From 1315608afc72b73cddccc67f36a48538b53eed48 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 18 May 2012 15:03:54 +0400
Subject: [PATCH 001/239] cleanup, typos, warnings

---
 .../diff/impl/incrementalMerge/MergeBuilder.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
index 10cbbabd69c4..068228032f49 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
@@ -19,12 +19,12 @@ import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.diff.impl.util.ContextLogger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.TextRange;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
 
 class MergeBuilder {
-  //private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.MergeBuilder");
   private final ContextLogger LOG;
   private final int[] myProcessed = new int[]{0, 0, 0};
   private final ArrayList<MergeFragment> myResult = new ArrayList<MergeFragment>();
@@ -55,7 +55,7 @@ class MergeBuilder {
     LOG.assertTrue(myPairs[0].getBase() == myPairs[1].getBase());
     LOG.assertTrue(myPairs[0].getBase() > myProcessed[1]);
     addMergeFragment(myPairs[0].processVersion(myProcessed),
-                     proccesBaseChange(myPairs[0]),
+                     processBaseChange(myPairs[0]),
                      myPairs[1].processVersion(myProcessed));
     skipProcessed();
   }
@@ -108,7 +108,7 @@ class MergeBuilder {
     skipProcessed();
   }
 
-  private TextRange proccesBaseChange(EqualPair workingPair) {
+  private TextRange processBaseChange(EqualPair workingPair) {
     int base = workingPair.getBase();
     TextRange change = new TextRange(myProcessed[1], base);
     int otherBase = myPairs[workingPair.getSide().otherSide().getIndex()].getBase();
@@ -131,7 +131,7 @@ class MergeBuilder {
     skipProcessed();
   }
 
-  private void addMergeFragment(TextRange left, TextRange base, TextRange right) {
+  private void addMergeFragment(@Nullable TextRange left, @Nullable TextRange base, @Nullable TextRange right) {
     myResult.add(new MergeFragment(new TextRange[]{left, base, right}));
   }
 
@@ -170,7 +170,7 @@ class MergeBuilder {
     return myResult;
   }
 
-  private TextRange createRange(int[] starts, int[] ends, int column) {
+  private static TextRange createRange(int[] starts, int[] ends, int column) {
     return new TextRange(starts[column], ends[column]);
   }
 
@@ -183,6 +183,7 @@ class MergeBuilder {
     myResult.add(new MergeFragment(tailChange));
   }
 
+  @Nullable
   private FragmentSide getNotProcessedSide() {
     EqualPair left = myPairs[0];
     EqualPair right = myPairs[1];
@@ -297,7 +298,7 @@ class MergeBuilder {
     }
 
     public String toString() {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("<");
       for (int i = 0; i < myRanges.length; i++) {
         TextRange range = myRanges[i];

From 2cd179d40ee431dcbf0b7e65696bb61046943e0f Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 18 May 2012 18:10:18 +0400
Subject: [PATCH 002/239] [merge] refactoring: use structure instead of array
 indices

* MergeFragment: hold TextRanges in named fields instead of operating an array via indices 0, 1, 2.
* cleanup, set @NotNull/@Nullable, fix code style.
---
 .../impl/incrementalMerge/MergeBuilder.java   | 118 +++++++++++-------
 .../diff/impl/incrementalMerge/MergeList.java |  31 +++--
 .../incrementalMerge/MergeBuilderTest.java    |   2 +-
 3 files changed, 91 insertions(+), 60 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
index 068228032f49..a17bc2c3e5e8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
@@ -17,8 +17,8 @@ package com.intellij.openapi.diff.impl.incrementalMerge;
 
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.diff.impl.util.ContextLogger;
-import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.TextRange;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -131,8 +131,8 @@ class MergeBuilder {
     skipProcessed();
   }
 
-  private void addMergeFragment(@Nullable TextRange left, @Nullable TextRange base, @Nullable TextRange right) {
-    myResult.add(new MergeFragment(new TextRange[]{left, base, right}));
+  private void addMergeFragment(@Nullable TextRange left, TextRange base, @Nullable TextRange right) {
+    myResult.add(new MergeFragment(left, base, right));
   }
 
   private void skipProcessed() {
@@ -149,10 +149,14 @@ class MergeBuilder {
   }
 
   public List<MergeFragment> finish(int leftLength, int baseLength, int rightLength) {
-    int[] lengths = new int[]{leftLength, baseLength, rightLength};
-    if (isProcessedUpto(lengths)) return myResult;
+    int[] lengths = new int[]{ leftLength, baseLength, rightLength };
+    if (isProcessedUpto(lengths)) {
+      return myResult;
+    }
     int[] afterEnds = new int[3];
-    for (int i = 0; i < lengths.length; i++) afterEnds[i] = lengths[i] + 1;
+    for (int i = 0; i < lengths.length; i++) {
+      afterEnds[i] = lengths[i] + 1;
+    }
     FragmentSide notProcessedSide = getNotProcessedSide();
     if (notProcessedSide == null) {
       addTailChange(lengths);
@@ -160,12 +164,10 @@ class MergeBuilder {
     }
     myPairs[notProcessedSide.getIndex()].grow(1);
     FragmentSide processedSide = notProcessedSide.otherSide();
-    add(createRange(lengths, afterEnds, 1),
-        createRange(lengths, afterEnds, processedSide.getMergeIndex()), processedSide);
-    if (!isProcessedUpto(afterEnds))
-      add(createRange(lengths, afterEnds, 1),
-          createRange(lengths, afterEnds, notProcessedSide.getMergeIndex()),
-          notProcessedSide);
+    add(createRange(lengths, afterEnds, 1), createRange(lengths, afterEnds, processedSide.getMergeIndex()), processedSide);
+    if (!isProcessedUpto(afterEnds)) {
+      add(createRange(lengths, afterEnds, 1), createRange(lengths, afterEnds, notProcessedSide.getMergeIndex()), notProcessedSide);
+    }
     LOG.assertTrue(isProcessedUpto(afterEnds));
     return myResult;
   }
@@ -180,7 +182,7 @@ class MergeBuilder {
       if (i != 1 && myProcessed[i] == lengths[i]) tailChange[i] = null;
       else tailChange[i] = new TextRange(myProcessed[i], lengths[i]);
     }
-    myResult.add(new MergeFragment(tailChange));
+    myResult.add(new MergeFragment(tailChange[0], tailChange[1], tailChange[2]));
   }
 
   @Nullable
@@ -267,54 +269,86 @@ class MergeBuilder {
     }
   }
 
-  public static class MergeFragment {
-    private final TextRange[] myRanges;
+  public static final class MergeFragment {
 
-    public MergeFragment(TextRange[] ranges) {
-      myRanges = ranges;
+    @Nullable private final TextRange myLeft;
+    @NotNull private final TextRange myBase;
+    @Nullable private final TextRange myRight;
+
+    public MergeFragment(@Nullable TextRange left, @NotNull TextRange base, @Nullable TextRange right) {
+      myLeft = left;
+      myBase = base;
+      myRight = right;
     }
 
-    public TextRange[] getRanges() {
-      return myRanges;
+    @Nullable
+    public TextRange getLeft() {
+      return myLeft;
     }
 
-    public boolean equals(Object obj) {
-      if (!(obj instanceof MergeFragment)) return false;
-      MergeFragment other = (MergeFragment)obj;
-      for (int i = 0; i < myRanges.length; i++) {
-        TextRange range = myRanges[i];
-        if (!Comparing.equal(range, other.myRanges[i])) return false;
-      }
+    @NotNull
+    public TextRange getBase() {
+      return myBase;
+    }
+
+    @Nullable
+    public TextRange getRight() {
+      return myRight;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      MergeFragment fragment = (MergeFragment)o;
+
+      // suppressing unnecessary check for null, because myBase may occasionally become nullable
+      //noinspection ConstantConditions
+      if (myBase != null ? !myBase.equals(fragment.myBase) : fragment.myBase != null) return false;
+      if (myLeft != null ? !myLeft.equals(fragment.myLeft) : fragment.myLeft != null) return false;
+      if (myRight != null ? !myRight.equals(fragment.myRight) : fragment.myRight != null) return false;
+
       return true;
     }
 
+    @Override
     public int hashCode() {
-      int result = 0;
-      for (int i = 0; i < myRanges.length; i++) {
-        TextRange range = myRanges[i];
-        result ^= range == null ? i : range.hashCode();
-      }
+      int result = myLeft != null ? myLeft.hashCode() : 0;
+      // suppressing unnecessary check for null, because myBase may occasionally become nullable
+      // noinspection ConstantConditions
+      result = 31 * result + (myBase != null ? myBase.hashCode() : 0);
+      result = 31 * result + (myRight != null ? myRight.hashCode() : 0);
       return result;
     }
 
     public String toString() {
       StringBuilder buffer = new StringBuilder();
       buffer.append("<");
-      for (int i = 0; i < myRanges.length; i++) {
-        TextRange range = myRanges[i];
-        buffer.append(range != null ? range.toString() : "-----");
-        if (i != myRanges.length - 1) buffer.append(", ");
-      }
+      buffer.append(range2String(myLeft)).append(", ");
+      buffer.append(range2String(myBase)).append(", ");
+      buffer.append(range2String(myRight));
       buffer.append(">");
       return buffer.toString();
     }
 
-    public static MergeFragment notConflict(TextRange baseChange, TextRange versionChange, FragmentSide versionSide) {
-      TextRange[] ranges = new TextRange[3];
-      ranges[1] = baseChange;
-      ranges[versionSide.getMergeIndex()] = versionChange;
-      ranges[versionSide.otherSide().getMergeIndex()] = null;
-      return new MergeFragment(ranges);
+    private static String range2String(@Nullable TextRange left) {
+      return left != null ? left.toString() : "-----";
+    }
+
+    @NotNull
+    public static MergeFragment notConflict(@NotNull TextRange baseChange, TextRange versionChange, FragmentSide versionSide) {
+      TextRange left;
+      TextRange right;
+      if (versionSide == FragmentSide.SIDE1) {
+        left = versionChange;
+        right = null;
+      }
+      else {
+        left = null;
+        right = versionChange;
+      }
+      return new MergeFragment(left, baseChange, right);
     }
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
index ecc4683eb587..20a1967b67b0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
@@ -79,31 +79,30 @@ public class MergeList implements ChangeList.Parent, UserDataHolder {
     final int fragmentsListSize = fragmentList.size();
     for (int i = 0; i < fragmentsListSize; i++) {
       final MergeBuilder.MergeFragment mergeFragment = fragmentList.get(i);
-      final TextRange[] ranges = mergeFragment.getRanges();
-      logger.assertTrue(ranges[1] != null);
-      if (ranges[0] == null) {
-        if (ranges[2] == null) {
-          if (i == fragmentsListSize - 1 && ranges[1].getEndOffset() == baseText.length()) {
+      TextRange baseRange = mergeFragment.getBase();
+      TextRange leftRange = mergeFragment.getLeft();
+      TextRange rightRange = mergeFragment.getRight();
+
+      if (leftRange == null) {
+        if (rightRange == null) {
+          if (i == fragmentsListSize - 1 && baseRange.getEndOffset() == baseText.length()) {
             // the very end, both local and remote revisions does not contain latest base fragment
             final int rightTextLength = rightText.length();
             final int leftTextLength = leftText.length();
-            rightChanges.add(SimpleChange.fromRanges(ranges[1], new TextRange(rightTextLength, rightTextLength), mergeList.myChanges[1]));
-            leftChanges.add(SimpleChange.fromRanges(ranges[1], new TextRange(leftTextLength, leftTextLength), mergeList.myChanges[0]));
+            rightChanges.add(SimpleChange.fromRanges(baseRange, new TextRange(rightTextLength, rightTextLength), mergeList.myChanges[1]));
+            leftChanges.add(SimpleChange.fromRanges(baseRange, new TextRange(leftTextLength, leftTextLength), mergeList.myChanges[0]));
           } else {
             LOG.error("Left Text: " + leftText + "\n" + "Right Text: " + rightText + "\nBase Text: " + baseText);
           }
         } else {
-          rightChanges.add(SimpleChange.fromRanges(ranges[1], ranges[2], mergeList.myChanges[1]));
+          rightChanges.add(SimpleChange.fromRanges(baseRange, rightRange, mergeList.myChanges[1]));
         }
       }
-      else if (ranges[2] == null) {
-        if (ranges[0] == null) {
-          LOG.error("Left Text: " + leftText + "\n" + "Right Text: " + rightText + "\nBase Text: " + baseText);
-        }
-        leftChanges.add(SimpleChange.fromRanges(ranges[1], ranges[0], mergeList.myChanges[0]));
+      else if (rightRange == null) {
+        leftChanges.add(SimpleChange.fromRanges(baseRange, leftRange, mergeList.myChanges[0]));
       }
       else {
-        Change[] changes = MergeConflict.createChanges(ranges[0], ranges[1], ranges[2], mergeList);
+        Change[] changes = MergeConflict.createChanges(leftRange, baseRange, rightRange, mergeList);
         leftChanges.add(changes[0]);
         rightChanges.add(changes[1]);
       }
@@ -113,9 +112,7 @@ public class MergeList implements ChangeList.Parent, UserDataHolder {
     return mergeList;
   }
 
-  private static List<MergeBuilder.MergeFragment> processText(String leftText,
-                                                              String baseText,
-                                                              String rightText,
+  private static List<MergeBuilder.MergeFragment> processText(String leftText, String baseText, String rightText,
                                                               ContextLogger logger) throws FilesTooBigForDiffException {
     DiffFragment[] leftFragments = DiffPolicy.DEFAULT_LINES.buildFragments(baseText, leftText);
     DiffFragment[] rightFragments = DiffPolicy.DEFAULT_LINES.buildFragments(baseText, rightText);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilderTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilderTest.java
index 05d325a7d855..01111b25c05c 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilderTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilderTest.java
@@ -53,7 +53,7 @@ public class MergeBuilderTest extends TestCase {
   }
 
   private MergeBuilder.MergeFragment fragment(TextRange left, TextRange base, TextRange right) {
-    return new MergeBuilder.MergeFragment(new TextRange[]{left, base, right});
+    return new MergeBuilder.MergeFragment(left, base, right);
   }
 
   public void testHeadInsert() {

From 62fa9041fa8dafbd6152c4f1bfa00d635668bcb8 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 18 May 2012 20:13:18 +0400
Subject: [PATCH 003/239] [merge] cleanup

* Remove the deprecated constant.
* Logically reorder fields.
* Convert for-with-index to Iterator.
---
 .../diff/impl/incrementalMerge/MergeList.java | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
index 20a1967b67b0..5c15fcec40dc 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
@@ -45,23 +45,26 @@ import java.util.Iterator;
 import java.util.List;
 
 public class MergeList implements ChangeList.Parent, UserDataHolder {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.MergeList");
-  private final Project myProject;
-  private final ChangeList[] myChanges = new ChangeList[2];
-  private final UserDataHolderBase myDataHolder = new UserDataHolderBase();
+
   public static final FragmentSide BRANCH_SIDE = FragmentSide.SIDE2;
   public static final FragmentSide BASE_SIDE = FragmentSide.SIDE1;
 
   public static final DataKey<MergeList> DATA_KEY = DataKey.create("mergeList");
-  @Deprecated public static final String MERGE_LIST = DATA_KEY.getName();
 
-  private MergeList(Project project, Document left, Document base, Document right) {
+  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.MergeList");
+
+  @NotNull private final Project myProject;
+  @NotNull private final ChangeList[] myChanges = new ChangeList[2];
+  @NotNull private final UserDataHolderBase myDataHolder = new UserDataHolderBase();
+
+  private MergeList(@NotNull Project project, @NotNull Document left, @NotNull Document base, @NotNull Document right) {
     myProject = project;
     myChanges[0] = new ChangeList(base, left, this);
     myChanges[1] = new ChangeList(base, right, this);
   }
 
-  public static MergeList create(Project project, Document left, Document base, Document right) throws FilesTooBigForDiffException {
+  public static MergeList create(@NotNull Project project, @NotNull Document left, @NotNull Document base,
+                                 @NotNull Document right) throws FilesTooBigForDiffException {
     MergeList mergeList = new MergeList(project, left, base, right);
     String leftText = left.getText();
     String baseText = base.getText();
@@ -76,16 +79,15 @@ public class MergeList implements ChangeList.Parent, UserDataHolder {
 
     ArrayList<Change> leftChanges = new ArrayList<Change>();
     ArrayList<Change> rightChanges = new ArrayList<Change>();
-    final int fragmentsListSize = fragmentList.size();
-    for (int i = 0; i < fragmentsListSize; i++) {
-      final MergeBuilder.MergeFragment mergeFragment = fragmentList.get(i);
+    for (Iterator<MergeBuilder.MergeFragment> fragmentIterator = fragmentList.iterator(); fragmentIterator.hasNext(); ) {
+      final MergeBuilder.MergeFragment mergeFragment = fragmentIterator.next();
       TextRange baseRange = mergeFragment.getBase();
       TextRange leftRange = mergeFragment.getLeft();
       TextRange rightRange = mergeFragment.getRight();
 
       if (leftRange == null) {
         if (rightRange == null) {
-          if (i == fragmentsListSize - 1 && baseRange.getEndOffset() == baseText.length()) {
+          if (!fragmentIterator.hasNext() && baseRange.getEndOffset() == baseText.length()) {
             // the very end, both local and remote revisions does not contain latest base fragment
             final int rightTextLength = rightText.length();
             final int leftTextLength = leftText.length();
@@ -229,7 +231,7 @@ public class MergeList implements ChangeList.Parent, UserDataHolder {
 
   @Nullable
   public static MergeList fromDataContext(DataContext dataContext) {
-    MergeList mergeList = MergeList.DATA_KEY.getData(dataContext);
+    MergeList mergeList = DATA_KEY.getData(dataContext);
     if (mergeList != null) return mergeList;
     MergePanel2 mergePanel = MergePanel2.fromDataContext(dataContext);
     return mergePanel == null ? null : mergePanel.getMergeList();
@@ -241,6 +243,7 @@ public class MergeList implements ChangeList.Parent, UserDataHolder {
     }
   };
 
+  @NotNull
   public Project getProject() {
     return myProject;
   }
@@ -253,6 +256,7 @@ public class MergeList implements ChangeList.Parent, UserDataHolder {
     myDataHolder.putUserData(key, value);
   }
 
+  @Nullable
   public FragmentSide getSideOf(ChangeList source) {
     for (int i = 0; i < myChanges.length; i++) {
       ChangeList changeList = myChanges[i];

From 3630379f2e9833356d1a9130a1ae8c5f55232637 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 18 May 2012 20:26:39 +0400
Subject: [PATCH 004/239] [merge] cleanup

Remove the Parent interface, because it looks like an overhead.
Just pass the Project instance to clients.
---
 .../impl/incrementalMerge/ChangeList.java     | 16 +++++--------
 .../diff/impl/incrementalMerge/MergeList.java | 24 +++++++------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java
index b44c2225c2f6..ded9f26b3cc1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java
@@ -35,15 +35,15 @@ public class ChangeList {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.ChangeList");
   private static final Comparator<Change> CHANGE_ORDER = new SimpleChange.ChangeOrder(FragmentSide.SIDE1);
 
+  private final Project myProject;
   private final Document[] myDocuments = new Document[2];
-  private final Parent myParent;
   private final ArrayList<Listener> myListeners = new ArrayList<Listener>();
   private ArrayList<Change> myChanges;
 
-  public ChangeList(Document base, Document version, Parent parent) {
+  public ChangeList(Document base, Document version, Project project) {
     myDocuments[0] = base;
     myDocuments[1] = version;
-    myParent = parent;
+    myProject = project;
   }
 
   public void addListener(Listener listener) {
@@ -72,14 +72,14 @@ public class ChangeList {
     myChanges = new ArrayList<Change>(changes);
   }
 
-  public Project getProject() { return myParent.getProject(); }
+  public Project getProject() { return myProject; }
 
   public List<Change> getChanges() {
     return Collections.unmodifiableList(myChanges);
   }
 
-  public static ChangeList build(Document base, Document version, Parent parent) throws FilesTooBigForDiffException {
-    ChangeList result = new ChangeList(base, version, parent);
+  public static ChangeList build(Document base, Document version, Project project) throws FilesTooBigForDiffException {
+    ChangeList result = new ChangeList(base, version, project);
     ArrayList<Change> changes = result.buildChanges();
     Collections.sort(changes, CHANGE_ORDER);
     result.setChanges(changes);
@@ -203,10 +203,6 @@ public class ChangeList {
     }
   }
 
-  public interface Parent {
-    Project getProject();
-  }
-
   public interface Listener {
     void onChangeRemoved(ChangeList source);
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
index 5c15fcec40dc..73ba17f8bb36 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
@@ -44,23 +44,26 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-public class MergeList implements ChangeList.Parent, UserDataHolder {
+public class MergeList implements UserDataHolder {
 
   public static final FragmentSide BRANCH_SIDE = FragmentSide.SIDE2;
   public static final FragmentSide BASE_SIDE = FragmentSide.SIDE1;
 
   public static final DataKey<MergeList> DATA_KEY = DataKey.create("mergeList");
+  public static final Condition<Change> NOT_CONFLICTS = new Condition<Change>() {
+    public boolean value(Change change) {
+      return !(change instanceof ConflictChange);
+    }
+  };
 
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.MergeList");
 
-  @NotNull private final Project myProject;
   @NotNull private final ChangeList[] myChanges = new ChangeList[2];
   @NotNull private final UserDataHolderBase myDataHolder = new UserDataHolderBase();
 
   private MergeList(@NotNull Project project, @NotNull Document left, @NotNull Document base, @NotNull Document right) {
-    myProject = project;
-    myChanges[0] = new ChangeList(base, left, this);
-    myChanges[1] = new ChangeList(base, right, this);
+    myChanges[0] = new ChangeList(base, left, project);
+    myChanges[1] = new ChangeList(base, right, project);
   }
 
   public static MergeList create(@NotNull Project project, @NotNull Document left, @NotNull Document base,
@@ -237,17 +240,6 @@ public class MergeList implements ChangeList.Parent, UserDataHolder {
     return mergePanel == null ? null : mergePanel.getMergeList();
   }
 
-  public static final Condition<Change> NOT_CONFLICTS = new Condition<Change>() {
-    public boolean value(Change change) {
-      return !(change instanceof ConflictChange);
-    }
-  };
-
-  @NotNull
-  public Project getProject() {
-    return myProject;
-  }
-
   public <T> T getUserData(@NotNull Key<T> key) {
     return myDataHolder.getUserData(key);
   }

From f3efdde810fde56049bb1f45b89b968d8c9ea713 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 18 May 2012 21:02:54 +0400
Subject: [PATCH 005/239] [merge] refactor: change array & indices to structure

* MergeList.myChanges[]
* MergeConflict.myChanges[]
* cleanup, code style, javadoc, @NotNull/Nullable
---
 .../impl/incrementalMerge/ConflictChange.java | 12 ++-
 .../impl/incrementalMerge/MergeConflict.java  | 52 ++++++-----
 .../diff/impl/incrementalMerge/MergeList.java | 87 ++++++++++---------
 3 files changed, 83 insertions(+), 68 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
index 8fc7f10ccce1..6b6b5ead435f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
@@ -19,7 +19,12 @@ import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.editor.ex.DocumentEx;
 import com.intellij.openapi.util.TextRange;
 
+/**
+ * One of two conflicting changes.
+ * @see MergeConflict
+ */
 class ConflictChange extends Change implements DiffRangeMarker.RangeInvalidListener {
+
   private Side myOriginalSide;
   private MergeConflict myConflict;
 
@@ -37,7 +42,7 @@ class ConflictChange extends Change implements DiffRangeMarker.RangeInvalidListe
     return isBranch(side) ? myOriginalSide : myConflict;
   }
 
-  private boolean isBranch(FragmentSide side) {
+  private static boolean isBranch(FragmentSide side) {
     return MergeList.BRANCH_SIDE == side;
   }
 
@@ -45,14 +50,15 @@ class ConflictChange extends Change implements DiffRangeMarker.RangeInvalidListe
     return myOriginalSide;
   }
 
-  public ChangeType getType() { return ChangeType.CONFLICT; }
+  public ChangeType getType() {
+    return ChangeType.CONFLICT;
+  }
 
   public ChangeList getChangeList() {
     return myConflict.getMergeList().getChanges(myOriginalSide.getFragmentSide());
   }
 
   public void onRemovedFromList() {
-    myConflict.onChangeRemoved(myOriginalSide.getFragmentSide(), this);
     myOriginalSide.getRange().removeListener(this);
     myConflict = null;
     myOriginalSide = null;
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
index 85f31b07c8e9..be4062058467 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
@@ -15,22 +15,28 @@
  */
 package com.intellij.openapi.diff.impl.incrementalMerge;
 
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.ex.DocumentEx;
 import com.intellij.openapi.util.TextRange;
+import org.jetbrains.annotations.NotNull;
 
+/**
+ * Represents a merge conflict, i.e. two {@link ConflictChange conflicting changes}, one from left, another from right.
+ */
 class MergeConflict extends ChangeType.ChangeSide implements DiffRangeMarker.RangeInvalidListener {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.MergeConflict");
-  private final Change.HighlighterHolder myCommonHighlighterHolder = new Change.HighlighterHolder();
-  private final MergeList myMergeList;
-  private final DiffRangeMarker myCommonRange;
-  private ConflictChange[] myChanges;
 
-  private MergeConflict(TextRange commonRange, MergeList mergeList) {
+  @NotNull private final MergeList myMergeList;
+  @NotNull private final DiffRangeMarker myCommonRange;
+  @NotNull private final ConflictChange myLeftChange;
+  @NotNull private final ConflictChange myRightChange;
+  @NotNull private final Change.HighlighterHolder myCommonHighlighterHolder = new Change.HighlighterHolder();
+
+  MergeConflict(TextRange commonRange, MergeList mergeList, TextRange leftMarker, TextRange rightMarker) {
     myCommonRange = new DiffRangeMarker((DocumentEx)mergeList.getBaseDocument(),commonRange, this);
     myMergeList = mergeList;
+    myLeftChange = new ConflictChange(this, FragmentSide.SIDE1, leftMarker);
+    myRightChange = new ConflictChange(this, FragmentSide.SIDE2, rightMarker);
   }
 
   public Change.HighlighterHolder getHighlighterHolder() {
@@ -41,27 +47,28 @@ class MergeConflict extends ChangeType.ChangeSide implements DiffRangeMarker.Ran
     return myCommonRange;
   }
 
-  public static Change[] createChanges(TextRange leftMarker, TextRange baseMarker, TextRange rightMarker, MergeList mergeList) {
-    MergeConflict conflict = new MergeConflict(baseMarker, mergeList);
-    return conflict.createChanges(leftMarker, rightMarker);
+  @NotNull
+  public ConflictChange getLeftChange() {
+    return myLeftChange;
   }
 
-  private Change[] createChanges(TextRange leftMarker, TextRange rightMarker) {
-    LOG.assertTrue(myChanges == null);
-    myChanges = new ConflictChange[]{new ConflictChange(this, FragmentSide.SIDE1, leftMarker),
-                                     new ConflictChange(this, FragmentSide.SIDE2, rightMarker)};
-    return myChanges;
+  @NotNull
+  public ConflictChange getRightChange() {
+    return myRightChange;
   }
 
   public void conflictRemoved() {
-    for (ConflictChange change : myChanges) {
-      change.getOriginalSide().getHighlighterHolder().removeHighlighters();
-    }
+    removeHighlighters(myLeftChange);
+    removeHighlighters(myRightChange);
     myCommonHighlighterHolder.removeHighlighters();
-    myMergeList.removeChanges(myChanges);
+    myMergeList.removeChanges(myLeftChange, myRightChange);
     myCommonRange.removeListener(this);
   }
 
+  private static void removeHighlighters(@NotNull ConflictChange change) {
+    change.getOriginalSide().getHighlighterHolder().removeHighlighters();
+  }
+
   public Document getOriginalDocument(FragmentSide mergeSide) {
     return myMergeList.getChanges(mergeSide).getDocument(MergeList.BRANCH_SIDE);
   }
@@ -70,12 +77,9 @@ class MergeConflict extends ChangeType.ChangeSide implements DiffRangeMarker.Ran
     conflictRemoved();
   }
 
-  public void onChangeRemoved(FragmentSide mergeSide, ConflictChange conflictChange) {
-    LOG.assertTrue(myChanges[mergeSide.getIndex()] == conflictChange);
-    myChanges[mergeSide.getIndex()] = null;
-  }
-
+  @NotNull
   public MergeList getMergeList() {
     return myMergeList;
   }
+
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
index 73ba17f8bb36..fcea6262275b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
@@ -58,12 +58,13 @@ public class MergeList implements UserDataHolder {
 
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.MergeList");
 
-  @NotNull private final ChangeList[] myChanges = new ChangeList[2];
   @NotNull private final UserDataHolderBase myDataHolder = new UserDataHolderBase();
+  @NotNull private final ChangeList myBaseToLeftChangeList;
+  @NotNull private final ChangeList myBaseToRightChangeList;
 
   private MergeList(@NotNull Project project, @NotNull Document left, @NotNull Document base, @NotNull Document right) {
-    myChanges[0] = new ChangeList(base, left, project);
-    myChanges[1] = new ChangeList(base, right, project);
+    myBaseToLeftChangeList = new ChangeList(base, left, project);
+    myBaseToRightChangeList = new ChangeList(base, right, project);
   }
 
   public static MergeList create(@NotNull Project project, @NotNull Document left, @NotNull Document base,
@@ -94,26 +95,26 @@ public class MergeList implements UserDataHolder {
             // the very end, both local and remote revisions does not contain latest base fragment
             final int rightTextLength = rightText.length();
             final int leftTextLength = leftText.length();
-            rightChanges.add(SimpleChange.fromRanges(baseRange, new TextRange(rightTextLength, rightTextLength), mergeList.myChanges[1]));
-            leftChanges.add(SimpleChange.fromRanges(baseRange, new TextRange(leftTextLength, leftTextLength), mergeList.myChanges[0]));
+            rightChanges.add(SimpleChange.fromRanges(baseRange, new TextRange(rightTextLength, rightTextLength), mergeList.myBaseToRightChangeList));
+            leftChanges.add(SimpleChange.fromRanges(baseRange, new TextRange(leftTextLength, leftTextLength), mergeList.myBaseToLeftChangeList));
           } else {
             LOG.error("Left Text: " + leftText + "\n" + "Right Text: " + rightText + "\nBase Text: " + baseText);
           }
         } else {
-          rightChanges.add(SimpleChange.fromRanges(baseRange, rightRange, mergeList.myChanges[1]));
+          rightChanges.add(SimpleChange.fromRanges(baseRange, rightRange, mergeList.myBaseToRightChangeList));
         }
       }
       else if (rightRange == null) {
-        leftChanges.add(SimpleChange.fromRanges(baseRange, leftRange, mergeList.myChanges[0]));
+        leftChanges.add(SimpleChange.fromRanges(baseRange, leftRange, mergeList.myBaseToLeftChangeList));
       }
       else {
-        Change[] changes = MergeConflict.createChanges(leftRange, baseRange, rightRange, mergeList);
-        leftChanges.add(changes[0]);
-        rightChanges.add(changes[1]);
+        MergeConflict conflict = new MergeConflict(baseRange, mergeList, leftRange, rightRange);
+        leftChanges.add(conflict.getLeftChange());
+        rightChanges.add(conflict.getRightChange());
       }
     }
-    mergeList.myChanges[0].setChanges(leftChanges);
-    mergeList.myChanges[1].setChanges(rightChanges);
+    mergeList.myBaseToLeftChangeList.setChanges(leftChanges);
+    mergeList.myBaseToRightChangeList.setChanges(rightChanges);
     return mergeList;
   }
 
@@ -168,31 +169,29 @@ public class MergeList implements UserDataHolder {
   }
 
   public void setMarkups(Editor left, Editor base, Editor right) {
-    myChanges[0].setMarkup(base, left);
-    myChanges[1].setMarkup(base, right);
+    myBaseToLeftChangeList.setMarkup(base, left);
+    myBaseToRightChangeList.setMarkup(base, right);
     addActions(FragmentSide.SIDE1);
     addActions(FragmentSide.SIDE2);
   }
 
   public Iterator<Change> getAllChanges() {
-    return SequenceIterator.create(myChanges[0].getChanges().iterator(),
-                                   FilteringIterator.create(myChanges[1].getChanges().iterator(), NOT_CONFLICTS));
+    return SequenceIterator.create(myBaseToLeftChangeList.getChanges().iterator(),
+                                   FilteringIterator.create(myBaseToRightChangeList.getChanges().iterator(), NOT_CONFLICTS));
   }
 
   public void addListener(ChangeList.Listener listener) {
-    for (ChangeList changeList : myChanges) {
-      changeList.addListener(listener);
-    }
+    myBaseToLeftChangeList.addListener(listener);
+    myBaseToRightChangeList.addListener(listener);
   }
 
   public void removeListener(ChangeList.Listener listener) {
-    for (ChangeList changeList : myChanges) {
-      changeList.removeListener(listener);
-    }
+    myBaseToLeftChangeList.removeListener(listener);
+    myBaseToRightChangeList.removeListener(listener);
   }
 
   private void addActions(final FragmentSide side) {
-    ChangeList changeList = myChanges[side.getIndex()];
+    ChangeList changeList = getChanges(side);
     final FragmentSide originalSide = BRANCH_SIDE;
     for (int i = 0; i < changeList.getCount(); i++) {
       final Change change = changeList.getChange(i);
@@ -215,20 +214,24 @@ public class MergeList implements UserDataHolder {
     Change.apply(change, BRANCH_SIDE);
   }
 
-  public ChangeList getChanges(final FragmentSide changesSide) {
-    return myChanges[changesSide.getIndex()];
-  }
-
-  public void removeChanges(Change[] changes) {
-    for (int i = 0; i < changes.length; i++) {
-      Change change = changes[i];
-      myChanges[i].remove(change);
+  @NotNull
+  public ChangeList getChanges(@NotNull final FragmentSide changesSide) {
+    if (changesSide == FragmentSide.SIDE1) {
+      return myBaseToLeftChangeList;
+    }
+    else {
+      return myBaseToRightChangeList;
     }
   }
 
+  public void removeChanges(@NotNull Change leftChange, @NotNull Change rightChange) {
+    myBaseToLeftChangeList.remove(leftChange);
+    myBaseToRightChangeList.remove(rightChange);
+  }
+
   public Document getBaseDocument() {
-    Document document = myChanges[0].getDocument(BASE_SIDE);
-    LOG.assertTrue(document == myChanges[1].getDocument(BASE_SIDE));
+    Document document = myBaseToLeftChangeList.getDocument(BASE_SIDE);
+    LOG.assertTrue(document == myBaseToRightChangeList.getDocument(BASE_SIDE));
     return document;
   }
 
@@ -248,17 +251,19 @@ public class MergeList implements UserDataHolder {
     myDataHolder.putUserData(key, value);
   }
 
-  @Nullable
-  public FragmentSide getSideOf(ChangeList source) {
-    for (int i = 0; i < myChanges.length; i++) {
-      ChangeList changeList = myChanges[i];
-      if (changeList == source) return FragmentSide.fromIndex(i);
+  @NotNull
+  public FragmentSide getSideOf(@NotNull ChangeList source) {
+    if (myBaseToLeftChangeList == source) {
+      return FragmentSide.SIDE1;
+    }
+    else {
+      return FragmentSide.SIDE2;
     }
-    return null;
   }
 
   public void updateMarkup() {
-    myChanges[0].updateMarkup();
-    myChanges[1].updateMarkup();
+    myBaseToLeftChangeList.updateMarkup();
+    myBaseToRightChangeList.updateMarkup();
   }
+
 }

From f571391945f21b53f0b2b6e4a82b8c93e1081635 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 18 May 2012 21:18:10 +0400
Subject: [PATCH 006/239] Extract MergeFragment to a separate class.

It is used in several places and is rather big.
Added some javadocs.
---
 .../impl/incrementalMerge/MergeBuilder.java   |  84 -------------
 .../impl/incrementalMerge/MergeFragment.java  | 114 ++++++++++++++++++
 .../diff/impl/incrementalMerge/MergeList.java |   8 +-
 .../incrementalMerge/MergeBuilderTest.java    |  14 +--
 4 files changed, 125 insertions(+), 95 deletions(-)
 create mode 100644 platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeFragment.java

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
index a17bc2c3e5e8..a0b526cff493 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilder.java
@@ -18,7 +18,6 @@ package com.intellij.openapi.diff.impl.incrementalMerge;
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.diff.impl.util.ContextLogger;
 import com.intellij.openapi.util.TextRange;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -268,87 +267,4 @@ class MergeBuilder {
       myLength += delta;
     }
   }
-
-  public static final class MergeFragment {
-
-    @Nullable private final TextRange myLeft;
-    @NotNull private final TextRange myBase;
-    @Nullable private final TextRange myRight;
-
-    public MergeFragment(@Nullable TextRange left, @NotNull TextRange base, @Nullable TextRange right) {
-      myLeft = left;
-      myBase = base;
-      myRight = right;
-    }
-
-    @Nullable
-    public TextRange getLeft() {
-      return myLeft;
-    }
-
-    @NotNull
-    public TextRange getBase() {
-      return myBase;
-    }
-
-    @Nullable
-    public TextRange getRight() {
-      return myRight;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
-
-      MergeFragment fragment = (MergeFragment)o;
-
-      // suppressing unnecessary check for null, because myBase may occasionally become nullable
-      //noinspection ConstantConditions
-      if (myBase != null ? !myBase.equals(fragment.myBase) : fragment.myBase != null) return false;
-      if (myLeft != null ? !myLeft.equals(fragment.myLeft) : fragment.myLeft != null) return false;
-      if (myRight != null ? !myRight.equals(fragment.myRight) : fragment.myRight != null) return false;
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      int result = myLeft != null ? myLeft.hashCode() : 0;
-      // suppressing unnecessary check for null, because myBase may occasionally become nullable
-      // noinspection ConstantConditions
-      result = 31 * result + (myBase != null ? myBase.hashCode() : 0);
-      result = 31 * result + (myRight != null ? myRight.hashCode() : 0);
-      return result;
-    }
-
-    public String toString() {
-      StringBuilder buffer = new StringBuilder();
-      buffer.append("<");
-      buffer.append(range2String(myLeft)).append(", ");
-      buffer.append(range2String(myBase)).append(", ");
-      buffer.append(range2String(myRight));
-      buffer.append(">");
-      return buffer.toString();
-    }
-
-    private static String range2String(@Nullable TextRange left) {
-      return left != null ? left.toString() : "-----";
-    }
-
-    @NotNull
-    public static MergeFragment notConflict(@NotNull TextRange baseChange, TextRange versionChange, FragmentSide versionSide) {
-      TextRange left;
-      TextRange right;
-      if (versionSide == FragmentSide.SIDE1) {
-        left = versionChange;
-        right = null;
-      }
-      else {
-        left = null;
-        right = versionChange;
-      }
-      return new MergeFragment(left, baseChange, right);
-    }
-  }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeFragment.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeFragment.java
new file mode 100644
index 000000000000..91096b5d4097
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeFragment.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.diff.impl.incrementalMerge;
+
+import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
+import com.intellij.openapi.util.TextRange;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Represents one fragment in the 3-way merge, i.e. an insertion, a deletion, a modification or a conflict.
+ * Holds information about the {@link TextRange TextRanges} of changed fragments.<br/>
+ * One and only one left or right fragment is null for all cases, except for the conflict, when both are not null.
+ */
+final class MergeFragment {
+
+  @Nullable private final TextRange myLeft;
+  @NotNull private final TextRange myBase;
+  @Nullable private final TextRange myRight;
+
+  MergeFragment(@Nullable TextRange left, @NotNull TextRange base, @Nullable TextRange right) {
+    myLeft = left;
+    myBase = base;
+    myRight = right;
+  }
+
+  /**
+   * Creates a non-conflicting MergeFragment, given one of TextRanges and the FragmentSide to identify which range is it: right or left.
+   */
+  @NotNull
+  static MergeFragment notConflict(@NotNull TextRange baseChange, @NotNull TextRange versionChange, @NotNull FragmentSide versionSide) {
+    TextRange left;
+    TextRange right;
+    if (versionSide == FragmentSide.SIDE1) {
+      left = versionChange;
+      right = null;
+    }
+    else {
+      left = null;
+      right = versionChange;
+    }
+    return new MergeFragment(left, baseChange, right);
+  }
+
+  @Nullable
+  TextRange getLeft() {
+    return myLeft;
+  }
+
+  @NotNull
+  TextRange getBase() {
+    return myBase;
+  }
+
+  @Nullable
+  TextRange getRight() {
+    return myRight;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    MergeFragment fragment = (MergeFragment)o;
+
+    // suppressing unnecessary check for null, because myBase may occasionally become nullable
+    //noinspection ConstantConditions
+    if (myBase != null ? !myBase.equals(fragment.myBase) : fragment.myBase != null) return false;
+    if (myLeft != null ? !myLeft.equals(fragment.myLeft) : fragment.myLeft != null) return false;
+    if (myRight != null ? !myRight.equals(fragment.myRight) : fragment.myRight != null) return false;
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = myLeft != null ? myLeft.hashCode() : 0;
+    // suppressing unnecessary check for null, because myBase may occasionally become nullable
+    // noinspection ConstantConditions
+    result = 31 * result + (myBase != null ? myBase.hashCode() : 0);
+    result = 31 * result + (myRight != null ? myRight.hashCode() : 0);
+    return result;
+  }
+
+  public String toString() {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append("<");
+    buffer.append(range2String(myLeft)).append(", ");
+    buffer.append(range2String(myBase)).append(", ");
+    buffer.append(range2String(myRight));
+    buffer.append(">");
+    return buffer.toString();
+  }
+
+  @NotNull
+  private static String range2String(@Nullable TextRange left) {
+    return left != null ? left.toString() : "-----";
+  }
+
+}
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
index fcea6262275b..95c7fd938aa7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
@@ -79,12 +79,12 @@ public class MergeList implements UserDataHolder {
       "\nRight\n", rightText
     };
     ContextLogger logger = new ContextLogger(LOG, new ContextLogger.SimpleContext(data));
-    List<MergeBuilder.MergeFragment> fragmentList = processText(leftText, baseText, rightText, logger);
+    List<MergeFragment> fragmentList = processText(leftText, baseText, rightText, logger);
 
     ArrayList<Change> leftChanges = new ArrayList<Change>();
     ArrayList<Change> rightChanges = new ArrayList<Change>();
-    for (Iterator<MergeBuilder.MergeFragment> fragmentIterator = fragmentList.iterator(); fragmentIterator.hasNext(); ) {
-      final MergeBuilder.MergeFragment mergeFragment = fragmentIterator.next();
+    for (Iterator<MergeFragment> fragmentIterator = fragmentList.iterator(); fragmentIterator.hasNext(); ) {
+      final MergeFragment mergeFragment = fragmentIterator.next();
       TextRange baseRange = mergeFragment.getBase();
       TextRange leftRange = mergeFragment.getLeft();
       TextRange rightRange = mergeFragment.getRight();
@@ -118,7 +118,7 @@ public class MergeList implements UserDataHolder {
     return mergeList;
   }
 
-  private static List<MergeBuilder.MergeFragment> processText(String leftText, String baseText, String rightText,
+  private static List<MergeFragment> processText(String leftText, String baseText, String rightText,
                                                               ContextLogger logger) throws FilesTooBigForDiffException {
     DiffFragment[] leftFragments = DiffPolicy.DEFAULT_LINES.buildFragments(baseText, leftText);
     DiffFragment[] rightFragments = DiffPolicy.DEFAULT_LINES.buildFragments(baseText, rightText);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilderTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilderTest.java
index 01111b25c05c..898f4b8705ba 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilderTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/diff/impl/incrementalMerge/MergeBuilderTest.java
@@ -46,14 +46,14 @@ public class MergeBuilderTest extends TestCase {
     TextRange version = new TextRange(0, 1);
     addLeft(base, version);
     addRight(base, version);
-    CHECK.compareAll(new MergeBuilder.MergeFragment[]{
+    CHECK.compareAll(new MergeFragment[]{
       fragment(new TextRange(0, 0), new TextRange(0, 1), new TextRange(0, 0)),
       fragment(new TextRange(1, 2), new TextRange(2, 2), new TextRange(1, 2))
     }, finish(2, 2, 2));
   }
 
-  private MergeBuilder.MergeFragment fragment(TextRange left, TextRange base, TextRange right) {
-    return new MergeBuilder.MergeFragment(left, base, right);
+  private MergeFragment fragment(TextRange left, TextRange base, TextRange right) {
+    return new MergeFragment(left, base, right);
   }
 
   public void testHeadInsert() {
@@ -73,7 +73,7 @@ public class MergeBuilderTest extends TestCase {
   public void testNotAllignedConflict() {
     addLeft(new TextRange(1, 3), new TextRange(0, 2));
     addRight(new TextRange(2, 4), new TextRange(1, 3));
-    CHECK.compareAll(new MergeBuilder.MergeFragment[]{
+    CHECK.compareAll(new MergeFragment[]{
       fragment(new TextRange(0, 1), new TextRange(0, 2), new TextRange(0, 1)),
       fragment(new TextRange(2, 3), new TextRange(3, 4), null)
     }, finish(3, 4, 3));
@@ -86,7 +86,7 @@ public class MergeBuilderTest extends TestCase {
     addRight(new TextRange(4, 5), new TextRange(3, 4));
     addRight(new TextRange(6, 7), new TextRange(5, 6));
     addLeft(new TextRange(9, 10), new TextRange(9, 10));
-    CHECK.compareAll(new MergeBuilder.MergeFragment[]{
+    CHECK.compareAll(new MergeFragment[]{
       fragment(new TextRange(0, 1), new TextRange(0, 1), TextRange.EMPTY_RANGE),
       fragment(null, new TextRange(2, 3), new TextRange(1, 1)),
       fragment(null, new TextRange(4, 4), new TextRange(2, 3)),
@@ -100,7 +100,7 @@ public class MergeBuilderTest extends TestCase {
     addRight(new TextRange(0, 2), new TextRange(0, 2));
     addLeft(new TextRange(3, 5), new TextRange(1, 3));
     addRight(new TextRange(4, 5), new TextRange(2, 3));
-    CHECK.compareAll(new MergeBuilder.MergeFragment[]{
+    CHECK.compareAll(new MergeFragment[]{
       fragment(new TextRange(1, 2), new TextRange(1, 4), new TextRange(1, 2))
     }, finish(3, 5, 3));
   }
@@ -113,7 +113,7 @@ public class MergeBuilderTest extends TestCase {
     myMergeBuilder.add(base, left, FragmentSide.SIDE1);
   }
 
-  private List<MergeBuilder.MergeFragment> finish(int left, int base, int right) {
+  private List<MergeFragment> finish(int left, int base, int right) {
     return myMergeBuilder.finish(left, base, right);
   }
 

From 741bcb69549fbed8234b5b2a9d77a55df4e2db12 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 18 May 2012 21:37:08 +0400
Subject: [PATCH 007/239] [merge] refactoring: make FragmentSide to be enum

* Make some DRY.
* Use IllegalArgumentException to a not-public InvalidParameterException
---
 .../openapi/diff/impl/DiffPanelImpl.java      |   2 +-
 .../diff/impl/fragments/InlineFragment.java   |   2 +-
 .../diff/impl/fragments/LineFragment.java     |   3 +-
 .../diff/impl/highlighting/FragmentSide.java  | 130 ++++++++++--------
 4 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
index 5853849359ad..88aaf6e0af8f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
@@ -482,7 +482,7 @@ public class DiffPanelImpl implements DiffPanelEx, ContentChangeListener, TwoSid
       return myLeftSide;
     }
     if (side == FragmentSide.SIDE2) return myRightSide;
-    throw new InvalidParameterException(String.valueOf(side));
+    throw new IllegalArgumentException(String.valueOf(side));
   }
 
   public LineBlocks getLineBlocks() { return myLineBlocks; }
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/fragments/InlineFragment.java b/platform/util/src/com/intellij/openapi/diff/impl/fragments/InlineFragment.java
index 5e8116586293..8b06e9847b55 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/fragments/InlineFragment.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/fragments/InlineFragment.java
@@ -42,7 +42,7 @@ public class InlineFragment implements Fragment {
   public TextRange getRange(FragmentSide side) {
     if (side == FragmentSide.SIDE1) return myRange1;
     if (side == FragmentSide.SIDE2) return myRange2;
-    throw new InvalidParameterException(String.valueOf(side));
+    throw new IllegalArgumentException(String.valueOf(side));
   }
 
   public Fragment shift(TextRange range1, TextRange range2, int startingLine1, int startingLine2) {
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/fragments/LineFragment.java b/platform/util/src/com/intellij/openapi/diff/impl/fragments/LineFragment.java
index e56f13277c4b..4aeb74fb3726 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/fragments/LineFragment.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/fragments/LineFragment.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.diff.impl.util.TextDiffTypeEnum;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.TextRange;
 
-import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -55,7 +54,7 @@ public class LineFragment extends LineBlock implements Fragment {
   public TextRange getRange(FragmentSide side) {
     if (side == FragmentSide.SIDE1) return myRange1;
     if (side == FragmentSide.SIDE2) return myRange2;
-    throw new InvalidParameterException(String.valueOf(side));
+    throw new IllegalArgumentException(String.valueOf(side));
   }
 
   public Fragment shift(TextRange range1, TextRange range2, int startingLine1, int startingLine2) {
diff --git a/platform/util/src/com/intellij/openapi/diff/impl/highlighting/FragmentSide.java b/platform/util/src/com/intellij/openapi/diff/impl/highlighting/FragmentSide.java
index 8119a53df8ef..2a9a4fed5d2a 100644
--- a/platform/util/src/com/intellij/openapi/diff/impl/highlighting/FragmentSide.java
+++ b/platform/util/src/com/intellij/openapi/diff/impl/highlighting/FragmentSide.java
@@ -17,84 +17,94 @@ package com.intellij.openapi.diff.impl.highlighting;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.ex.DiffFragment;
+import org.jetbrains.annotations.NotNull;
 
-import java.security.InvalidParameterException;
+public enum FragmentSide {
+
+  SIDE1(0, 0) {
+    @Override
+    public String getText(DiffFragment fragment) {
+      return fragment.getText1();
+    }
+
+    @Override
+    protected DiffFragment createDiffFragment(String text, String otherText) {
+      return new DiffFragment(text, otherText);
+    }
+
+    @Override
+    public FragmentSide otherSide() {
+      return SIDE2;
+    }
+  },
+
+  SIDE2(1, 2) {
+    @Override
+    public String getText(DiffFragment fragment) {
+      return fragment.getText2();
+    }
+
+    @Override
+    protected DiffFragment createDiffFragment(String text, String otherText) {
+      return new DiffFragment(otherText, text);
+    }
+
+    @Override
+    public FragmentSide otherSide() {
+      return SIDE1;
+    }
+  };
+
+  private static final Logger LOG = Logger.getInstance(FragmentSide.class);
+
+  private final int myIndex;
+  private final int myMergeIndex;
+
+  FragmentSide(int index, int mergeIndex) {
+    myIndex = index;
+    myMergeIndex = mergeIndex;
+  }
+
+  public DiffFragment createFragment(String text, String otherText, boolean modified) {
+    DiffFragment fragment = createDiffFragment(text, otherText);
+    if (!fragment.isOneSide()) fragment.setModified(modified);
+    return fragment;
+  }
 
-public abstract class FragmentSide {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.highlighting.FragmentSide");
   public abstract String getText(DiffFragment fragment);
-  public abstract DiffFragment createFragment(String text, String otherText, boolean modified);
   public abstract FragmentSide otherSide();
-  public abstract int getIndex();
-  public abstract int getMergeIndex();
+  protected abstract DiffFragment createDiffFragment(String text, String otherText);
+
+  public int getIndex() {
+    return myIndex;
+  }
+
+  public int getMergeIndex() {
+    return myMergeIndex;
+  }
 
   public String getOtherText(DiffFragment fragment) {
     return otherSide().getText(fragment);
   }
 
-  public InvalidParameterException invalidException() {
-    return new InvalidParameterException(String.valueOf(this));
+  public IllegalArgumentException invalidException() {
+    return new IllegalArgumentException(String.valueOf(this));
   }
 
-  public static final FragmentSide SIDE1 = new FragmentSide() {
-    public String getText(DiffFragment fragment) {
-      return fragment.getText1();
-    }
-
-    public DiffFragment createFragment(String text, String otherText, boolean modified) {
-      DiffFragment fragment = new DiffFragment(text, otherText);
-      if (!fragment.isOneSide()) fragment.setModified(modified);
-      return fragment;
-    }
-
-    public FragmentSide otherSide() {
-      return SIDE2;
-    }
-
-    public int getIndex() {
-      return 0;
-    }
-
-    public int getMergeIndex() {
-      return 0;
-    }
-  };
-
-  public static final FragmentSide SIDE2 = new FragmentSide() {
-    public String getText(DiffFragment fragment) {
-      return fragment.getText2();
-    }
-
-    public DiffFragment createFragment(String text, String otherText, boolean modified) {
-      DiffFragment fragment = new DiffFragment(otherText, text);
-      if (!fragment.isOneSide()) fragment.setModified(modified);
-      return fragment;
-    }
-
-    public FragmentSide otherSide() {
-      return SIDE1;
-    }
-
-    public int getIndex() {
-      return 1;
-    }
-
-    public int getMergeIndex() {
-      return 2;
-    }
-  };
-
   public static FragmentSide chooseSide(DiffFragment oneSide) {
     LOG.assertTrue(oneSide.isOneSide());
     LOG.assertTrue(oneSide.getText1() != oneSide.getText2());
     return oneSide.getText1() == null ? SIDE2 : SIDE1;
   }
 
+  @NotNull
   public static FragmentSide fromIndex(int index) {
-    switch (index) {
-      case 0: return SIDE1;
-      case 1: return SIDE2;
-      default: throw new InvalidParameterException(String.valueOf(index));
+    for (FragmentSide side : FragmentSide.values()) {
+      if (side.getIndex() == index) {
+        return side;
+      }
     }
+    throw new IllegalArgumentException(String.valueOf(index));
   }
+
 }

From 714fd989fb8f23bc769e1ac6771406538dc50330 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 28 May 2012 16:08:47 +0400
Subject: [PATCH 008/239] [merge] refactoring: move inner classes outside, move
 some methods, cleanup, code style

* Move Change.HighlighterHolder and Change.Side inner classes to outside since they are used a lot from the ouside of the Change class.
* Move ChangeType.apply() to Change, because it is nothing to do with the ChangeType: it is the Change which is being applied.
* Add some javadocs.
* Cleanup.
---
 .../diff/impl/incrementalMerge/Change.java    | 173 +++++-------------
 .../ChangeHighlighterHolder.java              | 140 ++++++++++++++
 .../impl/incrementalMerge/ChangeSide.java     |  52 ++++++
 .../impl/incrementalMerge/ChangeType.java     |  75 ++------
 .../impl/incrementalMerge/ConflictChange.java |   8 +-
 .../impl/incrementalMerge/MergeConflict.java  |   6 +-
 .../impl/incrementalMerge/SimpleChange.java   |  12 +-
 7 files changed, 261 insertions(+), 205 deletions(-)
 create mode 100644 platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeHighlighterHolder.java
 create mode 100644 platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeSide.java

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/Change.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/Change.java
index 553b31a4e6f2..30dab2e70de0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/Change.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/Change.java
@@ -15,45 +15,70 @@
  */
 package com.intellij.openapi.diff.impl.incrementalMerge;
 
-import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.DiffBundle;
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
-import com.intellij.openapi.diff.impl.util.GutterActionRenderer;
-import com.intellij.openapi.diff.impl.util.TextDiffType;
+import com.intellij.openapi.diff.impl.util.DocumentUtil;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.RangeMarker;
-import com.intellij.openapi.editor.markup.HighlighterTargetArea;
-import com.intellij.openapi.editor.markup.MarkupModel;
-import com.intellij.openapi.editor.markup.RangeHighlighter;
-import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.ReadonlyStatusHandler;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
 import java.util.Comparator;
 
+/**
+ * Represents a change in diff or merge view.
+ * A change has two {@link com.intellij.openapi.diff.impl.incrementalMerge.Change.SimpleChangeSide sides} (left and right), each of them representing the text which has been changed and the original text
+ * shown in the diff/merge.
+ * Change can be applied, then its sides would be equal.
+ */
 public abstract class Change {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.Change");
 
+  public abstract ChangeSide getChangeSide(FragmentSide side);
+
+  public abstract ChangeType getType();
+
+  public abstract ChangeList getChangeList();
+
+  protected abstract void removeFromList();
+
+  public abstract void onRemovedFromList();
+
+  public abstract boolean isValid();
+
   private void apply(@NotNull FragmentSide original) {
     FragmentSide targetSide = original.otherSide();
     RangeMarker originalRangeMarker = getRangeMarker(original);
     RangeMarker rangeMarker = getRangeMarker(targetSide);
 
     if (originalRangeMarker != null && rangeMarker != null) {
-      ChangeType.apply(getProject(), originalRangeMarker, rangeMarker);
+      apply(getProject(), originalRangeMarker, rangeMarker);
       if (isValid()) {
         removeFromList();
       }
     }
   }
 
-  protected abstract void removeFromList();
+  private static void apply(@NotNull Project project, @NotNull RangeMarker original, @NotNull RangeMarker target) {
+    Document document = target.getDocument();
+    if (!ReadonlyStatusHandler.ensureDocumentWritable(project, document)) return;
+    if (DocumentUtil.isEmpty(original)) {
+      int offset = target.getStartOffset();
+      document.deleteString(offset, target.getEndOffset());
+    }
+    String text = DocumentUtil.getText(original);
+    int startOffset = target.getStartOffset();
+    if (DocumentUtil.isEmpty(target)) {
+      document.insertString(startOffset, text);
+    } else {
+      document.replaceString(startOffset, target.getEndOffset(), text);
+    }
+  }
 
   public void addMarkup(Editor[] editors) {
     LOG.assertTrue(editors.length == 2);
@@ -71,26 +96,16 @@ public abstract class Change {
 
   private Project getProject() { return getChangeList().getProject(); }
 
-  public abstract ChangeType.ChangeSide getChangeSide(FragmentSide side);
-
-  public abstract ChangeType getType();
-
-  public abstract ChangeList getChangeList();
-
-  private HighlighterHolder getHighlighterHolder(FragmentSide side) {
+  private ChangeHighlighterHolder getHighlighterHolder(FragmentSide side) {
     return getChangeSide(side).getHighlighterHolder();
   }
 
   private RangeMarker getRangeMarker(FragmentSide side) {
-    ChangeType.ChangeSide changeSide = getChangeSide(side);
+    ChangeSide changeSide = getChangeSide(side);
     LOG.assertTrue(changeSide != null);
     return changeSide.getRange();
   }
 
-  public abstract void onRemovedFromList();
-
-  public abstract boolean isValid();
-
   public static void apply(final Change change, final FragmentSide fromSide) {
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       public void run() {
@@ -134,116 +149,12 @@ public abstract class Change {
     }
   }
 
-  protected static class HighlighterHolder implements ChangeType.MarkupHolder {
-    private Editor myEditor;
-    private final ArrayList<RangeHighlighter> myHighlighters = new ArrayList<RangeHighlighter>(3);
-    private RangeHighlighter myMainHighlighter = null;
-    private AnAction[] myActions;
-    private RangeHighlighter[] myActionHighlighters = RangeHighlighter.EMPTY_ARRAY;
-
-    public void highlight(ChangeType.ChangeSide changeSide, Editor editor, ChangeType type) {
-      LOG.assertTrue(myEditor == null || editor == myEditor);
-      removeHighlighters();
-      myEditor = editor;
-      setHighlighter(changeSide, type);
-    }
-
-    private MarkupModel getMarkupModel() {
-      return myEditor.getMarkupModel();
-    }
-
-    private void highlighterCreated(RangeHighlighter highlighter, TextAttributes attrs) {
-      if (attrs != null) {
-        highlighter.setErrorStripeMarkColor(attrs.getErrorStripeColor());
-      }
-      myHighlighters.add(highlighter);
-    }
-
-    @Nullable
-    public RangeHighlighter addLineHighlighter(int line, int layer, TextDiffType diffType) {
-      if (myEditor.getDocument().getTextLength() == 0) return null;
-      RangeHighlighter highlighter = getMarkupModel().addLineHighlighter(line, layer, null);
-      highlighter.setLineSeparatorColor(diffType.getTextBackground(myEditor));
-      highlighterCreated(highlighter, diffType.getTextAttributes(myEditor));
-      return highlighter;
-    }
-
-    @Nullable
-    public RangeHighlighter addRangeHighlighter(int start, int end, int layer, TextDiffType type, HighlighterTargetArea targetArea) {
-      if (getMarkupModel().getDocument().getTextLength() == 0) return null;
-      TextAttributes attributes = type.getTextAttributes(myEditor);
-      RangeHighlighter highlighter = getMarkupModel().addRangeHighlighter(start, end, layer, attributes, targetArea);
-      highlighterCreated(highlighter, attributes);
-      return highlighter;
-    }
-
-    private void setHighlighter(ChangeType.ChangeSide changeSide, ChangeType type) {
-      myMainHighlighter = type.addMarker(changeSide, this);
-      updateAction();
-    }
-
-    public Editor getEditor() {
-      return myEditor;
-    }
-
-    public void removeHighlighters() {
-      if (myEditor == null) {
-        LOG.assertTrue(myHighlighters.isEmpty());
-        LOG.assertTrue(myMainHighlighter == null);
-        return;
-      }
-      for (RangeHighlighter highlighter : myHighlighters) {
-        highlighter.dispose();
-      }
-      myHighlighters.clear();
-      removeActionHighlighters();
-      myMainHighlighter = null;
-    }
-
-    private void removeActionHighlighters() {
-      for (RangeHighlighter actionHighlighter : myActionHighlighters) {
-        actionHighlighter.dispose();
-      }
-      myActionHighlighters = RangeHighlighter.EMPTY_ARRAY;
-    }
-
-    public void setActions(AnAction[] action) {
-      myActions = action;
-      updateAction();
-    }
-
-    private void updateAction() {
-      removeActionHighlighters();
-      if (myMainHighlighter != null && myActions != null && myActions.length > 0) {
-        myActionHighlighters = new RangeHighlighter[myActions.length];
-        for (int i = 0; i < myActionHighlighters.length; i++) {
-          RangeHighlighter highlighter = cloneMainHighlighter(myMainHighlighter);
-          highlighter.setGutterIconRenderer(new GutterActionRenderer(myActions[i]));
-          myActionHighlighters[i] = highlighter;
-        }
-      }
-    }
-
-    private RangeHighlighter cloneMainHighlighter(@NotNull RangeHighlighter mainHighlighter) {
-      RangeHighlighter highlighter = myEditor.getMarkupModel().addRangeHighlighter(mainHighlighter.getStartOffset(), mainHighlighter.getEndOffset(), mainHighlighter.getLayer(),
-                                                                                   null, mainHighlighter.getTargetArea());
-      // TODO[dyoma] copy greedyToLeft and greedyToRight
-      return highlighter;
-    }
-
-    public void updateHighlighter(ChangeType.ChangeSide changeSide, ChangeType type) {
-      LOG.assertTrue(myEditor != null);
-      removeHighlighters();
-      setHighlighter(changeSide, type);
-    }
-  }
-
-  protected static class Side extends ChangeType.ChangeSide {
+  protected static class SimpleChangeSide extends ChangeSide {
     private final FragmentSide mySide;
     private final DiffRangeMarker myRange;
-    private final HighlighterHolder myHighlighterHolder = new HighlighterHolder();
+    private final ChangeHighlighterHolder myHighlighterHolder = new ChangeHighlighterHolder();
 
-    public Side(FragmentSide side, DiffRangeMarker rangeMarker) {
+    public SimpleChangeSide(FragmentSide side, DiffRangeMarker rangeMarker) {
       mySide = side;
       myRange = rangeMarker;
     }
@@ -256,7 +167,7 @@ public abstract class Change {
       return myRange;
     }
 
-    public HighlighterHolder getHighlighterHolder() {
+    public ChangeHighlighterHolder getHighlighterHolder() {
       return myHighlighterHolder;
     }
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeHighlighterHolder.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeHighlighterHolder.java
new file mode 100644
index 000000000000..137aac7cc6d6
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeHighlighterHolder.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.diff.impl.incrementalMerge;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.diff.impl.util.GutterActionRenderer;
+import com.intellij.openapi.diff.impl.util.TextDiffType;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.markup.HighlighterTargetArea;
+import com.intellij.openapi.editor.markup.MarkupModel;
+import com.intellij.openapi.editor.markup.RangeHighlighter;
+import com.intellij.openapi.editor.markup.TextAttributes;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+
+/**
+ * Incorporates highlighting stuff of a Change.
+ *
+ * @author Kirill Likhodedov
+ */
+class ChangeHighlighterHolder {
+
+  private static final Logger LOG = Logger.getInstance(ChangeHighlighterHolder.class);
+
+  private Editor myEditor;
+  private final ArrayList<RangeHighlighter> myHighlighters = new ArrayList<RangeHighlighter>(3);
+  private RangeHighlighter myMainHighlighter = null;
+  private AnAction[] myActions;
+  private RangeHighlighter[] myActionHighlighters = RangeHighlighter.EMPTY_ARRAY;
+
+  public void highlight(ChangeSide changeSide, Editor editor, ChangeType type) {
+    LOG.assertTrue(myEditor == null || editor == myEditor);
+    removeHighlighters();
+    myEditor = editor;
+    setHighlighter(changeSide, type);
+  }
+
+  private MarkupModel getMarkupModel() {
+    return myEditor.getMarkupModel();
+  }
+
+  private void highlighterCreated(RangeHighlighter highlighter, TextAttributes attrs) {
+    if (attrs != null) {
+      highlighter.setErrorStripeMarkColor(attrs.getErrorStripeColor());
+    }
+    myHighlighters.add(highlighter);
+  }
+
+  @Nullable
+  public RangeHighlighter addLineHighlighter(int line, int layer, TextDiffType diffType) {
+    if (myEditor.getDocument().getTextLength() == 0) return null;
+    RangeHighlighter highlighter = getMarkupModel().addLineHighlighter(line, layer, null);
+    highlighter.setLineSeparatorColor(diffType.getTextBackground(myEditor));
+    highlighterCreated(highlighter, diffType.getTextAttributes(myEditor));
+    return highlighter;
+  }
+
+  @Nullable
+  public RangeHighlighter addRangeHighlighter(int start, int end, int layer, TextDiffType type, HighlighterTargetArea targetArea) {
+    if (getMarkupModel().getDocument().getTextLength() == 0) return null;
+    TextAttributes attributes = type.getTextAttributes(myEditor);
+    RangeHighlighter highlighter = getMarkupModel().addRangeHighlighter(start, end, layer, attributes, targetArea);
+    highlighterCreated(highlighter, attributes);
+    return highlighter;
+  }
+
+  private void setHighlighter(ChangeSide changeSide, ChangeType type) {
+    myMainHighlighter = type.addMarker(changeSide, this);
+    updateAction();
+  }
+
+  public Editor getEditor() {
+    return myEditor;
+  }
+
+  public void removeHighlighters() {
+    if (myEditor == null) {
+      LOG.assertTrue(myHighlighters.isEmpty());
+      LOG.assertTrue(myMainHighlighter == null);
+      return;
+    }
+    for (RangeHighlighter highlighter : myHighlighters) {
+      highlighter.dispose();
+    }
+    myHighlighters.clear();
+    removeActionHighlighters();
+    myMainHighlighter = null;
+  }
+
+  private void removeActionHighlighters() {
+    for (RangeHighlighter actionHighlighter : myActionHighlighters) {
+      actionHighlighter.dispose();
+    }
+    myActionHighlighters = RangeHighlighter.EMPTY_ARRAY;
+  }
+
+  public void setActions(AnAction[] action) {
+    myActions = action;
+    updateAction();
+  }
+
+  private void updateAction() {
+    removeActionHighlighters();
+    if (myMainHighlighter != null && myActions != null && myActions.length > 0) {
+      myActionHighlighters = new RangeHighlighter[myActions.length];
+      for (int i = 0; i < myActionHighlighters.length; i++) {
+        RangeHighlighter highlighter = cloneMainHighlighter(myMainHighlighter);
+        highlighter.setGutterIconRenderer(new GutterActionRenderer(myActions[i]));
+        myActionHighlighters[i] = highlighter;
+      }
+    }
+  }
+
+  private RangeHighlighter cloneMainHighlighter(@NotNull RangeHighlighter mainHighlighter) {
+    return myEditor.getMarkupModel().addRangeHighlighter(mainHighlighter.getStartOffset(), mainHighlighter.getEndOffset(), mainHighlighter.getLayer(),
+                                                                                 null, mainHighlighter.getTargetArea());
+  }
+
+  public void updateHighlighter(ChangeSide changeSide, ChangeType type) {
+    LOG.assertTrue(myEditor != null);
+    removeHighlighters();
+    setHighlighter(changeSide, type);
+  }
+}
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeSide.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeSide.java
new file mode 100644
index 000000000000..cc2942aeadbb
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeSide.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.diff.impl.incrementalMerge;
+
+import com.intellij.openapi.diff.impl.util.DocumentUtil;
+
+/**
+* @author Kirill Likhodedov
+*/
+public abstract class ChangeSide {
+
+  public int getStart() {
+    return getRange().getStartOffset();
+  }
+
+  public int getStartLine() {
+    return DocumentUtil.getStartLine(getRange());
+  }
+
+  public String getText() {
+    return DocumentUtil.getText(getRange());
+  }
+
+  public int getEndLine() {
+    return DocumentUtil.getEndLine(getRange());
+  }
+
+  public abstract DiffRangeMarker getRange();
+
+  public abstract ChangeHighlighterHolder getHighlighterHolder();
+
+  public boolean contains(int offset) {
+    return getStart() <= offset && offset < getEnd();
+  }
+
+  public int getEnd() {
+    return getRange().getEndOffset();
+  }
+}
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
index fceefcf3cdf3..38382b003050 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
@@ -34,6 +34,7 @@ import org.jetbrains.annotations.Nullable;
 import java.awt.*;
 
 public class ChangeType {
+
   private static final int LAYER = HighlighterLayer.SELECTION - 1;
   private static final ChangeType INSERT = new ChangeType(TextDiffType.INSERT);
   private static final ChangeType DELETED = new ChangeType(TextDiffType.DELETED);
@@ -46,7 +47,7 @@ public class ChangeType {
     myDiffType = diffType;
   }
 
-  public RangeHighlighter addMarker(ChangeSide changeSide, MarkupHolder markup) {
+  public RangeHighlighter addMarker(ChangeSide changeSide, ChangeHighlighterHolder markup) {
     String text = changeSide.getText();
     if (text != null && text.length() > 0) return addBlock(text, changeSide, markup, myDiffType);
     else return addLine(markup, changeSide.getStartLine(), myDiffType, SeparatorPlacement.TOP);
@@ -58,16 +59,17 @@ public class ChangeType {
 
   public TextDiffType getTextDiffType() { return getTypeKey(); }
 
-  private static RangeHighlighter addBlock(String text, ChangeSide changeSide, MarkupHolder markup, TextDiffType diffType) {
+  private static RangeHighlighter addBlock(String text, ChangeSide changeSide, ChangeHighlighterHolder markup, TextDiffType diffType) {
     int length = text.length();
     int start = changeSide.getStart();
     int end = start + length;
-    RangeHighlighter highlighter = markup.addRangeHighlighter(
-      start, end, ChangeType.LAYER, diffType, HighlighterTargetArea.EXACT_RANGE);
+    RangeHighlighter highlighter = markup.addRangeHighlighter(start, end, ChangeType.LAYER, diffType, HighlighterTargetArea.EXACT_RANGE);
     highlighter.setLineSeparatorPlacement(SeparatorPlacement.TOP);
     highlighter.setLineMarkerRenderer(LineRenderer.top());
     highlighter.setLineSeparatorColor(Color.GRAY);
-    if (text.charAt(length - 1) == '\n') end--;
+    if (text.charAt(length - 1) == '\n') {
+      end--;
+    }
     highlighter = markup.addRangeHighlighter(start, end, LAYER, TextDiffType.NONE, HighlighterTargetArea.EXACT_RANGE);
     highlighter.setLineSeparatorPlacement(SeparatorPlacement.BOTTOM);
     highlighter.setLineSeparatorColor(Color.GRAY);
@@ -75,79 +77,30 @@ public class ChangeType {
     return highlighter;
   }
 
-  private static RangeHighlighter addLine(MarkupHolder markup, int line, TextDiffType type, SeparatorPlacement placement) {
+  @Nullable
+  private static RangeHighlighter addLine(ChangeHighlighterHolder markup, int line, TextDiffType type, SeparatorPlacement placement) {
     RangeHighlighter highlighter = markup.addLineHighlighter(line, LAYER, type);
-    if (highlighter == null) return null;
+    if (highlighter == null) {
+      return null;
+    }
     highlighter.setLineSeparatorPlacement(placement);
     return highlighter;
   }
 
-  public static ChangeType fromDiffFragment(DiffFragment fragment) {
+  static ChangeType fromDiffFragment(DiffFragment fragment) {
     if (fragment.getText1() == null) return INSERT;
     if (fragment.getText2() == null) return DELETED;
     return CHANGE;
   }
 
-  public static ChangeType fromRanges(@NotNull TextRange left, @NotNull TextRange right) {
+  static ChangeType fromRanges(@NotNull TextRange left, @NotNull TextRange right) {
     if (left.getLength() == 0) return INSERT;
     if (right.getLength() == 0) return DELETED;
     return CHANGE;
   }
 
-  public static void apply(@NotNull Project project, @NotNull RangeMarker original, @NotNull RangeMarker target) {
-    Document document = target.getDocument();
-    if (!ReadonlyStatusHandler.ensureDocumentWritable(project, document)) return;
-    if (DocumentUtil.isEmpty(original)) {
-      int offset = target.getStartOffset();
-      document.deleteString(offset, target.getEndOffset());
-    }
-    String text = DocumentUtil.getText(original);
-    int startOffset = target.getStartOffset();
-    if (DocumentUtil.isEmpty(target)) {
-      document.insertString(startOffset, text);
-    } else {
-      document.replaceString(startOffset, target.getEndOffset(), text);
-    }
-  }
-
   public String toString() {
     return myDiffType.getDisplayName();
   }
 
-  public interface MarkupHolder {
-    @Nullable
-    RangeHighlighter addLineHighlighter(int line, int layer, TextDiffType diffType);
-    @Nullable
-    RangeHighlighter addRangeHighlighter(int start, int end, int layer, TextDiffType type, HighlighterTargetArea targetArea);
-  }
-
-  public static abstract class ChangeSide {
-    public int getStart() {
-      return getRange().getStartOffset();
-    }
-
-    public int getStartLine() {
-      return DocumentUtil.getStartLine(getRange());
-    }
-
-    public String getText() {
-      return DocumentUtil.getText(getRange());
-    }
-
-    public int getEndLine() {
-      return DocumentUtil.getEndLine(getRange());
-    }
-
-    public abstract DiffRangeMarker getRange();
-
-    public abstract Change.HighlighterHolder getHighlighterHolder();
-
-    public boolean contains(int offset) {
-      return getStart() <= offset && offset < getEnd();
-    }
-
-    public int getEnd() {
-      return getRange().getEndOffset();
-    }
-  }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
index 6b6b5ead435f..c6820c91dfbe 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
@@ -25,12 +25,12 @@ import com.intellij.openapi.util.TextRange;
  */
 class ConflictChange extends Change implements DiffRangeMarker.RangeInvalidListener {
 
-  private Side myOriginalSide;
+  private SimpleChangeSide myOriginalSide;
   private MergeConflict myConflict;
 
   public ConflictChange(MergeConflict conflict, FragmentSide mergeSide, TextRange range) {
     myConflict = conflict;
-    myOriginalSide = new Side(mergeSide, new DiffRangeMarker((DocumentEx)conflict.getOriginalDocument(mergeSide), range, this));
+    myOriginalSide = new SimpleChangeSide(mergeSide, new DiffRangeMarker((DocumentEx)conflict.getOriginalDocument(mergeSide), range, this));
   }
 
   protected void removeFromList() {
@@ -38,7 +38,7 @@ class ConflictChange extends Change implements DiffRangeMarker.RangeInvalidListe
     myConflict = null;
   }
 
-  public ChangeType.ChangeSide getChangeSide(FragmentSide side) {
+  public ChangeSide getChangeSide(FragmentSide side) {
     return isBranch(side) ? myOriginalSide : myConflict;
   }
 
@@ -46,7 +46,7 @@ class ConflictChange extends Change implements DiffRangeMarker.RangeInvalidListe
     return MergeList.BRANCH_SIDE == side;
   }
 
-  public Change.Side getOriginalSide() {
+  public SimpleChangeSide getOriginalSide() {
     return myOriginalSide;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
index be4062058467..ca18b0183b18 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
@@ -24,13 +24,13 @@ import org.jetbrains.annotations.NotNull;
 /**
  * Represents a merge conflict, i.e. two {@link ConflictChange conflicting changes}, one from left, another from right.
  */
-class MergeConflict extends ChangeType.ChangeSide implements DiffRangeMarker.RangeInvalidListener {
+class MergeConflict extends ChangeSide implements DiffRangeMarker.RangeInvalidListener {
 
   @NotNull private final MergeList myMergeList;
   @NotNull private final DiffRangeMarker myCommonRange;
   @NotNull private final ConflictChange myLeftChange;
   @NotNull private final ConflictChange myRightChange;
-  @NotNull private final Change.HighlighterHolder myCommonHighlighterHolder = new Change.HighlighterHolder();
+  @NotNull private final ChangeHighlighterHolder myCommonHighlighterHolder = new ChangeHighlighterHolder();
 
   MergeConflict(TextRange commonRange, MergeList mergeList, TextRange leftMarker, TextRange rightMarker) {
     myCommonRange = new DiffRangeMarker((DocumentEx)mergeList.getBaseDocument(),commonRange, this);
@@ -39,7 +39,7 @@ class MergeConflict extends ChangeType.ChangeSide implements DiffRangeMarker.Ran
     myRightChange = new ConflictChange(this, FragmentSide.SIDE2, rightMarker);
   }
 
-  public Change.HighlighterHolder getHighlighterHolder() {
+  public ChangeHighlighterHolder getHighlighterHolder() {
     return myCommonHighlighterHolder;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/SimpleChange.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/SimpleChange.java
index 7aeea7b63ecc..e0736c3bb373 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/SimpleChange.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/SimpleChange.java
@@ -24,25 +24,25 @@ import org.jetbrains.annotations.NotNull;
 class SimpleChange extends Change implements DiffRangeMarker.RangeInvalidListener{
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.Change");
   private final ChangeType myType;
-  private final Side[] mySides;
+  private final SimpleChangeSide[] mySides;
   private final ChangeList myChangeList;
 
   public SimpleChange(ChangeType type, @NotNull TextRange range1, @NotNull TextRange range2, ChangeList changeList) {
-    mySides = new Side[]{createSide(changeList, range1, FragmentSide.SIDE1),
+    mySides = new SimpleChangeSide[]{createSide(changeList, range1, FragmentSide.SIDE1),
                          createSide(changeList, range2, FragmentSide.SIDE2)};
     myType = type;
     myChangeList = changeList;
   }
 
-  private Change.Side createSide(ChangeList changeList, TextRange range1, FragmentSide side) {
-    return new Change.Side(side, new DiffRangeMarker((DocumentEx)changeList.getDocument(side), range1, this));
+  private SimpleChangeSide createSide(ChangeList changeList, TextRange range1, FragmentSide side) {
+    return new SimpleChangeSide(side, new DiffRangeMarker((DocumentEx)changeList.getDocument(side), range1, this));
   }
 
   protected void removeFromList() {
     myChangeList.remove(this);
   }
 
-  public ChangeType.ChangeSide getChangeSide(FragmentSide side) {
+  public ChangeSide getChangeSide(FragmentSide side) {
     return mySides[side.getIndex()];
   }
 
@@ -56,7 +56,7 @@ class SimpleChange extends Change implements DiffRangeMarker.RangeInvalidListene
 
   public void onRemovedFromList() {
     for (int i = 0; i < mySides.length; i++) {
-      Change.Side side = mySides[i];
+      SimpleChangeSide side = mySides[i];
       side.getRange().removeListener(this);
       side.getHighlighterHolder().removeHighlighters();
       mySides[i] = null;

From 44c2615aabd4681ca35f6ec3fea70f2fb9918aae Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 31 May 2012 14:29:30 +0400
Subject: [PATCH 009/239] IDEA-85034 Git: "Contained i branches" shows always
 the "Loading status"

---
 plugins/git4idea/src/git4idea/GitBranch.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/git4idea/src/git4idea/GitBranch.java b/plugins/git4idea/src/git4idea/GitBranch.java
index 074835767cf5..c17cbb76a972 100644
--- a/plugins/git4idea/src/git4idea/GitBranch.java
+++ b/plugins/git4idea/src/git4idea/GitBranch.java
@@ -253,6 +253,7 @@ public class GitBranch extends GitReference {
         final String prefix = "ref: refs/heads/";
         return head.startsWith(prefix) ? new GitBranch(head.substring(prefix.length()), true, false) : null;
       } catch (IOException e) {
+        LOG.info(e);
         return null;
       }
     }

From f88257bbffaddd3a79c03690022dea4c787fcab8 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 31 May 2012 14:44:40 +0400
Subject: [PATCH 010/239] additionally for e159740,

---
 .../src/org/jetbrains/idea/svn/history/FirstInBranch.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java
index 4e03b8a87246..81c410f2c0fd 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/FirstInBranch.java
@@ -80,9 +80,11 @@ public class FirstInBranch implements Runnable {
         final SVNLogClient logClient = ApplicationManager.getApplication().runReadAction(new Computable<SVNLogClient>() {
           @Override
           public SVNLogClient compute() {
+            if (myVcs.getProject().isDisposed()) return null;
             return myVcs.createLogClient();
           }
         });
+        if (logClient == null) return;
         final long start1 = getStart(logClient, branchURL);
         if (start1 > 0) {
           final SVNRevision start1Rev = SVNRevision.create(start1);

From 7585d622a9a60ba5f3fe7811949be21b73bd2a29 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 31 May 2012 15:14:15 +0400
Subject: [PATCH 011/239] IDEA-86767 Compare two text files shows no
 differences, while files are different (files were too big, and comparison
 was interrupted, but the messages was not shown)

---
 .../src/com/intellij/openapi/diff/impl/DiffPanelImpl.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
index bd943bce6e3f..6c32190fcc02 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffPanelImpl.java
@@ -363,7 +363,7 @@ public class DiffPanelImpl implements DiffPanelEx, ContentChangeListener, TwoSid
   }
 
   public boolean hasDifferences() {
-    return getLineBlocks().getCount() > 0;
+    return getLineBlocks().getCount() > 0 || myNotCalculateDiffPanel != null;
   }
 
   public JComponent getPreferredFocusedComponent() {

From 64c27b654de455de81aad18a283b4754195247ac Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Thu, 31 May 2012 14:00:06 +0400
Subject: [PATCH 012/239] name suggestion fields in groovy introduce
 refactorings

---
 .../constant/GrIntroduceConstantDialog.form   |  2 +-
 .../constant/GrIntroduceConstantDialog.java   | 22 +++++++----------
 .../field/GrIntroduceFieldDialog.form         |  2 +-
 .../field/GrIntroduceFieldDialog.java         | 24 +++++++------------
 .../parameter/GrIntroduceParameterDialog.java | 17 ++++++-------
 .../GroovyIntroduceVariableDialog.java        | 19 ++++++---------
 6 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.form
index 349da4cb4b9f..48411b87b314 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.form
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.form
@@ -41,7 +41,7 @@
               <text value="&amp;Name:"/>
             </properties>
           </component>
-          <component id="a27e1" class="com.intellij.ui.TextFieldWithAutoCompletion" binding="myNameField" custom-create="true">
+          <component id="a27e1" class="com.intellij.refactoring.ui.NameSuggestionsField" binding="myNameField" custom-create="true">
             <constraints>
               <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
index 7e9522c94ada..ac6dc350b332 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/constant/GrIntroduceConstantDialog.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
-import com.intellij.openapi.editor.event.DocumentListener;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
@@ -36,11 +35,12 @@ import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.introduceField.IntroduceConstantHandler;
 import com.intellij.refactoring.ui.JavaVisibilityPanel;
+import com.intellij.refactoring.ui.NameSuggestionsField;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
 import com.intellij.refactoring.util.RefactoringMessageUtil;
 import com.intellij.ui.RecentsManager;
 import com.intellij.ui.ReferenceEditorComboWithBrowseButton;
-import com.intellij.ui.TextFieldWithAutoCompletion;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
@@ -85,7 +85,7 @@ public class GrIntroduceConstantDialog extends DialogWrapper
   private JPanel myPanel;
   private GrTypeComboBox myTypeCombo;
   private ReferenceEditorComboWithBrowseButton myTargetClassEditor;
-  private TextFieldWithAutoCompletion<String> myNameField;
+  private NameSuggestionsField myNameField;
   private JavaVisibilityPanel myJavaVisibilityPanel;
   private JPanel myTargetClassPanel;
   private JLabel myTargetClassLabel;
@@ -193,11 +193,9 @@ public class GrIntroduceConstantDialog extends DialogWrapper
       }
     }, KeyStroke.getKeyStroke(KeyEvent.VK_N, InputEvent.ALT_MASK), JComponent.WHEN_IN_FOCUSED_WINDOW);
 
-    myNameField.addDocumentListener(new DocumentListener() {
-      public void beforeDocumentChange(DocumentEvent event) {
-      }
-
-      public void documentChanged(DocumentEvent event) {
+    myNameField.addDataChangedListener(new NameSuggestionsField.DataChanged() {
+      @Override
+      public void dataChanged() {
         updateOkStatus();
       }
     });
@@ -227,7 +225,7 @@ public class GrIntroduceConstantDialog extends DialogWrapper
   @Nullable
   @Override
   public String getName() {
-    return myNameField.getText().trim();
+    return myNameField.getEnteredName();
   }
 
   @Override
@@ -260,11 +258,7 @@ public class GrIntroduceConstantDialog extends DialogWrapper
     String[] possibleNames = GroovyNameSuggestionUtil.suggestVariableNames(myContext.getExpression(), new GroovyVariableValidator(myContext), true);
     ContainerUtil.addAll(names, possibleNames);
 
-    myNameField = TextFieldWithAutoCompletion.create(myContext.getProject(), names, null, true);
-    if (names.size()>0) {
-      myNameField.setText(names.get(0));
-      myNameField.selectAll();
-    }
+    myNameField = new NameSuggestionsField(ArrayUtil.toStringArray(names), myContext.getProject(), GroovyFileType.GROOVY_FILE_TYPE);
 
     GrTypeComboBox.registerUpDownHint(myNameField, myTypeCombo);
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.form
index f60e654bfc8c..cf7f8fabf7d1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.form
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.form
@@ -32,7 +32,7 @@
               <text value="&amp;Name:"/>
             </properties>
           </component>
-          <component id="e4b52" class="com.intellij.ui.TextFieldWithAutoCompletion" binding="myNameField" custom-create="true" default-binding="true">
+          <component id="e4b52" class="com.intellij.refactoring.ui.NameSuggestionsField" binding="myNameField" custom-create="true" default-binding="true">
             <constraints>
               <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.java
index 3af3e76a8305..108de3cd6a8c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrIntroduceFieldDialog.java
@@ -15,20 +15,20 @@
  */
 package org.jetbrains.plugins.groovy.refactoring.introduce.field;
 
-import com.intellij.openapi.editor.event.DocumentEvent;
-import com.intellij.openapi.editor.event.DocumentListener;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.ui.NameSuggestionsField;
 import com.intellij.refactoring.util.RadioUpDownListener;
-import com.intellij.ui.TextFieldWithAutoCompletion;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyRecursiveElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrConstructorInvocation;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
@@ -60,7 +60,7 @@ import static com.intellij.refactoring.introduceField.IntroduceFieldHandler.REFA
 
 public class GrIntroduceFieldDialog extends DialogWrapper implements GrIntroduceDialog<GrIntroduceFieldSettings>, GrIntroduceFieldSettings {
   private JPanel myContentPane;
-  private TextFieldWithAutoCompletion<String> myNameField;
+  private NameSuggestionsField myNameField;
   private JRadioButton myPrivateRadioButton;
   private JRadioButton myProtectedRadioButton;
   private JRadioButton myPublicRadioButton;
@@ -131,13 +131,9 @@ public class GrIntroduceFieldDialog extends DialogWrapper implements GrIntroduce
       myReplaceAllOccurrencesCheckBox.setVisible(false);
     }
 
-    myNameField.addDocumentListener(new DocumentListener() {
+    myNameField.addDataChangedListener(new NameSuggestionsField.DataChanged() {
       @Override
-      public void beforeDocumentChange(DocumentEvent event) {
-      }
-
-      @Override
-      public void documentChanged(DocumentEvent event) {
+      public void dataChanged() {
         validateOKAction();
       }
     });
@@ -265,11 +261,7 @@ public class GrIntroduceFieldDialog extends DialogWrapper implements GrIntroduce
       list.add(var.getName());
     }
     ContainerUtil.addAll(list, possibleNames);
-    myNameField = TextFieldWithAutoCompletion.create(myContext.getProject(), list, null, true);
-    if (list.size()>0) {
-      myNameField.setText(list.get(0));
-      myNameField.selectAll();
-    }
+    myNameField = new NameSuggestionsField(ArrayUtil.toStringArray(list), myContext.getProject(), GroovyFileType.GROOVY_FILE_TYPE);
 
     if (expression == null) {
       myTypeComboBox = GrTypeComboBox.createTypeComboBoxWithDefType(var.getDeclaredType()
@@ -319,7 +311,7 @@ public class GrIntroduceFieldDialog extends DialogWrapper implements GrIntroduce
   @Override
   @NotNull
   public String getName() {
-    return myNameField.getText().trim();
+    return myNameField.getEnteredName();
   }
 
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
index 4177581c4b8b..c5b6ed01158e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/GrIntroduceParameterDialog.java
@@ -32,9 +32,10 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.BaseRefactoringProcessor;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.RefactoringBundle;
+import com.intellij.refactoring.ui.NameSuggestionsField;
 import com.intellij.ui.IdeBorderFactory;
-import com.intellij.ui.TextFieldWithAutoCompletion;
 import com.intellij.ui.components.JBRadioButton;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.GridBag;
 import com.intellij.util.ui.UIUtil;
@@ -42,6 +43,7 @@ import gnu.trove.TIntArrayList;
 import gnu.trove.TObjectIntHashMap;
 import gnu.trove.TObjectIntProcedure;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrParametersOwner;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
@@ -77,7 +79,7 @@ import static com.intellij.refactoring.IntroduceParameterRefactoring.*;
 
 public class GrIntroduceParameterDialog extends DialogWrapper implements GrIntroduceDialog<GrIntroduceParameterSettings> {
   private GrTypeComboBox myTypeComboBox;
-  private TextFieldWithAutoCompletion<String> myNameSuggestionsField;
+  private NameSuggestionsField myNameSuggestionsField;
   private JCheckBox myDeclareFinalCheckBox;
   private JCheckBox myDelegateViaOverloadingMethodCheckBox;
   private JBRadioButton myDoNotReplaceRadioButton;
@@ -342,7 +344,7 @@ public class GrIntroduceParameterDialog extends DialogWrapper implements GrIntro
     return returnType;
   }
 
-  private TextFieldWithAutoCompletion<String> createNameField(GrVariable var, GrExpression expr) {
+  private NameSuggestionsField createNameField(GrVariable var, GrExpression expr) {
     String[] possibleNames;
     if (expr != null) {
       final GrIntroduceContext
@@ -366,12 +368,7 @@ public class GrIntroduceParameterDialog extends DialogWrapper implements GrIntro
     }
     ContainerUtil.addAll(names, possibleNames);
 
-    TextFieldWithAutoCompletion<String> result = TextFieldWithAutoCompletion.create(myProject, names, null, true);
-    if (names.size() > 0) {
-      result.setText(names.get(0));
-      result.selectAll();
-    }
-    return result;
+    return new NameSuggestionsField(ArrayUtil.toStringArray(names), myProject, GroovyFileType.GROOVY_FILE_TYPE);
   }
 
   private void initReplaceFieldsWithGetters(JavaRefactoringSettings settings) {
@@ -510,7 +507,7 @@ public class GrIntroduceParameterDialog extends DialogWrapper implements GrIntro
   }
 
   private String getEnteredName() {
-    return myNameSuggestionsField.getText().trim();
+    return myNameSuggestionsField.getEnteredName();
   }
 
   private void saveSettings() {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GroovyIntroduceVariableDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GroovyIntroduceVariableDialog.java
index aa47fcf00fb1..2052ff190b9a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GroovyIntroduceVariableDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GroovyIntroduceVariableDialog.java
@@ -22,10 +22,12 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.psi.PsiType;
 import com.intellij.refactoring.HelpID;
-import com.intellij.ui.TextFieldWithAutoCompletion;
+import com.intellij.refactoring.ui.NameSuggestionsField;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.ui.GridBag;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
 import org.jetbrains.plugins.groovy.refactoring.GroovyNameSuggestionUtil;
 import org.jetbrains.plugins.groovy.refactoring.GroovyNamesUtil;
@@ -48,7 +50,7 @@ public class GroovyIntroduceVariableDialog extends DialogWrapper implements GrIn
   private final int myOccurrencesCount;
   private final GrIntroduceVariableHandler.Validator myValidator;
 
-  private TextFieldWithAutoCompletion<String> myNameField;
+  private NameSuggestionsField myNameField;
   private JCheckBox myCbIsFinal;
   private JCheckBox myCbReplaceAllOccurrences;
   private GrTypeComboBox myTypeComboBox;
@@ -142,7 +144,7 @@ public class GroovyIntroduceVariableDialog extends DialogWrapper implements GrIn
 
   @Nullable
   protected String getEnteredName() {
-    return myNameField.getText().trim();
+    return myNameField.getEnteredName();
   }
 
   protected boolean isReplaceAllOccurrences() {
@@ -158,17 +160,10 @@ public class GroovyIntroduceVariableDialog extends DialogWrapper implements GrIn
     return myTypeComboBox.getSelectedType();
   }
 
-  private TextFieldWithAutoCompletion<String> setUpNameComboBox() {
+  private NameSuggestionsField setUpNameComboBox() {
     List<String> possibleNames = Arrays.asList(GroovyNameSuggestionUtil.suggestVariableNames(myExpression, myValidator));
 
-    TextFieldWithAutoCompletion<String> result = TextFieldWithAutoCompletion.create(myProject, possibleNames, null, true);
-
-    if (possibleNames.size() > 0) {
-      result.setText(possibleNames.get(0));
-      result.selectAll();
-    }
-
-    return result;
+    return new NameSuggestionsField(ArrayUtil.toStringArray(possibleNames), myProject, GroovyFileType.GROOVY_FILE_TYPE);
   }
 
   public JComponent getPreferredFocusedComponent() {

From aebfdd2f0dfcb3b6df668ce38db772b1ece001f8 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Thu, 31 May 2012 14:54:39 +0400
Subject: [PATCH 013/239] @TypeChecked

---
 .../plugins/groovy/lang/psi/impl/GroovyPsiManager.java          | 2 ++
 .../plugins/groovy/lang/psi/util/GroovyCommonClassNames.java    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java
index f14ad91f7f9c..a7339849bec0 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java
@@ -137,6 +137,8 @@ public class GroovyPsiManager {
     if (list != null) {
       PsiAnnotation annotation = list.findAnnotation(GroovyCommonClassNames.GROOVY_TRANSFORM_COMPILE_STATIC);
       if (annotation != null) return true;
+      PsiAnnotation typeChecked = list.findAnnotation(GroovyCommonClassNames.GROOVY_TRANSFORM_TYPE_CHECKED);
+      if (typeChecked != null) return true;
     }
     PsiClass aClass = member.getContainingClass();
     if (aClass != null) return isCompileStatic(aClass);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyCommonClassNames.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyCommonClassNames.java
index f6e040e36eff..851927168bdb 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyCommonClassNames.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyCommonClassNames.java
@@ -52,6 +52,7 @@ public final class GroovyCommonClassNames {
   @NonNls public static final String GROOVY_UTIL_TEST_CASE = "groovy.util.GroovyTestCase";
   @NonNls public static final String GROOVY_LANG_SINGLETON = "groovy.lang.Singleton";
   @NonNls public static final String GROOVY_TRANSFORM_COMPILE_STATIC = "groovy.transform.CompileStatic";
+  @NonNls public static final String GROOVY_TRANSFORM_TYPE_CHECKED = "groovy.transform.TypeChecked";
 
 
   private GroovyCommonClassNames() {

From c5451cdd3476650e0ab6abee634514732e6706c8 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Thu, 31 May 2012 14:56:09 +0400
Subject: [PATCH 014/239] correct gui layout for GroovyCreateClassDialog

---
 .../intentions/GroovyCreateClassDialog.form   |  6 ++--
 .../intentions/GroovyCreateClassDialog.java   | 29 +++++++------------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.form
index 291244fad4b1..ed775082facc 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.form
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.form
@@ -34,9 +34,9 @@
                   <text resource-bundle="org/jetbrains/plugins/groovy/codeInspection/GroovyInspectionBundle" key="destination.package"/>
                 </properties>
               </component>
-              <component id="f6348" class="org.jetbrains.plugins.groovy.annotator.intentions.GroovyCreateClassDialog$MySizeTextField" binding="myPackageTextField" custom-create="true">
+              <component id="f6348" class="com.intellij.ui.EditorTextField" binding="myPackageTextField" custom-create="true">
                 <constraints>
-                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties/>
               </component>
@@ -50,7 +50,7 @@
               </component>
               <component id="a6ccf" class="javax.swing.JButton" binding="myPackageChooseButton" custom-create="true">
                 <constraints>
-                  <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                  <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <text value=""/>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.java
index 781e1963eac4..5cb1196bcd38 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/GroovyCreateClassDialog.java
@@ -22,6 +22,8 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.editor.event.DocumentAdapter;
+import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
@@ -30,16 +32,15 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiNameHelper;
 import com.intellij.psi.PsiPackage;
 import com.intellij.refactoring.util.RefactoringMessageUtil;
-import com.intellij.ui.DocumentAdapter;
+import com.intellij.ui.EditorTextField;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.codeInspection.GroovyInspectionBundle;
 
 import javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
@@ -48,7 +49,7 @@ import java.awt.event.KeyEvent;
 public class GroovyCreateClassDialog extends DialogWrapper {
   private JPanel myContentPane;
   private JLabel myInformationLabel;
-  private MySizeTextField myPackageTextField;
+  private EditorTextField myPackageTextField;
   private JButton myPackageChooseButton;
   private PsiDirectory myTargetDirectory;
   private final Project myProject;
@@ -86,26 +87,18 @@ public class GroovyCreateClassDialog extends DialogWrapper {
   }
 
   private void createUIComponents() {
-    myPackageTextField = new MySizeTextField();
+    myPackageTextField = new EditorTextField();
     myPackageChooseButton = new FixedSizeButton(myPackageTextField);
   }
 
-  public static class MySizeTextField extends JTextField {
-    public Dimension getPreferredSize() {
-      Dimension size = super.getPreferredSize();
-      FontMetrics fontMetrics = getFontMetrics(getFont());
-      size.width = fontMetrics.charWidth('a') * 40;
-      return size;
-    }
-  }
-
   @Nullable
   protected JComponent createCenterPanel() {
-
     myPackageTextField.getDocument().addDocumentListener(new DocumentAdapter() {
-      protected void textChanged(DocumentEvent e) {
-        getOKAction().setEnabled(JavaPsiFacade.getInstance(myProject).getNameHelper().isQualifiedName(getPackageName()) ||
-            "".equals(getPackageName()));
+      @Override
+      public void documentChanged(DocumentEvent e) {
+        PsiNameHelper nameHelper = JavaPsiFacade.getInstance(myProject).getNameHelper();
+        String packageName = getPackageName();
+        getOKAction().setEnabled(nameHelper.isQualifiedName(packageName) || packageName != null && packageName.isEmpty());
       }
     });
 

From 4b08b2c6f282faf5ff66475e76644304cb1a7e65 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Thu, 31 May 2012 16:20:56 +0400
Subject: [PATCH 015/239] IDEA-86521

---
 .../designer/propertyTable/PropertyTable.java | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTable.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTable.java
index 83b245867218..3fe2aab4930a 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTable.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTable.java
@@ -290,7 +290,7 @@ public final class PropertyTable extends JBTable implements ComponentSelectionLi
     int indexToSelect = -1;
     int size = propertyPath.size();
     for (int i = 0; i < size; i++) {
-      int index = findProperty(myProperties, propertyPath.get(i));
+      int index = findFullPathProperty(myProperties, propertyPath.get(i));
       if (index == -1) {
         break;
       }
@@ -332,7 +332,7 @@ public final class PropertyTable extends JBTable implements ComponentSelectionLi
           for (Iterator<Property> I = myProperties.iterator(); I.hasNext(); ) {
             Property property = I.next();
 
-            int index = findProperty(properties, property);
+            int index = findFullPathProperty(properties, property);
             if (index == -1) {
               I.remove();
               continue;
@@ -408,6 +408,32 @@ public final class PropertyTable extends JBTable implements ComponentSelectionLi
     return -1;
   }
 
+  private static int findFullPathProperty(List<Property> properties, Property property) {
+    Property parent = property.getParent();
+    if (parent == null) {
+      return findProperty(properties, property);
+    }
+
+    String name = getFullPathName(property);
+    int size = properties.size();
+
+    for (int i = 0; i < size; i++) {
+      if (name.equals(getFullPathName(properties.get(i)))) {
+        return i;
+      }
+    }
+
+    return -1;
+  }
+
+  private static String getFullPathName(Property property) {
+    StringBuilder builder = new StringBuilder();
+    for (; property != null; property = property.getParent()) {
+      builder.insert(0, ".").insert(0, property.getName());
+    }
+    return builder.toString();
+  }
+
   public static void moveProperty(List<Property> source, String name, List<Property> destination, int index) {
     Property property = extractProperty(source, name);
     if (property != null) {

From 886027be421d1889afe1814b630706c671244fe9 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Thu, 31 May 2012 16:24:27 +0400
Subject: [PATCH 016/239] IDEA-86103 Reimport maven module if dependency list
 is changed

---
 .../idea/maven/importing/MavenImporter.java   |  4 ++
 .../maven/importing/MavenModuleImporter.java  | 33 ++++++++++---
 .../maven/importing/MavenProjectImporter.java | 46 ++++++++++++-------
 3 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java
index 843f8d2caa97..8853355bb8c3 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java
@@ -125,6 +125,10 @@ public abstract class MavenImporter {
                                Map<MavenProject, String> mavenProjectToModuleName,
                                List<MavenProjectsProcessorTask> postTasks);
 
+  public boolean processChangedModulesOnly() {
+    return true;
+  }
+
   public void collectSourceFolders(MavenProject mavenProject, List<String> result) {
   }
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
index 00ca4d806dbd..7a51c9665b5c 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.roots.LibraryOrderEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
-import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
@@ -31,6 +30,7 @@ import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.pom.java.LanguageLevel;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.model.MavenArtifact;
 import org.jetbrains.idea.maven.model.MavenConstants;
 import org.jetbrains.idea.maven.project.*;
@@ -45,6 +45,8 @@ public class MavenModuleImporter {
   private final Module myModule;
   private final MavenProjectsTree myMavenTree;
   private final MavenProject myMavenProject;
+
+  @Nullable
   private final MavenProjectChanges myMavenProjectChanges;
   private final Map<MavenProject, String> myMavenProjectToModuleName;
   private final MavenImportingSettings mySettings;
@@ -53,14 +55,15 @@ public class MavenModuleImporter {
 
   public MavenModuleImporter(Module module,
                              MavenProjectsTree mavenTree,
-                             Pair<MavenProject, MavenProjectChanges> mavenProjectWithChanges,
+                             MavenProject mavenProject,
+                             @Nullable MavenProjectChanges changes,
                              Map<MavenProject, String> mavenProjectToModuleName,
                              MavenImportingSettings settings,
                              MavenModifiableModelsProvider modifiableModelsProvider) {
     myModule = module;
     myMavenTree = mavenTree;
-    myMavenProject = mavenProjectWithChanges.first;
-    myMavenProjectChanges = mavenProjectWithChanges.second;
+    myMavenProject = mavenProject;
+    myMavenProjectChanges = changes;
     myMavenProjectToModuleName = mavenProjectToModuleName;
     mySettings = settings;
     myModifiableModelsProvider = modifiableModelsProvider;
@@ -84,12 +87,21 @@ public class MavenModuleImporter {
     final ModuleType moduleType = ModuleType.get(myModule);
 
     for (final MavenImporter importer : getSuitableImporters()) {
+      final MavenProjectChanges changes;
+      if (myMavenProjectChanges == null) {
+        if (importer.processChangedModulesOnly()) continue;
+        changes = MavenProjectChanges.NONE;
+      }
+      else {
+        changes = myMavenProjectChanges;
+      }
+
       if (importer.getModuleType() == moduleType) {
         // facets use FacetConfiguration and like that do not have modifiable models,
         // therefore we have to take write lock
         MavenUtil.invokeAndWaitWriteAction(myModule.getProject(), new Runnable() {
           public void run() {
-            importer.preProcess(myModule, myMavenProject, myMavenProjectChanges, myModifiableModelsProvider);
+            importer.preProcess(myModule, myMavenProject, changes, myModifiableModelsProvider);
           }
         });
       }
@@ -100,6 +112,15 @@ public class MavenModuleImporter {
     final ModuleType moduleType = ModuleType.get(myModule);
 
     for (final MavenImporter importer : getSuitableImporters()) {
+      final MavenProjectChanges changes;
+      if (myMavenProjectChanges == null) {
+        if (importer.processChangedModulesOnly()) continue;
+        changes = MavenProjectChanges.NONE;
+      }
+      else {
+        changes = myMavenProjectChanges;
+      }
+
       if (importer.getModuleType() == moduleType) {
         // facets use FacetConfiguration and like that do not have modifiable models,
         // therefore we have to take write lock
@@ -110,7 +131,7 @@ public class MavenModuleImporter {
                              myRootModelAdapter,
                              myMavenTree,
                              myMavenProject,
-                             myMavenProjectChanges,
+                             changes,
                              myMavenProjectToModuleName,
                              postTasks);
           }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java
index f4ff8d86fe24..ed73c334a3d5 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java
@@ -19,7 +19,9 @@ import com.intellij.compiler.CompilerConfiguration;
 import com.intellij.compiler.CompilerConfigurationImpl;
 import com.intellij.compiler.impl.javaCompiler.javac.JavacSettings;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.module.*;
+import com.intellij.openapi.module.ModifiableModuleModel;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.LibraryOrderEntry;
 import com.intellij.openapi.roots.ModifiableRootModel;
@@ -36,6 +38,7 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.Stack;
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.model.MavenArtifact;
 import org.jetbrains.idea.maven.project.*;
 import org.jetbrains.idea.maven.utils.MavenLog;
@@ -46,8 +49,6 @@ import org.jetbrains.idea.maven.utils.MavenUtil;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class MavenProjectImporter {
   private final Project myProject;
@@ -397,36 +398,48 @@ public class MavenProjectImporter {
 
   private void importModules(final List<MavenProjectsProcessorTask> postTasks) {
     Map<MavenProject, MavenProjectChanges> projectsWithChanges = myProjectsToImportWithChanges;
-    Set<MavenProject> projects = projectsWithChanges.keySet();
 
     Set<MavenProject> projectsWithNewlyCreatedModules = new THashSet<MavenProject>();
 
-    for (MavenProject each : projects) {
+    for (MavenProject each : projectsWithChanges.keySet()) {
       if (ensureModuleCreated(each)) {
         projectsWithNewlyCreatedModules.add(each);
       }
     }
 
-    final Map<Module, MavenModuleImporter> moduleImporters = new THashMap<Module, MavenModuleImporter>();
+    List<Module> modulesToMavenize = new ArrayList<Module>();
+    List<MavenModuleImporter> importers = new ArrayList<MavenModuleImporter>();
+
     for (Map.Entry<MavenProject, MavenProjectChanges> each : projectsWithChanges.entrySet()) {
       MavenProject project = each.getKey();
       Module module = myMavenProjectToModule.get(project);
       boolean isNewModule = projectsWithNewlyCreatedModules.contains(project);
 
-      MavenModuleImporter moduleImporter = createModuleImporter(module, Pair.create(project, each.getValue()));
-      moduleImporters.put(module, moduleImporter);
+      MavenModuleImporter moduleImporter = createModuleImporter(module, project, each.getValue());
+      modulesToMavenize.add(module);
+      importers.add(moduleImporter);
 
       moduleImporter.config(isNewModule);
     }
 
-    for (MavenProject each : projects) {
-      moduleImporters.get(myMavenProjectToModule.get(each)).preConfigFacets();
-    }
-    for (MavenProject each : projects) {
-      moduleImporters.get(myMavenProjectToModule.get(each)).configFacets(postTasks);
+    for (MavenProject project : myAllProjects) {
+      if (!projectsWithChanges.containsKey(project)) {
+        Module module = myMavenProjectToModule.get(project);
+        if (module == null) continue;
+
+        importers.add(createModuleImporter(module, project, null));
+      }
     }
 
-    setMavenizedModules(moduleImporters.keySet(), true);
+    for (MavenModuleImporter importer : importers) {
+      importer.preConfigFacets();
+    }
+
+    for (MavenModuleImporter importer : importers) {
+      importer.configFacets(postTasks);
+    }
+
+    setMavenizedModules(modulesToMavenize, true);
   }
 
   private void setMavenizedModules(final Collection<Module> modules, final boolean mavenized) {
@@ -466,10 +479,11 @@ public class MavenProjectImporter {
     });
   }
 
-  private MavenModuleImporter createModuleImporter(Module module, Pair<MavenProject, MavenProjectChanges> projectWithChanges) {
+  private MavenModuleImporter createModuleImporter(Module module, MavenProject mavenProject, @Nullable MavenProjectChanges changes) {
     return new MavenModuleImporter(module,
                                    myProjectsTree,
-                                   projectWithChanges,
+                                   mavenProject,
+                                   changes,
                                    myMavenProjectToModuleName,
                                    myImportingSettings,
                                    myModelsProvider);

From 1e0976b42c9dbacc7f7686f0df66a2faaded1ef9 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 31 May 2012 16:55:55 +0400
Subject: [PATCH 017/239] IDEA-86247 No feedback after loading a patch file

---
 .../intellij/openapi/vcs/ZipperUpdater.java   | 12 ++++++++++
 .../patch/ApplyPatchDifferentiatedDialog.java | 23 +++++++++++++++----
 .../vcs/changes/ui/ChangesTreeList.java       |  5 ++++
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ZipperUpdater.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ZipperUpdater.java
index 0ab7a86c4e6f..6f2d851b1677 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ZipperUpdater.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ZipperUpdater.java
@@ -25,6 +25,7 @@ public class ZipperUpdater {
   private boolean myRaised;
   private final Object myLock = new Object();
   private final int myDelay;
+  private boolean myIsEmpty;
 
   public ZipperUpdater(final int delay, Disposable parentDisposable) {
     this(delay, Alarm.ThreadToUse.SHARED_THREAD, parentDisposable);
@@ -32,6 +33,7 @@ public class ZipperUpdater {
 
   public ZipperUpdater(final int delay, final Alarm.ThreadToUse threadToUse, Disposable parentDisposable) {
     myDelay = delay;
+    myIsEmpty = true;
     myAlarm = new Alarm(threadToUse, parentDisposable);
   }
 
@@ -44,6 +46,7 @@ public class ZipperUpdater {
       if (myAlarm.isDisposed()) return;
       final boolean wasRaised = myRaised;
       myRaised = true;
+      myIsEmpty = false;
       if (! wasRaised) {
         myAlarm.addRequest(new Runnable() {
           public void run() {
@@ -52,12 +55,21 @@ public class ZipperUpdater {
               myRaised = false;
             }
             runnable.run();
+            synchronized (myLock) {
+              myIsEmpty = ! myRaised;
+            }
           }
         }, urgent ? 0 : myDelay);
       }
     }
   }
 
+  public boolean isEmpty() {
+    synchronized (myLock) {
+      return myIsEmpty;
+    }
+  }
+
   public void stop() {
     myAlarm.cancelAllRequests();
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
index 22610770973a..30aca85f19e6 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
@@ -148,7 +148,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
     myPatchFile.getTextField().getDocument().addDocumentListener(new DocumentAdapter() {
       protected void textChanged(DocumentEvent e) {
         setPathFileChangeDefault();
-        myLoadQueue.queue(myUpdater);
+        queueRequest();
       }
     });
 
@@ -191,7 +191,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
         public void contentsChanged(VirtualFileEvent event) {
           if (myRecentPathFileChange.get() != null && myRecentPathFileChange.get().getVf() != null &&
               myRecentPathFileChange.get().getVf().equals(event.getFile())) {
-            myLoadQueue.queue(myUpdater);
+            queueRequest();
           }
         }
       };
@@ -206,6 +206,11 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
     }
   }
 
+  private void queueRequest() {
+    paintBusy(true);
+    myLoadQueue.queue(myUpdater);
+  }
+
   private void init(List<TextFilePatch> patches, final LocalChangeList localChangeList) {
     final List<FilePatchInProgress> matchedPathes = new AutoMatchIterator(myProject).execute(patches);
 
@@ -284,7 +289,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
   public void init(final VirtualFile patchFile) {
     myPatchFile.setText(patchFile.getPresentableUrl());
     myRecentPathFileChange.set(new FilePresentation(patchFile));
-    myLoadQueue.queue(myUpdater);
+    queueRequest();
   }
 
   private class MyUpdater implements Runnable {
@@ -309,6 +314,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
           myPatches.addAll(matchedPathes);
           myReader = patchReader;
           updateTree(true);
+          paintBusy(false);
         }
       });
     }
@@ -368,6 +374,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
     myChangesTreeList.setChangesToDisplay(Collections.<FilePatchInProgress.PatchChange>emptyList());
     myChangesTreeList.repaint();
     myContainBasedChanges = false;
+    paintBusy(false);
   }
 
   @Override
@@ -410,7 +417,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
         group.add(new AnAction("Refresh", "Refresh", AllIcons.Actions.Sync) {
           @Override
           public void actionPerformed(AnActionEvent e) {
-            myLoadQueue.queue(myUpdater);
+            queueRequest();
           }
         });
       }
@@ -445,6 +452,14 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
     return myCenterPanel;
   }
 
+  private void paintBusy(final boolean requestPut) {
+    if (requestPut) {
+      myChangesTreeList.setPaintBusy(true);
+    } else {
+      myChangesTreeList.setPaintBusy(! myLoadQueue.isEmpty());
+    }
+  }
+
   private static class MyChangeTreeList extends ChangesTreeList<FilePatchInProgress.PatchChange> {
     private MyChangeTreeList(Project project,
                              Collection<FilePatchInProgress.PatchChange> initiallyIncluded,
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
index 4aa730b6880d..9cd1dd3fb7ed 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
@@ -927,4 +927,9 @@ public abstract class ChangesTreeList<T> extends JPanel {
   public void setAlwaysExpandList(boolean alwaysExpandList) {
     myAlwaysExpandList = alwaysExpandList;
   }
+
+  public void setPaintBusy(final boolean value) {
+    myTree.setPaintBusy(value);
+    myList.setPaintBusy(value);
+  }
 }

From 5ba86ba03b96789fc30b94be691aa1b38aec5c3c Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 31 May 2012 17:01:11 +0400
Subject: [PATCH 018/239] apply patch: always expand all nodes on new patch
 file contents is shown

---
 .../vcs/changes/patch/ApplyPatchDifferentiatedDialog.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
index 30aca85f19e6..04c44c55c76a 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
@@ -551,6 +551,9 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
 
     myChangesTreeList.setChangesToDisplay(changes);
     myChangesTreeList.setIncludedChanges(included);
+    if (doInitCheck) {
+      myChangesTreeList.expandAll();
+    }
     myChangesTreeList.repaint();
     if ((! doInitCheck) && patchesToSelect != null) {
       final List<FilePatchInProgress.PatchChange> toSelect = new ArrayList<FilePatchInProgress.PatchChange>(patchesToSelect.size());

From 4b3db7acdee21b152b909b53bd0d210b62608651 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 31 May 2012 15:40:51 +0200
Subject: [PATCH 019/239] rollback rollback

---
 .../ide/navigationToolbar/NavBarListener.java | 52 ++++++++++++++++---
 1 file changed, 46 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java
index 634501e5e74b..bc8bb588ff35 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,16 @@ import com.intellij.ide.actions.CopyAction;
 import com.intellij.ide.actions.CutAction;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.AnActionListener;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootEvent;
 import com.intellij.openapi.roots.ModuleRootListener;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.vcs.FileStatusListener;
 import com.intellij.openapi.vcs.FileStatusManager;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.problems.WolfTheProblemSolver;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiTreeChangeEvent;
@@ -36,10 +39,7 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
+import java.awt.event.*;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.List;
@@ -49,7 +49,7 @@ import java.util.List;
  */
 public class NavBarListener extends WolfTheProblemSolver.ProblemListener
   implements ActionListener, FocusListener, FileStatusListener, AnActionListener,
-             PsiTreeChangeListener, ModuleRootListener, NavBarModelListener, PropertyChangeListener {
+             PsiTreeChangeListener, ModuleRootListener, NavBarModelListener, PropertyChangeListener, KeyListener {
   private static final String LISTENER = "NavBarListener";
   private static final String BUS = "NavBarMessageBus";
   private final NavBarPanel myPanel;
@@ -71,6 +71,7 @@ public class NavBarListener extends WolfTheProblemSolver.ProblemListener
     connection.subscribe(ProjectTopics.PROJECT_ROOTS, listener);
     connection.subscribe(NavBarModelListener.NAV_BAR, listener);
     panel.putClientProperty(BUS, connection);
+    panel.addKeyListener(listener);
   }
 
   static void unsubscribeFrom(NavBarPanel panel) {
@@ -256,7 +257,46 @@ public class NavBarListener extends WolfTheProblemSolver.ProblemListener
            || action instanceof CutAction;
   }
 
+  @Override
+  public void keyPressed(final KeyEvent e) {
+    if (!(e.isAltDown() || e.isMetaDown() || e.isControlDown() || myPanel.isNodePopupActive())) {
+      if (!Character.isLetter(e.getKeyChar())) {
+        return;
+      }
+
+      final IdeFocusManager focusManager = IdeFocusManager.getInstance(myPanel.getProject());
+      final ActionCallback firstCharTyped = new ActionCallback();
+      focusManager.typeAheadUntil(firstCharTyped);
+      myPanel.moveDown();
+      ApplicationManager.getApplication().invokeLater(new Runnable() {
+        public void run() {
+          try {
+            final Robot robot = new Robot();
+            final boolean shiftOn = e.isShiftDown();
+            final int code = e.getKeyCode();
+            if (shiftOn) {
+              robot.keyPress(KeyEvent.VK_SHIFT);
+            }
+            robot.keyPress(code);
+            robot.keyRelease(code);
+
+            //don't release Shift
+            firstCharTyped.setDone();
+          }
+          catch (AWTException ignored) {
+          }
+        }
+      });
+    }
+  }
+
   //---- Ignored
+  @Override
+  public void keyTyped(KeyEvent e) {}
+
+  @Override
+  public void keyReleased(KeyEvent e) {}
+
   @Override
   public void beforeActionPerformed(AnAction action, DataContext dataContext, AnActionEvent event) {}
 

From fdea7504c0c25e3602b3bf8d3536ef3d9f6a502f Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Thu, 31 May 2012 17:41:14 +0400
Subject: [PATCH 020/239] don't duplicate usages from field and accessors

---
 .../parameterToEntry/ConvertParameterToMapEntryIntention.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java
index 29f8709945e9..f4f4aac8315e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/intentions/style/parameterToEntry/ConvertParameterToMapEntryIntention.java
@@ -36,6 +36,7 @@ import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.containers.HashSet;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -445,7 +446,7 @@ public class ConvertParameterToMapEntryIntention extends Intention {
       .message("find.method.ro.closure.usages.0", owner instanceof GrClosableBlock ? CLOSURE_CAPTION : METHOD_CAPTION), true) {
       public void run(@NotNull final ProgressIndicator indicator) {
         final GlobalSearchScope projectScope = GlobalSearchScope.projectScope(getProject());
-        final Collection<PsiReference> references = Collections.synchronizedList(new ArrayList<PsiReference>());
+        final Collection<PsiReference> references = Collections.synchronizedSet(new HashSet<PsiReference>());
         final Processor<PsiReference> consumer = new Processor<PsiReference>() {
           @Override
           public boolean process(PsiReference psiReference) {

From d8f82066b8b2cf4caca2ccdae8011f521713d740 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Thu, 31 May 2012 17:41:40 +0400
Subject: [PATCH 021/239] correct constructors for converted scripts

---
 .../convertToJava/ClassItemGeneratorImpl.java        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java
index c54d192ffb42..13cf94b98900 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassItemGeneratorImpl.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.light.LightMethodBuilder;
-import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.codeInspection.noReturnMethod.MissingReturnInspection;
@@ -41,6 +41,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlo
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrEnumConstantInitializer;
+import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.*;
 import org.jetbrains.plugins.groovy.lang.psi.impl.signatures.GrClosureSignatureUtil;
 import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GroovyScriptClass;
@@ -335,10 +336,11 @@ public class ClassItemGeneratorImpl implements ClassItemGenerator {
     if (typeDefinition instanceof GroovyScriptClass) {
       final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(context.project);
       final String name = typeDefinition.getName();
-      result.add(factory.createConstructorFromText(name, new String[]{"groovy.lang.Binding"}, new String[]{"binding"}, "{super(binding);}",
-                                                   typeDefinition));
-      result.add(
-        factory.createConstructorFromText(name, ArrayUtil.EMPTY_STRING_ARRAY, ArrayUtil.EMPTY_STRING_ARRAY, "{super();}", typeDefinition));
+      GrTypeDefinition tempClass = factory.createTypeDefinition("class " + name + " extends groovy.lang.Script {\n" +
+                                                                "  def " + name + "(groovy.lang.Binding binding){ super(binding);}\n" +
+                                                                "  def " + name + "(){super();}\n" +
+                                                                "}");
+      ContainerUtil.addAll(result, tempClass.getCodeConstructors());
     }
     return result;
   }

From a2e79e6f17708cda9311099e30300e5a35b5f0b6 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Thu, 31 May 2012 17:42:14 +0400
Subject: [PATCH 022/239] fix NPE

---
 .../impl/signatures/GrClosureSignatureUtil.java  | 16 +++++++++++-----
 .../convertToJava/ArgumentListGenerator.java     |  1 +
 ...yIntroduceParameterMethodUsagesProcessor.java |  1 +
 .../java2groovy/OldReferencesResolver.java       |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrClosureSignatureUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrClosureSignatureUtil.java
index b3c3b8ca762a..24123e079bbe 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrClosureSignatureUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrClosureSignatureUtil.java
@@ -639,6 +639,7 @@ public class GrClosureSignatureUtil {
     final HashMap<GrExpression, Pair<PsiParameter, PsiType>> result = new HashMap<GrExpression, Pair<PsiParameter, PsiType>>();
     for (int i = 0; i < argInfos.length; i++) {
       ArgInfo<PsiElement> info = argInfos[i];
+      if (info == null) continue;
       for (PsiElement arg : info.args) {
         if (arg instanceof GrNamedArgument) {
           arg = ((GrNamedArgument)arg).getExpression();
@@ -719,12 +720,17 @@ public class GrClosureSignatureUtil {
 
     for (; i < innerMap.length; i++) {
       final ArgInfo<InnerArg> innerArg = innerMap[i];
-      List<PsiElement> argList = new ArrayList<PsiElement>();
-      for (InnerArg arg : innerArg.args) {
-        argList.addAll(arg.list);
+      if (innerArg == null) {
+        map[i] = null;
+      }
+      else {
+        List<PsiElement> argList = new ArrayList<PsiElement>();
+        for (InnerArg arg : innerArg.args) {
+          argList.addAll(arg.list);
+        }
+        boolean multiArg = innerArg.isMultiArg || argList.size() > 1;
+        map[i] = new ArgInfo<PsiElement>(argList, multiArg);
       }
-      boolean multiArg = innerArg.isMultiArg || argList.size() > 1;
-      map[i] = new ArgInfo<PsiElement>(argList, multiArg);
     }
 
     return map;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
index 32a160ac9383..8620f5902d26 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
@@ -75,6 +75,7 @@ class ArgumentListGenerator {
     boolean hasArgs = false;
     for (int i = 0; i < argInfos.length; i++) {
       GrClosureSignatureUtil.ArgInfo<PsiElement> arg = argInfos[i];
+      if (arg == null) continue;
       final GrClosureParameter param = params[i];
       if (arg.isMultiArg ? generateMultiArg(arg, param, substitutor, project, context) : generateSingeArg(arg, param)) {
         hasArgs = true;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java
index 10cf41aeee85..1493d3f73d0d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java
@@ -169,6 +169,7 @@ public class GroovyIntroduceParameterMethodUsagesProcessor implements IntroduceP
       public boolean execute(final int paramNum) {
         try {
           final GrClosureSignatureUtil.ArgInfo<PsiElement> actualArg = actualArgs[paramNum];
+          if (actualArg == null) return true;
           for (PsiElement arg : actualArg.args) {
             arg.delete();
           }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java
index fa72d5ae8e5c..0a4409106c8e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/OldReferencesResolver.java
@@ -318,7 +318,7 @@ public class OldReferencesResolver {
 
   @NotNull
   private GrExpression getActualArg(int index) {
-    if (myActualArgs == null) {
+    if (myActualArgs == null || myActualArgs[index] == null) {
       final GrExpression[] arguments = myContext.getArgumentList().getExpressionArguments();
       if (index < arguments.length) return arguments[index];
       index -= arguments.length;

From 16dcd0173bdf1ecc47d96e950da26db9df87b7de Mon Sep 17 00:00:00 2001
From: "andrey.zaytsev" <andrey.zaytsev@jetbrains.com>
Date: Thu, 31 May 2012 18:09:20 +0400
Subject: [PATCH 023/239] Visual Studio keymap fix

---
 platform/platform-resources/src/idea/Keymap_VisualStudio.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/platform-resources/src/idea/Keymap_VisualStudio.xml b/platform/platform-resources/src/idea/Keymap_VisualStudio.xml
index faa8875ec839..3a75f1eef983 100644
--- a/platform/platform-resources/src/idea/Keymap_VisualStudio.xml
+++ b/platform/platform-resources/src/idea/Keymap_VisualStudio.xml
@@ -170,6 +170,9 @@
     <action id="ViewBreakpoints">
       <keyboard-shortcut first-keystroke="alt F9"/>
     </action>
+    <action id="EditBreakpoint">
+      <keyboard-shortcut first-keystroke="alt F9"/>
+    </action>
     <action id="TypeHierarchy">
       <keyboard-shortcut first-keystroke="alt H"/>
     </action>

From 7497c65ab4f10d09527fefa350b61c11b5d812fb Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Thu, 31 May 2012 18:34:52 +0400
Subject: [PATCH 024/239] configurable cache size for stub indices + use int[]
 instead of TIntArrayList to minimize memory usage (most often this is one
 element array)

---
 .../src/com/intellij/psi/stubs/StubTree.java  | 68 +++++++++++++------
 .../intellij/psi/stubs/AbstractStubIndex.java |  2 +
 .../psi/stubs/StubIndexExtension.java         |  2 +
 .../com/intellij/psi/stubs/StubIndexImpl.java | 54 ++++++++-------
 .../intellij/psi/stubs/StubUpdatingIndex.java | 20 +++---
 5 files changed, 91 insertions(+), 55 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/psi/stubs/StubTree.java b/platform/core-impl/src/com/intellij/psi/stubs/StubTree.java
index d1021e2be84c..34aa9ee3a48e 100644
--- a/platform/core-impl/src/com/intellij/psi/stubs/StubTree.java
+++ b/platform/core-impl/src/com/intellij/psi/stubs/StubTree.java
@@ -21,11 +21,11 @@ package com.intellij.psi.stubs;
 
 import com.intellij.openapi.util.Key;
 import gnu.trove.THashMap;
-import gnu.trove.TIntArrayList;
+import gnu.trove.TObjectObjectProcedure;
+import gnu.trove.TObjectProcedure;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -64,11 +64,9 @@ public class StubTree {
   }
 
   @NotNull
-  public Map<StubIndexKey, Map<Object, TIntArrayList>> indexStubTree() {
-    final Map<StubIndexKey, Map<Object, TIntArrayList>> result = new HashMap<StubIndexKey, Map<Object, TIntArrayList>>();
-
+  public Map<StubIndexKey, Map<Object, int[]>> indexStubTree() {
     SerializationManager serializationManager = SerializationManager.getInstance();
-    StubIndexSink sink = new StubIndexSink(result);
+    StubIndexSink sink = new StubIndexSink();
 
     for (int i = 0, plainListSize = myPlainList.size(); i < plainListSize; i++) {
       final StubElement<?> stub = myPlainList.get(i);
@@ -76,31 +74,63 @@ public class StubTree {
       serializationManager.getSerializer(stub).indexStub(stub, sink);
     }
 
-    return result;
+    return sink.getResult();
   }
 
-  private static class StubIndexSink implements IndexSink {
-    private final Map<StubIndexKey, Map<Object, TIntArrayList>> myResult;
+  private static class StubIndexSink implements IndexSink, TObjectProcedure<Map<Object, int[]>>,TObjectObjectProcedure<Object,int[]> {
+    private final THashMap<StubIndexKey, Map<Object, int[]>> myResult = new THashMap<StubIndexKey, Map<Object, int[]>>();;
     private int myStubIdx;
-
-    public StubIndexSink(Map<StubIndexKey, Map<Object, TIntArrayList>> result) {
-      myResult = result;
-    }
+    private Map<Object, int[]> myProcessingMap;
 
     @Override
     public void occurrence(@NotNull final StubIndexKey indexKey, @NotNull final Object value) {
-      Map<Object, TIntArrayList> map = myResult.get(indexKey);
+      Map<Object, int[]> map = myResult.get(indexKey);
       if (map == null) {
-        map = new THashMap<Object, TIntArrayList>();
+        map = new THashMap<Object, int[]>();
         myResult.put(indexKey, map);
       }
 
-      TIntArrayList list = map.get(value);
+      int[] list = map.get(value);
       if (list == null) {
-        list = new TIntArrayList();
-        map.put(value, list);
+        map.put(value, new int[] {myStubIdx});
+      } else {
+        int lastZero;
+        for(lastZero = list.length - 1; lastZero >=0 && list[lastZero] == 0; --lastZero);
+        ++lastZero;
+
+        if (lastZero == list.length) {
+          int[] newlist = new int[Math.max(4, list.length << 1)];
+          System.arraycopy(list, 0, newlist, 0, list.length);
+          lastZero = list.length;
+          map.put(value, list = newlist);
+        }
+        list[lastZero] = myStubIdx;
       }
-      list.add(myStubIdx);
+    }
+
+    public Map<StubIndexKey, Map<Object, int[]>> getResult() {
+      myResult.forEachValue(this);
+      return myResult;
+    }
+
+    @Override
+    public boolean execute(Map<Object, int[]> object) {
+      myProcessingMap = object;
+      ((THashMap<Object, int[]>)object).forEachEntry(this);
+      return true;
+    }
+
+    @Override
+    public boolean execute(Object a, int[] b) {
+      if (b.length == 1) return true;
+      int firstZero;
+      for(firstZero = 0; firstZero < b.length && b[firstZero] != 0; ++firstZero);
+      if (firstZero != b.length) {
+        int[] shorterList = new int[firstZero];
+        System.arraycopy(b, 0, shorterList, 0, shorterList.length);
+        myProcessingMap.put(a, shorterList);
+      }
+      return true;
     }
   }
 }
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java b/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java
index 1d5c648f844d..4cc68a25392c 100644
--- a/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java
+++ b/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java
@@ -32,4 +32,6 @@ public abstract class AbstractStubIndex<Key, Psi extends PsiElement> implements
   public Collection<Psi> get(Key key, final Project project, final GlobalSearchScope scope) {
     return StubIndex.getInstance().get(getKey(), key, project, scope);
   }
+
+  public int getCacheSize() { return 5; }
 }
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/StubIndexExtension.java b/platform/lang-api/src/com/intellij/psi/stubs/StubIndexExtension.java
index 8ee1c2dbc253..741cab3f5247 100644
--- a/platform/lang-api/src/com/intellij/psi/stubs/StubIndexExtension.java
+++ b/platform/lang-api/src/com/intellij/psi/stubs/StubIndexExtension.java
@@ -34,4 +34,6 @@ public interface StubIndexExtension<Key, Psi extends PsiElement> {
 
   @NotNull
   KeyDescriptor<Key> getKeyDescriptor();
+
+  int getCacheSize();
 }
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
index 05a5e6d08e00..54a83823712b 100644
--- a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
@@ -49,7 +49,6 @@ import com.intellij.util.indexing.*;
 import com.intellij.util.io.DataExternalizer;
 import com.intellij.util.io.DataInputOutputUtil;
 import gnu.trove.THashMap;
-import gnu.trove.TIntArrayList;
 import gnu.trove.TObjectIntHashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -128,8 +127,13 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
 
     for (int attempt = 0; attempt < 2; attempt++) {
       try {
-        final MapIndexStorage<K, TIntArrayList> storage = new MapIndexStorage<K, TIntArrayList>(IndexInfrastructure.getStorageFile(indexKey), extension.getKeyDescriptor(), new StubIdExternalizer(), 2 * 1024);
-        final MemoryIndexStorage<K, TIntArrayList> memStorage = new MemoryIndexStorage<K, TIntArrayList>(storage);
+        final MapIndexStorage<K, int[]> storage = new MapIndexStorage<K, int[]>(
+          IndexInfrastructure.getStorageFile(indexKey),
+          extension.getKeyDescriptor(),
+          new StubIdExternalizer(),
+          extension.getCacheSize()
+        );
+        final MemoryIndexStorage<K, int[]> memStorage = new MemoryIndexStorage<K, int[]>(storage);
         myIndices.put(indexKey, new MyIndex<K>(memStorage));
         break;
       }
@@ -143,40 +147,38 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
     return needRebuild;
   }
 
-  private static class StubIdExternalizer implements DataExternalizer<TIntArrayList> {
+  private static class StubIdExternalizer implements DataExternalizer<int[]> {
     @Override
-    public void save(final DataOutput out, @NotNull final TIntArrayList value) throws IOException {
-      int size = value.size();
+    public void save(final DataOutput out, @NotNull final int[] value) throws IOException {
+      int size = value.length;
       if (size == 0) {
         DataInputOutputUtil.writeSINT(out, Integer.MAX_VALUE);
       }
       else if (size == 1) {
-        DataInputOutputUtil.writeSINT(out, -value.get(0));
+        DataInputOutputUtil.writeSINT(out, -value[0]);
       }
       else {
         DataInputOutputUtil.writeSINT(out, size);
         for (int i = 0; i < size; i++) {
-          DataInputOutputUtil.writeINT(out, value.get(i));
+          DataInputOutputUtil.writeINT(out, value[i]);
         }
       }
     }
 
     @NotNull
     @Override
-    public TIntArrayList read(final DataInput in) throws IOException {
+    public int[] read(final DataInput in) throws IOException {
       int size = DataInputOutputUtil.readSINT(in);
       if (size == Integer.MAX_VALUE) {
-        return new TIntArrayList();
+        return new int[0];
       }
       else if (size <= 0) {
-        TIntArrayList result = new TIntArrayList(1);
-        result.add(-size);
-        return result;
+        return new int[] {-size};
       }
       else {
-        TIntArrayList result = new TIntArrayList(size);
+        int[] result = new int[size];
         for (int i = 0; i < size; i++) {
-          result.add(DataInputOutputUtil.readINT(in));
+          result[i] = DataInputOutputUtil.readINT(in);
         }
         return result;
       }
@@ -213,13 +215,13 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
         // disable up-to-date check to avoid locks on attempt to acquire index write lock while holding at the same time the readLock for this index
         FileBasedIndexImpl.disableUpToDateCheckForCurrentThread();
         index.getReadLock().lock();
-        final ValueContainer<TIntArrayList> container = index.getData(key);
+        final ValueContainer<int[]> container = index.getData(key);
 
         final FileBasedIndexImpl.ProjectIndexableFilesFilter projectFilesFilter = fileBasedIndex.projectIndexableFiles(project);
 
-        return container.forEach(new ValueContainer.ContainerAction<TIntArrayList>() {
+        return container.forEach(new ValueContainer.ContainerAction<int[]>() {
           @Override
-          public boolean perform(final int id, @NotNull final TIntArrayList value) {
+          public boolean perform(final int id, @NotNull final int[] value) {
             if (projectFilesFilter != null && !projectFilesFilter.contains(id)) return true;
             final VirtualFile file = IndexInfrastructure.findFileByIdIfCached(fs, id);
             if (file == null || scope != null && !scope.contains(file)) {
@@ -249,8 +251,8 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
                 return true;
               }
               final List<StubElement<?>> plained = stubTree.getPlainList();
-              for (int i = 0; i < value.size(); i++) {
-                final StubElement<?> stub = plained.get(value.get(i));
+              for (int i = 0; i < value.length; i++) {
+                final StubElement<?> stub = plained.get(value[i]);
                 final ASTNode tree = psiFile.findTreeForStub(stubTree, stub);
 
                 if (tree != null) {
@@ -290,8 +292,8 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
             }
             else {
               final List<StubElement<?>> plained = stubTree.getPlainList();
-              for (int i = 0; i < value.size(); i++) {
-                final int stubTreeIndex = value.get(i);
+              for (int i = 0; i < value.length; i++) {
+                final int stubTreeIndex = value[i];
                 if (stubTreeIndex >= plained.size()) {
                   final VirtualFile virtualFile = psiFile.getVirtualFile();
                   StubTree stubTreeFromIndex = StubTreeLoader.getInstance().readFromVFile(project, file);
@@ -470,7 +472,7 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
     index.flush();
   }
 
-  public <K> void updateIndex(@NotNull StubIndexKey key, int fileId, @NotNull final Map<K, TIntArrayList> oldValues, @NotNull Map<K, TIntArrayList> newValues) {
+  public <K> void updateIndex(@NotNull StubIndexKey key, int fileId, @NotNull final Map<K, int[]> oldValues, @NotNull Map<K, int[]> newValues) {
     try {
       final MyIndex<K> index = (MyIndex<K>)myIndices.get(key);
       index.updateWithMap(fileId, newValues, new Callable<Collection<K>>() {
@@ -486,13 +488,13 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
     }
   }
 
-  private static class MyIndex<K> extends MapReduceIndex<K, TIntArrayList, Void> {
-    public MyIndex(final IndexStorage<K, TIntArrayList> storage) {
+  private static class MyIndex<K> extends MapReduceIndex<K, int[], Void> {
+    public MyIndex(final IndexStorage<K, int[]> storage) {
       super(null, null, storage);
     }
 
     @Override
-    public void updateWithMap(final int inputId, @NotNull final Map<K, TIntArrayList> newData, @NotNull Callable<Collection<K>> oldKeysGetter) throws StorageException {
+    public void updateWithMap(final int inputId, @NotNull final Map<K, int[]> newData, @NotNull Callable<Collection<K>> oldKeysGetter) throws StorageException {
       super.updateWithMap(inputId, newData, oldKeysGetter);
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
index cfb2be18ee98..547f47a6f437 100644
--- a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
+++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
@@ -201,21 +201,21 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
     return new MyIndex(indexId, storage, getIndexer());
   }
 
-  private static void updateStubIndices(@NotNull final Collection<StubIndexKey> indexKeys, final int inputId, @NotNull final Map<StubIndexKey, Map<Object, TIntArrayList>> oldStubTree, @NotNull final Map<StubIndexKey, Map<Object, TIntArrayList>> newStubTree) {
+  private static void updateStubIndices(@NotNull final Collection<StubIndexKey> indexKeys, final int inputId, @NotNull final Map<StubIndexKey, Map<Object, int[]>> oldStubTree, @NotNull final Map<StubIndexKey, Map<Object, int[]>> newStubTree) {
     final StubIndexImpl stubIndex = (StubIndexImpl)StubIndex.getInstance();
     for (StubIndexKey key : indexKeys) {
-      final Map<Object, TIntArrayList> oldMap = oldStubTree.get(key);
-      final Map<Object, TIntArrayList> newMap = newStubTree.get(key);
+      final Map<Object, int[]> oldMap = oldStubTree.get(key);
+      final Map<Object, int[]> newMap = newStubTree.get(key);
 
-      final Map<Object, TIntArrayList> _oldMap = oldMap != null ? oldMap : Collections.<Object, TIntArrayList>emptyMap();
-      final Map<Object, TIntArrayList> _newMap = newMap != null ? newMap : Collections.<Object, TIntArrayList>emptyMap();
+      final Map<Object, int[]> _oldMap = oldMap != null ? oldMap : Collections.<Object, int[]>emptyMap();
+      final Map<Object, int[]> _newMap = newMap != null ? newMap : Collections.<Object, int[]>emptyMap();
 
       stubIndex.updateIndex(key, inputId, _oldMap, _newMap);
     }
   }
 
   @NotNull
-  private static Collection<StubIndexKey> getAffectedIndices(@NotNull final Map<StubIndexKey, Map<Object, TIntArrayList>> oldStubTree, @NotNull final Map<StubIndexKey, Map<Object, TIntArrayList>> newStubTree) {
+  private static Collection<StubIndexKey> getAffectedIndices(@NotNull final Map<StubIndexKey, Map<Object, int[]>> oldStubTree, @NotNull final Map<StubIndexKey, Map<Object, int[]>> newStubTree) {
     Set<StubIndexKey> allIndices = new HashSet<StubIndexKey>();
     allIndices.addAll(oldStubTree.keySet());
     allIndices.addAll(newStubTree.keySet());
@@ -254,7 +254,7 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
       throws StorageException {
 
       checkNameStorage();
-      final Map<StubIndexKey, Map<Object, TIntArrayList>> newStubTree = getStubTree(newData);
+      final Map<StubIndexKey, Map<Object, int[]>> newStubTree = getStubTree(newData);
 
       final StubIndexImpl stubIndex = getStubIndex();
       final Collection<StubIndexKey> allStubIndices = stubIndex.getAllStubIndexKeys();
@@ -268,7 +268,7 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
           getWriteLock().lock();
 
           final Map<Integer, SerializedStubTree> oldData = readOldData(inputId);
-          final Map<StubIndexKey, Map<Object, TIntArrayList>> oldStubTree = getStubTree(oldData);
+          final Map<StubIndexKey, Map<Object, int[]>> oldStubTree = getStubTree(oldData);
 
           super.updateWithMap(inputId, newData, oldKeysGetter);
 
@@ -302,8 +302,8 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
       }
     }
 
-    private static Map<StubIndexKey, Map<Object, TIntArrayList>> getStubTree(@NotNull final Map<Integer, SerializedStubTree> data) {
-      final Map<StubIndexKey, Map<Object, TIntArrayList>> stubTree;
+    private static Map<StubIndexKey, Map<Object, int[]>> getStubTree(@NotNull final Map<Integer, SerializedStubTree> data) {
+      final Map<StubIndexKey, Map<Object, int[]>> stubTree;
       if (!data.isEmpty()) {
         final SerializedStubTree stub = data.values().iterator().next();
         stubTree = new StubTree((PsiFileStub)stub.getStub(true), false).indexStubTree();

From 9ab8ca5d0631e8bcf4d9b4c347c2b946d8e571d5 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Wed, 30 May 2012 19:48:16 +0400
Subject: [PATCH 025/239] extract constants

---
 .../src/org/jetbrains/android/util/AndroidCommonUtils.java   | 2 ++
 .../jps/android/AndroidSourceGeneratingBuilder.java          | 3 +--
 .../compiler/AndroidBuildConfigGeneratingCompiler.java       | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java b/plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java
index 432be8fbea6d..6c90602ad3d3 100644
--- a/plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java
+++ b/plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java
@@ -88,6 +88,8 @@ public class AndroidCommonUtils {
     {"JUnit", "TestNG", "ScalaTestRunConfiguration", "SpecsRunConfiguration", "Specs2RunConfiguration"};
   @NonNls public static final String ANNOTATIONS_JAR_RELATIVE_PATH = "/tools/support/annotations.jar";
 
+  @NonNls public static final String PACKAGE_MANIFEST_ATTRIBUTE = "package";
+
   private AndroidCommonUtils() {
   }
 
diff --git a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java
index 8f38c85b047b..7d1cb001b210 100644
--- a/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java
+++ b/plugins/android/jps-plugin/src/org/jetbrains/jps/android/AndroidSourceGeneratingBuilder.java
@@ -49,7 +49,6 @@ public class AndroidSourceGeneratingBuilder extends ModuleLevelBuilder {
   @NonNls private static final String AIDL_EXTENSION = "aidl";
   @NonNls private static final String RENDERSCRIPT_EXTENSION = "rs";
   @NonNls private static final String MANIFEST_TAG = "manifest";
-  @NonNls private static final String PACKAGE_MANIFEST_ATTRIBUTE = "package";
   @NonNls private static final String PERMISSION_TAG = "permission";
   @NonNls private static final String PERMISSION_GROUP_TAG = "permission-group";
   @NonNls private static final String NAME_ATTRIBUTE = "name";
@@ -751,7 +750,7 @@ public class AndroidSourceGeneratingBuilder extends ModuleLevelBuilder {
         @Override
         public void addAttribute(String key, String nsPrefix, String nsURI, String value, String type)
           throws Exception {
-          if (value != null && PACKAGE_MANIFEST_ATTRIBUTE.equals(key)) {
+          if (value != null && AndroidCommonUtils.PACKAGE_MANIFEST_ATTRIBUTE.equals(key)) {
             packageName.set(value.trim());
           }
         }
diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidBuildConfigGeneratingCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidBuildConfigGeneratingCompiler.java
index 98a8c3319a14..20a79be60a6c 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/AndroidBuildConfigGeneratingCompiler.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidBuildConfigGeneratingCompiler.java
@@ -14,6 +14,7 @@ import com.intellij.util.xml.NanoXmlUtil;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.android.util.AndroidBundle;
+import org.jetbrains.android.util.AndroidCommonUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -28,6 +29,7 @@ import java.util.List;
  */
 public class AndroidBuildConfigGeneratingCompiler implements SourceGeneratingCompiler {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.compiler.AndroidBuildConfigGeneratingCompiler");
+  private static final String MANIFEST_LOCATION = NanoXmlUtil.createLocation("manifest");
 
   @Nullable
   @Override
@@ -126,7 +128,8 @@ public class AndroidBuildConfigGeneratingCompiler implements SourceGeneratingCom
         throws Exception {
         super.addAttribute(key, nsPrefix, nsURI, value, type);
 
-        if ("package".equals(key) && NanoXmlUtil.createLocation("manifest").equals(getLocation())) {
+        if (AndroidCommonUtils.PACKAGE_MANIFEST_ATTRIBUTE.equals(key) &&
+            MANIFEST_LOCATION.equals(getLocation())) {
           packageNameRef.set(value);
           stop();
         }

From 53643aab1c895b833d3187f45a9c575a32c817ea Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Thu, 31 May 2012 18:46:29 +0400
Subject: [PATCH 026/239] new api for android list quick fixes: they should
 behave correctly in ui designer

---
 .../designer/inspection/ErrorAnalyzer.java    |  4 +-
 .../lint/AddMissingPrefixQuickFix.java        | 18 ++---
 .../lint/AndroidLintExternalAnnotator.java    |  4 +-
 .../lint/AndroidLintInspectionBase.java       |  4 +-
 .../inspections/lint/AndroidLintQuickFix.java |  6 +-
 .../lint/AndroidQuickfixContexts.java         | 75 +++++++++++++++++++
 .../inspections/lint/ConvertToDpQuickFix.java | 23 +++---
 .../lint/InefficientWeightQuickFix.java       |  8 +-
 .../lint/RemoveAttributeQuickFix.java         |  8 +-
 .../lint/RemoveUselessViewQuickFix.java       |  8 +-
 .../lint/SetAttributeQuickFix.java            | 61 +++++++++++++--
 .../lint/SetScrollViewSizeQuickFix.java       |  8 +-
 .../inspections/lint/TypographyQuickFix.java  | 12 +--
 13 files changed, 180 insertions(+), 59 deletions(-)
 create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/AndroidQuickfixContexts.java

diff --git a/plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java b/plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java
index 3afda61c8823..a0dd4b11d039 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java
@@ -84,11 +84,11 @@ public final class ErrorAnalyzer {
               List<QuickFix> designerFixes = errorInfo.getQuickFixes();
 
               for (final AndroidLintQuickFix fix : inspection.public_getQuickFixes(message)) {
-                if (fix.isApplicable(startElement, endElement, false)) {
+                if (fix.isApplicable(startElement, endElement, AndroidQuickfixContexts.DesignerContext.TYPE)) {
                   designerFixes.add(new QuickFix(fix.getName(), AbstractQuickFixManager.ICON) {
                     @Override
                     public void run() {
-                      fix.apply(startElement, endElement, null);
+                      fix.apply(startElement, endElement, AndroidQuickfixContexts.DesignerContext.getInstance());
                     }
                   });
                 }
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AddMissingPrefixQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AddMissingPrefixQuickFix.java
index 67b4c390ad08..d8864cc147bc 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/AddMissingPrefixQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AddMissingPrefixQuickFix.java
@@ -2,7 +2,6 @@ package org.jetbrains.android.inspections.lint;
 
 import com.android.sdklib.SdkConstants;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -12,7 +11,6 @@ import com.intellij.psi.xml.XmlTag;
 import com.intellij.xml.XmlExtension;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;
 
@@ -21,14 +19,14 @@ import java.util.Collections;
  */
 class AddMissingPrefixQuickFix implements AndroidLintQuickFix {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.inspections.lint.AddMissingPrefixQuickFix");
-  
+
   @Override
-  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) {
+  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context) {
     final XmlAttribute attribute = PsiTreeUtil.getParentOfType(startElement, XmlAttribute.class, false);
     if (attribute == null) {
       return;
     }
-    
+
     final XmlTag tag = attribute.getParent();
     if (tag == null) {
       LOG.debug("tag is null");
@@ -40,17 +38,17 @@ class AddMissingPrefixQuickFix implements AndroidLintQuickFix {
     if (androidNsPrefix == null) {
       final PsiFile file = tag.getContainingFile();
       final XmlExtension extension = XmlExtension.getExtension(file);
-      
+
       if (extension == null) {
         LOG.debug("Cannot get XmlExtension for file + " + file);
         return;
       }
-      
+
       if (!(file instanceof XmlFile)) {
         LOG.debug(file + " is not XmlFile");
         return;
       }
-      
+
       final XmlFile xmlFile = (XmlFile)file;
       final String defaultPrefix = "android";
       extension.insertNamespaceDeclaration(xmlFile, null, Collections.singleton(SdkConstants.NS_RESOURCES), defaultPrefix, null);
@@ -60,7 +58,9 @@ class AddMissingPrefixQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) {
+  public boolean isApplicable(@NotNull PsiElement startElement,
+                              @NotNull PsiElement endElement,
+                              @NotNull AndroidQuickfixContexts.ContextType contextType) {
     return PsiTreeUtil.getParentOfType(startElement, XmlAttribute.class, false) != null;
   }
 
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintExternalAnnotator.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintExternalAnnotator.java
index 6a5b179b671b..87520d3de2b0 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintExternalAnnotator.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintExternalAnnotator.java
@@ -167,7 +167,7 @@ public class AndroidLintExternalAnnotator extends ExternalAnnotator<State, State
             final Annotation annotation = createAnnotation(holder, message, range, displayLevel);
 
             for (AndroidLintQuickFix fix : inspection.getQuickFixes(message)) {
-              if (fix.isApplicable(startElement, endElement, false)) {
+              if (fix.isApplicable(startElement, endElement, AndroidQuickfixContexts.EditorContext.TYPE)) {
                 annotation.registerFix(new MyFixingIntention(fix, startElement, endElement));
               }
             }
@@ -278,7 +278,7 @@ public class AndroidLintExternalAnnotator extends ExternalAnnotator<State, State
 
     @Override
     public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
-      myQuickFix.apply(myStartElement, myEndElement, editor);
+      myQuickFix.apply(myStartElement, myEndElement, AndroidQuickfixContexts.EditorContext.getInstance(editor) );
     }
 
     @Override
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
index 4beaccefca87..a427a0d860de 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
@@ -85,7 +85,7 @@ public abstract class AndroidLintInspectionBase extends GlobalInspectionTool imp
     final LocalQuickFix[] result = new LocalQuickFix[fixes.length];
     
     for (int i = 0; i < fixes.length; i++) {
-      if (fixes[i].isApplicable(startElement, endElement, true)) {
+      if (fixes[i].isApplicable(startElement, endElement, AndroidQuickfixContexts.BatchContext.TYPE)) {
         result[i] = new MyLocalQuickFix(fixes[i]);
       }
     }
@@ -349,7 +349,7 @@ public abstract class AndroidLintInspectionBase extends GlobalInspectionTool imp
 
     @Override
     public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
-      myLintQuickFix.apply(descriptor.getStartElement(), descriptor.getEndElement(), null);
+      myLintQuickFix.apply(descriptor.getStartElement(), descriptor.getEndElement(), AndroidQuickfixContexts.BatchContext.getInstance());
     }
   }
 }
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintQuickFix.java
index a5e9396fee0f..6ba34a6d937f 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintQuickFix.java
@@ -1,9 +1,7 @@
 package org.jetbrains.android.inspections.lint;
 
-import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Eugene.Kudelevsky
@@ -11,9 +9,9 @@ import org.jetbrains.annotations.Nullable;
 public interface AndroidLintQuickFix {
   AndroidLintQuickFix[] EMPTY_ARRAY = new AndroidLintQuickFix[0];
   
-  void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor);
+  void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context);
 
-  boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode);
+  boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.ContextType contextType);
 
   @NotNull
   String getName();
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidQuickfixContexts.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidQuickfixContexts.java
new file mode 100644
index 000000000000..3f9217b728bf
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidQuickfixContexts.java
@@ -0,0 +1,75 @@
+package org.jetbrains.android.inspections.lint;
+
+import com.intellij.openapi.editor.Editor;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidQuickfixContexts {
+  public static abstract class Context {
+    private final ContextType myType;
+
+    private Context(@NotNull ContextType type) {
+      myType = type;
+    }
+
+    @NotNull
+    public ContextType getType() {
+      return myType;
+    }
+  }
+
+  public static class ContextType {
+    private ContextType() {
+    }
+  }
+
+  public static class BatchContext extends Context {
+    public static final ContextType TYPE = new ContextType();
+    private static final BatchContext INSTANCE = new BatchContext();
+
+    private BatchContext() {
+      super(TYPE);
+    }
+
+    @NotNull
+    public static BatchContext getInstance() {
+      return INSTANCE;
+    }
+  }
+
+  public static class EditorContext extends Context {
+    public static final ContextType TYPE = new ContextType();
+    private final Editor myEditor;
+
+    private EditorContext(@NotNull Editor editor) {
+      super(TYPE);
+      myEditor = editor;
+    }
+
+    @NotNull
+    public Editor getEditor() {
+      return myEditor;
+    }
+
+    @NotNull
+    public static EditorContext getInstance(@NotNull Editor editor) {
+      return new EditorContext(editor);
+    }
+  }
+
+  public static class DesignerContext extends Context {
+    public static final ContextType TYPE = new ContextType();
+    private static final DesignerContext INSTANCE = new DesignerContext();
+
+    private DesignerContext() {
+      super(TYPE);
+    }
+
+    @NotNull
+    public static DesignerContext getInstance() {
+      return INSTANCE;
+    }
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/ConvertToDpQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/ConvertToDpQuickFix.java
index e0190e1bc360..27dccdc9948a 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/ConvertToDpQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/ConvertToDpQuickFix.java
@@ -3,7 +3,6 @@ package org.jetbrains.android.inspections.lint;
 import com.android.resources.Density;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -11,7 +10,6 @@ import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlTag;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,12 +22,12 @@ import java.util.regex.Pattern;
 class ConvertToDpQuickFix implements AndroidLintQuickFix {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.inspections.lint.ConvertToDpQuickFix");
   private static final Pattern PX_ATTR_VALUE_PATTERN = Pattern.compile("(\\d+)px");
-  
+
   private static int ourPrevDpi = Density.DEFAULT_DENSITY;
 
   @Override
-  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) {
-    if (editor == null) {
+  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context) {
+    if (context instanceof AndroidQuickfixContexts.BatchContext) {
       return;
     }
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class);
@@ -42,7 +40,7 @@ class ConvertToDpQuickFix implements AndroidLintQuickFix {
     }
 
     final String[] densityPresentableNames = new String[densities.size()];
-    
+
     String defaultValue = null;
     String initialValue = null;
 
@@ -54,7 +52,7 @@ class ConvertToDpQuickFix implements AndroidLintQuickFix {
       if (dpi == 0) {
         continue;
       }
-      
+
       if (dpi == ourPrevDpi) {
         initialValue = densityPresentableNames[i];
       }
@@ -69,9 +67,9 @@ class ConvertToDpQuickFix implements AndroidLintQuickFix {
     if (initialValue == null) {
       return;
     }
-    
+
     final int dpi;
-    
+
     if (ApplicationManager.getApplication().isUnitTestMode()) {
       dpi = Density.DEFAULT_DENSITY;
     }
@@ -115,8 +113,11 @@ class ConvertToDpQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) {
-    return !inBatchMode && PsiTreeUtil.getParentOfType(startElement, XmlTag.class) != null;
+  public boolean isApplicable(@NotNull PsiElement startElement,
+                              @NotNull PsiElement endElement,
+                              @NotNull AndroidQuickfixContexts.ContextType contextType) {
+    return contextType != AndroidQuickfixContexts.BatchContext.TYPE &&
+           PsiTreeUtil.getParentOfType(startElement, XmlTag.class) != null;
   }
 
   @NotNull
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/InefficientWeightQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/InefficientWeightQuickFix.java
index 7d2c4e6ee443..e5f84f1774dc 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/InefficientWeightQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/InefficientWeightQuickFix.java
@@ -1,13 +1,11 @@
 package org.jetbrains.android.inspections.lint;
 
 import com.android.sdklib.SdkConstants;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Eugene.Kudelevsky
@@ -15,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
 class InefficientWeightQuickFix implements AndroidLintQuickFix {
 
   @Override
-  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) {
+  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context) {
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class);
     if (tag == null) {
       return;
@@ -38,7 +36,9 @@ class InefficientWeightQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) {
+  public boolean isApplicable(@NotNull PsiElement startElement,
+                              @NotNull PsiElement endElement,
+                              @NotNull AndroidQuickfixContexts.ContextType contextType) {
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class);
     if (tag == null) {
       return false;
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveAttributeQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveAttributeQuickFix.java
index b9d01eaba5e9..b215ef9558b9 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveAttributeQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveAttributeQuickFix.java
@@ -1,19 +1,17 @@
 package org.jetbrains.android.inspections.lint;
 
-import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlAttribute;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Eugene.Kudelevsky
  */
 class RemoveAttributeQuickFix implements AndroidLintQuickFix {
   @Override
-  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) {
+  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context) {
     final XmlAttribute attribute = PsiTreeUtil.getParentOfType(startElement, XmlAttribute.class);
     if (attribute != null) {
       attribute.getParent().setAttribute(attribute.getName(), null);
@@ -21,7 +19,9 @@ class RemoveAttributeQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) {
+  public boolean isApplicable(@NotNull PsiElement startElement,
+                              @NotNull PsiElement endElement,
+                              @NotNull AndroidQuickfixContexts.ContextType contextType) {
     return PsiTreeUtil.getParentOfType(startElement, XmlAttribute.class) != null;
   }
 
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveUselessViewQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveUselessViewQuickFix.java
index 3c429b7fe435..b2188f4695fb 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveUselessViewQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveUselessViewQuickFix.java
@@ -2,13 +2,11 @@ package org.jetbrains.android.inspections.lint;
 
 import com.android.tools.lint.checks.UselessViewDetector;
 import com.android.tools.lint.detector.api.Issue;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Eugene.Kudelevsky
@@ -21,7 +19,7 @@ public class RemoveUselessViewQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) {
+  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context) {
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class);
     if (tag == null) {
       return;
@@ -42,7 +40,9 @@ public class RemoveUselessViewQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) {
+  public boolean isApplicable(@NotNull PsiElement startElement,
+                              @NotNull PsiElement endElement,
+                              @NotNull AndroidQuickfixContexts.ContextType contextType) {
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class);
     if (tag == null) {
       return false;
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java
index 4143549ef208..e4ad95f2f982 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java
@@ -2,12 +2,17 @@ package org.jetbrains.android.inspections.lint;
 
 import com.android.sdklib.SdkConstants;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlTag;
+import org.jetbrains.android.dom.attrs.AttributeDefinition;
+import org.jetbrains.android.dom.attrs.AttributeDefinitions;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.android.resourceManagers.SystemResourceManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -20,6 +25,7 @@ class SetAttributeQuickFix implements AndroidLintQuickFix {
   private final String myAttributeName;
   private final String myValue;
 
+  // 'null' value means asking
   SetAttributeQuickFix(@NotNull String name, @NotNull String attributeName, @Nullable String value) {
     super();
     myName = name;
@@ -34,19 +40,28 @@ class SetAttributeQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) {
+  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context) {
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class, false);
-    
+
     if (tag == null) {
       return;
     }
+    String value = myValue;
+
+    if (value == null && context instanceof AndroidQuickfixContexts.DesignerContext) {
+      value = askForAttributeValue(tag);
+      if (value == null) {
+        return;
+      }
+    }
     final XmlAttribute attribute = tag.setAttribute(myAttributeName, SdkConstants.NS_RESOURCES, "");
 
     if (attribute != null) {
-      if (myValue != null) {
-        attribute.setValue(myValue);
+      if (value != null) {
+        attribute.setValue(value);
       }
-      if (editor != null) {
+      if (context instanceof AndroidQuickfixContexts.EditorContext) {
+        final Editor editor = ((AndroidQuickfixContexts.EditorContext)context).getEditor();
         final XmlAttributeValue valueElement = attribute.getValueElement();
         final TextRange valueTextRange = attribute.getValueTextRange();
 
@@ -63,12 +78,44 @@ class SetAttributeQuickFix implements AndroidLintQuickFix {
     }
   }
 
+  @Nullable
+  private String askForAttributeValue(@NotNull PsiElement context) {
+    final AndroidFacet facet = AndroidFacet.getInstance(context);
+    final String message = "Specify value of attribute '" + myAttributeName + "'";
+    final String title = "Set attribute value";
+
+    if (facet != null) {
+      final SystemResourceManager srm = facet.getSystemResourceManager();
+
+      if (srm != null) {
+        final AttributeDefinitions attrDefs = srm.getAttributeDefinitions();
+
+        if (attrDefs != null) {
+          final AttributeDefinition def = attrDefs.getAttrDefByName(myAttributeName);
+          if (def != null) {
+            final String[] variants = def.getValues();
+
+            if (variants.length > 0) {
+              return Messages.showEditableChooseDialog(message, title, Messages.getQuestionIcon(), variants, variants[0], null);
+            }
+          }
+        }
+      }
+    }
+    return Messages.showInputDialog(context.getProject(), message, title, Messages.getQuestionIcon());
+  }
+
   @Override
-  public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) {
+  public boolean isApplicable(@NotNull PsiElement startElement,
+                              @NotNull PsiElement endElement,
+                              @NotNull AndroidQuickfixContexts.ContextType contextType) {
+    if (myValue == null && contextType == AndroidQuickfixContexts.BatchContext.TYPE) {
+      return false;
+    }
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class, false);
     if (tag == null) {
       return false;
     }
-    return tag.getAttribute(myAttributeName,  SdkConstants.NS_RESOURCES) == null;
+    return tag.getAttribute(myAttributeName, SdkConstants.NS_RESOURCES) == null;
   }
 }
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/SetScrollViewSizeQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/SetScrollViewSizeQuickFix.java
index 336bb9a11f61..d39332910c63 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/SetScrollViewSizeQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/SetScrollViewSizeQuickFix.java
@@ -2,20 +2,18 @@ package org.jetbrains.android.inspections.lint;
 
 import com.android.sdklib.SdkConstants;
 import com.android.tools.lint.detector.api.LintConstants;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author Eugene.Kudelevsky
  */
 class SetScrollViewSizeQuickFix implements AndroidLintQuickFix {
   @Override
-  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) {
+  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context) {
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class);
     if (tag == null) {
       return;
@@ -34,7 +32,9 @@ class SetScrollViewSizeQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) {
+  public boolean isApplicable(@NotNull PsiElement startElement,
+                              @NotNull PsiElement endElement,
+                              @NotNull AndroidQuickfixContexts.ContextType contextType) {
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class);
     if (tag == null) {
       return false;
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/TypographyQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/TypographyQuickFix.java
index a290b68ee61d..52091bf9248a 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/TypographyQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/TypographyQuickFix.java
@@ -3,14 +3,12 @@ package org.jetbrains.android.inspections.lint;
 import com.android.tools.lint.checks.TypographyDetector;
 import com.android.tools.lint.detector.api.Issue;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -27,7 +25,7 @@ class TypographyQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) {
+  public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull AndroidQuickfixContexts.Context context) {
     final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class);
     if (tag == null) {
       return;
@@ -44,11 +42,11 @@ class TypographyQuickFix implements AndroidLintQuickFix {
 
           for (TypographyDetector.ReplaceEdit edit : edits) {
             String with = edit.replaceWith;
-            
+
             if (ApplicationManager.getApplication().isUnitTestMode()) {
               with = with.replace('\u2013', '~').replace('\u2018', '{').replace('\u2019', '}');
             }
-            
+
             builder.replace(edit.offset, edit.offset + edit.length, with);
           }
 
@@ -62,7 +60,9 @@ class TypographyQuickFix implements AndroidLintQuickFix {
   }
 
   @Override
-  public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) {
+  public boolean isApplicable(@NotNull PsiElement startElement,
+                              @NotNull PsiElement endElement,
+                              @NotNull AndroidQuickfixContexts.ContextType contextType) {
     return PsiTreeUtil.getParentOfType(startElement, XmlTag.class) != null;
   }
 

From 6e420869b419e9a72ea24d64d415a439911a8a4d Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Thu, 31 May 2012 16:50:06 +0200
Subject: [PATCH 027/239] IDEA-85612 Edit Breakpoint Popup: Editing condition
 in '...' dialog doesn't saves the expression

---
 .../platform-impl/src/com/intellij/ui/BalloonImpl.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
index 2958e9668b5e..50d9210c4508 100644
--- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.ex.AnActionListener;
 import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.GraphicsConfig;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.ui.impl.ShadowBorderPainter;
@@ -90,7 +91,7 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui {
         final boolean insideBalloon = isInsideBalloon(me);
 
         if (myHideOnMouse && id == MOUSE_PRESSED) {
-          if (!insideBalloon) {
+          if (!insideBalloon && !hasModalDialog(me)) {
             hide();
           }
           return;
@@ -132,6 +133,12 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui {
       }
     }
   };
+
+  private static boolean hasModalDialog(MouseEvent e) {
+    final DialogWrapper dialog = DialogWrapper.findInstance(e.getComponent());
+    return dialog != null && dialog.isModal();
+  }
+
   private final long myFadeoutTime;
   private Dimension myDefaultPrefSize;
   private final ActionListener myClickHandler;

From 1b5cea2314cd4d1f52d6a4bd813d436148f135fe Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Thu, 31 May 2012 19:00:45 +0400
Subject: [PATCH 028/239] refactor: remove public_getQuickFixes, make
 getQuickFixes public

---
 .../designer/inspection/ErrorAnalyzer.java    |  2 +-
 .../lint/AndroidLintInspectionBase.java       |  7 +-----
 .../AndroidLintInspectionToolProvider.java    | 22 +++++++++----------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java b/plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java
index a0dd4b11d039..92f514d700a3 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java
@@ -83,7 +83,7 @@ public final class ErrorAnalyzer {
 
               List<QuickFix> designerFixes = errorInfo.getQuickFixes();
 
-              for (final AndroidLintQuickFix fix : inspection.public_getQuickFixes(message)) {
+              for (final AndroidLintQuickFix fix : inspection.getQuickFixes(message)) {
                 if (fix.isApplicable(startElement, endElement, AndroidQuickfixContexts.DesignerContext.TYPE)) {
                   designerFixes.add(new QuickFix(fix.getName(), AbstractQuickFixManager.ICON) {
                     @Override
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
index a427a0d860de..7a5b3f0af14f 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java
@@ -65,15 +65,10 @@ public abstract class AndroidLintInspectionBase extends GlobalInspectionTool imp
   }
 
   @NotNull
-  protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+  public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
     return AndroidLintQuickFix.EMPTY_ARRAY;
   }
 
-  @NotNull
-  public AndroidLintQuickFix[] public_getQuickFixes(@NotNull String message) {
-    return getQuickFixes(message);
-  }
-
   @NotNull
   public IntentionAction[] getIntentions(@NotNull PsiElement startElement, @NotNull PsiElement endElement) {
     return IntentionAction.EMPTY_ARRAY;
diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionToolProvider.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionToolProvider.java
index 855510204e91..dca31689700c 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionToolProvider.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionToolProvider.java
@@ -245,7 +245,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
     }
 
     @NotNull
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{
         new SetAttributeQuickFix(AndroidBundle.message("android.lint.inspections.add.content.description"),
                                  LintConstants.ATTR_CONTENT_DESCRIPTION, null)
@@ -381,7 +381,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{new AddMissingPrefixQuickFix()};
     }
   }
@@ -417,7 +417,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{
         new InefficientWeightQuickFix()
       };
@@ -437,7 +437,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{
         new SetAttributeQuickFix(AndroidBundle.message("android.lint.inspections.set.baseline.attribute"),
                                  LintConstants.ATTR_BASELINE_ALIGNED, "false")
@@ -482,7 +482,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{new RemoveAttributeQuickFix()};
     }
   }
@@ -506,7 +506,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{new ConvertToDpQuickFix()};
     }
   }
@@ -518,7 +518,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{new SetScrollViewSizeQuickFix()};
     }
   }
@@ -530,7 +530,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{
         new SetAttributeQuickFix(AndroidBundle.message("android.lint.inspections.add.permission.attribute"),
                                  LintConstants.ATTR_PERMISSION, null)
@@ -563,7 +563,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{
         new SetAttributeQuickFix(AndroidBundle.message("android.lint.inspections.add.input.type.attribute"),
                                  LintConstants.ATTR_INPUT_TYPE, null)
@@ -636,7 +636,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[]{new RemoveUselessViewQuickFix(myIssue)};
     }
   }
@@ -648,7 +648,7 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider
 
     @NotNull
     @Override
-    protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
+    public AndroidLintQuickFix[] getQuickFixes(@NotNull String message) {
       return new AndroidLintQuickFix[] {new TypographyQuickFix(myIssue, message)};
     }
   }

From 970ab7b14b6f2bdf4c0b6901cdc7c57e23a7ed88 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Thu, 31 May 2012 19:03:31 +0400
Subject: [PATCH 029/239] cosmetics: capitalize title

---
 .../android/inspections/lint/SetAttributeQuickFix.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java
index e4ad95f2f982..b478c1e9024b 100644
--- a/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java
+++ b/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java
@@ -82,7 +82,7 @@ class SetAttributeQuickFix implements AndroidLintQuickFix {
   private String askForAttributeValue(@NotNull PsiElement context) {
     final AndroidFacet facet = AndroidFacet.getInstance(context);
     final String message = "Specify value of attribute '" + myAttributeName + "'";
-    final String title = "Set attribute value";
+    final String title = "Set Attribute Value";
 
     if (facet != null) {
       final SystemResourceManager srm = facet.getSystemResourceManager();

From 31a757336e96ea95d11e0fda6c861658edad14f5 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Thu, 31 May 2012 19:18:38 +0400
Subject: [PATCH 030/239] IDEA-85741 subversion integration autodetection
 broken for 1.7 working copies

---
 .../openapi/vcs/impl/VcsDescriptor.java       | 42 +++++++++++++---
 .../VcsMappingConfigurationDialog.java        | 50 ++++++++++++++-----
 .../com/intellij/openapi/vcs/impl/VcsEP.java  |  4 +-
 plugins/svn4idea/src/META-INF/plugin.xml      |  2 +-
 4 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/impl/VcsDescriptor.java b/platform/vcs-api/src/com/intellij/openapi/vcs/impl/VcsDescriptor.java
index aee403b937d9..56167f373ad0 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/impl/VcsDescriptor.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/impl/VcsDescriptor.java
@@ -15,31 +15,57 @@
  */
 package com.intellij.openapi.vcs.impl;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.util.Comparing;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.vcs.VcsBundle;
 import com.intellij.openapi.vfs.VirtualFile;
 
 public class VcsDescriptor implements Comparable<VcsDescriptor> {
   private final String myName;
+  private final boolean myCrawlUpToCheckUnderVcs;
   private final String myDisplayName;
   private final String myAdministrativePattern;
   private boolean myIsNone;
 
-  public VcsDescriptor(String administrativePattern, String displayName, String name) {
+  public VcsDescriptor(String administrativePattern, String displayName, String name, boolean crawlUpToCheckUnderVcs) {
     myAdministrativePattern = administrativePattern;
     myDisplayName = displayName;
     myName = name;
+    myCrawlUpToCheckUnderVcs = crawlUpToCheckUnderVcs;
   }
 
   public boolean probablyUnderVcs(final VirtualFile file) {
     if (file == null || (! file.isDirectory()) || (! file.isValid())) return false;
     if (myAdministrativePattern == null) return false;
-    final String[] patterns = myAdministrativePattern.split(",");
-    for (String pattern : patterns) {
-      final VirtualFile child = file.findChild(pattern.trim());
-      if (child != null) return true;
-    }
-    return false;
+    return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
+      @Override
+      public Boolean compute() {
+        if (checkFileForBeingAdministrative(file)) return true;
+        if (myCrawlUpToCheckUnderVcs) {
+          VirtualFile current = file.getParent();
+          while (current != null) {
+            if (checkFileForBeingAdministrative(current)) return true;
+            current = current.getParent();
+          }
+        }
+        return false;
+      }
+    });
+  }
+
+  private boolean checkFileForBeingAdministrative(final VirtualFile file) {
+    return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
+      @Override
+      public Boolean compute() {
+        final String[] patterns = myAdministrativePattern.split(",");
+        for (String pattern : patterns) {
+          final VirtualFile child = file.findChild(pattern.trim());
+          if (child != null) return true;
+        }
+        return false;
+      }
+    });
   }
 
   public String getDisplayName() {
@@ -72,7 +98,7 @@ public class VcsDescriptor implements Comparable<VcsDescriptor> {
   }
 
   public static VcsDescriptor createFictive() {
-    final VcsDescriptor vcsDescriptor = new VcsDescriptor(null, VcsBundle.message("none.vcs.presentation"), null);
+    final VcsDescriptor vcsDescriptor = new VcsDescriptor(null, VcsBundle.message("none.vcs.presentation"), null, false);
     vcsDescriptor.myIsNone = true;
     return vcsDescriptor;
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java
index 3a06bebec303..5d58c8b8e928 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java
@@ -20,6 +20,8 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.UnnamedConfigurable;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.*;
 import com.intellij.openapi.util.io.FileUtil;
@@ -31,6 +33,8 @@ import com.intellij.openapi.vcs.impl.DefaultVcsRootPolicy;
 import com.intellij.openapi.vcs.impl.VcsDescriptor;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.components.JBLabel;
+import com.intellij.util.continuation.ModalityIgnorantBackgroundableTask;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
@@ -197,20 +201,40 @@ public class VcsMappingConfigurationDialog extends DialogWrapper {
       super.onFileChoosen(chosenFile);
       final VcsDescriptor wrapper = (VcsDescriptor) myVCSComboBox.getSelectedItem();
       if (oldText.length() == 0 && (wrapper == null || wrapper.isNone())) {
-        VcsDescriptor probableVcs = null;
-        for(VcsDescriptor vcs: myVcses.values()) {
-          if (vcs.probablyUnderVcs(chosenFile)) {
-            if (probableVcs != null) {
-              probableVcs = null;
-              break;
+        final ModalityIgnorantBackgroundableTask task =
+          new ModalityIgnorantBackgroundableTask(myProject, "Looking for VCS administrative area, false") {
+            VcsDescriptor probableVcs = null;
+
+            @Override
+            protected void doInAwtIfFail(Exception e) {
             }
-            probableVcs = vcs;
-          }
-        }
-        if (probableVcs != null) {
-          // todo none
-          myVCSComboBox.setSelectedItem(probableVcs);
-        }
+
+            @Override
+            protected void doInAwtIfCancel() {
+            }
+
+            @Override
+            protected void doInAwtIfSuccess() {
+              if (probableVcs != null) {
+                // todo none
+                myVCSComboBox.setSelectedItem(probableVcs);
+              }
+            }
+
+            @Override
+            protected void runImpl(@NotNull ProgressIndicator indicator) {
+              for (VcsDescriptor vcs : myVcses.values()) {
+                if (vcs.probablyUnderVcs(chosenFile)) {
+                  if (probableVcs != null) {
+                    probableVcs = null;
+                    break;
+                  }
+                  probableVcs = vcs;
+                }
+              }
+            }
+          };
+        ProgressManager.getInstance().run(task);
       }
     }
   }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
index 775947e8592a..7eda8accaa93 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsEP.java
@@ -43,6 +43,8 @@ public class VcsEP extends AbstractExtensionPointBean {
   public String displayName;
   @Attribute("administrativeAreaName")
   public String administrativeAreaName;
+  @Attribute("crawlUpToCheckUnderVcs")
+  public boolean crawlUpToCheckUnderVcs;
 
   private AbstractVcs myVcs;
 
@@ -69,6 +71,6 @@ public class VcsEP extends AbstractExtensionPointBean {
   }
 
   public VcsDescriptor createDescriptor() {
-    return new VcsDescriptor(administrativeAreaName, displayName, name);
+    return new VcsDescriptor(administrativeAreaName, displayName, name, crawlUpToCheckUnderVcs);
   }
 }
diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index a9b27e678deb..12bde03814e6 100644
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -132,7 +132,7 @@
     <applicationService serviceInterface="org.jetbrains.idea.svn.dialogs.browserCache.Loader"
                     serviceImplementation="org.jetbrains.idea.svn.dialogs.browserCache.CacheLoader"/>
 
-    <vcs name="svn" vcsClass="org.jetbrains.idea.svn.SvnVcs" displayName="Subversion" administrativeAreaName=".svn, _svn"/>
+    <vcs name="svn" vcsClass="org.jetbrains.idea.svn.SvnVcs" displayName="Subversion" administrativeAreaName=".svn, _svn" crawlUpToCheckUnderVcs="true"/>
 
     <ComponentRoamingType component="SvnConfiguration" type="DISABLED"/>
     <vcsPopupProvider implementation="org.jetbrains.idea.svn.actions.SvnQuickListContentProvider"/>

From e11f69ee842fe5b38df2229d81eb944c970419e8 Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Thu, 31 May 2012 19:33:45 +0400
Subject: [PATCH 031/239] revert fixing exception

---
 .../platform-impl/src/com/intellij/ide/IdeRepaintManager.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/IdeRepaintManager.java b/platform/platform-impl/src/com/intellij/ide/IdeRepaintManager.java
index 694a00782a9c..bb2cf498987c 100644
--- a/platform/platform-impl/src/com/intellij/ide/IdeRepaintManager.java
+++ b/platform/platform-impl/src/com/intellij/ide/IdeRepaintManager.java
@@ -44,7 +44,6 @@ public class IdeRepaintManager extends RepaintManager {
   WeakReference<JComponent> myLastComponent;
 
   public Image getVolatileOffscreenBuffer(Component c, int proposedWidth, int proposedHeight) {
-    if (proposedWidth <= 0 || proposedHeight <= 0) return null;
     final Image buffer = super.getVolatileOffscreenBuffer(c, proposedWidth, proposedHeight);
     clearLeakyImages(false); // DisplayChangedListener might be unavailable
     return buffer;

From 9a0587b2ad4ed85926c4022789e231b153f8a573 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Wed, 30 May 2012 19:35:29 +0400
Subject: [PATCH 032/239] inner -> nested

---
 .../platform-resources-en/src/messages/UsageView.properties     | 2 +-
 .../usageView/src/com/intellij/usages/impl/rules/UsageType.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/platform-resources-en/src/messages/UsageView.properties b/platform/platform-resources-en/src/messages/UsageView.properties
index a8333adb3c88..dab1be4932a9 100644
--- a/platform/platform-resources-en/src/messages/UsageView.properties
+++ b/platform/platform-resources-en/src/messages/UsageView.properties
@@ -52,7 +52,7 @@ usage.target.xml.tag.of.file={0} of file {1}
 usage.target.package.in.directory={0} (in {1})
 usage.target.exception=Exception
 usage.type.new=New instance creation
-usage.type.new.inner=New inner class instance creation
+usage.type.new.nested=New nested class instance creation
 usage.type.new.anonymous=New anonymous inheritor creation
 usage.type.new.array=New array creation
 usage.type.annotation=Annotation
diff --git a/platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java b/platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java
index 43905dd67b2e..698bd075f093 100644
--- a/platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java
+++ b/platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java
@@ -31,7 +31,7 @@ public final class UsageType {
   public static final UsageType CLASS_CATCH_CLAUSE_PARAMETER_DECLARATION = new UsageType(UsageViewBundle.message("usage.type.catch.declaration"));
   public static final UsageType CLASS_METHOD_RETURN_TYPE = new UsageType(UsageViewBundle.message("usage.type.return"));
   public static final UsageType CLASS_NEW_OPERATOR = new UsageType(UsageViewBundle.message("usage.type.new"));
-  public static final UsageType CLASS_INNER_NEW_OPERATOR = new UsageType(UsageViewBundle.message("usage.type.new.inner"));
+  public static final UsageType CLASS_NESTED_NEW_OPERATOR = new UsageType(UsageViewBundle.message("usage.type.new.nested"));
   public static final UsageType CLASS_ANONYMOUS_NEW_OPERATOR = new UsageType(UsageViewBundle.message("usage.type.new.anonymous"));
   public static final UsageType CLASS_NEW_ARRAY = new UsageType(UsageViewBundle.message("usage.type.new.array"));
   public static final UsageType ANNOTATION = new UsageType(UsageViewBundle.message("usage.type.annotation"));

From 4eabf0d145238112b6028036d990759d0a4f0bb3 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Wed, 30 May 2012 21:20:44 +0400
Subject: [PATCH 033/239] IDEA-85626 "Field declaration" usage type group mixes
 together fields of class and fields of its inner classes fixed

---
 .../usages/impl/rules/JavaUsageTypeProvider.java       | 10 ++++++----
 .../src/messages/UsageView.properties                  |  2 +-
 .../src/com/intellij/usages/impl/rules/UsageType.java  |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java b/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java
index cce007268945..7cdf805178d0 100644
--- a/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java
+++ b/java/java-impl/src/com/intellij/usages/impl/rules/JavaUsageTypeProvider.java
@@ -157,6 +157,11 @@ public class JavaUsageTypeProvider implements UsageTypeProviderEx {
 
   @Nullable
   private static UsageType getClassUsageType(@NotNull PsiElement element, @NotNull UsageTarget[] targets) {
+    final PsiJavaCodeReferenceElement codeReference = PsiTreeUtil.getParentOfType(element, PsiJavaCodeReferenceElement.class);
+    if(codeReference != null && isNestedClassOf(codeReference,targets)){
+      return UsageType.CLASS_NESTED_CLASS_ACCESS;
+    }
+
     if (element.getParent() instanceof PsiAnnotation &&
         element == ((PsiAnnotation)element.getParent()).getNameReferenceElement()) {
       return UsageType.ANNOTATION;
@@ -224,9 +229,6 @@ public class JavaUsageTypeProvider implements UsageTypeProviderEx {
         if (isAnonymousClassOf(psiNewExpression.getAnonymousClass(), targets)) {
           return UsageType.CLASS_ANONYMOUS_NEW_OPERATOR;
         }
-        if (isInnerClassOf(classReference, targets)) {
-          return UsageType.CLASS_INNER_NEW_OPERATOR;
-        }
         if (isNewArrayCreation(psiNewExpression)) {
           return UsageType.CLASS_NEW_ARRAY;
         }
@@ -249,7 +251,7 @@ public class JavaUsageTypeProvider implements UsageTypeProviderEx {
     return qualifiesToTargetClasses(anonymousClass.getBaseClassReference(), targets);
   }
 
-  private static boolean isInnerClassOf(PsiJavaCodeReferenceElement classReference, @NotNull UsageTarget[] targets) {
+  private static boolean isNestedClassOf(PsiJavaCodeReferenceElement classReference, @NotNull UsageTarget[] targets) {
     final PsiElement qualifier = classReference.getQualifier();
     if (qualifier instanceof PsiJavaCodeReferenceElement) {
       return qualifiesToTargetClasses((PsiJavaCodeReferenceElement)qualifier, targets);
diff --git a/platform/platform-resources-en/src/messages/UsageView.properties b/platform/platform-resources-en/src/messages/UsageView.properties
index dab1be4932a9..8a0fb1290ae6 100644
--- a/platform/platform-resources-en/src/messages/UsageView.properties
+++ b/platform/platform-resources-en/src/messages/UsageView.properties
@@ -33,6 +33,7 @@ usage.type.import=Usage in import
 usage.type.cast.target=Usage in cast target type
 usage.type.extends=Usage in extends/implements clause
 usage.type.static.member=Class static member access
+usage.type.nested.class=Nested class access
 usage.type.throws.list=Method throws list
 usage.type.class.object=Usage in .class
 usage.type.field.declaration=Field declaration
@@ -52,7 +53,6 @@ usage.target.xml.tag.of.file={0} of file {1}
 usage.target.package.in.directory={0} (in {1})
 usage.target.exception=Exception
 usage.type.new=New instance creation
-usage.type.new.nested=New nested class instance creation
 usage.type.new.anonymous=New anonymous inheritor creation
 usage.type.new.array=New array creation
 usage.type.annotation=Annotation
diff --git a/platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java b/platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java
index 698bd075f093..c8b2932e014c 100644
--- a/platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java
+++ b/platform/usageView/src/com/intellij/usages/impl/rules/UsageType.java
@@ -23,6 +23,7 @@ public final class UsageType {
   public static final UsageType CLASS_CAST_TO = new UsageType(UsageViewBundle.message("usage.type.cast.target"));
   public static final UsageType CLASS_EXTENDS_IMPLEMENTS_LIST = new UsageType(UsageViewBundle.message("usage.type.extends"));
   public static final UsageType CLASS_STATIC_MEMBER_ACCESS = new UsageType(UsageViewBundle.message("usage.type.static.member"));
+  public static final UsageType CLASS_NESTED_CLASS_ACCESS = new UsageType(UsageViewBundle.message("usage.type.nested.class"));
   public static final UsageType CLASS_METHOD_THROWS_LIST = new UsageType(UsageViewBundle.message("usage.type.throws.list"));
   public static final UsageType CLASS_CLASS_OBJECT_ACCESS = new UsageType(UsageViewBundle.message("usage.type.class.object"));
   public static final UsageType CLASS_FIELD_DECLARATION = new UsageType(UsageViewBundle.message("usage.type.field.declaration"));
@@ -31,7 +32,6 @@ public final class UsageType {
   public static final UsageType CLASS_CATCH_CLAUSE_PARAMETER_DECLARATION = new UsageType(UsageViewBundle.message("usage.type.catch.declaration"));
   public static final UsageType CLASS_METHOD_RETURN_TYPE = new UsageType(UsageViewBundle.message("usage.type.return"));
   public static final UsageType CLASS_NEW_OPERATOR = new UsageType(UsageViewBundle.message("usage.type.new"));
-  public static final UsageType CLASS_NESTED_NEW_OPERATOR = new UsageType(UsageViewBundle.message("usage.type.new.nested"));
   public static final UsageType CLASS_ANONYMOUS_NEW_OPERATOR = new UsageType(UsageViewBundle.message("usage.type.new.anonymous"));
   public static final UsageType CLASS_NEW_ARRAY = new UsageType(UsageViewBundle.message("usage.type.new.array"));
   public static final UsageType ANNOTATION = new UsageType(UsageViewBundle.message("usage.type.annotation"));

From 998f5cce1c6dbdaf7ed756e371d1213aede7f502 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 31 May 2012 17:28:19 +0200
Subject: [PATCH 034/239] earlier LowMemoryWatcher notifications

---
 .../jps/incremental/IncProjectBuilder.java    |  10 +-
 .../com/intellij/semantic/SemServiceImpl.java |   5 +-
 .../openapi/util/LowMemoryWatcher.java        | 117 ++++++------------
 .../intellij/util/io/PersistentHashMap.java   |   4 +-
 4 files changed, 42 insertions(+), 94 deletions(-)

diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index 91ccb8ac3f85..8d2e56bc3683 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -1,6 +1,5 @@
 package org.jetbrains.jps.incremental;
 
-import com.intellij.openapi.Forceable;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.LowMemoryWatcher;
 import com.intellij.openapi.util.Pair;
@@ -93,14 +92,9 @@ public class IncProjectBuilder {
 
   public void build(CompileScope scope, final boolean isMake, final boolean isProjectRebuild, boolean forceCleanCaches)
     throws RebuildRequestedException {
-    final LowMemoryWatcher memWatcher = LowMemoryWatcher.register(new Forceable() {
+    final LowMemoryWatcher memWatcher = LowMemoryWatcher.register(new Runnable() {
       @Override
-      public boolean isDirty() {
-        return true; // always perform flush when not enough memory
-      }
-
-      @Override
-      public void force() {
+      public void run() {
         myProjectDescriptor.dataManager.flush(false);
         myTimestamps.force();
       }
diff --git a/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java b/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java
index b386c380a8d9..222e154f132a 100644
--- a/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java
+++ b/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java
@@ -89,8 +89,9 @@ public class SemServiceImpl extends SemService{
 
     myInheritors = cacheKeyHierarchy(myProducers.keySet());
     
-    final LowMemoryWatcher watcher = LowMemoryWatcher.register(new LowMemoryWatcher.ForceableAdapter() {
-      public void force() {
+    final LowMemoryWatcher watcher = LowMemoryWatcher.register(new Runnable() {
+      @Override
+      public void run() {
         clearCache();
         //System.out.println("SemService cache flushed");
       }
diff --git a/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java b/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
index bbdf98350dea..57810812d1d7 100644
--- a/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
+++ b/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
@@ -15,16 +15,16 @@
  */
 package com.intellij.openapi.util;
 
-import com.intellij.openapi.Forceable;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.reference.SoftReference;
-import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.containers.WeakList;
 
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import javax.management.Notification;
+import javax.management.NotificationEmitter;
+import javax.management.NotificationListener;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryNotificationInfo;
+import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.MemoryType;
 
 /**
  * @author Eugene Zhuravlev
@@ -33,97 +33,50 @@ import java.util.Set;
 public class LowMemoryWatcher {
   private static final long MEM_THRESHOLD = 5 /*MB*/ * 1024 * 1024;
   
-  public abstract static class ForceableAdapter implements Forceable {
-    public boolean isDirty() {
-      return true;
-    }
-  }
-  
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.LowMemoryWatcher");
   
-  private static final ReferenceQueue<Object> ourRefQueue = new ReferenceQueue<Object>();
-  @SuppressWarnings({"FieldCanBeLocal"}) 
-  private static SoftReference<Object> ourRef;
-  private static final List<WeakReference<LowMemoryWatcher>> ourInstances = ContainerUtil.createEmptyCOWList();
+  private static final WeakList<LowMemoryWatcher> ourInstances = new WeakList<LowMemoryWatcher>();
 
-  private final Forceable myForceable;
+  private final Runnable myRunnable;
 
   static {
-    final Thread thread = new Thread("LowMemoryWatcher") {
-      boolean shouldCleanup = false;
-      public void run() {
-        updateRef();
-        final Set<WeakReference<LowMemoryWatcher>> toRemove = new HashSet<WeakReference<LowMemoryWatcher>>();
-        
-        while (true)  {
-          try {
-            ourRefQueue.remove();
-            updateRef();
-
-            if (!shouldCleanup) {
-              final Runtime runtime = Runtime.getRuntime();
-              shouldCleanup = runtime.maxMemory() - runtime.totalMemory() <= MEM_THRESHOLD;
+    for (MemoryPoolMXBean bean : ManagementFactory.getMemoryPoolMXBeans()) {
+      if (bean.getType() == MemoryType.HEAP && bean.isUsageThresholdSupported()) {
+        long threshold = bean.getUsage().getMax() - MEM_THRESHOLD;
+        if (threshold > 0) {
+          bean.setUsageThreshold(threshold);
+          bean.setCollectionUsageThreshold(threshold);
+        }
+      }
+    }
+    ((NotificationEmitter)ManagementFactory.getMemoryMXBean()).addNotificationListener(new NotificationListener() {
+      public void handleNotification(Notification n, Object hb) {
+        if (MemoryNotificationInfo.MEMORY_THRESHOLD_EXCEEDED.equals(n.getType()) || MemoryNotificationInfo.MEMORY_COLLECTION_THRESHOLD_EXCEEDED.equals(n.getType())) {
+          System.out.println(n.getType());
+          for (LowMemoryWatcher watcher : ourInstances) {
+            try {
+              watcher.myRunnable.run();
             }
-
-            for (WeakReference<LowMemoryWatcher> instanceRef : ourInstances) {
-              final LowMemoryWatcher watcher = instanceRef.get();
-              if (watcher == null) {
-                toRemove.add(instanceRef);
-              }
-              else {
-                if (shouldCleanup) {
-                  try {
-                    watcher.doCleanup();
-                  }
-                  catch (Throwable e) {
-                    LOG.info(e);
-                  }
-                }
-              }
+            catch (Throwable e) {
+              LOG.info(e);
             }
-            
-            if (!toRemove.isEmpty()) {
-              ourInstances.removeAll(toRemove);
-              toRemove.clear();
-            }
-            
-          }
-          catch (InterruptedException ignored) {
           }
         }
       }
-    };
-    thread.setPriority(Thread.NORM_PRIORITY - 1);
-    thread.setDaemon(true);
-    thread.start();
+    }, null, null);
   }
   
-  public static LowMemoryWatcher register(Forceable forceable) {
-    return new LowMemoryWatcher(forceable);
+  public static LowMemoryWatcher register(Runnable runnable) {
+    return new LowMemoryWatcher(runnable);
   }
   
-  private LowMemoryWatcher(Forceable forceable) {
-    myForceable = forceable;
-    updateRef();
-    ourInstances.add(new WeakReference<LowMemoryWatcher>(this));
+  private LowMemoryWatcher(Runnable runnable) {
+    myRunnable = runnable;
+    ourInstances.add(this);
   }
 
   public void stop() {
-    for (WeakReference<LowMemoryWatcher> ref : ourInstances) {
-      if (ref.get() == this) {
-        ourInstances.remove(ref);
-        break;
-      }
-    }
+    ourInstances.remove(this);
   }
   
-  private void doCleanup() {
-    if (myForceable.isDirty()) {
-      myForceable.force();
-    }
-  }
-
-  private static void updateRef() {
-    ourRef = new SoftReference<Object>(new Object(), ourRefQueue);
-  }
 }
diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMap.java b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
index 61daaf1f6147..196983d4bfae 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMap.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMap.java
@@ -128,9 +128,9 @@ public class PersistentHashMap<Key, Value> extends PersistentEnumeratorDelegate<
     return myCanReEnumerate ? size + POSITIVE_VALUE_SHIFT < Integer.MAX_VALUE: false;
   }
 
-  private final LowMemoryWatcher myAppendCacheFlusher = LowMemoryWatcher.register(new LowMemoryWatcher.ForceableAdapter() {
+  private final LowMemoryWatcher myAppendCacheFlusher = LowMemoryWatcher.register(new Runnable() {
     @Override
-    public void force() {
+    public void run() {
       //System.out.println("Flushing caches: " + myFile.getPath());
       dropMemoryCaches();
     }

From 8252e9dc727004efc8a89d27d59bb57b43026f13 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 31 May 2012 17:38:53 +0200
Subject: [PATCH 035/239] SofterReference

---
 .../com/intellij/util/SofterReference.java    | 69 +++++++++++++++++++
 .../intellij/util/containers/WeakList.java    |  9 +++
 2 files changed, 78 insertions(+)
 create mode 100644 platform/core-impl/src/com/intellij/util/SofterReference.java

diff --git a/platform/core-impl/src/com/intellij/util/SofterReference.java b/platform/core-impl/src/com/intellij/util/SofterReference.java
new file mode 100644
index 000000000000..e15ef2ccabff
--- /dev/null
+++ b/platform/core-impl/src/com/intellij/util/SofterReference.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.util;
+
+import com.intellij.openapi.util.LowMemoryWatcher;
+import com.intellij.util.containers.WeakList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+
+/**
+ * A reference whose referent may be garbage-collected when there's low free memory, not only when there's none.
+ * Use for objects which retain lots of memory and whose loss is not very expensive.
+ *
+ * @author peter
+ */
+public class SofterReference<T> {
+  private volatile Reference<T> myRef;
+  private static final WeakList<SofterReference> ourRegistry = new WeakList<SofterReference>();
+
+  @SuppressWarnings("UnusedDeclaration") private static LowMemoryWatcher ourWatcher = LowMemoryWatcher.register(new Runnable() {
+    @Override
+    public void run() {
+      System.out.println("SofterReference.run: " + ourRegistry.size());
+      for (SofterReference reference : ourRegistry.copyAndClear()) {
+        reference.weaken();
+      }
+    }
+  });
+
+  public SofterReference(@NotNull T referent) {
+    ourRegistry.add(this);
+    myRef = new SoftReference<T>(referent);
+  }
+
+  private void weaken() {
+    T o = myRef.get();
+    if (o != null) {
+      myRef = new WeakReference<T>(o);
+    }
+  }
+
+  @Nullable
+  public T get() {
+    Reference<T> ref = myRef;
+    T referent = ref.get();
+    if (referent != null && ref instanceof WeakReference) {
+      ourRegistry.add(this);
+      myRef = new SoftReference<T>(referent);
+    }
+    return referent;
+  }
+}
diff --git a/platform/util/src/com/intellij/util/containers/WeakList.java b/platform/util/src/com/intellij/util/containers/WeakList.java
index 7fb01f556302..22890840ba33 100644
--- a/platform/util/src/com/intellij/util/containers/WeakList.java
+++ b/platform/util/src/com/intellij/util/containers/WeakList.java
@@ -102,6 +102,15 @@ public class WeakList<T> extends UnsafeWeakList<T> {
     }
   }
 
+  public List<T> copyAndClear() {
+    synchronized (myArray) {
+      List<T> result = new ArrayList<T>(myArray.size());
+      myArray.toStrongCollection(result);
+      clear();
+      return result;
+    }
+  }
+
   private class MySyncIterator extends MyIterator {
     protected void findNext() {
       synchronized (myArray) {

From f2765fe5ef84fdd7fbb6a3e645f93b30c5f0e0a3 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 31 May 2012 17:43:31 +0200
Subject: [PATCH 036/239] more responsive find usages: group usages outside EDT

---
 .../usages/impl/UsageNodeTreeBuilderTest.java |  8 +++++-
 .../com/intellij/usages/impl/GroupNode.java   | 16 ++++++------
 .../usages/impl/UsageNodeTreeBuilder.java     |  7 ++---
 .../intellij/usages/impl/UsageViewImpl.java   | 26 +++++++++++--------
 .../usages/impl/UsageViewManagerImpl.java     |  6 +++--
 .../impl/UsageViewTreeModelBuilder.java       |  9 ++++++-
 6 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
index 1b3d885fd5c7..1b08e40def90 100644
--- a/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
@@ -22,6 +22,7 @@ import com.intellij.testFramework.LightPlatformTestCase;
 import com.intellij.usages.*;
 import com.intellij.usages.rules.UsageFilteringRule;
 import com.intellij.usages.rules.UsageGroupingRule;
+import com.intellij.util.Consumer;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -90,7 +91,12 @@ public class UsageNodeTreeBuilderTest extends LightPlatformTestCase {
     model.setRoot(rootNode);
     UsageNodeTreeBuilder usageNodeTreeBuilder = new UsageNodeTreeBuilder(UsageTarget.EMPTY_ARRAY, rules, UsageFilteringRule.EMPTY_ARRAY, rootNode);
     for (Usage usage : usages) {
-      usageNodeTreeBuilder.appendUsage(usage);
+      usageNodeTreeBuilder.appendUsage(usage, new Consumer<Runnable>() {
+        @Override
+        public void consume(Runnable runnable) {
+          runnable.run();
+        }
+      });
       UIUtil.dispatchAllInvocationEvents();
     }
 
diff --git a/platform/usageView/src/com/intellij/usages/impl/GroupNode.java b/platform/usageView/src/com/intellij/usages/impl/GroupNode.java
index fd8a33434717..19ac91ad7627 100644
--- a/platform/usageView/src/com/intellij/usages/impl/GroupNode.java
+++ b/platform/usageView/src/com/intellij/usages/impl/GroupNode.java
@@ -23,7 +23,7 @@ import com.intellij.usages.UsageGroup;
 import com.intellij.usages.UsageView;
 import com.intellij.usages.UsageViewSettings;
 import com.intellij.usages.rules.MergeableUsage;
-import com.intellij.util.ui.UIUtil;
+import com.intellij.util.Consumer;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -62,22 +62,22 @@ public class GroupNode extends Node implements Navigatable, Comparable<GroupNode
     return children == null ? result : result + children.toString();
   }
 
-  public GroupNode addGroup(@NotNull UsageGroup group, int ruleIndex) {
+  public GroupNode addGroup(@NotNull UsageGroup group, int ruleIndex, Consumer<Runnable> edtQueue) {
     synchronized (lock) {
       GroupNode node = mySubgroupNodes.get(group);
       if (node == null) {
         final GroupNode node1 = node = new GroupNode(group, ruleIndex, getBuilder());
         mySubgroupNodes.put(group, node);
 
-        addNode(node1);
+        addNode(node1, edtQueue);
       }
       return node;
     }
   }
 
-  void addNode(@NotNull final DefaultMutableTreeNode node) {
+  void addNode(@NotNull final DefaultMutableTreeNode node, @NotNull Consumer<Runnable> edtQueue) {
     if (!getBuilder().isDetachedMode()) {
-      UIUtil.invokeLaterIfNeeded(new Runnable() {
+      edtQueue.consume(new Runnable() {
         @Override
         public void run() {
           myTreeModel.insertNodeInto(node, GroupNode.this, getNodeInsertionIndex(node));
@@ -102,7 +102,7 @@ public class GroupNode extends Node implements Navigatable, Comparable<GroupNode
     myTreeModel.reload(this);
   }
 
-  private UsageNode tryMerge(@NotNull Usage usage) {
+  @Nullable UsageNode tryMerge(@NotNull Usage usage) {
     if (!(usage instanceof MergeableUsage)) return null;
     MergeableUsage mergeableUsage = (MergeableUsage)usage;
     for (UsageNode node : myUsageNodes) {
@@ -154,7 +154,7 @@ public class GroupNode extends Node implements Navigatable, Comparable<GroupNode
     myTreeModel.nodeChanged(this);
   }
 
-  public UsageNode addUsage(@NotNull Usage usage) {
+  public UsageNode addUsage(@NotNull Usage usage, Consumer<Runnable> edtQueue) {
     final UsageNode node;
     synchronized (lock) {
       if (UsageViewSettings.getInstance().isFilterDuplicatedLine()) {
@@ -168,7 +168,7 @@ public class GroupNode extends Node implements Navigatable, Comparable<GroupNode
     }
 
     if (!getBuilder().isDetachedMode()) {
-      UIUtil.invokeLaterIfNeeded(new Runnable() {
+      edtQueue.consume(new Runnable() {
         @Override
         public void run() {
           myTreeModel.insertNodeInto(node, GroupNode.this, getNodeIndex(node));
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageNodeTreeBuilder.java b/platform/usageView/src/com/intellij/usages/impl/UsageNodeTreeBuilder.java
index 167371136559..9ac882982801 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageNodeTreeBuilder.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageNodeTreeBuilder.java
@@ -22,6 +22,7 @@ import com.intellij.usages.rules.UsageFilteringRule;
 import com.intellij.usages.rules.UsageFilteringRuleEx;
 import com.intellij.usages.rules.UsageGroupingRule;
 import com.intellij.usages.rules.UsageGroupingRuleEx;
+import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -69,7 +70,7 @@ class UsageNodeTreeBuilder {
   }
 
   @Nullable
-  UsageNode appendUsage(@NotNull Usage usage) {
+  UsageNode appendUsage(@NotNull Usage usage, Consumer<Runnable> edtQueue) {
     if (!isVisible(usage)) return null;
 
     GroupNode lastGroupNode = myRoot;
@@ -83,10 +84,10 @@ class UsageNodeTreeBuilder {
         group = rule.groupUsage(usage);
       }
       if (group != null) {
-        lastGroupNode = lastGroupNode.addGroup(group, i);
+        lastGroupNode = lastGroupNode.addGroup(group, i, edtQueue);
       }
     }
 
-    return lastGroupNode.addUsage(usage);
+    return lastGroupNode.addUsage(usage, edtQueue);
   }
 }
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
index db8dafac57fb..c0219c6ced28 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -34,7 +34,7 @@ import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.vfs.ReadonlyStatusHandler;
-import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiDocumentManager;
@@ -47,6 +47,7 @@ import com.intellij.usageView.UsageViewManager;
 import com.intellij.usages.*;
 import com.intellij.usages.rules.*;
 import com.intellij.util.Alarm;
+import com.intellij.util.Consumer;
 import com.intellij.util.EditSourceOnDoubleClickHandler;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
@@ -237,10 +238,10 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
         }
       });
     }
-    myTransferToEDTQueue = new TransferToEDTQueue<Usage>("Insert usages", new Processor<Usage>() {
+    myTransferToEDTQueue = new TransferToEDTQueue<Runnable>("Insert usages", new Processor<Runnable>() {
       @Override
-      public boolean process(Usage usage) {
-        appendUsage(usage);
+      public boolean process(Runnable runnable) {
+        runnable.run();
         return true;
       }
     }, new Condition<Object>() {
@@ -672,7 +673,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
               if (usageCount > UsageLimitUtil.USAGES_LIMIT && tooManyUsages.get() == 0 && tooManyUsages.compareAndSet(0, 1)) {
                 ((UsageViewManagerImpl)usageViewManager).showTooManyUsagesWarning(indicator, waitWhileUserClick, usageCountWithoutDefinition.get());
               }
-              appendUsageLater(usage);
+              appendUsage(usage);
             }
             ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
             return indicator == null || !indicator.isCanceled();
@@ -699,10 +700,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
     }
   }
 
-  private final TransferToEDTQueue<Usage> myTransferToEDTQueue;
-  public void appendUsageLater(@NotNull Usage usage) {
-    myTransferToEDTQueue.offer(usage);
-  }
+  private final TransferToEDTQueue<Runnable> myTransferToEDTQueue;
   public void drainQueuedUsageNodes() {
     assert !ApplicationManager.getApplication().isDispatchThread() : Thread.currentThread();
     UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@@ -718,6 +716,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
     doAppendUsage(usage);
   }
 
+  @Nullable
   public UsageNode doAppendUsage(@NotNull Usage usage) {
     // invoke in ReadAction to be be sure that usages are not invalidated while the tree is being built
     ApplicationManager.getApplication().assertReadAccessAllowed();
@@ -725,7 +724,12 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
       // because the view is built incrementally, the usage may be already invalid, so need to filter such cases
       return null;
     }
-    UsageNode node = myBuilder.appendUsage(usage);
+    UsageNode node = myBuilder.appendUsage(usage, new Consumer<Runnable>() {
+      @Override
+      public void consume(Runnable runnable) {
+        myTransferToEDTQueue.offer(runnable);
+      }
+    });
     myUsageNodes.put(usage, node == null ? NULL_NODE : node);
     return node;
   }
@@ -934,7 +938,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
     final Set<VirtualFile> readOnlyUsages = getReadOnlyUsagesFiles();
 
     return readOnlyUsages.isEmpty() ||
-           !ReadonlyStatusHandler.getInstance(myProject).ensureFilesWritable(VfsUtil.toVirtualFileArray(readOnlyUsages)).hasReadonlyFiles();
+           !ReadonlyStatusHandler.getInstance(myProject).ensureFilesWritable(VfsUtilCore.toVirtualFileArray(readOnlyUsages)).hasReadonlyFiles();
   }
 
   @NotNull
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
index 7c055d4e05dc..403812d40399 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
@@ -282,7 +282,7 @@ public class UsageViewManagerImpl extends UsageViewManager {
           openView(usageView);
           Usage firstUsage = myFirstUsage.get();
           if (firstUsage != null) {
-            usageView.appendUsageLater(firstUsage);
+            usageView.appendUsage(firstUsage);
           }
         }
         else {
@@ -308,8 +308,10 @@ public class UsageViewManagerImpl extends UsageViewManager {
 
     @Override
     public void run() {
+      //long start = System.currentTimeMillis();
       searchUsages();
       endSearchForUsages();
+      //System.out.println("Usage search took " + (System.currentTimeMillis() - start));
     }
 
     private void searchUsages() {
@@ -342,7 +344,7 @@ public class UsageViewManagerImpl extends UsageViewManager {
             }
             UsageViewImpl usageView = getUsageView();
             if (usageView != null) {
-              usageView.appendUsageLater(usage);
+              usageView.appendUsage(usage);
             }
           }
           return indicator == null || !indicator.isCanceled();
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeModelBuilder.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeModelBuilder.java
index 8d2da9c0ce91..450e327cd69c 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeModelBuilder.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeModelBuilder.java
@@ -17,6 +17,8 @@ package com.intellij.usages.impl;
 
 import com.intellij.usages.UsageTarget;
 import com.intellij.usages.UsageViewPresentation;
+import com.intellij.util.Consumer;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -66,7 +68,12 @@ public class UsageViewTreeModelBuilder extends DefaultTreeModel {
       myTargetsNode.add(targetNode);
       myTargetNodes[i] = targetNode;
     }
-    myRootNode.addNode(myTargetsNode);
+    myRootNode.addNode(myTargetsNode, new Consumer<Runnable>() {
+      @Override
+      public void consume(Runnable runnable) {
+        UIUtil.invokeLaterIfNeeded(runnable);
+      }
+    });
   }
 
   public UsageNode getFirstUsageNode() {

From 10b963783a1b5800dd7f19bda273528af36a287d Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 31 May 2012 17:51:22 +0200
Subject: [PATCH 037/239] remove debug printing

---
 platform/core-impl/src/com/intellij/util/SofterReference.java    | 1 -
 .../util/src/com/intellij/openapi/util/LowMemoryWatcher.java     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/util/SofterReference.java b/platform/core-impl/src/com/intellij/util/SofterReference.java
index e15ef2ccabff..feef3ad5fc8d 100644
--- a/platform/core-impl/src/com/intellij/util/SofterReference.java
+++ b/platform/core-impl/src/com/intellij/util/SofterReference.java
@@ -37,7 +37,6 @@ public class SofterReference<T> {
   @SuppressWarnings("UnusedDeclaration") private static LowMemoryWatcher ourWatcher = LowMemoryWatcher.register(new Runnable() {
     @Override
     public void run() {
-      System.out.println("SofterReference.run: " + ourRegistry.size());
       for (SofterReference reference : ourRegistry.copyAndClear()) {
         reference.weaken();
       }
diff --git a/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java b/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
index 57810812d1d7..d7665efbf492 100644
--- a/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
+++ b/platform/util/src/com/intellij/openapi/util/LowMemoryWatcher.java
@@ -52,7 +52,6 @@ public class LowMemoryWatcher {
     ((NotificationEmitter)ManagementFactory.getMemoryMXBean()).addNotificationListener(new NotificationListener() {
       public void handleNotification(Notification n, Object hb) {
         if (MemoryNotificationInfo.MEMORY_THRESHOLD_EXCEEDED.equals(n.getType()) || MemoryNotificationInfo.MEMORY_COLLECTION_THRESHOLD_EXCEEDED.equals(n.getType())) {
-          System.out.println(n.getType());
           for (LowMemoryWatcher watcher : ourInstances) {
             try {
               watcher.myRunnable.run();

From 0df29523b1085ef1d300b3f39498277bc711ea8f Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Thu, 31 May 2012 20:07:38 +0400
Subject: [PATCH 038/239] IDEA-86807 Inconsistent treatment of type parameters
 in widen (ctrl-w) fixed

---
 .../MethodOrClassSelectioner.java             | 49 +++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
index 9efaa06d5feb..bc8f8951217b 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
@@ -19,12 +19,15 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.javadoc.PsiDocComment;
+import org.jetbrains.annotations.NotNull;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 /**
-   *
-   */
+ *
+ */
 
 public class MethodOrClassSelectioner extends BasicSelectioner {
   @Override
@@ -69,16 +72,44 @@ public class MethodOrClassSelectioner extends BasicSelectioner {
     }
 
     if (e instanceof PsiClass) {
-      int start = CodeBlockOrInitializerSelectioner.findOpeningBrace(children);
-      // in non-Java PsiClasses, there can be no opening brace
-      if (start != 0) {
-        int end = CodeBlockOrInitializerSelectioner.findClosingBrace(children, start);
-
-        result.addAll(expandToWholeLine(editorText, new TextRange(start, end)));
-      }
+      result.addAll(selectWithTypeParameters((PsiClass)e));
+      result.addAll(selectBetweenBracesLines(children, editorText));
     }
 
 
     return result;
   }
+
+  private static Collection<TextRange> selectWithTypeParameters(@NotNull PsiClass psiClass) {
+    final PsiIdentifier identifier = psiClass.getNameIdentifier();
+    final PsiTypeParameterList list = psiClass.getTypeParameterList();
+    if (identifier != null && list != null) {
+      return Collections.singletonList(new TextRange(identifier.getTextRange().getStartOffset(), list.getTextRange().getEndOffset()));
+    }
+    return Collections.emptyList();
+  }
+
+  private static Collection<TextRange> selectBetweenBracesLines(@NotNull PsiElement[] children,
+                                                                @NotNull CharSequence editorText) {
+    int start = CodeBlockOrInitializerSelectioner.findOpeningBrace(children);
+    // in non-Java PsiClasses, there can be no opening brace
+    if (start != 0) {
+      int end = CodeBlockOrInitializerSelectioner.findClosingBrace(children, start);
+
+      return expandToWholeLine(editorText, new TextRange(start, end));
+    }
+    return Collections.emptyList();
+  }
+
+  private static Collection<TextRange> selectWithoutDocComment(@NotNull PsiElement[] children,
+                                                               @NotNull CharSequence editorText) {
+    int start = CodeBlockOrInitializerSelectioner.findOpeningBrace(children);
+    // in non-Java PsiClasses, there can be no opening brace
+    if (start != 0) {
+      int end = CodeBlockOrInitializerSelectioner.findClosingBrace(children, start);
+
+      return expandToWholeLine(editorText, new TextRange(start, end));
+    }
+    return Collections.emptyList();
+  }
 }

From b2219e6e662502da7f1fa3e289a4e8055bc5c922 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Thu, 31 May 2012 20:09:56 +0400
Subject: [PATCH 039/239] garbage removed

---
 .../wordSelection/MethodOrClassSelectioner.java      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
index bc8f8951217b..d727b850ff20 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/MethodOrClassSelectioner.java
@@ -100,16 +100,4 @@ public class MethodOrClassSelectioner extends BasicSelectioner {
     }
     return Collections.emptyList();
   }
-
-  private static Collection<TextRange> selectWithoutDocComment(@NotNull PsiElement[] children,
-                                                               @NotNull CharSequence editorText) {
-    int start = CodeBlockOrInitializerSelectioner.findOpeningBrace(children);
-    // in non-Java PsiClasses, there can be no opening brace
-    if (start != 0) {
-      int end = CodeBlockOrInitializerSelectioner.findClosingBrace(children, start);
-
-      return expandToWholeLine(editorText, new TextRange(start, end));
-    }
-    return Collections.emptyList();
-  }
 }

From 6326788d96ceaa53dba40ad3ae938dfe5d47d618 Mon Sep 17 00:00:00 2001
From: Oleg Sukhodolsky <os97673@gmail.com>
Date: Thu, 31 May 2012 19:31:22 +0400
Subject: [PATCH 040/239] Refactoring: IndentationFoldingBuilder should create
 folds for every node of appropriate type, also we can avoid recursion in this
 algorithm.

---
 .../indentation/IndentationFoldingBuilder.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/indentation/IndentationFoldingBuilder.java b/platform/lang-impl/src/com/intellij/indentation/IndentationFoldingBuilder.java
index 447158cc029f..0b96bcaa68ea 100644
--- a/platform/lang-impl/src/com/intellij/indentation/IndentationFoldingBuilder.java
+++ b/platform/lang-impl/src/com/intellij/indentation/IndentationFoldingBuilder.java
@@ -11,6 +11,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 
 /**
  * @author oleg
@@ -30,13 +31,18 @@ public abstract class IndentationFoldingBuilder implements FoldingBuilder, DumbA
   }
 
   private void collectDescriptors(@NotNull final ASTNode node, @NotNull final List<FoldingDescriptor> descriptors) {
-    final ASTNode[] children = node.getChildren(myTokenSet);
-    if (children.length > 0) {
-      if (node.getTreeParent() !=null && node.getTextLength() > 1) {
-        descriptors.add(new FoldingDescriptor(node, node.getTextRange()));
+    final Queue<ASTNode> toProcess = new LinkedList<ASTNode>();
+    toProcess.add(node);
+    while (!toProcess.isEmpty()) {
+      final ASTNode current = toProcess.remove();
+      if (current.getTreeParent() != null
+          && current.getTextLength() > 1
+          && myTokenSet.contains(current.getElementType()))
+      {
+        descriptors.add(new FoldingDescriptor(current, current.getTextRange()));
       }
-      for (ASTNode child : children) {
-        collectDescriptors(child, descriptors);
+      for (ASTNode child = current.getFirstChildNode(); child != null; child = child.getTreeNext()) {
+        toProcess.add(child);
       }
     }
   }

From 1e5ded28e015d8ab28df6bfeb643843826b3117b Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Thu, 31 May 2012 20:27:43 +0400
Subject: [PATCH 041/239] don't resolve on EDT just for printing

---
 .../src/com/intellij/codeEditor/printing/PrintAction.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java
index ba85ab8cdb53..a8872ea21b8c 100644
--- a/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java
+++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/PrintAction.java
@@ -20,8 +20,7 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiElement;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
 
 public class PrintAction extends AnAction implements DumbAware {
@@ -42,8 +41,8 @@ public class PrintAction extends AnAction implements DumbAware {
   public void update(AnActionEvent event){
     Presentation presentation = event.getPresentation();
     DataContext dataContext = event.getDataContext();
-    PsiElement psiElement = LangDataKeys.PSI_ELEMENT.getData(dataContext);
-    if(psiElement instanceof PsiDirectory) {
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
+    if(file != null && file.isDirectory()) {
       presentation.setEnabled(true);
       return;
     }

From f93626217d961ca389716f9d31ea2bf177982448 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Thu, 31 May 2012 21:25:42 +0400
Subject: [PATCH 042/239] Reference AllIcons' fields from xml, rather than
 resource files directly

---
 .../src/CommunityFileTypes.xml                |  20 ++--
 images/src/META-INF/ImagesPlugin.xml          |  10 +-
 .../internal/UsedIconsListingAction.java      | 103 ++++++++++--------
 .../openapi/actionSystem/AnAction.java        |  13 ++-
 .../src/FileTypeManager.xml                   |  12 +-
 .../src/META-INF/LangExtensions.xml           |   8 +-
 .../src/META-INF/XmlActions.xml               |   6 +-
 .../src/idea/LangActions.xml                  |  64 +++++------
 .../src/idea/PlatformActions.xml              |  82 +++++++-------
 .../src/idea/VcsActions.xml                   |  62 +++++------
 .../com/intellij/openapi/util/IconLoader.java |  19 +++-
 plugins/ant/src/META-INF/plugin.xml           |   2 +-
 plugins/commander/src/META-INF/plugin.xml     |   6 +-
 .../IconsReferencesContributor.java           |  45 +++++++-
 plugins/git4idea/src/META-INF/plugin.xml      |  12 +-
 plugins/gradle/src/META-INF/plugin.xml        |   8 +-
 plugins/groovy/src/META-INF/plugin.xml        |   6 +-
 plugins/hg4idea/src/META-INF/plugin.xml       |   4 +-
 .../action/HgAbstractGlobalAction.java        |   9 +-
 .../src/org/zmlx/hg4idea/action/HgAction.java |   9 ++
 .../org/zmlx/hg4idea/action/HgPullAction.java |   4 +
 .../org/zmlx/hg4idea/action/HgPushAction.java |   6 +-
 .../src/main/resources/META-INF/plugin.xml    |  24 ++--
 plugins/ui-designer/src/META-INF/plugin.xml   |   4 +-
 resources/src/META-INF/IdeaPlugin.xml         |   2 +-
 resources/src/idea/JavaActions.xml            |  10 +-
 resources/src/idea/RichPlatformActions.xml    |  22 ++--
 27 files changed, 340 insertions(+), 232 deletions(-)

diff --git a/community-resources/src/CommunityFileTypes.xml b/community-resources/src/CommunityFileTypes.xml
index 141fb501b114..75f58284f129 100644
--- a/community-resources/src/CommunityFileTypes.xml
+++ b/community-resources/src/CommunityFileTypes.xml
@@ -7,7 +7,7 @@
       extensions="idl"
       default_extension="idl"
       binary="false"
-      icon = "/fileTypes/idl.png">
+      icon = "AllIcons.FileTypes.Idl">
 
       <highlighting>
 
@@ -71,7 +71,7 @@
       extensions="fx"
       default_extension="fx"
       binary="false"
-      icon = "/fileTypes/custom.png">
+      icon = "AllIcons.FileTypes.Custom">
 
       <highlighting>
 
@@ -178,7 +178,7 @@
       </highlighting>
     </filetype>
 
-    <filetype binary="false" default_extension="cpp" extensions="c;cpp;h;hpp" description="C/C++ files" name="C++" icon="/fileTypes/custom.png">
+    <filetype binary="false" default_extension="cpp" extensions="c;cpp;h;hpp" description="C/C++ files" name="C++" icon="AllIcons.FileTypes.Custom">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="//"/>
@@ -271,7 +271,7 @@
       </highlighting>
     </filetype>
 
-    <filetype binary="false" default_extension="cs" extensions="cs" description="C# files" name="C#" icon="/fileTypes/javaScript.png">
+    <filetype binary="false" default_extension="cs" extensions="cs" description="C# files" name="C#" icon="AllIcons.FileTypes.JavaScript">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="//"/>
@@ -369,7 +369,7 @@
       </highlighting>
     </filetype>
     
-    <filetype binary="false" default_extension="pl" extensions="pl;pm" description="Perl files" name="Perl" icon="/fileTypes/javaScript.png">
+    <filetype binary="false" default_extension="pl" extensions="pl;pm" description="Perl files" name="Perl" icon="AllIcons.FileTypes.JavaScript">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="#"/>
@@ -443,7 +443,7 @@
         <keywords4/>
       </highlighting>
     </filetype>
-    <filetype binary="false" default_extension="aj" extensions="aj" description="AspectJ files" name="AspectJ" icon="/fileTypes/javaScript.png">
+    <filetype binary="false" default_extension="aj" extensions="aj" description="AspectJ files" name="AspectJ" icon="AllIcons.FileTypes.JavaScript">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="//"/>
@@ -597,7 +597,7 @@
       </extensionMap>
     </filetype>
 
-    <filetype binary="false" default_extension="css" extensions="css" description="CSS files" name="CSS files" icon="/fileTypes/css.png">
+    <filetype binary="false" default_extension="css" extensions="css" description="CSS files" name="CSS files" icon="AllIcons.FileTypes.Css">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="" />
@@ -612,7 +612,7 @@
       </extensionMap>
     </filetype>
 
-    <filetype binary="false" default_extension="js" extensions="js" description="JavaScript files" name="JavaScript files" icon="/fileTypes/javaScript.png">
+    <filetype binary="false" default_extension="js" extensions="js" description="JavaScript files" name="JavaScript files" icon="AllIcons.FileTypes.JavaScript">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="//" />
@@ -4264,7 +4264,7 @@
       </highlighting>
     </filetype>
 
-    <filetype binary="false" default_extension="jsp" extensions="jsp;jsf;jspf;tag;tagf" description="JSP files" name="JSP files" icon="/fileTypes/jsp.png">
+    <filetype binary="false" default_extension="jsp" extensions="jsp;jsf;jspf;tag;tagf" description="JSP files" name="JSP files" icon="AllIcons.FileTypes.Jsp">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="" />
@@ -4594,4 +4594,4 @@
     <mapping ext="jspx" type="XML" />
     <mapping ext="tagx" type="XML" />
   </extensionMap>
-</component>
\ No newline at end of file
+</component>
diff --git a/images/src/META-INF/ImagesPlugin.xml b/images/src/META-INF/ImagesPlugin.xml
index 44ea70670b05..4c62fcf8b37e 100644
--- a/images/src/META-INF/ImagesPlugin.xml
+++ b/images/src/META-INF/ImagesPlugin.xml
@@ -1,4 +1,4 @@
-<idea-plugin version="2" xmlns:xi="http://www.w3.org/2001/XInclude">
+<idea-plugin version="2">
 
   <vendor>Alexey Efimov</vendor>
 
@@ -93,14 +93,14 @@
               id="Images.Thumbnails.UpFolder"
               text="Parent Folder"
               description="Show image thumbnails from the containing folder"
-              icon="/nodes/upFolder.png">
+              icon="AllIcons.Nodes.UpFolder">
         <keyboard-shortcut first-keystroke="BACK_SPACE" keymap="$default"/>
       </action>
       <action class="org.intellij.images.thumbnail.actions.ToggleRecursiveAction"
               id="Images.Thumbnails.ToggleRecursive"
               text="Recursive"
               description="Toggle whether to show the images from subfolders recursively"
-              icon="/objectBrowser/flattenPackages.png">
+              icon="AllIcons.ObjectBrowser.FlattenPackages">
         <keyboard-shortcut first-keystroke="control MULTIPLY" keymap="$default"/>
       </action>
       <separator/>
@@ -110,7 +110,7 @@
               id="Images.Thumbnails.Hide"
               text="Hide"
               description="Hide image thumbnails"
-              icon="/actions/cancel.png" use-shortcut-of="CloseContent"/>
+              icon="AllIcons.Actions.Cancel" use-shortcut-of="CloseContent"/>
     </group>
     <group id="Images.ThumbnailsPopupMenu">
       <reference id="CutCopyPasteGroup"/>
@@ -136,4 +136,4 @@
       <reference id="ExternalToolsGroup"/>
     </group>
   </actions>
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java b/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java
index de0054dae7c0..c24f3159b311 100644
--- a/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java
+++ b/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java
@@ -37,7 +37,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiSearchHelper;
 import com.intellij.psi.search.searches.MethodReferencesSearch;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.MultiMap;
@@ -106,13 +106,24 @@ public class UsedIconsListingAction extends AnAction {
 
     PsiMethod getIconMethod = iconLoader.findMethodsByName("getIcon", false)[0];
     PsiMethod findIconMethod = iconLoader.findMethodsByName("findIcon", false)[0];
-    MethodReferencesSearch.search(getIconMethod, false).forEach(consumer);
-    MethodReferencesSearch.search(findIconMethod, false).forEach(consumer);
+    if (false) {
+      MethodReferencesSearch.search(getIconMethod, false).forEach(consumer);
+      MethodReferencesSearch.search(findIconMethod, false).forEach(consumer);
+    }
 
     final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
 
+
+    PsiClass allIcons =
+      JavaPsiFacade.getInstance(project).findClass("com.intellij.icons.AllIcons", GlobalSearchScope.allScope(project));
+
+    final HashMap<String, String> mappings = new HashMap<String, String>();
+    collectFields(allIcons, "", mappings);
+
+    final List<XmlAttribute> victims = new ArrayList<XmlAttribute>();
+
     PsiSearchHelper.SERVICE.getInstance(project).processAllFilesWithWordInText(
-      "action",
+      "icon",
       new DelegatingGlobalSearchScope(GlobalSearchScope.projectScope(project)) {
         @Override
         public boolean contains(VirtualFile file) {
@@ -123,57 +134,63 @@ public class UsedIconsListingAction extends AnAction {
       new Processor<PsiFile>() {
         @Override
         public boolean process(PsiFile file) {
-          if (file instanceof XmlFile) {
-            processTag(((XmlFile)file).getRootTag());
-          }
-          return true;
-        }
+          file.accept(new XmlRecursiveElementVisitor() {
+            @Override
+            public void visitXmlTag(XmlTag tag) {
+              super.visitXmlTag(tag);
 
-        private void processTag(XmlTag tag) {
-          if ("action".equals(tag.getLocalName())) {
-            String icon = tag.getAttributeValue("icon");
-            if (icon != null) {
-              answer.add(icon);
+              String icon = tag.getAttributeValue("icon");
+              if (icon != null) {
+                answer.add(icon);
+                if (mappings.containsKey(icon)) {
+                  victims.add(tag.getAttribute("icon"));
+                }
+              }
             }
-          }
-          else {
-            for (XmlTag sub : tag.getSubTags()) {
-              processTag(sub);
-            }
-          }
+          });
+          return true;
         }
       },
 
       true
     );
 
-    ArrayList<String> sorted = new ArrayList<String>(answer);
-    Collections.sort(sorted);
-
-    for (String icon : sorted) {
-      System.out.println(icon);
+    for (final XmlAttribute victim : victims) {
+      String value = victim.getValue();
+      final String replacement = mappings.get(value);
+      if (replacement != null) {
+        new WriteCommandAction<Void>(project, victim.getContainingFile()) {
+          @Override
+          protected void run(Result<Void> result) throws Throwable {
+            victim.setValue(replacement);
+          }
+        }.execute();
+      }
     }
 
-    PsiClass allIcons =
-      JavaPsiFacade.getInstance(project).findClass("com.intellij.icons.AllIcons", GlobalSearchScope.allScope(project));
+    if (false /*do replacements*/) {
+      ArrayList<String> sorted = new ArrayList<String>(answer);
+      Collections.sort(sorted);
 
-    HashMap<String, String> mappings = new HashMap<String, String>();
-    collectFields(allIcons, "", mappings);
+      for (String icon : sorted) {
+        System.out.println(icon);
+      }
 
-    final JVMElementFactory factory = JVMElementFactories.getFactory(JavaLanguage.INSTANCE, project);
-    for (Map.Entry<String, Collection<PsiCallExpression>> entry : calls.entrySet()) {
-      String path = entry.getKey();
-      final String replacement = mappings.get(path);
-      if (replacement != null) {
-        for (final PsiCallExpression call : entry.getValue()) {
-          new WriteCommandAction(project, call.getContainingFile()) {
-            @Override
-            protected void run(Result result) throws Throwable {
-              JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(project);
-              PsiElement expr = factory.createExpressionFromText("com.intellij.icons." + replacement, call);
-              styleManager.shortenClassReferences(call.replace(expr));
-            }
-          }.execute();
+      final JVMElementFactory factory = JVMElementFactories.getFactory(JavaLanguage.INSTANCE, project);
+      for (Map.Entry<String, Collection<PsiCallExpression>> entry : calls.entrySet()) {
+        String path = entry.getKey();
+        final String replacement = mappings.get(path);
+        if (replacement != null) {
+          for (final PsiCallExpression call : entry.getValue()) {
+            new WriteCommandAction(project, call.getContainingFile()) {
+              @Override
+              protected void run(Result result) throws Throwable {
+                JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(project);
+                PsiElement expr = factory.createExpressionFromText("com.intellij.icons." + replacement, call);
+                styleManager.shortenClassReferences(call.replace(expr));
+              }
+            }.execute();
+          }
         }
       }
     }
diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java
index 5ecd6aa6963f..81ec67ca7914 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/AnAction.java
@@ -81,7 +81,16 @@ public abstract class AnAction implements PossiblyDumbAware {
    * Creates a new action with its text, description and icon set to <code>null</code>.
    */
   public AnAction(){
-    this(null);
+    this(null, null, null);
+  }
+
+  /**
+   * Creates a new action with <code>icon</code> provided. Its text, description set to <code>null</code>.
+   *
+   * @param icon Default icon to appear in toolbars and menus (Note some platform don't have icons in menu).
+   */
+  public AnAction(Icon icon){
+    this(null, null, icon);
   }
 
   /**
@@ -106,7 +115,7 @@ public abstract class AnAction implements PossiblyDumbAware {
    *
    * @param icon Action's icon
    */
-  public AnAction(String text, @Nullable String description, @Nullable Icon icon){
+  public AnAction(@Nullable String text, @Nullable String description, @Nullable Icon icon){
     myShortcutSet = ourEmptyShortcutSet;
     myEnabledInModalContext = false;
     Presentation presentation = getTemplatePresentation();
diff --git a/platform/platform-resources/src/FileTypeManager.xml b/platform/platform-resources/src/FileTypeManager.xml
index a80c370a7990..2c886356a0d6 100644
--- a/platform/platform-resources/src/FileTypeManager.xml
+++ b/platform/platform-resources/src/FileTypeManager.xml
@@ -7,7 +7,7 @@
       extensions="idl"
       default_extension="idl"
       binary="false"
-      icon = "/fileTypes/idl.png">
+      icon = "AllIcons.FileTypes.Idl">
 
       <highlighting>
 
@@ -71,7 +71,7 @@
       extensions="fx"
       default_extension="fx"
       binary="false"
-      icon = "/fileTypes/custom.png">
+      icon = "AllIcons.FileTypes.Custom">
 
       <highlighting>
 
@@ -178,7 +178,7 @@
       </highlighting>
     </filetype>
 
-    <filetype binary="false" default_extension="cpp" extensions="c;cpp;h;hpp;cc" description="C/C++ files" name="C++" icon="/fileTypes/custom.png">
+    <filetype binary="false" default_extension="cpp" extensions="c;cpp;h;hpp;cc" description="C/C++ files" name="C++" icon="AllIcons.FileTypes.Custom">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="//"/>
@@ -271,7 +271,7 @@
       </highlighting>
     </filetype>
 
-    <filetype binary="false" default_extension="cs" extensions="cs" description="C# files" name="C#" icon="/fileTypes/javaScript.png">
+    <filetype binary="false" default_extension="cs" extensions="cs" description="C# files" name="C#" icon="AllIcons.FileTypes.JavaScript">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="//"/>
@@ -369,7 +369,7 @@
       </highlighting>
     </filetype>
     
-    <filetype binary="false" default_extension="pl" extensions="pl;pm" description="Perl files" name="Perl" icon="/fileTypes/javaScript.png">
+    <filetype binary="false" default_extension="pl" extensions="pl;pm" description="Perl files" name="Perl" icon="AllIcons.FileTypes.JavaScript">
       <highlighting>
         <options>
           <option name="LINE_COMMENT" value="#"/>
@@ -493,4 +493,4 @@
     </filetype>
 
   </filetypes>
-</component>
\ No newline at end of file
+</component>
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 6080ee552079..34444adf12f5 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -669,13 +669,13 @@
 
   <http.fileEditorActionProvider implementation="com.intellij.openapi.fileEditor.impl.http.LangRemoteFileEditorActionProvider"/>
 
-  <toolWindow id="Project" anchor="left" icon="/general/toolWindowProject.png"
+  <toolWindow id="Project" anchor="left" icon="AllIcons.General.ToolWindowProject"
               factoryClass="com.intellij.ide.projectView.impl.ProjectViewToolWindowFactory"/>
-  <toolWindow id="TODO" anchor="bottom" icon="/general/toolWindowTodo.png"
+  <toolWindow id="TODO" anchor="bottom" icon="AllIcons.General.ToolWindowTodo"
               factoryClass="com.intellij.ide.todo.TodoToolWindowFactory" canCloseContents="true"/>
-  <toolWindow id="Structure" anchor="left" icon="/general/toolWindowStructure.png" secondary="true"
+  <toolWindow id="Structure" anchor="left" icon="AllIcons.General.ToolWindowStructure" secondary="true"
               factoryClass="com.intellij.ide.structureView.impl.StructureViewToolWindowFactory"/>
-  <toolWindow id="Favorites" anchor="left" icon="/general/toolWindowFavorites.png" secondary="true"
+  <toolWindow id="Favorites" anchor="left" icon="AllIcons.General.ToolWindowFavorites" secondary="true"
               factoryClass="com.intellij.ide.projectView.impl.FavoritesViewToolWindowFactory"/>
 
   <psi.fileReferenceHelper implementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.PsiFileReferenceHelper"/>
diff --git a/platform/platform-resources/src/META-INF/XmlActions.xml b/platform/platform-resources/src/META-INF/XmlActions.xml
index 68831eccf560..052768e5498e 100644
--- a/platform/platform-resources/src/META-INF/XmlActions.xml
+++ b/platform/platform-resources/src/META-INF/XmlActions.xml
@@ -1,4 +1,4 @@
-<component xmlns:xi="http://www.w3.org/2001/XInclude">
+<component>
   <actions>
 
     <group id="ToolsXmlGroup" popup="true" class="com.intellij.xml.actions.XmlActionsGroup">
@@ -62,7 +62,7 @@
       <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFromTemplate"/>
     </group>
 
-    <group id="NewXmlDescriptor" class="com.intellij.ide.actions.NonEmptyActionGroup" text="XML Configuration File" popup="true" icon="/fileTypes/xml.png">
+    <group id="NewXmlDescriptor" class="com.intellij.ide.actions.NonEmptyActionGroup" text="XML Configuration File" popup="true" icon="AllIcons.FileTypes.Xml">
       <add-to-group group-id="NewGroup" anchor="last"/>
     </group>
 
@@ -74,7 +74,7 @@
 
     <action id="OpenInBrowser" class="com.intellij.ide.browsers.OpenFileInBrowserAction"
             text="Open in _Browser" description="Open a selected file in browser"
-            icon="/nodes/ppWeb.png">
+            icon="AllIcons.Nodes.PpWeb">
       <add-to-group group-id="ViewMenu" anchor="after" relative-to-action="ViewSource"/>
       <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="CutCopyPasteGroup"/>
       <add-to-group group-id="ProjectViewPopupMenu" anchor="after" relative-to-action="EditSource"/>
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 19ccf97be8c8..2b4ee16704f5 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -8,8 +8,8 @@
     <group id="SendToFavoritesGroup" class="com.intellij.ide.favoritesTreeView.actions.SendToFavoritesGroup" popup="true"/>
 
     <action id="RunConfiguration" class="com.intellij.execution.actions.RunConfigurationAction"/>
-    <action id="ChooseRunConfiguration" class="com.intellij.execution.actions.ChooseRunConfigurationAction" text="Run..." description="Choose and run configuration" icon="/general/toolWindowRun.png"/>
-    <action id="ChooseDebugConfiguration" class="com.intellij.execution.actions.ChooseDebugConfigurationAction" text="Debug..." description="Choose and debug configuration" icon="/general/debug.png"/>
+    <action id="ChooseRunConfiguration" class="com.intellij.execution.actions.ChooseRunConfigurationAction" text="Run..." description="Choose and run configuration" icon="AllIcons.General.ToolWindowRun"/>
+    <action id="ChooseDebugConfiguration" class="com.intellij.execution.actions.ChooseDebugConfigurationAction" text="Debug..." description="Choose and debug configuration" icon="AllIcons.General.Debug"/>
 
     <group id="RunContextGroup" popup="false">
       <action id="CreateRunConfiguration" class="com.intellij.execution.actions.CreateAction"/>
@@ -35,7 +35,7 @@
     <action id="ShowIntentionActions" class="com.intellij.codeInsight.intention.actions.ShowIntentionActionsAction"/>
 
     <action id="TogglePopupHints" class="com.intellij.ide.actions.TogglePopupHintsAction"/>
-    <action id="FindModal" class="com.intellij.openapi.editor.actions.FindAction" icon="/actions/menu-find.png"/>
+    <action id="FindModal" class="com.intellij.openapi.editor.actions.FindAction" icon="AllIcons.Actions.Menu_find"/>
 
     <action id="CodeInspection.OnEditor" class="com.intellij.codeInspection.actions.CodeInspectionOnEditorAction"/>
 
@@ -65,7 +65,7 @@
     <group id="PrintExportGroup">
       <separator/>
       <action id="ExportToHTML" class="com.intellij.codeEditor.printing.ExportToHTMLAction"/>
-      <action id="Print" class="com.intellij.codeEditor.printing.PrintAction" icon="/graph/print.png"/>
+      <action id="Print" class="com.intellij.codeEditor.printing.PrintAction" icon="AllIcons.Graph.Print"/>
       <reference ref="AddToFavorites"/>
       
       <add-to-group group-id="FileMenu" anchor="after" relative-to-action="InvalidateCaches"/>
@@ -292,7 +292,7 @@
       <reference ref="ChooseRunConfiguration"/>
       <reference ref="ChooseDebugConfiguration"/>
       <action id="editRunConfigurations" class="com.intellij.execution.actions.EditRunConfigurationsAction"/>
-      <action id="Stop" class="com.intellij.execution.actions.StopAction" icon="/actions/suspend.png"/>
+      <action id="Stop" class="com.intellij.execution.actions.StopAction" icon="AllIcons.Actions.Suspend"/>
 
       <add-to-group group-id="MainMenu" anchor="after" relative-to-action="RefactoringMenu"/>
     </group>
@@ -423,7 +423,7 @@
       <reference ref="ProjectViewPopupMenuRunGroup"/>
       <separator/>
       <reference ref="VersionControlsGroup"/>
-      <action id="SynchronizeCurrentFile" class="com.intellij.ide.actions.SynchronizeCurrentFileAction" icon="/actions/sync.png"/>
+      <action id="SynchronizeCurrentFile" class="com.intellij.ide.actions.SynchronizeCurrentFileAction" icon="AllIcons.Actions.Sync"/>
       <separator/>
       <action id="RevealIn" class="com.intellij.ide.actions.RevealFileAction"/>
       <reference ref="ShowFilePath"/>
@@ -593,7 +593,7 @@
       <action id="UsageView.Include" class="com.intellij.usages.actions.IncludeUsageAction"/>
       <action id="UsageView.Exclude" class="com.intellij.usages.actions.ExcludeUsageAction" use-shortcut-of="$Delete"/>
       <separator/>
-      <action id="UsageView.ShowRecentFindUsages" class="com.intellij.find.impl.ShowRecentFindUsagesAction" icon="/actions/back.png"
+      <action id="UsageView.ShowRecentFindUsages" class="com.intellij.find.impl.ShowRecentFindUsagesAction" icon="AllIcons.Actions.Back"
               use-shortcut-of="RecentFiles"/>
     </group>
 
@@ -610,31 +610,31 @@
 
     <group id="DebugMainMenu">
       <separator/>
-      <action id="StepOver" class="com.intellij.xdebugger.impl.actions.StepOverAction" icon="/actions/traceOver.png"/>
-      <action id="ForceStepOver" class="com.intellij.xdebugger.impl.actions.ForceStepOverAction" icon="/debugger/actions/force_step_over.png"/>
-      <action id="StepInto" class="com.intellij.xdebugger.impl.actions.StepIntoAction" icon="/actions/traceInto.png"/>
-      <action id="ForceStepInto" class="com.intellij.xdebugger.impl.actions.ForceStepIntoAction" icon="/debugger/actions/force_step_into.png"/>
-      <action id="SmartStepInto" class="com.intellij.xdebugger.impl.actions.SmartStepIntoAction" icon="/actions/traceInto.png"/>
-      <action id="StepOut" class="com.intellij.xdebugger.impl.actions.StepOutAction" icon="/actions/stepOut.png"/>
-      <action id="RunToCursor" class="com.intellij.xdebugger.impl.actions.RunToCursorAction" icon="/actions/runToCursor.png"/>
-      <action id="ForceRunToCursor" class="com.intellij.xdebugger.impl.actions.ForceRunToCursorAction" icon="/debugger/actions/force_run_to_cursor.png"/>
-      <action id="Pause" class="com.intellij.xdebugger.impl.actions.PauseAction" icon="/actions/pause.png"/>
-      <action id="Resume" class="com.intellij.xdebugger.impl.actions.ResumeAction" icon="/actions/resume.png"/>
+      <action id="StepOver" class="com.intellij.xdebugger.impl.actions.StepOverAction" icon="AllIcons.Actions.TraceOver"/>
+      <action id="ForceStepOver" class="com.intellij.xdebugger.impl.actions.ForceStepOverAction" icon="AllIcons.Debugger.Actions.Force_step_over"/>
+      <action id="StepInto" class="com.intellij.xdebugger.impl.actions.StepIntoAction" icon="AllIcons.Actions.TraceInto"/>
+      <action id="ForceStepInto" class="com.intellij.xdebugger.impl.actions.ForceStepIntoAction" icon="AllIcons.Debugger.Actions.Force_step_into"/>
+      <action id="SmartStepInto" class="com.intellij.xdebugger.impl.actions.SmartStepIntoAction" icon="AllIcons.Actions.TraceInto"/>
+      <action id="StepOut" class="com.intellij.xdebugger.impl.actions.StepOutAction" icon="AllIcons.Actions.StepOut"/>
+      <action id="RunToCursor" class="com.intellij.xdebugger.impl.actions.RunToCursorAction" icon="AllIcons.Actions.RunToCursor"/>
+      <action id="ForceRunToCursor" class="com.intellij.xdebugger.impl.actions.ForceRunToCursorAction" icon="AllIcons.Debugger.Actions.Force_run_to_cursor"/>
+      <action id="Pause" class="com.intellij.xdebugger.impl.actions.PauseAction" icon="AllIcons.Actions.Pause"/>
+      <action id="Resume" class="com.intellij.xdebugger.impl.actions.ResumeAction" icon="AllIcons.Actions.Resume"/>
       <separator/>
-      <action id="EvaluateExpression" class="com.intellij.xdebugger.impl.actions.EvaluateAction" icon="/debugger/evaluateExpression.png"/>
+      <action id="EvaluateExpression" class="com.intellij.xdebugger.impl.actions.EvaluateAction" icon="AllIcons.Debugger.EvaluateExpression"/>
       <action id="QuickEvaluateExpression" class="com.intellij.xdebugger.impl.actions.QuickEvaluateAction"/>
       <action id="ShowExecutionPoint" class="com.intellij.xdebugger.impl.actions.ShowExecutionPointAction"
-              icon="/debugger/showCurrentFrame.png"/>
+              icon="AllIcons.Debugger.ShowCurrentFrame"/>
       <separator/>
       <action id="ToggleLineBreakpoint" class="com.intellij.xdebugger.impl.actions.ToggleLineBreakpointAction"/>
       <action id="EditBreakpoint" class="com.intellij.xdebugger.impl.actions.EditBreakpointAction"/>
-      <action id="ViewBreakpoints" class="com.intellij.xdebugger.impl.actions.ViewBreakpointsAction" icon="/debugger/viewBreakpoints.png"/>
+      <action id="ViewBreakpoints" class="com.intellij.xdebugger.impl.actions.ViewBreakpointsAction" icon="AllIcons.Debugger.ViewBreakpoints"/>
       <separator/>
 
       <add-to-group group-id="RunMenu" anchor="last"/>
     </group>
 
-    <action id="Debugger.AddToWatch" class="com.intellij.xdebugger.impl.actions.AddToWatchesAction" icon="/debugger/addToWatch.png"/>
+    <action id="Debugger.AddToWatch" class="com.intellij.xdebugger.impl.actions.AddToWatchesAction" icon="AllIcons.Debugger.AddToWatch"/>
 
     <group id="EditorPopupMenuDebug">
       <separator/>
@@ -654,15 +654,15 @@
       <action id="XDebugger.CopyName" class="com.intellij.xdebugger.impl.ui.tree.actions.XCopyNameAction"/>
       <action id="XDebugger.Inspect" class="com.intellij.xdebugger.impl.ui.tree.actions.XInspectAction"/>
       <action id="XDebugger.JumpToSource" class="com.intellij.xdebugger.impl.ui.tree.actions.XJumpToSourceAction"/>
-      <action id="XDebugger.AddToWatches" class="com.intellij.xdebugger.impl.ui.tree.actions.XAddToWatchesAction" icon="/debugger/addToWatch.png"/>
-      <action id="XDebugger.NewWatch" class="com.intellij.xdebugger.impl.frame.actions.XNewWatchAction" icon="/debugger/newWatch.png"/>
+      <action id="XDebugger.AddToWatches" class="com.intellij.xdebugger.impl.ui.tree.actions.XAddToWatchesAction" icon="AllIcons.Debugger.AddToWatch"/>
+      <action id="XDebugger.NewWatch" class="com.intellij.xdebugger.impl.frame.actions.XNewWatchAction" icon="AllIcons.Debugger.NewWatch"/>
       <action id="XDebugger.EditWatch" class="com.intellij.xdebugger.impl.frame.actions.XEditWatchAction"/>
-      <action id="XDebugger.RemoveWatch" class="com.intellij.xdebugger.impl.frame.actions.XRemoveWatchAction" icon="/actions/delete.png"/>
+      <action id="XDebugger.RemoveWatch" class="com.intellij.xdebugger.impl.frame.actions.XRemoveWatchAction" icon="AllIcons.Actions.Delete"/>
       <action id="XDebugger.RemoveAllWatches" class="com.intellij.xdebugger.impl.frame.actions.XRemoveAllWatchesAction"/>
       <action id="XDebugger.MuteBreakpoints" class="com.intellij.xdebugger.impl.actions.MuteBreakpointAction"
-              icon="/debugger/muteBreakpoints.png"/>
+              icon="AllIcons.Debugger.MuteBreakpoints"/>
       <action id="XDebugger.AutoTooltip" class="com.intellij.xdebugger.impl.actions.ValueTooltipAutoShowAction"/>
-      <action id="XDebugger.ToggleSortValues" class="com.intellij.xdebugger.impl.ui.tree.actions.SortValuesToggleAction" icon="/objectBrowser/sorted.png"/>
+      <action id="XDebugger.ToggleSortValues" class="com.intellij.xdebugger.impl.ui.tree.actions.SortValuesToggleAction" icon="AllIcons.ObjectBrowser.Sorted"/>
       <action id="Debugger.MarkObject" class="com.intellij.xdebugger.impl.actions.MarkObjectAction"/>
     </group>
 
@@ -730,22 +730,22 @@
       <reference ref="XDebugger.AddToWatches"/>
     </group>
 
-    <group id="XDebugger.Settings" icon="/general/secondaryGroup.png" popup="true">
+    <group id="XDebugger.Settings" icon="AllIcons.General.SecondaryGroup" popup="true">
 
     </group>
 
     <group id="RunnerLayoutActions">
       <group id="Runner.Layout">
         <action id="Runner.RestoreLayout" class="com.intellij.execution.ui.layout.actions.RestoreLayoutAction"
-                icon="/debugger/restoreLayout.png"/>
+                icon="AllIcons.Debugger.RestoreLayout"/>
       </group>
 
       <group id="Runner.View.Popup">
-        <action id="Runner.MinimizeView" class="com.intellij.execution.ui.layout.actions.MinimizeViewAction" icon="/actions/minimize.png"/>
+        <action id="Runner.MinimizeView" class="com.intellij.execution.ui.layout.actions.MinimizeViewAction" icon="AllIcons.Actions.Minimize"/>
         <separator/>
-        <action id="Runner.CloseView" class="com.intellij.execution.ui.layout.actions.CloseViewAction" icon="/actions/cross.png"/>
-        <action id="Runner.CloseOtherViews" class="com.intellij.execution.ui.layout.actions.CloseOtherViewsAction" icon="/actions/cross.png"/>
-        <action id="Runner.CloseAllViews" class="com.intellij.execution.ui.layout.actions.CloseAllViewsAction" icon="/actions/cross.png"/>
+        <action id="Runner.CloseView" class="com.intellij.execution.ui.layout.actions.CloseViewAction" icon="AllIcons.Actions.Cross"/>
+        <action id="Runner.CloseOtherViews" class="com.intellij.execution.ui.layout.actions.CloseOtherViewsAction" icon="AllIcons.Actions.Cross"/>
+        <action id="Runner.CloseAllViews" class="com.intellij.execution.ui.layout.actions.CloseAllViewsAction" icon="AllIcons.Actions.Cross"/>
         <separator/>
         <group id="Runner.Focus">
           <action id="Runner.FocusOnStartup" class="com.intellij.execution.ui.actions.FocusOnStartAction"/>
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index adc5b44d90e8..7d6faf452ca8 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -107,15 +107,15 @@
       <action id="EditorStartNewLineBefore" class="com.intellij.openapi.editor.actions.StartNewLineBeforeAction"/>
     </group>
 
-    <action id="ExpandAll" class="com.intellij.ide.actions.ExpandAllAction" icon="/actions/expandall.png"/>
-    <action id="CollapseAll" class="com.intellij.ide.actions.CollapseAllAction" icon="/actions/collapseall.png"/>
-    <action id="ExportToTextFile" class="com.intellij.ide.actions.ExportToTextFileAction" icon="/actions/export.png"/>
+    <action id="ExpandAll" class="com.intellij.ide.actions.ExpandAllAction" icon="AllIcons.Actions.Expandall"/>
+    <action id="CollapseAll" class="com.intellij.ide.actions.CollapseAllAction" icon="AllIcons.Actions.Collapseall"/>
+    <action id="ExportToTextFile" class="com.intellij.ide.actions.ExportToTextFileAction" icon="AllIcons.Actions.Export"/>
     <action id="ExpandTreeNode" class="com.intellij.ide.actions.tree.ExpandTreeNodeAction"/>
     <action id="CollapseTreeNode" class="com.intellij.ide.actions.tree.CollapseTreeNodeAction"/>
     <action id="FullyExpandTreeNode" class="com.intellij.ide.actions.tree.FullyExpandTreeNodeAction"/>
 
-    <action id="NextDiff" class="com.intellij.openapi.diff.actions.NextDiffAction" icon="/actions/moveDown.png"/>
-    <action id="PreviousDiff" class="com.intellij.openapi.diff.actions.PreviousDiffAction" icon="/actions/moveUp.png"/>
+    <action id="NextDiff" class="com.intellij.openapi.diff.actions.NextDiffAction" icon="AllIcons.Actions.MoveDown"/>
+    <action id="PreviousDiff" class="com.intellij.openapi.diff.actions.PreviousDiffAction" icon="AllIcons.Actions.MoveUp"/>
 
     <action id="Refresh" class="com.intellij.ide.actions.RefreshAction"/>
 
@@ -130,32 +130,32 @@
 
     <action id="CloseEditor" class="com.intellij.ide.actions.CloseEditorAction"/>
 
-    <action id="WelcomeScreen.ReopenRecent" class="com.intellij.openapi.wm.impl.welcomeScreen.RecentProjectsAction" icon="/general/reopenRecentProject.png"/>
+    <action id="WelcomeScreen.ReopenRecent" class="com.intellij.openapi.wm.impl.welcomeScreen.RecentProjectsAction" icon="AllIcons.General.ReopenRecentProject"/>
 
     <group id="MainMenu">
       <group id="FileMenu" popup="true">
         <group id="FileOpenGroup">
           <action id="NewDummyProject" class="com.intellij.ide.actions.NewDummyProjectAction" text="New Dummy Project"/>
-          <action id="OpenFile" class="com.intellij.ide.actions.OpenFileAction" icon="/actions/menu-open.png"/>
+          <action id="OpenFile" class="com.intellij.ide.actions.OpenFileAction" icon="AllIcons.Actions.Menu_open"/>
           <group id="$LRU" class="com.intellij.ide.actions.RecentProjectsGroup" popup="true"/>
           <action id="CloseProject" class="com.intellij.ide.actions.CloseProjectAction"/>
         </group>
         <separator/>
         <group id="FileMainSettingsGroup">
-          <action id="ShowSettings" class="com.intellij.ide.actions.ShowSettingsAction" icon="/general/ideOptions.png"/>
+          <action id="ShowSettings" class="com.intellij.ide.actions.ShowSettingsAction" icon="AllIcons.General.IdeOptions"/>
           <group id="FileOtherSettingsGroup" class="com.intellij.ide.actions.SmartPopupActionGroup">
              <action id="TemplateProjectProperties" class="com.intellij.ide.actions.TemplateProjectPropertiesAction"/>
              <group id="FileSettingsGroup"/>
           </group>
         </group>
         <separator/>
-        <action id="SaveAll" class="com.intellij.ide.actions.SaveAllAction" icon="/actions/menu-saveall.png"/>
+        <action id="SaveAll" class="com.intellij.ide.actions.SaveAllAction" icon="AllIcons.Actions.Menu_saveall"/>
         <group id="ExportImportGroup">
           <action id="ExportSettings" class="com.intellij.ide.actions.ExportSettingsAction"/>
           <action id="ImportSettings" class="com.intellij.ide.actions.ImportSettingsAction"/>
         </group>
         <separator/>
-        <action id="Synchronize" class="com.intellij.ide.actions.SynchronizeAction" icon="/actions/sync.png"/>
+        <action id="Synchronize" class="com.intellij.ide.actions.SynchronizeAction" icon="AllIcons.Actions.Sync"/>
         <action id="InvalidateCaches" class="com.intellij.ide.actions.InvalidateCachesAction"/>
         
         <group id="ChangeFileEncodingGroup" popup="true" class="com.intellij.openapi.vfs.encoding.ChangeEncodingUpdateGroup">
@@ -168,14 +168,14 @@
 
       <!-- Edit -->
       <group id="EditMenu" popup="true">
-        <action id="$Undo" class="com.intellij.ide.actions.UndoAction" icon="/actions/undo.png"/>
-        <action id="$Redo" class="com.intellij.ide.actions.RedoAction" icon="/actions/redo.png"/>
+        <action id="$Undo" class="com.intellij.ide.actions.UndoAction" icon="AllIcons.Actions.Undo"/>
+        <action id="$Redo" class="com.intellij.ide.actions.RedoAction" icon="AllIcons.Actions.Redo"/>
         <separator/>
         <group id="CutCopyPasteGroup">
-          <action id="$Cut" class="com.intellij.ide.actions.CutAction" icon="/actions/menu-cut.png"/>
-          <action id="$Copy" class="com.intellij.ide.actions.CopyAction" icon="/actions/copy.png"/>
+          <action id="$Cut" class="com.intellij.ide.actions.CutAction" icon="AllIcons.Actions.Menu_cut"/>
+          <action id="$Copy" class="com.intellij.ide.actions.CopyAction" icon="AllIcons.Actions.Copy"/>
           <action id="CopyPaths" class="com.intellij.ide.actions.CopyPathsAction"/>
-          <action id="$Paste" class="com.intellij.ide.actions.PasteAction" icon="/actions/menu-paste.png"/>
+          <action id="$Paste" class="com.intellij.ide.actions.PasteAction" icon="AllIcons.Actions.Menu_paste"/>
           <action id="PasteMultiple" class="com.intellij.openapi.editor.actions.MultiplePasteAction"/>
           <reference ref="EditorPasteSimple"/>
         </group>
@@ -184,8 +184,8 @@
         </group>
         <separator/>
         <group id="FindMenuGroup" popup="true">
-          <action id="Find" class="com.intellij.openapi.editor.actions.IncrementalFindAction" icon="/actions/menu-find.png"/>
-          <action id="Replace" class="com.intellij.openapi.editor.actions.ReplaceAction" icon="/actions/menu-replace.png"/>
+          <action id="Find" class="com.intellij.openapi.editor.actions.IncrementalFindAction" icon="AllIcons.Actions.Menu_find"/>
+          <action id="Replace" class="com.intellij.openapi.editor.actions.ReplaceAction" icon="AllIcons.Actions.Menu_replace"/>
           <action id="FindNext" class="com.intellij.ide.actions.SearchAgainAction"/>
           <action id="FindPrevious" class="com.intellij.ide.actions.SearchBackAction"/>
           <action id="FindWordAtCaret" class="com.intellij.openapi.editor.actions.FindWordAtCaretAction"/>
@@ -259,7 +259,7 @@
           <action id="EditorToggleShowWhitespaces" class="com.intellij.openapi.editor.actions.ToggleShowWhitespacesAction"/>
           <action id="EditorToggleShowLineNumbers" class="com.intellij.openapi.editor.actions.ToggleShowLineNumbersAction"/>
           <action id="EditorToggleShowIndentLines" class="com.intellij.openapi.editor.actions.ToggleShowIndentLinesAction"/>
-          <action id="EditorToggleUseSoftWraps" class="com.intellij.openapi.editor.actions.ToggleUseSoftWrapsMenuAction" icon="/actions/toggleSoftWrap.png"/>
+          <action id="EditorToggleUseSoftWraps" class="com.intellij.openapi.editor.actions.ToggleUseSoftWrapsMenuAction" icon="AllIcons.Actions.ToggleSoftWrap"/>
         </group>
 
         <!-- Mac OS Lion: In native apps toggle full screen mode is the last action in "View" menu -->
@@ -273,12 +273,12 @@
       <group id="GoToMenu" popup="true">
         <action id="GotoLine" class="com.intellij.ide.actions.GotoLineAction"/>
         <separator/>
-        <action id="Back" class="com.intellij.ide.actions.BackAction" icon="/actions/back.png"/>
-        <action id="Forward" class="com.intellij.ide.actions.ForwardAction" icon="/actions/forward.png"/>
+        <action id="Back" class="com.intellij.ide.actions.BackAction" icon="AllIcons.Actions.Back"/>
+        <action id="Forward" class="com.intellij.ide.actions.ForwardAction" icon="AllIcons.Actions.Forward"/>
         <action id="JumpToLastChange" class="com.intellij.ide.actions.JumpToLastEditAction"/>
         <separator/>
-        <action id="PreviousOccurence" class="com.intellij.ide.actions.PreviousOccurenceAction" icon="/actions/previousOccurence.png"/>
-        <action id="NextOccurence" class="com.intellij.ide.actions.NextOccurenceAction" icon="/actions/nextOccurence.png"/>
+        <action id="PreviousOccurence" class="com.intellij.ide.actions.PreviousOccurenceAction" icon="AllIcons.Actions.PreviousOccurence"/>
+        <action id="NextOccurence" class="com.intellij.ide.actions.NextOccurenceAction" icon="AllIcons.Actions.NextOccurence"/>
         <separator/>
       </group>
 
@@ -331,8 +331,8 @@
             <action id="CloseAllUnpinnedEditors" class="com.intellij.ide.actions.CloseAllUnpinnedEditorsAction"/>
           </group>
           <separator/>
-          <action id="SplitVertically" class="com.intellij.ide.actions.SplitVerticallyAction" icon="/actions/splitVertically.png"/>
-          <action id="SplitHorizontally" class="com.intellij.ide.actions.SplitHorizontallyAction" icon="/actions/splitHorizontally.png"/>
+          <action id="SplitVertically" class="com.intellij.ide.actions.SplitVerticallyAction" icon="AllIcons.Actions.SplitVertically"/>
+          <action id="SplitHorizontally" class="com.intellij.ide.actions.SplitHorizontallyAction" icon="AllIcons.Actions.SplitHorizontally"/>
           <action id="ChangeSplitOrientation" class="com.intellij.ide.actions.ChangeSplitterOrientationAction"/>
           <action id="Unsplit" class="com.intellij.ide.actions.UnsplitAction"/>
           <action id="UnsplitAll" class="com.intellij.ide.actions.UnsplitAllAction"/>
@@ -357,7 +357,7 @@
       <group id="HelpMenu" popup="true">
         <action id="GotoAction" class="com.intellij.ide.actions.GotoActionAction"/>
         <separator/>
-        <action id="HelpTopics" class="com.intellij.ide.actions.HelpTopicsAction" icon="/actions/menu-help.png"/>
+        <action id="HelpTopics" class="com.intellij.ide.actions.HelpTopicsAction" icon="AllIcons.Actions.Menu_help"/>
         <action id="ShowTips" class="com.intellij.ide.actions.ShowTipsAction"/>
         <action id="ProductivityGude" class="com.intellij.featureStatistics.actions.ShowFeatureUsageStatisticsAction"/>
         <separator/>
@@ -366,7 +366,7 @@
         <action id="ShowLog" class="com.intellij.ide.actions.ShowLogAction"/>
         <separator/>
         <action id="OnlineDocAction" class="com.intellij.ide.actions.OnlineDocAction"/>
-        <action id="Help.KeymapReference" class="com.intellij.ide.actions.RefCardAction"/>
+        <action id="Help.KeymapReference" class="com.intellij.ide.actions.RefCardAction" icon="AllIcons.General.DefaultKeymap"/>
         <action id="Help.JetBrainsTV" class="com.intellij.openapi.wm.impl.welcomeScreen.JetBrainsTvAction"/>
         <separator/>
         <action id="CheckForUpdate" class="com.intellij.openapi.updateSettings.impl.CheckForUpdateAction"/>
@@ -432,9 +432,9 @@
 
     <group id="WelcomeScreen.Documentation">
       <action id="WelcomeScreen.ReadHelp" class="com.intellij.openapi.wm.impl.welcomeScreen.ReadHelpAction"
-        icon="/general/readHelp.png"/>
+        icon="AllIcons.General.ReadHelp"/>
       <action id="WelcomeScreen.ShowTips" class="com.intellij.ide.actions.ShowTipsAction"
-        icon="/general/tipsOfTheDay.png"/>
+        icon="AllIcons.General.TipsOfTheDay"/>
       <reference ref="Help.KeymapReference"/>
     </group>
 
@@ -453,22 +453,22 @@
 
     <group id="FileChooserToolbar">
       <action id="FileChooser.GotoHome" class="com.intellij.openapi.fileChooser.actions.GotoHomeAction"
-        icon="/nodes/homeFolder.png"/>
+        icon="AllIcons.Nodes.HomeFolder"/>
       <action id="FileChooser.GotoProject" class="com.intellij.openapi.fileChooser.actions.GotoProjectDirectory"
-        icon="/nodes/ideaProject.png"/>
+        icon="AllIcons.Nodes.IdeaProject"/>
       <separator/>
       <action id="FileChooser.NewFile" class="com.intellij.openapi.fileChooser.actions.NewFileAction"
-        icon="/actions/new.png"/>
+        icon="AllIcons.Actions.New"/>
       <action id="FileChooser.NewFolder" class="com.intellij.openapi.fileChooser.actions.NewFolderAction"
-        icon="/actions/newFolder.png"/>
+        icon="AllIcons.Actions.NewFolder"/>
       <action id="FileChooser.Delete" class="com.intellij.openapi.fileChooser.actions.FileDeleteAction"
-        icon="/actions/delete.png"/>
+        icon="AllIcons.Actions.Delete"/>
       <separator/>
       <action id="FileChooser.Refresh" class="com.intellij.openapi.fileChooser.actions.RefreshFileChooserAction"
-        icon="/actions/sync.png"/>
+        icon="AllIcons.Actions.Sync"/>
       <separator/>
       <action id="FileChooser.ShowHiddens" class="com.intellij.openapi.fileChooser.actions.ShowHiddensAction"
-        icon="/actions/showHiddens.png"/>
+        icon="AllIcons.Actions.ShowHiddens"/>
     </group>
 
     <group id="DiffPanel.Toolbar">
@@ -496,8 +496,8 @@
     <group id="Console.HistoryActions">
       <action id="Console.History.Previous" class="com.intellij.openapi.actionSystem.EmptyAction"/>
       <action id="Console.History.Next" class="com.intellij.openapi.actionSystem.EmptyAction"/>
-      <action id="Console.History.Browse" class="com.intellij.openapi.actionSystem.EmptyAction" icon="/actions/consoleHistory.png"/>
-      <action id="Console.History.BrowseTW" class="com.intellij.openapi.actionSystem.EmptyAction" use-shortcut-of="RecentFiles" icon="/actions/consoleHistory.png"/>
+      <action id="Console.History.Browse" class="com.intellij.openapi.actionSystem.EmptyAction" icon="AllIcons.Actions.ConsoleHistory"/>
+      <action id="Console.History.BrowseTW" class="com.intellij.openapi.actionSystem.EmptyAction" use-shortcut-of="RecentFiles" icon="AllIcons.Actions.ConsoleHistory"/>
     </group>
 
     <group id="Internal" text="Internal Actions" internal="true" popup="true">
@@ -539,9 +539,9 @@
     </group>
 
     <group id="DirDiffMenu">
-      <action id="DirDiffMenu.SetCopyToRight" class="com.intellij.openapi.diff.impl.dir.actions.popup.SetCopyToRight" text="Set Copy to Right" icon="/vcs/arrow_right.png"/>
-      <action id="DirDiffMenu.SetCopyToLeft" class="com.intellij.openapi.diff.impl.dir.actions.popup.SetCopyToLeft" text="Set Copy to Left" icon="/vcs/arrow_left.png"/>
-      <action id="DirDiffMenu.SetDelete" class="com.intellij.openapi.diff.impl.dir.actions.popup.SetDelete" text="Set Delete" icon="/vcs/remove.png"/>
+      <action id="DirDiffMenu.SetCopyToRight" class="com.intellij.openapi.diff.impl.dir.actions.popup.SetCopyToRight" text="Set Copy to Right" icon="AllIcons.Vcs.Arrow_right"/>
+      <action id="DirDiffMenu.SetCopyToLeft" class="com.intellij.openapi.diff.impl.dir.actions.popup.SetCopyToLeft" text="Set Copy to Left" icon="AllIcons.Vcs.Arrow_left"/>
+      <action id="DirDiffMenu.SetDelete" class="com.intellij.openapi.diff.impl.dir.actions.popup.SetDelete" text="Set Delete" icon="AllIcons.Vcs.Remove"/>
       <action id="DirDiffMenu.SetNoOperation" class="com.intellij.openapi.diff.impl.dir.actions.popup.SetNoOperation" text="Set Do Nothing"/>
       <separator/>
       <action id="DirDiffMenu.SetDefault" class="com.intellij.openapi.diff.impl.dir.actions.popup.SetDefault" text="Set Default"/>
@@ -554,6 +554,6 @@
     <action id="IncrementWindowHeight" class="com.intellij.ide.actions.WindowAction$IncrementHeight" use-shortcut-of="ResizeToolWindowDown"/>
     <action id="DecrementWindowHeight" class="com.intellij.ide.actions.WindowAction$DecrementHeight" use-shortcut-of="ResizeToolWindowUp"/>
 
-    <action id="ExportTestResults" class="com.intellij.execution.testframework.export.ExportTestResultsAction" icon="/actions/export.png"/>
+    <action id="ExportTestResults" class="com.intellij.execution.testframework.export.ExportTestResultsAction" icon="AllIcons.Actions.Export"/>
   </actions>
 </component>
diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index 546ad5328178..91f17d8d3798 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -1,9 +1,9 @@
 <component>
   <actions>
     <action id="Vcs.ShowTabbedFileHistory" class="com.intellij.openapi.vcs.actions.TabbedShowHistoryAction"
-      icon="/_cvs/showAsTree.png"/>
+      icon="AllIcons._cvs.ShowAsTree"/>
 
-    <action id="CheckinProject" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction" icon="/actions/commit.png">
+    <action id="CheckinProject" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction" icon="AllIcons.Actions.Commit">
       <keyboard-shortcut first-keystroke="control K" keymap="$default"/>
     </action>
     <action id="CheckinFiles" class="com.intellij.openapi.vcs.actions.CommonCheckinFilesAction"/>
@@ -12,7 +12,7 @@
     <action id="IntegrateFiles" class="com.intellij.openapi.vcs.update.CommonIntegrateFileOrDirectoryAction"/>
     <action id="Annotate" class="com.intellij.openapi.vcs.actions.AnnotateToggleAction"/>
     <action id="Show.Current.Revision" class="com.intellij.openapi.vcs.actions.ShowBaseRevisionAction" text="Show Current Revision"/>
-    <action id="Compare.SameVersion" class="com.intellij.openapi.vcs.actions.CompareWithTheSameVersionAction" icon="/actions/diff.png"/>
+    <action id="Compare.SameVersion" class="com.intellij.openapi.vcs.actions.CompareWithTheSameVersionAction" icon="AllIcons.Actions.Diff"/>
     <action id="Compare.LastVersion" class="com.intellij.openapi.vcs.actions.CompareWithLastVersion"/>
     <action id="Compare.Selected" class="com.intellij.openapi.vcs.actions.CompareWithSelectedRevisionAction" popup="true"/>
     <action id="Compare.Specified" class="com.intellij.openapi.vcs.actions.SelectAndCompareWithSelectedRevisionAction"
@@ -30,9 +30,9 @@
     <group id="GoToChangeMarkerGroup">
       <separator/>
       <action id="VcsShowNextChangeMarker" class="com.intellij.openapi.vcs.actions.ShowNextChangeMarkerAction"
-              icon="/actions/nextOccurence.png"/>
+              icon="AllIcons.Actions.NextOccurence"/>
       <action id="VcsShowPrevChangeMarker" class="com.intellij.openapi.vcs.actions.ShowPrevChangeMarkerAction"
-              icon="/actions/previousOccurence.png"/>
+              icon="AllIcons.Actions.PreviousOccurence"/>
 
       <add-to-group group-id="GoToMenu" anchor="last"/>
     </group>
@@ -48,7 +48,7 @@
                 text = "VCS Operations Popup..." description="Context aware popup with list of commonly used VCS actions"/>
         <action id="Vcs.ChangesView" class="com.intellij.openapi.vcs.changes.ShowChangesViewAction"/>
         <reference ref="CheckinProject"/>
-        <action id="Vcs.UpdateProject" class="com.intellij.openapi.vcs.update.CommonUpdateProjectAction" icon="/_cvs/checkOut.png">
+        <action id="Vcs.UpdateProject" class="com.intellij.openapi.vcs.update.CommonUpdateProjectAction" icon="AllIcons._cvs.CheckOut">
           <keyboard-shortcut first-keystroke="control T" keymap="$default"/>
         </action>
         <action id="Vcs.IntegrateProject" class="com.intellij.openapi.vcs.update.CommonIntegrateProjectAction"/>
@@ -71,21 +71,21 @@
 
     <group id="ChangesViewToolbar">
       <action id="ChangesView.Refresh" class="com.intellij.openapi.vcs.changes.actions.RefreshAction"
-              icon="/actions/sync.png"/>
+              icon="AllIcons.Actions.Sync"/>
       <action id="ChangesView.Commit" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction"
-              icon="/actions/commit.png"/>
+              icon="AllIcons.Actions.Commit"/>
       <action id="ChangesView.Rollback" class="com.intellij.openapi.vcs.changes.actions.RollbackAction"
-              icon="/actions/rollback.png"/>
+              icon="AllIcons.Actions.Rollback"/>
       <action id="ChangesView.NewChangeList" class="com.intellij.openapi.vcs.changes.actions.AddChangeListAction"
-              icon="/general/add.png"/>
+              icon="AllIcons.General.Add"/>
       <action id="ChangesView.RemoveChangeList" class="com.intellij.openapi.vcs.changes.actions.RemoveChangeListAction"
-              icon="/actions/exclude.png"/>
+              icon="AllIcons.Actions.Exclude"/>
       <action id="ChangesView.SetDefault" class="com.intellij.openapi.vcs.changes.actions.SetDefaultChangeListAction"
-              icon="/actions/submit1.png"/>
+              icon="AllIcons.Actions.Submit1"/>
       <action id="ChangesView.Move" class="com.intellij.openapi.vcs.changes.actions.MoveChangesToAnotherListAction"
-              icon="/actions/fileStatus.png"/>
+              icon="AllIcons.Actions.FileStatus"/>
       <action id="ChangesView.Diff" class="com.intellij.openapi.vcs.changes.actions.ShowDiffAction"
-              icon="/actions/diff.png"/>
+              icon="AllIcons.Actions.Diff"/>
     </group>
     
     <group id="AlienCommitChangesDialog.AdditionalActions"/>
@@ -98,14 +98,14 @@
       <reference ref="EditSource"/>
       <separator/>
       <action id="ChangesView.DeleteUnversioned" class="com.intellij.openapi.vcs.changes.actions.DeleteUnversionedFilesAction"
-              icon="/actions/cancel.png"/>
+              icon="AllIcons.Actions.Cancel"/>
       <action id="ChangesView.AddUnversioned" class="com.intellij.openapi.vcs.changes.actions.ScheduleForAdditionAction"
-              icon="/general/add.png">
+              icon="AllIcons.General.Add">
         <keyboard-shortcut first-keystroke="control alt A" keymap="$default"/>
       </action>
       <action id="ChangesView.Ignore" class="com.intellij.openapi.vcs.changes.actions.IgnoreUnversionedAction"/>
       <action id="ChangesView.RemoveDeleted" class="com.intellij.openapi.vcs.changes.actions.ScheduleForRemovalAction"
-              icon="/actions/exclude.png"/>
+              icon="AllIcons.Actions.Exclude"/>
       <action id="ChangesView.Edit" class="com.intellij.openapi.vcs.changes.actions.EditAction"/>
       <separator/>
       <reference ref="ChangesView.NewChangeList"/>
@@ -126,9 +126,9 @@
               text="Unshelve..." description="Correct paths where to apply patches and unshelve"/>
       <action id="ShelvedChanges.Restore" class="com.intellij.openapi.vcs.changes.shelf.RestoreShelvedChange"/>
       <action id="ShelvedChanges.Diff" class="com.intellij.openapi.vcs.changes.shelf.DiffShelvedChangesAction"
-          icon="/actions/diff.png"/>
+          icon="AllIcons.Actions.Diff"/>
       <action id="ChangesView.CreatePatchFromChanges" class="com.intellij.openapi.vcs.changes.actions.CreatePatchFromChangesAction"
-              icon="/actions/createPatch.png"/>
+              icon="AllIcons.Actions.CreatePatch"/>
       <action id="ShelvedChanges.ImportPatches" class="com.intellij.openapi.vcs.changes.shelf.ImportIntoShelfAction"/>
       <separator/>
       <action id="ShelvedChanges.Rename" class="com.intellij.openapi.vcs.changes.shelf.RenameShelvedChangeListAction"
@@ -143,16 +143,16 @@
 
     <group id="CommittedChangesToolbar">
       <action id="CommittedChanges.Refresh" class="com.intellij.openapi.vcs.changes.committed.RefreshCommittedAction"
-              icon="/vcs/refresh.png"/>
+              icon="AllIcons.Vcs.Refresh"/>
       <action id="CommittedChanges.Filter" class="com.intellij.openapi.vcs.changes.committed.FilterCommittedAction"
-              icon="/ant/filter.png"/>
+              icon="AllIcons.Ant.Filter"/>
       <action id="CommittedChanges.Details" class="com.intellij.openapi.vcs.changes.committed.ChangeListDetailsAction"
-              icon="/actions/showChangesOnly.png"/>
+              icon="AllIcons.Actions.ShowChangesOnly"/>
       <reference ref="ChangesView.CreatePatchFromChanges"/>
       <action id="CommittedChanges.Revert" class="com.intellij.openapi.vcs.changes.actions.RevertChangeListAction"
-              icon="/actions/rollback.png"/>
+              icon="AllIcons.Actions.Rollback"/>
       <action id="CommittedChanges.Clear" class="com.intellij.openapi.vcs.changes.committed.ClearCommittedAction"
-              icon="/vcs/remove.png"/>
+              icon="AllIcons.Vcs.Remove"/>
     </group>
     
     <group id="RepositoryChangesBrowserToolbar">
@@ -160,7 +160,7 @@
 
     <group id="IncomingChangesToolbar">
       <action id="IncomingChanges.Refresh" class="com.intellij.openapi.vcs.changes.committed.RefreshIncomingChangesAction"
-              icon="/vcs/refresh.png"/>
+              icon="AllIcons.Vcs.Refresh"/>
       <reference ref="CommittedChanges.Details"/>
       <!--
       <action id="IncomingChanges.Get" class="com.intellij.openapi.vcs.changes.committed.GetCommittedChangelistAction"
@@ -172,9 +172,9 @@
     <action id="ChangesView.Browse" class="com.intellij.openapi.vcs.changes.actions.BrowseChangesAction"/>
 
     <action id="Diff.PrevChange" class="com.intellij.openapi.vcs.changes.actions.ShowPrevChangeAction"
-      icon="/actions/prevfile.png" use-shortcut-of="PreviousTab"/>
+      icon="AllIcons.Actions.Prevfile" use-shortcut-of="PreviousTab"/>
     <action id="Diff.NextChange" class="com.intellij.openapi.vcs.changes.actions.ShowNextChangeAction"
-      icon="/actions/nextfile.png" use-shortcut-of="NextTab"/>
+      icon="AllIcons.Actions.Nextfile" use-shortcut-of="NextTab"/>
 
     <group id="EditorGutterVcsPopupMenu">
       <reference ref="Annotate"/>
@@ -192,16 +192,16 @@
       <reference ref="EditSource"/>
       <reference ref="$Delete"/>
       <action id="Diff.UpdatedFiles" class="com.intellij.openapi.vcs.update.ShowUpdatedDiffAction"
-              use-shortcut-of="CompareDirs" icon="/actions/diff.png"/>
+              use-shortcut-of="CompareDirs" icon="AllIcons.Actions.Diff"/>
     </group>
 
     <group id="Vcs.MessageActionGroup">
       <action id="Vcs.CheckCommitMessageSpelling"
               class="com.intellij.openapi.vcs.actions.CheckCommitMessageSpellingAction"
-              icon="/vcs/checkSpelling.png"/>
+              icon="AllIcons.Vcs.CheckSpelling"/>
       <action id="Vcs.ShowMessageHistory"
               class="com.intellij.openapi.vcs.actions.ShowMessageHistoryAction"
-              icon="/vcs/messageHistory.png"/>
+              icon="AllIcons.Vcs.MessageHistory"/>
     </group>
 
     <group id="VcsToobarActions">
@@ -224,7 +224,7 @@
     </action>
 
     <action id="WelcomeScreen.GetFromVcs" class="com.intellij.openapi.wm.impl.welcomeScreen.GetFromVcsAction"
-      icon="/general/getProjectfromVCS.png">
+      icon="AllIcons.General.GetProjectfromVCS">
       <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
     </action>
   </actions>
diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java
index 55e9486dde94..81b2322e3153 100644
--- a/platform/util/src/com/intellij/openapi/util/IconLoader.java
+++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java
@@ -31,8 +31,9 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.lang.ref.Reference;
+import java.lang.reflect.Field;
 import java.net.URL;
-import java.util.*;
+import java.util.Map;
 
 public final class IconLoader {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.IconLoader");
@@ -74,6 +75,19 @@ public final class IconLoader {
     return getIcon(path, callerClass);
   }
 
+  @Nullable
+  private static Icon getReflectiveIcon(String path) {
+    try {
+      Class cur = Class.forName("com.intellij.icons." + path.substring(0, path.lastIndexOf('.')).replace('.', '$'));
+      Field field = cur.getField(path.substring(path.lastIndexOf('.') + 1));
+
+      return (Icon)field.get(null);
+    }
+    catch (Exception e) {
+      return null;
+    }
+  }
+
   @Nullable
   /**
    * Might return null if icon was not found.
@@ -117,7 +131,10 @@ public final class IconLoader {
     return findIcon(path, aClass, false);
   }
 
+  @Nullable
   public static Icon findIcon(@NotNull final String path, @NotNull final Class aClass, boolean computeNow) {
+    if (path.startsWith("AllIcons.")) return getReflectiveIcon(path);
+
     final ByClass icon = new ByClass(aClass, path);
 
     if (computeNow || !Registry.is("ide.lazyIconLoading", true)) {
diff --git a/plugins/ant/src/META-INF/plugin.xml b/plugins/ant/src/META-INF/plugin.xml
index 1fc05dc788ba..3ca059d1f592 100644
--- a/plugins/ant/src/META-INF/plugin.xml
+++ b/plugins/ant/src/META-INF/plugin.xml
@@ -70,7 +70,7 @@
     <typeName className="com.intellij.lang.ant.dom.AntDomTarget" name="target"/>
     <typeName className="com.intellij.lang.ant.dom.AntDomAntCallParam" name="antcall parameter"/>
 
-    <toolWindow anchor="right" icon="/general/toolWindowAnt.png" id="Ant Build"
+    <toolWindow anchor="right" icon="AllIcons.General.ToolWindowAnt" id="Ant Build"
                 factoryClass="com.intellij.lang.ant.config.impl.AntToolWindowFactory"/>
   </extensions>
 
diff --git a/plugins/commander/src/META-INF/plugin.xml b/plugins/commander/src/META-INF/plugin.xml
index 635f81ffd1ff..6e37f68043c2 100644
--- a/plugins/commander/src/META-INF/plugin.xml
+++ b/plugins/commander/src/META-INF/plugin.xml
@@ -9,18 +9,18 @@
   <extensions defaultExtensionNs="com.intellij">
     <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
     <selectInTarget implementation="com.intellij.ide.commander.CommanderSelectInTarget"/>
-    <toolWindow id="Commander" anchor="right" icon="/general/toolWindowCommander.png"
+    <toolWindow id="Commander" anchor="right" icon="AllIcons.General.ToolWindowCommander"
                 factoryClass="com.intellij.ide.commander.CommanderToolWindowFactory"/>
     <projectService serviceInterface="com.intellij.ide.commander.Commander"
                     serviceImplementation="com.intellij.ide.commander.Commander"/>
   </extensions>
 
   <actions>
-    <action id="CommanderSyncViews" class="com.intellij.ide.actions.SyncViewsAction" icon="/actions/syncPanels.png">
+    <action id="CommanderSyncViews" class="com.intellij.ide.actions.SyncViewsAction" icon="AllIcons.Actions.SyncPanels">
       <add-to-group group-id="PairFileActions" anchor="first"/>
       <keyboard-shortcut first-keystroke="alt F6" keymap="$default"/>
     </action>
-    <action id="CommanderSwapPanels" class="com.intellij.ide.actions.SwapPanelsAction" icon="/actions/swapPanels.png">
+    <action id="CommanderSwapPanels" class="com.intellij.ide.actions.SwapPanelsAction" icon="AllIcons.Actions.SwapPanels">
       <add-to-group group-id="PairFileActions" anchor="first"/>
       <keyboard-shortcut first-keystroke="control U" keymap="$default"/>
     </action>
diff --git a/plugins/devkit/src/references/IconsReferencesContributor.java b/plugins/devkit/src/references/IconsReferencesContributor.java
index f7f98e86afcb..6086c6cc5839 100644
--- a/plugins/devkit/src/references/IconsReferencesContributor.java
+++ b/plugins/devkit/src/references/IconsReferencesContributor.java
@@ -26,14 +26,17 @@ import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.ProperTextRange;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.patterns.*;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReference;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceSet;
 import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferenceUtil;
+import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.Processor;
@@ -60,7 +63,7 @@ public class IconsReferencesContributor extends PsiReferenceContributor implemen
 
     final XmlAttributeValuePattern pluginXml = XmlPatterns.xmlAttributeValue().withLocalName("icon");
 
-    registrar.registerReferenceProvider(or(javaFile, pluginXml), new PsiReferenceProvider() {
+    registrar.registerReferenceProvider(javaFile, new PsiReferenceProvider() {
       @NotNull
       @Override
       public PsiReference[] getReferencesByElement(@NotNull final PsiElement element, @NotNull ProcessingContext context) {
@@ -86,6 +89,46 @@ public class IconsReferencesContributor extends PsiReferenceContributor implemen
         }.getAllReferences();
       }
     });
+
+    registrar.registerReferenceProvider(pluginXml, new PsiReferenceProvider() {
+      @NotNull
+      @Override
+      public PsiReference[] getReferencesByElement(@NotNull final PsiElement element, @NotNull ProcessingContext context) {
+        return new PsiReference[] {
+          new PsiReferenceBase<PsiElement>(element, false) {
+            @Override
+            public PsiElement resolve() {
+              String value = ((XmlAttributeValue)element).getValue();
+              if (value.startsWith("AllIcons.")) {
+                List<String> path = StringUtil.split(value, ".");
+                Project project = element.getProject();
+                PsiClass cur = JavaPsiFacade.getInstance(project).findClass("com.intellij.icons.AllIcons",
+                                                                           GlobalSearchScope.projectScope(project));
+                if (cur == null) return null;
+
+                for (int i = 1; i < path.size() - 1; i++) {
+                  cur = cur.findInnerClassByName(path.get(i), false);
+                  if (cur == null) return null;
+                }
+
+                return cur.findFieldByName(path.get(path.size() - 1), false);
+              }
+              else if (value.startsWith("/")) {
+                FileReference lastRef = new FileReferenceSet(element).getLastReference();
+                return lastRef != null ? lastRef.resolve() : null;
+              }
+              return null;
+            }
+
+            @NotNull
+            @Override
+            public Object[] getVariants() {
+              return EMPTY_ARRAY;
+            }
+          }
+        };
+      }
+    });
   }
 
   public static boolean isIdeaProject(@Nullable Project project) {
diff --git a/plugins/git4idea/src/META-INF/plugin.xml b/plugins/git4idea/src/META-INF/plugin.xml
index b8532218d24a..5bd558318b99 100644
--- a/plugins/git4idea/src/META-INF/plugin.xml
+++ b/plugins/git4idea/src/META-INF/plugin.xml
@@ -19,7 +19,7 @@
     </action>
 
     <group id="GitFileActions">
-      <action id="Git.Add" class="git4idea.actions.GitAdd" text="Add" icon="/general/add.png" use-shortcut-of="ChangesView.AddUnversioned" />
+      <action id="Git.Add" class="git4idea.actions.GitAdd" text="Add" icon="AllIcons.General.Add" use-shortcut-of="ChangesView.AddUnversioned" />
       <reference ref="CheckinFiles"/>
       <separator/>
       <reference ref="Annotate"/>
@@ -31,21 +31,21 @@
       <reference ref="Vcs.ShowTabbedFileHistory"/>
       <reference id="Vcs.ShowHistoryForBlock"/>
       <separator/>
-      <action id="Git.Revert" class="git4idea.actions.GitRevert" text="Revert File" icon="/actions/rollback.png"/>
+      <action id="Git.Revert" class="git4idea.actions.GitRevert" text="Revert File" icon="AllIcons.Actions.Rollback"/>
       <action id="Git.ResolveConflicts" class="git4idea.actions.GitResolveConflictsAction" text="Resolve Conflicts..."/>
     </group>
 
     <group id="GitRepositoryActions">
       <action id="Git.Branches" class="git4idea.ui.branch.GitBranchesAction" text="_Branches" icon="/icons/branch.png"/>
       <action id="Git.Tag" class="git4idea.actions.GitTag" text="Tag Files..."/>
-      <action id="Git.Merge" class="git4idea.actions.GitMerge" text="Merge Changes..." icon="/vcs/mergeSourcesTree.png"/>
+      <action id="Git.Merge" class="git4idea.actions.GitMerge" text="Merge Changes..." icon="AllIcons.Vcs.MergeSourcesTree"/>
       <action id="Git.Stash" class="git4idea.actions.GitStash" text="Stash Changes..."/>
       <action id="Git.Unstash" class="git4idea.actions.GitUnstash" text="UnStash Changes..."/>
-      <action id="Git.Reset" class="git4idea.actions.GitResetHead" text="Reset HEAD..." icon="/actions/reset.png"/>
+      <action id="Git.Reset" class="git4idea.actions.GitResetHead" text="Reset HEAD..." icon="AllIcons.Actions.Reset"/>
       <separator/>
       <action id="Git.Fetch" class="git4idea.actions.GitFetch" text="Fetch"/>
-      <action id="Git.Pull" class="git4idea.actions.GitPull" text="Pull..." icon="/actions/checkOut.png"/>
-      <action id="Git.Push" class="git4idea.actions.GitPushAction" icon="/actions/commit.png" text="Push..."/>
+      <action id="Git.Pull" class="git4idea.actions.GitPull" text="Pull..." icon="AllIcons.Actions.CheckOut"/>
+      <action id="Git.Push" class="git4idea.actions.GitPushAction" icon="AllIcons.Actions.Commit" text="Push..."/>
       <separator/>
       <action id="Git.Rebase" class="git4idea.actions.GitRebase" text="Rebase..."/>
       <action id="Git.Rebase.Abort" class="git4idea.actions.GitRebaseAbort" text="Abort Rebasing"/>
diff --git a/plugins/gradle/src/META-INF/plugin.xml b/plugins/gradle/src/META-INF/plugin.xml
index 413d1faaed32..fc3b175b8b1c 100644
--- a/plugins/gradle/src/META-INF/plugin.xml
+++ b/plugins/gradle/src/META-INF/plugin.xml
@@ -110,9 +110,9 @@
     
     <!-- Tool window toolbar actions -->
     <action id="Gradle.LinkToProject" class="org.jetbrains.plugins.gradle.action.GradleLinkToProjectAction"/>
-    <action id="Gradle.RefreshProject" class="org.jetbrains.plugins.gradle.action.GradleRefreshProjectAction" icon="/actions/sync.png"/>
+    <action id="Gradle.RefreshProject" class="org.jetbrains.plugins.gradle.action.GradleRefreshProjectAction" icon="AllIcons.Actions.Sync"/>
     <action id="Gradle.OpenScript" class="org.jetbrains.plugins.gradle.action.GradleOpenScriptAction" icon="/icons/gradleNavigate.png"/>
-    <action id="Gradle.Help.ToolWindow" class="org.jetbrains.plugins.gradle.action.GradleToolWindowHelpAction" icon="/actions/help.png"/>
+    <action id="Gradle.Help.ToolWindow" class="org.jetbrains.plugins.gradle.action.GradleToolWindowHelpAction" icon="AllIcons.Actions.Help"/>
     <group id="Gradle.ChangeActionsToolbar">
       <reference id="Gradle.RefreshProject"/>
       <reference id="Gradle.OpenScript"/>
@@ -121,7 +121,7 @@
 
     <!-- 'Sync project structure' tree nodes actions -->
     <action id="Gradle.ImportEntity" class="org.jetbrains.plugins.gradle.action.GradleImportEntityAction" icon="/icons/gradleImport.png"/>
-    <action id="Gradle.ShowConflict" class="org.jetbrains.plugins.gradle.action.GradleShowConflictDetailsAction" icon="/actions/diff.png"/>
+    <action id="Gradle.ShowConflict" class="org.jetbrains.plugins.gradle.action.GradleShowConflictDetailsAction" icon="AllIcons.Actions.Diff"/>
     <group id="Gradle.SyncTreeGroup">
       <reference id="Gradle.ImportEntity"/>
       <reference id="Gradle.ShowConflict"/>
@@ -142,4 +142,4 @@
     <action id="Gradle.RebuildChangesTree" class="org.jetbrains.plugins.gradle.action.GradleRebuildStructureChangesTreeAction"/>
   </actions>
   
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index f71a9c20989f..55b29dccf347 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -1067,10 +1067,10 @@
 
     <group id="Groovy.Dynamic.Toolbar">
       <action id="Groovy.Dynamic.Remove" class="org.jetbrains.plugins.groovy.annotator.intentions.dynamic.RemoveDynamicAction"
-              icon="/general/remove.png" text="Remove" description="Remove dynamic element"/>
+              icon="AllIcons.General.Remove" text="Remove" description="Remove dynamic element"/>
       <separator/>
-      <action id="Groovy.Dynamic.ExpandAll" class="org.jetbrains.plugins.groovy.annotator.intentions.dynamic.ExpandAllAction" icon="/actions/expandall.png" text="Expand all" description="Collapse all"/>
-      <action id="Groovy.Dynamic.CollapseAll" class="org.jetbrains.plugins.groovy.annotator.intentions.dynamic.CollapseAllAction" icon="/actions/collapseall.png" text="Collapse all" description="Collapse all"/>
+      <action id="Groovy.Dynamic.ExpandAll" class="org.jetbrains.plugins.groovy.annotator.intentions.dynamic.ExpandAllAction" icon="AllIcons.Actions.Expandall" text="Expand all" description="Collapse all"/>
+      <action id="Groovy.Dynamic.CollapseAll" class="org.jetbrains.plugins.groovy.annotator.intentions.dynamic.CollapseAllAction" icon="AllIcons.Actions.Collapseall" text="Collapse all" description="Collapse all"/>
     </group>
 
       
diff --git a/plugins/hg4idea/src/META-INF/plugin.xml b/plugins/hg4idea/src/META-INF/plugin.xml
index 020691fa5749..46c00acb22ad 100644
--- a/plugins/hg4idea/src/META-INF/plugin.xml
+++ b/plugins/hg4idea/src/META-INF/plugin.xml
@@ -46,8 +46,8 @@
       <reference ref="Annotate"/>
       <separator/>
 
-      <action id="hg4idea.pull" class="org.zmlx.hg4idea.action.HgPullAction" icon="/actions/checkOut.png"/>
-      <action id="hg4idea.push" class="org.zmlx.hg4idea.action.HgPushAction" icon="/actions/commit.png"/>
+      <action id="hg4idea.pull" class="org.zmlx.hg4idea.action.HgPullAction" />
+      <action id="hg4idea.push" class="org.zmlx.hg4idea.action.HgPushAction" />
       <separator/>
       <action id="hg4idea.run.conflict.resolver" class="org.zmlx.hg4idea.action.HgRunConflictResolverAction"/>
       <!--<action id="hg4idea.mq.rebase" class="org.zmlx.hg4idea.action.HgMqRebaseAction"/>-->
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java
index 815922ec1c75..8d1b4b53b486 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java
@@ -18,13 +18,20 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsImplUtil;
 import org.jetbrains.annotations.Nullable;
-import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.execution.HgCommandException;
+import org.zmlx.hg4idea.util.HgUtil;
 
+import javax.swing.*;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Collection;
 
 abstract class HgAbstractGlobalAction extends AnAction {
+  protected HgAbstractGlobalAction(Icon icon) {
+    super(icon);
+  }
+
+  protected HgAbstractGlobalAction() {
+  }
 
   protected abstract HgGlobalCommandBuilder getHgGlobalCommandBuilder(Project project);
   private static final Logger LOG = Logger.getInstance(HgAbstractGlobalAction.class.getName());
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAction.java
index 7081a6f5b4e9..6ef4a88a02bb 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAction.java
@@ -18,10 +18,19 @@ package org.zmlx.hg4idea.action;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.Project;
 
+import javax.swing.*;
+
 /**
  * @author Kirill Likhodedov
  */
 public abstract class HgAction extends AnAction {
+  protected HgAction() {
+  }
+
+  protected HgAction(Icon icon) {
+    super(icon);
+  }
+
   @Override
   public void actionPerformed(AnActionEvent event) {
     final DataContext dataContext = event.getDataContext();
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPullAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPullAction.java
index b8451f14fab7..9d53d02e0279 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPullAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPullAction.java
@@ -12,6 +12,7 @@
 // limitations under the License.
 package org.zmlx.hg4idea.action;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
@@ -23,6 +24,9 @@ import org.zmlx.hg4idea.ui.HgPullDialog;
 import java.util.Collection;
 
 public class HgPullAction extends HgAbstractGlobalAction {
+  public HgPullAction() {
+    super(AllIcons.Actions.CheckOut);
+  }
 
   protected HgGlobalCommandBuilder getHgGlobalCommandBuilder(final Project project) {
     return new HgGlobalCommandBuilder() {
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPushAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPushAction.java
index b55bfc50abf7..1f8e42abfd6f 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPushAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgPushAction.java
@@ -12,12 +12,14 @@
 // limitations under the License.
 package org.zmlx.hg4idea.action;
 
-import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.Project;
 import org.zmlx.hg4idea.HgPusher;
 
 public class HgPushAction extends HgAction {
-  private static final Logger LOG = Logger.getInstance(HgPushAction.class);
+  public HgPushAction() {
+    super(AllIcons.Actions.Commit);
+  }
 
   @Override
   public void execute(final Project project) {
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index 80eae7de882a..1138d95b7553 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -156,12 +156,12 @@
   <actions>
     <action id="Maven.Reimport" class="org.jetbrains.idea.maven.project.actions.ReimportAction"
             text="Reimport All Maven Projects"
-            icon="/actions/sync.png">
+            icon="AllIcons.Actions.Sync">
     </action>
 
     <action id="Maven.ReimportProject" class="org.jetbrains.idea.maven.project.actions.ReimportProjectAction"
             text="Reimport" description="Reimport selected Maven projects"
-            icon="/actions/sync.png">
+            icon="AllIcons.Actions.Sync">
     </action>
 
     <action id="Maven.UpdateFolders" class="org.jetbrains.idea.maven.project.actions.UpdateFoldersAction"
@@ -209,14 +209,14 @@
             class="org.jetbrains.idea.maven.project.actions.AddManagedFilesAction"
             text="Add Maven Projects"
             description="Add and import Maven projects to the projects tree"
-            icon="/general/add.png">
+            icon="AllIcons.General.Add">
     </action>
 
     <action id="Maven.AddFileAsMavenProject"
             class="org.jetbrains.idea.maven.project.actions.AddFileAsMavenProjectAction"
             text="Add as Maven Project"
             description="Add and import Maven project to the projects tree"
-            icon="/general/add.png">
+            icon="AllIcons.General.Add">
       <add-to-group group-id="EditorPopupMenu" anchor="before" relative-to-action="Maven.GlobalProjectMenu"/>
       <add-to-group group-id="ProjectViewPopupMenu" anchor="before" relative-to-action="Maven.GlobalProjectMenu"/>
     </action>
@@ -225,7 +225,7 @@
             class="org.jetbrains.idea.maven.project.actions.RemoveManagedFilesAction"
             text="Remove Projects"
             description="Remove selected Maven projects from the project tree"
-            icon="/general/remove.png">
+            icon="AllIcons.General.Remove">
     </action>
 
     <action id="Maven.OpenSettingsXml"
@@ -253,13 +253,13 @@
             class="org.jetbrains.idea.maven.project.actions.RunBuildAction"
             text="_Run Maven Build"
             description="Execute selected phases or goals"
-            icon="/actions/execute.png">
+            icon="AllIcons.Actions.Execute">
     </action>
 
     <action id="Maven.ShowSettings"
             class="org.jetbrains.idea.maven.project.actions.EditSettingsAction" text="Maven Settings"
             description="Edit Maven integration settings for the current project"
-            icon="/actions/showSettings.png">
+            icon="AllIcons.Actions.ShowSettings">
     </action>
 
     <action id="Maven.ToggleOffline"
@@ -271,17 +271,17 @@
     <action id="Maven.ToggleSkipTests"
             class="org.jetbrains.idea.maven.project.actions.ToggleSkipTestsAction" text="Toggle 'Skip Tests' Mode"
             description="Toggle 'Skip tests' mode for Maven builds"
-            icon="/nodes/exceptionClass.png">
+            icon="AllIcons.Nodes.ExceptionClass">
     </action>
 
     <action id="Maven.Help"
             class="com.intellij.ide.actions.ContextHelpAction" text="Help"/>
 
     <action id="Maven.ExpandAll" class="org.jetbrains.idea.maven.navigator.actions.MavenTreeAction$ExpandAll" text="Expand All"
-            icon="/actions/expandall.png"
+            icon="AllIcons.Actions.Expandall"
             use-shortcut-of="ExpandAll"/>
     <action id="Maven.CollapseAll" class="org.jetbrains.idea.maven.navigator.actions.MavenTreeAction$CollapseAll" text="Collapse All"
-            icon="/actions/collapseall.png"
+            icon="AllIcons.Actions.Collapseall"
             use-shortcut-of="CollapseAll"/>
 
     <group id="Maven.TasksGroup">
@@ -330,13 +330,13 @@
               text="Group Modules"
               description="Group projects according to Maven structure"
               secondary="true"
-              icon="/nodes/folder.png"/>
+              icon="AllIcons.Nodes.Folder"/>
       <action id="Maven.ShowIgnored"
               class="org.jetbrains.idea.maven.navigator.actions.ShowIgnoredProjectsAction"
               text="Show Ignored Projects"
               description="Show ignored projects"
               secondary="true"
-              icon="/actions/showHiddens.png"/>
+              icon="AllIcons.Actions.ShowHiddens"/>
       <action id="Maven.ShowBasicPhasesOnly"
               class="org.jetbrains.idea.maven.navigator.actions.ShowBasicPhasesOnlyAction"
               text="Show Basic Phases Only"
diff --git a/plugins/ui-designer/src/META-INF/plugin.xml b/plugins/ui-designer/src/META-INF/plugin.xml
index 86bec25ab0f4..7da570f6d2cc 100644
--- a/plugins/ui-designer/src/META-INF/plugin.xml
+++ b/plugins/ui-designer/src/META-INF/plugin.xml
@@ -155,11 +155,11 @@
     <group id="GuiDesigner.MainToolbarActions">
       <separator/>
       <action id="GuiDesigner.PreviewForm" class="com.intellij.uiDesigner.actions.PreviewFormAction"
-              icon="/actions/preview.png"/>
+              icon="AllIcons.Actions.Preview"/>
       <action id="GuiDesigner.DataBindingWizard" class="com.intellij.uiDesigner.actions.DataBindingWizardAction"
               icon="/com/intellij/uiDesigner/icons/dataBindingWizard.png"/>
       <action id="GuiDesigner.ReloadCustomComponents" class="com.intellij.uiDesigner.actions.ReloadCustomComponentsAction"
-              icon="/actions/refresh.png"/>
+              icon="AllIcons.Actions.Refresh"/>
       <action id="GuiDesigner.ChooseLocale" class="com.intellij.uiDesigner.actions.ChooseLocaleAction"/>
       <separator/>
 
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index acb49fac6a1a..a2400794960f 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -1254,7 +1254,7 @@
 
   <actions>
     <action id="ShowProjectStructureSettings" class="com.intellij.ide.actions.ShowStructureSettingsAction"
-            icon="/general/projectStructure.png">
+            icon="AllIcons.General.ProjectStructure">
       <add-to-group group-id="FileMainSettingsGroup" anchor="after" relative-to-action="ShowSettings"/>
       <add-to-group group-id="MainToolBar" anchor="after" relative-to-action="ShowSettings"/>
     </action>
diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml
index efc76f8b37cd..d6edb106f607 100644
--- a/resources/src/idea/JavaActions.xml
+++ b/resources/src/idea/JavaActions.xml
@@ -94,7 +94,7 @@
       <add-to-group group-id="DebugMainMenu" anchor="before" relative-to-action="StepOver"/>
     </action>
 
-    <action id="Debugger.PopFrame" class="com.intellij.debugger.actions.PopFrameAction" icon="/actions/popFrame.png">
+    <action id="Debugger.PopFrame" class="com.intellij.debugger.actions.PopFrameAction" icon="AllIcons.Actions.PopFrame">
       <add-to-group group-id="DebugMainMenu" anchor="after" relative-to-action="ForceRunToCursor"/>
     </action>
 
@@ -105,10 +105,10 @@
       <add-to-group group-id="DebugMainMenu" anchor="after" relative-to-action="ToggleLineBreakpoint"/>
     </group>
 
-    <action id="ExportThreads" class="com.intellij.debugger.actions.ExportThreadsAction" icon="/actions/export.png">
+    <action id="ExportThreads" class="com.intellij.debugger.actions.ExportThreadsAction" icon="AllIcons.Actions.Export">
       <add-to-group group-id="RunMenu" anchor="last"/>
     </action>
-    <action id="DumpThreads" class="com.intellij.debugger.actions.ThreadDumpAction" text="Take a thread dump" icon="/actions/dump.png">
+    <action id="DumpThreads" class="com.intellij.debugger.actions.ThreadDumpAction" text="Take a thread dump" icon="AllIcons.Actions.Dump">
       <add-to-group group-id="RunMenu" anchor="last"/>
     </action>
 
@@ -138,14 +138,14 @@
       <action id="Debugger.CompareValueWithClipboard" class="com.intellij.debugger.actions.CompareValueWithClipboardAction"/>
       <action id="Debugger.CustomizeContextView" class="com.intellij.debugger.actions.CustomizeContextViewAction"/>
       <action id="Debugger.CustomizeThreadsView" class="com.intellij.debugger.actions.CustomizeThreadsViewAction"/>
-      <action id="Debugger.NewWatch" class="com.intellij.debugger.actions.NewWatchAction" icon="/debugger/newWatch.png"/>
+      <action id="Debugger.NewWatch" class="com.intellij.debugger.actions.NewWatchAction" icon="AllIcons.Debugger.NewWatch"/>
       <action id="Debugger.EditWatch" class="com.intellij.debugger.actions.EditWatchAction"/>
       <action id="Debugger.EditFrameSource" class="com.intellij.debugger.actions.EditFrameSourceAction"/>
       <action id="Debugger.EditNodeSource" class="com.intellij.debugger.actions.EditSourceAction"/>
       <action id="Debugger.EditTypeSource" class="com.intellij.debugger.actions.JumpToObjectAction"/>
       <reference ref="Debugger.PopFrame"/>
       <action id="Debugger.RemoveAllWatches" class="com.intellij.debugger.actions.RemoveAllWatchesAction"/>
-      <action id="Debugger.RemoveWatch" class="com.intellij.debugger.actions.RemoveWatchAction" icon="/actions/delete.png"/>
+      <action id="Debugger.RemoveWatch" class="com.intellij.debugger.actions.RemoveWatchAction" icon="AllIcons.Actions.Delete"/>
       <action id="Debugger.ViewAsGroup" class="com.intellij.debugger.actions.ViewAsGroup"/>
       <action id="Debugger.SetValue" class="com.intellij.debugger.actions.SetValueAction"/>
       <!--<action id="Debugger.ShowAsHex" class="com.intellij.debugger.actions.ShowAsHexAction" text="Show as Hex"/>-->
diff --git a/resources/src/idea/RichPlatformActions.xml b/resources/src/idea/RichPlatformActions.xml
index bc88209c38a0..10fa797c9195 100644
--- a/resources/src/idea/RichPlatformActions.xml
+++ b/resources/src/idea/RichPlatformActions.xml
@@ -29,17 +29,17 @@
 
   <actions>
     <action id="RerunFailedTests" class="com.intellij.execution.actions.AbstractRerunFailedTestsAction"
-            icon="/runConfigurations/rerunFailedTests.png"/>
+            icon="AllIcons.RunConfigurations.RerunFailedTests"/>
 
     <action id="FileChooser.GotoModule" class="com.intellij.openapi.fileChooser.actions.GotoModuleDirectory"
-            icon="/nodes/ModuleClosed.png">
+            icon="AllIcons.Nodes.ModuleClosed">
       <add-to-group group-id="FileChooserToolbar" anchor="after" relative-to-action="FileChooser.GotoProject"/>
     </action>
 
 
     <group id="NewGroup1">
       <action id="NewModuleInGroup" class="com.intellij.openapi.roots.ui.configuration.actions.NewModuleInGroupAction"
-              icon="/nodes/ModuleClosed.png"/>
+              icon="AllIcons.Nodes.ModuleClosed"/>
 
       <add-to-group group-id="NewGroup" anchor="first"/>
     </group>
@@ -90,7 +90,7 @@
     </group>
 
     <group id="BuildMenu" popup="true">
-      <action id="CompileDirty" class="com.intellij.compiler.actions.CompileDirtyAction" icon="/actions/compile.png"/>
+      <action id="CompileDirty" class="com.intellij.compiler.actions.CompileDirtyAction" icon="AllIcons.Actions.Compile"/>
       <action id="MakeModule" class="com.intellij.compiler.actions.MakeModuleAction"/>
       <action id="Compile" class="com.intellij.compiler.actions.CompileAction"/>
       <action id="RunAPT" class="com.intellij.compiler.actions.ProcessAnnotationsAction"/>
@@ -376,17 +376,17 @@
 
     <group id="WelcomeScreen.QuickStart.IDEA">
       <action id="WelcomeScreen.CreateNewProject" class="com.intellij.ide.actions.NewProjectAction"
-              icon="/general/createNewProject.png"/>
+              icon="AllIcons.General.CreateNewProject"/>
       <action id="WelcomeScreen.OpenProject" class="com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenOpenProjectAction"
-              icon="/general/openProject.png"/>
+              icon="AllIcons.General.OpenProject"/>
       <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
     </group>
 
     <group id="WelcomeScreen.Documentation.IDEA">
       <action id="WelcomeScreen.JetBrainsTV.IDEA" class="com.intellij.openapi.wm.impl.welcomeScreen.IdeaJetBrainsTvAction"
-              icon="/general/jetbrainsTvIdea.png"/>
+              icon="AllIcons.General.JetbrainsTvIdea"/>
       <action id="WelcomeScreen.DevelopPlugins" class="com.intellij.openapi.wm.impl.welcomeScreen.DevelopPluginsAction"
-              icon="/general/pluginManager.png"/>
+              icon="AllIcons.General.PluginManager"/>
 
       <add-to-group group-id="WelcomeScreen.Documentation" anchor="last"/>
     </group>
@@ -403,9 +403,9 @@
     </group>
 
     <group>
-      <action id="MarkSourceRoot" class="com.intellij.ide.projectView.actions.MarkRootAction" icon="/modules/sourceRootClosed.png"/>
-      <action id="MarkTestSourceRoot" class="com.intellij.ide.projectView.actions.MarkTestSourceRootAction" icon="/modules/testRootClosed.png"/>
-      <action id="MarkExcludeRoot" class="com.intellij.ide.projectView.actions.MarkExcludeRootAction" icon="/modules/excludeRootClosed.png"/>
+      <action id="MarkSourceRoot" class="com.intellij.ide.projectView.actions.MarkRootAction" icon="AllIcons.Modules.SourceRootClosed"/>
+      <action id="MarkTestSourceRoot" class="com.intellij.ide.projectView.actions.MarkTestSourceRootAction" icon="AllIcons.Modules.TestRootClosed"/>
+      <action id="MarkExcludeRoot" class="com.intellij.ide.projectView.actions.MarkExcludeRootAction" icon="AllIcons.Modules.ExcludeRootClosed"/>
       <action id="UnmarkRoot" class="com.intellij.ide.projectView.actions.UnmarkRootAction"/>
       <add-to-group group-id="MarkRootGroup"/>
     </group>

From d1cf24b6e7930ef2b9189c2ce22c61e3e5d3e992 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 31 May 2012 14:19:36 +0400
Subject: [PATCH 043/239] search for first class file in all roots to detect
 language level

---
 .../psi/impl/JavaPsiImplementationHelperImpl.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
index 3a887e667551..fe729adddc94 100644
--- a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
@@ -142,24 +142,27 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
       for (VirtualFile rootFile : files) {
         final VirtualFile classFile = rootFile.findFileByRelativePath(relativePath);
         if (classFile != null) {
-          return getLanguageLevel(classFile);
+          final PsiJavaFile javaFile = getPsiFileInRoot(classFile);
+          if (javaFile != null) {
+            return javaFile.getLanguageLevel();
+          }
         }
       }
+      return LanguageLevelProjectExtension.getInstance(myProject).getLanguageLevel();
     }
     return null;
   }
 
-  private LanguageLevel getLanguageLevel(final VirtualFile dirFile) {
+  @Nullable
+  private PsiJavaFile getPsiFileInRoot(final VirtualFile dirFile) {
     final VirtualFile[] children = dirFile.getChildren();
-    final LanguageLevel defaultLanguageLevel = LanguageLevelProjectExtension.getInstance(myProject).getLanguageLevel();
     for (VirtualFile child : children) {
       if (StdFileTypes.CLASS.equals(child.getFileType())) {
         final PsiFile psiFile = PsiManager.getInstance(myProject).findFile(child);
-        if (psiFile instanceof PsiJavaFile) return ((PsiJavaFile)psiFile).getLanguageLevel();
+        if (psiFile instanceof PsiJavaFile) return ((PsiJavaFile)psiFile);
       }
     }
-
-    return defaultLanguageLevel;
+    return null;
   }
 
   @Override

From b950ee85623a944fcc9b9b7f0bef764f1d3e87ee Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 31 May 2012 20:13:01 +0400
Subject: [PATCH 044/239] extract method: no need to declare variables after
 call when expression was extracted

---
 .../extractMethod/ExtractMethodProcessor.java |  1 +
 .../VarDeclAfterExpressionExtraction.java     | 34 +++++++++++++++++
 ...arDeclAfterExpressionExtraction_after.java | 38 +++++++++++++++++++
 .../refactoring/ExtractMethodTest.java        |  3 ++
 4 files changed, 76 insertions(+)
 create mode 100644 java/java-tests/testData/refactoring/extractMethod/VarDeclAfterExpressionExtraction.java
 create mode 100644 java/java-tests/testData/refactoring/extractMethod/VarDeclAfterExpressionExtraction_after.java

diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
index 41bbe91ca43d..f6895cc4fe35 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
@@ -1157,6 +1157,7 @@ public class ExtractMethodProcessor implements MatchProvider {
   }
 
   protected void declareNecessaryVariablesAfterCall(PsiVariable outputVariable) throws IncorrectOperationException {
+    if (myHasExpressionOutput) return;
     List<PsiVariable> usedVariables = myControlFlowWrapper.getUsedVariables();
     Collection<ControlFlowUtil.VariableInfo> reassigned = myControlFlowWrapper.getInitializedTwice();
     for (PsiVariable variable : usedVariables) {
diff --git a/java/java-tests/testData/refactoring/extractMethod/VarDeclAfterExpressionExtraction.java b/java/java-tests/testData/refactoring/extractMethod/VarDeclAfterExpressionExtraction.java
new file mode 100644
index 000000000000..a757c44cdfc0
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethod/VarDeclAfterExpressionExtraction.java
@@ -0,0 +1,34 @@
+class BasicLazyResolveTest {
+
+
+    public void test() {
+
+        Object session = <selection>new Object() {
+
+/*
+            public ClassMemberDeclarationProvider getClassMemberDeclarationProvider(JetClass jetClassOrObject) {
+                final JetClass jetClass = (JetClass) jetClassOrObject;
+                return new ClassMemberDeclarationProvider() {*/
+
+
+                    /*     private <D, T extends JetNamed> List<T> filter(List<D> list, final Class<T> t, final Name name) {
+                        //noinspection unchecked
+                        return (List) Lists.newArrayList(Collections2.filter(list, new Predicate<D>() {
+                            @Override
+                            public boolean apply(D d) {
+                                return t.isInstance(d) && ((JetNamed) d).getNameAsName().equals(name);
+                            }
+                        }));
+                    }*/
+
+
+             /*   };
+            }*/
+        }</selection>;
+
+        String packageDescriptor = session.toString();
+
+    }
+
+
+}
diff --git a/java/java-tests/testData/refactoring/extractMethod/VarDeclAfterExpressionExtraction_after.java b/java/java-tests/testData/refactoring/extractMethod/VarDeclAfterExpressionExtraction_after.java
new file mode 100644
index 000000000000..cb7aeffa679d
--- /dev/null
+++ b/java/java-tests/testData/refactoring/extractMethod/VarDeclAfterExpressionExtraction_after.java
@@ -0,0 +1,38 @@
+class BasicLazyResolveTest {
+
+
+    public void test() {
+
+        Object session = newMethod();
+
+        String packageDescriptor = session.toString();
+
+    }
+
+    private Object newMethod() {
+        return new Object() {
+
+/*
+            public ClassMemberDeclarationProvider getClassMemberDeclarationProvider(JetClass jetClassOrObject) {
+                final JetClass jetClass = (JetClass) jetClassOrObject;
+                return new ClassMemberDeclarationProvider() {*/
+
+
+                    /*     private <D, T extends JetNamed> List<T> filter(List<D> list, final Class<T> t, final Name name) {
+                        //noinspection unchecked
+                        return (List) Lists.newArrayList(Collections2.filter(list, new Predicate<D>() {
+                            @Override
+                            public boolean apply(D d) {
+                                return t.isInstance(d) && ((JetNamed) d).getNameAsName().equals(name);
+                            }
+                        }));
+                    }*/
+
+
+             /*   };
+            }*/
+        };
+    }
+
+
+}
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
index fba5f90a20fa..123b3e4bedad 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java
@@ -194,6 +194,9 @@ public class ExtractMethodTest extends LightCodeInsightTestCase {
     doTest();
   }
 
+  public void testVarDeclAfterExpressionExtraction() throws Exception {
+    doTest();
+  }
 
   public void testFinalParamUsedInsideAnon() throws Exception {
     CodeStyleSettingsManager.getSettings(getProject()).GENERATE_FINAL_PARAMETERS = false;

From 95733028b58bebf2247d4bab4a9fea139be0c820 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 31 May 2012 20:51:38 +0400
Subject: [PATCH 045/239] push down: substitute pushed dependencies
 (IDEA-86870)

---
 .../memberPushDown/PushDownProcessor.java            |  9 ++++++++-
 .../refactoring/pushDown/PreserveTypeArgs.java       |  6 ++++++
 .../refactoring/pushDown/PreserveTypeArgs.java.after |  6 ++++++
 .../testData/refactoring/pushDown/SubstTypeArgs.java |  6 ++++++
 .../refactoring/pushDown/SubstTypeArgs.java.after    |  6 ++++++
 .../com/intellij/refactoring/PushDownTest.java       | 12 ++++++++++++
 6 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/refactoring/pushDown/PreserveTypeArgs.java
 create mode 100644 java/java-tests/testData/refactoring/pushDown/PreserveTypeArgs.java.after
 create mode 100644 java/java-tests/testData/refactoring/pushDown/SubstTypeArgs.java
 create mode 100644 java/java-tests/testData/refactoring/pushDown/SubstTypeArgs.java.after

diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
index 543137d65e60..a3a95859fe06 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
@@ -392,8 +392,15 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
       else if (member instanceof PsiClass) {
         if (Boolean.FALSE.equals(memberInfo.getOverrides())) {
           final PsiClass aClass = (PsiClass)memberInfo.getMember();
+          PsiClassType classType = null;
           if (!targetClass.isInheritor(aClass, false)) {
-            PsiJavaCodeReferenceElement classRef = factory.createClassReferenceElement(aClass);
+            final PsiClassType[] types = memberInfo.getSourceReferenceList().getReferencedTypes();
+            for (PsiClassType type : types) {
+              if (type.resolve() == aClass) {
+                classType = (PsiClassType)substitutor.substitute(type);
+              }
+            }
+            PsiJavaCodeReferenceElement classRef = classType != null ? factory.createReferenceElementByType(classType) : factory.createClassReferenceElement(aClass);
             if (aClass.isInterface()) {
               targetClass.getImplementsList().add(classRef);
             } else {
diff --git a/java/java-tests/testData/refactoring/pushDown/PreserveTypeArgs.java b/java/java-tests/testData/refactoring/pushDown/PreserveTypeArgs.java
new file mode 100644
index 000000000000..dbf4610b3c0b
--- /dev/null
+++ b/java/java-tests/testData/refactoring/pushDown/PreserveTypeArgs.java
@@ -0,0 +1,6 @@
+import java.util.*;
+abstract class Test implements List<String> {
+}
+
+abstract class B extends Test {
+}
diff --git a/java/java-tests/testData/refactoring/pushDown/PreserveTypeArgs.java.after b/java/java-tests/testData/refactoring/pushDown/PreserveTypeArgs.java.after
new file mode 100644
index 000000000000..1e26dd3ef0e2
--- /dev/null
+++ b/java/java-tests/testData/refactoring/pushDown/PreserveTypeArgs.java.after
@@ -0,0 +1,6 @@
+import java.util.*;
+abstract class Test {
+}
+
+abstract class B extends Test implements List<String> {
+}
diff --git a/java/java-tests/testData/refactoring/pushDown/SubstTypeArgs.java b/java/java-tests/testData/refactoring/pushDown/SubstTypeArgs.java
new file mode 100644
index 000000000000..4b90ba60d12d
--- /dev/null
+++ b/java/java-tests/testData/refactoring/pushDown/SubstTypeArgs.java
@@ -0,0 +1,6 @@
+import java.util.*;
+abstract class Test<T> implements List<T> {
+}
+
+abstract class B extends Test<String> {
+}
diff --git a/java/java-tests/testData/refactoring/pushDown/SubstTypeArgs.java.after b/java/java-tests/testData/refactoring/pushDown/SubstTypeArgs.java.after
new file mode 100644
index 000000000000..bee78b91e57c
--- /dev/null
+++ b/java/java-tests/testData/refactoring/pushDown/SubstTypeArgs.java.after
@@ -0,0 +1,6 @@
+import java.util.*;
+abstract class Test<T> {
+}
+
+abstract class B extends Test<String> implements List<String> {
+}
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java
index 455b87b19e89..04690faf94c4 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java
@@ -120,6 +120,18 @@ public class PushDownTest extends LightRefactoringTestCase {
   }
 
   public void testSameClassInterface() throws Exception {
+    doTestImplements();
+  }
+
+  public void testPreserveTypeArgs() throws Exception {
+    doTestImplements();
+  }
+  
+  public void testSubstTypeArgs() throws Exception {
+    doTestImplements();
+  }
+
+  private void doTestImplements() {
     final String filePath = "/refactoring/pushDown/" + getTestName(false) + ".java";
     configureByFile(filePath);
 

From f1b1f669253fcc46673af5695e15e706a9303870 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 31 May 2012 21:19:43 +0400
Subject: [PATCH 046/239] remember configured annotations on ok only
 (IDEA-86853)

---
 .../codeInspection/ex/EntryPointsManagerImpl.java      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
index d7d6d37ee529..a704e3cb204b 100644
--- a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
+++ b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java
@@ -350,7 +350,8 @@ public class EntryPointsManagerImpl implements PersistentStateComponent<Element>
 
   @Override
   public void configureAnnotations() {
-    final JPanel listPanel = SpecialAnnotationsUtil.createSpecialAnnotationsListControl(ADDITIONAL_ANNOTATIONS, "Do not check if annotated by", true);
+    final ArrayList<String> list = new ArrayList<String>(ADDITIONAL_ANNOTATIONS);
+    final JPanel listPanel = SpecialAnnotationsUtil.createSpecialAnnotationsListControl(list, "Do not check if annotated by", true);
     new DialogWrapper(myProject) {
       {
         init();
@@ -361,6 +362,13 @@ public class EntryPointsManagerImpl implements PersistentStateComponent<Element>
       protected JComponent createCenterPanel() {
         return listPanel;
       }
+
+      @Override
+      protected void doOKAction() {
+        ADDITIONAL_ANNOTATIONS.clear();
+        ADDITIONAL_ANNOTATIONS.addAll(list);
+        super.doOKAction();
+      }
     }.show();
   }
 

From babdd2a18c1c5de8df9235e2c53a0d5df6fd798b Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 31 May 2012 14:01:14 +0400
Subject: [PATCH 047/239] Cleanup

---
 .../com/intellij/lang/java/parser/ExpressionParser.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
index 1e2cebe67217..b65578b6df00 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
@@ -62,7 +62,7 @@ public class ExpressionParser {
   private static final TokenSet ARGS_LIST_END = TokenSet.create(JavaTokenType.RPARENTH, JavaTokenType.RBRACE, JavaTokenType.RBRACKET);
   private static final TokenSet ARGS_LIST_CONTINUE = TokenSet.create(
     JavaTokenType.IDENTIFIER, TokenType.BAD_CHARACTER, JavaTokenType.COMMA, JavaTokenType.INTEGER_LITERAL, JavaTokenType.STRING_LITERAL);
-  private static final TokenSet CONSTRUCTOR_CALL = TokenSet.create(JavaTokenType.THIS_KEYWORD, JavaTokenType.SUPER_KEYWORD);
+  private static final TokenSet THIS_OR_SUPER = TokenSet.create(JavaTokenType.THIS_KEYWORD, JavaTokenType.SUPER_KEYWORD);
 
   public ExpressionParser(DeclarationParser declarationParser, ReferenceParser referenceParser) {
     myDeclarationParser = declarationParser;
@@ -363,8 +363,7 @@ public class ExpressionParser {
           dotPos.drop();
           expr = parseNew(builder, expr);
         }
-        else if ((dotTokenType == JavaTokenType.THIS_KEYWORD || dotTokenType == JavaTokenType.SUPER_KEYWORD) &&
-                 exprType(expr) == JavaElementType.REFERENCE_EXPRESSION) {
+        else if (THIS_OR_SUPER.contains(dotTokenType) && exprType(expr) == JavaElementType.REFERENCE_EXPRESSION) {
           if (breakPoint == BreakPoint.P2 && builder.getCurrentOffset() == breakOffset) {
             dotPos.rollbackTo();
             startMarker.drop();
@@ -581,13 +580,13 @@ public class ExpressionParser {
       }
 
       tokenType = builder.getTokenType();
-      if (!CONSTRUCTOR_CALL.contains(tokenType)) {
+      if (!THIS_OR_SUPER.contains(tokenType)) {
         expr.rollbackTo();
         return null;
       }
     }
 
-    if (CONSTRUCTOR_CALL.contains(tokenType)) {
+    if (THIS_OR_SUPER.contains(tokenType)) {
       if (expr == null) {
         expr = builder.mark();
         builder.mark().done(JavaElementType.REFERENCE_PARAMETER_LIST);

From cae648dcf0d6cb3e3c72c2293a7b5c16d9783f36 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Thu, 31 May 2012 21:39:09 +0400
Subject: [PATCH 048/239] do not recreate directory

---
 .../org/jetbrains/android/compiler/tools/AndroidApkBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java b/plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java
index 70d180c8bec5..a3fedd4c41e6 100644
--- a/plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java
+++ b/plugins/android/common/src/org/jetbrains/android/compiler/tools/AndroidApkBuilder.java
@@ -177,7 +177,7 @@ public class AndroidApkBuilder {
         continue;
       }
 
-      if (!dstDir.mkdirs()) {
+      if (!dstDir.exists() && !dstDir.mkdirs()) {
         map.get(ERROR).add("Cannot create directory: " + FileUtil.toSystemDependentName(dstDir.getPath()));
         continue;
       }

From 3be3a615b5abb387e2e112831dea4189f6e29e46 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Thu, 31 May 2012 21:56:04 +0400
Subject: [PATCH 049/239] Yet a bit more icons removed

---
 platform/icons/src/_cvs/checkOut.png          | Bin 539 -> 0 bytes
 platform/icons/src/_cvs/cvs.png               | Bin 537 -> 0 bytes
 platform/icons/src/_cvs/hideMissing.png       | Bin 438 -> 0 bytes
 platform/icons/src/_cvs/hideUnknown.png       | Bin 476 -> 0 bytes
 platform/icons/src/_cvs/hideUptodate.png      | Bin 435 -> 0 bytes
 platform/icons/src/_cvs/missing.png           | Bin 182 -> 0 bytes
 platform/icons/src/_cvs/testInProgress1.png   | Bin 806 -> 0 bytes
 platform/icons/src/_cvs/testInProgress2.png   | Bin 812 -> 0 bytes
 platform/icons/src/_cvs/testInProgress3.png   | Bin 809 -> 0 bytes
 platform/icons/src/_cvs/testInProgress4.png   | Bin 809 -> 0 bytes
 platform/icons/src/_cvs/testInProgress5.png   | Bin 812 -> 0 bytes
 platform/icons/src/_cvs/testInProgress6.png   | Bin 806 -> 0 bytes
 platform/icons/src/_cvs/testInProgress7.png   | Bin 806 -> 0 bytes
 platform/icons/src/_cvs/testInProgress8.png   | Bin 806 -> 0 bytes
 platform/icons/src/_cvs/unknown.png           | Bin 199 -> 0 bytes
 .../src/{_cvs => actions}/showAsTree.png      | Bin
 .../platform-resources/platform-resources.iml |   1 +
 .../src/idea/VcsActions.xml                   |   4 ++--
 .../util/src/com/intellij/icons/AllIcons.java |  21 +-----------------
 .../cvsSupport2/ui/CvsTabbedWindow.java       |   2 +-
 20 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 platform/icons/src/_cvs/checkOut.png
 delete mode 100644 platform/icons/src/_cvs/cvs.png
 delete mode 100644 platform/icons/src/_cvs/hideMissing.png
 delete mode 100644 platform/icons/src/_cvs/hideUnknown.png
 delete mode 100644 platform/icons/src/_cvs/hideUptodate.png
 delete mode 100644 platform/icons/src/_cvs/missing.png
 delete mode 100644 platform/icons/src/_cvs/testInProgress1.png
 delete mode 100644 platform/icons/src/_cvs/testInProgress2.png
 delete mode 100644 platform/icons/src/_cvs/testInProgress3.png
 delete mode 100644 platform/icons/src/_cvs/testInProgress4.png
 delete mode 100644 platform/icons/src/_cvs/testInProgress5.png
 delete mode 100644 platform/icons/src/_cvs/testInProgress6.png
 delete mode 100644 platform/icons/src/_cvs/testInProgress7.png
 delete mode 100644 platform/icons/src/_cvs/testInProgress8.png
 delete mode 100644 platform/icons/src/_cvs/unknown.png
 rename platform/icons/src/{_cvs => actions}/showAsTree.png (100%)

diff --git a/platform/icons/src/_cvs/checkOut.png b/platform/icons/src/_cvs/checkOut.png
deleted file mode 100644
index 0deafaa170fd73931a58dd0326073082b3f0cba4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003LP)t-s|Ns9h
zK3gw1Z#_YKgOIa>kF#rerhtvGYI&uAjIT#cgPMu^{r&z+H_lE#$XH#FZdLkwX8Hm-
zcDSneyu{h)@%!oV`|9%h>ht^S^Zf1f{O<Mq`279?X4n4y{#sv<Y=E6cN}F}I|9FX@
zMoXN4Z23n^oJdTZMM|5#)bhgD^TpZp$lUbI-u2Jm_S56`*5&xw==j>__}l6D-Rk+>
z>-yj8`QYvQ;q3Y1@A~8K`{eHW=J5JXJJ9Iz`$bBfQ9aR8S&r)S{8L$u?DhOpT8>m&
zkM8#U@AdpwT#r{>k47}jxzO;t((&f;`{(id=kokXHqL`__wV-n@b~=i_x<ts{qpzy
z^Z5OUb@y0Zk4Q|Nt{7~g0000BbW%=J0FS-a>Fe|J^z{2?!Q(;z0065=L_t&-S7pvc
z7Q#RfMbSX;ZsH^acXxMpcisO!ph<@Tyi=olYVZl-uYeoH{Rk)M^t$(%v2d=-c{&<&
zZYJf&?b>Y`)p9;}MW7)`i<hPs^PrSHA<*(xj|W04h}tqU3=krCw$e@vpFpIUawu>=
zgjtpap;}VLKvC3w3H+6WT?K}zw?V8FmlWU;^gy?`7S$b($#~fJ6;@lkR5&^vvRx8w
dDi{slh!<9C7T@Y@-tzze002ovPDHLkV1gd0Esy{J

diff --git a/platform/icons/src/_cvs/cvs.png b/platform/icons/src/_cvs/cvs.png
deleted file mode 100644
index f46a91236a9b07cad20fd7d858c98c9b481664be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 537
zcmV+!0_OdRP)<h;3K|Lk000e1NJLTq000aC000aK0{{R3VXLgw0003CP)t-sFGFDe
z|Nk#TU@t>pFGFByaaS)xU@SjdDm+&!Lu4vJVJA3KMLs=4Jv~T6K2KLlWKu&=Mmttp
zM<`K)Q9m;<RDd>EfjwP;NI*JVM=(Kuzi3V=YGFEic0W!+H+g(QK4p?JXrydI9+q`V
zOLU@#h(L~eGmnBekdHpik|UO77^9v#qjVU`br0Ez6Rm$h^0gK6yBq466GX}X{rO?A
zcMpq(J(F$;lWq#AsX<j?L)3T*)p`ood<tQSvg@H4?3@$w!5{L&AoJZy^t&nc<yiRO
zMfvGc`rtnL@?-k*Yx~nH`_?e~+A;g!Jp1WJ`|3sf@>c!tQT^~m{qjTo@>7U{JpTJ!
z|NdaTGh<Q!001&{QchC<01h21I89-7hnk(JudlDc#Kg(T%+S!()z;V9;^gP)@$vKZ
z_4oJp`1<<&{r&#_{&u=5^8f$<i%CR5R0tgf!Gi+APyhwcdo#9b*|vLIwr&3ZmvjyQ
zAUW{?06=rrA67jiNzkIEOm;_FCJ8lQau-&!kwnH}wI!an-MOhS)POG6AKb<DSPxD+
zh-#X)Uy8XH_J~Nk{X4A1Le#p1zViBN;&CdwN*~Zzd~Y|Gmcmd5q|O=3SH}_=2T76!
buT1g}AKnrKeV+b~00000NkvXXu0mjf^jY_A

diff --git a/platform/icons/src/_cvs/hideMissing.png b/platform/icons/src/_cvs/hideMissing.png
deleted file mode 100644
index 97b1a5b86b499024ca2f6dffbf48c3518bdf03f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002VP)t-s|NsAq
zldXx9ty5opVQh#~UwvS0hc825-s0!-^!Lxz+|k$G)7anB+27UM;n>~d+u-Hh<LWp_
zV&LTH;N|S%=IZ0<?&aw0=<M<7?(*yJ^Y8NY!N=D5`uoh%+RfA3-sI}u<m=z$>)++;
z&eYuC<mos{W8viK;pgo-OJw5b?c?U_<LB!;Ol3AkU*+lU=IQL_>hI?3@aO97=j-su
z&ezu4;mXk2?eO#M@bvES^vcoM@bmWZ^Y-%d_1xm=^Y!-h_4nQ3=4#CR_W%F@2Xs<S
zQvm7f@bK~R&y*qE0001$Nkl<ZcwTMG*Al`Y5I|8-Baq&E?7jEi|No;T%4WtHci@3@
z7xZUHet#t;DK24ts$WP+#@Hn}9b!prWaP09CJv1x@q<0d&2wI6C^j%#@HaJ$6~HwZ
z_vz5+%>fdx%e$`m1x)j<+9QDDrz^4x5c96t@~j0A89Ux<=LSHit4gQ7-&z2hr9W`n
gP3tb8QZ5FeH$qtr1hIcqga7~l07*qoM6N<$g0;s0+W-In

diff --git a/platform/icons/src/_cvs/hideUnknown.png b/platform/icons/src/_cvs/hideUnknown.png
deleted file mode 100644
index ae5728e8192fbee9f8a8b335e91e35da305dbc6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002zP)t-s|NsAk
zkh6o2vr1TiSZ0S=W`{3BV94C`&*1i!s>Z#=+QQfK#o6>mTYJpj^-5lR&*Apc<M-3!
z_SWV2*5>%v=lI#^`P%6C-0Jz@?fT;H`sMKZ=kfdO_5APl{POty`27C4(D2ga_q)>Z
z)8qHk<oDF%_tfP0ywdU3=J!Zke7@B3+35Jb)$+g8^1;{h-Rk+>>iXU5`rhmL-t79|
z?D|Amdf@H*;_mvz+4JM?`%GVaOkaKI^84uW{Oa@k>h%1}-u3SG{qObsM_YUF_Wkhp
z{qgwy@%jCpvB;*j%E;UFlBUIwA|m$y000JbQchC<>Fe?F@i_-?mjD0&o=HSOR2Wxf
z%2f`+P!t5vR|>E0?#12R-P!+oAZaflVKVb`G6?+#r~45WvqXmYG?xI2<Ll)RY}Y=S
zK4Kg#rh}H|C4kvmgu|XySKahMoM*?!Qo7S)fY9l$bfqB<0Rr2U3bH`i06R-B(I<vC
z0XCXK3k=U00KQ6#)SPQ-0G=#TlUKV~0dV(EzT2tg6#!>sn}%L317yi>5PAbcN)DqE
SU9<`S0000<MNUMnLSTYNJ{SD}

diff --git a/platform/icons/src/_cvs/hideUptodate.png b/platform/icons/src/_cvs/hideUptodate.png
deleted file mode 100644
index 35812474337abfb09c34991978c390cf37c68593..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0002SP)t-s|NsAk
zkh6o2vr1TiSZ0S=W`{3BV7<lKz3tG&_1L)R%e(8&Kwo9C;l#i1(!lW3!t&L_^VYND
z#>e;C%KF{R?A*=m-Oc^r&hOvQ@Zi$%;necv*!Jkz`03pG>)re8;Qj9B|MThp^7Q}u
z%k12?=E*={XS(XmL1Adl{^8I6;zD6)LSkt|WNX#)<<<1%*7WAr_2xumY({2nuiwHz
zUS;0=?ce<EK3!zt{_x`e@Z|mO<p1&I{_p1h^2qqx$@$#1<;Z6h`7r<h00wkYPE!Es
z>+$jNIR|f-0001%Nkl<ZcwTMG)e^!$3<Xe1VWsZw#ob;1|EJgvn+ImdBo8?^Y5ghG
z%&%aCg|@)D`vr{Z@^LN>c_#9U8dVeDv1uyukFr8{=Shu(UkJDHmF=ds0=W2WpU<WX
zfZ}CSQzvo^aNKTKK2RcnoEjRDrG5yIv3#WLPXR!xH@T&H00|jNZ%f^|0PAHOg@Nbx
dICMlP1|N6;4Qf!F1+D-9002ovPDHLkV1f&p@;(3n

diff --git a/platform/icons/src/_cvs/missing.png b/platform/icons/src/_cvs/missing.png
deleted file mode 100644
index be638c26242d6cb0d0ba26feef70c2172498ec86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=%3?!FCJ6-`&iUB?$uK)l4_lvLSn7($w`lAas
z99y&d;@UlzwjI5_{n(uY=bs+D@N9{-(08C>#*!evU<QY0H`0I{XHOT$5DwYoga(Fl
zVaklh{MgQ!IkR2VV_O%-=yq9;?VKB%V)%jt%^An9zT%klSf^Adfkl&X)ti=;Pqb15
eie9(OVr8&Y;@$FOc19S`I0jEwKbLh*2~7Y_??bx)

diff --git a/platform/icons/src/_cvs/testInProgress1.png b/platform/icons/src/_cvs/testInProgress1.png
deleted file mode 100644
index c50631693d2e6d225b781ad23d4f572ec25c6366..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005eP)t-s|NsA>
zUI3zB0HR<4reg!9V+5vT2B%^Gr(^@CWCW;V0H9s~p<e)^U;(6J0i<FAs%QqQY74Dx
z4X<qsv1<geZwj(&1F~)gzkwdXeG<Wc8^U@G!hRLQb^^q90=#}6y?q<Ne;UAn9m913
z!*>V6bp*qC3eS=&(TW(+k0#TB1oE#h@~|-Tu`ctpF!Q=s^SoB{q7n3{8~^BW|Noi!
zf-w1lG5Lr(`in67jWzwtsr}Kk|GXss$vpqdT>s5U`F<+@|DON<p#Qoh|GOpsyd!;l
zZ>gDPtfPYe!7=~BH2=mr|HerBo?!c;X8fl<{Hi|uuzdWmef+Xf{Iq8LwQBsiS^T?P
z{JdZP*lYjUT>sgQ|Jqys-CY0QV*lS{|KN@Pyfgp6Ec%l^`j<%hoKpYJQ~%Cv|Icmz
z&~*RNO#jhM|J6_b)lmP}h5C*&|LAi6>8k(ga{udf|LeN{?0Em}y#MXS`F|?<kT?Fv
zMgHHa`j9yP;cWlndH>~(|K+a#=B)j{mHB!kT3uOMUtf1~VgBQH{_y7h@s9ttAOG&d
z|MP_Z^V$FO+5hy~|MlJf`j7wqm;bjS|Nol*|C|5+o&UHW|No!=xh?<yp|+gh;{X5v
zGjvi;QvfO}D^*ohR#sM5W@l$<X`rE_q@|^%roX_z!NJ19&d$)#(b3Y<+uYpV_xJbr
z_xJetU``Ee0002dNkl<Z7*}Ipzy=t(1r_84xEWz`tWpN)tt~TkB-kJ#oSJzJjc#o|
z)4SBcBFr+;y?rGf?rGjOlO;g9c=gNst3y&O{i|$UwYh-;BAFA)LIbV*90GD}orQn`
zY8l;ysn#7$W)|@|HcCJN6}yD`<RB|why2pGBt@WrSYl*du&H@PbNIvpFJYhnkD+~S
zdst0nMCY_3U67$naxSqwlct!MOm)hZ1Ur^p%d^;NhT|;97!4MPQ@Lb~vW$(R^rSgp
ko?+q>S5_6}XU6Jt05T0Q#A7C*qW}N^07*qoM6N<$f`})!jsO4v

diff --git a/platform/icons/src/_cvs/testInProgress2.png b/platform/icons/src/_cvs/testInProgress2.png
deleted file mode 100644
index 7d9b0d03fd7b8cc59fd24a6d42a001db46186b10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 812
zcmV+{1JnG8P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005kP)t-s|NsA>
zUI3zB0HR<4reg!9V+5vT2B%^Gr(^@CWCW;V0H9s~p<e)^U;(6J0i<FAs%QqQY74Dx
z4X<qsv1<geZwj(&1F~)gzkwdXeG<Wc8^U@G!hRLQb^^q90=#}6y?q<Ne;UAn9m913
z!*>V6bp*qC3eS=&(TW(+k0#TB1oE#h@~|-Tu`ctpF!Q=s^SoB{q7n3{8~w|v|No%*
zf-w1lG5`OW{n51k->UxOcmD9^{_&3aek%X}n*aZv|LAf0mq_}YQv04@`=Vz2r#}3u
zKK!tJ{IGrevQhlBX8g5k|H)hb%Uu7>N&n7M|ITdx&tw13ZU4}8|ItkU(M|u=Pyf|W
z|J7>$*M<MsYyZJ9|H3r?#z_CkJo$er|LAi6>8k(ga{udf|LeN{?0EW%F#3%(`i?XD
zkT?2}IRCpP`G`9IxF7$yE&u<Y|GFjryd(d-B>%iK|Gqr`z%2jST>sgQ|Jqys+K2z$
zT>sx<|KDW);En&`Z2#hU|Kpke<&OX5uK(t&{JB~DyIlOdU;V$8fp}7fdQg*tQ~&L}
z|Lw;A?!*7{g#Yu||Mc1a^xFUR-T(TJ|NfWxdL&s}RR8~*|Nos`T~cLXPx_NS|No)M
zXX&5-001*|QchC<Dl02hRaI72R##?cXK87mp`)awrKYC8z`()5!otqZ(9qG*($d@9
z+}`*1_xJbr`1oK>4Qv1a0MSWAK~xx5V_?7r7`X)%<OR4HVREce1_3@Lc{&no5D`wz
z$foAXz}Vbb>R=IOnezS#DGd?+ozrGYfOPTd_e`|(a!hya>L}Fa1`3D-PwMt|H+Hdg
z3y&)h0t%=F^(H!5Sht&{)r1u(0R>ciYa3^K7(3f$q*j+I0tLj1qv}0PbK<AAPELps
z1`6;P`qf#rWM#J5%t+D&8OkJ=UDY?m&fI*uNvI^)vFuvW$tL;sbL=ZLSRhX2k~Io(
qa46H0=74#IiBDWvRg|9@tIq+M!7+F}@0EoB0000<MNUMnLSTZas=ST>

diff --git a/platform/icons/src/_cvs/testInProgress3.png b/platform/icons/src/_cvs/testInProgress3.png
deleted file mode 100644
index 167811a22d9076fafc50e075d922e7adf357ede0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 809
zcmV+^1J?YBP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005hP)t-s|NsA>
zUI3zB0HR<4reg!9V+5vT2B%^Gr(^@CWCW;V0H9s~p<e)^U;(6J0i<FAs%QqQY74Dx
z4X<qsv1<geZwj(&1F~)gzkwdXeG<Wc8^U@G!hRLQb^^q90=#}6y?q<Ne;UAn9m913
z!*>V6bp*qC3eS=&(TW(+k0#TB1oE#h@~|-Tu`ctpF!Q=s^SoB{q7n3{8~J`J{mZHU
z|C#^)p81G6`in67jWzm?Gy0G>`F|??(X{@@MgHHa{^NK4@aF#Uj{mkF|F<IlxF7$y
zE&sYD|H(Z6$y@)+T>s5U|ISnY&TRkBWB<=>|Il>*(M<o*P5<a||LAi6>8k(ga{udf
z`GPR{f-(R9p!$$F`jbBTmq_}YQv04@|GOpsyd(d-B>%iK|Gqr`!7=~BH2=mr|HerB
zqGtT3KK!aa{IGoduzmcpQT()K{IzQQxmo<XT>QLW|J6|c)oTCOh5y)V|Jhvs*^d9(
zTmRaJ|J_{w;En&`Z2#hU|Kpke<&OX5uK(t&{lArWd0~BeTB)XPtf6B6>$?B#y#MXS
z|L(*8^MwEN+5hy}|Mc4b_1*vakN^Ic`FbS(|C;~*oB#ivT3l5B|DRf2Rsa8?^v<Js
z0000pbW%=J04gghRaI41R#sPLXJ=_?prNCrrKP5(zreu3!NS7M&d|`&(bCe}+}z&x
z_xJbr_xSi=P7Q1T007ZRL_t&-S7Ttn1{k>o732lD8DVm)QU<=BDQ-FvY!DGn&9bKE
zYQGFuXLYa$vrJ`Qe`iCfPkNGz1V|UJe)k0X{8-B@JC8(dZlHijz{IYC9Ft7r>=F-m
zA)tVoe@|$ftz%21MMv8VC7^(cS8ZcVu1UPHReS3!MWBFKa(R7Tgt^U>qDdiX!axBY
zL+?6=!f5Mar|Dt3AVZnt5^8!UPc=2278N83b}YMAYIxL4v)N`<8Y~c}a>*J61_xK@
nNprwF!^9`9tSZXSjMe7=6xlIJ5}V@p00000NkvXXu0mjfHYc?)

diff --git a/platform/icons/src/_cvs/testInProgress4.png b/platform/icons/src/_cvs/testInProgress4.png
deleted file mode 100644
index fec75adf81442cbe8b6a49fbfe2ded63ea478a4c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 809
zcmV+^1J?YBP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005hP)t-s|NsA>
zUI3zB0HR<4reg!9V+5vT2B%^Gr(^@CWCW;V0H9s~p<e)^U;(6J0i<FAs%QqQY74Dx
z4X<qsv1<geZwj(&1F~)gzkwdXeG<Wc8^U@G!hRLQb^^q90=#}6y?q<Ne;UAn9m913
z!*>V6bp*qC3eS=&(TW(+k0#TB1oE#h@~|-Tu`ctpF!Q=s^SoB{q7n3{8~J`J|GXss
z|DO4RG5Lr(`in67jWzm?Gy0G>`j9yN%c=joGylFk|H(Z6$y@)+T>s5U|LAf5|C#^)
zn)!k-|GOpsyd(RfX8fl<{Hi|xz%2j4G5^9e|HeB1#z_3IeEhI|{IXH}v}XLZYW%rb
z{JUKIykGslm4}mh|F<IlxF7$yE&7u_`F|??(X{@@MgHHa{^NK4@aF%{Q~%Cv|IcIp
z&u#zEbpO#z|J6_bwjclKa{uY7|LSu8>vjL@x|5f7|J6|c)oTCOh5y)V|Jhvs*^d9(
zhyUGN|KDQ&-(>&bjsM|n|KfT7<C*{Ej{oJZ|K_audL&tCZCzzwWoTQ0jd%K&NdN43
z|Lwg0?Z*G^!~gSy|MS`Z^x6OP+W+<4|N4*r{+IfkQv04@|GFjr|DXT=p#T4&ESf$c
z0000pbW%=J04gghRaI41R#sPLXJ=_?prNCrrKP5(zreu3!NS7M&d|`&(bCe}+}z&x
z_xJbr_xSi=P7Q1T007ZRL_t&-S7Ttn1{k>o732lD8DVm)QU>Xc_HjBAY!DGn&9df}
zs*J$cTy?MrvrOfLiA9a2X#plN5+Gf?`n{8qL%S@!lN>y?xq$*AS(AIhf^5BveM%f=
z2muAuGW+tUC8kE1S=8p3C;<gjoa&n5gKei9TXom?Dgp(>?8+NL+|3hOBc|l}3j+ms
z44vy!!fmW0i=zv4L54EPc~tjLb#ry?Z0nE&JC<F`uW;5()7hr&8Y~c}a>*KHySP;7
nNprwF!^9`9tSZXSjMe7=3{){Bq6Hh#00000NkvXXu0mjf!OOSk

diff --git a/platform/icons/src/_cvs/testInProgress5.png b/platform/icons/src/_cvs/testInProgress5.png
deleted file mode 100644
index 5a5811ff77dd882145becf09cd93f5d95c3141c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 812
zcmV+{1JnG8P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005kP)t-s|NsA>
zUI3zB0HR<4reg!9V+5vT2B%^Gr(^@CWCW;V0H9s~p<e)^U;(6J0i<FAs%QqQY74Dx
z4X<qsv1<geZwj(&1F~)gzkwdXeG<Wc8^U@G!hRLQb^^q90=#}6y?q<Ne;UAn9m913
z!*>V6bp*qC3eS=&(TW(+k0#TB1oE#h@~|-Tu`ctpF!Q=s^SoB{q7n3{8~w|v|H(Z0
ze=7NcF!_Qp`G`7NWn}%)wEo9M|GXssyfgWJD*wq_|I1we%}M{xQ~&><|No)-mq_}Y
zQv04@|G_c;!ZiQJI{(H<`=Vz2r#}3uKK!tJ{IGrevQhlBX8g5k{JB~DyIlOdU;V$8
zsj`Bsw1WA1BzJ^%eTsMbjx+j@H~Nq`|F<IlxF7$%JpaHf{@<$p<9Gh>=Kk@H|F$3h
z&TRkBWB<=>|Il>*(M<o*P5;$T|J6|c)oTCOh5y)V|Jhvs*^d9(TmRaJ|J_{w-(vsY
zWdGoe|KV)<jWzm<F#owN|GFjryCwhPdH>^?|K*PV<*xtctpDh8|LLm#>T>_<b^q(S
z|Ll1G?Y#f(#{cfa|MP_Z^V$FO+5hy~|MlJf`j7wqm;e8n|Noo+|DFH;p8vcf`jbA1
zIFxh%001*|QchC<Dl02hRaI72R##?cXK87mp`)awrKYC8z`()5!otqZ(9qG*($d@9
z+}`*1_xJbr`1oK>4Qv1a0MSWAK~xx5V_?7r7`X)%<OR4HVREce2ATFr^*R!45D`wz
zqSm(ZEbqh&b+8DtOzFf)-OYtgUN#95AYHureUnpyTx)%;O=fFz0|i8Krt}8;8~fP#
z6__*#0R_~u`#apM(!$N_s`71=fC4HG)h%-ZjNR>Gdn%I^fdXQ-#Z7@`7N$|5Q`<d-
zfdV{+jy0(v@o{14Gdp!bhBC=DR!o={5jlN^bDkvFvFutNUCz-lF0;xsSRhX2k~PY;
qv@Fq+=74#IiBDWvRg|9@tIq*VG%<UL<&w4l0000<MNUMnLSTZ)t-FB$

diff --git a/platform/icons/src/_cvs/testInProgress6.png b/platform/icons/src/_cvs/testInProgress6.png
deleted file mode 100644
index dddc98f7eac899e906308bc593a3b7bda3c66082..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005eP)t-s|NsA>
zUI3zB0HR<4reg!9V+5vT2B%^Gr(^@CWCW;V0H9s~p<e)^U;(6J0i<FAs%QqQY74Dx
z4X<qsv1<geZwj(&1F~)gzkwdXeG<Wc8^U@G!hRLQb^^q90=#}6y?q<Ne;UAn9m913
z!*>V6bp*qC3eS=&(TW(+k0#TB1oE#h@~|-Tu`ctpF!Q=s^SoB{q7n3{8~^BW|Noi!
zf-w1lG5Lr(`in67jWzm?Gy0G>`j9yKlRo;FNcx;o{mZHUyd?k0JpajC|I1we%}M{x
zQ~%Cv|IcIp&u#zEbpO#z|ItnV)ldJ`Q2Bl;|LAi6>8k(ga{udf|LeN{?0Em}y#MXS
z|L(*8^V$FO+4+Ae|Nox<|DXT=p#T4&Sz=%Ryfgp4JpaHf|H3r?#ybDTNL^l2Wn@%=
zf@Oz}Z<CN~`<`I?qGtT3KK!aa{IGoduzmcpQT()K|J7>$*M<MsYya6?|JjcJ+FSqH
zhyUMV|KDW);En&{dH>^?|K*PV<*xtcto*fV{JB~DyIlOdU;V$8`FbS%(X{@@MgHHa
z{_y7h@s9ttAOG~)|MlJf`j7wqm;bjS|Nol*|C|5+o&UHW|G6#yx+VX-BX!zTg8%>k
zGjvi;QvfO}D^*ohR#sM5W@l$<X`rE_q@|^%roX_z!NJ19&d$)#(b3Y<+uYpV_xJbr
z_xJetU``Ee0002dNkl<Z7*}Ipzy=t(1r_84xEWz`tWpN<&Pg+LB-kJ#oSLPLO;sLg
z)BDuHBFr)skx?P_C2pyXlO;g9c=f~kyNm5C^SYd7X>$VwM7$=1H5WMK`se#O%@hI(
zsCh;N+IRM}n_1NOIw}DLR9tEsYzrN7{H;Q(lNEsiVu@vSMW*J_9jy}sQiOp5Jch2B
z*)2BKZN1ZibU}tP$)zV`O`2k2GBwUe66{!Zt&HHf*qHd3N(~l>Q@Lb~yp4^^^`tpq
ko?+q>S5_6}XU6Jt09&{*8Zhj?@c;k-07*qoM6N<$g3JTAEC2ui

diff --git a/platform/icons/src/_cvs/testInProgress7.png b/platform/icons/src/_cvs/testInProgress7.png
deleted file mode 100644
index 5b1835a5e1b8bb71fec8c8b5639cf5a1c96d3bd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005eP)t-s|NsA>
zUI3zB0HR<4reg!9V+5vT2B%^Gr(^@CWCW;V0H9s~p<e)^U;(6J0i<FAs%QqQY74Dx
z4X<qsv1<geZwj(&1F~)gzkwdXeG<Wc8^U@G!hRLQb^^q90=#}6y?q<Ne;UAn9m913
z!*>V6bp*qC3eS=&(TW(+k0#TB1oE#h@~|-Tu`ctpF!Q=s^SoB{q7n3{8~?l{|H(Z6
z|DO4RG5Lr(`in67jWzm?GyTh{`F<+@yfgWKD*wq_|IJDN=yCu5nfZb+|No%>|Dpf4
zBLBD_|G6#yx+VX+CI7r5T3=sUU}OKjJpaHf|G_c;!ZiQJI{(H<cYcC>esQU#jQX5X
z`<`I?qGtT3KK!aa{IGoduzmcpQUBFy|JQ~8*lYjUT>sgQ|Jqys=yLz+a{udf|LeN{
z?0Em}y#MXS|MP_Z^V#~7KKhqP`j9vM(X{{0Q~%Cv|IcIp&~*RNO#jhM|J6_b)lmA7
zIRDy*|J_{w-(vsYWdGr8|KfT7<C*{EuK(t&{Iq8LwQBsiS^T?P{JdZNzm=?{eEE7L
z{>MfB->U!g+5hy~|MlJf`j7wqm;U2-|Nol*|C|5+o&NCV|No!<@s9ttA6+zH^Z)<=
zGjvi;QvfO}D^*ohR#sM5W@l$<X`rE_q@|^%roX_z!NJ19&d$)#(b3Y<+uYpV_xJbr
z_xJetU``Ee0002dNkl<Z7*}Ipzy=t(1r_84xEWz`tWpNW_I@5Z5^N9=PR)d-=IWAQ
z_gU&-5oVd>+`f#)_@W?VHwlm~Uj6L;-j;mJs2&q<ZEm1|Na=*E))?zZo9IdtPa&Xy
znr}#0c;WO;GmE+kV<n(~ice@)UaWP5ja6o?zamgT%r>zh&e`0qyM1D6pfFH?$IzjE
za$8kF$INMIx*$WD<h*KfCQWg2n(9(633e>IRzSMT3{zLr6b%-LQ@Lb~${Zb&^rSgp
ko?+q>S5_6}XU6Jt0OlAl!JWRuF8}}l07*qoM6N<$g0h3S;Q#;t

diff --git a/platform/icons/src/_cvs/testInProgress8.png b/platform/icons/src/_cvs/testInProgress8.png
deleted file mode 100644
index bfc1339045f9dfddf886543e587fc42ea7f0bce3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 806
zcmV+>1KIqEP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0005eP)t-s|NsA>
zUI3zB0HR<4reg!9V+5vT2B%^Gr(^@CWCW;V0H9s~p<e)^U;(6J0i<FAs%QqQY74Dx
z4X<qsv1<geZwj(&1F~)gzkwdXeG<Wc8^U@G!hRLQb^^q90=#}6y?q<Ne;UAn9m913
z!*>V6bp*qC3eS=&(TW(+k0#TB1oE#h@~|-Tu`ctpF!Q=s^SoB{q7n3{8~^BW{mZHO
zf-w1lG5Lr(`in67jWz%Ong6^b|H(Z6$y@)+T>s5U|ISnY&TRR9D*ykU|No%>|Dpf8
zCI7r5U1Vtgyfgp4JpaHf|G_c;!ZiQJI{(H<Wom4JiI9hml#`Bx`FbS#qGtT3KK!aa
z{IGoduzmcpQT()K|J6|c)oTCPYya6?|Jqys+K2z$T>sx<|KDW);En&$P5;$T`j9vO
z=yLz*s{iV8|Lb-C>$?B!c>nFZ|Lw;A?!*7{g!z9e`j9yP|DXDkKKhqP`kYexo?!Zp
zGyl(H|Icmz&~*RNO#k6*|KfT7<C*{Ej{oJZ|K_axwQBsiS^T?P{JdZNzm-{Lc>U3|
z{>MfB<9Gh>=Kk@H|MlJf`j7wqm;bgO|Nol*|C|5+o&UEY|F|Fjxh?;?CGcS{DF6Tf
zGjvi;QvfO}D^*ohR#sM5W@l$<X`rE_q@|^%roX_z!NJ19&d$)#(b3Y<+uYpV_xJbr
z_xJetU``Ee0002dNkl<Z7*}Ipzy=t(1r_84xEWz`tWpM!wq7%JB-kJ#oSGiZEs53s
zGbXEpMVMs*x&m_>V;%ggr%Qlz@#+@@1xJ@#hV|IEYjXnyL~1AGw?>$RI)%sB%n||$
zsMQo^Rdn}tnpvczTPpztRP0il$|6lFovQMZy%m81VxDmgQKsg_A?*`0eT9JnJcjo5
zy=^5K9sSd?bwP$Q$+;yJO`2k5HPt0e66{!ZEuS2hQfF7^1PvC5Q@Lb~>Wq!!^`tpq
ko?+q>S5_6}XU6Jt00G)C$dud-ZvX%Q07*qoM6N<$f+do$PXGV_

diff --git a/platform/icons/src/_cvs/unknown.png b/platform/icons/src/_cvs/unknown.png
deleted file mode 100644
index c3db35b2d4d51d1b8d1c656897553d004a481752..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMV)pt(#|NlRb#DkI-Kh_7T
z=P3#D3ua)j@atN%YQv_jJJ0+MblL_Kck^^{4B?1Q7HDB&^J)8%w?N_WyI!74d}nr-
zOK)h9xWjlyTA_y}lcTw@a2r$0!L6N)haTKuNHySE(7nNVNtrPN<AoF+Z^rY%5-n^i
Snr8q_WbkzLb6Mw<&;$Sr>_MLZ

diff --git a/platform/icons/src/_cvs/showAsTree.png b/platform/icons/src/actions/showAsTree.png
similarity index 100%
rename from platform/icons/src/_cvs/showAsTree.png
rename to platform/icons/src/actions/showAsTree.png
diff --git a/platform/platform-resources/platform-resources.iml b/platform/platform-resources/platform-resources.iml
index b02a4aad9114..dcae9c1f00d4 100644
--- a/platform/platform-resources/platform-resources.iml
+++ b/platform/platform-resources/platform-resources.iml
@@ -8,6 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lvcs-impl" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="util" />
   </component>
 </module>
 
diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index 91f17d8d3798..0070165c10b3 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -1,7 +1,7 @@
 <component>
   <actions>
     <action id="Vcs.ShowTabbedFileHistory" class="com.intellij.openapi.vcs.actions.TabbedShowHistoryAction"
-      icon="AllIcons._cvs.ShowAsTree"/>
+      icon="AllIcons.Actions.ShowAsTree"/>
 
     <action id="CheckinProject" class="com.intellij.openapi.vcs.actions.CommonCheckinProjectAction" icon="AllIcons.Actions.Commit">
       <keyboard-shortcut first-keystroke="control K" keymap="$default"/>
@@ -48,7 +48,7 @@
                 text = "VCS Operations Popup..." description="Context aware popup with list of commonly used VCS actions"/>
         <action id="Vcs.ChangesView" class="com.intellij.openapi.vcs.changes.ShowChangesViewAction"/>
         <reference ref="CheckinProject"/>
-        <action id="Vcs.UpdateProject" class="com.intellij.openapi.vcs.update.CommonUpdateProjectAction" icon="AllIcons._cvs.CheckOut">
+        <action id="Vcs.UpdateProject" class="com.intellij.openapi.vcs.update.CommonUpdateProjectAction" icon="AllIcons.Actions.CheckOut">
           <keyboard-shortcut first-keystroke="control T" keymap="$default"/>
         </action>
         <action id="Vcs.IntegrateProject" class="com.intellij.openapi.vcs.update.CommonIntegrateProjectAction"/>
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 9c33157063b8..b77a5823b58d 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -6,26 +6,6 @@ import javax.swing.*;
 
 public class AllIcons {
   
-  public static class _cvs {
-    public static final Icon CheckOut = IconLoader.getIcon("/_cvs/checkOut.png"); 
-    public static final Icon Cvs = IconLoader.getIcon("/_cvs/cvs.png"); 
-    public static final Icon HideMissing = IconLoader.getIcon("/_cvs/hideMissing.png"); 
-    public static final Icon HideUnknown = IconLoader.getIcon("/_cvs/hideUnknown.png"); 
-    public static final Icon HideUptodate = IconLoader.getIcon("/_cvs/hideUptodate.png"); 
-    public static final Icon Missing = IconLoader.getIcon("/_cvs/missing.png"); 
-    public static final Icon ShowAsTree = IconLoader.getIcon("/_cvs/showAsTree.png"); 
-    public static final Icon TestInProgress1 = IconLoader.getIcon("/_cvs/testInProgress1.png"); 
-    public static final Icon TestInProgress2 = IconLoader.getIcon("/_cvs/testInProgress2.png"); 
-    public static final Icon TestInProgress3 = IconLoader.getIcon("/_cvs/testInProgress3.png"); 
-    public static final Icon TestInProgress4 = IconLoader.getIcon("/_cvs/testInProgress4.png"); 
-    public static final Icon TestInProgress5 = IconLoader.getIcon("/_cvs/testInProgress5.png"); 
-    public static final Icon TestInProgress6 = IconLoader.getIcon("/_cvs/testInProgress6.png"); 
-    public static final Icon TestInProgress7 = IconLoader.getIcon("/_cvs/testInProgress7.png"); 
-    public static final Icon TestInProgress8 = IconLoader.getIcon("/_cvs/testInProgress8.png"); 
-    public static final Icon Unknown = IconLoader.getIcon("/_cvs/unknown.png"); 
-
-  }
-  
   public static class Actions {
     public static final Icon AddFacesSupport = IconLoader.getIcon("/actions/addFacesSupport.png"); 
     public static final Icon Annotate = IconLoader.getIcon("/actions/annotate.png"); 
@@ -155,6 +135,7 @@ public class AllIcons {
     public static final Icon Search = IconLoader.getIcon("/actions/search.png"); 
     public static final Icon Selectall = IconLoader.getIcon("/actions/selectall.png"); 
     public static final Icon Share = IconLoader.getIcon("/actions/share.png"); 
+    public static final Icon ShowAsTree = IconLoader.getIcon("/actions/showAsTree.png"); 
     public static final Icon ShowChangesOnly = IconLoader.getIcon("/actions/showChangesOnly.png"); 
     public static final Icon ShowHiddens = IconLoader.getIcon("/actions/showHiddens.png"); 
     public static final Icon ShowImportStatements = IconLoader.getIcon("/actions/showImportStatements.png"); 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
index 7eb880e46b1f..e5760a40ea9b 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
@@ -108,7 +108,7 @@ public class CvsTabbedWindow {
     ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject);
     ToolWindow toolWindow =
       toolWindowManager.registerToolWindow(ToolWindowId.CVS, myContentManager.getComponent(), ToolWindowAnchor.BOTTOM);
-    toolWindow.setIcon(AllIcons._cvs.Cvs);
+    toolWindow.setIcon(AllIcons.Actions.Cvs);
     toolWindow.installWatcher(myContentManager);
   }
 

From 9a6609fa5b71b81378c1630b27d9b25047dfe77d Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 31 May 2012 22:05:53 +0400
Subject: [PATCH 050/239] gimme some speedsearching!

---
 .../com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
index 77b81e18bd09..49df3c099ec7 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
@@ -398,6 +398,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton {
                                 storageKey, myVcs.getProject());
       myDualView.switchToTheFlatMode();
     }
+    new TableSpeedSearch(myDualView.getFlatView()).setComparator(new SpeedSearchComparator(false));
     final TableLinkMouseListener listener = new TableLinkMouseListener();
     listener.install(myDualView.getFlatView());
     listener.install(myDualView.getTreeView());

From 96b3e6c75d9c1d39281d25b1113230e43cbda38d Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 31 May 2012 19:38:42 +0200
Subject: [PATCH 051/239] IDEA-22219 Spring Webflow: When editing spring
 webflow xml, the cursor jumps all over the place

---
 .../template/macro/BaseCompleteMacro.java     | 67 ++++++++-----------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/BaseCompleteMacro.java b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/BaseCompleteMacro.java
index 19c21c2fa03e..953e0cc76859 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/BaseCompleteMacro.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/BaseCompleteMacro.java
@@ -29,7 +29,6 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiUtilBase;
 import org.jetbrains.annotations.NonNls;
@@ -72,50 +71,37 @@ public abstract class BaseCompleteMacro extends Macro {
     final Editor editor = context.getEditor();
 
     final PsiFile psiFile = PsiUtilBase.getPsiFileInEditor(editor, project);
-    new WriteCommandAction.Simple(project, psiFile) {
-        public void run() {
-          PsiDocumentManager.getInstance(project).commitAllDocuments();
-        }
-      }.execute();
-
-    if (ApplicationManager.getApplication().isUnitTestMode()) {
-      getCompletionHandler().invoke(project, editor, psiFile);
-      return;
-    }
-
-    ApplicationManager.getApplication().invokeLater(new Runnable() {
+    Runnable runnable = new Runnable() {
+      @Override
       public void run() {
-        if (project.isDisposed()) return;
+        if (project.isDisposed() || editor.isDisposed() || psiFile == null || !psiFile.isValid()) return;
 
-        CommandProcessor.getInstance().executeCommand(
-            project, new Runnable() {
-            public void run() {
-              if (!ApplicationManager.getApplication().isUnitTestMode()) {
-                getCompletionHandler().invoke(project, editor, psiFile);
-              }
+        CommandProcessor.getInstance().executeCommand(project, new Runnable() {
+          public void run() {
+            getCompletionHandler().invoke(project, editor, psiFile);
+            Lookup lookup = LookupManager.getInstance(project).getActiveLookup();
 
-              final LookupManager lookupManager = LookupManager.getInstance(project);
-              Lookup lookup = lookupManager.getActiveLookup();
-
-              if (lookup != null) {
-                lookup.addLookupListener(new MyLookupListener(context));
-              }
-              else {
-                TemplateState templateState = TemplateManagerImpl.getTemplateState(editor);
-                if (templateState != null) {
-                  TextRange range = templateState.getCurrentVariableRange();
-                  if (range != null && range.getLength() > 0/* && TemplateEditorUtil.getOffset(editor) == range.getEndOffset()*/) {
-                    templateState.nextTab();
-                  }
+            if (lookup != null) {
+              lookup.addLookupListener(new MyLookupListener(context));
+            }
+            else {
+              TemplateState templateState = TemplateManagerImpl.getTemplateState(editor);
+              if (templateState != null) {
+                TextRange range = templateState.getCurrentVariableRange();
+                if (range != null && range.getLength() > 0/* && TemplateEditorUtil.getOffset(editor) == range.getEndOffset()*/) {
+                  templateState.nextTab();
                 }
               }
             }
-          },
-            "",
-            null
-        );
+          }
+        }, "", null);
       }
-    });
+    };
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      runnable.run();
+    } else {
+      ApplicationManager.getApplication().invokeLater(runnable);
+    }
   }
 
   private static class MyLookupListener extends LookupAdapter {
@@ -129,6 +115,11 @@ public abstract class BaseCompleteMacro extends Macro {
       LookupElement item = event.getItem();
       if (item == null) return;
 
+      char c = event.getCompletionChar();
+      if (c != Lookup.REPLACE_SELECT_CHAR && c != Lookup.NORMAL_SELECT_CHAR && c != Lookup.COMPLETE_STATEMENT_SELECT_CHAR) {
+        return;
+      }
+
       for(TemplateCompletionProcessor processor: Extensions.getExtensions(TemplateCompletionProcessor.EP_NAME)) {
         if (!processor.nextTabOnItemSelected(myContext, item)) {
           return;

From bb675ab516c19176c1140a009feb02efe66146a3 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 31 May 2012 20:00:03 +0200
Subject: [PATCH 052/239] make lookup list size not divisible by lookup item
 height to make more obvious that it's scrollable

---
 .../com/intellij/codeInsight/lookup/impl/LookupImpl.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index 2494d208a23a..f86768899ceb 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -1359,8 +1359,11 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
           int scrollBarWidth = myScrollPane.getPreferredSize().width - myScrollPane.getViewport().getPreferredSize().width;
           int listWidth = Math.min(scrollBarWidth + maxCellWidth, UISettings.getInstance().MAX_LOOKUP_WIDTH2);
           int adWidth = myAdComponent.getAdComponent().getPreferredSize().width;
-          return new Dimension(Math.max(listWidth, adWidth),
-                               Math.min(mainPanel.getPreferredSize().height, myMaximumHeight));
+          int panelHeight = mainPanel.getPreferredSize().height;
+          if (myList.getModel().getSize() > myList.getVisibleRowCount() && myList.getVisibleRowCount() > 5) {
+            panelHeight -= myList.getFixedCellHeight() / 2;
+          }
+          return new Dimension(Math.max(listWidth, adWidth), Math.min(panelHeight, myMaximumHeight));
         }
 
         @Override

From 815d34448ecedf1a3c02a93f871b1e9b88e5ec18 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Fri, 1 Jun 2012 01:47:07 +0400
Subject: [PATCH 053/239] - when resizing the file, unmap only last page, all
 others can be used - force affect only dirty bytebuffers

---
 .../intellij/util/io/ByteBufferWrapper.java   |   9 +
 .../intellij/util/io/DirectBufferWrapper.java |   2 +-
 .../intellij/util/io/MappedBufferWrapper.java |  10 +-
 .../intellij/util/io/PagedFileStorage.java    | 441 +++++++++---------
 4 files changed, 240 insertions(+), 222 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/ByteBufferWrapper.java b/platform/util/src/com/intellij/util/io/ByteBufferWrapper.java
index bbfe788f0955..c6527821fd3e 100644
--- a/platform/util/src/com/intellij/util/io/ByteBufferWrapper.java
+++ b/platform/util/src/com/intellij/util/io/ByteBufferWrapper.java
@@ -27,6 +27,7 @@ public abstract class ByteBufferWrapper {
   protected final File myFile;
   protected final long myPosition;
   protected final long myLength;
+  protected volatile boolean myDirty;
 
   protected ByteBufferWrapper(final File file, final long offset, final long length) {
     myFile = file;
@@ -37,6 +38,14 @@ public abstract class ByteBufferWrapper {
   @Nullable
   public abstract ByteBuffer getCachedBuffer();
 
+  public final void markDirty() {
+    if (!myDirty) myDirty = true;
+  }
+
+  public final boolean isDirty() {
+    return myDirty;
+  }
+
   public abstract ByteBuffer getBuffer() throws IOException;
 
   public abstract void unmap();
diff --git a/platform/util/src/com/intellij/util/io/DirectBufferWrapper.java b/platform/util/src/com/intellij/util/io/DirectBufferWrapper.java
index f944cbe335b4..00049a0619fa 100644
--- a/platform/util/src/com/intellij/util/io/DirectBufferWrapper.java
+++ b/platform/util/src/com/intellij/util/io/DirectBufferWrapper.java
@@ -48,7 +48,7 @@ public abstract class DirectBufferWrapper extends ByteBufferWrapper {
 
   @Override
   public void unmap() {
-    flush();
+    if (isDirty()) flush();
     myBuffer = null;
   }
 }
diff --git a/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java b/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java
index d2a5455ec1cf..0f86ffa4d433 100644
--- a/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java
+++ b/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java
@@ -48,7 +48,7 @@ public abstract class MappedBufferWrapper extends ByteBufferWrapper {
     long started = IOStatistics.DEBUG ? System.currentTimeMillis() : 0;
     MappedByteBuffer buffer = myBuffer;
     myBuffer = null;
-    if (!clean(buffer)) {
+    if (!clean(buffer, isDirty())) {
       LOG.error("Unmapping failed for: " + myFile);
     }
 
@@ -74,10 +74,10 @@ public abstract class MappedBufferWrapper extends ByteBufferWrapper {
     return buffer;
   }
 
-  private static boolean clean(final MappedByteBuffer buffer) {
+  private static boolean clean(final MappedByteBuffer buffer, boolean dirty) {
     if (buffer == null) return true;
 
-    if (!tryForce(buffer)) {
+    if (dirty && !tryForce(buffer)) {
       return false;
     }
 
@@ -117,8 +117,8 @@ public abstract class MappedBufferWrapper extends ByteBufferWrapper {
   @Override
   public void flush() {
     final MappedByteBuffer buffer = myBuffer;
-    if (buffer != null) {
-      tryForce(buffer);
+    if (buffer != null && isDirty()) {
+      if(tryForce(buffer)) myDirty = false;
     }
   }
 }
diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index 88c13ce23b9e..ba943184c4a2 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -83,211 +83,17 @@ public class PagedFileStorage implements Forceable {
   private static final int MAX_LIVE_STORAGES_COUNT = 0xFFFF;
 
   public void lock() {
-    myStorageLockContext.myReentrantLock.lock();
+    myStorageLockContext.myLock.lock();
   }
 
   public void unlock() {
-    myStorageLockContext.myReentrantLock.unlock();
+    myStorageLockContext.myLock.unlock();
   }
 
   public StorageLockContext getStorageLockContext() {
     return myStorageLockContext;
   }
 
-  public static class StorageLock {
-    private static final int FILE_INDEX_MASK = 0xFFFF0000;
-    private static final int FILE_INDEX_SHIFT = 16;
-    private final boolean checkThreadAccess;
-    public final StorageLockContext myDefaultStorageLockContext;
-
-    public StorageLock() {
-      this(true);
-    }
-
-    public StorageLock(boolean checkThreadAccess) {
-      this.checkThreadAccess = checkThreadAccess;
-      myDefaultStorageLockContext = new StorageLockContext(this);
-    }
-
-    public void lock() {
-      myDefaultStorageLockContext.myReentrantLock.lock();
-    }
-
-    public void unlock() {
-      myDefaultStorageLockContext.myReentrantLock.unlock();
-    }
-
-    private final BuffersCache myBuffersCache = new BuffersCache();
-    private final ConcurrentHashMap<Integer, PagedFileStorage> myIndex2Storage = new ConcurrentHashMap<Integer, PagedFileStorage>();
-
-    private int registerPagedFileStorage(PagedFileStorage storage) {
-      int registered = myIndex2Storage.size();
-      assert registered <= MAX_LIVE_STORAGES_COUNT;
-      int value = registered << FILE_INDEX_SHIFT;
-      while(myIndex2Storage.putIfAbsent(value, storage) != null) {
-        ++registered;
-        assert registered <= MAX_LIVE_STORAGES_COUNT;
-        value = registered << FILE_INDEX_SHIFT;
-      }
-      return value;
-    }
-    
-    private PagedFileStorage getRegisteredPagedFileStorageByIndex(int index) {
-      return myIndex2Storage.get(index);
-    }
-
-    private class BuffersCache {
-      private int changeCount;
-      private final LinkedHashMap<Integer, ByteBufferWrapper> myMap;
-      private long mySizeLimit;
-      private long mySize;
-
-      private BuffersCache() {
-        mySizeLimit = UPPER_LIMIT;
-        myMap = new LinkedHashMap<Integer, ByteBufferWrapper>(10) {
-          @Override
-          protected boolean removeEldestEntry(Map.Entry<Integer, ByteBufferWrapper> eldest) {
-            return mySize > mySizeLimit;
-          }
-
-          @Nullable
-          @Override
-          public ByteBufferWrapper remove(Object key) {
-            // this method can be called after removeEldestEntry
-            ByteBufferWrapper wrapper = super.remove(key);
-            if (wrapper != null) {
-              mySize -= wrapper.myLength;
-              wrapper.dispose();
-            }
-            return wrapper;
-          }
-        };
-      }
-
-      private ByteBufferWrapper get(Integer key) {
-        ByteBufferWrapper wrapper = myMap.get(key);
-        if (wrapper != null) {
-          return wrapper;
-        }
-
-        long started = IOStatistics.DEBUG ? System.currentTimeMillis() : 0;
-        wrapper = createValue(key);
-        mySize += wrapper.myLength;
-
-        if (IOStatistics.DEBUG) {
-          long finished = System.currentTimeMillis();
-          if (finished - started > IOStatistics.MIN_IO_TIME_TO_REPORT) {
-            IOStatistics.dump(
-              "Mapping " + wrapper.myLength + " from " + wrapper.myPosition + " file:" + wrapper.myFile + " for " + (finished - started));
-          }
-        }
-        myMap.put(key, wrapper);
-
-        ensureSize(mySizeLimit);
-        return wrapper;
-      }
-
-      private void ensureSize(long sizeLimit) {
-        while (mySize > sizeLimit) {
-          // we still have to drop something
-          myMap.doRemoveEldestEntry();
-        }
-      }
-
-      @NotNull
-      private ByteBufferWrapper createValue(Integer key) {
-        final int storageIndex = key & FILE_INDEX_MASK;
-        PagedFileStorage owner = getRegisteredPagedFileStorageByIndex(storageIndex);
-        assert owner != null: "No storage for index " + storageIndex;
-        checkThreadAccess(owner.myStorageLockContext);
-        int off = (key & MAX_PAGES_COUNT) * owner.myPageSize;
-        if (off > owner.length()) {
-          throw new IndexOutOfBoundsException("off=" + off + " key.owner.length()=" + owner.length());
-        }
-        ++changeCount;
-        ByteBufferWrapper wrapper = ByteBufferWrapper.readWrite(owner.myFile, off, Math.min((int)(owner.length() - off), owner.myPageSize));
-        IOException oome = null;
-        while (true) {
-          try {
-            // ensure it's allocated
-            wrapper.getBuffer();
-            if (oome != null) {
-              LOG.info("Successfully recovered OOME in memory mapping: -Xmx=" + Runtime.getRuntime().maxMemory() / MB + "MB " +
-                       "new size limit: " + mySizeLimit / MB + "MB " +
-                       "trying to allocate " + wrapper.myLength + " block");
-            }
-            return wrapper;
-          }
-          catch (IOException e) {
-            if (e.getCause() instanceof OutOfMemoryError) {
-              oome = e;
-              if (mySizeLimit > LOWER_LIMIT) {
-                mySizeLimit -= owner.myPageSize;
-              }
-              long newSize = mySize - owner.myPageSize;
-              if (newSize >= 0) {
-                ensureSize(newSize);
-                continue; // next try
-              }
-              else {
-                throw new MappingFailedException(
-                  "Cannot recover from OOME in memory mapping: -Xmx=" + Runtime.getRuntime().maxMemory() / MB + "MB " +
-                  "new size limit: " + mySizeLimit / MB + "MB " +
-                  "trying to allocate " + wrapper.myLength + " block", e);
-              }
-            }
-            throw new MappingFailedException("Cannot map buffer", e);
-          }
-        }
-      }
-
-      private void checkThreadAccess(StorageLockContext storageLockContext) {
-        if (checkThreadAccess && !storageLockContext.myReentrantLock.isHeldByCurrentThread()) {
-          throw new IllegalStateException("Must hold StorageLock lock to access PagedFileStorage");
-        }
-      }
-
-      private @Nullable Map<Integer, ByteBufferWrapper> getBuffersOrderedForOwner(int index, StorageLockContext storageLockContext) {
-        checkThreadAccess(storageLockContext);
-        Map<Integer, ByteBufferWrapper> mineBuffers = null;
-        for (Map.Entry<Integer, ByteBufferWrapper> entry : myMap.entrySet()) {
-          if ((entry.getKey() & FILE_INDEX_MASK) == index) {
-            if (mineBuffers == null) {
-              mineBuffers = new TreeMap<Integer, ByteBufferWrapper>(new Comparator<Integer>() {
-                @Override
-                public int compare(Integer o1, Integer o2) {
-                  return o1 - o2;
-                }
-              });
-            }
-            mineBuffers.put(entry.getKey(), entry.getValue());
-          }
-        }
-        return mineBuffers;
-      }
-
-      private void unmapBuffersForOwner(int index, StorageLockContext storageLockContext) {
-        final Map<Integer, ByteBufferWrapper> buffers = getBuffersOrderedForOwner(index, storageLockContext);
-
-        if (buffers != null) {
-          for (Integer key : buffers.keySet()) {
-            myMap.remove(key);
-          }
-        }
-      }
-
-      private void flushBuffersForOwner(int index, StorageLockContext storageLockContext) {
-        Map<Integer, ByteBufferWrapper> buffers = getBuffersOrderedForOwner(index, storageLockContext);
-
-        if (buffers != null) {
-          for(ByteBufferWrapper buffer:buffers.values()) {
-            buffer.flush();
-          }
-        }
-      }
-    }
-  }
-
   private final byte[] myTypedIOBuffer;
   private boolean isDirty = false;
   private final File myFile;
@@ -305,7 +111,7 @@ public class PagedFileStorage implements Forceable {
     myStorageLockContext = storageLockContext;
     myPageSize = Math.max(pageSize > 0 ? pageSize : BUFFER_SIZE, Page.PAGE_SIZE);
     myValuesAreBufferAligned = valuesAreBufferAligned;
-    myStorageIndex = storageLockContext.myLock.registerPagedFileStorage(this);
+    myStorageIndex = storageLockContext.myStorageLock.registerPagedFileStorage(this);
     myTypedIOBuffer = valuesAreBufferAligned ? null:new byte[8];
   }
   public PagedFileStorage(File file, StorageLock lock) throws IOException {
@@ -332,7 +138,7 @@ public class PagedFileStorage implements Forceable {
     if (myValuesAreBufferAligned) {
       int page = addr / myPageSize;
       int page_offset = addr % myPageSize;
-      return getBuffer(page).getInt(page_offset);
+      return getBuffer(page, false).getInt(page_offset);
     } else {
       get(addr, myTypedIOBuffer, 0, 4);
       return Bits.getInt(myTypedIOBuffer, 0);
@@ -363,7 +169,7 @@ public class PagedFileStorage implements Forceable {
     if (myValuesAreBufferAligned) {
       int page = addr / myPageSize;
       int page_offset = addr % myPageSize;
-      return getBuffer(page).getShort(page_offset);
+      return getBuffer(page, false).getShort(page_offset);
     } else {
       get(addr, myTypedIOBuffer, 0, 2);
       return Bits.getShort(myTypedIOBuffer, 0);
@@ -395,7 +201,7 @@ public class PagedFileStorage implements Forceable {
     if (myValuesAreBufferAligned) {
       int page = addr / myPageSize;
       int page_offset = addr % myPageSize;
-      return getBuffer(page).getLong(page_offset);
+      return getBuffer(page, false).getLong(page_offset);
     } else {
       get(addr, myTypedIOBuffer, 0, 8);
       return Bits.getLong(myTypedIOBuffer, 0);
@@ -406,7 +212,7 @@ public class PagedFileStorage implements Forceable {
     int page = index / myPageSize;
     int offset = index % myPageSize;
 
-    return getBuffer(page).get(offset);
+    return getBuffer(page, false).get(offset);
   }
 
   public void put(int index, byte value) {
@@ -427,7 +233,7 @@ public class PagedFileStorage implements Forceable {
       int page_offset = i % myPageSize;
 
       int page_len = Math.min(l, myPageSize - page_offset);
-      final ByteBuffer buffer = getBuffer(page);
+      final ByteBuffer buffer = getBuffer(page, false);
       try {
         buffer.position(page_offset);
       }
@@ -478,13 +284,13 @@ public class PagedFileStorage implements Forceable {
     }
     finally {
       unmapAll();
-      myStorageLockContext.myLock.myIndex2Storage.remove(myStorageIndex);
+      myStorageLockContext.myStorageLock.myIndex2Storage.remove(myStorageIndex);
       myStorageIndex = -1;
     }
   }
 
   private void unmapAll() {
-    myStorageLockContext.myLock.myBuffersCache.unmapBuffersForOwner(myStorageIndex, myStorageLockContext);
+    myStorageLockContext.myStorageLock.unmapBuffersForOwner(myStorageIndex, myStorageLockContext);
 
     myLastPage = UNKNOWN_PAGE;
     myLastPage2 = UNKNOWN_PAGE;
@@ -497,7 +303,8 @@ public class PagedFileStorage implements Forceable {
     if (oldSize == newSize) return;
 
     final long started = IOStatistics.DEBUG ? System.currentTimeMillis():0;
-    unmapAll();
+    myStorageLockContext.myStorageLock.invalidateBuffer((int)(myStorageIndex | (mySize / myPageSize)));
+    //unmapAll();
     final long unmapAllFinished = IOStatistics.DEBUG ? System.currentTimeMillis():0;
 
     resizeFile(newSize);
@@ -539,7 +346,6 @@ public class PagedFileStorage implements Forceable {
     }
   }
 
-
   public final long length() {
     if (mySize == -1) {
       mySize = myFile.length();
@@ -548,23 +354,34 @@ public class PagedFileStorage implements Forceable {
   }
 
   private ByteBuffer getBuffer(int page) {
+    return getBuffer(page, true);
+  }
+
+  private ByteBuffer getBuffer(int page, boolean modify) {
     if (myLastPage == page) {
       ByteBuffer buf = myLastBuffer.getCachedBuffer();
-      if (buf != null && myLastChangeCount == myStorageLockContext.myLock.myBuffersCache.changeCount) return buf;
+      if (buf != null && myLastChangeCount == myStorageLockContext.myStorageLock.myMappingChangeCount) {
+        if (modify) myLastBuffer.markDirty();
+        return buf;
+      }
     }
 
     if (myLastPage2 == page) {
       ByteBuffer buf = myLastBuffer2.getCachedBuffer();
-      if (buf != null && myLastChangeCount2 == myStorageLockContext.myLock.myBuffersCache.changeCount) return buf;
+      if (buf != null && myLastChangeCount2 == myStorageLockContext.myStorageLock.myMappingChangeCount) {
+        if (modify) myLastBuffer2.markDirty();
+        return buf;
+      }
     }
 
     try {
       assert page <= MAX_PAGES_COUNT;
 
       if (myStorageIndex == -1) {
-        myStorageIndex = myStorageLockContext.myLock.registerPagedFileStorage(this);
+        myStorageIndex = myStorageLockContext.myStorageLock.registerPagedFileStorage(this);
       }
-      ByteBufferWrapper byteBufferWrapper = myStorageLockContext.myLock.myBuffersCache.get(myStorageIndex | page);
+      ByteBufferWrapper byteBufferWrapper = myStorageLockContext.myStorageLock.get(myStorageIndex | page);
+      if (modify) byteBufferWrapper.markDirty();
       ByteBuffer buf = byteBufferWrapper.getBuffer();
 
       if (myLastPage != page) {
@@ -577,7 +394,7 @@ public class PagedFileStorage implements Forceable {
         myLastBuffer = byteBufferWrapper;
       }
 
-      myLastChangeCount = myStorageLockContext.myLock.myBuffersCache.changeCount;
+      myLastChangeCount = myStorageLockContext.myStorageLock.myMappingChangeCount;
 
       return buf;
     }
@@ -588,7 +405,7 @@ public class PagedFileStorage implements Forceable {
 
   public void force() {
     long started = IOStatistics.DEBUG ? System.currentTimeMillis():0;
-    myStorageLockContext.myLock.myBuffersCache.flushBuffersForOwner(myStorageIndex, myStorageLockContext);
+    myStorageLockContext.myStorageLock.flushBuffersForOwner(myStorageIndex, myStorageLockContext);
 
     isDirty = false;
     if (IOStatistics.DEBUG) {
@@ -603,13 +420,205 @@ public class PagedFileStorage implements Forceable {
     return isDirty;
   }
 
+  public static class StorageLock {
+    private static final int FILE_INDEX_MASK = 0xFFFF0000;
+    private static final int FILE_INDEX_SHIFT = 16;
+    private final boolean checkThreadAccess;
+    public final StorageLockContext myDefaultStorageLockContext;
+
+    private int myMappingChangeCount;
+    private final LinkedHashMap<Integer, ByteBufferWrapper> myMap;
+    private long mySizeLimit;
+    private long mySize;
+    private final ConcurrentHashMap<Integer, PagedFileStorage> myIndex2Storage = new ConcurrentHashMap<Integer, PagedFileStorage>();
+
+    public StorageLock() {
+      this(true);
+    }
+
+    public StorageLock(boolean checkThreadAccess) {
+      this.checkThreadAccess = checkThreadAccess;
+      myDefaultStorageLockContext = new StorageLockContext(this);
+
+      mySizeLimit = UPPER_LIMIT;
+      myMap = new LinkedHashMap<Integer, ByteBufferWrapper>(10) {
+        @Override
+        protected boolean removeEldestEntry(Map.Entry<Integer, ByteBufferWrapper> eldest) {
+          return mySize > mySizeLimit;
+        }
+
+        @Nullable
+        @Override
+        public ByteBufferWrapper remove(Object key) {
+          // this method can be called after removeEldestEntry
+          ByteBufferWrapper wrapper = super.remove(key);
+          if (wrapper != null) {
+            mySize -= wrapper.myLength;
+            wrapper.dispose();
+          }
+          return wrapper;
+        }
+      };
+    }
+
+    public void lock() {
+      myDefaultStorageLockContext.myLock.lock();
+    }
+
+    public void unlock() {
+      myDefaultStorageLockContext.myLock.unlock();
+    }
+
+    private int registerPagedFileStorage(PagedFileStorage storage) {
+      int registered = myIndex2Storage.size();
+      assert registered <= MAX_LIVE_STORAGES_COUNT;
+      int value = registered << FILE_INDEX_SHIFT;
+      while(myIndex2Storage.putIfAbsent(value, storage) != null) {
+        ++registered;
+        assert registered <= MAX_LIVE_STORAGES_COUNT;
+        value = registered << FILE_INDEX_SHIFT;
+      }
+      return value;
+    }
+
+    private PagedFileStorage getRegisteredPagedFileStorageByIndex(int index) {
+      return myIndex2Storage.get(index);
+    }
+
+    private ByteBufferWrapper get(Integer key) {
+      ByteBufferWrapper wrapper = myMap.get(key);
+      if (wrapper != null) {
+        return wrapper;
+      }
+
+      long started = IOStatistics.DEBUG ? System.currentTimeMillis() : 0;
+      wrapper = createValue(key);
+      mySize += wrapper.myLength;
+
+      if (IOStatistics.DEBUG) {
+        long finished = System.currentTimeMillis();
+        if (finished - started > IOStatistics.MIN_IO_TIME_TO_REPORT) {
+          IOStatistics.dump(
+            "Mapping " + wrapper.myLength + " from " + wrapper.myPosition + " file:" + wrapper.myFile + " for " + (finished - started));
+        }
+      }
+      myMap.put(key, wrapper);
+
+      ensureSize(mySizeLimit);
+      return wrapper;
+    }
+
+    private void ensureSize(long sizeLimit) {
+      while (mySize > sizeLimit) {
+        // we still have to drop something
+        myMap.doRemoveEldestEntry();
+      }
+    }
+
+    @NotNull
+    private ByteBufferWrapper createValue(Integer key) {
+      final int storageIndex = key & FILE_INDEX_MASK;
+      PagedFileStorage owner = getRegisteredPagedFileStorageByIndex(storageIndex);
+      assert owner != null: "No storage for index " + storageIndex;
+      checkThreadAccess(owner.myStorageLockContext);
+      int off = (key & MAX_PAGES_COUNT) * owner.myPageSize;
+      if (off > owner.length()) {
+        throw new IndexOutOfBoundsException("off=" + off + " key.owner.length()=" + owner.length());
+      }
+      ++myMappingChangeCount;
+      ByteBufferWrapper wrapper = ByteBufferWrapper.readWrite(owner.myFile, off, Math.min((int)(owner.length() - off), owner.myPageSize));
+      IOException oome = null;
+      while (true) {
+        try {
+          // ensure it's allocated
+          wrapper.getBuffer();
+          if (oome != null) {
+            LOG.info("Successfully recovered OOME in memory mapping: -Xmx=" + Runtime.getRuntime().maxMemory() / MB + "MB " +
+                     "new size limit: " + mySizeLimit / MB + "MB " +
+                     "trying to allocate " + wrapper.myLength + " block");
+          }
+          return wrapper;
+        }
+        catch (IOException e) {
+          if (e.getCause() instanceof OutOfMemoryError) {
+            oome = e;
+            if (mySizeLimit > LOWER_LIMIT) {
+              mySizeLimit -= owner.myPageSize;
+            }
+            long newSize = mySize - owner.myPageSize;
+            if (newSize >= 0) {
+              ensureSize(newSize);
+              continue; // next try
+            }
+            else {
+              throw new MappingFailedException(
+                "Cannot recover from OOME in memory mapping: -Xmx=" + Runtime.getRuntime().maxMemory() / MB + "MB " +
+                "new size limit: " + mySizeLimit / MB + "MB " +
+                "trying to allocate " + wrapper.myLength + " block", e);
+            }
+          }
+          throw new MappingFailedException("Cannot map buffer", e);
+        }
+      }
+    }
+
+    private void checkThreadAccess(StorageLockContext storageLockContext) {
+      if (checkThreadAccess && !storageLockContext.myLock.isHeldByCurrentThread()) {
+        throw new IllegalStateException("Must hold StorageLock lock to access PagedFileStorage");
+      }
+    }
+
+    private @Nullable Map<Integer, ByteBufferWrapper> getBuffersOrderedForOwner(int index, StorageLockContext storageLockContext) {
+      checkThreadAccess(storageLockContext);
+      Map<Integer, ByteBufferWrapper> mineBuffers = null;
+      for (Map.Entry<Integer, ByteBufferWrapper> entry : myMap.entrySet()) {
+        if ((entry.getKey() & FILE_INDEX_MASK) == index) {
+          if (mineBuffers == null) {
+            mineBuffers = new TreeMap<Integer, ByteBufferWrapper>(new Comparator<Integer>() {
+              @Override
+              public int compare(Integer o1, Integer o2) {
+                return o1 - o2;
+              }
+            });
+          }
+          mineBuffers.put(entry.getKey(), entry.getValue());
+        }
+      }
+      return mineBuffers;
+    }
+
+    private void unmapBuffersForOwner(int index, StorageLockContext storageLockContext) {
+      final Map<Integer, ByteBufferWrapper> buffers = getBuffersOrderedForOwner(index, storageLockContext);
+
+      if (buffers != null) {
+        for (Integer key : buffers.keySet()) {
+          myMap.remove(key);
+        }
+      }
+    }
+
+    private void flushBuffersForOwner(int index, StorageLockContext storageLockContext) {
+      Map<Integer, ByteBufferWrapper> buffers = getBuffersOrderedForOwner(index, storageLockContext);
+
+      if (buffers != null) {
+        for(ByteBufferWrapper buffer:buffers.values()) {
+          buffer.flush();
+        }
+      }
+    }
+
+    public void invalidateBuffer(int page) {
+      myMap.remove(page);
+    }
+  }
+
   public static class StorageLockContext {
-    private final SequenceLock myReentrantLock;
-    private final StorageLock myLock;
+    private final SequenceLock myLock;
+    private final StorageLock myStorageLock;
 
     public StorageLockContext(StorageLock lock) {
-      myReentrantLock = new SequenceLock();
-      myLock = lock;
+      myLock = new SequenceLock();
+      myStorageLock = lock;
     }
   }
 }

From e6aaec790218ee73d12dfca0d6e3ad8b10a0b4d9 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 10:27:19 +0400
Subject: [PATCH 054/239] correct introduce parameter for incorrect calls

---
 .../GroovyIntroduceParameterMethodUsagesProcessor.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java
index 1493d3f73d0d..27718ffc13b8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/parameter/java2groovy/GroovyIntroduceParameterMethodUsagesProcessor.java
@@ -103,7 +103,7 @@ public class GroovyIntroduceParameterMethodUsagesProcessor implements IntroduceP
 
     final GrClosureSignatureUtil.ArgInfo<PsiElement>[] actualArgs = GrClosureSignatureUtil
       .mapParametersToArguments(signature, callExpression.getNamedArguments(), callExpression.getExpressionArguments(),
-                                callExpression.getClosureArguments(), callExpression, true, true);
+                                callExpression.getClosureArguments(), callExpression, false, true);
 
     final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(data.getProject());
 

From da7fd75bf05b7bc298aabd4f983d5da07471cdf5 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Fri, 1 Jun 2012 11:20:43 +0400
Subject: [PATCH 055/239] allocate last non aligned buffer as direct
 bytebuffer, it is cheaper to close/flush it during resize

---
 .../util/src/com/intellij/util/io/ByteBufferWrapper.java   | 4 ++++
 .../util/src/com/intellij/util/io/PagedFileStorage.java    | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/ByteBufferWrapper.java b/platform/util/src/com/intellij/util/io/ByteBufferWrapper.java
index c6527821fd3e..60efdd155c06 100644
--- a/platform/util/src/com/intellij/util/io/ByteBufferWrapper.java
+++ b/platform/util/src/com/intellij/util/io/ByteBufferWrapper.java
@@ -61,6 +61,10 @@ public abstract class ByteBufferWrapper {
                    : new ReadWriteMappedBufferWrapper(file, offset, length);
   }
 
+  public static ByteBufferWrapper readWriteDirect(final File file, final int offset, final int length) {
+    return new ReadWriteDirectBufferWrapper(file, offset, length);
+  }
+
   public static ByteBufferWrapper readOnly(final File file, final int offset) {
     return new ReadOnlyMappedBufferWrapper(file, offset);
   }
diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index ba943184c4a2..8cd61fa5aac1 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -304,7 +304,7 @@ public class PagedFileStorage implements Forceable {
 
     final long started = IOStatistics.DEBUG ? System.currentTimeMillis():0;
     myStorageLockContext.myStorageLock.invalidateBuffer((int)(myStorageIndex | (mySize / myPageSize)));
-    //unmapAll();
+    //unmapAll(); // we do not need it since all page alighned buffers can be reused
     final long unmapAllFinished = IOStatistics.DEBUG ? System.currentTimeMillis():0;
 
     resizeFile(newSize);
@@ -526,7 +526,10 @@ public class PagedFileStorage implements Forceable {
         throw new IndexOutOfBoundsException("off=" + off + " key.owner.length()=" + owner.length());
       }
       ++myMappingChangeCount;
-      ByteBufferWrapper wrapper = ByteBufferWrapper.readWrite(owner.myFile, off, Math.min((int)(owner.length() - off), owner.myPageSize));
+      int min = Math.min((int)(owner.length() - off), owner.myPageSize);
+      ByteBufferWrapper wrapper = min != owner.myPageSize ?  // last, non aligned buffer allocate directly, it is much faster to unmap it during resize
+                                  ByteBufferWrapper.readWriteDirect(owner.myFile, off, min):
+                                  ByteBufferWrapper.readWrite(owner.myFile, off, min);
       IOException oome = null;
       while (true) {
         try {

From 2a73182e7c7625e8f1b193c024771daffae2cd06 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 1 Jun 2012 10:04:12 +0200
Subject: [PATCH 056/239] make change method signature works everywhere (UML,
 Project view, etc)

---
 .../actions/ChangeSignatureAction.java         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java
index 1a845cf7c1c3..0d049d9a0c6f 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/actions/ChangeSignatureAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,7 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiReference;
+import com.intellij.psi.*;
 import com.intellij.refactoring.RefactoringActionHandler;
 import com.intellij.refactoring.changeSignature.ChangeSignatureHandler;
 import org.jetbrains.annotations.NotNull;
@@ -73,9 +70,14 @@ public class ChangeSignatureAction extends BaseRefactoringAction {
       final PsiElement targetMember = fileHandler.findTargetMember(element);
       if (targetMember != null) return targetMember;
     }
-    final PsiReference reference = element.getReference();
-    if (reference == null) return null;
-    return reference.resolve();
+    PsiReference reference = element.getReference();
+    if (reference == null && element instanceof PsiNameIdentifierOwner) {
+      return element;
+    }
+    if (reference != null) {
+      return reference.resolve();
+    }
+    return null;
   }
 
   @Override

From e3928791c1493463ccd993aff59656677a1a80dd Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 30 May 2012 13:43:42 +0400
Subject: [PATCH 057/239] can have multiple test projects open

---
 .../daemon/quickFix/OrderEntryTest.java       |  2 +-
 .../navigation/GotoImplementationTest.java    |  2 +-
 .../intellij/psi/search/UpdateCacheTest.java  |  4 +-
 .../openapi/project/ex/ProjectManagerEx.java  |  6 +--
 .../project/impl/ProjectManagerImpl.java      | 38 +++++++++++--------
 .../testFramework/LightPlatformTestCase.java  | 16 ++++----
 .../testFramework/PlatformTestCase.java       | 10 +++--
 .../impl/HeavyIdeaTestFixtureImpl.java        |  2 +-
 8 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java
index d77be017306f..3a6ca8cc358a 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/OrderEntryTest.java
@@ -37,7 +37,7 @@ public class OrderEntryTest extends DaemonAnalyzerTestCase {
     VirtualFile projectFile = tempProjectRootDir.findChild("orderEntry.ipr");
 
     myProject = ProjectManagerEx.getInstanceEx().loadProject(projectFile.getPath());
-    ProjectManagerEx.getInstanceEx().setCurrentTestProject(myProject);
+    ProjectManagerEx.getInstanceEx().openTestProject(myProject);
     ModuleManagerImpl mm = (ModuleManagerImpl)ModuleManager.getInstance(myProject);
     mm.projectOpened();
     setUpJdk();
diff --git a/java/java-tests/testSrc/com/intellij/navigation/GotoImplementationTest.java b/java/java-tests/testSrc/com/intellij/navigation/GotoImplementationTest.java
index b63f3672a9aa..d36f9ead9e07 100644
--- a/java/java-tests/testSrc/com/intellij/navigation/GotoImplementationTest.java
+++ b/java/java-tests/testSrc/com/intellij/navigation/GotoImplementationTest.java
@@ -42,7 +42,7 @@ public class GotoImplementationTest extends CodeInsightTestCase {
     myProject = ProjectManagerEx.getInstanceEx().loadProject(projectFile.getPath());
 
     simulateProjectOpen();
-    ProjectManagerEx.getInstanceEx().setCurrentTestProject(myProject);
+    ProjectManagerEx.getInstanceEx().openTestProject(myProject);
   }
 
   @Override
diff --git a/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java b/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java
index 0b9b648d8507..e39f43603064 100644
--- a/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/search/UpdateCacheTest.java
@@ -80,7 +80,7 @@ public class UpdateCacheTest extends PsiTestCase{
 
     setUpJdk();
 
-    myProjectManager.setCurrentTestProject(myProject);
+    myProjectManager.openTestProject(myProject);
     runStartupActivities();
   }
 
@@ -175,7 +175,7 @@ public class UpdateCacheTest extends PsiTestCase{
     ((InjectedLanguageManagerImpl)InjectedLanguageManager.getInstance(getProject())).pushInjectors();
     setUpModule();
     setUpJdk();
-    ProjectManagerEx.getInstanceEx().setCurrentTestProject(myProject);
+    ProjectManagerEx.getInstanceEx().openTestProject(myProject);
     runStartupActivities();
     PsiTestUtil.addSourceContentToRoots(getModule(), content);
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java b/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java
index d971eb44a2f7..ed2959ea53a1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java
@@ -51,12 +51,10 @@ public abstract class ProjectManagerEx extends ProjectManager {
   public abstract void blockReloadingProjectOnExternalChanges();
   public abstract void unblockReloadingProjectOnExternalChanges();
 
-  @Nullable
   @TestOnly
-  public abstract Project getCurrentTestProject();
-
+  public abstract void openTestProject(@NotNull Project project);
   @TestOnly
-  public abstract void setCurrentTestProject(@Nullable Project project);
+  public abstract void closeTestProject(@NotNull Project project);
 
   // returns true on success
   public abstract boolean closeAndDispose(@NotNull Project project);
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
index 32886b248d1f..9bbb47458da0 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
@@ -64,6 +64,7 @@ import com.intellij.util.io.fs.IFile;
 import com.intellij.util.messages.MessageBus;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.UIUtil;
+import gnu.trove.THashSet;
 import gnu.trove.TObjectLongHashMap;
 import org.jdom.Element;
 import org.jdom.JDOMException;
@@ -95,7 +96,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
   private Project[] myOpenProjectsArrayCache = {};
   private final List<ProjectManagerListener> myListeners = ContainerUtil.createEmptyCOWList();
 
-  private Project myCurrentTestProject = null;
+  private final Set<Project> myTestProjects = new THashSet<Project>();
 
   private final Map<VirtualFile, byte[]> mySavedCopies = new HashMap<VirtualFile, byte[]>();
   private final TObjectLongHashMap<VirtualFile> mySavedTimestamps = new TObjectLongHashMap<VirtualFile>();
@@ -382,10 +383,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
         LOG.error("Open projects cache corrupted. Open projects: "+myOpenProjects+"; cache: "+Arrays.asList(myOpenProjectsArrayCache));
       }
       if (ApplicationManager.getApplication().isUnitTestMode()) {
-        Project currentTestProject = myCurrentTestProject;
-        if (currentTestProject != null && !currentTestProject.isDisposed()) {
-          return ArrayUtil.append(myOpenProjectsArrayCache, currentTestProject);
-        }
+         return ArrayUtil.mergeArrays(myOpenProjectsArrayCache, myTestProjects.toArray(new Project[myTestProjects.size()]));
       }
       return myOpenProjectsArrayCache;
     }
@@ -393,10 +391,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
 
   @Override
   public boolean isProjectOpened(Project project) {
-    if (ApplicationManager.getApplication().isUnitTestMode() && myCurrentTestProject != null) {
-      return project == myCurrentTestProject || myOpenProjects.contains(project);
-    }
-    return myOpenProjects.contains(project);
+    return ApplicationManager.getApplication().isUnitTestMode() && myTestProjects.contains(project) || myOpenProjects.contains(project);
   }
 
   @Override
@@ -799,16 +794,29 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
   }
 
   @Override
-  public void setCurrentTestProject(@Nullable final Project project) {
+  public void openTestProject(@NotNull final Project project) {
     assert ApplicationManager.getApplication().isUnitTestMode();
-    myCurrentTestProject = project;
+    myTestProjects.add(project);
   }
 
   @Override
-  @Nullable
-  public Project getCurrentTestProject() {
+  public void closeTestProject(@NotNull Project project) {
     assert ApplicationManager.getApplication().isUnitTestMode();
-    return myCurrentTestProject;
+    myTestProjects.remove(project);
+  }
+
+  @TestOnly
+  public void assertTestProjectsClosed() {
+    assert ApplicationManager.getApplication().isUnitTestMode();
+    if (!myTestProjects.isEmpty()) {
+      try {
+        Project project = myTestProjects.iterator().next();
+        throw new AssertionError("Test project is not disposed: " + project);
+      }
+      finally {
+        myTestProjects.clear();
+      }
+    }
   }
 
   @Override
@@ -993,7 +1001,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
             myOpenProjects.remove(project);
             cacheOpenProjects();
           }
-          myCurrentTestProject = null;
+          myTestProjects.remove(project);
 
           myChangedProjectFiles.remove(project);
 
diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
index 72a4258cb213..83d230c03b29 100644
--- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
@@ -71,7 +71,7 @@ import com.intellij.openapi.util.ShutDownTracker;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.openapi.vfs.encoding.EncodingManager;
@@ -92,7 +92,6 @@ import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.LocalTimeCounter;
 import com.intellij.util.containers.CollectionFactory;
 import com.intellij.util.indexing.FileBasedIndex;
-import com.intellij.util.indexing.FileBasedIndexImpl;
 import com.intellij.util.indexing.IndexableFileSet;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.UIUtil;
@@ -234,7 +233,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
           throw new RuntimeException(e);
         }
 
-        ((FileBasedIndexImpl)FileBasedIndex.getInstance()).registerIndexableSet(new IndexableFileSet() {
+        FileBasedIndex.getInstance().registerIndexableSet(new IndexableFileSet() {
           @Override
           public boolean isInSet(@NotNull final VirtualFile file) {
             return ourSourceRoot != null && file.getFileSystem() == ourSourceRoot.getFileSystem() && ourProject.isOpen();
@@ -335,7 +334,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
     ((ProjectImpl)ourProject).setTemporarilyDisposed(false);
 
     ProjectManagerEx projectManagerEx = ProjectManagerEx.getInstanceEx();
-    projectManagerEx.setCurrentTestProject(ourProject);
+    projectManagerEx.openTestProject(ourProject);
 
     ((PsiDocumentManagerImpl)PsiDocumentManager.getInstance(getProject())).clearUncommitedDocuments();
 
@@ -404,8 +403,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
     catch (Exception e) {
 
     }
-    assertTrue("open: "+getProject().isOpen()+"; disposed:"+getProject().isDisposed()+"; startup passed:"+ passed+"; testProjectIsOurProject:"+(getProject() == projectManagerEx
-      .getCurrentTestProject())+"; all open projects: "+
+    assertTrue("open: "+getProject().isOpen()+"; disposed:"+getProject().isDisposed()+"; startup passed:"+ passed+"; all open projects: "+
                Arrays.asList(ProjectManager.getInstance().getOpenProjects()), getProject().isInitialized());
 
     CodeStyleSettingsManager.getInstance(getProject()).setTemporarySettings(new CodeStyleSettings());
@@ -461,7 +459,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
     }
   }
 
-  public static void doTearDown(final Project project, IdeaTestApplication application, boolean checkForEditors) throws Exception {
+  public static void doTearDown(@NotNull final Project project, IdeaTestApplication application, boolean checkForEditors) throws Exception {
     DocumentCommitThread.getInstance().clearQueue();
     CodeStyleSettingsManager.getInstance(project).dropTemporarySettings();
     checkAllTimersAreDisposed();
@@ -526,7 +524,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
 
     TemplateDataLanguageMappings.getInstance(project).cleanupForNextTest();
 
-    ProjectManagerEx.getInstanceEx().setCurrentTestProject(null);
+    ProjectManagerEx.getInstanceEx().closeTestProject(project);
     application.setDataProvider(null);
     ourTestCase = null;
     ((PsiManagerImpl)PsiManager.getInstance(project)).cleanupForNextTest();
@@ -705,7 +703,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
       ApplicationManager.getApplication().assertWriteAccessAllowed();
       ((ProjectImpl)ourProject).setTemporarilyDisposed(false);
       final VirtualFile projFile = ((ProjectEx)ourProject).getStateStore().getProjectFile();
-      final File projectFile = projFile == null ? null : VfsUtil.virtualToIoFile(projFile);
+      final File projectFile = projFile == null ? null : VfsUtilCore.virtualToIoFile(projFile);
       if (!ourProject.isDisposed()) Disposer.dispose(ourProject);
 
       if (projectFile != null) {
diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
index 354c47885495..797d9063ca27 100644
--- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java
@@ -44,6 +44,7 @@ import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.module.impl.ModuleManagerImpl;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ex.ProjectManagerEx;
+import com.intellij.openapi.project.impl.ProjectManagerImpl;
 import com.intellij.openapi.project.impl.TooManyProjectLeakedException;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ModifiableRootModel;
@@ -180,11 +181,11 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
     myThreadTracker = new ThreadTracker();
 
     setUpProject();
-    ProjectManagerEx.getInstanceEx().setCurrentTestProject(myProject);
 
     storeSettings();
     ourTestCase = this;
     if (myProject != null) {
+      ProjectManagerEx.getInstanceEx().openTestProject(myProject);
       CodeStyleSettingsManager.getInstance(myProject).setTemporarySettings(new CodeStyleSettings());
       ((InjectedLanguageManagerImpl)InjectedLanguageManager.getInstance(myProject)).pushInjectors();
     }
@@ -212,7 +213,7 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
     File projectFile = getIprFile();
 
     myProject = createProject(projectFile, getClass().getName() + "." + getName());
-    myProjectManager.setCurrentTestProject(myProject);
+    myProjectManager.openTestProject(myProject);
     LocalFileSystem.getInstance().refreshIoFiles(myFilesToDelete);
 
     setUpModule();
@@ -482,8 +483,9 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro
           public void run() {
             Disposer.dispose(myProject);
             ProjectManagerEx projectManager = ProjectManagerEx.getInstanceEx();
-            if (projectManager != null) {
-              projectManager.setCurrentTestProject(null);
+            if (projectManager instanceof ProjectManagerImpl) {
+              projectManager.closeTestProject(myProject);
+              ((ProjectManagerImpl)projectManager).assertTestProjectsClosed();
             }
           }
         });
diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java
index 2b8d9be8c609..dcc3571cc2eb 100644
--- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java
+++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/HeavyIdeaTestFixtureImpl.java
@@ -162,7 +162,7 @@ class HeavyIdeaTestFixtureImpl extends BaseFixture implements HeavyIdeaTestFixtu
         sm.startCacheUpdate();
         sm.runPostStartupActivities();
 
-        ProjectManagerEx.getInstanceEx().setCurrentTestProject(myProject);
+        ProjectManagerEx.getInstanceEx().openTestProject(myProject);
         ((PsiDocumentManagerImpl)PsiDocumentManager.getInstance(myProject)).clearUncommitedDocuments();
       }
     }.execute().throwException();

From e9154731723b34eef63aaa970331e05e9cfbf4d2 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 30 May 2012 19:11:18 +0400
Subject: [PATCH 058/239] cleanup

---
 .../projectWizard/ExistingModuleLoader.java   |  2 +-
 .../ide/util/projectWizard/ModuleBuilder.java | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
index cc651af9fbcf..a57c8a6e0877 100644
--- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
+++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ExistingModuleLoader.java
@@ -51,7 +51,7 @@ public class ExistingModuleLoader extends ModuleBuilder {
   private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.projectWizard.ExistingModuleLoader");
 
   @NotNull
-  public Module createModule(ModifiableModuleModel moduleModel)
+  public Module createModule(@NotNull ModifiableModuleModel moduleModel)
     throws InvalidDataException, IOException, ModuleWithNameAlreadyExists, JDOMException, ConfigurationException {
     LOG.assertTrue(getName() != null);
 
diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
index 97e7ed4e17a5..3ca4caeb6121 100644
--- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
+++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/ModuleBuilder.java
@@ -155,7 +155,7 @@ public abstract class ModuleBuilder extends ProjectBuilder{
   }
 
   @NotNull
-  public Module createModule(ModifiableModuleModel moduleModel)
+  public Module createModule(@NotNull ModifiableModuleModel moduleModel)
     throws InvalidDataException, IOException, ModuleWithNameAlreadyExists, JDOMException, ConfigurationException {
     LOG.assertTrue(myName != null);
     LOG.assertTrue(myModuleFilePath != null);
@@ -182,26 +182,24 @@ public abstract class ModuleBuilder extends ProjectBuilder{
   public abstract ModuleType getModuleType();
 
   @NotNull
-  public Module createAndCommitIfNeeded(final Project project, ModifiableModuleModel model, boolean runFromProjectWizard) throws
-                                                                                                 InvalidDataException,
-                                                                                                 ConfigurationException,
-                                                                                                 IOException,
-                                                                                                 JDOMException,
-                                                                                                 ModuleWithNameAlreadyExists{
+  public Module createAndCommitIfNeeded(@NotNull Project project, @Nullable ModifiableModuleModel model, boolean runFromProjectWizard)
+    throws InvalidDataException, ConfigurationException, IOException, JDOMException, ModuleWithNameAlreadyExists {
     final ModifiableModuleModel moduleModel = model != null ? model : ModuleManager.getInstance(project).getModifiableModel();
     final Module module = createModule(moduleModel);
     if (model == null) moduleModel.commit();
 
     if (runFromProjectWizard) {
       StartupManager.getInstance(module.getProject()).runWhenProjectIsInitialized(new DumbAwareRunnable() {
-      public void run() {
-        ApplicationManager.getApplication().runWriteAction(new Runnable() {
-          public void run() {
-            onModuleInitialized(module);
-          }
-        });
-      }
-    });
+        @Override
+        public void run() {
+          ApplicationManager.getApplication().runWriteAction(new Runnable() {
+            @Override
+            public void run() {
+              onModuleInitialized(module);
+            }
+          });
+        }
+      });
     }
     else {
       onModuleInitialized(module);
@@ -222,13 +220,14 @@ public abstract class ModuleBuilder extends ProjectBuilder{
     return true;
   }
 
+  @Override
   @Nullable
   public List<Module> commit(final Project project, final ModifiableModuleModel model, final ModulesProvider modulesProvider) {
     final Module module = commitModule(project, model);
     return module != null ? Collections.singletonList(module) : null;
   }
 
-  public Module commitModule(final Project project, final ModifiableModuleModel model) {
+  public Module commitModule(@NotNull final Project project, final ModifiableModuleModel model) {
     final Ref<Module> result = new Ref<Module>();
     if (canCreateModule()) {
       if (myName == null) {
@@ -238,6 +237,7 @@ public abstract class ModuleBuilder extends ProjectBuilder{
         myModuleFilePath = project.getBaseDir().getPath() + File.separator + myName + ModuleFileType.DOT_DEFAULT_EXTENSION;
       }
       Exception ex = ApplicationManager.getApplication().runWriteAction(new Computable<Exception>() {
+        @Override
         public Exception compute() {
           try {
             result.set(createAndCommitIfNeeded(project, model, true));

From f665cf14d70797cfd7d94df8e6f2a8774e62825f Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 31 May 2012 15:00:38 +0400
Subject: [PATCH 059/239] test blinking

---
 .../src/com/intellij/ui/EditorTextField.java  | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
index 1731856fc0e5..1721fa49f67b 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorTextField.java
@@ -52,6 +52,7 @@ import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author max
@@ -67,7 +68,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
   private EditorEx myEditor = null;
   private Component myNextFocusable = null;
   private boolean myWholeTextSelected = false;
-  private final ArrayList<DocumentListener> myDocumentListeners = new ArrayList<DocumentListener>();
+  private final List<DocumentListener> myDocumentListeners = new ArrayList<DocumentListener>();
   private boolean myIsListenerInstalled = false;
   private boolean myIsViewer;
   private boolean myIsSupplementary;
@@ -77,12 +78,11 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
   private boolean myEnsureWillComputePreferredSize;
   private Dimension myPassivePreferredSize;
   private CharSequence myHintText;
-  private boolean myPaintSelection;
   private boolean myIsRendererWithSelection = false;
   private Color myRendererBg;
   private Color myRendererFg;
   private int myPreferredWidth = -1;
-  private ArrayList<EditorSettingsProvider> mySettingsProviders = new ArrayList<EditorSettingsProvider>();
+  private final List<EditorSettingsProvider> mySettingsProviders = new ArrayList<EditorSettingsProvider>();
 
   public EditorTextField() {
     this("");
@@ -116,10 +116,12 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     setFocusable(true);
     // dsl: this is a weird way of doing things....
     addFocusListener(new FocusListener() {
+      @Override
       public void focusGained(FocusEvent e) {
         requestFocus();
       }
 
+      @Override
       public void focusLost(FocusEvent e) {
       }
     });
@@ -146,6 +148,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     setDocument(myDocument); // reinit editor.
   }
 
+  @Override
   public String getText() {
     return myDocument.getText();
   }
@@ -159,6 +162,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     }
   }
 
+  @Override
   public JComponent getComponent() {
     return this;
   }
@@ -173,12 +177,14 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     uninstallDocumentListener(false);
   }
 
+  @Override
   public void beforeDocumentChange(DocumentEvent event) {
     for (DocumentListener documentListener : myDocumentListeners) {
       documentListener.beforeDocumentChange(event);
     }
   }
 
+  @Override
   public void documentChanged(DocumentEvent event) {
     for (DocumentListener documentListener : myDocumentListeners) {
       documentListener.documentChanged(event);
@@ -189,6 +195,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     return myProject;
   }
 
+  @Override
   public Document getDocument() {
     return myDocument;
   }
@@ -241,8 +248,10 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
 
   public void setText(final String text) {
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
       public void run() {
         CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+          @Override
           public void run() {
             myDocument.replaceString(0, myDocument.getTextLength(), text);
             if (myEditor != null) {
@@ -293,6 +302,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     return myEditor.getCaretModel();
   }
 
+  @Override
   public boolean isFocusOwner() {
     if (myEditor != null) {
       return IJSwingUtilities.hasFocus(myEditor.getContentComponent());
@@ -311,6 +321,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     remove(editor.getComponent());
     final Application application = ApplicationManager.getApplication();
     final Runnable runnable = new Runnable() {
+      @Override
       public void run() {
         if (!editor.isDisposed()) {
           EditorFactory.getInstance().releaseEditor(editor);
@@ -325,6 +336,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     }
   }
 
+  @Override
   public void addNotify() {
     releaseEditor();
 
@@ -350,6 +362,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     add(component, BorderLayout.CENTER);
   }
 
+  @Override
   public void removeNotify() {
     super.removeNotify();
     releaseEditor();
@@ -374,6 +387,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     });
   }
 
+  @Override
   public void setFont(Font font) {
     super.setFont(font);
     if (myEditor != null) {
@@ -443,15 +457,11 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
 
     final EditorFactory factory = EditorFactory.getInstance();
     EditorEx editor;
-    if (!myIsViewer) {
-      editor = myProject != null
-               ? (EditorEx)factory.createEditor(myDocument, myProject)
-               : (EditorEx)factory.createEditor(myDocument);
+    if (myIsViewer) {
+      editor = myProject == null ? (EditorEx)factory.createViewer(myDocument) : (EditorEx)factory.createViewer(myDocument, myProject);
     }
     else {
-      editor = myProject != null
-               ? (EditorEx)factory.createViewer(myDocument, myProject)
-               : (EditorEx)factory.createViewer(myDocument);
+      editor = myProject == null ? (EditorEx)factory.createEditor(myDocument) : (EditorEx)factory.createEditor(myDocument, myProject);
     }
 
     final EditorSettings settings = editor.getSettings();
@@ -539,8 +549,8 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
 
   protected void updateBorder(@NotNull final EditorEx editor) {
     if (editor.isOneLineMode()
-        && (!Boolean.TRUE.equals(getClientProperty("JComboBox.isTableCellEditor"))
-            && (SwingUtilities.getAncestorOfClass(JTable.class, this) == null || Boolean.TRUE.equals(getClientProperty("JBListTable.isTableCellEditor"))))) {
+        && !Boolean.TRUE.equals(getClientProperty("JComboBox.isTableCellEditor"))
+        && (SwingUtilities.getAncestorOfClass(JTable.class, this) == null || Boolean.TRUE.equals(getClientProperty("JBListTable.isTableCellEditor")))) {
       final Container parent = getParent();
       if (parent instanceof JTable || parent instanceof CellRendererPane) return;
 
@@ -575,6 +585,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     return true;
   }
 
+  @Override
   public void setEnabled(boolean enabled) {
     if (isEnabled() != enabled) {
       super.setEnabled(enabled);
@@ -606,6 +617,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     super.addImpl(comp, constraints, index);
   }
 
+  @Override
   public Dimension getPreferredSize() {
     if (super.isPreferredSizeSet()) {
       return super.getPreferredSize();
@@ -668,12 +680,14 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     myPreferredWidth = preferredWidth;
   }
 
+  @Override
   public Component getNextFocusableComponent() {
     if (myEditor == null && myNextFocusable == null) return super.getNextFocusableComponent();
     if (myEditor == null) return myNextFocusable;
     return myEditor.getContentComponent().getNextFocusableComponent();
   }
 
+  @Override
   public void setNextFocusableComponent(Component aComponent) {
     if (myEditor != null) {
       myEditor.getContentComponent().setNextFocusableComponent(aComponent);
@@ -683,13 +697,15 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
   }
 
 
+  @Override
   protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition, boolean pressed) {
-    if (e.isConsumed() || (myEditor != null && !myEditor.processKeyTyped(e))) {
+    if (e.isConsumed() || myEditor != null && !myEditor.processKeyTyped(e)) {
       return super.processKeyBinding(ks, e, condition, pressed);
     }
     return true;
   }
 
+  @Override
   public void requestFocus() {
     if (myEditor != null) {
       myEditor.getContentComponent().requestFocus();
@@ -700,6 +716,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     }
   }
 
+  @Override
   public boolean requestFocusInWindow() {
     if (myEditor != null) {
       final boolean b = myEditor.getContentComponent().requestFocusInWindow();
@@ -726,6 +743,7 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     return myEditor == null ? this : myEditor.getContentComponent();
   }
 
+  @Override
   public Object getData(String dataId) {
     if (myEditor != null && myEditor.isRendererMode()) return null;
 
@@ -745,10 +763,6 @@ public class EditorTextField extends NonOpaquePanel implements DocumentListener,
     myEnsureWillComputePreferredSize = true;
   }
 
-  public void setPaintSelection(boolean b) {
-    myPaintSelection = b;
-  }
-
   public void setAsRendererWithSelection(Color backgroundColor, Color foregroundColor) {
     myIsRendererWithSelection = true;
     myRendererBg = backgroundColor;

From 12c13555a81794f658a19cff5fa250ef09c9e50a Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 31 May 2012 15:24:52 +0400
Subject: [PATCH 060/239] diagnostics

---
 .../navigation/JavaMethodNavigationOffsetProvider.java        | 1 +
 .../com/intellij/codeInsight/navigation/MethodUpDownUtil.java | 4 +++-
 .../navigation/XmlMethodNavigationOffsetProvider.java         | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java b/java/java-impl/src/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java
index 62d7bc1b2b03..ee84ce5c6c4a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/navigation/JavaMethodNavigationOffsetProvider.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
  * @author yole
  */
 public class JavaMethodNavigationOffsetProvider implements MethodNavigationOffsetProvider {
+  @Override
   @Nullable
   public int[] getMethodNavigationOffsets(final PsiFile file, final int caretOffset) {
     if (file instanceof PsiJavaFile) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java
index e52cd1698496..a4b2e80d854c 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java
@@ -51,7 +51,9 @@ public class MethodUpDownUtil {
   public static int[] offsetsFromElements(final Collection<PsiElement> array) {
     TIntArrayList offsets = new TIntArrayList(array.size());
     for (PsiElement element : array) {
-      offsets.add(element.getTextOffset());
+      int offset = element.getTextOffset();
+      assert offset >= 0 : element + "; offset: " + offset;
+      offsets.add(offset);
     }
     offsets.sort();
     return offsets.toNativeArray();
diff --git a/xml/impl/src/com/intellij/codeInsight/navigation/XmlMethodNavigationOffsetProvider.java b/xml/impl/src/com/intellij/codeInsight/navigation/XmlMethodNavigationOffsetProvider.java
index d7eb4a73a1e0..136ddf84a97e 100644
--- a/xml/impl/src/com/intellij/codeInsight/navigation/XmlMethodNavigationOffsetProvider.java
+++ b/xml/impl/src/com/intellij/codeInsight/navigation/XmlMethodNavigationOffsetProvider.java
@@ -27,6 +27,7 @@ import java.util.ArrayList;
  * @author yole
  */
 public class XmlMethodNavigationOffsetProvider implements MethodNavigationOffsetProvider {
+  @Override
   public int[] getMethodNavigationOffsets(final PsiFile file, final int caretOffset) {
     if (file instanceof XmlFile) {
       PsiElement element = file;

From a8ffbd11ddd3848635f5ea76f0e0cce40877ca35 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 1 Jun 2012 12:40:12 +0400
Subject: [PATCH 061/239] disabled dangerous test

---
 .../testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
index 0d65d499a8dd..07f23d257541 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
@@ -351,7 +351,7 @@ public class FileWatcherTest extends PlatformLangTestCase {
   }
 */
 
-  public void testSubst() throws Exception {
+  public void _testSubst() throws Exception {
     if (!SystemInfo.isWindows) {
       System.out.println("Ignored: Windows required");
       return;

From 6455992412155c9676f97bd7232f5a95124f8d6a Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 11:35:19 +0400
Subject: [PATCH 062/239] inapplicable args in translating to java

---
 .../refactoring/convertToJava/ArgumentListGenerator.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
index 8620f5902d26..3f1010dd1b86 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ArgumentListGenerator.java
@@ -17,6 +17,7 @@ package org.jetbrains.plugins.groovy.refactoring.convertToJava;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.NullUtils;
 import com.intellij.psi.PsiArrayType;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiSubstitutor;
@@ -63,7 +64,7 @@ class ArgumentListGenerator {
     }
 
     final PsiSubstitutor substitutor = signature == null ? PsiSubstitutor.EMPTY : signature.getSubstitutor();
-    if (argInfos == null) {
+    if (argInfos == null || NullUtils.hasNull(argInfos)) {
       generateSimple(exprs, namedArgs, clArgs, context, substitutor);
       return;
     }

From df010c3a33f2fd883591c5bcc60e24aa6db18de9 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 11:50:27 +0400
Subject: [PATCH 063/239] semicolon in enum with no constants

---
 .../groovy/refactoring/convertToJava/ClassGenerator.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassGenerator.java
index ceda991f2c1d..b950b4cc9486 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ClassGenerator.java
@@ -118,8 +118,9 @@ public class ClassGenerator {
       }
       if (enumConstants.length > 0) {
         //text.removeFromTheEnd(1).append(";\n");
-        text.delete(text.length()-1, text.length()).append(";\n");
+        text.delete(text.length() - 1, text.length());
       }
+      text.append(";\n");
     }
 
     writeAllMethods(text, classItemGenerator.collectMethods(typeDefinition, isClassDef), typeDefinition);

From 1d6b4274946b027ace52e427ce9ad4503c8a8b70 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 12:28:03 +0400
Subject: [PATCH 064/239] fix testdata

---
 .../testdata/refactoring/convertGroovyToJava/file/hash.groovy | 1 +
 .../testdata/refactoring/convertGroovyToJava/file/hash.java   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/hash.groovy b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/hash.groovy
index aee07196dbe0..1e7d79bd2cba 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/hash.groovy
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/hash.groovy
@@ -1,5 +1,6 @@
 class BigInteger {
   BigInteger(int i, byte[] arr) {}
+  String toString(int radix) {""}
 }
 
 class NoSuchAlgorithmException extends Exception {}
diff --git a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/hash.java b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/hash.java
index e7b10c48e8bc..a333176b0dd7 100644
--- a/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/hash.java
+++ b/plugins/groovy/testdata/refactoring/convertGroovyToJava/file/hash.java
@@ -1,6 +1,10 @@
 public class BigInteger extends groovy.lang.GroovyObjectSupport implements groovy.lang.GroovyObject {
 public BigInteger(int i, java.lang.Byte[] arr) {
 }
+public java.lang.String toString(int radix) {
+return "";
+}
+
 }
 public class NoSuchAlgorithmException extends java.lang.Exception implements groovy.lang.GroovyObject {
 }

From 1376176e46a17d8e5b5a73796d48b47e3c4b7d75 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 12:32:13 +0400
Subject: [PATCH 065/239] asserts

---
 .../completion/GroovyCompletionTest.groovy       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
index 42bf94b12d2f..2a835f46e23e 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
@@ -908,7 +908,7 @@ class Fopppp {
 class Instantiation {}
 '''
     myFixture.completeBasic()
-    assert myFixture.lookupElementStrings[0] == 'instanceof'
+    assertEquals 'instanceof', myFixture.lookupElementStrings[0]
   }
 
   public void testForFinal() {
@@ -1003,7 +1003,7 @@ while(true) {
 
     myFixture.configureByText "a.groovy", "def foo(stryng) { println str<caret> }"
     myFixture.completeBasic()
-    assert myFixture.lookupElementStrings[0] == 'stryng'
+    assertEquals 'stryng', myFixture.lookupElementStrings[0]
   }
 
   private def caseSensitiveNone() {
@@ -1077,13 +1077,13 @@ class X {
   public void testInitializerMatters() throws Exception {
     myFixture.configureByText("a.groovy", "class Foo {{ String f<caret>x = getFoo(); }; String getFoo() {}; }");
     myFixture.completeBasic()
-    assert myFixture.lookupElementStrings == ["foo"]
+    assertOrderedEquals(myFixture.lookupElementStrings, ["foo"])
   }
 
   public void testFieldInitializerMatters() throws Exception {
     myFixture.configureByText("a.groovy", "class Foo { String f<caret>x = getFoo(); String getFoo() {}; }");
     myFixture.completeBasic()
-    assert myFixture.lookupElementStrings == ["foo"]
+    assertOrderedEquals(myFixture.lookupElementStrings, ["foo"])
   }
 
   public void testAccessStaticViaInstanceSecond() throws Exception {
@@ -1096,7 +1096,7 @@ public class KeyVO {
     myFixture.complete(CompletionType.BASIC, 1)
     assert !myFixture.lookupElementStrings
     myFixture.complete(CompletionType.BASIC, 2)
-    assert myFixture.lookupElementStrings == ["foo"]
+    assertOrderedEquals(myFixture.lookupElementStrings, ["foo"])
   }
 
   public void testNoRepeatingModifiers() {
@@ -1118,11 +1118,11 @@ public class KeyVO {
     myFixture.addClass("package bar; public class Util { public static void bar() {} }")
     myFixture.configureByText 'a.groovy', 'Util.<caret>'
     myFixture.completeBasic()
-    assert myFixture.lookupElementStrings[0..1] == ['Util.bar', 'Util.foo']
+    assertOrderedEquals myFixture.lookupElementStrings[0..1] , ['Util.bar', 'Util.foo']
 
     def presentation = LookupElementPresentation.renderElement(myFixture.lookupElements[0])
-    assert 'Util.bar' == presentation.itemText
-    assert '() (bar)' == presentation.tailText
+    assertEquals 'Util.bar', presentation.itemText
+    assertEquals '() (bar)', presentation.tailText
     assert !presentation.tailGrayed
 
     myFixture.type 'f\n'

From f945ba6c99fb12ed91d6280047c7caa72eae1127 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 12:36:03 +0400
Subject: [PATCH 066/239] skip temp classes in resolve

---
 .../groovy/lang/psi/GroovyPsiElementFactory.java       |  2 +-
 .../impl/statements/GrConstructorInvocationImpl.java   | 10 ++--------
 .../plugins/groovy/lang/psi/util/PsiUtil.java          | 10 +++++++++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
index eb0128dacecb..4c9e7f7037c8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyPsiElementFactory.java
@@ -54,7 +54,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
  */
 public abstract class GroovyPsiElementFactory implements JVMElementFactory {
 
-  @NonNls public static final String DUMMY_FILE_NAME = "DUMMY__";
+  @NonNls public static final String DUMMY_FILE_NAME = "DUMMY__1234567890_DUMMYYYYYY___";
 
   public abstract GrCodeReferenceElement createCodeReferenceElementFromClass(PsiClass aClass);
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrConstructorInvocationImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrConstructorInvocationImpl.java
index e6c630bef390..be38a735e959 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrConstructorInvocationImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrConstructorInvocationImpl.java
@@ -18,7 +18,6 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.statements;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.*;
 import com.intellij.psi.tree.TokenSet;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -28,7 +27,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrConstructorInvocation;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrThisSuperReferenceExpression;
-import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyResolveResultImpl;
 import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.GrCallImpl;
@@ -78,7 +76,7 @@ public class GrConstructorInvocationImpl extends GrCallImpl implements GrConstru
       if (isThisCall()) {
         substitutor = PsiSubstitutor.EMPTY;
       } else {
-        GrTypeDefinition enclosing = getEnclosingClass();
+        PsiClass enclosing = PsiUtil.getContextClass(this);
         assert enclosing != null;
         substitutor = TypeConversionUtil.getSuperClassSubstitutor(clazz, enclosing, PsiSubstitutor.EMPTY);
       }
@@ -110,17 +108,13 @@ public class GrConstructorInvocationImpl extends GrCallImpl implements GrConstru
 
   @Nullable
   public PsiClass getDelegatedClass() {
-    GrTypeDefinition typeDefinition = getEnclosingClass();
+    PsiClass typeDefinition = PsiUtil.getContextClass(this);
     if (typeDefinition != null) {
       return isThisCall() ? typeDefinition : typeDefinition.getSuperClass();
     }
     return null;
   }
 
-  private GrTypeDefinition getEnclosingClass() {
-    return PsiTreeUtil.getParentOfType(this, GrTypeDefinition.class);
-  }
-
   @NotNull
   public String getCanonicalText() {
     return getText(); //TODO
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
index 1c920224e894..7f5c771938c8 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
@@ -570,7 +570,7 @@ public class PsiUtil {
   @Nullable
   public static PsiClass getContextClass(PsiElement context) {
     while (context != null) {
-      if (context instanceof PsiClass) {
+      if (context instanceof PsiClass && !isInDummyFile(context)) {
         return (PsiClass)context;
       }
       else if (context instanceof GroovyFileBase && context.isPhysical()) {
@@ -582,6 +582,14 @@ public class PsiUtil {
     return null;
   }
 
+  private static boolean isInDummyFile(PsiElement context) {
+    PsiFile file = context.getContainingFile();
+    if (file == null) return false;
+
+    String name = file.getName();
+    return name.startsWith(GroovyPsiElementFactory.DUMMY_FILE_NAME);
+  }
+
   @Nullable
   public static GroovyPsiElement getFileOrClassContext(PsiElement context) {
     while (context != null) {

From 2a014c660b71443a9fe1b80942c2bd4c05f9ee73 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 1 Jun 2012 12:53:15 +0400
Subject: [PATCH 067/239] moving xml-tests to community: getting rid of
 ultimate dependencies

---
 .../intellij/psi/AbstractReparseTestCase.java | 105 ++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 java/testFramework/src/com/intellij/psi/AbstractReparseTestCase.java

diff --git a/java/testFramework/src/com/intellij/psi/AbstractReparseTestCase.java b/java/testFramework/src/com/intellij/psi/AbstractReparseTestCase.java
new file mode 100644
index 000000000000..43bf6ccc20ec
--- /dev/null
+++ b/java/testFramework/src/com/intellij/psi/AbstractReparseTestCase.java
@@ -0,0 +1,105 @@
+package com.intellij.psi;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.command.CommandProcessor;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.psi.impl.DebugUtil;
+import com.intellij.psi.impl.source.SourceTreeToPsiMap;
+import com.intellij.psi.text.BlockSupport;
+import com.intellij.testFramework.PsiTestCase;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
+
+/**
+ * @author maxim
+ */
+public abstract class AbstractReparseTestCase extends PsiTestCase {
+  protected FileType myFileType;
+  protected PsiFile myDummyFile;
+  private int myInsertOffset;
+
+  protected void setFileType(final FileType fileType) {
+    myFileType = fileType;
+  }
+
+  protected void insert(@NonNls final String s) throws IncorrectOperationException {
+    CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            String oldText = myDummyFile.getText();
+            String expectedNewText = oldText.substring(0, myInsertOffset) + s + oldText.substring(myInsertOffset);
+
+            try {
+              doReparse(s, expectedNewText, 0);
+            }
+            catch (IncorrectOperationException e) {
+              LOG.error(e);
+            }
+            myInsertOffset += s.length();
+          }
+        });
+      }
+    }, "asd", null);
+  }
+
+  protected void moveEditPointLeft(int count) {
+    myInsertOffset -= count;
+  }
+
+  protected void moveEditPointRight(int count) {
+    myInsertOffset += count;
+  }
+
+  protected void setEditPoint(int pos) {
+    myInsertOffset = pos;
+  }
+
+  protected void remove(int count) throws IncorrectOperationException {
+    String oldText = myDummyFile.getText();
+    String expectedNewText = oldText.substring(0, myInsertOffset-count) + oldText.substring(myInsertOffset);
+
+    doReparse("", expectedNewText, count);
+    myInsertOffset -= count;
+  }
+
+  protected void doReparse(final String s, final String expectedNewText, final int length) throws IncorrectOperationException {
+    CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() {
+      @Override
+      public void run() {
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            BlockSupport blockSupport = ServiceManager.getService(myProject, BlockSupport.class);
+            try {
+              blockSupport.reparseRange(myDummyFile, myInsertOffset - length, myInsertOffset, s);
+              String foundStructure = DebugUtil.treeToString(SourceTreeToPsiMap.psiElementToTree(myDummyFile), false);
+              final PsiFile psiFile = createDummyFile(getName() + "." + myFileType.getDefaultExtension(), expectedNewText);
+              String expectedStructure = DebugUtil.treeToString(SourceTreeToPsiMap.psiElementToTree(psiFile), false);
+              if (!expectedStructure.equals(foundStructure)) {
+                System.out.println("expected: ");
+                System.out.println(expectedStructure);
+                System.out.println("found: ");
+                System.out.println(foundStructure);
+                assertEquals(expectedStructure, foundStructure);
+              }
+
+              assertEquals("Reparse tree should be equal to the document",expectedNewText,myDummyFile.getText());
+            }
+            catch (IncorrectOperationException e) {
+              LOG.error(e);
+            }
+          }
+        });
+      }
+    }, "asd", null);
+  }
+
+  protected void prepareFile(@NonNls String prefix, @NonNls String suffix) throws IncorrectOperationException {
+    myDummyFile = createDummyFile(getName() + "." + myFileType.getDefaultExtension(), prefix + suffix);
+    myInsertOffset = prefix.length();
+  }
+}

From fa8670510cff2b8fbea1fdd329f78cfc3c0ba82d Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Fri, 1 Jun 2012 13:01:35 +0400
Subject: [PATCH 068/239] SVN: use standard configuration directory on Mac and
 Unix as well

---
 .../idea/svn/IdeaSubversionConfigurationDirectory.java      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/IdeaSubversionConfigurationDirectory.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/IdeaSubversionConfigurationDirectory.java
index c9176f2b7961..1947ca03a902 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/IdeaSubversionConfigurationDirectory.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/IdeaSubversionConfigurationDirectory.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.idea.svn;
 
-import com.intellij.openapi.util.SystemInfo;
 import org.tmatesoft.svn.core.wc.SVNWCUtil;
 
 import java.io.File;
@@ -26,9 +25,6 @@ public class IdeaSubversionConfigurationDirectory {
 
   public static String getPath() {
     final File standard = SVNWCUtil.getDefaultConfigurationDirectory();
-    if (SystemInfo.isWindows) {
-      return standard.getAbsolutePath();
-    }
-    return standard.getParent() + File.separator + standard.getName() + "_IDEA";
+    return standard.getAbsolutePath();
   }
 }

From 57c8e750e60e50c50ffbcf4afc4c7e4a3ba1ba54 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 12:57:26 +0400
Subject: [PATCH 069/239] diagnostics

---
 .../org/jetbrains/plugins/groovy/formatter/GroovyBlock.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java
index 32184b90452c..8225b524b6c5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java
@@ -111,6 +111,10 @@ public class GroovyBlock implements Block, GroovyElementTypes, ASTBlock {
       try {
         mySubBlocks = new GroovyBlockGenerator(this).generateSubBlocks();
       }
+      catch (AssertionError e) {
+        final PsiFile file = myNode.getPsi().getContainingFile();
+        LogMessageEx.error(LOG, "Formatting failed for file " + file.getName(), file.getText());
+      }
       catch (RuntimeException e) {
         final PsiFile file = myNode.getPsi().getContainingFile();
         LogMessageEx.error(LOG, "Formatting failed for file " + file.getName(), file.getText());

From 6ccb8dd2a31b0e5ba52909e19a46483ca1a5880f Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Fri, 1 Jun 2012 13:05:45 +0400
Subject: [PATCH 070/239] svnkit 1.7.5 9277 - better logging (does not affect
 performance)

---
 plugins/svn4idea/lib/svnkit-javahl.jar   | Bin 329668 -> 329668 bytes
 plugins/svn4idea/lib/svnkit-javahl16.zip | Bin 165836 -> 165836 bytes
 plugins/svn4idea/lib/svnkit.jar          | Bin 3330289 -> 3330582 bytes
 plugins/svn4idea/lib/svnkitsrc.zip       | Bin 2100702 -> 2101279 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/plugins/svn4idea/lib/svnkit-javahl.jar b/plugins/svn4idea/lib/svnkit-javahl.jar
index 7eee9c01f89018132cfb35a706a142f2fc925ce4..088881d4109923ea0f868362bb26a8d0da81e8e6 100644
GIT binary patch
delta 4674
zcmX|Dd0dUz8^7ng=eAhNPE(eQEQJ`<#Mt+-uf>FrtP?RvGnfobBkS)@UVHg5qsWq5
zy%CXalu9a@(n1Xqsgal{{NCqz-p}u^?|HWGvz>F_Yuek&w6|50sS_m8NT;)~(0PRI
zZ_>@eBP?;))!B*B`v=XjzAf9>wEM#5;1{+g+qsA5MxSh{=N@5(cztJpB7F}4bF=;c
zgUtr1U<@$xXMnZlt0cfhjbC!WDOTGAU~Y@oXus8JG0ILhwP?4uTZ;Of?X58Ga3@=o
z6?<z7h)eBp6a9Ae>@PKi8Z&;j@IJwGx?c_Z;<_9t6Bfqz&I+>v)1rx&g37s0XKrTL
z`s7QrRrD1|Tiw3|(`LEZOX$0yhPMw=eHZEtVGZEh(%64+7{?T6Cz^EgRhxxjVIHJt
zZ?qq_466tkaRqVg=$=^R`Y~omzj?ej!_X8jpB1OoP;bM}W1Qr3mxQIU^Mq)O$(!`b
z3_3E+%*Ghm!ymD^=TIxqPhT+?{m!q_n}Zy?&ZdouhI_va2eIYO7&NEt3PPN=Hv<RM
z@!+r6S;WzDq~CusOOK@#oEo^ijil3kGHiL`D2FTRq{1S5VamHv;}F|jtV3)O<A<C(
z;?@D4{1A`ohJ<EViB<9mG)JeT!96hkl>Qp!)pws_%Gr5E9EW=IZI8ssLZ_S8$gn@I
zhjDqn50;i)#L)kK$ui^}Qq~XUbx-mTzb)@Zaz!X&qspP^H=()&WP?-9C`jv9a|?!U
zaI38c(d8}Olo{^`*Zgaa=1p}qVE+ES8;TJh>aezrZFe0!qSNVeb#OTh;Wd_qhxH2Z
z85-U}K*-0T5Ma#s)ExugeSW2iu}@iB5amyd)v2h|aW)JU0|kS3ATJRN9)f&CFn9?{
zzF^a!Y{ki(-2qSKUket3A=?|VLQpJh%&s<rLq|Kd6@9}yu!(r6>ckifO?lmgSz>g9
z18aw-Hr?4}JY+kvj&xIVCMA@uR<B!*Y~P)AlZR!9#)@+<7L0C}otZ;tpn5!wwMVMY
z)7cuhG>YGM%pF#%+*!m%pvlUcy?|vZA6BqUFnwjcFKdg3J$|eSmUMJIGa>ULe};Eg
zF8Yxbf$x={SUtKZfefdolx|~7ka*m7)*BA8{|;6QzP>?h0<t6oGd(@ruR=4HbynYW
z5|g9PurFn&`@%YIC&M?U^bTQ_$Yi&hb;qK|{Lb=`p_9y7!Htw%jxt!f;&_a8LEovz
z*$Lv_;XiQjY?XUHmjiuO?ybj}xzZz?twKNf1j|OM6{pyEJjDK~mI<6^BWdA(oMBNg
zG<k-RH9(SSG0YB|T^-L7A-&?9$ik5>`#SptW+u;0W>3KKjfqKMk%y<yq&nVW$C`j8
zF^4hiCaHk+#mi7z!6xhRuD%^z*Xp!dvtE*u{#0w;Tr65E!PP7psRq4f<-pLThLS0f
zZ`mX)sO~-c4OjNdN45dGssGH5;^7eIi_!E+&r?y8YQew4q8ltZ!_|Mb=J+G6)HLU@
zXo_sflQE}nYhDRCJ=<{F%Fed@F!FV^<=*JK%Z}sEgzVgr7lW@=CvJ~r_3grE;UTy?
zx5mSvp1dus$H#N~;?wH0v}W?YMrx~GU3gQusuzz}8RUrG{53EgapuQb!eQV@ZjV{#
zjZy0X&4lsX4K+a%`2{?<PUR=jR5YEZW41_l-T_NY^Wf*u$KR9R=?meb_HZ9`j@rk&
zp()S6_n>CU0Ulz9>qwZ~tZ@@{9ru~Mz^K+}J)K!9jz;c)qnQ@Nd#Y6O))?LgFgk`0
z0DK<9zkw88WBF+Kfmgmy=8dt8023d9_a-q-TS3hoJ{rl~GB`e{wwe6eatM0hB5kI(
zzTn}*7h~18?kktNNc|Lpn=}XOtQsU8#6$29X&SarI9!^DhaRJ)QZzLgC#^$G-~_1>
z538q0=D2kKSyC{45_>!K)Qwa>7<uOMLN_(T@Hx^<^p!oOudv?qh0<>1o9ivLMw8!C
z=?B!5FPDzv;n!8tT|Bt2mhk6Waa}9X&&J0eB>b2wNgJgNI0?5+(m-6%`pr@nMveJd
zYK6?6zew%yupvlF#2+n}y;4&sSsooK4T0J02$e=Pg+uy(rBTS&{FL;zHE1lZNP{tY
z>@_K!+Pe@?RF|%9afSr#sW&ZIYNpIclGKlr8qhaca;A@%@9+U%-d5-QyBYcQ`6SvZ
z5h)V=PW+fE^~YI6XG(3b;<PNO1@=&!D>X;cKl#%B-S`duT9=q3^g7*CdCFShqL_R{
zYxF2wDYOl(7B*PtsI`JFYx9j_DQW@&L?j*@wutq3I2tJ0;~`<Yn2!hBU~vKui6P<*
z{XeRxwyd^Lx42mDvqcP0-t5&9SQ*4!bS*g`im~u(hr|NZbT}reP-7J?98fdhq;SWv
z>^UWzKqDud76bnOA5pG5Eq(&+h6sUo-to4ulT8uA7L=tCVg#T=q!<slCQ>W{ydNo+
z01i4M)&QP6BUS<0o)w;eo6d^)fCU=5MG1G1{}UxV04t-!GQipA#2morb7C%F)AM36
z;M((I9$@x);SK0|K`aD3e1YP`MX?fOzl*{Lu;3!;M@Cb8L^SbAmneSuC6Y~-$iJsi
zd=GI)jKUAlDu(3EF;sVP4AturOZD!H6;r^kG?w}s8b|dVj}za4zCKQP0nSrsK1mAM
zJH=D}pm@^1h^PG1FN+1>Z@f%?Ev^vyU7`HhSIEyTf%3@-RDX?zldh6I_A14-x<+{d
zuF)JHTqAzhMA9EiB)^74s>AC#*^{mlPmdd7I@GiI2JP|X4bsm@qB-A4qWL=BB>ep*
z?Z5t}SOIZMlPOQ8hW$(w7jB~a(ISQB8<;}86)BX*{T9V1-y%Ns^0@+^dhhJyt+z#2
z5KiBw%U5$-%m(?}RBGaUDh<Uljhb7QCT4;CdKwME_70J5yF<$?yhF?SI-Q1mFdd6I
zkU`-KGN`uO8PrR!Oxo$*OuBnDnY4?kcZufQU7|J1B08TevYWCfuIoK2FYq4S$!GUy
z=3}!d{!})#VUa_)Du?o9<&a;WT;ki4OZ-*2bQj0nr}#haQy%j?ieH&W`qVrcQ>O<s
zj*Sn9Cr`tEe^K4L{t|QWXW;O7hiduJS<yz8^69yc&8HF~@+l=RpwgBUP)j!oC`G%6
zB(HlYX29fAA5sYpg*4Lbg(R02ikV<{Eh4{NMHE+FM5PQXrWV7CsTEN|8}urn(WR77
zyzL{(yY3Oi-+e@Jy&qG)-H*jm$n)+o)jOw@u4{5Bt=6fG<j^u2$(u6b_xPLmjDOSW
zZJrSCrYFQx^n~oLPif?bp3=3|Kcl?f8YVv@Ui)(DE1;a>@-*!8oa7J<pJ_O}g7il#
zsDAwmlD%HgJWMaBF2|Qt&+eBr$Fi5SpKmHjA66*_LjQ%80=}xU?JF@7(Cd}>7BK1+
zJ-aWeXdc_Di1&FFy_6}{gmKk07u$cRzkq+J?;;I{ye2tZLtaC&w}!Vg?EZ%IJ2kA-
zaB?l_FV@mMYyOsSt%kW8_J2qEPz~Q{=>9M1<2AIYqkaPGsQ%}5^z$?8J<TQlJ@wh)
z1MPLo2bycy2Qd-m(x+bd0*2QM_@^c}ZXmyv4OC~QhRz>J-ml>s4QG8Ky`rJbXOe&X
zOnFN`W4)mx^ziiz{S!fM#0Y&g%+b(=lm0N*<45nKhF%iM$r^SQB>$#irG``Vq`#zL
YYcoB5?6#Zf@#9)yrpGR4n(Np64?~Re)Bpeg

delta 4674
zcmX|Dd0fx;AOF6OZ{;d?S~)T~3Nd6c_dWN`7D8?!=4!(-%-r@}K5qH3DRSgneWHo<
zjZ&n@P>vcBsmZY@?EQMZK9ApD&)0pwKi{uyYi--s+Es@Q6tc3(<lta(3)x<^nS)zM
zLid*Me~sJTdAyTNb8)Hnnaj@4Ty3tqUB*Qns%7S`A(l9EV}M+93jlk&_S`MR(#5W`
z0&B3{G6wkCey#wVQsp@Z9O}4Q0^X?k67`pAPetC#<u&Tv-DaSCLw!f|+ug_&dEMQ~
z0sK;0TtvG~E!&G~P-FU!4gm+5$@H^jTWpgZ`O?Aq&Rb`Wpqeu1^tu9WGTGZ%Rz3P0
zb%kvuhAnA-AJb;|x(l>jQp)SEQ?`@MmID=FTg%$M%K?rljt#PzCMunSWpXy8sBd-e
zJ`=0h*z+u6zdkLo%Ef){F#L)E0SsM}{in}9qFe(kKlb&~j-Qs5tc?dop-=YU7k1E*
zZB!=uXycY4*6{1*2=WoLzu{`G))RBh_JA>qT<R*h<@zr@KwWD?G=@ptv<`9j)^r?D
z!<|24XW@GbF#PsI8D=cy&f!k8>I#$Tqh;kIPc2MWlR6O53R7N-?2lOQR2gE;=pc-_
zHg*x<q4#kpu86O052+oK4x&0LIn@mO4{0xvpMUK!rW})<%W<d|-?T^=B2A_Vl`Y$2
zTUck^o{ptu<}$Rud4DFx?V8^X`9+Vi5x*{IMtor?V&$T4Xg9FrKJXT=(%z6ZsPqyH
z-QxSY99W+>bSWd>5-#}H9@WdsN<lsEoiDQC@5`{ZrOumn?lGB6H%xFGmax)Fmb>LT
z#Isbq1&56vx`Bf={bO@<eEaEzVq+dNXJECDjFl<W%Q)-K)PA&1lEFLBrbz}5LE9r4
zyafHWWW%9s-OHX`0ayKB2euJotf|a$Krp!q`?ER_4c*u(v<+*(1|d=0h%p$N{;~<H
zgx(b%tRAZBHfLv$$n<0l=~A->$LG&i=a!|pH)qYX?&-3M?%j&5N3%2D%%d@cdN`cb
z$55X}umx~5deFCQEUZ?)GKKX-m16*V2Fujn&t}VE`ugHP=8VLaAXXJi+Pj$9F!GdT
z3~yJ<{hsB5?b#n#IhyDp45z2(t!C3OaQ`)|H4xgewd^(62CicRF-rV;W~PVxMQHlW
z#_CNcGA-&T`&{$7DV<_BFnnWr>y4}kBe`v6&9Ugdzp>jGp^?UF!$oR7dl@WU_uR*t
zpzW~z>>$NnyR1`}F)H>%u7w1u*sJz4d%Z;%n~QeZL6(W3W*=q)kcjz1l?gGAMbN^3
zKguFuXxd0CtAHfKqnR5vJ3o#kKziLffrVkX%=7Fgn3*;vi9G_%S2iX<qxDFpNj1F0
z_EiN<LKb7#P2wHa7LVa|Asb@GTYb}~to9LAvsq|~f2f*Q+>>?m^(8C{Lv?=13Lrw0
zQc9*rykUc}pt5)D7hKs-AJ`J?ru-Azi^ML@r=seknWvy6#esi;MORef3|IfjiQ`9F
zFRj62P!&;&Ct=ROI=l#S`qkyMl?~2(H^yt~$^+1LlN-m+gy!9l-ve96M%*3CYTJa5
zMq+()?u5jymfV@vGu>~^)FbLyIx%fqW!0*G6JAX#ZpGtN1TDNZf2p3BzQ>#Is|7@-
zUff*(F`=)j2Z(_KxGzf94dN$}=s1iYLRIbvo+iO2Vk~a}PgYMI$B(1UGCzK$El7HA
z;nUGLavN`ks%#72f|6-F_(nHJSM|FRKcsq<s%jlKnKsF)YIGXGD(Rk9?t$Nd;nBRM
z3Z<=z=4}9@qIn0vr_uZ?NYONg_i+SbUJ|c@Wdz%JPxwLA6H;LXiYUFp`(QBNbe;<W
z=d1kOEFf<Ah!wmVR59u9-DmyOTMyLod_+6l;w#2uoyDESP9)ZM6~nQGoE~Bj5-s|O
zJXBTfFBYLBWS}TQV*XHJZwCpMjTY+#w%OXNrKy+t!N|7PCi|)kJ;sYsXsh{&FR<RU
z$zn6c`zAotK~>NU@f}JEW{Les{5)4&Lt^ZFp+4U#L&t?eeKr*F;X9#z%oUNiR4l>1
zeV2<)xT3`?L<Xw*{wQi=WWS$8JtUT_6A2FB<+D{(gOasAp`t4Y)`p7S)qqI*pXiP8
zY8)1C>VU-ItmuN?{mzLrYVTxlZdsbz;z$AQsY^=|)%B5yLj5=?hqg(=o8uS)dvy5x
zvYPX6c4XJ)qjc88lZE<DD7)`dM0=b?)KyUzC8-&rCiZaehNyw6e{PHIn{j7fni8_4
z*<>1~4P7XGblY@U2Q6~uNMl3ur3=>Cd!eLbt+7<jKuK`0j6lL;rCf}}-Vj+IiTE{g
zA`-6a<v}D8Hp*85Qx=v~DsfO-oT{~1DLd$|wi*c>E%F+g-rphbVd3X?$w??_uum4F
z#4${IprpegITpvV<*@X^4_f>Y+2Q~H5w)@-@&`2yZArMqoA<md-85UcbOm8vxa<k9
z*CRp>09+6urvToJkkbG=AC(ILj~|tD0bP$tKfvY3<V3(b2Kq+IvB3WtDaQd8Mar3g
zV~)%5fKkWgH-Obn$f<w}Psj;?nI~ibV8@ekGT`o$<R?$bIlu><lG6e2oFaLzDDn@F
zqPXHT`Oi8{yzMmEx3tQ6;J3#rg8&_)iC+<|>Q;T<i&ph2^ogN*x5dbzV3!v|{dJ3_
z`u4}lZ$VxjEByf{=ro^1o%D_3DF3=Rl0S>1{3FiDNnme1Lv}UK5(b^6xn-UuJKuQ9
zr^QqKr3McElk_ovl3(p}lqdKc&GFVbir+DT<ogoHt|Ecz@IO!b#PbxV#RWM6>REAt
z_W1k)$wwyAoG&EOd_6A`{&tb}Uw%=}2EQ3el;^5}?QG;1W~2M4nN0HyNv61k$&_d8
zCGt<Yq~fW0tK;iv+?|`Y>auJK!H-;~<14)^#{mCz3N>*eg@#fom71HGDo2C<d@2pW
z^$Hca`U)Li&J|kLmuWQQooQIij&yRLluor>PN!a4U8S9Fy-K%NdX;uD>>7nRevQJ~
zWl*^38Kk#mkYCg5R9?t+y2&TkY3BVh$^URBwc(IOI5&&(WMq+Dn;R5w%MFTOe1mSW
z|4s7${U+tH&nEvl*(6WNrZF|TMdMg{i{fM(*zPZ?d(&TXJbngt5AZ0_9vqW(HF2As
zd%xRMLilY;$?s5U)9z497w%AsdUuImbXSgq$*0_<5<GHfq-%1B&&!dcK;JQ!>^9|+
zUqLRF()}K_7<P|Zk@snX{`YBg$@j_M^#SEw^nm=YJs`i<4=LZ~hjIqwdHay+9iK<%
znv_SY^~xtcG@nNDDxczy`<vof|EATuJfgVEA5om#N2Krgm`1+qF`cdX3FQqiFzJbk
ztIpWHK=q|CxIp<S%r>yiQ{p!o_{6{-g(TlwsOnet=4ZtFKU4EiyzQB)OQGj;Rgc2W
z&($0i=08{aQTSC6$qy9CPQd3BN%&ROTwlmufc`J!*MN~P)U#9gS+Saj!qvqT_h~Ub
zzo8|Bu_bCQO7HrQ>Q7<tKdNtqxdwK9Nqm@ryp;F=11}la{1wSJ7+7TBkk=$X^;+GT
zid*9i;X(s%7})+T$wLi%Yv9;_NgijQOBwYOQbzSZEmNN#6?gPInoHa}>a)RnwO1uy
z`JU#Q|6UFPzD>Cd1Pm*e@J~&vQbBfeDyYt@26}%We!GFM3>^KD<hp?_pNRkd6XnhO
zg!P8@G{ZVW|3J_xGr~Xvvkdg%B;U==xa|)H`U~Qd3~VZi|HZ%}1BaSPe%in~cIJ7|
T)fzi9Zne<Pj9rehH!t`PW34}C

diff --git a/plugins/svn4idea/lib/svnkit-javahl16.zip b/plugins/svn4idea/lib/svnkit-javahl16.zip
index 6b2fa287ec89b650c6f2e45a19451686c9b29c61..26b8d1313933188fa2547ca6d085d26d365003de 100644
GIT binary patch
delta 92
zcmX@p&vmAsizmRFnT3mifrEn~YW_qXb&ja{`yBR!?b|rfI#T5LbV*4GDajd9(nqAD
rW<`A{`dGv`S#iH~<KfoBj9U*gIVLbg&7aPe$YcuFw%s|AsZ$LAuk|68

delta 92
zcmX@p&vmAsizmRFnT3mifrEoVp>ZOQI)_5zJ_ns&lXgtBjubgET~bm)N^*vj^bzS<
rk`W(@J{B=fR@^V$c)0a2<JQAWjtNW(jnml@nM~o@wmT;>b*cdXVB;Uo

diff --git a/plugins/svn4idea/lib/svnkit.jar b/plugins/svn4idea/lib/svnkit.jar
index bcfbd9ed6c8e8ed9fb81d6d2e249d9461fe55f57..4d6c54ac72439f9bf0f40e1f85bbcb6b28e1d39d 100644
GIT binary patch
delta 129297
zcmZ6y2{=_>)CYWL7k4nb<}q_zLS#tESRx9UGNqD4MKoRWlqupEGK&nE!VM9n6cx%)
zhES<U8Oqf7owM)%d*Ao_o~P%zKWneG_S);Lz4qGcoR*9F(3z!uXp+rdERF+(A`(&i
z3$BsmiTevWjPBWY)L+v(EYt%D3DJawvV=vtMVxY+md-4nL8A}>$X%W;T;H>Z!<ZGM
z-^EKKKNENr<cEVm$5<7l>l3udX0R$0p3A-tg+g&dXbx5J^c#d%Fw>ntwx?+1SD$@9
z77<D${YL&wAkT7xVTnWx^7~IppMd-tC=eu(UlVgI5VN#+kBHq-vr;4@zfMl-fIrE_
zkq`O%Q$PwB4>`v}ME*{^v<~E=ubctDn~Vh3-{Gyu3hwNR5e4%cN&JaN{&r4_;6#3>
z^6>1)@5i!iKo76B+=l%9e5wHG_kYhzq9Ci>Q+wqp4TnOt5Yw++5xY~psD(qE@cz3I
z{Bvi^k7OGB%WNW{8!!ksK}Gwb5irb!o+TsTo;dnG7`iNlcEw;U3!n)Zv>|3+0VFDm
z-b2|3&oQS)aZg}Fp-xkv@H-eeh^j+phdQ<CRA#j-I)@GBWtyv??Xd_bR6{>UBjB_;
zx{-i@Ejs8|SXeLfrylwP4gu3f=pquu64rd)<6Q?y5QUOahomA1|7lLqq2r-rx^xP2
z&<ZUeh)B$NqoWYpn5U1SjYtTnKa0M{q6DKMU^X!nZH$aqg`&H_d|a2&2Ne;DPZ^qw
zMnF(GT8V&wqTByTAE`rs1vc$(LSu2jrb^!}j9>6-cT%APzLIiKSQDDaOlm>Xh=^o)
z7utr3fXxB)1z<qXE3^OrNyBJPPGl%&8hwQu0m3WjW+G6k;(BVU9sz}lqCo0{JaU=l
zbSfmgo6f`B@(XPOO!7lx-T+I?2$*@6P@~|w@L3WHH7}Naz+4O(=t6TdPf;-mzyX^g
zm=9o?QxcePJeVY-{<;tmjs;C3q@FIrvK&g;LziWCZo%-dR`<}{PT?hNND&nZ+{GaW
z(bX}0OkpL=J7C0LIwl?{jn~8&BGy1pbud4Xr99Hb{K0}*rgIW`KVeZQQ#J^FjUUW{
zht$mI;!Gh!%rcNB?Z%u#1Lmmw<;7D(6ly;&5<05Pd&Za~;K#lDFwq3SqCfcb?-;Ca
zFB=p-#nMM)lI$=)SkrB2WP}Iup-}B|kd&?Je_qgcz{K+*X7!xJL;&aS^~clz@GAhr
zWJylQR^EF8yMw|3+*eqP;b*R#!;Awj_lIJ9IS>tcQ5a4jXdZ)ki#P#NNWzREBe-M?
z0fVt9V3JZXCwLHWz8Hf+Bj92Q#vg}(FXfm+7>WfP%4<!VA>Yv`)OQ?s!XRv*+B+B`
z^mjj<o0(CG`GW?G%-nnN#qfF;|JQ#+7Nf*|I-WURjcLUqs-Zf}1eiYP4(1J@*f25w
z0Odd{CRqsKnR$iz#DmxzjuzF(6u`0zV?mZ=rB!5yC7!&p`4D~p^E}XUGp8IRDT5_J
zJ8bE^Oz%&a=d3uhbi2@d4Hmh@&x#4aQ*H}yK*ka#7kEkZ7iN@<IAxWHr2=;mII%on
zQwfu>4*{4WV`Bk0PQ@Ako^oz%DF9Y{SOyq+!H@L=6nz@D4ru-+jr|HX)T9PB0`Pcf
zVoLxZXk+hycxuzdN&%_2df1C#$l2gO<|#w$SyreutsQkYrJzu7f`UU$87j1;vq8#^
zSQ0be2y0J4j9=T2{emVVZV}EpzaR)d1T55boL!#f6_}UIR6T%I0CPGX#HIuA)dBkk
zO#Z|P+e-k_$tN=8=iz5P1YLV4BoF(Y3sOBoXJ<}%V1EMh#=Wqm0E8dKjsf6$44a2X
zZ20YmokP@>e>#l?YUcv6cK}QNS!@dchlBo;{uhib1eBr>tSCEXZvk{a9J?Frntb1|
zs8$RLg=S-gn-K>N$JC9$&H$aF(O8NoGMh>fRtl`bx)eJAhNQ}|T>yNjz%BtWQjL8H
zKxHkK57^k*h^++S?bm|ULu1Sfm=&$qOblYcu6C?B{L8%Bj^)E5pr{ioi$g$9H`WtS
zl%HTP0Z`G0)dNEx`>~uj%3j#-+J32b5x+BuP#0Q30V?#R)0jJluzEn?(kS*K0Gngj
z1^{lq#ZCZl^&PeZ0QyI4IRJ0wu(kkf{fc#A@hoB0!F(M*u-SlecmpdAK<F>n0>sLg
zf3QMe$_}6V=|-?AG<K-VfS?2!vEg_jt_Te_W+N7N5J+*b;V=MDIB-J%d?4eP0OWDw
z-~$g<xXOo<0h)z{aB%j6DP%F+JmM?nrUb5sHCJx+;HWV?*I{-fGb=!Kqga0ED?@{m
zDIkk;08*#raX|olRKl@5`+F;{5K!{fakeZyINrYlo$ynCL15Y3d7RD%4ZKt)K&M0K
z9L#-MxLz<bO$QePK;aJD9>h9`%Z#86)m^5uQT}g+fQ?k&iBsW3tUY3hYrp`{oDn%8
z;sc+6uX$OqHQ<fogQyqjWTuZ5E`SYTeti(vO+`SyH|`dg$^01Z2LOh?xSbrx5aS$f
z6bV|U;}u*q0RdA{xOpJecO91vC_cHkUMiThjN3;$4_=xk0b1_bq5!4#;CPrJRk%Aq
z>DC(DIvG(RcMo?PP=-5j(L{ve(u2$9L%{ktt`Q8~ev3N;rjh!FOQ#@1&A)MNthMd^
z+W$@;KL5ISpaW^*|4q~K59bWb5g_2_cn|@!5WWg*xEg7^DMDD2##8VJASmF4z*CV@
z#tQ(7E*&ooBEVG>PXTI9?ZBT0l#hmZHlT0O2HymR${g@Ffs~aiz6|iJdf-J^n`5re
z6r%!1$!j)9>Jo<%R2WO=fTrW=0?gw+cx^Cg;R!q*thzi9j{%@66h8>Od?gYu1r!#=
z;$y&Eipls>Kq~7Ro*fUoe92j%a2tFkDsdvIo;3yYeJ0)lNUG-IaV)-1JD+u^;!!9m
z3KU2bR)DzT=={vfg?K|?d;3j12blcnZM+sTc{3AV3pCWX;o)N#c9Ta3{wkn+dw_QY
zz`O@v1kC#K9B&EC+CGTyK`70y@kas6u?hTs0GQMGXux9l0Us=m=xfFhB+v*L#S%6E
z7{n8-z*Le%f;`A^7Mz5)AYCew2?=y0{WTd7@F2C_+evr{hEjJC3<2}N9)ck<gzO9p
zgxA@OAWsLmRini&kRJ}ke>kKn-NEcVPmsre5n5)`Rz7%SnKc5XX48qxT^9)AU=oi@
zgb@IA8H6zmI4Ml7>b((#AE_)fbB&-6_2<ypm|k$D3rx5gP4ER^J&pheHEcuKRYEmO
zaA*68=L)c(8xUmXCKGf4>&P`i7yynLgzrGcDvRI=Kz$Cu8vwyP!ZH9Hg@mo3+R-hA
zZ$HQclybr^05~iE<M~@nm;{u`S^`{ez&vdYglPcsnh38E4?{KaJQ`5vEP)NGyGtM;
zPod*3ArWMaecc4AAVP5+CtL-=F+WWx1`jcLmcYuDW^;u5AY6zmgkTMXIZT%AFW?DN
zWGe+gPL(YiZ165UHrBR!W5kvUhEAHW{RK(qq!pVgpyVE4y9UBT^$;6;Z-NynIkO28
zK!kgAf8x%8H+VJ=B*jnEV1|3JwS%xTI?hG|z{#I&0mPJf5*vIJ!qS|nZ15cj2G7#i
zwy*&;tr_Qbxxr7`4G+>$W;&Yy(;$Z}0I=2GU~>Z7nzNS87~~$Chio*E^n9PQjRDh4
z2ibPZAvzP**+fCW-r8VW03h=x8y1M?l87O|G5q|*Kdk)3$9}Ua6yBhXoQU~*nBFvE
z0$B5sC~*oX9+V`m0`NqZ$ntNv0`Wd8gTyd}EMj2k^CSrEiC2Q?O>|*q+E!vVP_b2m
z*bXEYw1}?&rE3R~wa?5AiD$u3`z~S->#V7$gWhSu5x9@|Ke|Mi(I!MQ!1uzO7zcde
zxR+?o^8Dbt`_u4c9`%J62xKzpB2Y3D-XOmY5aHV}><X$AQJuBS9|uQo{)CU1H~-7a
zOm`uY09%naQ5EPO^dZ8v5-fP{1Th~xXP48&J}|%HS)v1)jFc2LJUeH{;3sthl8h2n
zge0|z{LH>{#4kYb?s?)dz%O-?7zN_AJdMZ(!k{jTC<?;rMFDXSA9(2b-nSpW6-J@L
zc7huN*K;`a+BFiFgb^D|`iZB3&gMa4yfi}D^@GR>9_ap6qA?gsUnhnFK>11hrvR2L
z!yfTpy+PB=T7&x$Eof+&Lmn=DI^mQ$A;&HRRIJOhUk8sQNrk;y29eaWVgCzs>DjU0
zWCf+Gr$!Q7;iJmI0inT^bY|BFt8;T>w+G?Ze4HIl53sb3A3IqQ0cIKO{y+^AVm|_A
zpxt0s5C-c_%eHOPfy2dugj~H85Z`e^)HZfJGp3o{954^GvWEcATXwQ<1zSJ#89Q9m
z!<r@f*@eLK+A+%RzzGz}+JB4a=YsEsD$s#`q6P#Th-Z$xW1r$e1eo91t@RN=q;q5d
z6$Kg`aDN1*WNC6V1G{Z>IC#Nvc61lV89;fnha(CkjU(qd8i7sxmpBMuNQ}Wz2q^a>
zIWR0QTd`S5L~x=|S4CNO<}^4O(6JmDAX#Olaj1eIcv8VpD~8M)+QY#*R&t)e$r7RH
z_jAA(02uhZ<lqKIh7NH!Ya)~pA}4$igF!us^CVCxPUEbKK`4FsoN)4lK}8YgAXw3*
z5>6*psZ_~14UBB9<?I7Iu??IqfHK?6*~SKfSZGW6emeYQIiOt(VMVB}gi`?eI}9Hd
z-#a*WfH~D3a5@8hiBCBd0fqUDvlvX}{DSkS2=ISS$I@RBSWVx5w}P<O@cyUFbE*IV
z{jZ#?qf>j4^9vdXlpjH-6mi4XLro~Wm{$%-@+2tb4IKC9mpQAr0na*o+b)4?0b44o
z90WZ7-oVj&9!t6nf<um-6s`uAuS3cPYuuwp(gPsefTWGwCCXcNk-+7(&6xBWT%t2f
zNFrQh<nF9MbzXZ2Z(%m5Yk{T+g>@5%5PgD9V*Wftf-f}iMR(GXREB}ONzmpBuLi_)
zCQ*?;;B!d}T2dzC{y#-6+;gJ3kl>RT2A|wWTr>o129shyUn)F=G|dj$TBn~WDf5Y<
zP}Dt8xHNSuls648sXl@vE{X^Y=99R%0AG6S+ZjdJsc>86KtGQnG9epNqLyTg1;gC2
zg&#$fQ798X*6_d#U65JVK-!{=s2QCk<(LCL!?}v+G5FG$g=I}Qtw5$QTjj`KfLY}V
zWFF8!Yf~n}K7|+Ot4`jJXlPX@8?z(e-wv`i=%{VqMb0E5lzt0xITr##oXDk!5L4Wp
zTm!(1qvVqS=$#~A1ueQKXUOms2<90MCcl+NKvOn(J5czofJ_9FZxoZ&08lI=y8@}W
z+hkuVu>W7dyIoW`3?@jd?vjl=nU|^CPSya^oO(ch%ZVtpdO=<RN_P#DF(iayGDA)$
zBVg<s`3waC`~Q$nB6dS<WQrw1V53lO0+t#PiURP*Yf%aj2j;zrQL(F6K%p!TAa@=)
zDAkU_4Y@4APS%&Av?(Csn-&xYJQ-<K)?uDb+<~9f3RFKLBM(iBP)N*FYsxdQC^tKb
z8;FXILzH{KkW1ba956P*mjd4yVO3)O6bS(Y7)DW^b0dJ9Ns$CYYT1-3eS|VGOo1yd
z7#O{#JP-s%o@hR3n+VSfw;T@4kX50&bvh23UW6N&0c&(Vrt=adlNBvT@8XnC!Cvg+
zK%zjKsr7>r2^`qENhwDIUBQW=6^CJ6$KVFhn4BE6bciAd-Cu_n{O}jW3z(wtkKzWN
zWgM1D1^&v$Q7?lBMk7(bgK!}WP<?>^gQTfSV5mru$`0(VR;IoIQn6d9EeHka^=d%V
z8dL&wfldWdadfIIV6M@iYVZK(dI!nRKZYYX0qQg$z|Pg63Ng2uP^W+@iW$|17ja6k
z6ZHwpJFe7R049%6GkK7qpfgmsRSJWob5wZ{EzJySJlJl#ZcvAS9>IJnoTOkL?n3Gp
zVFdhbr8)p9hjwZ<1-Pi|)nLc8A_{fioz<g-O(8N>o>BiOA_B^5)XeRG&nD6=&ks&4
z?s(STbYG)VnQW?DSAf1)Iu{yvF+r2-q#Po-?!?szC@n|0gfU>zA88ZxT6obDpx1*e
znh1pv)NxQVUY(aI=g9^4Y+%V5FD|$d34^0PT+sk59Ov2q;NwZIQy`=cMQ~l_1a>9w
za49i|qhOH}2^U2Owu=ZUajA1cM;JVKrc^SQ3kV8EI#&j0jtP`-`Ei0Ph{gTjiXXi2
zC6WF=OTsfdYPh&SKXl*$7u+U+i};|&T;r^c@5;di>of3)m?HLne3jV8l>&OzVxwI2
zZHRz12REA4H=W(Fw|@wBniK(&oKz8mjPj}6&=Q9_J2QjK{Sn*@E^~38V=>FL(}nC|
z=3_XdPL=~P#8l?vX7$F)1-So#Yu7CrcQk1CsmXA|H4{9azAX1RI|77MxzmBt8anqs
za9gR>;$8%lLLKgM8p307fLjbSsE<2vKM?|cc){@@zC{&<>hXs>BDhqcutIJs^I{<P
zQ&mL3w2&LF`(RL8!p*wyRF`r4fexl{BllHcL3tCmE~^2m6!X;n77q&LycOa~hWm%`
zLuO}+b#S*Ky;bJe0CyYE1r2eRokS=*jd%*V5HMrI^B8%?P=y`OJ`g~5Jn#z|I1I8J
zcsf8}I3DIH0+e4aJaAzF^KNnHu|inRx$|g(0IBrkf$LqEGUm+#H&b8`b&N+AB&f<D
z9{4T>QxZdXrT{o~@xK`;3?BH}3lD9N;Gu#fW**1mjm(Lhizdj(YCI1eY&`iJJaG39
zrflZ(<bmvvb&JOuq_?>io-#nW_K;^5oGKyDc;Gq(W;W^Pf$!5W*fPjd&B{&u+R|yf
zaK(t_U^V|!71a44UnzAeQ{fel7}z>yqdXHFK<XXOFIEa)xR~?LlZryA$wBA@9y(Mf
zt<J*?_{8IfoZ`&4YdmUTKI$e9+--y@`+o9BgZK~l$8!s89bp09e|V%25E12thhVT%
ziZ_q|8tR|+=RQ@Wp-`$i$c~^xr;T_ym>crEx->AntFHU&EjXRp!08m8oCyzigLb;s
z9^O1Vz*5PtRjmjI@!)?!%(c$L!Q{%~wE(q;a}F<@FW@Q1Z}2u_$>#7eBU38<&k#-u
zqmWHMk1FIg$U|nnDdgP`ybm90T2QBwI{W{>DhVp)?FTM0E$96KsuKN9UU5Ki>E`W2
z0Md=nfWlPOIfedjpAI?Nnwc(71>iX!KvFeA@(2%w+4z)~<+0^nUbq&7U6=8Ux0-d*
z6p~H)_2GWFg!q5&RbT;VQAM4DnKZy_3ZiTHE$<lceEke>5e8%?|MDO+8`xV+_#gvs
zzf{%vnYkZ$-9f1R`NUfVLap)}uNANtuE%yE^Xh-+4FJ(o^NSbm1HcqLG#^9;I<HM)
zTkgX*A5}Co6HJzaxZd#-AT=&NA!rMgZvf$4r}FUvLr6S)IslmR@wu?pVfj(4%LiU}
z8U`vl3b%|?4b<__fQGs%lat0502X~&i0?ZqvBtmnZuJ>9{{fs>k@jApjye(Q+@>zU
ze7=Qm1+1Y<k<Sfm3MqX)3072x#1p5z$ne1?30*4_QOVR&=Vo3t;5!9MlAo4**TKqC
z?f6E(bjJ_zEr7>o@6QK!*J1lZ1Nqv)Cepdcw}W*=(Q4#Ymf@WuDTufqE@~@;aLn8B
zd?etUwq(9Jc|@|TnU8~I#QrI#?7MIf_OY`{ak`B<8#DzELvMD%_7Lv!Jpi8RZRINk
zlLmC~N$?>$uD#?V2q7T*3tt86G0HREg+APlLP?)vy)_GXBuIq{5AhM05#RVmw<FBX
za{O@92?iXB{7wM)DDxllKq&o*{3Ni_$s~ROFxP4-|8Bseo6a8rR?wcsFA7fX@kahu
za85)0{H)Wxc98!eYvWsHhZ`f&q{ar#bl?=AX+t<&>^D*uWWE~VcLJK##`xhT7(8k2
zBtLvFfI-j{|1mJv+Zq0JClEmnQiVnP;26-s{O@v@Rr&%xEZ1Fe5Fc}ahxh&8;k||e
z!K`7^^rM~6;q-o84QYBRKt?=#c!<jwKEA0&0;3=nKHCaVzysWH7SLh2knsGY>;`<m
zhy<~YLD+>PD3vP6!3=a0pr|31h9?Ppkw$=joxoPGFY=lNRDpY*w+SqRsOjt$XaNP)
z#X$l1MI+1{_e$Us;0b&qP|qqdxZg*Qw!jO(W?tjp3K{9B<CyLf0u#U;hHnMzK@QCP
zArJ>NNumXH!Txoo3Vvj55~rqdF%LKgj%cu=O-)6R%8ca|3<PodQ(4fS^+2YN%1EK$
ziN@irh&+%bOLb*tJzbCkOx3O~xFm*{SZgf^H%?)|JSb=l5)|>U;6VV~Tm=^Z*ykxY
z1Ekcv1rxx++I$3MKtN7k5KIP(4~P`>0nD#s1s(aoqs-``NWO#jMKD|dBm1HzkdK`i
za6@nd@c9-Ax&oz7iv^#u?j7sqbBV9u?4f~%u1&)Yo`Fez9Q3?Fa22RqI{P7VD|~?!
zR{Ec9hG+i0BWMN=H?v2AH;*Cf_@+X001GnHpml?p$lGZJ0MzKwlEIMSE}9>>%~qSz
zUI7rkk46DE>}yuEkKhU&dVnSeuC+yWG{t?$jrUmrO#(1~Ev4D9x^SBDj3ya)i8<^@
zBTND6bX4EM%&nloy;xYF_cqNKD5ciYjsji5^)y2On(zEK^sA930(fZ6G#mipOqw9z
z+1^4k1%S~;V+TVC_h{<^h~~&wv^ZcTd6WhhwlIZjoR$ZeYbR;&Co?dm@EvWM)vkMZ
zCI|lv&NtiGpn`Rx0u<&c$O#p?stZ6@+|}8bZ|7+66&jXkUZAN0tsfU@uvcM<8d_+l
z76Jmag(6r>u8*8j6@!%(;6Mgts^|&9c^qc(F%aSgecez?Apy{Gxpqtl{u%=wDm*S^
z02EK16oTKd!jx8jp*11UbHE1Obh-g2j!w{g1c`%#xfCbV#p?2Sm}%Y*g<FlHe606r
za9-hn;9)W(=>u<T?j)f|(3#525W2&QXx>{P^c2*V0yRRap!zed6{3R*IHXlbk@W_-
zYGo$y1FV&YhP?DpgbI$U3o}>Rgubz=MEB1-i!I=O!5@?VO+rw|J0T9H>?5JW;B_lw
zMhFkI$Gj8z%K{&S&VpL@*GHk_QsAAy%<~P`7C4}Jp{_eLxJUa*hzF`B3ilxeWhlGw
zG1jYw25HMHyI>DIXJ?&cODEOknFb``y`U6LpbD3WAOdR2!p%Vcr>(*eSYeokF#NRw
zJoIIc@H1dTi>dI47(%(`EewYh3~G)F9|3x(CxmqXu<#Q$V@;gMk#A=M_wZ~a{&$(o
zUVmX<q~a~tW(b2>bRvaUWRaps<(9A<8gy~ex7T3b!!d9g;#R;bBIh)rJh?&`)LN<4
z!rR#p_NRA*7o-rt92UL_sw%hF!f>YursR$ZkLMsDBuHe0hya@_B8~(ER7QzRf~qe*
zLF5<?)NBT*brIy2Tti@Wr3%l&x2MivbpfVHiU@p5Mx@e2;1mjjxa%UHSzl?GTdp_%
zf!_{zQ2!^XQ=z&b5fZe}!AWFxKq3TS=Hq-3_>BN88e1d+Zv%@0=t!x^UxaYvrid(1
z8eJxG3Q2p&w-;KF&1(_3rl}AC3EH4SBnE&-O(F)Y3@;^dJFp2(ysppyOoM7J!duMl
zuE>2fxMaTO$a4DMQKn0)$Ya*gRWBKRkpuQ=9u698647V+-4hW3xi-E-L<4~KP7&CB
zaEkl+K;#pv2=cLwHW`Ei>>?TpbLWA-@wuXI0NM77j3aDn10qHs!v+qD+yZBo$ZHXA
z#s3y!hOqRaMd25kNY=!Q4uZ3}i(T|GI3A67MPC34m!POA$eNC#qD%m|rA5z!q@SQ9
z>I+uCrY(9MQOrzq7u^l!9Pkj00ZjtOAW^vQ3J-+_i^4ChU@#RTstH;G{86H;nqzCM
z=ns34<hA;qy5eCkT)-nofFbkLTTxb}5j`zB0?cv!AZiJ$sF)KS11Ea)Z_!}Tt@)!P
zc9i88yW6if3}7{huo`>h<AWHu7%tu;<_nS!#Y`*{giV>Hm@(_)p8aA^B#~#{bXts)
zb=S!MsP?NHcI{R)E9z{b)X9)RB3#w*2aCNxcxQvfbU}PbhKL1lgHXjCB{^upL6=H}
z(ERYB3+5e&7h}b?QmWViVdNW&%avj;l@M@XSS*TwfYEWWU`GU4Yl@%4A>fgYINZdu
zDuCdx-83>W5_pK+K%9hp$0ukYu5t(gCTZe7!3TZ2GQ^(&K+O_=iKSS<cL+skSKR^`
zxG1%PuHhtAnPNA@+hh=-vHRi+x(Il(DV`66j{g>ij}Dl^_D}o~058xIDF7V7Nf_!N
zLk0R0Zvlm|Q(_bV$K4X}zJZ5?OeElP6$X=L5;?&L2<?#QA|OEjk;Ejj2Bt`_gdw0f
z4@fWo^TbPu06a3Z|FwiApyZ56m;f*{A;G|dMOc6NVEzq$j2vvpB6OMM?<D>KmRqwD
zEd;=F>)ye(1(-$PKbBhy5`O?o`J%)um@;`y;x!vG)A7F&@bLzNEVLy2&Ikt4I7#^9
zE*Pv5B_oIk2<4W1O$3U=w;$%%fFGp|oV?KrijYk&{0JBY@R?I6EGYsMwo6Hxu!^lf
zmv<e_aNTLR4SA2O00lgfAV7-+>U>OFImu2|Pi?`&uW<mj)Qt7^>i=b-FkN&d-+_%`
zq%Ro*;_}H($!{R#-u0H;#DJ7rbJj>p7nbHh+MP=OS>r27g2=_{Y|Y0djah7yikF>t
z!fcDswGTpyzz!zESJDN8gw&*;q=7mDMDryzF%;x_Tk9pV7!D_^R1C6F;CE^_;RWUt
zN|u6efsBeJmvDfOo|-(b1nUjJvAz<p$(Q6~UMQD@6B4YCSs@8R3B)Qyr%U0X<Z4L}
ztT(D9<AJZ`YbB>d5f>AmNhX3PpE)Qw!wH-|DH$sSoGxr7YGw_;EL?_P=|+hvKm*m1
z1g8GF<Z0mV+kYkDYz3<r#7Oa}AmEd#6hHXL^{<)~6+Bz&HmM2#TD7Hq0V$@Tlnf8T
zJYgfnit1B#QewcS#6wcb0JJzr#bJO2oC{Y^>cMyES}E{WNpib1FO%UUWkUh;9)~Z1
z2pI8|G6VBU_(^SeArzqjDY)kY1LIdxaNP)llfzOJ04|P76|*B0i5V&Q?g)do^HRC2
zp|4V3fgayQsY@UcfBr5-R0pZh@<2ta3hZ(N_zQ&p*B8*&2DlfnV~aFgMZ%f%g1mGf
zNQz&Tq|-pw4%d`E2Zq+QrQvoGTo1j`l_pCd;IpGNs~THBEbR}fv16{%iy(nH9+Cb|
zMN*p8Y3XS!6$uQZ=6ULD58O|EhlbF4a2Eo36p+zfbt+?_o&A!?qg5S4<=c&;ua~*y
zX*>avvM;Q5Q{q}go%dhgNI0q|i%wLzeTw_=8Cl)<7DY4oA1C|uGkm)h6}cp3CvHwe
zpW(YO7@6BVU|X~M1n2#ApJ0cohs~u?%~StAE%x`6Ouot9KAO9Iu|4$r$85F5i*Z~U
z%v(-DrZ)*D3@4?nc2Y}~4}xBvA=xVw%WAzFl^Z^wqP5rdswH2=;qWYb3#SU6-Xmk0
zPvx85+r`QTRhC{it9?*jqVAZ~C2Zkz^?r|gfJ%e`<$KVHm&<7qk^WX3=DSGeEanHz
zGls4Xs+=e=eY{s{A0tBcw%rrH3W-SK<30SJLSKeS?@u3LRDIA_EHe*O46lt;(mgUJ
zX(4jxOlqS=MocL$|D5ccH{LccqN{@VUUT1tR@uCwRO8ZZ+|!2>LT)vR^WL~^{>gmm
zpp=f_+5A}g3x`t9QqDtj(sQ1_1LBn~?``EPP<>e5w>-x&>hM_N<3DY}RM&3@PrI52
z<<Dt;*KSsEztdu5O}EipuCjN;^0)5KtT7AO?#_R@d-@k`BC6|omV1@#WO1t3P3QW@
zI}dgX%xOQnN3QxKW6|m=g`V60yV;f7!Q%YPz}uvfGbyrPZ7hf}#GH$2&3uwy4_e%B
z+#C4q`Zv4jxho{`&SLTIX(^KU<7sY{&7Q1p2QK|&C#1}LdCzcs$-D7Gws}FZy7yJu
z54-3aat2qs&eDF9B0s5zpd$s<L)g#$b>a8F?v`2VAUh|xv9T9#`px0>^&?d;PnSCI
z6R%wDT3q_FcxYGp-)ZTE{!Oz>7s*BUR4q<VFXm=_-dg=&eB)=bY<pGO$<m$g`U>bj
z`#CmuU$71|lx|PyI>K05t)*QGJMu5)@~RX;V&+Rv!gr}T-orl+X8cvX9HUm?wM6y%
zBuHDg-nXi@@84-s$Mw?MgJ+;2(xaz)xYe%V&6V`L-^8m)6I5>%EyT>EZxL--ZBQ}x
zI*P~gW65`H4y!(ZJV}q;Z7|2>p~?@IEu_dZ(Gy!z9-UEII&ou=vBix0kht37&EAZa
zw`upN5jllvg0t~qek&ab_X=F_Ix5z?-G3Qp%wp+TDt&C0D|{LEl(hO*4sK*rsVk&^
zIAKKjFsBr1l`qw|O)E6BQTV4-{?@*;g<n^8RhAsgSMK}1H0%DEC$vLFtrLnilKEiL
za4C-CDK%sE5$$kEZ!F{K(XbsWGc-}OmyAS3ui4Y4tRQx|iu4Z`_#c-D9no+2e(Coq
z6zMwTSx5RFs_vMqbtD`mqJG>KCGcfKpmS>re`E%&(W1dRV|<ok@;iMZzDsFekmlpt
z_TB5VTD0mzAG|(z)xYRbd{;ZGddSdi%`46S5ar1(mAyTF1{*_H8M_LUVn6WGdv=&y
zGNX8H`Kca=`y!O_0ewgZ^-=gBKe2c74CzkK7TqF_;T1`O$idJOQuo~U6)rB-%{?YM
zMuzN>>B|olH_j;;=EYc-dnIpMniHYjh_5|1^Xg67CCc9`ys__G4jEb-O6+Y#_1)tt
zP<?Rs>hc^9sRKV`+QG-TxT;~|sCq>8se{7q$ls?(9g%|$mMe!U>qIM6&-FrHbwa%U
zyS!VSGHbi!7=q&=TM6b3AHJjtPslwTt=cW0c;iy!C7Fm{hR>{x95&@PeJ)KV)cJRn
zOH8K=ULe^EhqUsSKcuSPB}bm3tACL22+$*pO8uM)@5&?k>S5YB8G{X^*mZx>w=Q=!
z!n$W2Z=@@2BDU*K+Hcg0RyOqzb8f<Hta=D8Qo?IVfv~fyHpOE}r^7JZ+S>Dd{)6)J
zdb$2-Uan^2569F)D3Jwdu?)y-NuS`ha8t0(%dPvKTE$BLEW}TA>zWqK`Mr13A?^3c
zLwEQ6B?qrn<$R}XGMF1b^qy^AJp3118g4;Yy+XcvQS8pdt=`j5PCr;kpL+R$dDGwG
z3Y(%e(d%u-hn-3_M^_5y8{0fTUUVG#Mf|R&GtDsRlz6f-wX|+bO1=A3qHjgM;kRPh
zhTh2fw(7<2um6E9R3{iYOVh9Auzq^P{T)N8hO&8tHWATvpK*;)+etm5RO7#?9AX<+
zN~~N`@Ej;fz+&ZbFAGV2(eG@d%K6x_LRkEK@hux=lXQM1Ws?S56=kCp$^pxOc;W8F
zn;Y$<UC`cMN0SPh#}yCMGL}1q6)sv>-c-7m5Zzw6kkn=Pn*A#3Uj}<ts5If1XI(+{
zL8)mAl;ax-Va9DyRFeIgS!cSs4wt#|$wUqOE9*yv!bi%xy6wxbE=LLHYBcQZeV+FE
z9nO|fX7ea+A^M49^l10{d-OS%P83zEq+K^YIJ4K$J6f%1n^c$^MIrXVyK0q~8hc;*
zs>kc@hev0Lmvn9IlOyJ;haL<a%AAIF9Ik-)sHuTB(VPqyCB;5T{61~-kB_ou6TBpj
zMptSoS#3o9usgBK{q{zqt?k&s9>amX3DzfiaALGccz+cd_73KFH8(f~JqtHFTvGjL
znnp@~)ZH@^t7@g|wv3f8I_JgJDS1n=^`(qrd)iC36Q!<3b=Om?Z-iZLq7=o}TmH$?
zj<7y(NGJ@?FcGpDd4G}=sdL2&)l*J-z*fj^(?iZWUsCO7n;|v3$8Xkxc2>hMPg=3O
zGMO-|S-mk=c_wCsOnT8ht%AF(EoZ=X<bHft3+;xy;-{+Qj9z@h87cd3(uwzIk$aa`
zozu=#%<DMiho4Y=nAPVobFd~X!*)}<Z1>nLmw0OjMMkgBQBFhGB<oT4C0COc`%Ur3
zuCdmmUIEySx3?6h9Q+?h-8*dGT$v1IIP=Z2!A-E=T#@7S*D+lwOJBA$oYBj?!sZ?G
z2rW4gkG5(5a=p!a*8g|AnSJoB-uB-83yH3dwZG_hCEDiEe*YrVR#NA6c<Zn`+DIi5
z@KI#3S<jf)ftKZaOBz;q9|hK|&<H7edwCmHO6Tu7hH^|5WM&*&S}#wWc+z{PVMSD6
zdD}DgMk717Fn;Gy?gF>8>jhQGCv|+=t95E-Zmn_{*0=oNtbVDc{>_2*TR3vc{hb4M
zQR;@`{fE=*wBP8+(K<G_p7QPV5Z*{8A6tNa=OqQt(|ddMDzUFs4u?7%`g`j)dxt`b
zSI$naC2_){a`LC^{IuWr$ormQD)}qhyT4Pn%*qTedqpj&2Y;4Nc;C}o-mr51@Fq!O
zCzQc>(hDDs)`vHt(%;TO`fTm&xBu{rNX{xly_cl7FwD0;c26wLeBxU%A7a(9*S7Cq
zPp+@-1F@?@%5<81)%)f1YFV<rH{ac}o^+0Om$;OJ;<Lz$v;NgPf2F}GIwjp^A--b%
z?>xF;htOT+Rio*eA;pbTN`ztBzK8BR2;1mc@m(q^p4x=7bfe<37x;*p7m?ftsgFHB
zy^qCjG}<uE8WyTzZrD?=4I8VY&zx6!slH18EV~-u*TYQ{jh9G%P$*zt+KMwTb&9QB
zrG?OqE|jT0>hAL%R<7z>zKq{z+;qS;_u!`vNk*m7i^^2_YFlUe@kj1k);vXIZ7y>?
zIodF$S|t|d=UZM~lQvvZ|DbC5a#D3o#;}+7s^eh;#(w)Y@70jQt9`!AYJ#_xLe&oK
zGBf*&^$Ui6X6E+RokvPNd}(*LHc5<#X-QWc7(U$d+Aau{KeW0L^(;@gXEdt%UD{3m
z&a5P2aC$Xm#yu}?Q2y!s(~UC;)%gilhUCasM^{OQ|HP<d^v!3}0yC@glQ#RiRHnL<
z^#t|4=`$?w!5bmh>r))mjOc>zUYXRDRR})JDI2kv-%@!8vI<yr)~SIoN2=TiDz`a4
zBvv}0_EueSw!L3c=}_tLbl#`%-n_u!c40>CwMn+=#q&p3oqqqxuXc;QKic<gv*7~P
z@U24CRL@kd_o~nDNsd>J?f6Iu_W)(W&g;YD-a)yH>c8f;rv-`J#8p%23)QL%DLtz?
z_eM-)3}$R3XOe#G!523^F2=4F<>%imeJhpvuDQ$nq-OqS+UKOr$kx)gim6I*-{;u(
z-Rj{n_W3Kv@XHfFIr@uDHmJ==Zsp+DpJjV|6LhT4Kt`5Q7P;bak0Z!Mb;+}P=O<0G
z)&Jm5%QEtpVjremNHMbH8nclNV;6bw*X`CMMf|GzS9ON0_?mp-m359i+dOlNMI=4T
zjS>>$wA%|zzFL|NoBaA^%x=-1BG~uEgYV)_>*j8W?PoZ=^@o&eP7lnKTcoVc`?TY2
z^GD3ZohP{2Z%Z`Fd%a1l;hZzoh<>#4DeX|b&4Vd1#z_6dk9{3cJJpYSD}4{ruB|+o
zOehM*9*}7$t+A$7e<yzqPu=;f<Z<1tLqVqok4LO8V+U5<l-D&Fva}JeRKcnFVyrQ_
z{`k&*XWtZG;@pg6cc^syYa1`kY3rzB?);i3!sx$-%~}Ep^1Hd8h**5S7ImPlzQd?M
zT(tXz`DaEwv9_qxkce^&de)!zldJLcA<bt0*+RoxOrvA<4`f$8!Vh+4dH?!BOw>18
z-t(}do9n@bdgG*kN20l_<GLAvt=b+MZqnSYdEv`go0C)94yP|C#|^mNghVhR8F1TU
zF7N%`?%mhk<}_aKIP`X{_2_`e+7mhJaa(IAmy=ufGN5Po9*nz84S&;ZHIQj&x_wh?
z+tFM$qhzZjzwavRL+G$}+Y;x@jj{0^^J509uYatKtx=9R>~(H0e?ESX?=iI9m(I=6
ze<EroTu!mW<}}VmiE!67eQmSu@$u^O`->$ATH;?Vp2eSzdlueO+5d)?g`Mm@P=EQj
zQLQdUlK&zjSMQ`qyJORfkI8c3#6FLM9vdDSCOmn6mn8WPa14JR(heHl`sKLW;OzIB
z@Jx0$d0$Je*v!z&uB&ggKeP3pIeeM#IPV%!yP30fuRX(aG4^q0>)7L($75UaO%Got
z4M=a|V+Kb3uUruAnfQ&n{E{&F(XkE3ULf@4L=E$NTR-EK)42Wk+n0nOr$eK|_Zq8S
zz54jQS<~2r9p6j1RyAMe+fh?C_Ho#i{MIz3Ki@p!8*_`V-*VGg$EH;)SMt_VR!vK8
ze)lfsjE~<FFEBbNQ`}yW@u>$I(XOqX94Cosy^TBJe_~CPd@YrFjWcsjzHrrXFw=*Z
zrpediVqXx&cuZ)+Yn;B@MH1S^Z5s5gShwq&?hX3T`G;AS;Q^X8qsGA=<R5|q?dA`1
zw%^n~hjt-WN0Q9SdXl1y9aDP<X+?usM!i3xRx1n~8uy)IKZ!3f%;ib9`=qaY>ykzd
zLtR#E`KOI2yXru5n$11!*AfXsv7Q$sxs%Ad`t6Usj9{D?5c3pEHN6!eW7G1n>#x7#
zPcGt1ie%EveuhfaqG>5@dHrF^uR0sq>pHt7^M*@)?CV2SIawKs>D=b!u>28SI7)eO
zA1bt)Ks$EtZpUQjczwlbY%AcfoVU9nCli65OV+G6oY3$)M!K4p{wgeS#M&o%wEAhA
z@vp;T(83i4zsKbjs$4Na8ILoH<yRCKF!+OwFFK@*f7gFsV&!p)di#Y3=^EFLIav3x
z5%;BqcZD2LO4KbWI%{fBYPfANEBv#OlIAh3suTL{WvZqrI1SaZb<7qcIqjgW>mOc+
z%W$))jB$VN3+*<Gcx0|{6`fV|wC>WIxa{rW)qDBuDj4}z=sYilMjlh*iEqDWdXCB#
zyNVhG*S?To|LjqCBJHPUCtK=Px!)&BlFy$B?o*$XaN$lsop5m<=(0ISX}F_xGA0_s
zm3pe%54D@5F1{#)iqZPu^1AN0-fusRZCG=3z;q|KCG!IB%a?T9_ha8es&=9yoo<W~
zKj(xTIrqMSVMD)V=6)sSo#S_>5M$Hrw;v_WQ|a_?I`6OS>uBm2KXy;z5IuXED*zR`
zC9Hz_3+qU28BfK@u9go-?z?fFoUBqUZ-vr%eEBbV-|Mg!ooUa?u47&{&WY>}{A}LQ
z$u3KOsn53I^E0QZFZQ;>b$Q&iEm6vTR!;KR@y|nEHY1EWlNn-<=b&S{c*?Jffm~M)
zti(AtMK8zCiAYEOA%#D`du>GX;;=_%S;RJxMMuscJ1_g^9!j$l=I)$@dfA%zs9Fc=
z%AoVLWY0D&wZ}Oo^rFnZ+ae9q>YBzYY>}cj^G&Ytx}#pkreR!NJ^1Uf;T-(r4KJfk
zkG16!B`fC{Zn#-Bxz_9xk*1^OyC%7)1>1ZbYhza@Yl_5(o-a&OWu;zJdUBTtx?cI-
zuHwG951WyYl-%5!6<mHv;`AkJ!SnbAxx565wW*n-Pec6RUAmW7YvEMd@F<<b(f;kR
zGZRmqIJSp#*+NGz)?8|KqFKg<6=@!S_3)mY(TI&8j&Z~0RxH0uW_@9G*Q&-?N*u~n
z*egfM;4^1l+@<D@rxNBv^|eJh!40C};va9$KKY7KMPYZ+j6ww+%7XknUXgxG_f2r)
zc>}!K(=Xac;XUh(D7|QbV86&~Sf~nZ92gOZs-Bv!39RtM%WmJp+45#SHfeL+IQiXm
z1I}02M-2JgM;d{Z-8ANyd7WKK^o1~;Zw1;Nb8-ET$8VPe6IwdSl3%+%gfH($38Uv~
z>NG-Ru#xQINp>R((%Xuzf0m%PR`pAmX$htBhN7;Z-%Qu*dnlBnF6DMy;qun|++Vz>
zvbVB1EHt%vb$3yN;Baw8POX8~r#mNxxIEsW8Ql!oHtpaZ$-4)*46Cm^7_0xh`{Qr=
zY+vGJ;(I4O%xU`R<kQBbFU;d3Y&1nRw^`2j+r07$`xF`YlEHKBtI1hcdxdY<Km*-~
zUrBMjaXqRxR?j9)g$|4cj?A6CEgzSAD38D7j;V&*or`tHRR4ufIIVLvR&!b`OkCf-
zA@?{txQn6f<+Px`MBC@{Icjr{E<JMbiQ(vn0ELF+_s_C6Y<6~Rxfp$*6<2bO-)Q2F
zRYUS_oJQ`8W}mM-x!pq_ByP=kKjiPJ)jfOvVT766HjciAd;29KGI%N;Wi?^~aiODK
z+vRG{@5)q-X;+9TEj3iJb7%}^FCJ<&nB;zVy}ONVmSHfx%}a9Ev6nL^-kcks4{O>Y
zm8vKc@b>9#&OIrAZSL2PDAJET^G_qY*Ab83@~4kUavkwl_!f}onJUSC^-Fg|eIx(R
z0VTt<vv*#M@fo;1cD(9Qh#wHv9!Oevqf5gM{7M>-7dw@d8g!!L5&5dhmVv}Za>iPs
zR%xM$?By;c#{3{}c*h6S@;d*Bcj3aM@ay!KxmmpV)o+Y5Zhn+Cd2Iy$|1`@Z7_VW`
zq}5*!i+KNB;#V2jPTr8|^43chz7}>Y`C-n!X930;dR)9iC}^7YzSci6x_Wq|QqoNH
zxw#|NitEY3fs0{P&-HTE4U&_twFlD&1(Vb>mi?PN9M3T#XDPcvw6k|72(t-L+ITJQ
z`aaR9{(AOIUgt=4;a|R%1_fF|leC9MY5ymw%D3VfDW(s-JMB<IwB0FNLIN_0Zkszy
zBNaWp)h+!cQF60<#?p<_q@v*`&$}6%S>0~!16D7ljfkI3pG_oW3<*vTH*d>r>+SQ)
z%xE#SJrY&Su-o$EpTgDa(xVdS)ll~NbfuJkW?#~!AIVSzXA+JrbjpmB)oS9?B->8m
zu50LS&nVx<wZQ!(@!G0Y=ASU@p4)<Ek~$Am#ri!*%G^@eJf+gx>{{F>tM9xK_8c0#
za3W=H2jl61ZMwGKk7nI-y=1F^e$UG_`t!GT@|`A3tj!mO)!6mIHNBo;&5RVqdbGNB
z-m4(LH<C%M$${>K;-;~Xn@2BVc6=(E5W%{z&3xPTV^G0*1oQUS!!>EakGrDmIE<S3
zQv(n71*}B3XLvrBO0_%V^6u63GW_!zl5v`_an-9wjy3Ao3$=$)i?pPAnNwx{qeJRa
z93PKdXl>d{wquC&usy6hcX7?;Wbf9b>d8u<y-pIflh4Pt6+3cm%ezTU*gOLrlv298
zJ9zoemox8W)-F*$s1qs~3R}zIcX#K6P8^Pk;Z{FuA;v5AIl-i)dG~}tVjX9xNB_AP
zBb;Q{tak4Q^o^O)W=&zv)ff~{Ew*avuD57S>(k0H9_RT<hE}#aXT9Z<>ZX>o8A!lh
z_1w{wXs>>gxxLQG2HJ@nYV12wCfVAA56z7{988LNY3OstRCxa8YmKC<Dd$s$2gB|q
zR5gXW{V6|`-`qMK@Mnc_LUZkSU&8Ld=I8bz#Lt0Q*~2paPY%z^4eeCe;q!r@A>%)k
z^VG)TkuDT+CbE!$gCY+7U21LZu+gDC#4o=SbtvcdagCYrdR`|drEqmu)z5{@z@WhZ
zN9s~$Fh;|4LEw6{ib(cq_}_8jZ66a(@0Yil?#NmVxpoJZOP&nEYZ!cqRXHO?`A7a|
z?3&k<@cPe9l;S{n&zI^oPH$iPWEHO^l-0>I7TN87jj<1RF<yH0x!-gjxwEU9At)2$
zdU=Pxha!59%YGrPH9!C06}1}`MGJ3irSHC0rZ0B-$;(8F3TYPBe)LNnDk#a8tlHz+
zP-yor-CO4Nxfq?%l*-_Z#gWt#uYaS<icOtQiiI=>VJdnX_NMzQ^Tb?lx`wjr;p;i4
zAQzE6*dXj~+Q!THYZJxzbXAhLZ<)8)#%%A^&REgoVpRv)S6fJeS{-?QV<hwWzT-Go
zhpD{8_r^D5vMr{5?#D;=zVP>1J;0}a>Pb?J?39(NLUySaJ&HViyZ)%sogT+a`CHSD
zsi1KqMF*XGj%CT8D^_UCS3cktzUX+qZ#s9~DEar53)E7h8OFI+8cF@dUR%w*QhohW
zcAGr;T&(`H3@tXyYya<V=)bHB4pWc0Z0{6WJ@>AguJ<<ke(Y_o?wC=c?JkQcJ|gv<
z(^pTq4w=uocZYhaSMGk4Iy{>e_VokW?B5T{*1J1TeG>BJ;9YA7t4ORj7Mm~+zq6LL
zBj(qx+3apqU7DONi9xf>YC2fJ@Xu?)JNaihmp)b!!De#gos>zh-C>y|kmvCF<hJyt
z4`GkiUayzlC6(Y-bq)p{=Qr2Y>`qz`+8!;Sa>4q6;MY;!%ZbK@l3L&CeeJ%eYVz*r
zLyWqq%5+gwGilWvlMS`~EvWriJxXV!MZXGRs&xgubRi}Y9x@V+(G9l5aCyHfD66{9
zIiY8%r*0Q{@?;$UKwUX1*<*ZrtG`k!>Re6Gr|*6Fx`##`8qvkOpVoJMjg4~aS(l!?
ztFPYOm@P&7$n{7uM|R@lg0(@MEOBm4M_0Hui~s9~HIa)uoGU5HJ>>G;0Wy7E)xuuN
z=_TbKnd=2z`9cpEs{3_IwqOn)bQhF-LtS0lg0638Z~JI1;%>(t>KbyE&CB>yB)4YX
zUa^In7ppfpUT!<RdoktHo$y)b^4M!nEsg6#BbMx?#;4y@+Q<26+;~3n&vnmKNxBd9
zMGkkfVb&I|zTwB`ZpV55dHO2F>-`14NO9-1n2n>sr0p_$e+yMI0?Vqr2Lh`OEG`?f
zFKA_sH%5IN{_f(l^?+zOTx&~@oyG`vrG|*RXKnR5ELmn;*?N6JW^Ae)9k4Ev9i#P>
zzHjZe=<K~GKZlwna=sjnP`Rz<RTX~)<Mhjsv%lk^FqcrnOT&)@Zl1_7cP=x<7Re61
z9b)EEaxHzSLeAR%9x<X8Hf%)asruT|a(50qJ$A=pp6&Xv7MFO1Ul}$%Z%+ul*`O_@
zp;Os^5WjeNy*l~aytj2CC;hT)omDU4*^@rir0;*|F{-!T4!jY68TUKs>*wPy*v&k$
z{S>o<XjNv0p&#Np20!a<@xRevx{FkN`RS;}zfPl&Cu~HTPbrbhnZb1>)$HuQtD+<3
zt=oV3E+4t!OHki-(*Fec{K=!1`Ps~o9LWN^qL9l9F$wyrjc>NbZU#HVTXehMPKeoF
zm+l`rl9&A;*XZXTDgE%9!uSTKgKNKHTUT#hz*$GmDSF%9UAo_!R;!5PKjWqI_gACt
zX}&#Pt9vBMA1~~&Z{Im%#<)bBKkIqnv@Bo2oh$oYj_kZ;hWUAe&h<@K`SN4sd~W}$
zN2Iujeb~;kRliHQ8BZ<zk1s7phdxbZzxVj%1~#XWB)72EcD+PT!XQ;*z>W8p2e#SM
z-alAapupZw`i$!lO}>G%gwAxC?Y!jg*`Gdk3uH|0N<IBuyTckv{G{s1co*Z5IG?1(
zZt^?CuusTGm`zUhthH$Ng||(6H9`bO2_0P1T^QAA-D3JF<(F|grzW2ze!}EP-uv;d
zmh<1XJLgljO7i+eK937la2Gk-Q2TWoHmr5aMU3L{Z}Dxve`hI<cDwI5o1@KtFVfQz
zbIOtSeYq=GZ;3B%^7g(m?b~$5oZ93ea^=vkNY1nzYhmjHQ3Ay+&uvWucP~oZVxCIL
z__6uk>aUw2-^3L^CklyPto1TTDk|1N!`g>hqO_Hnd(62f<7K}Y^?vU43*E)tJ2t$v
z${*~=84{n(d`{*%Gkkw1-}gq%2Rx<DrsKAqnyYG76+%1b0|$=x)M>1@G%~DI?t9FC
z+F$n~MtY_w9eeYh9QpW`6vD}gx57k!eSyy9`a|Q?Ri%$tC{DuTj@nOl(ng_}lF7dT
z7ypHw@K0%`%f-eBBt-<cP~`d_ioBiW`+k3yZ|IqGZCW`~DVhsguh(Sjh26S~v+e$o
ztTS|FBPMqrZR+!)DZBMii6p@!Mmha$>8-hg?iapo-KOK0$n#{T?F~xsp}?-Ye$>F;
zBiPhh?!B)xL;jt7y(M?d%h)(yU!luJDfDBG%%L+qir#?%3sHk8y~P7ULt9&Ee%8+q
ze6ya;L3OJ&N`0V;2zN$MT(^j%>V5TSi}Z|Z8Vcu4cx?BAni=)(*;bdj5no3}#ci#s
zd7VSg=}!Hz+eGYn<yXFyY^3YY**zJlS9|}NzbS>C<gLGh7&RfB>FKSXrn=P7SjWY;
zceNtcS0nhA?194mOi}><KIugo@g3&b63Hnk_!~a&N-vG-Vx7C1^dvL-)$-jZPQM))
z>^miv_uaNS^gF0F{bE@2C982o8HU#CNgnxNNcF+Np*M!HGq_Szz{8CqZ?oX=m%`P2
zGIxF-p4H5}Z}ZA2xBjq8Ue|WrEs;$=D&oC=z7ouAI3DcG+5YJHi_Wi4+^@Hsn;u$=
zuH|(2$E$ooPPoLqa8-VLW!4wLOVig?T6_X~?UIuxUtS91_|T~G;{BQUH+gp~wHa)s
zTG3ze$6^n9c-|J9D@<Bv{Mq-@U*rmDr>jlRt0!6Re5c2BB=l9&ht0E1F4ZgrJ+L9m
zmq*trFH$z|%Ram`iQC>Y{NbeZ^P|}^DGh6cSK0pfCvPIL!R3!{#XR%Ww=+`vLroc7
zx-@1k&)d`eN92c`9{VZLH`h!%1myf*Fis2CC~V|gRfywE_2a$|dseMIMmNsgdE=IR
zxV+!&z^k%~`t=X<8B@2s50?b<j-S=_J(Za~MlSnBia+HOa(SS~US`Z))%4e9J$K}%
zj7>wfva{Px2QNudG4G!X+G!04CVk<4AE(7oU-kVKRzF_2(oV`Z<_uJu{JkMDs~ycS
z#ERTC&DiU7BPIDCW8bwOjL80sU)lF1U39e0E*?MRm)Eit?^otJf1<8zDJ$s<M2dOf
zcPlq*Do9J5Q#MIFa=Eno`Zt#oDK7<wPjCCE_FnDOjvXy%w+IvavC4$4r<fKG4?Sjj
z+?y_Wcc<3fUTU#frzE7ZTWHXO|Ez!afdIy7Qb76{c0-}RB<Y`~@7dFq%56)8f_HA1
zeN^iyKU5x)S3}h_<4xRVocsMpWY0sr)Mrm`sV#D3m{j+^7X7nDX7gzhN6EIdQGtN>
zGXWhxd-#q?ggV$`v`Y=5&fa_$6ZZHy9&<uGNKJZbP&iS<ZA<--j^3ZNF|?PJH}l9#
zNk*#7O7qx$<(8olL*8G{w8vHBUng--`&ey`Tpjy5j?>W99gV#&7<r;&m3M>Vu{gQc
zvspfLknnB%Lkhphs7S*`^yb*;<@UUz+1&k22K`>&9=&7#HZ|B3XmIDKs*k)!b>xmZ
zodBhbi7%WnOY!A1y|d?huirPxjq9o9(8HuMLizFYE`RD@dvkSg>ORXCldMikf79p{
zD{ph;;r>yLVY0jxhmGI&OH#I{#jhHAoRsMrI%(gaJJp>o?7^4_hA)*z*EGJb!JSv7
zQ~7G~<@=X;<Osh84%h8`&BIPDI(mV43}de+>?mJx-~7TGKks859P177o7^SRt>TGi
z-5E!H@cOwwI^82KKJwn*m6g3$of&tk$;T~*D@}f-{L9(*g!0OwZ_ggsY4U6OX`~0&
zYD;)1X71SZsvhcZm)PbH8AvHViyutWKgO`PR&t^%9xs%8cI7sC)|YGln}Gz2#d<f*
zvU8eKYj^%1098P$zuLQGD52NJV*a5t6D8Snuz;@ifnR^b?Vm^>+RrQ@sQJjP7A#Y`
zCbRKHW^M$J2H*(7crLOs^LL8hlEy(L=4V@!2`w2_%#h1wS-UQqN^j4Q&ny<eVvw1J
zjqf$=1MAW|;F&zC^S@+&mlfwKVyVismI$YE>F(P`yu~3?WM|GaxuIE^i9vSr5hXGh
zHW8>8uV{ZTR0KXWX3&f}aaB1r-V9q&r6)QVF-1}nbPF=t)*IXEu@KktTTzVksZBpY
z4;Tt%6=<eWE>zPfrX^xKMb?(FJ(%w{O?tm{+M34>_{qi_G+-~_@CHHJ+>ox}6i6bE
zeM)`~aF0~gIw;S%Ce`dycH|AOJ@Hzb6Bs2S6VHF1=H@&<m-*v;+})qb3Nwx)TEo}L
zj^D-cgly7Wi2J<CYARG>_Ghy5GE@=&k-l>W4gc0-jGc1RgBsv4KZMLpe0pFe7y_Vi
zHag1zZErUI!HWktt$Pq$hJRFfW56^5qPRoC-3lVqGjs0;^dvai=ZroYR(|x^52woJ
zxqE+OQ!MGEX^go?hTJD}emK^ONjaQdoV*c$i__vDJDlzAF&eH0yKNF>usbcg8DSQq
z84>)5w;Ov6`ztoGs^IJC9wnx4Ft0y=p{xz|Gc*}vohG$Z<Z<gDc)9)TuH`AQ$aDo@
z`c(?qoOU!JKW}-~<Ze8QZ9YvHFImp-#o&J!W_cE(hCeoTWuZWt_P{A&3mo#914-D0
z*ea#KGLLh{xwAWL4d-Cf<@Extfk<VK$5@w5n8&UsWom3vDOin3V7>8WA?AI~&0e9h
zRoRK12?_~ay06^~@LBTg#k>^r3bynZD<fa<sZoD}{-#48iGwnI;*_Rn=1_HEjAnnF
zdxamvt~ask^5g+DqhtuauO5jH#z4mEi1fe&j00jb&7MDC@WUlQHlmSGfRQtpVGy;v
zP=`6D<JGtiXow+-73(RH0y(5maOiCf8gCrzYmLT`BKetee)2&F9mLp*yzzQu)g-W6
zj!g$)Fc$+9^bZS!jhoL@uBGQpPpN+$=xl^S#mmIYCH0q7{gv}$s{UI24OL%t{*$V|
zRewj---{X*iKt*u0TkJeW07@w5HXE9KXd*}Aain^LdMLY&c8W7l+-^^^)>Z%>io$0
zG4xy#KD*A2IzMrKO4T>iH>vuT`ZiVHQQsBF^pUmd_B*Vo`bYI$s{To=pkjZiSVqP1
zVuhssnX2z$>)u!YBB_6+>IVq=ZwUIR0yghcuArjg1T1TeSVG19;Ys~aJWwEYd6O6O
zmYK;I7#D#m)-x67s~=G@ib0PG!}f{#Da45jsrq;IGfDlNs{ar_gaqPxs(zvVQy>Qn
zKY=Y*VpRQ?`fo}7lB!>6MACl*sySS9sOAK)nh1e-7?yV!4%CW*8f2Q3Pc|Qnh83l}
zLqjwd)!dpyHCbFJX$sX;(L*&&qf{%xDiv#EB&~#MrCOP!l~Zl3RzbCK+IUIZi)xkH
z-c;L1n?SXR+IXt%3xliehxw~8m<0L7MzM)%`y-?STyq361?f@M)Tw_b9dydnsa1Xc
zcvU1?#qXhkHLuEaM2O{1rrLoBW(ox2a&ZL}pLM<@kb^oRsG#kQpbuv&Llrvfhqv{E
zdK>`(gJPCKwW(S)WX2wS9)lM#sAmBJ^cB>>cDKPPK7`GyWHaKZHcgvO#cyge;K}(C
z6_3TPnJF$Tv<h}l!6|=kgUu>r#8GXQHk)d5w1ePDgfW@xx{o^lfoQf@l8vf0Z;xbJ
zG3X`DC6I;!Y$~%{r32JWn@6>SwfR&GU=RdSs4alO&=z8_2!lf~Sb+6A6q0C*Fv&tB
zneXB2Vn7A02A>W?1gjD!N!sDL(vuM`d%?+Y1WaTMF2rCR1loU*7#xK`Eynd|OQ=?-
z)eGc^Lird|jyP<0Hi4+-(Hf|>6sV523}>#FYRfg~m_{*9wI&RjwHE5$3G>o@FHX)@
z*L^VkMlfUZC9g4|+DfgBYCb4J91>5YTDuq$$jp2;esG{WsMe{iqT(askEwRFdm(iz
z;#Ml2<a~{aKM;R!rQ#1^P{r?yH&Jc1cpcT&0R0fZhfiz8t$37<aWIm04AqX+j-y%^
z<kpVIz>fr_TMOWldKJ}znohMIab7`an(g)%s`YAphzlXAoq%+!uFfB+ibldiRlr+S
zCHnL#(``dlz{pn>?Wsarjd)F!Mc_h6-x5`R_5l$rgt&hNK-b~YHD8+!a~~jMni1ie
z@VfPYe=x3Bg&>-rw!$L(VY~%pC`m`D7RHsNAA<-6QEWp?VI?st4Xq!Hm`=W`_$hL#
z4Iu3G7{oA$YYD0i0$ZbP&^A)>V4T65v?1z#LOey%0F6%4PL{M&fZ@?j1);~}tZX;B
zQ0+7v+0%a!MzMB=q<w>GXKH6r?QE?K*Pe3#Q?zeV?OgE=fwUX#vDr0M#fSR4qv24X
z3h#3<8&ku&zbY8j`Ecl)py5@pLh!Lk$s>^Q=>jF=wb><|3@Fvk)6N&jgbeMk?eG)T
zF3>K-DR2>RTAsGHuBO_?hK}aCc5h3wq+Lw4OPqhN;daA@$YMMNFbh{N>JnTIs(nkl
z6rBujh^z}G78}Q(s5n_Xkczi!m!XeX$YfmGLdAcJUsCOI#C!%!kA`Ql`(vnfh4yVU
z)`v**>IN#lBK|_sz5^?u^D$Tp#TTeluKq^Su7pw3U>a@Kw%}xaTp&m0KaEnZw4g4R
z%T0g9r^RQe_y$t*t8uw~0}<kC@gb^RBi=!^?`qdl?Rz-X*FjaZ>mg2j1BvXL7#yYn
zM@{YAx1`;G%jb=l>id}L`&7FL7BE=PZlv1H8qkGXw5^hME7fk(woz%3_9Lp@uH7MN
zcLMp-wj-l+m!#cIwR^N3RJ#|0ofzywAoqWXknn!0J)k{EwTHBap{CGF+9Mj!u1B?>
zQ1|ERN4Zk{tR|<dU)-PLV)hu4?Z>qzfSbwJ_Ka#zYEMz^Y4vSMdxmO1)t;r=bK1|4
z@PA0P=Mnk~*v&8EhnMi_=lJw8KD~nc*)Jf8`vZLaCBFU&7ytPq)?yf+T~zzE24jEs
zs`gt+`yJJO50Z>HMf(HQUc=VCF2XYZ2E=J^0w!p0VemF^axU2gBF=;2L%Fi*DSesY
zR~kTR?@;Ys2wbJEvVwqScsB=lz@KS<#NbazIVZ3rcBax~T|qvk+Ml)esP;ah`7{jP
z$Hpz$y~Z&Yk=kFV_E(Uev=6j*B<+81NO)k3Kf(ro1hWXH0X%(xL;f*vmf9y6ypO@h
zIJ}==@F~*ezhm$j<OPECIr4MB&0GzEs~?}HVXy#$_c8bf28ZC}%WW+k)#EbNzR&;-
z{-ymJi~f?j)<FQ}e~IP8(^n8sLIp}4)Jds`uP$V64uO_I93aj=U?#$ogiU{TVO|&J
z#Q;CZxMb8~&(}IXmZ(Chs(uFYi)$eTNDC!eL}{`588F02nHRO;J|wJ!j-jp^*I|^F
z&{FC;!ZnZ5G92>*?IX>WKbzQrK0~YUjzua>g8ovkqvaAEOKAliN9lOFmqaTCQj)%q
z0OzQ_DUi8&_badpbZ=lsAkcsArTb7i0ovwjbv02sk?u?BepuldupCaE3hNs4)mnwy
z)4;JnRU@;4=AG}BOhl`o(<n-4E+4KQ6Eip#!;wc-fEl?>N8q`_-XG?^tDjMPz(yFU
z>69KoCsS8DJ&?Ml0A5OEFmUc$=oIQc&~-DVQ(eakq_zOsn(FbBy3c<BoRKCXP1~;>
zSR6J^X45wMdE3~=)@*^SDoE-|bu~LV_0^EP%Cp2m!)Y~4TnMBx2wb|Whtg>{a&rwv
z#&A|@R(LToU&!92j73$9Y2s&%mdDguS8=6u%gE^yQQ-Kh*s*<lM)okN`=4Fa9y7Vi
zDzr`oZZpZajtJ3k2~dB9dkZ;0MV1?;^#<2QN~a@+&Y&{|vj2$76H`J-bQYzv=^UKU
z2T?kg&MSxnr~6Vxy$+DgyO9zd49l8$H==gj1%#syMWV^bm!zx-%xJiZ-)+iQlsK~d
zE(pYnAb?px=ev%lbO8nOw1^%;U1!6q>k5oJ6obV$!D}c`q{Dw*3k9;kl04AaXgV^$
zAooFB3_YCU2Hpnja;8|WOwDIbQ|3#q%@{iNC2ib#qX?Xj9yiG`MsGBHXdD4(-snYL
z=ef?Mt_J8XR|69ABQQ7;;^<M>D-$~+>mt#Okt8Lyug(IgFX#wpn!{5{Yqi-BFt!zm
z*b>)el-A*t-K&2&TE%>?%wn_<Xre{^>RoPu9FjqOEa?O9B(F-|Nr-uIhnEReIuz%j
zdr{f|oD*G&B^}(}XC=32Y*oL1hyjCM<+kGh209i#&t>hmtvxN>xDyZZ6kSGL-@(dF
z&gFC`&Ll5&ZFSv3T{pRImgsUySGcdIv{Bqn-NX&+brXMWrtYmsx;+J2Q>VIDlxPd3
zt*&P%T?v8fUe`|Qy32Jp3_eUk*HyGlqCQI7X$OcGw3E_R7#t1Np{w23OLPsTYw0o6
z`3L7~)cHCFZ#Z9*=&_U@N4sD_&*=ysOt_rdlI~5A(&N?N;31n(tjpX|kIzO!NL;f0
z)b*I_aY}!?X@EMPMy4f5b&0|P&<pYp?V}+|PoO$=KIi-yrR!*z(thlMCtXjOVxs9u
zMWPW(qrlA30lJ>Le&zZ#KE-x#43d6eaM<INCd3aVI!NgT3Y2&g9isF^3{IjaQ`h^h
zzfgJ#lB!cNI1LdXhfd4l-w6vlT_ED@ME?M#XV8CdP<keUJPSk?dNw@=md2c2P@x!(
z&ZemQ0Qya;1u2k<^H8`POV6kD0_b?xpK(%MNH3D;#gtw`zeVY#^fFvF;OTPuEs0)1
z>9^^3D7}(iMd@aI+JeE=^csnNm(pwL_b9y%C*^!o9;yOrAMW-83D^*dGUNEF+E(x4
zD(-(lpK*#+{A^_$ruOyp28rHC>Gxf4Q+g8yH$$LR;ZwisZ6F)@z%?d5>NWuORuG@*
zE!c5Cz+fG{6<sUBD8nlHLwXx}=I{6S>T@>D+SDC_ks6TbHcEe_T}0{a+Ha}rQ`g7T
z^$7&@4tghQUw)gxFgN*Ol(y5mD7~BBQ_z3<n(pz2(jBOlbV6QA?*%&Re!}%yPP*JV
z{$PJ7!h~c)X=yjU1CUMi3lP0_Qo4&m5u$Hd?OaOl$LC_EDzRBqvIu5&$;desZ^zDj
zz;z#`590iMh(1i|Bige9so9NVBb5Fa=Cu0&_hd>Rb^nmkpMU`Fp65Q8x(|0BLEV2d
z-N3^<hUD*Y`UG_++=J9z>s~_LSGupF?i<{II8V~2sQYsF71TW!7!miO?!}Zo?aZym
zMs^MWoq&TqI~2vq2vkg>&rtE-+NIRp<OVXo)_n|hcep#L+k?Z@fWcA>&TxN&y2sO>
z7DRxu9LE)idKmw!IxtS9a{4TFKkt8h43;!AdiF-s(o8*>|6xk^3z&$SF|*m35cLTD
z#}d5A5|}ZwBWS(m-D3xCsdzr3%5xM5`1AAy>OS3l3UzC43X)k)N*;b_4{`QI>h5v_
zQ9ZZ-Dns3VcQ<wSxO*vmiT+$5(rkWekkXft%)H`yTcW?9^q1~FN`K|<Gk1S}vK(#`
zh!D$%0%IOVfuRY%Mhg6E>fVf~d!oA=Xo<<XSRxpe7UB&14O0A9-9U_fiyinoc+x(j
zzo+yM?rl(ox$qAh{cG-R5`CR&gY*r7I1Ys7ys3?+^eqZ)dIvMVi@_f;_!9<y#^5~+
z-pAlCFxBW^Q7!NR{Tp@Piqn7ZL+4ABendY;;q((qKgH7jP9e$X^dFRdfpoqmWwR0S
zt_oeDaGp)CT93BuRsMK93IYR;3S-ADPVk?=-MjC^=KTwUe`6iK6k)0V%DscS@5dSZ
zC<YG#m+OAe{RnkG<$jvFf9eL5|GoPU)cv~q4O&Es1c8jJ=7NRA2r_>^e$#->uQqLc
z)4x%7o7)FtQRD!2c|=oXfmG*uE|V5H=|!|i#K47t8}O(|LW_lQjah2ASQW@@Q%@g?
z4}|?gi_?;ze9+BIlB>`nSfxdBkphDbIV-){+qM`IsoI6GN)>4WsRi-DkXb;&sDgQI
z<ChPNPgT1I%?%GD*4%$EVH*MQ*-+AoykVfQ*RAUjF7bhwWr(^6ZCMhUu}hOLFeWOc
zRjfcz{l=*WgcjUwXr@39v;scDZxtHT>u3PS#|Dd8o?|iDa2nCU0*SzmPXgn1bNK+X
zSaCizF`YGEI5aGxH^(AUy2V7Il<qMuwq|%VO3&n8(r{?jwcCHdxI}I!5wcWwS-vHt
z?Xel<%!c_&k)H1FjR5RWuxhF~FkO7znp)+L^$zw!;Z$;nm(!x6qGDFOZXd&dsnTG&
z32uIjb(?B%1XH;XT~h@FnAO5eM2p50l~DJa?zd=BDbV?%GCC&*JE}C>Y3lya{Sio8
zMdj4}sr&D=Xskl^1TCsie+Nr7w<O2D@>j)~kIZDJ7&_JJAw4mzDn2+c5RKsoQpqJr
zv}l~<rbXkicgAJt3Ro}FqP>bLskE0=371f+A{BpW?kR?9Vjf$No)a$@$e|r=jVW4*
zED($&bD2gs37}|iSg?!saqnPf{P^xMu-XYc|L2%Hj}}cRnuwP!MG~lIqDA{kQ15*q
zk2DFEIB60xU<Gi{mZd2z+7G0CX-ZKQbzP5YhzHR$r93I6u%(Sz%1Lu!@hzGJYrpz?
zZ5w|Te}`J<L&ORy9a^-1t~z*oEu^9YXwhU9gf#ac^PfeXKf(66xuTUi9|y7C`2<F}
z*dadZd=g(o%uJn6@n^ti>U@Ufi?I_D)cI3<Q={E+rtJq@bv}y<f+Ii>C^`^>DJT+b
zc0D7IGLr?aHi<fL03{|zTg^QYK$LVi{{w%#%)hti79>ry4MtMVc(xS;Vw5wcErkNj
zc1WE;EMU73Af_KVEU>@qXM76~rm<<M=M@VBf&i@Ddx0EYFc9w0pa9zeBfoV7zhDTa
zHFRMEl5)_zuu9lH2^4@^8P|#yR1fxITHh6<3(q{LE0CoHbx1Zy1z?yj>7TKnjY5B4
zs((kkLdUMC1)9xtwLpmNq*YFm)RIUv!j?x^+-C7DHRs%UY94ln>1KS;A(19_Bw*U`
z`gjnX0(#i8kAl^^VEg7=`+Yc5;#~WEBum*sVc0EMb4BPZh6$#rU!L7z)}$VNamM1h
zaUE^WLt*B(UHMmV6H<G#U@)m2n%jTW9{md1Le1~fZ-LEi9UJiq)ZMVJ<p-B$=b(dz
z47g@=0P86bB@|y3iUgw@@jeASMTQFMdeb_B`_&s;o%L{ViN1c&AC7yOFM>LDWY5i`
z0F?a{G~dhP7m=e+0(RHz@K$8QHWgS=^j|BGNRB6DMxbA#xn43odhv@!#esjpIMB{1
z*;<tu1*~i+?&%*uxA)F!cG!79*Vm<Yq?Ot^fc}78fw1n685-^6IW71M@-802PjDyr
zs8+Kd<}#h*qsyGkSf~rg&&}+tv>0JO3iF;A=?V1~d~<Q?$rC8~()3F__6Xbpj@_A1
zpibV&{4!jSfpPD6vIS={z?pxHa3-5@CL^55!S2b!nY}yKdeJRYEXW-rz^HnMxA1_x
z$PDrGy<&4qvj-hjMw4+<hIb`n%WE7PWak+y_X5*L%xX_tGrZw^T1tMrkHyrnrG4t?
zg<!&(k&g`};gznc>uRlSU)I&!(%#k3($QQG=w8cj+bC+WWJtWci!^@~Hs;xn4%P63
zok?ckyL$#thbgT<e6`)Aq1rug4Zrt~{hK_(EH3lZLXS$&(t0Kgm8B2}=FtjGYZ|?t
z=Ju|(+OFEVI*-rS)#h2*;cfHO<H=Iyk_BYdk#6Zo4tyRsI4Luwsi10%_TptbFuU+P
z^#NI6rlkaM^Kx6@cqM=Q5kE7IaOvDrPV=a(GwYp0UD$DKJQiyl#|E0P9H!22^^5W`
zGg$_HDKHLAFgcLsE!W9mLy#4rcqghK&2(mgV)b%dTT0pW56JK*0ZB#{cv{ucw!+)I
z6p}Bg^#LK;*Fb|#Pn*vRq^X|I%p@+1fv;_=?Nhbf$g-ri9@2kxdNCjKn~)2tjOeS;
zT0?V2C#9~Xsma^kjy08Au{JFoK0eD$V`w~EJrYDbe{XXwlkByQ!lv)Yhw7lHAM6>T
zGfFuH5+6Gt<Xo(S{KcrAhBwQ<M}gfl@_|1*<&G{NlI}0|P;ZS=Y=OOH2ZZDr(2i{&
z;~DjZg`C@FzCeE>>~fyGZ(Yk&n?RMuCh^+t)xsSe;Lb28TJkjkP!v314&f_*bO(+5
z)5hW!5w?)s32%AGkz)El*pL2Pi)(#8Pa7T!>T0O<HVR}>fudN>7etJ30+L<R%~YFu
zkh@@nHU;f>N1}rPft*t?UJYAv?nq>TKz5%w=$LGmB|LwT!T#)$1hge?IJzp&%z>f>
zH+pb48#t7Q1jrX(WE=QXx>u)MnrDZF?y(xYjj+f_zST{Q-sTl};~%0<mZ~r3t0y;u
z=bWyo=-}k0AxHNOX{SIl{lPgx=xYq*+&YwzTQ;J*2v_xTFHXI&z3kGfbnl_*Ju$lP
z(^U7N=p27ZPtn|!q2$Vx-srK`A7nGCG(Oair}N@Ib9)U3lARv~a*~fZnW+g!E=M&u
zUUn_nxGe6-rmbB9J<t%^q%-*>irZnu-j=S8<`vB?tD3u5#!B1OW$2SFVl%v0nd~0>
z-D#O6tzELl#?hc7r(v&MQv%^=-0(uNS9bW=ttx*fQaoJ=5~@`7SY5%MTkKObN57M!
zDC>|KH@DP#pkqBpw|eS;Y3Tx9te%ll5cW}HQtV^*t9$ry1eEiWk18`H8Q?^@(v+cW
zz<lks?a2M8Nf`<{CHZ1rh^ZkuSPOfJ-#jYc;17id(V5Ai)w$g*n~evS6V^S6Dw^Dz
zFNc3+!@OK4F{A0pvCZ@&ls`2{MYr-S(J&ce>`;KKdhHSv@JrJ6Xwi`;e1eZacx9L|
zp0>7@Ha_DlS=wJHUz`UQJU&^maI_be``$T?`UZ402?Q9`4V8_<q+l$br=hl^v0Wf1
z=PnN=Yunxzi*7^<)S6+-$PsgvjXtIs*@k}^&SDq=A19_<XX)nNJ_Rx>D;f@SS{fHz
zq@LXMpjgc*C1L|qw<v{@L7C09?cPogl1rG0ZAK*+IAg`0l2h4G==yxGr7`$}9F>?^
z%Tz;gVC|#fL8K6hag9CJdR0CXH}~BuD01S6LYb-hWaTzSk%m-&h?}kMV~{RF#aDkA
zhr|VPS-w5EXYMG<(#zIT$8Y7dJCZY`1;bsU;g6QR%+FH&;k|-eLhP7Cv>sTOVDd(3
zvALtMk^6kZqD<dY+-@MZLn64UZHTN2)OY*({4rcH61nT!4PmLUD}wgeDx4<ND(FGf
z@OxL>&DTOJqVQ7Egh5kaHXutyQ*(c?WZ_-rTOVGoCqTyJTdN}fk&_Ob7mQlTEP$X+
zXXWbyEgP6TMlai*BXfif*u;e7`T4?vT)C<J(sO}SnuEvow0t;MYuFW9g=G965ioP}
zw8koqn}8@C#n*)fY9j$X&LoJLqudIVCSVy3y_2L(<4!qEPm?IxF=vy8UtWKMHt~fz
zH(RgNj)vtOms;EroR`BGr{Z*t>C@h}v7N()Vj7U;`A-U~JS5!AwP8n_*Arpn8~P!i
zRo7Yo#1o>S$S8{Kq`%Qz+%<BzPBwvxkR7(&FIbf!TxGbdEMly1@-n(v!;cSF9$1Ne
zI_579#qDNq!<(68=1%VQ7}9@Xb>>Cdh8s)14cD2=EKgBz<hX5DoUk>433c68txB1j
zOLH55$JspA@(60Ev%~yV2`8V+Lh*ECL&JHsy+G_nn*$WAlI@lGX-%YjUpVq84dYG4
zxP0B0=1g25hv$jS>2B6X*ji0qDL*C@XD&{XF)amNXFJ@bHL!9SN49^N28o%tg@Vi(
zYegt-XhzZdiLFuw4%YiO)cFH_d~~@!lAjrd;p}Jz5e($C`kXi5QyA+Ee=;~>WBLYW
zo{R2*0n7L%PLtQ?^ENN-V%#-OO-lhD$K}yBMs;C-JPu1%cAX@f;TXXu=@?7LY_hhc
z8OZ?Y%^ONt-?7V>4CjBuqgsBLVjnIb+)m|?ocQ~!!h#etYgxpV;MR^thOV4PyP>Y^
z!VLv&Lxan7RFM?3RV>k08)t??0y!Y-BAHSfR0Ent7~Z3~FOoDNYuL^&Wc3$&*cEII
z)q4ouvfW~1k{)&NW)6-9cr|w<5oNb;<X@xAW_99OT*Rxf8ESuKX1y~8olc|-JZjYq
zuO|m)<jJx>*_jRYayGsVKKoYbe#6r(!*#L?XCdmCJWZ|bt5J>A45Yw|k2deQb<uEG
z5AY2!G0raJskCnnC%^N3Xmr}pfX5RvY2a>N+Xc`|4J9Vm4s#9W$lDjz+{;(uM2QFY
zw#OmOwAtwa_sD-awXWS2Mbm`zOrhPqP9I|Qt2D)mf>XYtln8-%3!WTlMu;_d!PKY(
zC7qv9y-iJ?dT(vJ$A_eb(H6eVk=%1JQ+wH5C|Om<@U`CC=BaCMX#=z?H=+znfv&oi
zR*0>D*p6mjM{8?K8|s=HTH2aw+tCg!ZtmH**@-J4@5g^sPb+Yjc67f)(8}BQ%#Lsl
zWfiz9oC*qR+`jw%<1=hSYZyPywhhc7Ui~$8dU?v=durP|+C1EntI^ZY-qqMrSKHXt
z)Pm+A{vf-H(A>CS9^-`>|Do#<awB5}=jH~0d0r@#|LsvDA7y6FqH2xhz+LZY^t8iR
zOdpwLw`G5-5rpS+zum(UWbzmVUL@}<CMo^r60+Taz`9WY*?VL6Q|4eUW~SrUE#oQF
zJT%KbyHBHGI7_XM9kyZB1q2%9(qxvbrk>qYW^9zeY{nap@YoL%qqvUPxX~`T^LA*V
zJ8zxFCSLN+i~UB>AMo|HyeEnxf@Oei+|uX|_8Wg(x5D>-Yr{5~VAN}myw;f%c8f0d
zf#>MD#*TV4RWSG()*C)nG~?8G$u6{K@Flgz76(~|UFQ#`3fW_UI<_qFwYPP!?b(jj
z`dXZ*<Lq0Rc0o|W>vcJ=5d!g}cQEXaB_+usw6|+*YiTuDuHm)tqiig$&BD><zSlTy
zq+)+<Sc=`6v$Jh}FWwlgIAo^s+}6E3qHp9E+1UF@Wg}yl^jwiUC9}_=yh!q}m^3^E
zAI|VIosKc_ziwG=^HLQ5`NhjEgNZ=29~RAvN0`NSe_y$;rb%L+o2qM1-G{wfgYxyI
z8sVy4gMM*(&5rlijHG=`Ps}wxP4?j=Ge&<?e%h8dB;h$|$gmMyiMYhLyvUp+r7(5U
z<4})iUdtLE(V*P6k;zSyIifZA1Ke79&WKI%nhTwop=Lz?K^e*Msv|}UOm}v(nVH4f
zCAk$^lde|fG<yHxx8IW@RM9|8$9-6H1GOSsCR}d$cCE1t&CT~l&k-m@ruI~^3<-Z=
zO)=`1mSkoQRN1`Qv6HQ!X4NI22KuI!o?#AYd4a=h^0YDPG^+G&w$bty#+7w@1NwKv
zT4zPuand<3n7|_@IqCB{lQ&iubfG2!m^BJ(WSfLcM0SE~obL(dbjA4GMR<FfanCKD
z?)v5);lJ}V!^o@^&XhPHS1iz|_n3dwS|E#a-3dvj^VnZy9AFz>GiyOC>rFaEsEr#2
zHN%fY=D?xljRKIH%q<bTVZBce#f(kFxP7ZfG06pLIC!@w9mQoD1?GZ!YceTC+@Ola
z{i4=Zm+@{l@x&vJZ2C^g&hn<;H!KKasvC3mS%&_~YQE;=BTgBcZ>^f_4a$EJpAb;$
z?U>A7h>@Yn>g=F#kju>tGIVifncf9<)1ECivo%D$rcl3OK8-kP-c2l4GXj#E=R8xM
zch=Seshu@)ho@$$;l-K|4jP5PrDbLZT0QmN_S}8^`Qz+V5!XEAUR$2gsI3Vl*V-DH
znbB`jsDjlAtBwy9iD(uYhqixIqi|i>H!^39%xRdJEEgBWT>ef<f5RJo4qt4JHMRKB
z2_RwCwKO+0dh6P|+C09N#!gQgJA}d2bH>r$<a8R1bMs}~PMa%MnDFJ+7GHZSJLIY~
zd7C|54a@>fYhUK^w)u=V8AV`&R`=S7dT$C*7puKE@s;=>nlLl^Ij(=&>&?2eFg6=)
z0D*lYKV0sP8U9SF3|<6?@;W3HSvZpAIq@Pn?lz7`hh$lc3D`GqaIYcjYi5zTC&0Nf
zp5Jn7)u7$7&R&qc{83v}W;>dJS`mKZEM8iS3$S%*_sn6)b+)AyH<kK>3rt;+Ie57o
z1{&FgE><_*=bxJnxx{}uYGSnj&%JOHq!Qd8tc?V1?u0xeYp*j^EKAbQIdI1T>|$QS
z%9i7}+}zT|_-nv^V9G5OKigTc4C&1|j&!cvHmQxPztO|#r~+9U#bWo#M*H#FU&A)%
zupAm0$4kdUiJ>{h%2^-k)#KckgWA}Tw0*W;8!{9J<PgXg1uB0tcI#~q+V-aLIr%9L
z4$VSSvg+Z6vCOt?@p2TD)-ZdE0fVll8)~In#c;7IpH(4^i|w?;n|9_?Vr5|)ULy)B
zV~iEVoD0Blv-KtUo`Wx(5tvMXSGTOC#pmg2#0^w{H^z8xYN_`&cyaDcOtvfC(J<!)
zP3fGGKn1nMkh_1=!<V_10mFd`i^qM{uJ*RtW*?SUKir0Inxv458WY=_TDyFn_O5o%
z(d|i2psBWPg{KYALE|BBU<`O2N|O-0&?QW>Qc<0KJw-}|$0xm!rcfXjMeQ`(-bF=0
zd8!#c+U8@9HcwqkTYVQc&fDD3g2oWoPH(fXy%rb!F}{D*&2{W^S3_g%Qmh_(F{?*g
z+dRvY$*at^q0ZaW*1kHueUKk{jgHo(Af$MhIZ15-ZC%*uZ&;vw%uqr$udzlV=^Y&t
zQxr9LTo5vrnFp`z1iCE!R3Ku2H|M?Y6dSHg4`asJ6GOj48Twex$5!NO%A8V2R!?T^
zT*6?)20VYZ2QHk>TN_pkoGfl|)Ydn3HMT5G8qOuRi&W0TEiqgRF}KHD{KBo5C^L*l
zq1<D4iXVhQ3)tkdX~Uc)%r*x!Lyf={3F81XcWzW04zKD1wh}lU<aqZ<e&~-5MiMPO
z_OGSZS6CbkLNhLnuviqw)e~l(h00UZB_<nicpiWHlB||*+{J`nAV+3fj)vE+X0gaD
z@ixP3N28Ih*4nn(CfpQ@4xn2~gC_|lZKSM)hBHBYV=Z;7Y-!HBiX)kynk<%CSx#<c
zLoljOGaEDyO^vt;TPLr}?Z(fYcuf(i&^6PjafLp_RX`1l-{#weDj>CCbIF`=7-VSp
z8{L0Rdxw!fXC2%MJrW;`>DE@M$Cw`|Ynw)@8k2_Fqns;PP=FeYDGTtXc(k50Oc{-h
zxDodw^WK@sdGA9r7E^Qsk~{56JE<}H2A@gs%o9{FDdD?eP?%=A2@^c1$6+9X)-BYg
z<0$HFu5E3FMXYuSI~Z^6{Ed1}KlQ)?ndE<rI*JJ)lZb*YeBnt!=e_Lr3FG%k<M%1!
z_i5wz8RPe-#_zN2SH*jKh~Ru4o*m8?NTu^d=S%SZb9^Vu;QeLiE9SfN7x4Z|$Y;L)
z3f_Nhd;bl*ziNB`ExiBE_WpZ#|AX^2c&@~2j@a)T#_yZ9a^8aXw{7q5!27#t-~WGT
zgL^c*|H<~g7T*7CdtU|b@7dlv;r)Hv`(NPwueSFO;Qw#V583la&X3veC(ci;e)>E7
ze`f2q&r9~gyU5{r3-s(4&VRy}f5BS=^q~O16Q(~w%C{58W>U11IH&I*;#Q*aC)aHZ
z!oMMOv$VH6zl4zTe9o`fC<!7F1p|L(Go*83is{>ldxj{^yq8FKS};^7kqD(k6UrEz
zDxOw!i1>?7qUd6<sq+)jjr9ZAiUIq6;sWS|)J?ya$kXp9%IbTGdJoayk-}rqJ*0U0
z-K2QN%!w7^E;7bNri=HG68KsQU(4<x<?yw<(zSz(U6riT{zQf<jfEBzlQ9@V1=(8|
zN2-PKWR|cOIYg)=ON6~yRgd78P{1M-e?{;l;uC9#i#4R!XvkTR22;&WZ^#U6f-|$y
zGgIrlFOi_m6O1}fBx8krNu^LlCJU3G-uv6ScD7aD*$ia__GEVL7_r2tQ5}52Z<Scu
z4pOn1NWxZ9#NWm}LdM^biU-1hHaw^_3K7IovCIIt1PZ_|Q4z$9)ar9Am_`&~e>#IQ
zj;FM$s*2?zmLiB_#R>!7BBO!|uhL!_;ARn7m~E?+VpVFKRjDqcQu`RK+`_B3gH+CV
z0tN!AxpxxmI2be{%q6NYkCY1YNrkWgkYkap#`{<`-p8u(c&o-{mzF{iC7WSF0BY_c
z`v@diL@|z$uo(KfhLi}0+iG8Gf7O03vC;roZ`2+kX)|__2@aCc3rE4!s<l<oKDG81
z_hD6>09AA_h$q53emw{w?jjQf(g<+(706~X4j%Rs$RnhxY3436Ng!LldY7l#-`;{U
z#Bre>vU<oAVJVp-EVHn0B5|`a9Z<Ik;zV&@*0O_mjl})nS%jE_phi{Ve<Y)gbBs=N
zVQ;15+zML<xvUP_-)c^>$9Iqeo`8OWpItC1GJ3oPdb|~Sye+fG&3cIk!2e|NK%-vs
z4bUnd#RCPBUbzk%EY+&q6mhCixpyEP(t{u)QLYEcl-17dWU6nqxSdq{c9CgL(mY`c
znYo=zpLI6@RGc~cR>I~we_=2Y-rnZ_b~5V@NHu#0nR7?;tQ}<T4l-{$IrwHGu`ds^
zv0qABp?8;&7WT{QI)x|zZVjN}F)+Nxl6t{UmI=M2Rp=utg%CMTIDvEvVb+%UFah=<
z3&d)129&;%l#4UPS*#vG3#)?SY;g{&Ur;;<D4ru_T<41OjMkrOf3$u!YrSZ-p0&Ga
zCN#Kt)^;-gCZfX60%!*;L89}vv~gPxlQ0I8FwW{XokL7gIPqXsmkJ<ASZ4?H)mU-9
zxR5wgYPHC!)nB1jKuJkB%a|;**A0S23q@hEt3upNs?0VVf~gOMbc>y2vAfcJH>p|d
zN@>PeOh2a5wVfPxe^W-A_{y^h#$t$62`9q*If+aYPA0R3Q(#<9B`bu}Sv!|O9qS?Y
zAz}?%gThve!$ynuAuEj*SCK~EVi@TL@i4XqO@r0waENoI^uiJ1k-QfipFkX9#mTdt
zB$H-rCx=7z0soF*Ou>;m$x(}4*n--fWC=vqDOX%gWPI4he-qJJ_`8GDZ^OJdlY?eH
zK`LfGbS){F>728Zcwi}khi!nR4U1gxtq8x#Go9mHt>at>W9b$mjU~%4`*JLLJ6Ulv
z>8})@#PS<c%7<i&T+=JX9i(ZIYb%+ySgMq4*gtMNX~y(&rOeZBCGJY;;c+gg#uhSu
zJ83CvtrT~Xf0dYzr@$&~CvCi3-_4{mYq_k*c6`5^bYuX7p*OmRfhc0BRDCOv+0!;m
z3UFbGsRR^|peI&gHhZhK!KiE{x0CJGOx;0d!I+#y%7n84<Ie%IdoGzFoJS54&L@k6
z3&>Hzg=DF45m_x<OpX=4MFPU5BrIG;)(cmVgz#;0f0FPWa++`@xk$K*TqbNLTZAp-
z2H_gARk)ViF8q*e7rsaC7H%Ss3OAEyV6A^ixP`nT{DAyQxQ)CfY$NXrKO&z9caYD7
zI|Y}pT~LL)gfii7VQ*oFu)lDxFiY4e94hP*YJ~@cqlJfr0pVd`lkj7Pu{V$sn0vB#
zlvoQie<T33bqTQTE?_^+xMz$fncPh#GrA&?_l-CSdZJaV!yH1HnL{|#cybH-lZ6c1
zUBZ9`53tvq74TFqdKgVUS!@uOvUTxfahd34G~{G9XT+4buv}bWP=pTRX0&q>o8xYS
zA{@;q!fM}Y7_c>*E~JzH$8C%5Bx{0B;uAEbf3QZe$(VQ&<Sl}{N=jjz{H$e#*@)0F
zOD3_&<eIb%Nz!5$qe*VWq4_tH`6f*|7C{^b*}8xx0hZrQj%OLSkm3sWW?-LS!uerd
zd<Qdj-%KtxGX^kY5Hjj!#vYtUPmrEUc_-;z%qm%_q>=8$YNd*`(YBMmEo7fcjZwdH
zfBao=6VdJ`A>d+9c-YFDQaxHpv3gt0T20z!b!s=+3p(a$U_5>Xbn$uMYF_}};w7>`
z_&KQ&UM6+IZvgXOC0)XA$vWY6!1_1I$--NJ>2H(G!aL+z;XQJb@IHA!_zU@o@K^G>
z@B#T;_#63B_)rjpj|EBilnvNfFaWE`e_mp<xDxR0CbC*=g8@^>17wNl0~}MyPe_f}
z4%Aa4p94SB0qH2Yj0}pM;%dmTnMA}jkOL{XVqu^nu4Qz268WP+m#2_7#bW@Yon!%d
znNesLsUbgO6xyAF9><#KL0&dir=#;nk3|bz6|T)>zm%0~oqeSW+k2aH1^<BFfBph`
z`=8L;|AOBB5_<b9ve+SzR)>RhLgP$1s1@pLu0}^&$bPid>P1$o=ZVJ|tv-OYHFXW@
z5|1~g!jAwJ*5Ts&N&jk)iXw}}37d&l2~CaOLk1=S=2nUz7_Db5DoO2(80(C<Z?zk{
zWHnIsgl{#h0D}gOGO|4b+6_M&e-^{%>6LDazd~`8b6D8dGj0Dh#{UuUe<{@FBeOPJ
z$-7(0TW0+>V*R!d_g3;E7O-gxM8of*EreEzAb_slN_J+OWYz>z%w(5hzM(B-0&gxx
zLLnz5i^YB@s}w7xCk$qSr&x_CPJ|Rjxvcz6n@KGzb{9FxL9is~1IC9`e;SY7H^HQY
zoF_BbW4Dsh?c@|#_V}VC+)*heiQEmO8XhMS)v+Hbc2tpZj{V8rjsr-QV+!eTOeM!S
zs!6~xom}OZO|EgwAzK~u$*qn<$&Vb1$qvWi<UYp{<Uz+#<T*zz`Gup7eBh`jpEx|^
z3&%3@Z%3oxax@8wqgfc^e`poT9V>->9Ua2{j!t2&<7i=lW3_O&<5;1|ah$N)(IrG3
z#|s-Be&Iw%Ksd$GE1c)(6E1M9W7ydPGxh_biGG}u!fGJE-GGTWJ1@3o=fx(^3Qqy#
zS=m#NN$#p}7T~T97}_BmD)!(iLyi&Vu^H=zHFk#B3wfm!EbbFSe+CwN0Ebn8<^{>)
z)EOnxgXA<E@Y5NVp24v68w^X&WLSC@!_u>Tt4kp29Kecif(!tR<LNudxsQ<Z7K`wF
z275lA@s;1$K`z)#_SsG@taROsOv?O9@g`EVom_;!F7dV*JITeI8@UAH@%LL0@4OA<
ziWcK-sdJ$Opw8Sue=c1lkCTD*xMDLY0rGp<I2oSY;zFrH+CnNJ%~_CUEV;ZNK7QNw
z3E*M#SQB@V?>Gpr8PxL1UF0fUJe&(bmafEN&fY;b!_PVJGvQvcWuaUlZy_^SR_88q
zwG-&)M24hTf&0ldtFbKSz2v*Q$h9s~AtSTwOfCqHD5-I*e<w>FG2(N?$)IBc+346r
zPH_y8iySACOB^SYs~xA1YaOQo0-gp)cRC>5H^?iFGs&+UXOrJK&LMwroKL=VTp$RJ
zi-bzYC4gw(5@tFs6&f5@Fa#O^LVqo(6;A+kKt|*caUBpaL?Ew)Kwb-hykeLkP>oP5
z_KOifprwL?e<6!VeB|$9R9p`TbP9P^jEQkTpfAY^F@Xpq2xOT!2zh03gCRC@7@Jar
z6^A$^o@gM~=?1sZh%$vsJi@uqEi9IRBFvsXLll8O{oZ0}I<DK--A%4Hes93v8!`C4
zcrUqWp}WGpg_L4v&xHRg5YBDL7Q8PkmW9QNuvneBf0Nw2SYbH;)pnAtn+XN9x@EDv
zm0UOjKf=SA{Gr0Nh4{^q7HekN+sO}r2`;;JC;8!GZ7Z3PjKA$BGBNqK?Itp2JNc1C
zaVlk@QWIH?ojb|xSkT^;ieMJtWM4%5qD-%pE0uf69a{`KxKOK9c9J`hQ@OKJ-AT5u
zs?cr&fBqsZvXVYLea6gtiLk{I#vH&rR|r7dglb_r{u%`DGBOz+uOco7$S;nof$)8o
z6gjRXrH=2BeH_=3!yGq|CdZAW#c?xfcWfoA9Ji1)jvtU?9X|v@cpF*g*hbdFvUZ~5
z4sxdBE^?mZZgR2X9w3lA$juI@x??AK)^Q);M&*O#PmagP`;Ny2r{iZrh2sTbZ^w(m
zevX%fYIvRl&-3B=aK|eQKTiZ)xeCO+lbo*srmiCIh$oAu0Di6k2IEwCQpmBFg3KZ$
ze~I`FWKKwtaHM#qcvc$GJ6k-*z{^2n>0ZfLz;d89V_-S7Sik$pUGRJNV$oQP?r{(<
z`Ro9i0i^6El-lks+c_gelEMVL3^K@g-1|6%0nXI5gWQkFfa{%}!u392u$647dypk?
z!y2{~R!~TO*v+I8gv7FkSV1-k@mT!&e=stw@cRfbt@!(6mip1MpQNXrgI^!JiR_2J
zz~YX_-^T%y@%IT+$QM}hCo82VSrt%7eQGCpda(@Cb!;W?ib|Q0%X`Q(6H+68ijmLq
z)t3{$4P+v8^lPx{zE1XYyh&y_-X@1S-XZmlcS)n;&t$dZJ<{WNACT^^B<}bCe~|5O
z<O;`!<VwfK<OY!Mw>dtAe*Zgp!SNY+)$uub)A0}Tj^hiV%<-i#-tm>Nx6>g^b~=S>
zrzjlibPI<&C861=SR8V_DSMIgNU``$;DKeb&640=wVnV8EQDJro@*f7O7T2nm0c;G
z&k$}uSW&CR3jmpB2vcB{jR3-}e<q(Bt85Q>PrOjP2#DllGE2M|o{~h8r@u6Xk93Ha
ziI;O^6i}}Y$Vi%mW?`|2WU84_G;#W@N}zyuEOgC6Y5-K^&aI>fPz#?b-49o|Zd?5S
zNc#@>EQ+W9*}L28PbyEsK|-&2o(GW<;Gs!J3B3kT6a_>SL{PCIii#Z&e_IemKoaGL
z5+bA+1#F<AqKF+(Y@mp}H~uqw`&^zx^!@$cS3l&LyW6|lot>He&g|@-QR|ZFUoy9Q
z#&)cfhh5MTAKVgJi(igsI*1@yS2zWKPl3MTw*#K(5Ll5oq+lP0@F)ex%`~vpbVyS(
zz*EDJt7bzpwLY}O-wtX$f9Qngx+2{Z&z+)X2O&6YOaQTmYIn+T+feN;p~VW0D0idY
zt5|Zdb`Mfo9oF0{Srf-|XcOR~^i$wTbC~!W*XqG5T{!(Qw0tXzs5@6er!2!KB9T}*
z?76-Rk5T{x2_uVV8F;~s5qn-+d3=wWZ<T-=wl)qcgS}Y#jY`-Tf7d+1E^n5>Tb1xO
zT3M>`IJ8!;OTP4lG~`Po(ACBeQky`A+7z-?gp_J?h^j4+7cG$wtzeki8b+#ZV2m1p
z@oE$%s4+N4Z3h>sCk1d%M{8Jw)=))3JxyDQlm;0vK)X+b9J1jQZ52`mG=QGk{V0AG
zoP$D40;|CUXrM*4e+NWR^P+&u7YU9sK@mrjgPNAMT6<7BXg}b66oQ<M!z5a~JfZaO
zl;$A{D?kVqDXuw(*b5JP;-z<oMt4Cy<W<Idcr=pm9x|zKHN1~za(~8wayW=%^TBfX
zU|2PLScn`wQ~@8Asu>^qHiebek*-e2#m<nT#vxPfjvPD%f2FDq`aS)io!TEIYXJ06
z2SPt}FmmuzI9nY8=c_{l>FR+Ni+G_zJLs&fQJ+JJ8V|0v7AfM!Y%y*CWWpqE9by<(
zOS&FH-0AaT9o|RoVCS&55@In53s%7=G?UOIB8GZ_7V06rv6vi<PopG0Nik8iCYYj*
zOqy})9CS-(f2|lxGeJF!-K+@e5p9F0XlLy|a>lK*wo!PR37g@UdKBLvrbD&Iuo0Wk
zy80ELgZI!~jq@TIpH;x&q0x-b%HhbcXvXLG6C<$tMI{`q;kpP#tCPW0Plr_XjHFO>
z<DjaIWnk8XY;7}Qe+5z@O?#YpT5A;D5`?11$SJ`Lf2_ur<#23hbm!j!#$t*`JqO=B
zEoq7`BY0~@@K#&fN<CTYUFB&1{CAxz-_=Zv*coUgze*agu>xO<3RJ>3bz40P!s=|a
zTyvA&-z<24Gl?;Bk@=N>dw-So1a<+v|99+I>e`D>_<mH6bgaX-SchS;T{sGqMu$;+
z=sO7^fBq#Xhh7rdsqe}E{ek}cSPnnQnC;JgNB&aNBoXycFU2M;M1y=aG*z!fW4stz
zt4r`<H$i*#W*DX362#z}q6<_l)#Boy(H93ZAQx*-3iW9V1+rXwG(%5m+mHpLpt<i&
z*04lM<91}t4((~#HD};^$mF|u5vJzkhOsrjf7S^#s&^#~4axI+a=b<A8GpP*>RCA-
z?P|}FcGT*S9oqA9XlUd^IGA4zzhNKz9yhQPth`7C{4tcgjdah5l29B$k=P0kQfTSq
zDD}`0KY|g;_|r4X0Z+T0!M4J>61oMO;F-A<@E4vSCnJlVg0g+2CVKIZXVkPVpWGX@
ze+VpfB@PPrp*g!B>Z=bxEA>H$sB563x)%DX>tKkw9tzcm;SBW=n5+IraAPvozazBL
zD9yyAmIQp6AMj<qwo9lYQ7=fo%on`U1of-{zC=AIfUgC!5T(=xzKZsu_L48gY&n*3
z@yccv=PZuSm_@elD&gIlQb>=JkTMWLe>y?9{u71kUzi*|{Q(^={2ANDpr0QRmDpPt
z+X*@JtB8Y2rmE$PWIN7FAj{VW$8&aq?K$O))7fywpK(qzBt{w2<2oK$F^_u|1-pLA
zGESrd!_cmSx(ORpilaywvK}=I`=y6kjw40|oQ96rNc9P1cQst3J_VPl+hC!(e;uw@
zpMe|IXW>?4_j2`lxLe%`E7cbQ59KlxxZNoD4vsIUieR7(r$I06Wib*X%YyFN9H`G`
z?G@iILF!ehW}8JvX-Ge&J%#5e|KmT}9_=;!T@Fp;^DKB+dmXP@e^ai#DCTbjHg-Hd
zot_%@T@hv|@Xu!UWpLD2lFVE<f2eX;npp?U?7qL5xi_`9{MV`HNr(Lz@w!^UAZC(8
zFpDID*?#0_XcSMAm&2T4(WD>{p0+4j!(+Qxe~Q<kUn8bbcaUe!Trro$Lh??cQ$%rc
zI;u-pI^8n07(SDYPDTIAsJT5&I5#Zaza0e;4>II|?O8iva-wV*%PeR0e@N)Iuy8rc
z@+|H*i5jC(V=7rT#q?{ML9}0Y&&A5bP!^3!R=<*Y!%AQj`Q$U=j(k4-NEh*L1w5w;
zy%M12i6@4Vo|uySL?`Kqt*EIxiXjKv)ldXONK3GNc$`D(Q_4!~v?jp`&+r>n&T_MO
zIcp@GNY=QLHHlTSrZt|}f87NB)z@*1*o)BW4d|urgF))sXp`Q7(dxT!rurVjtM}m&
zbw6C89)KIvgK!68mDTDY*r<L4RqDsEP5lI3RX>Ac>S6d*J%XD3IWyIxte*NM%T|xE
zM(S6rxB4|3qJG21s^7AS>i2BA`V*V0{>&~_e_>avzp|Uv-`TC|e{r@7#cr#n2szz>
z%6uj?)ZRva%79m4p!SaTK1%5^Xsva{b1vHX!P<V5U5E9?b5xGzGWKZ)C?o}|VV8Cg
z&zZ0hp3puJ^B`65sP-WR6WFDYsT~rbtE<5gqZ;{p&jkM7Gg2#Bv-?otXQK{vV9T_R
z@SF<0*mW`}Hi%uJe|;=w_Ew>_{siks<3&jOR68QQJQ~;hRvg7T`E_4_b@yw06l?6)
z^DBJ6|E>jfH1KQf8>xXbuBFf{YOVSGHbPvRB_KmJYhGBvT8QZZ)^a5}?0P9-hIVDF
zRWTTm68uMkYDfiY?MKr^x(w=z<tNOrCPY!j3~NJHy_~g;e>>>dmk^m(1gptRM|O05
zRZtvE6K!yJcXyW{!JRDbu(-PuAlPDyySr;}cXziy77y+&!MWf6eDAHAo|&$BpE}j&
z^l3?<IZRvt>vz6R<WyE-jGu+v_$*<(Dt}rVJ@YO*^jE)Y*896CyngPcC0Ck+=hjd6
zl@5Vi6~?eLvh-p7EAn!q3bOr9>OXf&bKe>E)5UQlk<d=C45Jtmf(g2IWqc9NT2n_9
zKGx!e(LDYeI*e`e4YY3q-~3zg{)Ww_PB0?Xz~eyDr7#UT-LA4;w+f@phJ2&=Yv5O)
zl(+O$kP?tR#a_uIdj;2MF{|*LFZ>;d@+5DMlyC3&SHFhst@40ND!N{iZE_G8b6~^J
zFbed=Ur@FpYeBDWTS?6Q^}~#&W!9lPZEkkHv$3h!$)OeB8g$ok=}@?mY*_q&{p|t!
zcZe@-j+ZIg+K1p;o6WK@^6Ul5?0crbSj@0s%Gz*;Mu=Ow*+uVCuiQ*`LaB|Ijo5Ak
zPhtx`kvgt?7yEqWS#ZJTk2MwUFt^;tCe$^<@^@<ZF;dUkoJyOCvI5b!D0Q(f`p?<(
zr-_im?PZ;0GZ5o$%p*eH_mwQMmcD&XL8;D`OloZ(Z^Ccx+Nl1EG^O8r%jMq|Uv~el
zV$4W@<p03a|CG!eFv%o}xyq#0*BoH(7-aZ$fkbw6eN|_@`T6m(bp0T8{Q&p$V)_~W
zhb70A4l%g`x@f~&@@QC$sK!Dh>c2|4X#i<s)Pr<L(GG}l*axpTk|h<txDEQlk2P;l
zUxg`H`xZa}=dxiZ?K)S&i_dy^vJUq~j?XeeoEOKwUQNlf&+8y!Q>>aNE0xCwU$mxs
zToxN5x<-3ko{K)z!ebKS$rrO!HgK}WDxi}cE&u4(F5dN}R(#4Y)su>K@o)%jjV{R9
zJ!txpx(#$b8tBUpztN@U#(|vde<{IFIIHE?2tQQ#AGDmlV9s$j^gM>mY=i6%UzW{9
z_5#!aU~!YR1IS=i@*;B<?1SCz9~Qm9_QZZe@gOp0ipe3hUW&Na_qKYdA32PUu8Sd3
z10hlj-t`k~OvL~8diD*@Bcr6tU5HT2S*cE41VNTr;UTCb@)<S>gck7e?AGO@Eq0#7
z=v-2}8%wSA!MXpzYZo9F@9i6o{_2<J{`6-#sWxuh$UFbgc((=|<m=$ebRv=m_tYZl
zg^JX%N(i9`*){#Afn2;**D9xPmbWrW-?-i`WmgQ^oCOVa3wD99(NI?8IOhDNcugmc
zI;f?KQooBtxcU5|<yCd?QttlxOU$Bnv4setwY~k0@C8*yaZR{FvspW-+I{TWkW2a_
zV)Y^)r6NZNz(Y50iTSVPeK?L0kh#c8?CH@U;mVy{@qmvSIjL7f!ulMk#2LfuKZ~`h
zM;Ec7PLb+Es=Q#86L_yX%{*;|m)e~ZVUUzrVERpEC8YmNkq<M~dA}Z(xGr0~Ulxg1
z6u1i=`^`M&n7cg`dPJX4(1zF&TX)%k)brSz^!QoXJMEh-Nwg5x`G2A?s2-gX<V5CR
zP9+_`__Y~&?Z)qj3^J7yyTnDX@y?dzdyzcBIFJR6efKw<S#9k=26zT#3nKm1dC=eI
zcQ{@u%6uG*gP*nd5fsSeQQE>I3adyDJ-EMQ#_OPC&#Y@<?*&~mM5{s%ywk?lT#wt_
zx!e!Vv?Z4cWL6tj0@mM71E>XT;hQ*UuQlKp=J0cb<-9v1Ehu*Q6{T2r9D>R*`F9pP
zELc9K#p(AZcoMs`iG=>tA!h5LMuR>_yD^Ib__(N*bB@|BVnB!1W!5@8<(NV80J!Yb
zX~>H%uk@TUll9T-oG4bdNEdudgrD$*Wy-3K8pWeHfrq58Z5@r>Dhk}1C}H%YHS+Fi
z<r>uQ@Q?}=ib1k9D#k_8;2&#a^%AeJtv30REuMsVa?P)ek8s_k?=i;*1R!Y+(7>F5
z`G4GngHxlLa4g#{kpt44McbXvIXk&kl{dcr*jdw9$5`GG8iYhRyl2RLRjwQBHHY77
z`;I<pGMkxdOVM^Tn?-F)@??A+xrb#8%UsOkC=<HD4>tFwNb@1p6H(SR=cysGBDh94
zn$+`Ac=~Wv9t<IIp|6WS0I5T$y$z;c1RRhYq+<)p3uNhd@t7(r0iw?ROnd8^Yd55M
z3R%C7p>u8K!DL6V*At}gLB`(Z-61ZMZQYSByC@KXLAiPpRv}uCb#%<=&*rk0(Q|um
zo~^<7VUy2e-j>3RD{BP77K00vQ28uLTI*!_M!^)X0e0M<1P<&Upud8=P`2J~<R7{p
z@rI*^uX#TWrYs1GDZG*NU^Kq<5YRr~G>r@$MTF1E&2;_VJJdKgV{R44?NY?;GQjPU
z#O=b4Hk6Sc!2M2!KEhVDfWM^M$e8i;8+^9KZcVrU^C^%;X4T<4zFK>%Jn1ez{pQ?Z
zlo^h&(kN*~WtI&S0SIlmGN>qRwC{J)X?VC!dXo%`{b~6jiQDb+;%zLp4bxeMKEs~~
z!w@(nv5P1tG!mKm$ImH~r=@nY$8<wwl^nI%+R_k~W0MA9UGdUcR_i|#KF7l_-J-c4
ziqTIEP`v!Q_uO+y{A$@z^O02QDMNR3oOE2=;|_wqwjPRn_(2h;Y>ChAR;tA$$@U%^
zZn3lF#F1XRso5i`#2V_dCzitSINk^X(O#iS-7LZbT?3xv;nv<Nr29StuigB9Qz}8*
z-o^s6uUudZ3o6kFv?D2qv{8TAb)f?@#YEYS+Bvjn*36zc1kaB(E5_A^d$f3h(Sqff
zwlzz|s_vQx0umL4TRv5M#1o5tpPiG{aE&XvBZ?ZE)5^NbtS~uZ+I)Tna0CQ#=gw&#
z-Uv=o2Nb%I<X2Vi-(e?;@P1+HrYqHK&@pM1&*sI$$hy(SWmheeVn`&kN#ce--1+Di
z-k8&WbwX7~^ZrkRfs+Dd2CW;?ltM17r3iOrTKA$c0CFHci=sdGg{4iGZ$3;nPGFq7
z`yf|8!m9VieLmyZBxK&P7MKf%z(pWCKffZw1PMNun%u&DpXX#%<uVD8>?R|q((rzz
zEYPKF0-rI|*_pJxAey0c)y(b+23Rg8pCJg8_fizr!hKVbUAQiuR(Wkj6U93g1laD!
zsue>nK$Z?nABHd|w>Cr{{uS^#INUeFMk8rF-e1(KR>{ERbtWwJ%dE3FP>H~2+ujBo
zZH7co`V<k<c*R@wUw703tW81-Ptr7bY9p8GLG}AJXN6Ry-|q_)ku|K;|6V<s&GTt!
zHfnK|6e*;i*=ojj@uxTVa<BG4#{ffx5o4UtK_1f6n0IG8v;i=v2MQ+ieOT-}`~zkI
zJR9TAK|)V8E)>Sd%YH<{6FU9wZ_2;3yZ(L+z&JnpH^|V<m_a3b2siz~n}Pn6;<cYE
zt>ed>R$H-aV4cTdFs|~G;5PuBX9tkDS~^6B_=72bDsV(#JlQWxpaKXz2n_Oj@$y8u
z1Q{gcY_S~h#F1^}{!1_#nc$xBGV)+(Y>vWPC}H};N8b&w9nzt{h4DhxZC#{5E(*5z
zr`4c^yhYzs$jd4{h5Bn~ZB&5#?r(;3%vmJNJy!$pgcEkOaC+g&qrmp%`>xlwmz<@L
zOH6kjKRmmE_k>9usc*(GHBUgo!RQ4HR#1?uA6ZsYxCu77%D~>qldmWTlGQJI@u+!P
zvy1Kmo<q1?E|q%y0ifao&PfvCHx*7^S4Rmmassr{L0`IiX+gcw7gS=X^rU$@$)4(@
zO%-*+5pomN5pABtZT3GMJ#s0C>mr2wcay8c($Q9U`c;23e@Jq!N~ym&e$(Z^g8^|d
zH*yjnSOFMX?H41H|JZ+3d}9&p72eHEt<Jcvn@<g0Nkb&7jh{EP(_)M&*{e#WX)e>K
zDXI}hGj*BCM1V4#Qiu9bYm=001H|!HEtK$3l5}0F@jAp88nS{NjKWl}U5{tlimXzH
zq>Z3>yy-mu;J8rLg$X@-wug&_qk~rN5RttG(R)#hb~y&Z{rK&cr>@CBa0930Ww(Da
zXa7a9_mb&-BJm#f2qI0YG9HziFaVELMF(FC${?ID+BdxwBIwm&?%rZhR9!<T-F+GL
z_DJE<Ptj>D#1c<ae_<@1rsR*AjZ!<Kj^JN9qf+XsR<F@0LTk&}L&M7)r9nzhw$#;D
z@;$hvPYIy;Dd;@;zI=8Zn8sUb!H$FT9q7WiDBuYB0;RgORZd^zn?K6wO<VGys$Nim
zHC%AsNchCWDywJ?P<`q=UcTGVHd>|hi*Kj5eJv_mVfR<MXQvkOZthm9<aY*jdpazZ
z8K$D&lkR7<J4hT@JMwky?4UF=7ow^~g#wvHV&+y?k>6E<J{~=~qI5<Ph#29}FK9<H
z%n<VccFv-jVC;wqmNWr7R+fy|_$iBQJ2?_SL45Z{?5QTDxux0y;44$$;eYU27uW^H
ziVBYvFBD~o2xo(}paM}iE(KgaLD@`TNXCEyrN*d^$Hju7-prddK>7WMA4E9=ebVDU
z2xkxF{@Q)O8BE3RsNUk?-qh_teV|qEY!`;#iKN_6U?#mI3O%b_Gk?Nu9rO)Ke31B!
zg2Jz!DXxV+ao|ol(tfcFlvpbetrp;^#2#doQR7A@Qm1-bV_pzKM~^V$#9io)%N430
zPs;-*Qpg#_eG;V7L3x-YC83Z4P+8<og?1+aMQ%U+q@pcG*Z7xpD>$Dbmuu2V?0hao
zX;eD~P1+f)rpA&|9L1X>SwcEvC)0QubWYEp!pG@V`F~?}W9o6yuM(7pjcX{Jte>W>
zpPXYLLgFq%PK{7XMu{l$idS;zb!z5j8DW>Idt^x?8x)o?Q1(qZGzC~J)wK;47%jx2
zr-kQBtyaCp@mOMf&g7S>G!V)YO^M)GonN1@Q)nL&MpT;TSo~lsq7bOD1pVHN&xUmT
zO`sF1vJ>f~6HTuZMz9m5=N=PvUZX%<1-#%xtT?}9T9gNs{NUq~OCF|w&)P0E7e?J9
zDqP`PZ{++16n~0l8lMN_eA3|}?hKoM9J^D$1skxKJ(%yqQ+6_wS=?rJalcYsyp{H2
zg+_At608Xc2}~iq!F+=?6%C6gz?n9L4mzQR8#Ps<@<g_1D3gR}j+>%A!#1}P-v=8X
zgbsXZJ_J)=Yk!e@mgX|$B(8a*HBEI6iZwe)hV$wN`G^uttuoGITrb%oW04Q5?V_?C
ztu&fwv>PnK98Il0%Bp{9TXJ~CZ#6F`&AR!$g#262xo$7{;W42wA2rj5VSHJLL1};=
z`P{ZxT8Jt+e`Kyw1Zuqe=0qLIC_&>IrD~N2jCZa_Jl|4tE;y&&)_8<-X;YI5NvU)-
zkmo=I$@Nq}O7bt^bP!*(Hs(@u!C0<8ejTQ_l|@?x8wrY#8>^q{=|hxFr}sOs38f0!
zlVQh>>){DHQJM`9M5d|_6k8QCB*N!IoR4kevKyn{(}mlx&vR0D6WHY+@O3chRx$$p
z7|wAc&D575C?&QW$V$H7ZPqRqdXWY5B4$NEOt|#1WiV>ts@B?*>FPBL1-#{V%aY-Y
zJ6mI1>)4t8<Cd(X_cs6=u)i=St3T%Hq6y+zxun=TuYeK-wD~=BMhOPE@`W>_5+i)|
z1u>&8K2+gh!KFqN{)a8=MtOWl`2Edwi71rOJj%{jf9msPhJmgZ3rL+x5Y0=b%YRnY
z$lJ%(#iF?|pp&JH8WlMnkr2z{CS8ViKR(62z}VkM^*1kIha}PTnRyN~onr!oZ;!#e
zd+1FI-gDw?ZV*(`)j7N+?_3ki{79dp1Wh=fHcrmpD9=A7uX=;lOSj%>8B};PhO_SU
z2Cr2t1>gJ%y?FF8j01Jh1Y&<A8G%PY>?><7gDUU3UWJvOY|nYg^IQ*n;{|{DUMV?(
zBd#qQijqYBB!7r*qX?A;5c$$2_b^+8A3FInu<*N@s^p>sJWUG($tq%ZD2#z+0}=C6
zpQqCHv87F2)I@k+Y{LOTV#!^{7G6ZBiV>Q_Mfqc3t}ymz^c|}jczzm5;TvvHH_`1j
z<J+Gl<3ia)V?E1-xIfZDr#XH-v){4bxR6rIF)`Lzhy@hn-yb9ooH5Z9VSTQ**v`=$
z6esZoC`dx&_|46)k7ONCKMGU=V|1ogd$Grhc9Hh)>8Z+7F1Snc6=l<ON9scwm><(%
zKH%{Z?H)Z%LmPZJGj>3h=VbJtk1CU^QH_d-^d$9>t)+Q+ZcifpVSI#)BP5&fC=axZ
zmzIPgjxe8>AF9TE<iKNoaZO`ru6KF?y*?tJ)3(1~ez2hac9x?9BJ-b2nPm2oUM^e(
zBHZH%P;MfTJaqkaeRtB#ORW(2H^A}2{G??()BZt;a$>I=^?_+$P-i^@x;I-f0Hw4n
zP?+!CE1i4vq~sPmTQw!P5}d?0O}RK2mgqE%_`r1;)mgC2?{(^fk{l&jG-{pAeIG8)
z3oh$0w-HQjsB(`m?@=q9X;TNi#lIp}xXv4drmI6964)`dk=Ie!`x55xbdN&Bsl*bH
zGY5?bn5)G_TC<I56PA=f4ms1ZdZS@ebijZ013=IZ4(5HB>UdRkoRwl%2D%m#nlr|f
z-(h2Vn$_k%`YoLI#HEOM|1>UvlfsgghM$E+jo}Mw(@t6$bejITVy+pBBkfAjECBE~
zC()&)Z`%vg#O<0<)9?_&?o5*6cj9Ba8oG?b5<ZaEW^{IF{Z$r05bs7CPPkudMHlUa
zELg$#X3Lqu_<Ps^mCjtv%oO;{@7T!==OOzOx*mbcei!*|j5mb_LSphBReic){<_nP
zzx{@crP2tPtix{|{jTLca^?p7_#J2(k-Jz59gSdH4$R%iqlUS4nx&kr8da1n!uK03
zA1mu(^&!^H)U45<C^+|n605?CmLlhHoP{<T*E8cNorXEQf{o?h!<{6La6TLOa5JpK
zVduw_!*mJ;lJ;x#HsRkN>cW38m}_cWA+m9^1o_{h88ZizNQ9C~PbMG=vQh)WNLl@a
zV{^=miRK>N;f4uw^8`X3SOq`)@~o2yqQc4u^q%|YaixGDcC_P5Pc{m;a$6Uq$CVCg
z>4_T_8I10j;?O=q9?c=N+p{=Ro}rY{Ec$h`QKjzeMPF`9cNk+Qp2-(x2y!apRoBA1
z80y6;J+G09xNm9XqPlI!kqlyROR$ET-?n(eCPLl^z2s3_LDdJ}{mORG&Px|30E97m
zdPU>6g`okuhv8HbLp(a8=%;%LuU8d=Rk)8g0e^6zf9Cfyzau&<$4iuc2nrX1f;j&&
zp0D)D628L>9y|Yaf7gG~`$P{|0!cHz<22pp>*;=`w#<XfFCN4&q2DH6PCyM*FRpxR
zU-(8<bqfm{Cg81)h`;HZ5js?wHfn{9tPt|8+X#Rhk`o7+V+<Zc6DRX{7a<C=-+Y(H
zP3lM<AnURj{&p4(bFmJOr8^B*F=6L&#aOQ+HboV(8Y8?}OhmE@bn7;yyj*LHY_SoG
zqc&ChL_Y!30^d(enss(ZCjiF9G?hF{g;3Rq=Q}uyv*5pXup?oxI&y^=o#Ni<=9!}$
z#i<~5&LFM;L3Mn^pzS9-@8vMtYnZj-=moo6jIpOw?^#O~N&Xw*bT;tG8*}1b8#1yC
zJ;Kc0%pnR>Y1#~!j+)n;nYjd6-;VibL6onOC%f=m-C=aU>TVDydXx_F{hz`Yno^2B
z*|3k-8+$O>tQzocggT_MYF9qIq;1!?#Rp_|snT1hjL+96>cVrGyz-+z5{(#GTxYik
z2nX1H0)rThR>S)FCYe|HiDO$+&)2`{R}(#B@^y;C6tgt*b`E@(CG8~KEbLq0nYcwq
z>`sE>Hd@Bcx+Y;v@4&ayA9PN^+UB<y{wLlX!&WSBsVRNeiv#u6Y=b#t3}YH((F>{z
z^>0?L80E|Jeyzw5H{qfPypcwQqqv5tnLu9Ab}ADbB|m%LL}?``Myqw@v?Is@vIgzO
zGqgjPTyM(15imJNzZ(oquHwRcRppN9H6ea4%;fq~G%9{<gBq+nib?2%+plZRsK^~Q
zv^t8I;TRLD5ToW&$%UUrxMu?9A_raa(DyT&V+&g-hN<s)RPfFQGVif^uVo<D5n2yr
zj|yI=alt&29Klbu7pqfiRR_`i;iyHdSPb-`D+nvDRw3vzj0M}%%4Wdo$j1bd;d?v;
zQ5JZKhf<{i7k_FLRV^<d&Ks^xNXuJK*(`P|smqCJ`oh+J&3jKGoC}b_G6D51;2S%v
z))Q{w;dxE6VN^k`m}z5$vdW+L&;h~Is$|kBq+a(C<xA}}Nk9>)PoaI4Zrw{#iOd~Z
zU0m3IJ(>zWm1)=NDz^?|@c%WryHqoogNDg|QPO2^^gcdmeH~JqxIt-P-2kE{GRmCB
z=cgVKVN1`^jjN(a3#}`dB!T=q=WH+^j8NF@E>8mnyMTua)l2HQBT0Q9*vU#DA6YgA
zpC*i<V%Q;(y<ve3EP;(1SMLd9eg2R^H(it!VuUU=2WlY^uJHkLObM=hILDYfwQde^
z7A}%7LU+~fqe1CC>I|#t@Q%@u`ssGq%dhNUJ98*ua|3t|;`AY^JrMHKKzmY<D;^3_
zv@WDQ?0_&@4`okwWvxA~<!i0AVGM~bX}m9STO-t{qeDtViW2XoMLEe71lL@!tG_+O
zFk<X3rfW5IROH;woUUuRJ$}=++RTdx<8NSVmKG64<56tOIh?s+z1kAS-<xc;P_h+m
zbT0I4Y}Gcvfs1Y`ENBgVW6F#=*jfB*6L>J=8dXE4WILE(2cwXaZ}4pP4WCrnqdf-=
zCj=49Z;UGb5*_sCt*B0VKHqTezm9bORRcZ=R90XD>~4NX?ISgP07;+Ws1N>=cB-M#
z%m?#ymC0DR?5cM2-Bb9xKSJ&|S7jwyPqb+DtaM2)tQ&zXJrH!wu^Dz~H36wwyTQNa
zi-pBwd^np&r|3aX==iio0j0*#P&mVcdPwtgbP*z&!g-Ul{te@)vKWQtyn(ER5q7HL
zuo-4=OR=GE*&kf+NoqCKKbq1gdH{o2NjEI~aA=TIn)km*g|BJpDo=nc@mh*fN=L8>
zB6eyp6`BqDHxR49y+yE=%1$aH_>jlcX3;Z*+S5)LIqin9gfN?O2?CuPTQk4ODED3w
zSUAc@7z7ZUtdMLnj(xeoo#tsB`Z|iP>mUrnPdGQIG<sLT(`8b81MR?N6x<fOc^!0v
ztP%4k!~Wb7Ymbd@+&dhP@T#$4)c2fq&!2A-GIvOb0D?g8g;3tq^ZZValrJu*%!%1R
z+<Q{5Nx;TfJqR)|Vn4thz<5!g8vY>fIcW9a@5fjx_Y>ao#qndgrLc3f9ZtU!`e3?f
z;p4=5RNVn7_<j|YoxYifTrzr&>Z3#6Ao^0sVzK4nE|@O4UUfgM7fC3&z=H=I;^h8<
z)k3DQ2SRKgJxZ|hgF=ff77(RCp>H6Dp9;AdkdVnzfbU3{x%$<0M$;!W{<g`+57YaU
zucvA)#-%w}s7BR^rqbLtgzpV7Fp5uN3d_H*AdF?CYL!!;Y%!z1TOM=UrZnyYXWWnl
z$6XcnKVi*&4G6xAF;1#CxNTJKi{v6?_38D*0bM;G?H}UY-y$Vt$BNbSfj*?%?zWdC
zE)Qg|Rqw^iG=`lW%`$hkJqfWBS+8mI+-x(inwCpkX-jP#(t{4kMw+W^0%1a8P}gpt
zIksELfm8iI%wPPo3h0EBD|K6<eY*`B{QnzA9~<Od&wD6=T&%-93$QUNYtIBkh?SP$
zf_~-2KE%h=YO34AA0_S0ajr#-ZcA4nI)vT=h(&%7v@ZjEOu<Pz#(fe77?FO@?S{}y
z9?MP4DT;pCYROZ(5qPdYS$72&GRoC7XZP%MIdo1(41onv<ZhKY?rqdJsz@KDV2eUw
zj!>h}BPX>%-2HVptI{MoY7Z0|55DXJkXqN7FOybOIgC~_lqfPb&$Sr`QOdYy8S<tQ
zda)8tSqA<zr(^pH>cE8+^M<39cxfh*(6rBWTqYbv*6MY`$$+&L%+rbkVqZqbb@^(<
ziIqm06Q4QS41RU$YSa&2{ia$g621+GsnLv|4&6lN8q=N*S*v+7+(PvoR&uTVp!4Bc
zZlNao8Fq)#)zlikE~E*eh(>;yU<(u{j0!K>g97{QusYnJx|aDd<ATA{kjX14+on~`
z679n3MbxRaexF)2{F>^6e|HGOB?rLXtY}001Ru<+W!M&YCiaRJvjImTK4Vrgp82iW
zgof+6zu$Y&r}V1v44Agp)vR{^!yf`Mhm~(s9%j}O1byrdQ2RFz-Gu7U`+vo}BreDt
zypce<FXmPLxxv^f+i(@k5piCH=qzYzqi)F5mVis`QZ*y+qQK>@@uVdBMd+i^xch(B
z9ueNDWgoS93~F}C<-YJ>zadXZrFvEerV3M#@SNqR)T&$QPhq;<(i9dp(6wW*O^4P5
zzI0U$z&@qft#n44E(aI?TxOZi7lvO2YU&(?s)-_W1}ecEJ=p5d#Ks&wC`0cH&WvRH
zXbw7mHjfGTCwn!w^`OsP_ZR56u{gzpcvTZj0JPM9>L5z{Oo2bj>@#dwF*+k!rv^%@
zzdH<6Qy%J2>}b@(3dm(9LAba-+UY9Bqz!^ATBx(uP-~B}y_r0vN!qiVWqI&}?F&+k
ztAM@Bdw$U|RYr7wetHyJ&IlFKylXN!5>Yp-KpB?pr!qmn3(Rz75)%8irG{7;iDZDT
z{R3$;LSAdBGC>6DL-71S4vOLQbC7==<>Th$6dX_IcX+1mV4cZd|J8rfB9z9eQj;-#
znJ>;*`MC&kOsw7hYQ068)XB-XxJb@WORaecr5EaO)Y#PN*8gX_%EY!}FV*Kbm72_x
zif+cY9!UufFtpv3EM079-hcAcHjf!Lu`z;+>%atN>J+O1VS8rmO%gf?M>F|hiS%nI
z=~v1YteD@yry9A*ATM7<#Q}7@v#AvE&0(U8c%T&hwcSUF!&!8I9f}7Hi`{-AwkBil
zeCVX{%x7#Q#au)hOYTAp%kvY71Wv6-We|rM3c{V0W}v?6le5fDADY|DdLg(2^>+FI
z67MCh;|{j@&G=a=0n>R?J`ac>$Kz9uz}_Bhiw^VL6MFIlQEhELEy=q|hz!|sP@?BP
zHFdWu%byCew`l}UUF&&RYdHL^A6Fh9gep8^U(?h(X~mf){1`26a4YpCBemK>%le67
zk@-(j%AJmv>q-GY4_MRG)(k<4$`a?8IuJ@!w|Dg;07*n0sWTa}E!0xUGHduyN}pDW
zbCeVX7hyVsF2DUvT(lwEuqaB(u9D#YBc9cP&(eyXm4zYU-Xvg45|t)#0K6r5Rw!~~
zdv+?p<>fH_Xndh}YoUU?;g!@2zG?N!0k?hCmM31ERPPLvz-}v>ZS_kFgTMno9rYv$
zn}$z1OF3>zKVBw)f_PkQO@FVw+M}485#aA?L+=iXI&3snzX=v5J{w}x&zogzjK`3%
z*Dt)E^O~sS_L5BQl+jg3Qls-33AD2`F{M4%W(+wc{_CbXgX}T`kms*TkWvx1zx$rj
zQ(h3?fu_vUwinR{lX_;G;Vg=fo;kN?(}$v+%>nN|>rWZdC#%2~fdR$A58J&#nWBVs
zbomb?r(UA10Mi}R$KF;8>Hi1#-<8TLHIh1$4^Ae@0m+U6q(S%>ZShN$P1JT#Kj+8i
z7ZAx5*zWs3p*O?6J`W!|K47xjn*Shb7qwn$EA0&J!Fel+`bpav`wbkD1#_@UGJDo-
zQKrX2i63&O%|x{JqD*w_NI`UKw+(|~Gia|hiy~@%7#96kh|D<C;SJzGGuXz4NBK@&
zbtG&ahr2ta8*yhg7}?UMgFEJQFP{hJC=93CV>rN(u9|9jqJ$oN>_JkL^?JnG_q}rW
z^7rs24d5^5g=64gl$}CdwcN4#c&*Zig3YV>3)gY^?2P7z>93_uJ4=f~!ulcsE07jr
z@vbdv-esxkAU>Uk1#|H-z*4b;JFUdepp;uQ&!|R`F=dW9#yWyVpWHHvMuU9$Zm}Dc
zW2tJa+e5onk@TumhdEglZkNci{?8Pn4!uT-08X?8CbW)nI-KN9eL?rNC%#H)N1+Gs
zIxLEc4^VXIU3oA`bT36=c&*No0%GC?>(%CbN1Z7tTj1?>)9&DIfqka2fcq+*Bdnj}
z5h0B5-I&zjrz^07JNL5wn5)%q8r4;O!<9XWHBa_DBQnRW`=0qg817nejs3d$O*NC7
zMME&3IPJ1jfq<^YphKLLxoLzMANEDYgBKxQ^IIo4j-6GOXu(xg@+TRkGH9-R$sMP>
zX82_3<X&ck6W}q)ZUf-R2(Kf!%2T<Tz1BPR)$sVipq(FJ8|~f4!V&ixKN4`vKwf1&
zGFbSA+8GcD>Bf#!z!?sP<x+O=%xvJwd)UUkZ*+Mx<AHd#q8JhM$<0GwnNdV-)10Hc
zfFDjh9{48N)zTO1oX;Q!AQ$+xPMrb1e+4zZWNTTzrUlRNIgXbhGKc#05I>TrX|MU(
zp6I`~{t%PPaOOKo2OhCNooT7-yk{&w%K%hRMn31*TS{q0xSszVqP=6l>{_Orp7kB!
znN`3HeD-#|+F{!{>75YY&|8q9>Bo32Kgf(_I)9b;j-YkoE!B}9^l3JiIkw7v$NyOL
zEaW@&7UCaqBs$_Qcl}RD!Bh;$EEK0Z)$BpH%$;(WRyoY7aALO#FrHEi15#O5r~XoG
zSWLOA_OR?tEi`ak)=1OUo1D@1x9m7zs;Ul~BxaHOIX<byrx%-oTou_kWB2R4Ig5!y
ze<sym8|6Txs`NGyv<wimYtim)S!3)2I%<tfYACT3mFcOqMB-`CXbZIz|47PmZqbp`
zWvBvcBm8JwR?9W}p<NC%{C%R$|051hhd_68*}j_m)Y03IgS>8F56xQ<Cj@RD_ajjA
zgM95!6JKKdQiBZI4o>>{)lbZ#{_A`Mg*bDvV=!+3W~I+Lh%NI^%7js<L&KRNybywu
zoWUzpNdu7!O7H~+Rql@v=Fgv#ZZ5E}iaLDX<2emu<(Z|(f-;^k<G6^<<vck)5i2zh
ztYqVc#}djMLPXwhKA1|D<P!-O5|XftTZDH=sOkKrN{s&Tn@gUeHLPQ(xk*c%@>Hi%
zRSbPZg#G3NfuyCPMp^Y$d0Pd8fh@AkBX)9Jt>6OrnFG0}qaOxQ9KjrBY*@Z%Q1>w<
zKR9&Q&oYaJBkI{|kQOp053ulJ2k@v7*clku9wf%cHEUxk1V1K<`f8Z4yKr^=`|DqV
z?H@uE?ZwsWE3G-_|KaKnaXA=>ibZ|-J^=8ah==n9g6zzm$n~sA3Gs`uzW76tUew<5
z+Rg~-xwF@FT%H8%@&etJfbLSNc?}}kQ5dtqq&84>(c4f@N%->`Z|H#%yMLVJ5weCG
zmBGAcyyK0?lw-t5N;PWpgT%-+)u!_c#ONY72FAktUqIpd#UV9t-vAv;ST(P1a`JQ#
zM%>CckQ=ij?I*zDEFIqe=?}FRJ4)xBvnq27u>W!Wi;!rXKOn=_i|sr@YN`^Jk_KD6
zHni+JW_&AdZ7g&hK^rs5*wWu7N+jVtmDvu$5rl=iTNv@Ir1oN1_|LQAyQI98V`D%b
zqCpg$>I$rCjbut*WP+1YF#U?fv1Kk4Obrt!X!sk>sJ``(-ijdSW)?gFaA^nm%z&}c
zYQV>y@4TKJ72ldN8anI>-Q?i%i}vOJ^T3a?MPi0x@j|G-1%J_Y`Xs4_{UG}^`lgg`
zt`m0M=7rWfHxn%%Hz9z;7S2F#X!xR{gTJhoZfXb}_XEV#+{})`*EFI7TYXGcU*y#v
zwFSlEgYbVRZS`uc1tlVq07x;g^(Y(`Mwj6PL5U!7pBG9V$JIg_7U>2*dW+;a62OG?
zDPIqDbND4|>3bUYJ_<EzKL7ijRBr~@E;94_wz_ITfK76<7oJ%EPZ3CzBW!EsfpY?g
z{luu-6zIGJ)2oE>#3%B1{r>-(c-W3LnS?g)#hNBymaTcdjlpu@AyZgVs>m%{=0Ixe
zD<gK2GRMo@`4>Az#_2R5QB%jH)DDr`$^LWO;CxA&U)e4I=2ZLt789tfr%9Va0O>Bl
z<LVJ~mX7V6aQeF#sAr&CXh5K%glTKUyzA-1QfzHJ$DB&i&HL5`i^bZ*Np@p~q=+YI
zuemw;<BYpvRP*7<Sf{UbgVqt?xEXeM;>oL`P?+3;+Nn2HnEwM|?Nexhb`!3tx@$-M
z%&2`0h}5S0ZwTK0s{^Q!JQQG$ChS-P_Fwr1aTbBi2cGRjXrXQwf*zV4I5ld}SVw$P
zTAIntf3DD{IXhbQRFADvRtZDq3$V@J7#v{$hfDLppD~)mHDmjI1s<gu+Xz@EYDl&t
z?&`psoD}Vnl4feUQamQ68u{<GG5`RJx;ij1X)!A0zb8Likk+aTQw=)_W9iq13bo(4
zpIH?`>b5OrOMN%nrCQhfMwL@40)3h_8xdx18fNZ44y+nFIuCCY5Adat1m@#ce{GyD
zoVU8M6oG3d9R+3Pr<Z=EuA`jnJ7!L**GTHMYUy331LI`e&hR^iI2s2z8lj_UK_tTn
z2whYTJ*ctOARWp%AG}U|Uz7R=VqD$2y{BdZI8%!0hON-E>bAe0XSpTs{^<y^mOm3T
znsPp=2qxH$Kv4z_vYaaRL!XlH2Lq@9IZ4OKL}9`JzrcH2B0mzc!c4{kWqRmJ>fkko
ztc)<?w8{-U9D!P;(KgWqfj#^D@yVw}2Fc9HO)f4>kgKEl#0^7oE0dGBRvV_VJ_6;R
zZxJ(Zm|=S1CM6GQn2l55<Pr96=E*Ti!v*3<_*nETA)rIaaBzJkV`<fYbiVz!^mov-
z@c?wVGURi>Q?tc=YyXH+y7p4)dAE!Iegdu`VCqvh<cWK=vt4G%h~9s@FvY6oGIISs
zC<2uj<SV(~m2E+cov&L^{kwsYgvM6A<`4&?>}faz@@Ex0vaG}7{@7=YB2x5{lFtR#
z*Pv-JqK}MEudn`4?>;kpxPy3z8owHtUnoo_tM@H9?7%&xoC8yrTxRH&E~Y7Nr~e)=
z$JQT)r`mZ3cqXK4<{uA#h@flwj`&YsjOybVMD$_)4jr%GC)x5qB5ePTKBo^F?BatJ
zF91SotPMS=&a;I>GYOZRx!DMnkhldsQElR~0~owD{c!*5a?)h=%v-@?uUlk$=_f%A
z7aB$&RwP7diy-^OmI0N1)|vt6!Y_+ZVG)q{^IA%-wAGIb?q4tz%t0Gq*l~d$Q{LDH
zEes!tVQ;S#;Q2HbkCY3qEJ!m(1}7hdl-5h-!(eU0>VJ37jnH()uzzm0(tPwJzR<Da
z%7VkQonK%+Fp^=t6BlGkB9|AY%h8tZ$pb=f+5ibl2bn@tnC?2+$X>aFbVgRbFydsY
z(+Arq4l9@j#17i-{03N-rc>W$r@q>OV0VRIj!SDKAcymimBN}>Be0|7Mr%R*MZds0
zc*2u7$F_WkRS1T?nP&%E2=&j}YW+qnhSxfIbtB23lqb4Fv%6{ZCSqPa$q<hxj`xHU
zvhM}{b;Bk$`g%=>(kHUSvXoist#FC@Fst=$@sAS-cxk`mfKypTh8b=)l+Fi4>}k(D
z9nA9JQL<Pu1wHVs%vyfn8$RL+mxu=P3Rh3wM#NJFd0NIvMjjn(6<7BuC<tb4(A^Bj
z1E=Q~!!Z3Z{_u_~l^NfCP^=^_nE-01@vHdon|l0;(f1PTvxm~$4tRZWLT6jTa629j
z?b+U6+S)sR-9S0L#hsk=I{)b}$tZpCiV^nHm@pi)w0)f_+u7CsL@Rsra!jJh2**}f
zkD9q{@zAky`gYu!Y?SI)MGx|3_m%<ls-RaWxgzuS(N;Hu)<ybTeI?2^NwOg2;v`)d
z&26tm;`iYi=TMvwazv@~0nRN^yu;P<0cc-D)&`Wn+P=EjDTc%zQ|g<b<jqD+XUZ<i
z$}QFQeCdOTQhn)z7b>I@;>Z%d64(e%SQ*Me+~2^PL@4Gzy3W)E=juI7Sw0BdJAk}j
z{6pxr)aCV3oaCKRwihWtvLyp&Djd;K^RBZ6QOZy5FT=_%+)H~50{Z!qZJ8;rdL*(>
zBC(j6j#?}8yx#wPw8I*p9?jJ=rbaIfz&rFu6qvUWW`bb(O_L+#hG^%Kmm}6Mwb{**
ztj3PANFU4%u9ifZdz>l|?6*6>$||)Vkj1b3NsduYACm;x6#vPX7dIHH>)|i43pUdh
z4MEN_8fE9zH3HCvc@;Suo|ihPX`45gWe_W~1^W??NGmB^k79!ev*hUf8MvbwGcQY@
z-N!I^Dpbj_lK=fQl2t0K-|Ns#SZ3;gax84ZCXP}}_#EcxNfGwBBj#u_Sd|x6ddX^l
zNJGeDA01HlSIyNN#s+A8g>%eR0`JZxGt5;&tIn5pd|px8XY!z@&MRH|{Q0U|=7P{3
zdA)y&5&$kTRV_jJ2tpTn^>e*n&>>Aba=z^D=h3=lBJp3FkDAIJM_A2_2Rk7sy2h{E
zeB-@2co3cXn@6p4w^!oU(cV0~b^iLXb2^7?|76v88i6MxxC^jL+2DHuJw9y7093_X
zpCoGbEO`iT51l_KCX~A$qH<Pau`;$K@n87Z8^>N7fS}FAYTB?^C{MO@hVe~2*yYU5
z%fU&R!PIn3!#&hzQmO%}LA6PC9l_Mg$OD4s9yMscw2@O9J$h>DhqR`D-__6BP6xS(
z1UoBOEA2=m8YLv23!bWp&|jEHRg*AXDZcc6pBej|6TxAdU3tcmDtCwWGZ-KGA#U`|
z-2?OX4kV-6yq54!T87ae<H(jvi%o|-Iy<o&5h?5hMRta?K0~qD8D^-LO#PxX!IC4y
z;T65vjisQ)pFsMet1#Ig!=vd69PkJbnCZm`Tdy)H@)ygouS3EnV~~v6LKljtUYPEm
zoxwe)65`kJNTp_6m5^6!OUTV;%9w5tDm!I}1jVO)4bpgcG{Y&gNL%(>|M|-xNG-p&
zfJ)2|Ycd*HM0VeRpWIFiwycNzbaezW7@oXaI3Yycl1$Mkzh}I>YHGM3bWC<&)*4+8
zTl4D6@bgnE@yye{K^{?q@8Ax5UJLZP?8Ig2h`eV5(<EX@SfcrYU&8s#LU{gq*_^lO
z7*yX54ul(EQz-q&PW3p${dxBEcZHge+IWrX%l7VG8Fowu6rnpDa&i8TlwXhS-pOR$
zF`|&izMslI7e^5f<}G=?K-Rr8>398!7k=#Jx=`mguW^EEy6d#>jw=e3CNK>uV+@B0
zUM5$!46-A>^sf}qv>p)&^&ZiUL=@?P!5{#UNKHpz@YyFkbO_kp#>+4gS}T^bpdU10
z-2V;HP}Pk*B%uds#)@gMpWDVtM>5C|{OuYxrm@Pj`kgk%Neo=?OtRtN94>T0b{+W6
zE9@W!lYMSoxDkM^ba;17`@*~4fHnu=pnO}8y}q)9IQK#4uhtFnKaxMK2B3X3f{d-F
zx2AYs(X1e^8IFAu>KAQ#BClj=j(t<akgEo($AC0v3X^gO!a{REf7mKTqvR_M-|9z3
zt|e%)Y(2jr^O4{j@XDxf2b#ESh;LYa)Nx3D|5{bwXS#lI1tEX+eJo?^m6@6i!A}S=
zX{wp;d&FE4iu6d1EC9^&<3m+|FkZrFjIJfN8SiQQ=DiqraX1&i2nB`Rd#3W~UMYJT
zZ$f-ji1$|+a2oqUo^V&*^xk8hevP29<R`w*xc31eQIxG4rR%u9V6V3vZv-K@8Z~PX
z3IqHgqmOl6Fzg~#D=z%0;oCdys?dPRZCt&qqN<+TcCuG!p$^=#7UUPms@mX|dD!z+
z-@QT8d!Y`m35z!x$OU8c&whj#a`cB8V!L%jGiWwJQS|1C^Psbv<0tF*<Z!Zi-`*V5
zw%b&3`Mf;2hgjN*I<qcw6H=23_*uH>D$hHIF<wDU+0;QLnP7vfB@=4Fd|I{v85<Z@
zoBcs(A;{e9!E1Boa=Z^B{Jz3%e8rCcMorgSC%e)}w)RB+quNrXC%t;lTsK(NUYOYd
z>VkGfl%7>$J;NDM{`G5`syX?Mz|fBJ!;hqN+0)-kuKg|s<1Ui(<KKh$l$kv|7YnMA
zv4*{fC14g%h?^xK^Xn8ZROGrZ?Ez8J+pY_J&0=11RCFzmM=P(OV}Ckwr^sU3&JYJ>
z=w|9(+ybp)HjX!~rmU-KD{mqrpFyn|>G_PvFnZirsstK>;a{rEcW2-;yn**->_;Q4
zg3@=EH`R(GlV{8k2vc!k)D}&G#dj{no9GuftVmHT4Bs6#zz^Z*fV>#%r8$k8m-{BR
zI0%3IrQx3Cvy>>PwB6G8L8Q)LHLmS<2ea`~7vb#vBB0VI(=?gW9thop{<x9*;p*(V
zfkzRM8(It(i)_llL&`olz$)FrED9V*4{eezQ)IWCjCkGmb^9ZQVi#ckOREe+ZBQb2
zF!I~7$NNF^NTvn_>sW|pIaHL5l+ES7xGw_%ykM+J$r2&x@SD;Opqyyqk~h372fu#O
z7U?WUyMDkHO+~=*FI+iW_n!1$a|Yym!Hd5nN3>6ywsZZ0nS#o4hl07f(<jr)uATK*
z$~t_jC!@1oohUr3&~7`P0!mlq|H3&p;ND@0XM(lnrOF@DSL@Ngoxvpj!XPQg6-8u<
z|2Yq=2*?-#QEK=hutzJU$@3}h;u7WyLQ^E&WF~(B$kQd9=fJ8;GLLy7CQd$(NtO_Q
zrxlXxXVl1{skV!B4~=n@z#{h?ULII{o54c-O3Nr&!&F2nld7>0p+s=ahGuVAk<U!M
zF{2k0K)jU*b)o0%kEou>8PT$Ua^3S_$26zvpCR1_dbrNTRU)No%*-8Ewn-WfQ^^8U
zse1~Da}^rQnSQz?h8^Qe64^-!Z*$(mZ=S%kE)f8Q-V5V-Fp+a4IHv`_W+XTS!ECyG
zL?HIYB2EuPz+Rb#ib@9m#(I%QQkO$Sw+*(VQ<^|r;OQ)&y-J)+%nu@_@)^ZWxr#Y+
zA>JMaO%PqdR0g0WG0;A!z1R@Rf2dpdKpSY*2*-vUX13!~iD^%1<}DBZf&<oHZ)hL<
z%;Fqq5=xAj#O`{-R_hx^X&jE0AGL@~f5YbL8+Ov$wWLj!I=hgU&1tBx-=o}*krQDF
zjo?92cB3Eqa)e5FniKiri9hW!8zwm0ToN-4Dybtv?v420#uz+_muRcd4rk7o2&AZr
zPu>|NNsQ(VSu6wogwy|Et|64b(I+c5+^;5F)oU=8nC5Sa%L!b5`_F>&=lJ_j`F`Og
zg;TL$g$UN0PGz_34I+bhEY{pe(BThWRjjq|h|$t2s;syVl8w5&<de}0%0@QsQ>mby
z8_l`t;t;z@IjJVCSRE;k-AYh9u~bte{1w{mt@}hjgMVny?W4NQpU~!urwrUq_jM$S
zz0Bsz3ratzvEU!hW=_+Y;qQDDj{75+p6o$kv!xYiD3seBsIQl9gnI@^)<QZ14%Sqx
zF8Bj@vn?)7O@tQ*KkC;ypjN)|OH_i~dCpy&f^>5AcM9Bv{B}0r#&SxpTbfWmJkoe(
z^afCmobWv_P1$mNLyiv|>K|?fYd65ZVNG><1L1uNBQyhI(eZ0Q3dN%6=SJE6A<i@&
z04z-s+kb1c(5CVe;)Lqlm|>dI)d(%R<|*YL6~3lvOxi>G^9kVlNb2j&EH02~18F-n
zdFq2c3jfoCRK&98N*yjfVpk4uDoSaQLE-s4Z0=XM4mty+_^)&Truew^H>DCQZI)N$
zsg%`f$)7xV+R)Y!eo&bVe>?2JxA;XNxEwT0hMWrfXFY7ml=g0LM+;$Hm5eYgIRDzM
zbr`QA7ILtWdpr^oum4FtiAsYIuXfMWdr(PTZTCmEzdm8#i)bWEN#B!J^Rh83u|53f
zvQIwIPa0EXC4^C+TO->53^8lLCl)xPoYTYT$uSdHW|E+J<;49K->)|-n{gtH{70zt
zx<UgUZ+5SKW;M8|8E@;yq-mc9Qoewe#C-YJ@!xEWDaXP%SR0f9(ywZuX%SL%)XAOD
z0!lhKI3^}Wd9*ay7Z<ZYX#jeHJYCGaDHmZ@aM8d#wvH`f6WoC_w;V27SZ%?0X!tN0
zFKgLf5rmQY4CL}bn8rs_2n#F+8M%z&Pk5u5K*#wN483LS3Z|FL-b%Rzjp44*QRdWt
zHlhamwQCYvx8K$Za&OZ?ws#hQAElZfSb1cn!=~AXli`syaH$Oz@J#<8Wt@L8vsCi+
zmi&MI=Cvk?i-k~HBLG9nsSbr<$a1Y0qC~^@_U||$t4Kq+h6D8Qx|M-9<}jo2XoO;X
zCT|cEiP`^!?trSHYB>rT9kYs+VGQ17vJ44DM701(rdyh*7N`@2f4Av)mj3&z%&1L*
zkMUpIIA)pH4gI5H;aR7@vs1?;-O#JERo`)XzO#^yydmKHUM(UcC5}?oXc#elCpEQg
zTo}mGwl30HC_m$|xGwK{D&wdx4(O-PsJS+1gu_bwl}$dh<w2)xMIdJZtV{Fr1W1>B
zl+n(5J2B<0_JPP9-UL;riRZB#9STTsA<rS+jJA@jV7FG=x-XWR!l{v=j<RKN;T7tQ
zG`tqe#raX*?ZD^yc^;lrDZEL!8(!CviDHj$Q4=9Cb_aWs9L18)w0U&nywpu_naURa
z&2)N$;QDS(w%`nbEffuPV_@lRWx51t@kRv+cesg>48*BW24l4+qQ^~k9eUtCuO~PF
zH@AMd9KB8~lY^~{Aj8i=ZAJWjx@5!Vg|<{#f(fY1<eqt6Vn7c(Hh&F}9e2MQPQhpi
zQlx}SAzt*HoU{h@$u~(53l9oR1^pRuhVlfVpRop@KsaAgi=GJXW!3y(G_5Iqkx1Gc
zu{EbTgQVi_(0M(#WTKzRbI!ZtKTZP#Mg#-nrX)1GFicYJsB%t7gQIieO$zV0(8u%p
z9cRnyr=L-^1;Tekj}XzP^M`0=)tW1e2k&ONAZLDX2sw2-5qD^QSAJ9NcQ{SC`Fg+Z
zP^ymJqGqR^S;wB^zPj~VV;v!^5Y>&{_&9fOfhg+oqyC^=Z`cU)L(S#J9hC|8HD%6H
z9N)i9914LNz_YHNH7MtNI;LLj%q(t#`UhDK$@Wcle@wd!(|ZoXAVN;aLc3)sa+Of~
z{ZKYE>cLI(qeoFGe;uC4xupRv{`iSJe^;v$6=$Y{qce)|&W?(54H3m6cfP?ng>gt{
zfn1n3!nD210?5}^Ew3X*Q7S!jp~CO)5+?&+{~EqS_aMZP+MCvil3djw#P>V-qkm#T
zNqij+#iJ)UviTwucS>-p0(UNu_4I`?&z{b7OwII|SAvcnJuV7Mmf*L+b_LasPDoQM
z<MyWdD%LwSSJv^lhJRj!QEB75S$9QhFsOX)4@X)9SWWj^HlM5TPBV}UWv>`5D2&I3
zY1&AZ3m(gmQ-)K6CPfWn?9)ed647@D$VfBwM@E{+l<PXVC#qluG37+~CzPYM5AXA!
z{LjL;)g)^*mUSGWYKe+>K6Uj@;GH-}GJbVCqO0HM_MfjDn^V_ZBEP5?Hu7)dpFmGS
z%nlo8TrU-)t*P?{xC>vg?5Jj15LZac<SZ8l335j?;7AFgWm;+W0XAMh$u7FB?^$<v
z+Z(P;l;>7bG;N~IF7A|bGvG%jn&Wf6uv#Y^!d*VFs}oPgK418W6H3NKYw*;@ic9G_
zd|JEX4mv-^r5nw40SWlCoy&W}5rlAX`Te?io!rPnCCuLm0dnOTim{=5ow-ib>(({!
z&nbtiO=xMuh;`;-#%)7G*S!s6%Kf!5&Pi-#{bCMz1Ii&(C?VDpp~3aC^4#GcFW(&5
zVC{eGk$-oY0&ObXEA%gxZq|KnoG|fJah(SfQepaeg^Y(Vk9X|ON!fxBKM<38WeYzs
zn)u7$|KaMKf-~#7Xq}{E+qP}zjqP-7+fLrt>Np)c={OzRwr$(S=~MsB`A*fYwXgQY
zu9~B2uC>M-4@eQyKZD!<^OBp;AfvFTxV07wa4onqrCtAbX1WxSeQE<I8@x)|fC?Dr
zQxDOwWE$f1|6Ey}Q95zMJ*Z=O0}Je2`)l-O*1(;&RQYrW<JenY+XW7b`T1-mkMfO|
z+z>8aneI+>l3tFF(hfudCo(LADE1U~QOr%FGa$y0Rx%r#bv_(-E@n&FeJF2qE|$G(
zo*uwL+(4nWAyXcb5P|YwcXb)=0r8-Rccbc|ZbqhTM^hf6?A7&P)!oZM{Ml*&Zgus;
z6bTJP2VFQ@{0#&3jDD^L{c{mCEb?0TPsGtWOqbOO<J!vipc~M6jd8gqapR2aCrBkX
ziHU+`Wx-u^b`TfGN7T}qoZb!KCc^#Y=|O7ZTOZLW2C+~&yb;?{2|5Kk{o(bBTfB0k
ze5B{^ufStrNe^6CkJ5f(4@h_qi$3gUeziF*#~dF)+7k%JY(6}D=i?sM=RU);f7Suc
zlUh>4Jy^ed(>)+;uY$PJPuToxXbV_(Yi3AqICtlCaJ|QhL1d>SQ`@SP@3(@0y3(<D
zf$G=m!JF?9yZGb5BDp(Z1ux>#ks}ihTg-8;h)M5kiqb1z)BC}ZBiX!W9~yXftRCoR
z*5v8&UHoU6^izF^`;AcQ+@FOAx*?o5xGlq-n1qg4P_n>$Dylkf`JOWlk*D?F0gE=|
z6;Pu2rjK%_wbN%l<iU^H@Ldw!8mykx0S_RV3L}OFUjrW`ms42Fg~obD4JxlPz9mBu
zk^7o^D@EDi)cHEHS#_2a`o>1)L%9uVSxM{W-sW>KqV&g=JijKcYHU{Q-tBd;zW+Lm
zs&s;{`jG+I9UX!+t|k+%x4?dE>KFz2@YQ?M=w2}f>uelyPizGCPrzzkZ^7VgwkP_w
z$b$xRLBMYnF{S=n45<8C<li2_uGj<G$%A!z<=+qhsrS3AevytjP<?Wr5-7V_Ap4J*
zVj(V_7ZGc(dR*ttQVv%lzJhLUf>qM-hv<PR<v`!ye&>=qh9<$(9jQvW*Xl45>M54J
za1D#SVFs{Cy-5C6r0_%anW0W1<EtNKw-rgG3BAX=2{H{l2Hom%$5t~U4T^)HTd0pq
zXAAF~TGz1U`JG7@PtPf1NCiZhYJJnd^O@@}J>c(O6mH9)9z;R#9s=yH(fP$XLFs!&
z13>h6VI&XH#QEP1YUGw;4xjFBHQj1r2DDuPW6G|dS7*KezdVAp&!dijSdycdcPc;Z
zFxnYpf?gss@K)W|a+TMNf&sU-(=^~EWgSb<JGT2QC9zn_x&6?R0Al9`gC#@LUW5i>
z;bv6P6)skTtM1I4(;LB>&58<=_t+J#H?Z$YJAa#I{W;^JdbFUO8ijmyB64wU)cN>!
zqdQyrYTV$vlSy27uxhBw7nS~*X2i9*Fz8BH_l5nzEw@)gFna&VMd?J4C}v)>Ij=Y=
zI8_1DWh^T1Dv>55>9Jj0hEkH^-p6AB#^;&vQ-Ad>)ETbYT=QRYm6&LO*_eX}A24jN
zR<?b>dW~3RbQ4QCUq2|J9j|^fO_|alkn*ZRx?PAJ?rcMDNh?^QKm+!2mcm;7T$R;(
z_FK1N`@2;8a!|W7uyHNC(HqU?5p(J6@>{h^<Lr4<+b#jJJp8-y_eu4dwJ^q64*fOo
zqoU(o`%}=G{jKc^wDMf!0aGx*9e5RPnTkk~_)aao<OBYAg(4-4<d;(Bf!UB)zjYf@
z?+-*Ke%Bg%YXB}B7Ujo2{fJR9)GVB3m@;YT%sIUs$V=W>5VDc>tBjk8KE%ATC|e6x
zZj8^neZyzC!9sS62T(m@KX`NldcSdp+P8^`UocDBwkcq~8}d%)gGv<VfkeoC*CK(o
z-m=`{F}&<{+o}c(x{;%a1dXBJB7O+uUF(;?>;8UkENEpq)vr4p)cmQ+_UzVoG@0dT
z!?te2n$IZICmj{{V5*985zUU|db~Nm(LaxGjc>e>?C>;-s+RFdmNa8%@yQZnDf{9x
z?6m%@HV3o-piJRIu=t=lFq3wbB1n?<LFHfgstpMnDuT@+Z9m<zRpr4;om94A$2%71
z9`^|eq`MR-SCNQ$glKRAVk`iX9Vugm(o{r$BrplUn1wGBSe>tSf+G{Wl@EVHG!~Md
z@6AjIR75hPD3)*Ox+5l?n!^B2qo<=jY@&aXw0caU`*k9(f1QK?G3FWR8dp?NFAyUv
zM-4_b$&y5aJIx1&wZaCQY6%*?Ar6kjBde7#oH&}q)hpEGgA?~_7FWHglHnA}Sc<}a
z8zyA}=9SniQLI7hlw?l`tsy!ARX=QIL4Kbh-Mf5*rbxpve=;NyoD>NaWUEnmm<503
z8oHHH4m2n5+E5q+tx}Mp?Z%hI%ndYk;4V#!wnTg-^<G*3sHBy*X|^ZDm8y|3p;oEL
zBXAlF*Wo=Umur+*=X%PDbsKpZhLFy1qlY5qKdt<v>ZkGKXI{XO2)i=^l*xh=;hFSv
zp2Zv2@XY7|<+elQ<w6;~%TF5NPl^sn#S65s+1r)aQ(?w{Txn!znHbAw-II}Ds+JtM
zW-xMyyq99Rrz2QC-+C9<#oP_xX9&?0@>bTFChLVddE+u`&f2yfGJJ2=uC%%DzqH5R
z;p8;sF5c4!(b^%_Sn9M~sU?V9W69FvD4sAea%C?mIgvK;d`TBKz&7iOq={x;fRlP&
zzUbmlz(o$=yg*XnAIc<{(*(z0k|Y?90BF$GX-Aq}WKgXeG4wR*AgsKI2&@xSVKv>J
z9}qAHn#f|hYT$bOT4o~XZUP?5KlFZ1Tz8)3Ov#x7yFd4zU;X?Ey%sk)HuY)@I-mcX
zExv0re(Y1jmgwyUK=yRWQ%7sRc>W2-S?9Jhj2>tJ1}1lh+R;ig)T&l^tsT9Yyy<5e
z3d>PZToBBk5=YY<(n8>BGx7$CpMWQvQT}y69nN?C1My(>Ofd%&9RaV29@UZ6#S1JS
zfy#{lsJRA_Dnk>9!FxxNo-imeidkTjxAhp#B1l9SW7D<ugU|k`Mn3LiD8Qn}?A%qD
zh2o3^cHJ~^Be_R>IZD9?6dEIc5JQS~V)uO*Q^Q5<R%T%LwnhG`Y^F9L8=&Tth%rkV
z<YtoAfl~5bOzk(upMIkBRnvss*r;Zqq1nz3?uc5GvN)C(|3TsUwTaFRbIiT^zC-Q0
z;N@m@H|!Fkxq%W@ufQw$2b3(GwZe61zK(tnxRJlP0W(qB%k*)>9%qupwE`N?=dg3h
z?vzste#oPo=wa;O+IE-y;^SO(U%05N1~}KNwKs0SCEVe-QNqEzy1u$FpST-5GwkeU
z0VHE1rBa8>v4A=ch;d8GJ;D1>hD_qRYVy!#y8gw?cAfLwg5^rx!(`g7w8?5(_y{fq
z(lNQZc$-UlF{B+n{LJ?{%6ERtRNi`tWdu`|3sqx502uSKqhNi9GuMQ*(h-VHnz!@p
zF6S&}>~w13(DA@ALLpI!RHp12<Vc?eJsQ%$y!3UaNlbrjFeq3X(xZ#@4+SsYU`&E4
z+sh~UCYCe=C7ETu%^A#^M7~A92nLA(O?agTkeMco_(K&UGmugK)~==nFffMdI`KRp
z{}e87L4}O6F^ot@=pRsDVL0kBWx*<mwAnRgL1IM1Sdp&|_c9iwN9XGCGY0)opbwF8
zO5!3|_%Wxa8(?G)uvRIw5lF3e6S73pG`?E;A&ZCE8tLt_Yktpj?`8VP|8VjIw8Anc
zVPE!wnJkLG3Bnrf>U&H!`92~;?k5xuQ$8_;y%m2&{k8Y7qDc>Mr<ZW255(N#v?Q|+
ze=?@AjyHpebD6LK{CiT@Lolh^-)VTMq<Ib4H!qwkTltDvS2yq5f6F!N+b^`c*jWBx
zuHyZDFp92|<tRwH1X&A52HF6OrV!B%fLpp5Nd)=br$}v)It7<lAnQJ+@63710V#qb
zSOPC$^P5?gRwJ)=8v$pJ@MG`UnC&{;-I&4^z2atE2*j_BU#c=}ccpziK>^u@pL&ZB
z`36Zi7%Su{p_CvK1a|{-&5h(X_kzW|ep!pEJ;#eSW{D5TgS(h-uJ{*-#X213e+2ps
z^<t-!ck35PDU;ZBIetX9<=L+_#n`t?Jxv>3V8pLwx6y+0JMG0XcHt+2!yIp9j>!t5
z!#P96b)qzJPZl!1^xMdJ-MA1K;DfOJqYxPrF99xIM9%g>m-{2;>O&jb`C$#$?}fC+
zPyDU3+)tc0BQLOflnV*S`F0cb`p0X;D)3vt*I5-L2jh|FYjPy0uZ$>~qeB`8Q@%99
zx`5fb)ePTP@`wHELxF~kCueb>7mNz)loBKeQT|e^88Bv!G!GGa%^c?~=#3te^)zdN
ztVTs9#YW{V1BIPJl3c2f4Zt)o@2k7S_!6LU(-+>jVZS006Pyi9WS3b?M6F4jE0e)h
zmoBYD2=q)5E~G_Y(k3PSHz&)U*cR3pT~uYn0N2M)wJ(>>Rdv*g+dTe4MnSo5)FHRp
z>yBMB2m78L*)&kowMpF|Dn+w#Zi+BXH@Y)uq>(r(Lt060gXO?k7skb8RUh5l0~k-V
z<-_|N)p&ET`D_NpUXp9WEnuU$kzg|w8TL*!W!fIwRm4gU8nsJvI9PDy`=>~spJ+W$
z?J-VTB(0dW%ieQ-C0#O3<~I7<OHZvbuJHJf8GVz@_+oX$YoB2kEAS}93qV<MWDy_R
z;Q1x;xI0dJx6s#Vrymc~&Gz}|-!(qn+Pqv8WfpGHMHm2OzoZv@%wYwX50{bX9|+T*
za)oBTiTG#M!a7X^7JBV3%HMaevxL22&oV$ISLmBk2pmtX)bgQLVB{755=FMbOhM+O
zA?`UrM^VjodcyiVU{a$i7AmYqy<KQ6Sgg<Xu7e&LQ|Xdh&qOWuQ4}DWN9!q(<OEX~
zBhh2L8-@ZsK{X;jYc)Ec&j&%v(3tw|Z&5E$YI+23Y4Op*cSE?rsRnHvWj<iCd$`g`
z;+S(iqeBPRD~mnD52HP_pq!F1qJ;{{JhQTy6l$GsK{Lq}>S^{wIc2kqT?U42b6!Fi
zkaO#G1}!e6Z#mX!yUh3oJSr7@r=KF`ZM$Cr|K<MzO_-v)|27W_t-y5n!`1-9mb-_}
zxAz|BJ+ES3rkDqw!zdK+R6Z=l283csZ<A)FKa3wxABVVMhQLQ-S`+cci?>&Z8TPGk
znDvuI_AxSyeaYuza*KD2P6r6l^K&+WWnv!maochgXtG~75)EDQYP?o#L02#AxL|wD
znc9KM(5sacZMiiW$0nV=nCu3n2ga2@*yLmq%Qaa(#`ysvGq&))d1Pp;E3Y?LF6i37
znCZfwU1I>0nc&xF*rCvwU=F9)q4b<^`j4{r2-$seKP->5>{(Zc6_;Uz;71O^UP}}p
z*Za8bx{8x}F>!M<9nMW_1!DG(_`HuNi1&etNA2F){-Jdf{C_+?YgjQefJ=PFOSo_o
z&$Y>5=dtIL&u-{_g8N|i=?W;$V<)y>p(-KdRv-IEFw5qX?k-v@rel6cs#h8wws@jH
zG{&QG2lYpx!A&uXMr@&F`Fgi&1^$|xAF=4+=1nSK%iaI*9W?#xGWRiq5Le;!;Wh*u
zm3jb7mv%nIv6`@B#FzBk$M<!J0t_FTn6J}4rH;%2yRr$P9wX5A3X#jM#5h|~)r|=E
zQ<2Lv_(qS6qaIhkAI^Ww{PQ8Jo}^P&ZdT2jJ!cHYD(shENypEXdXo$NvDnKWw$CmE
z90eNe<;ie{W7b2sCRF9AHHCiF6Tk!0j(f;g3C%~qTErys0Yf{GTHxcRl9~*B{rmNB
z3nTWmKQa4l>Y+MFeEOul7=7t|dOhkJj39!X91@21bK{&CGQt=;56S6==GGPZjOjZI
z&5|>SGD>x~cSVz@b$ws=D+f#|7}bc@R0Qx2?6c&YO2Vk0*^76VS4&4z+xmgGzto)3
zlw{e9D)Ug+knId63%K1KWeAk9_==|*u9*Q)dUPb4?f4tI-5hZkMQDoP9Nb>o_7pzB
zyZgSp$YFqy0rRF5#N!#G07Rnv{)+v&)eAx1toFz`wVhdGUf!b~ZRL$Ec2~_6h!e@$
z*(SFDgwmx|D}{xe1-GQ2w`3p#%|KRDLDDn*hQOVbJ8p{Y@9`T2@Ds6~rVcdB?An(r
zkio0`OcB0#R%-Iv-Wo#+d0P>f_unTyLi4eY<1(<Y6AO~5KIpS3KrP-qMJ%>*%X8z9
zC?5CpCX`j4344GOd(zl<vu|vP#Usb>t3jIq+mW>?*}f0mHoQYf$39>>I8TJtij27=
z4QB+_y9-@@OMs?kzYoTHxv5ui0OM?q4%f0A@zwt0RD~E3dN!u`V^AAmuXEZ_HE6UF
zS!2=B(Jk-RI+C};pQ+R~2w&U$rc22P+{=+6yu`BEsS&C(QdE72q`L1XC`PCN8Yp8T
zLU1c*Y$+am=R@d`G%}!3Eq$=EGrC-IVI5I?V8x+ki+)`2`hlk=$+%H*7Ica;D?d3?
zh~xqK#XMH81`o#jBl`+jX+NkJ3w|owj@>Jsr@>SR(*ga9w0<AG7tQ#uv^tGD=Oump
zUfxkUt;mk3$0U~(M=u0Cs^faNLx)vYo_IY5x|PN|UJa5Oi+kXqZ<7+EVe}!uJ-6eR
z0KJ2;;&`T3RY&M$T66vK0jWEH(X8}<;DW6+#*g9JbbIXZqCt1UKUo&OyJIrJx%?N+
zHM4E&geB!QyY~2@1Rp<Ezf1P5t_T0J<d)e(5?u_*oqognGfvW>jLC0ZGhG^>#l)|Q
zSR1oqr$Sv5`V^o|?E3+)Ns_JuKMfIQ)0kw;rgLzeq&++0i2P8d^Is=5LHiD-+&k2C
z#3ALi;jU{D02Q}^qBKkkR?91l9i(BSV_clZg!wzkPf5D93l8X0%R&79>sJ^dZ~ve{
z?-OkCQD;pZg61+!y3|t1a1u^}xXj!Ft8v4h{pV|n(0_q8y9wt6YCUw-9?V3DEnB^S
zm74iHPL`oow0cxRqwtCDGj6GcT*CU@TkZ)6Z?N3fk+9*(>Fh?){T2oPGq$51{ChY7
zv!U4MNv20YmlZxow{w#$wnL`DdCMUCKEk~NFDl)#XK(2A7}p;+^G~%hc1T`)Fslyx
zFFhal+fyK?-uN?H5oN|TFnzlPZ5YKB!Lltc2TKPAmJrG@F36#W!f&jfVzN|g#d@g|
z)my2{!i8-^w4%-h=3%gfbVAl`MIE-cMR|C++03m2iI-+DbxNYNO4Ppk>yo=qN&;^B
zAF|3&Z<qg1fJVN>5Drx@=2Fz)I1akX$h1qs&@3<rU95Hb(@p97x9acEDT{EWqfgwt
zbuipE2IO$1I0uSc*)U{v%rw5*_UjN*d^F5)T<)Js1+V^ykfQ?38du`?ok-?mSUW1M
zMAZqv5Sv5L7KN@5^AEEYy)H11QPEl%!lA2gT=#D-!%|-~>qEYq0$(h|F|?bw50I{3
zRJ%Z|*I%5+Tsz0O=dkLq=)Js~C_xDb>jVMvFGJ#*g-SKv(<T-1aJUP@5D2ol=bt)i
zZ%dPSYBl0h@nG*B44mMd4}V{?6*iEuF#QlhDZCO7eC`|YKr(m9e;Z@8djj!45Qz!v
zC6yy9f-J$i0U@=xFFol)yYE{2H?KLdUfjSiJm{}$!iAl>L_;u4qo_*&m{kp6e9fP>
z)#cslA*L)_;{KhtVM{>>kI;zDqa;b<8F{hLhkCBiXQ_!>OrmUg=uI+Gu)D4+@nlP$
zTKLgp9W=9v?oQ;eY0h7gJ2ikTf}`4X+5&6k^j89bt>wRL2G?H+3OY$SGhdUB0@=Xo
zfpGFSnHThCFM+ZHPNr<sPL2C~^20|WZaewXCY3Pk9H*i7<7fm{Z>k0W&L{fh+;IZq
zKU&@g?C(*au$upm&^x{ps_t-BFI@9+q8;2<vWc|s5Vt!jPq{C+oMfT?zjyE*q`*K?
z*d2nw9XPX|<*0tELzD8c>10+dHZx#dD(#3dZAz??m2HQN1zL)!s#?UP8Vcu6vpTOo
zk>Tj<M4Z2cPO?qU4S(gNV%%WU&&*e$=7elpHx}2HPI3ap%Heiz4z<2PlIPi}!-KVl
zR9EGsmOW4`5!X&DPPwzr3v1@yG(wNBG(5Qh7)L^z<RBQhR0-!UxjfGC#nZq|rDfPn
zEIGaSH?T{|OuH}BFSz11qI2u73o73}*3_Dx!YZ2ZVZZ;mQoX%!vTbDdmM07n7iihe
zVKz15qj>iOtO`{i<o`5}aEsoDC-W=4i}#N(-8m*EnP1*N@@na(x(zjvW>+JGa$7>N
zThe(CKgVpq7tHj(<467jlBWZYO*_QvY&8RCW<h9?imV}d{_r%Ya6>Cs8Rc33AX5{}
zs#)tdRR_VUpq@}+NiU7+XlclT9MQjdK_uMH?-Ms0NIc?PE}q^D(L`+iY$J499{`m_
zV!%R&UmrCVoHHfM6P6V<w&v?+^`+Y+xsvmUz$<|8=?VoXT-Iwc*g61{IV9Y`a?jvP
z&S0(n==9BS9&~z+>|I5NPvrCFksy4e#+%2W2^AbR@9o$fgDp?~yIxzk*+qz7$P@Tu
z(Z?HiC@|#wlC(hBZPx01Ti71w5|h>j7fl9Fy$SD!szm-O1;wSZu1vu7$3)B|lUjcp
z{=VK+Sg(shu~-0hTp0mqA&v$nA4`H4Y4(kv$=553O3wU?6wG&GiS7V_uJ6TVedF91
zV!zj&I<J|Y-aAqIx9nzuE2@%k!n;t{Bxa{zYMfsunJy&Vu84z()G?$|XRneUu^s|c
z@f#qF7wMnJW=0z!pvjsTy<9}85>ix%13auepSqaLuo4$$UmXW1r(U>&%7M$My1&b*
zj_6SiQ>&r}j`Sz8R$D$u-kO!ax}-<dnpUmcs#aAGUUHG%Q&Desb;V!5>z35A<cG#5
zHGqO~Z(mL7)`eie8xNYHin21Sw#&LtPstpD{o+~%yOJXP;645MGTzH?KOJL%cQoL+
zGI_`eOXJUBiTwdE*_ABFI0eH%C8!1u3XN(|kjKI}cAEOPp!CE|<eoNu1jf>xa-#$m
z6o#VWjtLK{k{6PwgvbKokgWk`FYWCtqP;7zv>fGmdZ2d{4l%b{1t=m011F3E?Jv0Y
zQW7I}PD$guU2&DrFs>BLSuLW1PR{x(Ei0`r^%SKdanBfFxrKcF2YLthY+6c5`F8J%
zO~9V8hc(G(*E!`0!LTJohh$T*egcT>Cqh6mJFCUw3$B#)4M)Pl+|d^5a~fjQDV=sN
z;X-$eNyeGMm9u~A`s<-f!|6{ty9@Ouv3Nt=Nfl^5&GF&tz;Re;OgH4s8-QPb^pN`B
z{HfTIWK(2dhBj&wn`JpW+1Gw;J64I(U&E}^BarlyzZ3{jI^OUj4QzOl*|q_`7d$S+
z1=V3L3mh}5lY==dNRJ*6x<%E&IA`81x|<-&We|>kwV|8KGIwy?*q#D(44d09o+`v0
zl^DXvtYNa$ntLtI+*3<Z>*N}<R?iq49_TcIZd`c4k}D&Vg-+X`ws?7s=f8N1GEHJt
z#^Z}WF8mvR+o`8q1ZejoRy1BPG{*Ur6SB@Nl1Yet3SPm~Hh2=sEfJA+6?d^{wxN(}
zv~}YHB-(s9k_ZBnQ*Yopys^VH=bE9Qj2(KtQs>qUY85?$%juCQ1;?N9mkN8;QZf2a
zmy6+n!$&)dpdSclNfN0|@|aoE`n7%DIJcx4=iLCL{2ZgSvz%-&zE#)D+@d~v&e5@f
z?UG)9&Z(%A-3<}WzOg<FDegW<ZFx&;9_b1TohBRVuc+rzgfX;&5KKjr5^aC~R)U+w
zJGcTPK|;kj82VH$bSguZ395Q+L6~?-E_@zf#HRgr<vtc<p7H|<Y-2H@B*Ghb$YRor
zoB+h-BIZeTjzs$xd~!t<OoVxNm}!6F5%_8qj1!~r=s)(SGd`oSKzKA}Oda*1naV_1
z%K7?{h!Xd@Tgm-aM=}^n!Qzm%0S8~vKH^Gr=jk=5w&X_dSHx1aeBnv3-1SJW+|xDC
z&BEETKF(G#pnlALoLjUUo!&A!o5Wtl6{Kq|j<Oh5Ab?;b-I|?-BcaMVzx9u3Qa#k&
zB2k|3Wsrz97reTUQGquh-z1#=iV0-MC)?*wqa?VzRxC;8O_L2*tf0Pt@}o=pfH!nH
z#ddy7xw$wy74))2`nZkZYSEzt%Y{=QipX70@fO0Eb6?#?0^LH9{RqatK~x2H2^R~}
zrFnnEH3n<GZS!;)G~HWRCyG)GJQ|Klr897$Q!zIJ{FzhVSY7Kgy>;-qpOdA@CooOy
zI@3D#1=|@h9}!{FmqzSQs!(~w-Y{$BY57W>VA+cz$?gA~D*WI{3q}nyHN9ZKN8XL9
zFYt;56wSh|0E9F7mCCIkyEB4@G0A-G&g)Re${^isO@Yh6DVCaLI0`&r&B^S`-%7`R
zA-u~?O(Bc_vTgY^Pa$2<`(U@jc?lcY=-rGH5(OpUfK1J$SG`ofV$$X`68m^Hr2ARA
z9b`#Yn7c<H@Qzez63NuCD@@LT)LvE5+bToNCw0y+yb%OwZ2lE!D^x<l2Jd7Gv!y$_
zk1P)=xt_O@$HFCxD)HkqFllHNp$>bEwF~!zGF2L1gfIz_QyDocVaumBFFq!j+CD}!
zhcC8g<5l~BIcOFw;O)=~TO8cGco1A>#P-HYsF?;{Mb&%Dr#<;)`rlGu*6}>$(#<K^
zW&;p3N^sV)9QRjqC391f!NnAt@}7Y~{$=#y9S+~C11z4MA~dKN0R9dDc@Tbs7w$X5
zVG5W=jw1qqVq?HkhS*Z=4RY&F1XpYDo#WeT3pO<0xjDB4CY1aQrSw>O(g<8{(CGm!
zVvKM}G{$<Bqq25_%54PNnHmKx-C?0RQu<|6CS1~x6Wn8<CJ-bVhNCyYh2DJj>)+I0
zhS8#o!*w(>a>I=mYLLia(fmr)%uF7EPjfLK{poQln=qS}`eHnF0AsD@;hxWxvat%m
zCNqwfDMPPT=B<s-5T!7RmsezTbo3?~QmO^j3YqLsy`7n^s!RpMf;AJh9toRJLUcvs
z5dTSoB_ry^%)bCH5&pZsMTssQ)f!<QVAsJYfDfi2N7YOlxa7_3VALFQ*4q&o3<<@M
zEVu?=^UB7~%`|_^YmJZ@HDtkz*w15Hkf{{X@0iO4?@`SVY4Deq++V3QT63UB;X5wy
zqyC!@@`&umI@u2(Ttc9-sUZm~a~M250McC;(p>`5T?Eqo6FAZ{m6|DoF?<>qH>$9}
zav}M1xE9C>)`0N%!o?EToqAWjMc5#zH#jE_wb#x!?cWF*Yw#s>{Q&(4W>Ch(+J(;g
z@9Ng7jOpJ8!9hyE6KvdsJkB=Hnx#RPxHipAUA*ny%`2diW9q+LPW6lY`>&x%$IShm
zQq<_2@P-q2e{qg+vG%DN+XiGJ+@NbN^obcqH77FECyoQp>!kfZb<i(WS6$CZ!OB&H
zT@mjWIi6u#yo-L;9J!l24A%6oGnP^?vC<&e3T}jnuKhV0{OX6Koy9PD^3H6o55&=G
zf9Va3^cjHNGKJ|v>t$NU!LWKDlYsqvw=({~NxKg7#@m^WHO*t~&IaFxI&YhwGWmW*
zC6u*V5S1zw@$cq8^f*-;{1Iv;n&6M9Zf5J>hDuE;?>C^dHM%AEpuseN2Zd-uGy2`I
zJzdPXs*^Qw$LKXdvi%>wX$83^YO40S5$?Uz|24)FH5Gfy;jbUG{-WtjWvo&CzD5|`
zEE5iY_PD}d8Pq?P^pM4T(pAhJ*5bZz#pA;A>VGXO9Yv#!$)cV;NOJ>q`d%j$cqSZb
z!jjY_MADfSA@D^u^5H@s<TXWK7$zh|+dvo=01Xjb0Gk$=wZiOkkY)ha$I@}1F*j0b
zk0G#yV5o<H86vgU%#ms$_)v47Q8Vycqi?eo<@2wFA;UrsFZw5_wkZ6;_^tA`Fpa^`
zaUL6rVbv?XKNk2adl6m2R_p^|(KBf$(&?wvPg1?m2hbuU(ocf9MJc*p)go<}r@Tc-
zBzo}=Mn&<&e(0x=Me!t`0&}s*?1*HWA+A88xk;&t1i`olnmMY3Ilmk+Z>YJ_1Vlg^
z1lR>uk>U@NYcfB`pbLm1o!hSU1VJ0fRnMXj8pX$ow>4YrIfAkbAfOG6MxYe;)V7E^
zvIEmf&mi*~^pvrv{g<Ex<SSv3&+Us>(R-~wToF^cNUmAzJ;d8u*OQcTYY%JD<_)lg
zY7Q0pO@f3VwgLYXyu+VruHt>o@vqyA2f<Q1)M=;GH@sEXbL|$Dl#uuvPR=*}G%)gk
z&iC4DNd$P_)dYl|%a>xR9eN!uWNpVjg@^v_Q|UxWg3;K|)rxw({bSn@Wsc?rQjs`2
z(4iLL`o8`<C~tKcQ8)cf>`c|~@*53IN%jXgEC>iRG>BAgmoOd@PeB?nADJYmPnsnk
z84*w@B2v#MG_g8uqbb<oVB6X_hQ${|DEW3Hl7NL|Ho>)f__FmlCnx7>c-o;9gjSPr
zk8%ih#;HR1tf}6EJ%-NZXRiPR8Z11-GlraX`rJ)GzP;wK{sF%2nq*kQyTn2h8DZ4(
zFBEsMew0K!ePkz`l`f|XwN&_KvxTb7qfFqL_c*r+U40?9snq2n&fR$2HH3acUqVjK
zs@aHI=r|4}u6|FZQ~Tgy+~%E?Ss4lb`gUV+>Bp*ZR4#K22jXR%-J5%@17|1(9~2(p
z^XBhlK$j`CHfbv2_RT_AuRV&oh<J|JUu&XlbvS&35dGTj(ZV0Q)}Cd%b%<y#yl+63
zJk|9hH~Jlz{*yt;Q_nwrm>Bdlo+Uf2L0IV)nt5Rv(*6Jbs~p$-%j*BGIW^N|%mE@b
zP@rk*+lZnHesqsAE7k<gRK{f=9@Yp887aWEqo#>yeWPsy!R5M7%|*@ZoK+iL#&&NP
zc@#TY!n=SRr^mZj_J1Wy+WuDp*uU)Hw7OgGzV}i$uJ?N=XM!WtwqnLuz)|dd<QOG3
zzG*5Y?|qe{8IS9^TiqzDt5fg|Q>(nPM3&}2xsUi3Im4((8ua#O?fmuNw3MI9&o?;M
zj4Gs&j;l5NRoiK6Qx}0us)|S3K-(^hXj9qaf*R^?z7H~XbVm%X1aTZRt90_5KK@wu
zR7xL&^8pUqe$uU8KJEd=IAqjPW;wHCwc87ZLlAxCCe~XHU8*dZ1>*wi$TjKY%ra_a
zt3S}L035OboEX%p8Hb1^*Fzbvw_NX#)x}>1|E;>;Mf4777XoBJpwM_qZzwPTsA#>v
zIuB9pgfcgg>BZLJ#pl7*{Bs#3%yV%FQlGtcvnNh?dES9Yi%rpO&x(@RpSji5U5m1P
z3neA;NX_g)ymX-RMJ$`9ybAtN5G^j1bAGGs{!xssF;XV_l=w4Nf%?{_Ks6Qf1zV>%
z;Y-bH>|$g5Vq#<f$eY-W%99flC)=M(Bb%k~ZHM4cMPym{ncp+C?tvC)ZE8`u72TLW
zd*&*0r77RvC4xU8mpq@(IP&MaobBoE=iA5xLz?7JLbOVX*}$gav)24j5*w{qe1GT8
zozDPZx7J}S$hKafi7pL2e4Sp=A6oJvFWmn}J6QO4vrJyDC@@(qBlLq8VHp$q>o28#
zVV@A(4EQ!Q$JEOV1ShO*L5fLx4-|wutZ#&U94UX?KIKo=n!vSp*$6lVT5QKksQPcH
zv`Qf|GKBvtW@`PUXC6=x5d1XeSyZYt<Pb8{w1`#~q%?A2G8*6qCI%`5QP1!VOvED!
z2`;P{TRY!YHbK?4puRq6Lme7vyhgwzhz@*8E62Sh>4Rno{JWmX@Wy0FQaKJ!4kJf=
zY)XgF$)-|agTiP-zY?29Yzk(ig;lNVp9be+_}AcmP*D=r=fwOib?qn2zxfT##_7oO
zXTLSce;B3I{4@pj%A;E)cP@qE#!}blTQS%rN3cJ3P5Iv!HzcLn-h{XK?dffa|021X
zz4WX2wOQ+c$(foqR%7#J%a;>XTt?cX9bgwWCG^D1-hr)nlK$b%ol<9F`K^WAJ~E3G
zn4l0$YUaAFZn{NdltG)bD13W@b3ua#4I`Ul+ffMcdaR%bG#2o2FkKno9ZcAAUJ*t(
zRQzvI5+J3Jt)@AOkf{Qdf1*jEe_<wW%GcWx2ia+-(B^@X*wiM=&|?5<7t)EPh07WA
z`mi;)+D|VaPms<||N2?Fyv=kyOFlj*U}6+u_hw~f@OfN)UU7L`Wq%%T3w?tn^u{ae
z2A~Wwn4-%`&PJ~*`^IHJclFq!8|=klAE}wDZ>Zm<M0w@EXb%DfFyH{X=%NZD`n~l*
z@2CgusV1-YsNSmk=coW4k8tS-Ec$Q^omjgex}zrf-(tO08BcAa40VEPVIO+qNqIGm
zS?bI86_dPNq3un3+%d<t^Y_@7Oqja*TpwYlY}0;6cw0Fp3%XPA<F_~-a_cKKX6CVX
z-cDp`F47)5@r1ze2~<i4o?^=V5{K3}@El$~%ch%+4K{>vj#P$Bvv#ls-*HTkL#&CZ
zsEdc%A224RufNQ`@`io~5u;pHy_)*H<FivdTrMx^E*q>o{VwU2#Sxs+4Qji-!=e+k
zk&?>2#78APQs{Tq;Ok*Idf716uZ<FP;n@X;OPR?e#Xkia<VM@GX}jxm3<YHe77ok@
z6@`)Ls?`?k>hLEp-w}?^DfNg#h$B!`(s~vdA(%m6AgEW`tn`?`jFBk+SqUIVA*n4N
z&L&DRUUOjQ;P0h06J#Tx_*%SM0Pr*e<huG*5w`cCAaqc#{47~yPOdk??0DS@8$PoZ
zBPKpw^6h~$41(5mn0zX$qNOJmZIbDnx<13y*E|$H#~iCKU5lo}C&xk^9-QKQ1LqUd
zE?0Nq6ZaFmB#K2t+lvH}w&jR5-MJKvUlrWF`>usP$VTaY9=Dyn(Z|s#jZ`{=DrPpV
zY7C5SR<~p?r&m_!jHD*&XCiGnyrV%UT@=x(t1ZBf<APOU*kIQpE)Mk)8IQA&nq_V>
z$6ca_gQ^7`#TA&++h&8PFOb4BO`%4_OwMJDf04%b;EuMrI)W7~phput%;E^6Sv=Y3
z@ZU^56)DV<S*?~%7%*?fD*mVUtD<ZI^6dU%biwA4M>hjR3Ht6$LM6(WGI}D3rVPwI
zR4qWczaezklyuIil*mCcZAX)%Tb$nhgM+O~tPgxAL|+JZObJQ(-BjyJYf6I(q@*Ft
zFv=t|_N1vZBaIFU(zGxFC=P`}<>ZH)kP7Q?^IPMHWH=~qcTm2^C{$gzrhXtOok%PK
zaYbA4vTqPEr@>O^qUnoFWTgfoB195e-BCb>Ph9s$l$JNk<19rOrZ7-niBs4}Re~H%
zsb%K5$khSrA?lKZ>V3#TqW&L6mhdF8;xS3+L-bdMLF70*a=Vn$u#}@zV%R~qYE;u!
zx&=HUDqylN$puJrAF=qaNdJ{RuJeZ9HW&!VBqRukCI|?KgR@0iTMHFwTAm0Qa+-Y`
z3t1YW1Q|3i$yO73+*w(zBPfqjxE@?7nHW~2N=;liXxHm6d~NNj{N)tb8;zjO;a?_C
zubUqq)MGiJU>!>3N?mf(53bLrr}J$0_c!lIAUx=ami>mPqAgV6@6!CjGE;NX@FqnB
zg(GDnf0)%`SQ;i)su|32_R3vDMQA+Fv-1C%w)?UGE7e=Otu+Yd9+LUTU1>`k#vkic
zP;}gTX1Y<^%otPsYNq^dt9M%Q;_M=qOS(nBIy5Y1qN>L~gG?Ynsp1zCj~#Fe%wY*V
z@%o_M_4@C8?N_RIx@>rda#Au`$5I9x!9vk|4d6MzM$w{(+GHE-VAox6KGg1+U+0=y
zZE%}_799-)IS$yw=uKoll090I(lBCljB}0lz((K+e3qh)BU`PNxCSwUzkFEXt9)|0
zRna?!66_c`XyeFm_#>+p{kjAkAU8N{P`Xi)P1-Ugv|gIpr5Q)D-Z5*&jUj1=tn{7$
z+k31yVOM`gEsC4N+%0J-+2!`~!z9yHZZ-RXXmU0qCK7|H2!B0G_FBVuCfF)Jz8MWq
zcm+mO+%k27b{9h(m&%qL0EBmJ42wQ-{x|sGQC=#dVYBAcWKCSH)V8ZryrPWia$K@4
zt~KcjQo4Ey#ovPtO-_2I{G-o0QSt~@uUVDF#yn>Qbqhq#hfK*2xdIysRw)<4$(PSS
zesA|E*NzexV=1MqP}+XeKTc+(&yRnUV*vDOG_iH&e&nN%E<TEcS7qOjcxgpJpbc|u
z@?23{7ueEm-0bc%W5lCUlwsWgesN81xH?7k`^ees%W?2Cp|a$WdJl;yu3rJ%T44Ky
zIENs0KL)x185*omQsjbwY4W(_+`L-g>A(o6_FHn-09Tn)7U`ofsOz3~ypdEqSt%XL
z*@g0fi5gFPP=zw(eoL6(UFzTS77?D4hwTmWY=Fuz!$yhi^-LGw>C==4Ie(LaJ`$_Y
z7``wQmbAM}S9YE0zl!jF`ZsU$0|X=h3Is&`e~MsoO{+AcCjOr$9@<!lfmQ0ODrm~c
z0zb`RM&V(DaDQ%~X+eT>1>yBls4FiRQdc|}vFaL)m{M}Mm{4~Q)8_j19`+*LxKuhb
zF}y>XDkF=&I=8>eJ)d@M3b0-KcX+`WBDZqyapOqBT6twf6+(5YoF{1m@i8G$4?MJo
z6XJ{rEU+7tmpuk4!cx`RfFpUP!B$hX0@rUJ?o}##yG43;(5E9%ahDjEGbvA~Wf59j
z#@voIM_4WC2lu3SFYyA)D9snO6aAKnKmWi>Og($0KVDGp9r$w*g|MZTtprK-niz>I
z`i{c@>|48b@*R9MHgWhZFru1E>j$VJo>mOlOsT~+@2URqH-zH70O5`Pyy9nkWPJ`a
zZS=HVdGr6J5s`1nA*W7mP5aep<21nEKZD82mhN_}j~r1^TxK1u71q=^$UJZ+qB#Yl
zZ*<~N&2Ak>WzjrAaK9mizER39oN6KkzV(n!;Iv(hoOt8qm!gg|PN(s)*3n;4-~TJl
z#S|+@`@~U;MD+a(5BNBKhJelNmc``=N(RY_z34RCL!ry*2=TL+vxLmX5P#WKm&@@7
z7Y^muy)*NLWy9RxPaK;9_F;lvM-y4;5=(Fon~tHMcG}C3FS7`&$j8oDINq5V<ns1m
z(HE8H@@()W&Zp+j!eLl;H4^h@a>e&_b~F()j}{|^!22#KK_JiV`+&U9Sx8m~g=1-*
z?vL_q{X(JoBA~$~cuI<azVsX7tO}v@r|6F1ysD`Z&8lal5qG24JMQj01>JHUHk0yL
zpt%WlTku)iIt^1@Lw<%^<`a`fTSUKQ@w8y$uP@MbsX19m3p_1MX$cj9N7M`P{abfl
z4w&E9b-}JCvp~?x6LRVE7`+3E;BK@vnfi_OQhLL6Fl~Ji9OXC6yd3p*wMU$__XPu_
zhGV6bh^1m{)TO09@3eocSOd6WZ_GTZl%mvyq`KvZa!s0BVprPRA8QlwC+tG`!yhp$
z_i%*i1}ql-HpyR(bsfcX#Z7oVxXUzTk(~qNjeaZfnCfjaWcb8#B-=E`LSkv>`SD6z
zMz})>C5%_aSx7U1WJQCH$psk3d=mV_cy8G}3W)?ojVcy=Cvpk=760I;{}miwM5<Bc
zKfzh2-6GJ?|4(G^a%AGb+?Ok&8wf4Imy=+jUaIB0riI1_qLvMdpwJTcS=ZMd9==S!
zuFuQs3%|tcudg>e5b+jB))qrUbcn_noLVPkE%6^|j;lTAp8Y+U*gwa0Ah(7>U}<pD
z2QUbJy6Mh4Ws?ZdfRWU&J{;X~Kvv-|@$@@Mg8Ozgwhk4Vc}!9Pr}NOfs|{Sp@&&K?
zI9f@J!vc#nY6m)*|4c*Y{tS9d=&b|?jUVg68_oihWHVc@IM1i>BQ6&cI6!a`>@-1>
z$Ac|5H+Sx}=v7VDB#)E4x*xnsD#?Q5H3o%J#_Q7b1(1xn#p^i#L#<Xb0CaX!<G?MY
zcj*Go{I1fHB|3G0)zdvkBX<Xg{fDJHJ%)BZvPRUUOM4}BT-dBg^TsFZh=uPMqg*&c
zZDi7{uV+n!hUYA4<HkuI!LCUF=+X48TTj(;g7cRALb+<|l_>sd%ehS=MjN>l!#!|F
z*9~@-SRAxw=88gNW5nxpM@OCEjz|dlvlbI$7<Gbi%BupPxiQ4`ndkHX?H1Q9sNllw
zugLgY7|~atC1Ds^WKS0!`$cG@&qfk_a}KO$DC3brbn{ET0={?5_k_sY6aQog%Arpl
zZGY>qV_s!=fkgW$h;<HR+9AU3GEP*hOxOCC@~}<yb^)AV#yB4ohng9A5TtkvK~+|t
z>e)7h?U@6RX%D>$KU!K<f5HuZk4)<>o6IT3l7}=^{T4@2zY=zr5Z|RQuXkqKwJ^Q;
zGJgY@H@CB<=zkq0AYkY>&{b^?fZ=^U2)c?_#&Tu=t`(8<rmQtpdz`qsUWM0D`)Chb
zT2YK@w4W5acfzC`Jm&3_Z#j9(<8!4p_qS<cWoZL#YlHW)##Ao6o61(H7uA%mvo;hy
z7JU&cjAprr>+);*3D-_%^W72zR~y*YRLKki{W3n@akS^htUd#hOfxS*;CHpwaOyqd
z3Kn*+XQKtzuq5Hu7`@$R+o9|LCTQh-j4I_!j%^8V%ejP#xiZ%xxl(4T+oYL`PczNY
zU(>)}qt;qctWS=%hX4&S;`@MMX!yNbGS($U>{@?`r8kKFr5b9@?%l*kzG_XN;nEu#
z+>!yzvepT9N%!$B*rM>nlNQ~%ct^5YeFU3l#!ZSFW{na8&PET<ofY{wN7itK+NEOw
z07+joZppXL61>!kh<v=j0J3yOF-XCfb`$se|LYY~cWb$H!9hTfVbgZq5h(w+!#;0k
zK~KX|CSwMw-fd*?hfg4vWLpvP&4*7tuwFhq{p1y(t7akDc`$3_<@I^uJNA9I0=_(F
zUV}XJ#^qytvUEg0AKduE|9BCe5{w~@?Zpmb#vfGoMepZ`8JGz<cODU&4Z?%1XR&mC
z1(Cqmh}ktcK=&=!QHAgdTSDBtZ=sVLezH%`5p)3FLO^o%Bjd2zsp^_RQzojy=g0i*
z!NI*RnH;9AxZlW5o`Pra8lI`5+2lBUk7FTEm5a|eDlm?3_vNwh0W{M?a#*ZyOlmr-
zzWEDWw-hI9E<!wKiT}DIT%qZA@)~P^@UYvIslxI5QNFjZ;!3%nV5jHGPvo3n+=kJv
zbW{ywOfqytYlI@0U^+*7NIor+kdH<p#LFX<lZB+NcC=B_pc>Ij+a1Xs<v4GP^NIG!
z(cc5-wTy5J`}!F$mRE&?_K#YA)LGA%S~fOaXi=u)vXPRtQvu)EcnDZ*Fy(tTt_U+>
z(k>x6u&{2@WEekVnv?Jmj6JlLrEj;tsaFKjLYRPCj?}uZpwsbUEbpMwh~D>3c$;C;
z>WgLu1w}b+Xs`qp1W99fFc%x+dSGm*vII|~Z~VOF=~7~@Fh*<(^1^_`RCA>NLv18I
zXq9DTc`s{n>Q2K^FYDTkK`Tek_OQ4C0zpShuVh#AX>iBNe%Vhq!Q>*!yy071HopM8
zUB}Shg;MA{CA+v}GCH;2#%{AAL2PUp5H}xfkP>)9Z8fcGNE$D7tpF5pr$`+=kE@_p
zTcwQ@KEJe$cqVFkP;(N%^&cKEAnXg$F;V@Ad(GENT%;<`F+7x4M4zl_sR?OKOH*XE
z(V@nZh#I^YFs)|h<l{{wEAI5n;vNCIH5?WvSwX`*xckG0nz#)k`I#yrR?LU?=d^#0
z@fD9UjW^gB@`^TkicHWd!g?H<R;@$kuZIK<uumM)^{+&#KZ0u(X<Xj`a{BEs#(v%x
zaK6?Y$-y}tB}n8{t?keJi5R!@OPR^?A(4GvQU;5C?|A$!g15kIv1s!(QrrVZ0kANp
zEiT|0XT<X`Tx)xNuNBeHHIhnQ7d5aCoid0kN=!Q*tJV&)!|b@>lFgNUMsQhH+w<+n
zXBATQd%@x*L~8{EE&j5rZl`L9?4b<Ofi4!MC%9S_<Nn}i$YEZc-<7o76gGvE;YE$N
z&9jG_t@fl=ATl|Hp5#={)!+o?35u!ez7jre1KOX_5vKQkwbX|W`RR6+QRxchi@f7Z
zt}#W}bQkEoBj~MNpDcg%)IL$wuNkyde8y^B5)pm-iOq_0Z%gnUid%ZH{`!lk`|vlj
zpQ1z5XG9B3daNSwOE}vUE*}R%JGTfHUNywNUOb_AM1Wlt8f7G0ndDs7(W|C1+g~lO
z7(+hO(jS`Q0XlyNtt|c%m$1?)z}}m+n~t0A=S*cNqmu*5nd(CaM&uXNe>(xW4Ac(O
zf1A<BG?or<nzWfpV#qY55f+5BF?BLL(518^bux0`-;banB!704?<A)tWPNLB8vmB;
zjAQehjO>hyuiR@PkYwhx!02|Ijs6IMD+}hRI(WjJ{AfwWJ4RUe)8l;jNw_ezE+q>`
zT5EOY2Mtjg%%sV%86r<IQq#OYV1$dUh*f^jyygrsIB%(FTJQA1ugs|TC=RFx3{o_%
z6njoU`Vn6}^|sSYd3&)+K^&p2RR6q&8&Ru}RQ@}Upt&rA3Z`l`+NfGRwj~8^N{#H1
zVut)ym=x2Q*D0&<MYpcWPo>w?7GFjY<GvBp1x_)wCIT4<^E9I)une4fzTSG3BQvtC
zJ@Z%+k2dVED}rJ!%$OBZYIhA>4yt-I-n}Vc$11`=s-4<}anQwY8CPOk(y*_jPz*a1
zLhl48mQy2GaU{VKy<~p=p_phbB*mNL-NkRDU#Z1zhY{l?-3yvnfkvJ_BwHBPi|=CO
zdjk^i*@5vnzXG}A*9MqZrH8FF<&9`<j2gz2#+cA~v(pf2?y2*g;E&)I_nQ`C5Y3W+
z{87ixgLkV({^a&+rNVG`O+D>PsB*{aOP{&)p-&j}Zv60T=PwU2@9T4zXV@aY^~u^e
z1mx4C=9*@`GU#*3$yPbOFfL@zn<XvQf>v`!60ZojiNpO9AFy{}y;coF(RX`h4wC<d
z%lb(91>a9(U{h9{r_)Q?k9+|b+v9sxFRn39FGO}o$`>I|O&Bg|tCfout4-34UDVzY
z`tUc%7f5P!9=_e9zY*W05ED{Mnj6#Xm*k!KH}A3jTW#r2p9CKN`p#PDwAlzU?ld72
zGN`nTj(-Qn<(g!OK!Hv+!mccD4;aYQvOK7+(173V(20g+eTw7e0V!sjjeICCS{hoG
zUg|kpe)mu>F7!Scal*-c!cD9K^K73FY?}gn@4NGv%^=R{T!zLyJs76yY?g-5O@T%S
zZB8&h+no@W)g8n*3L))xO5%iEV@|Oxq_*xtsIHk^OW4#QfmO&0+@cPnXufTAO(Xq0
z7PC~7kt#d9{);dI99tUJ&V$j|Z(|5f+hlep5hEVtlj-6lo|-q=)O!ua_2?nvO}d4x
z)S8Lz54tP%$j<9%iQ#>>mu_4h{ncuv$8ezmu6TFObkx5%`oq%8?`MAL6Jz(ezSr&-
zTTHnOKY{540^^CGXA*L1KxivAh<>7+xgJ9HH;Q_i*Dh^3BaeI-t9cy2icagZ!t0%j
zv}h;$#u}9gSfk?`m{~%tM*y06%EaYsem@K(#;p%nP_>BHp)(&K{VEYa7VA%6bM(@q
zpq>+PGgAwaIB{+i3EOX%4_`Qvf5`hetcUiTz{L_61dNkLQ*Ei)4~z__{{4bRK@cw|
zXEHQkGVz<bu)t($08L4PGEQGdt>1~#SCW36Eqc0z4u=pQ)+2|NdwmC?t3pZfvas7{
zz>!UN4Jy#q{jMj$t~9v}Hm#Mu($hbdB#qI0jX}&z-|YiZ{Lz$G)f%#iR8*0EJ}N)>
zx#~tO>L03;lK`FTph264aF~NX%bsW0z-zQ2r%HFdx8zS=RfCvs_27M9Utcc@@5@R$
z{|%k<{Pxpa#sA^zEu$h?mabu7aCdiicXxMpcXx-zVX(m)cN^SY26q_T-CYM5^y8f8
zTkpE}{)^R})t!}D6%n~J_D<9`DK+k}WK3k&WFb~)100scgo6E3a0|awr#Zb!%%6H>
z@$&kJKeBn-=Zko~1R_~SF|j3k$u1QgrqH5)eS*S{s^sA<aNPq6Th6-_0~$ddnIg;3
z7!K68DxM)mP9BT7NDN8{$WJZA9f;!WlVZ(HcQ96BykEGRWlEYphGEXKj4*eg-lUUu
zsj^Eo#-GVLPC&<3MI7J=^iKQ{9ONeuDKm@2J(*YWDQb(^UmQqSO3P4xlFOYkCHlh{
zj4>{{+pXDQD^LQgqTs5&>Qp{NdjBAPTk?z5{xn^BVY1Zv=r_*FIV%~B80yZORidu&
z!aV*hvz|NXGiUQaGz4LbhAo`gKd)pcX}u`%220SJ7$=F{o9w}Bnbb#<geBt_E6AfL
z8ek5;&ngphP+k1;hCOU_@&W(f@1_gyH!bEyAfrB+GQhzLO#(fzbkjV!PH#<i_BjGG
z1zZjoq$?j3ViS|-0K1x?D=e^nxx%=4@pv)aGQ<=J1neN?XYWs-EF={jKYx2uA-pDU
zb_zm%W4+(7I_jD3?gYHQzvh9!KC^~`##S)1a)*cLD_Z>yWy9(Efpl<Z0%^vbReDH9
zgGoUv18`R?yhk-im}rZZqZQOtv6Rkr3((RxKAAeigO}ye-hqcwSUz5C<Cz)g5V%HR
zvxbbn<hb~qdWZQlisB1}QI2`1S>B)TqfOKudh*eJ{DNKFxg8;Q3rR9tc2sUsnF}?x
zokJ4vYM8uF)^qER(1+nGRdN`B-}aV<>J1)c0p`rH?->|`YyAlR5zNcoLrFgChRq0E
z%*C5?YzTw>e~LlvGW;lXfQC|4Y}r1bGw?5&YH(mKHiEkKL#SfgTgKR`b|P*1C|zUB
zYX;Wv8Px8!8=Y${**Z~!@xoN=f`?-*`ExSw)3Du(KaZuQd6R=>5l)?5H+SjoXh<=V
z0pxlj_`LdGKeLkaQZBDHAjd84)W&Clp@z%2kA{HZPs^mQVq%*vsWAXwQ_)sh04XO%
z;DfL{`<t0=)(Uk>#{C-?$437#ZI3bcXD@DSK`%j;)oaY~<eS44bi@RcxocYPt?r~*
zPo-XDZa+~#G*m;ofpJ8lV@EKqO=8R)AnBZe8QnG2zqOlu5w8VHO#$)n?nqIG9;M@h
zbQ61AV0!!(JK%$}Ls9Uj-A2?J%Z({XCuOS_=^dA~bap~A4~^HFkNI{<0PU+)MNAZL
zQNHROfx8QUdlN~<w@@{Ue%Z>_&Ad&<fO9tjUh0Dn;_u&_igb20nxAtS)Qg!}08Y9^
zI&~D--yQQ0`ha#@u2bvhdhWa%Q{S?9z32rmrC5_0Kh-~Q22Vm;l0xsfCsHDx6@+Ux
z7d8Z>WBEC=x!kwV7b36E%+)e7XHU1RCe?1BwL2VZIEEv5?lCDkps;g;oA2KQ+^A9&
z9vnq|!o*c<(7qFpCTi$P2SR<F*$n3KO&mRWb+FgmG)5kM(Z1n}D4VJvApS!5V9#3F
zlCUbQ$O_eh<M1t#qG(&psHJ*gxxa5U2VGHZ=XdW&(8srkKSV60pWterIB6dsTz?{W
zUYM-UdQBBR5w=gVo;97C=erkWZ0HQWZw)4T!d&e!RG2H_A?#E8{wy`x$5wWM9b?=g
zNy*RiA-G1B?H}ZhM^iP~rFR`A3r8!iPH27_otEZXO7>2D6cK%Ii=y`-Dh?pc_}|=a
zPX%CO`IXxRKmb88z^VTux$Euz62>l3H&8+oK^G7MGA=m$tt)?y%Wu){P*+B^V=oq&
zF9t2qMcr;$uQyn^N?2W;%QGwd05M8<-a)#N!nsC2m_SzbUupN6-ts$|Zs)o`fBNzD
za%;=}8q5K|GL>a|LQNlzHN495wk9<roj?X$LFD@OAy1gw!Ar`pa}P)l!2zCa7i!%8
zPXBxji`5D{f98<#^#y?7Rvd=IkNu(cKK$#S(<%{ZT!{~^pXN^m&+~3r1HIa$v97|8
zPLxXE3AT=rv~HN+29LkJ<pL+?+1%2hLJQO1VS5B_mPl=ZUgh9+O05JA&pIz;Ro`&x
zj=zr9V#$~*hfFiG48F*4g#~ElWYO}#!DMu1m1)|qfh$Nm-)$+<h5wm6#0-B4-L9ee
z#lN|(Wk(%Z?&djAta3N#sSbx#;4ci&5T84IA&#iu4?pxk!Hh^`PHbe3?1I3%r-a2M
zH0$dp%}w_nzqu3Q8)aVWti1+T@T=|_GZ?yg5iQ0mo?nlWdRyU^&jti5<+*^l5ZVqV
zoJ%>LsV7&ePTb?chs*P<J2krdPTi8tk>`wQ#+(17J%vz+9?h$bIhsG~p>o8f)N+kp
z`jxc>K53;m^&(Vet~6s**cVXqfjIW_?E<R9ZhNyIeeVHmHuaPTmsrkC@|<FA)f{KF
zZ}r-E+qaiNcOO?iP!y2lZzlvo6Ps891r4N;rGguThN5(J8)k&`L|G5LolIwcWNvd2
zPb*|57a~i23vs`*`{C{)bQ`4ZXY-;x^9B8<{Oq<%FWx|349sEv#s$qmeMb4-ySU#Q
zr_!*0Fmww-=H5us(0IEm^xuKTtew1u0UYETNEpojK9{0qWM}|2JPq{EP0M73{;dR6
z<<Ldl7>EAlkVSPFhoL5QTUd%><9b`*6b1d}#qcJ=PApSATeI$n%EYtEh*fTmOTulR
z6wzBzc5YTvO6_>i(eBp0%k}lfJ>T)x)b{7wEme?66n7GKRPsXuzT(I&tYI8k44bPr
zLqxK-Ks?Dou`fW=cROK#=VvZ(Aj=h7^ENHID;f?yu`$gI;uu@>bP_!@$!j8{pxKzm
zw8}6C!*DFUd2CM8Sz#cTm0#`*DNdHz=`VbjwwENm-od8rBJ9^5!U&4t7N@^af?wN?
zFNQ!lZt%@!yYLeh!KS-Ffu15U|47{*3b&iDD9yo{GXv-}*F)@RAwGhhtK{3~*u@Dx
z<b^l%{Y-D~52?34Nvo7Q*vJL>^Q(d4*8zjcF*z3ro3<r)K+qRzlceLmY3#jJi_^z1
zW_oUdT_{)MWyg-J5%KX(5I0(H;lNq9n6H~$u1++O;ieI*{FY?J-J_6DWX`Lt&>}oq
z*Q0`gPzFF#&RB&XF!56HmdnM9vXL$GiFzKgP+KtH^v3{7=eeKf(qv8#WRX3{DY7^1
zMn$)B#O^gjcquEpNDN>PYv?aB2Ny=jq_FFYwMNq*%zJAMcuZP*BXO~R1$uV>s4QIg
zNn2(WOYTo1yabX}YM=u*Mu5MkNV<84JF)WE1VG$iVW`yc$~)v8WMoV82u(>iUjR?T
z<YZH+SEW)@JRz^up45|BAam8Jb^KB-!l3M|wTvx%WKa<@_fXwh;&aPKj$bFwE=-|y
z>;b$wEuu1xjyYk=bJa_H%)U1$^p!HJ1E{)c+_iCWvMDAsXL-^}=I+WS-{@TO5Fg-&
z2IziD)p*ZjW(cL8=Ny=~682Z;vhNroIPHJboUu5u96^{z@7d;HX8xu8MwGkFkQs}7
z8zzPXJ5Ud>Q0^JLZK#vDIf0S69^CsFiKl5sSucO?tRhM9G!0mx!Ga*@Qt70;cUaE=
z+M%Tx72?;lS=ddZ9&Tz*?QrX!p3C>00Mr7aEPY3;?Wq*XGG_6wJ_s(BBRWHequB3e
zZqUbc-9U3Csixp(_Nc21r>dYaSQ@Gy9%<~jn<9SmrjV3Sl@zBSzb_#Z!ahl7Y$O&)
zQ&&bb%&H$SH5HTgigf>&R_B)JISC;5D{hO|)-;e1AFCiZP~>!Qp};d3N{nl+2dH}!
zFw6_6F7g%%1y2y$?NnOZ$bLT^Y1c1x?{gyS6B<zogerT+Iyo{b{INX*@qt14yi9%T
z<eUSD$$I0Py!9);#h|~tzJ>V&&ATIV0e;5%y#XPKxH5T!4#Z?<cK<?3(Q!v$QCFnI
z?@NRw{Bp=9&JxXLD2gd&RxF4H$|g|8ch(2N$I-qhiy+CUJj^+U|9*ik>rD)eN1w_G
zTax`u$PIp@OQlG`PGyUUNnH8%-~J`LVvsBW0tAE-@jo!re^;7QR%A$kuPQ4E>`w)^
zRmx2U2b;xm?;=}R2Qg3)T=2CNW7{^4l2pxwDa$p-&Q*lYEJJ1Fu3ZSG^3mN@x0^mH
zer%N=f}=cw&r&{bmSTDxzY1tB2K0O0kGQr2EI;0_pL#(ac3jban0cYs8vn3<l&nVz
z_;d1uG#pf9l}G{?iqsnefWv|tyF<~1DS`<#bdq3=DCGh!HMC7Kdq9pKlMhkLwZlD3
ziaqR&?z9sY6sX4BMX~DuQxV25=H2Rec10K=++`L<lHLHDZDOFw^|!#4W#-a^!wI>B
z!p^3GrEskyeVY_=lV;Pz8lN`HW^)H;-bG`;IDxHn>@uZ*7qRRU@UAnFE8ixuco@&I
zOPQ_1R-nVFbW%FupvHmfraLn&?s)Lqn$`lvVave?CWBnQ)1HvgMbE=y!n|(3Ih3+-
z{;VqVcXe2h;uco^#aRT%=#(=VO%)kWi>J6pne<_*GCaasiml>ZKS&>odo8Zs&HP=^
z(KMUAUZ^7ccs8dwK*!N&i^iv6aYpA+e)w=m_u$5zoDQ#lN=`Y>BC@Q?RK+XuPoXmf
z9$DcOOp&t3OxO^ztH&7yx^$X}9tT0_W97%0Ug)`&aDx2o`<G5WOe-JiXxnVIMhgey
zqm^|}fK97&bSzc9NPk$YjQrSd76uc^2+#(o^F-tEI^`r60BQ@kR78vpj2r6_3a~y%
zjdiQf2FA*~E3%PwdN%-v$ha~L$-+PEheh@X6|3No6{?_>bhT`+s9@qPIKgOZjHLAv
zV`kGd0;}FTX(CC3c-m|*9BNO(Ek)1QdAg`QX)Y++qtBSzV{KvAIFAC>jx6jx_4dkd
zl!(V=?MJNm0By80YKW~_R;K%P)aFaVhi)WnY<RruU}3v7(ujh_G<aeqc~>ru61cL5
zK{kTsqaWIWg}4^clS|%Go~v~{%S%%-dnY};TVP7uC)g%x9X6a)jw0ntxeP8w1f6C;
zM1Y6wU8C~uG1Wwc2+bzu%*%V;MLxR|u|`A3{?UUPV1tj4)jTOPXSgocIerCPTq;_M
z-C(VGQK{m^eX?wQW#!$#*(!enA*(7OkXzdQN~6*Y&E_a(Y?trAC>iVnmD+7$v>h%6
z!Yc>*79(W=m-9CGH)jA6Jn5dSyhB9CZQyt$PLJ@2N*{_B><p`6Kfb!0j7xS}TWKZw
zKA&bH0Nu8rJj?W6Vqd#SX3(Gsec+eD{oa-i>(+I0l)pq|*B*U(rgjqNf=p89Dioc!
z=)qsm4grTBwR4@V1R%xFH5^2^@UM1TH;hz>V|68(*shcqg`yhKF@i<0Lg+tjxsFg}
z8zN+lx{G8;{Z2La7h6Q4l_Jk_&f1`=Lj()l0K6c&{<4VC4J)z}FO&TV*N6wlUq{n5
zM$I1P?!t7OE~_X#q1xsZ>V)`823XJ68ZUQkE2-gOiihvx;7({jg4vYi?)r2I>o=tv
zgoIJgI(m9S(3MvbJAdojGL|c+Q_s;v-a;v~@%F*Jst`^J{Pi+bZycn#Xe3pv^@1{$
z12C9ljSvT%RuZr25ha_7V3PGjoF_=sMwPO7e>?B$!vL>E@q<usD4;u8(-&c5_&{SA
z`6gr*aK+UG=}h3zov3|4#6BESFAecy<5y9U!!BJEEDNo-z0MyI-#Xz8(J!PXlr>Iq
z=$B_n6zEWYf-5Q&I^KPBXk&DY+c^C+9l)(Ee{#Q~At*0Jt(>~-HqsRmKxZXzpZYsU
z5d4O8&%CD68uf`vJZ#l5Lp_$W=&OiG!5zgYhwF^;8vJ*ZQC+yT$la=jZ<zyymir!S
z%Pe&)Nr!-DqLMM#dOg}7?+i^S7zeD~2VY-``otH*z3AD>bDpSHU0gomT=NkYF#20*
zyy24`Yzb*xU2XomIcl-4t2uA1#81%w_Tp@lj0VfVAO|v4z^WhGGRCKY-ko+)yD5t&
z?HW09mL{bAYQc~MYh|p6<jQcrC-@X=5~N=pe^I<-M6p~)vCUk#qr1#p6NQ2FeE41|
z<Q&uc-5l_PE?`QpxAu~UYz*(n&Acem?Krpn>8orq$8AQS2=M;Y4FEYA@}uQVRB-{t
z((zXun)e<CeD<Cx4K;cz22a;Eh#VwnxgbVF%cbun&eO{4Yciw#!klcV(_Rrlzx9Do
z1aV36&aX6u8sEq<bCKv<1o7O1z%(+xmB2JIy|u`FGX;^l!N4@KxaGh!vbsgpdxJ#s
z(dpyD=qlXN2rdnrXWb+Ni%Xn_0X6EM#skw+Ew%Vku&`>3a5J32lx`HTIDY64yGq}v
zr46`h(m_oyvp5ekWF3yx@rz&3ooj%nQu!@M5o$=Jv^uT6kh5q|WNzeIRKi1-*+@WU
zt6Q_H?MvcIvAm9@paic(iOP9e(?LLoybpewQk_`1ds1Vg2c}pYIO%=XAXp})z{hKi
z8T;G;0I^u6XBPGyrXI}5k~~LsaP)#G&DT?#g%t~J5o4yRJ&Gl*jn}L^QaJW*VXx?%
z2P;VR{LV4oVNUnVnaG=gJsOWA(P`e%a_^t?07fOWwsf~@J-5Ck+_E2--WGC=Z1)!8
zQ$<X)iS3FIlt!4z61!J-8P6*@R;Lf@66`$&XxD;3wEsnh&a35W)^dreBk`l^h^~b#
z**#7t`09mUypzE>ic$3M@q=gvK4k>Ae|io}k+O?Svs}bTPROr)qz3VoeKVR6L~pd=
z3CmoiepQfSgOR4vl`^){RIM9>VB^#dwqj&%RiVR)BQ)nmv&jq!rjx}XWICEQ$@eA$
zfTt^@RO+vm!$Hq`SdNQ<K#1-6n}9dr0i;_ph-Hp9Y$25!H3XpnyQX^&Q=NfxZ?V1^
zj;`-U*3T4yB|8xjtv7ZEy?ss?Z;As7T@1{Bkxg67EWCcR!wwox;OZjuj_~1r{M!5B
zE!CID{)W>!T0ijv_XltBE>qi-`sDp{BY;0pd}p#0QB>-(phLX9u+{_}u;`pSgo8<g
zIY7TPw5{zG<zc16)xRI%EvY*Ic4gfb<L9o-mB9?r!pP%E?zcKRt0K@$qU?Gx+1{YS
znP#!Q1a*RjL;?+t=rqm+_MXM#0(OZs4G}XUY77u)|E_qOvP)U2fS9%=-O#u-2^gNI
zqFuF@Dt4=WoA3T8#rg4Lh}%Ssa)t*o&QgMc>QP*C^T(6UseV9Wcv?iUy<PO2xr&#p
z<Y7BU10-09Y4~Fjs~md5x}Dyw=R}9Zqy&P+Qqtd$-Bc=>3eB$UX%30v`#npw^Oll7
z6gJ~2yU6ofh)Mp<)$O3Vp~VQXX8=S4K<eb{3hmxi(a+YaP$?i54$dg7KW{@|UDXz4
zhI;mz2G9q4aZop7wNbTGB*5a@_TuL<CWHu0nHHPYRM@X-jTFaUi$pGHe;PYA>m^zR
z|Hc4$t7cTC`RhHUtN0r(&xyEcd1oAJEcJXeG_X2S=(hd2#f5&YL5>+1IstgM0){h9
zt_RH5Z7shSY6|4l#+EOZq}G2LChz<?`?Q_%>g9^y1Uj8f{QVP{W6VYRz(ZRH>`}lg
zFIoFxj`gQ-0oL~2?^<}{(a<Z|-n4{YycV>Y6-0nrn8AX;KSFZ$AOe^_r$r<F`N6mi
zhKu>z8>=VX3F<B2gAt%m^Z@wlBpOGPt2>B}Vux8D6!o(T+LM9U8Hx5V1~1)#Y{&q-
zGt<_snaa#okJ<Shfj%t2i^R-z8%)$>^+B-39QU}MBj<KX%_r-2#?0@9P!|^k?wx>-
zb@z9t^&yRe*NwFN?$wCt)JB+Da8|nGedV%I<X$I?(Z0wkt<gYR<ORSkkcbcG?>^xj
z75{<Md`77cf7&$ly?1uig(+QZb7#n#I7GVu=1yr5)96%gdIytylYc|QM-Ikw9jYTD
z)LMv%MwH)kO7!}mHJoPw!IZ|85v7;NBN;hTkp$roqYv2S9roks{t6x1Nz%8IL@F0y
z#Jzm}@HYOqdDibK`2B$SJNP@+a2y}Z<pXBNQIswQDHplifiC&|Z$5;dDf`dLihDwL
zG_%BPq{K{7)pv#7;(}y^sWZ`tf3u?|s*Yb<>oELApP*);AlR^fS-C)?E?dX3;7dXi
z&5fIJODYi=qmH<QY^jQ?7lr4cvdeiZQQ0_#KCwrsS&K`%@3R9={jE`Qq)nsfJ-##O
zgC{o=?rQW8PJp89xMG9iqbukms%;E~?|f~%#U|qr>7)~1$S{TE^(QY3Lz97_b?@{_
zMxQ`^&Z-Qm*v_c%dD6?z;z<Rs<vbku*gnlYJ8?jK{7=zGp#AYrgD+M^@E3Nc1Ofsa
zb0^aWDEIVol0zC3pACYT^1%Eo^p}>fP(*4)D25p?fe6GzL;WTcL==8Qz*R>aHn?Xc
z#OIm&{&D*PnIAj_ji&w6xH`lm_$>6^Yf5-P-MIJA-zcI0Hl@Qb;dEtu&?jjP@=g<n
z2X<}L^SCQO>PXpmO_^!%>O;o3#-nmr)|N^M&_pt=(S3y!ZH}IDt%f2`U{g6z|7&pC
zQ7Rw56A!h#wW;KOwodLt)&qeph5<-DuVQHBB9b;Be6O_3C{V&q8Ns%<v^rUO$rG$Q
zuX|UoVk4{X{Zd&RS?rP^(-Hqg`!HMiDB!Y-UUNK1&PLIG{;(EOGZG8SfaL_w{N&WI
zGZr+eQfXmg>S#>?4<622H-n=P<Wq)ZLP@^3rBEJo>G)+EOgi7!GMqSRX6$+mv6qp9
zYPqUtaWDzucCp+8t2|<wYczhziiu4&omv;|qb~G62?s^q2ZhkrsPlpWZ+?FJ|It!n
z!7oP3wC5Kp)u}kZj4p6R$BytYWG7(?0$HU9Pn-s=T%sIN$lBQ_W1z3+y3y~%Lc($b
z>W|(}qhew#VtUj4v@z0-)C=h90X;EUmclVW(j#nv!IdmV^P8Id#s!{ZJ&qYGTdK<2
zBw7BD@(cK-x(S|^ky2}XDNk)O12Ya4Nfshoe$68SU_*^YI%;I$YPF~LQLHkfl$wmf
z$C{4LiHgm~vrUyo!7A1<qFCcNqZ?A7)=6^#x?|WRtMZwpS@G7h>rvy{4g6G2!y6(G
zi1nj#=f>R#kDs}t>imRr>X}xaQJ7?s5EOm2>T~Jw58_x5xIor_lamTrdQxy2RwL94
z*~<H=S|6G8%GGv^7+KM{@dxe_BlDn<@03p*h+R(D9mLO96c&-(ys;XE%+2>K`-@k1
z!rPCA&zkqLQyV60Mfm+o0P8<VfVQh{uL3|8Z!$kXYk30oGe}PqY`qn72<q(Q)%3;0
z`SQ~-7KnlUE4At7KxrhRm<`EAN&(^YpsKUQb9nS2ix@@ocXYRi>DIZK3)04KBgZ&Y
zvUGmq${XuMsztvxWFsWYn=UNw6Xk0LsVPedGNlK_63h8NNaZ{$RB`>P7Y!)yGl0JK
z*tS4`?gV+1M5gTAj99XKTMitZ8e0p$fh}Q%xNAwZd{fllfCYiQP?Kv)Xm}SS&nGWA
z-36j_`tSGyzh5%^(uJxcFw_O?S+d`~u*K#H=rDczUyCwg>BXLA4C+I{-cg`WRjHGu
zjw6ogCzdH5X!aN($Dx#rf7BSK)+Hr>;MpEfFAJj8MU>9#A+B2|{E?wE{^p@B1oGdb
zwT@Sq9uJ)LA=3sZ*r|!2M{LX3nby=h;Pwh(ilUqsifJ;Ui-@HP+lQw>Us28{b6;*`
zus&@Je^k|gV|{=CQoOGm3JkQxo!z#0td4k$CTEPczw+FDmk5dtyIm1DB#gC~bi_z`
zpMpA$Xqy@yE_sRUddB$B7M4WMU>b;hkFn|VTXQRa=?_4OC{-DI*=CZ%q>RZuZJ>!=
z6asK)YYYWu4WY@~4)!H|4~4>${7;_Y5S;(5;!f@_Cwkzp(XbXb3W906k5$Ga#)4J&
z5gitOuco$d3y+F6;b6e2yT<|8Wy;@_x!erj?^QnvIRZ_SD&OvRSOG3cZBGTb_k|10
zlZEg?@WFt&Us;9a6}_M5cbF}og}8_F!kOkT<9L8kx_OIzZA!Uo{YB9y);bU4cm*h~
z`ni6x@XJqC6_aY&%5E69Zax9x3D|dlVjPwA=m=Pi2qqO~p+b{wcf4oyYWtROnWn}R
zsiy|N!E3+JC!_~$B;?W{XQlCyl-6`kBb4^Y<qPG9qQmuGnl+^t!iE&m<@SHi(}Bm-
zH<>RFqVOMVIQu>pBtVHury|(bPRqc&feN9Z9vWPMv8YAxn!TxLh_Y}U;Swm8r`6;I
z{fU)MhW0aPV9M>4ZEPIN@X?0fOh8Wi{mbJUSbnG&md`~>z1FZ`XycOQY9nhj&RT%O
z(S~IIxb_VF53T6eHEBX>x;Ru4C41z%S#xIH@wy4+@5LDtCIHg_0-1;-rFT0ayM}(s
z+vi<HRl8Gq<=}4P(L8o4cnGEK-(j{w%B~6GYBs~BxTy0dc1B@nCL!z}<ZzFi#NE>x
z9X(~1nZ*w&NyBgw_;Rv2pD!uR+dK*y27bAeS6hSt1u~y2X{uo$P^6>gqr0jbnNFn-
zGMg0<yW?|Zz*Jc-@>aQ=he#1?t`$B<2x$<-^`V5gcs^g6a1-lrvO%4uKn`WbG=Iex
z%x@Bx6Go2av_+Yu_f92<VWGiaU;whh++h5$F2;fT`oBkfyGuz%<ts|^{zvuFm&=9)
zuJ^HE0>=WrYD#De%gd=vY5H~1eSTx-i&JQNmj^$$bu(U?I{nyi==&Vi;*cz)q!h$P
z`=s8#xb0jj4g==2GqG(?2C}vGe)_*7<_E39v$iEl;*udcmb$<d;cN_RL&9v-J5QVL
zBU0jTSV&7yru183(>p{l^lALk%Cu~>8E5&3Dp-~VxB*1OU3*X+VAZTnc%TC+aFaw|
z-p}Og8N0bu=9#W<8B#*(hU1uGV?#U!iWsK4iBt4#$ix_M{nz&k&*-KmDkol78JZha
z4A6Bm)PAID9>Iu_a`lWS&_im-IHaYdO(^t|4rmq55tHk|^3Q5x6f|u68P6?f4E}D#
zq%}kFs|QeY6Ee5S=}y$GAghqmnAV4Wz%{l!HJh>!UsU5bP?X?3EEM~+d*>sH337c1
z9XU8<0$U#fs}^$`CT5P|B2P11f5Qvdgi~$)(9CNPb4eWX!RkIS!#=Ny4VA&df5J!C
zm*4Lx@!lyU3ShLPe@lq)@nw*{_qM|oU4E9e5Cix|m=rc*N*Pfbl&oH6f;-?1m`BnM
zx04@k*eoZKD9mfCbKs~Pe`6mWcvTLY<EUsz;8W52R2{@~Xw5BfHl1Y={q%~+4JOB)
z?x*;%i|=bH$A_~1u|hdoq*34&)WfYK*}~WR?J+o;Q9qx}qVE9<KI!@ja)*?0gk8(o
zgGu+Vjy@vxG(dEjiTi>8vWMjMg)9m4Z|oI8@zxhHms^zAUzm3zZGlJ9cbN222GBxs
z+28!!6;INjb2m4-k9t9u{%c|5_y5p|9o8Bvf`N=dWV!&dulG9DU7qR@JMMZU2o8&-
zP~poRbBRbqAyFooY-p^>(x0l!cnpnj{RP1yZTp9(b*p)9iV2JO#aP#P%5^)ty?c3p
z&yUEHIAAsmiiEMEyicDtiy#4NJ3<VYie))k`=yX~m<=50hbMB9c187D+SSS!ydT`0
z$yc$Y07$EO>tipNX7^Po;4h*~j16dQxUkdcwugCj?OD7%0_0(35q=ID_AX-{CA6AV
zq~P)Hxy0a|-u)=FQX*%Gzk;2|fRfDX9=I%zw}kdgK`kY`Cr4RmdQV0ES;ZVZQe570
z#{OQj%(2LL*-zExeqgHhq(I(MoXmXp^lO|(2yhG<osPg9<PSm=&VPi>`3c80P)7!B
zR@1Q?_^K|RMxy8Pr1@$EHaS0kd?IB2D_c7{eLl;VmmG2oGUdG>p8l`uAC#(&hah>6
zE6~+f_Xns|R?xoQh~w@2oo&<6-T~yr<Lwda)L?d3cKSGcm53$lXx0dnJBhV>=5Ui|
zr~gSTB1xNP9DyhyWLkg;*>5c90ycIdOSX0ay~usxNY3=pUo(RtLXDxTw|vT8O*1df
zYV#-Z?f=b-B{KS8IBD=iK(?Rjm4e}Rt`SH|U6KfDqfRmNu}R+msn~QB9>HQ$3j!Kz
zm1fiFOUq1kl>5lbtn%Mr&i-1i$~fJ_C=xU-cF2Y)fO6HtbHbNuqCu}?oVo#6@nv)D
zk{8Zn;9k-=Y?1fLHe`v|h`$D--T0=?av*(b6BRrZ9^ho#p0#+qg8};v<EOaCZzmYH
zF}(t3SC3x<lw5N|L}Mw*a?R<bvN;@F+wEu8y3_5d{V8IE5+Tf1y;w~jIcb)YOMiZW
z@5%Fm0+Nkx`5X&)%oC<e;N=L@a1=lHH6!|u^$ePPN$cRp5L#>JYX8<teo{*q(ZWQa
z6pxwRFvFt5D*EBG;Sx)EW)}vKpMb1ZUrN<gQ;`!=%NmE+XENVhB~oqg!i0mB?!CC%
zTPepjl4IYegZuqYRp}#@Dx?|TS19~Sqoc@pfTUq$!hl|haB&fdAt{o_cy#FRV6zv#
zRwIr3e_lr>=z=Ic0}kqUO(q67#Y`%uf(m9^ZlgLgoN4RDMv}vK=Z2%b{Bq(6%IQpV
zm{UCFy0uheqJlSBQWTqKuVP7h0l&%W6UyOJTR1D&^8RS}lf9sj{Ao!gJ^QX*_6L=|
ztzHqkVi%x2cB<N95s^k>jZ?J8j4D$Y<#L<F<B%O47xf%!PgthuH1Hes@dQ^$VytVs
z`Chw1E(ftTz=}v=P!wESWOV>>;P2<iY@@0IAq?Bz^85Fs_=3My1{Wk!y%5n&Oz5ZL
za*;rbG~Ch?wV_5_YC^$K0Shcmnl#nAhlrr*J}f#=yK>8SUCi@x<;S1E0m>zn|7GRS
z|0w4%{~EMSFrY~jIUP{Aj0_RjKEQ$wC{g{tr+IlPe#thV7XuvYtbZjnL^TDaKpS11
zwrxUQ4UbR3n6l*~jjk`8Xh-V1*D&K?>K-ZAadw!S65%ybt<#ru1`}zd4^j+a8gzJ|
zw?#GCZvv9-+0s*!aAwcVwzfY?p>CMaC7CR=k7OC-v?S{1oIO}IbUCv26M*l<R^rxX
z6iqI)oUEwtbq!3J!Q}|{oV}|AsFF!No+f(r9=p<bmla_fOP--<&n-Wp4?8%|_UiG<
zpCutt=;l4}#>+{}a_)lDy&R@|#sl@jbM%A+q^Fwb`#uf&=~JC_{9Lny<hd<x*93<P
zc;{_ue_m&K5t%EcDfhQUY5@AjdOJ}l)#OlQ+?W_cp)h!n?81sZH`ojAj*Y{*ds_w}
zBcA1gp@d)}aBe#b)2Gb7DV|!m<QP-3BEnyH1?A$v7fd!MM2CNqXJrg<_=RrS@MpDZ
z+9c)JMv^d%#kFhDI{5Di)qm#}0|*F>=wGuT2nN!s6-j0f3iFTR!NdN~ziq(DC^8Lz
zjMKa@c7U3at-btQTs6IeO)w`^RW^4Jx3T)qQP^_11a4x54IAE6Hnlh^&_K*c=<na4
z1}Ov4Z{o&4NnC`VZ+b4L?w^J~9^W_pKnU!IqUupe`YR$ikhpM#N`KTY3D}3VVeD~=
zS;x6RwU}#<#Ss)cQfF69CdyUTE5expEIO9Y2``SGuu<uh6q@NK%K8b|*zeI;Fn_Y1
zw$M^cg(fb;RN=GLjSOmOSSlJ_!|^4=>(1a<Uei@?d^2@${DbXniAW(vr={yDHPF-a
zT4<zdMZy(M?blChq?ENmP#JAfBNy3q)50-85MX|yz^5yhm0DOq&O-P;6+Nd2&}A5Z
zu$XN>j}w?+73<b=+*eY$L%YsMWGMC;VgBTMjrYnmhB-#dmPp#c&xFwx%o^|yfuN6A
zG53D{^h?-&$&@RAI!*rgPJcqn_gNLg@p8uUPKv<X%W5&{WH7SSRJwUCeZHLN6B&k8
z?i(D$YTW#eSv5tOev9nAb4kIjLJ7Uz2X3{6Yz2u017v}_LE3pEBmIC;_`r#IgG>9X
zrC;cCCx--dX%=*=9zJgqWhvDO%PK~B{~s=#gU6Fm<yQ_l4FNRCq@??Y42J;39b&-(
z3dN8y0EAwV#-s<W#RXr#%AP9YaDvm*tK_a$eV(?wX1W7vg#ZBp5D7!F@T?Eqgv6D`
zvVBF|sNVFGh0(LzJb6)36c}h=c@^pC&+-zgJ8l>>!8{N?kV9?;fQd#N$)!yLLw6*h
z6#iC~hPLjB{AwP=r|6bd`#Z`3+toj39ox(SfGzhY|L#@Khs<-AO;`Ubp3>^xN(-QS
zQA3XbeMi&dR$h0VU3|-*=Yn<rfy*x*_6%{ec)-}cgR71LO1F)#$5nFI>bR_r-J&sd
z_od3M^_NCiVV2gZeC=aOOw%Z{dJBHfmhFYJ)BHxgjRZ`z!v%}_{NcAohqIQ`1&@Iz
z0DW2R#6!7%;l+}Cr>SpRIc{1SL1SO|wWv;}$d)TTAj9MhRl_a=*5dUQbBfwh+hgQG
zkMNSbBwTE2`GVP}lg?|=hT~4a#wz1s2%+_G(R&OvF4mojJ}L>fCOTB8WEUb0qsyH7
zF~1=qi`u#^w6g$bs4W7<gfd(PHo2c0FtGEt2Zxkn-9!3Jn|GcgIWFg$;r-8?3qYlr
z_C+9DAHt-8XV5g=7)FD8Bicho6lRjBkT5sOo_W+5vKm;VnrV6p$@~k4KGXnvJ&x$@
zAfIvGtQX`d8cPJ8snc$<5=v3<RM>6I2^{N-6v<40$N_wV^a&r(Ip)I-(9awLSP#yl
zRPf||ZjgESmeT(BCz|+=kHi{ch9)w!!AX%J{#7AaK~<`+GfhMF6{zQ67R(00P=Vj(
zh>#gj6M}=_CBLzvCzwzWlbv~)szx%3Xk6uQmrL?uGgr(aM#NUk6@>c0dp>y4yCi}A
zh0>I+K$q=|d<A9Pkwq54f<t1_#FYMk{BOT>&|oma4SbIyvj-TaK_^m#%zEcmC3Bmw
zeQQiE7uxysM&<u!4Y|_ki#!;*Q{q?A(b0M0;|K78KsKG1!l5Hv;;&*$vEsB?iH;+1
z<HAt1v^?<UT;^xdy!*)a@<1VCS*Xf>vQ+!hN!!u3IaDn7^K$y7{CzUc+<H(}ZVtYr
z8+{-p-P0a55r7z`!Sg{%ccp0oUmfrHNP@*};jZ-qUhMax?iw|Q4yDZ8->K9&MO_Bf
zKwwy8`^Y&p>)>W*4w2ee=QbBx)~H%)ty2JyNPbWsTw8c^08;D$=@mQkuW~M|z|rx*
zcX@oV=i|N=$?qR9=%?o8b1_$lwWIW2^0QQfaPaC+dAxnO(Ge2S&DmA_r1@SqG`~<Y
zCAu{RIdM}0D!w2-i-rFMQUu73-NU|II^?(iC_MXjy$C(bf(AVML52fJgvVqcGtrnI
zr<P4sU-o_r1JoyJKZ6iaI6g`9dul&ie(e+nIBx2_|GO#=$pCZ3hGRxCPAZ_Tj(_V;
z>pYr-OgE*LXnwzBBDe93OJrOil`-!})~vR322ga#Ut}DQ#qHL6B+>1cu!-KUw>9*S
z9Z|zGxOfF#MIO_N0hUX;dYi9O;N=$KT*$oV>873rIWX=MZLxQ=6j>($wKdJE4Dz8;
zTQu|90;{@ZP9X=n!?M<po|C`ZOJncO;oHN9aK-$rl`Pg|aN4)KD&)MV&oa|p7l%cc
z!_;g(L|R_mB#zH`-22HhkL)i^?vX+PjrnSrr0eeW8!9$=fREa_L-!g|*%LVCsk+-4
zL->Ha7~XQD(Up1d&mNwL@mc}q7|xetVWdk;gRqlmmHZWjHUtS#fs-lkG{+!QAq)PA
z;P?`%x)FKZ(v^&)b|`pc#ujkwL1#^(u{~-qUm%Q!arT3c=svdS2f=?o**G@PHo(9{
zvJm|L0|h^V@<c8OpjCbo&rbSUc`dzq2LJ*=f%r*e>l|n+W{fN3Rp#cq2%z1eGvM|G
zi6dD&Ey`5qYE?m;w&j8UgQ2nQj=FjQ>66KH019#g!pITZHg-iEi@HMRtve!g*fE7r
zLrAcu1q)&&A*~J_w&a_s<Qku8P$>NW)Uxl{m*?*c(FTuoC2v|i=3K15ex<Cam{19W
z>X0<(^po1@6c3SC&GsJtHYV{2)m*m6hrX@ib#$_0`4=(FDI~k)6`^!gwlUHXFRZSB
ze!jyt-h}uvQXJ}Cz9&bUk?$lHQ_YdqfAL&^37&tdsr0}*j8P2ycJClf?w`yD*6vfV
zF40=Fd{=tch`$yGLxPc&xk=56oiw3rv+UFN8kexWBw#Zqjw}}Oa@em;YN!2lXR2t5
zz8TX<<eX_g&lPvZ&1T#Q{&twXOK!jb@HiVdBfcaSgPq@m0$_N)dHEOAWX~VPxs&zx
z5q)x#w3|X2yl_Ct`Rl0pJ0%l8m;|vA!b1k@Pe1?QxJ8cOIns6@=|f7OsSyZ{o{{En
zkTni7%UmXA3Fbd;8OvagzI}cb$ETW|x#qXBkssitciy&%4Ho==^8xpNI&eO>$iZ<y
z#MCcP^J=MjlNufpKJq!fAy~DH_>7WCQC=GJSvg(j&Ha?IsMt<nxq#?Rg%y<r7a{Lm
zW!P=Pv_)DTzG;j{K;XE2#!d11a>mFA07AVZ0S0?TbqjJ&+dxZ5$r2mF{)0W1oaV2#
zCcQN_Fi=HI@`VbQve-!VHihKMH!ztGKGf0!aIdi1^eEAN2@M%A;1O=*>0L>o3vY)p
z<Ag1e3{`k|2_bp@n}dD^E8-He->coMs})vGvQ2um=<BS%(;kc%cooB1G&2KkQewzO
ztZRJ7v9i-MT??yCbML>8sNQ>#8#Z#YwXT0Bw3TT5JXA9(R%%x4xxB)Ar@Rhh7ZR-P
z06$Eqw0L$RH=NtnnJ0g>Zc4HMU=~iJtz62+1N2xuZ7_gb;gjzYGTlJ?WyCZb)?@0m
zQ7ssPi*@#_FdHs?!lnRSn#^RFYI7cgy46qvul1?9a6KJL2bp=h*EDa32}()dm}82Z
zcsf@+D-ZqwHw<v?cH+wTbL!K!(9;?mKwo;iiw*0Xym72ad9Ox9`k^-?4gSQT-*8>C
zA8}QXIL3z_`he;62=t8lZP)u;ZE>4!z8SB)l|V~o>Ky3ZzCqsU3(RRG)!{|CDhc2B
zO5^mx6HXr=imy<M!Xxp3CIP=ZI&8sMNGihCF<WgUPA(1~E1K~hvO<Fn6ZHTJaGYxl
z)Qr#*C%I?WZ&2HHqLJmwpPp98Ar5>%YK!hv<+}>!VEdgw=2v<^=0RF}>7;CH!{G~d
ziT#~fn%0CF8Pb;?9&*5#nh=ua51+&=qQh<GTwjn*jK|57W{g(?>yN(pk4fTCY!xbI
z>{%8Z857E+VKAFmPmV(tyceEW(s3G8+2G&@+efbd_D2oRY#G^KB0VH1K&5#SM&Q4Z
zLMWXK7qIHJK8!IeB#jO#S|{EYk2~U0+2Kh>qp8i&qP84Q8cnJpxdAWSkf9K4EnT1h
z1`j>%vfQMQeD#{^sIyiqx0W8ipL<76ReNbPdz|a;lmxVFXA81dF<n=a^#3*T*W{?v
z%aW0MhiL10GX{k6)*qb2n-y0Z&80O8%DmV)7hoVbdF3BwAV_PX*gqofuP-S?m;w`!
zbgLwj4!p5JK^nvE4}}+?Cn4KKLCH&HxhR^E8<l+yiDDXG*)L*}8<lyEj;bBUzMWmB
zIH2$s8|1RUznN{NKqvQ?8uYS=eLZ<aRh0HtA4D=A^nW0O$qXZkdHx<NCg`gl!ng~A
z0#F*~J}b(TVJ7FN*t5Y=6MP8|gMjHpzoo;0A$r#xbOL{v8T@mQls0*Ul?=9!9Pjri
zK47c;H}f#laJ3$S+Gf3FLwu-exw<1reb`0I%y99cs-tml=*-Tu>Yz=t%HA){E-Q7V
zeeQsPC4l9N8S5M+uyeU>>lf><b}H{m1IU?=^QIKbxUnS7n<|a_v*c@tvUS&c4f}!-
zEf;|~bDGhXn2o_)j^*~9B9JNd`^@Qq(eI>Iqd!CoN#DCTCpwGWes%?QOSaS%Q^iq`
z`HT~f=+h=EV#}?zapo<I8k@fdicDZ7WvXm!M9$G4c$gJ1mkn9bG}oz3WN5@Ju>jnL
z_1VlY<_+UcbM;!ZY<f_v0`5q2F`VO;>i8JEI%57@T1$`&y~o^6iY6VgdL4T@=y^|7
zv1^kQOO3Qlv8OmI&UYYKj<=-RsRJ37nSpfT;)D#nq&xAm)iJy+2Dgi`YOHiIrFxbo
zp(`X=PL|K!tBihXU{}`(BEEEMEr54Cy<+^X*YTz$l<qFuEW?2k|Etr4;g;dpDqTat
z@&kh+vm9HUU4xp1i#Ka7zT3PCO<uzaaJenMaa7)BlJMfqa>DIghrB}VhAZ}sq*U5Q
z1fn(WJxWZqK7)(=HoZOwb_soS=1zhF4ElW@2)ednV-zZk?Eahwvj+R6Y5>e~1+QJo
zq=Ny&3A~PV@IZVEC!CfUPy@oPE$7iWoKirg<vdsCCv^H1Eumi9L&uOXpEC2z-orgN
zMVT&x-=<<rJ0(~ofrA4?My1Hs)*8!voSj#5HSt7<xHod|K(#^S=-ur*o-VBGWMI&`
zUyaQ&-2t6(>G@ZAdGd*6F@Sic5MgO%y#$8PwZyb$sS}|r8R1^(FXil%v`Da)-c<8+
z*QPC9f|Opf0|>0*jZHfyPR<b;-8x--khoR>yW_qVn;XtrKe{#jj$y5CR=M65IG&7!
zW3Bo)g;SwzhZO@5lYD!#LN`~$2rbxP$&0PZHjeaT`4!eZZE4h37r+7R_VPaFDx(xW
z=WG-;UM1XA`ck_0P%*xNYB^fymULL;Snb=k;7J(j|M%YOe&zjqOb#^+YdOtE{jF8O
z{g_6^+Uq||>*L-a|FInmj=$yIbkB8VmSgC<b}U{W!PlJ;%b=(<=NB0L@dB@SZQ1)5
z<kUYuL%1>c2y6-fr3?Kap0Atln=hFUCtuLu7E4E9A^gDW>8#2ZyV(XMhwRMM{FvDA
zV<YT_-`7y|x^V&3_%8QiD-XG#u^#<FD3(z1)r*w<L+_zG3>okDJm(I(0Y)z#eXckX
z-{HwP{go)wi?-=LmmvUW_x8IS@`%^h+NHyJNT$RB>_Y(%Uz<FF_wae8aK$TXwz~QH
zjJ`~@>SvKjlF~kc6CH?|N_>h<Gg0dF#uJq_hvCavypDwpSKfccti8t1y<t)Z4#fee
zyMY%^D>ZILrmaXc)Nm~5^~M>uxM+(4RfH0=Z3-tTq%Gs)*<36$obP9z^>X%QDC-<J
z^I*6j@f84+`SAplmG@MJqZD2rxf7LLCoa4*;1j<XDmv}Bv*T)x=weg(lZ`;}<VHoG
zDKHE|_x{+IiQgtlUC7eo7Jp_Qk>c*5z*Q0Y-LKM5bnuKlGE&swYX_$m=Ctpfx$oU%
zlw(68;+?i{uI>};_`u1Mk0qvXu@DoWpkIkKpl|_Lj4?%feJETQMDYER^CO0-mq87Y
zk|tHaCo3q-p*(dW{b>~DyeoT1*oWBB6KnE@19givxl^l72q+SG=OgSFx}pB~PWchO
zy^ryRQoF~|MG3FG`v`gHCZu2EQ7mHsuWXVt5P7mno3w=zudI?gKy@;PP5KUh%6xh(
z{gl8K_}xA1!LArex>tf%@kL+``xHqADN#_;H|3$MSglxyN+CfobX4y@!&&R!Try+O
ze^onqB?XUud?6m5Kodvw|DW^!tN)AhzcR{#2&~Kh(w<{HUvfkrK6j3~F2|$xfGu>~
zaSskN$6*Q27*Z-p(YbI;uE9%xE;1)KWyckKMT=z_CNkx3Ww#VJHC>{dIX(69n?7xS
zzdIkW0^y+_BH7ghYh|G#W7t;&6B~tTt2E{o8TRWpGwf?ifP+;P-O^$vIVg;Ug1@5#
z3~dTb{|3}*(b3fuz19-Mh#2f|+{wnz+UqJrj94sJ+64~WRF`({+f8vU%P%*wXT7G4
zAV{sVxy9g?cpK8TKR9mZU5x{+5@;FAy6U5M*ByMLYSvztI8oAT1ZkXVPT+^I1hBq0
zBa~4*3r?B)%}}OpIGASAuWwW|;p(Nen%IBe9R-MF{2_o8P}|~Ii#WpWsyXeky7v`a
zciT;Du)|ecys=kdqNjB!GJ#n)g7|qIGUWisAn}0AYqn1<d<Sw)QPiw^I6gD{V3lC)
z&qtT1f)8B6=<L^v6a5iKkJcD=)xtlo+bjV$uvz0)m>%tB>M>7CxR(eIt9|yfG&+X5
zybTa>iX6dGYN{_R`wM&+8&auNrqi0Y&o$nn!GKJAd#zbMkNWT<3w1#BDH1wf<)cc0
zXNufta<&h@aGrpn6v89uz?)jFARF1$T2(%tpQ2wT8)^XEMoT7|ZWh!pvd2t(D{0s{
zm>F}Whg6ZR1O0_5pUHb&2-fCEpl~EXTo|zZGiW00>^okKGK@*tE~+AgP$BeY5I-BA
zN7zcAP``yf)`kn&O*;$(PCpu@Q#qQ8gMXMhULu*4G9n66N*FrzdvKxTHw$8ANVDLi
z6rn`S)8D?!#fa}?wzG(k54u&M#evYCH&&1|;xN4?Alo*!Lgg<?lV~H-qckxY!qY^i
z>hg(&<kr|UrGWoochsRB>T3a2ipY!s$V3pA-~1_6bj+HYAXFMqV}|p|!%8Pl=x;@r
z89P0_M4r`NjMVA(&_}-X83<lHU!L6gpByDaUP?lZu6T~Uu6*)3JO6CYD1jWXRGJ7)
zQx@!Ga|_Dt+>;CTW8uOWRbVeMhunkVV4T6xGQyh3LqlMc<^$DZ;dIe6Cun;BbIieX
z{WrE?6cIId+8%|Rfp-24?v<)JrcqOv*iEV~c(ao~9YnawbUkRFvSr)OZoq3;+|_Ll
zZz+YfsPuuarDhPINZ5=i{D3}atm*`)Eq`n9iJIA)FQr7s(ST*wSiiWp1QA9{`FS#X
z3jVo0r}P2?$oua&^#*+S7Huhj)sp#D(U#%-^eqQjZjA;5Lqpx{{lLXcG>T$5!vR;@
zG$*)r7~0)d&c$TgTejV4Klr1oBoxK+@fKoRBYxx(%Hsg1dP^R;ut{@SuPTcPXL_%`
ze94uoe&@&cLH&5r;%!7>HbNWjslXAoLId3)y*s=v>lk)FT>~UoH-bn&!tyQ2iwAr@
zS1{|qN=@Se3k^PDze#4VUHBvG<%S0V7jsDwsX9?UaH&;&K?TD!4_#r75ILI^Q)@)z
z;VfNJ$UzWe2<ltl@?G`sd$jV?^uA@@v*(BczfP27H!p88bMD?sT<p8g_1p$VKgR7u
z1$N9^>>i^A{I!9AYCROdA#ZjG?Ak<w4Esi5cfS)GdFkf0{&jBW{H87PorG@(9Dmo9
zpV!y9S*-Ye$EDqNT%%QWxY1A5<_(PyxNV}_^!Yh2O5aFol;lO{zA5-Bt5R}`&w<j6
zd@nkk^9d{FH4Ov#xdEwtHOOn)o_rp)O+_71<X%dHe3LS5CB4T3=(qtJfj<2)>5Q)<
z?8?)hexRtFkG(1QU2Te4&z#AfuH7hMElkx&3~ycd^~b6B70Ck8Z?xbs4r|n_70`3L
zlN9IWEN9vNO{abVu=wJp*!zxL5%=GJ=?)vi9p5A!UUF=ozm?rmN#0^H?mMlm1Dw&A
zc6W?)DhUr2TOd_Z^{$SxJQmHpg4j+4e$+jYJPHJr@@t;oI#$1c<e;p}*jH4KEn)mT
zYiE*b*xb#duJyn@CBvPkJoJ^ce4`Oe<T8EG!s#EudOf*9W|i*wFP-*Qm@+Z}P%wo&
zU=1k*JMdQsIV9q@|F?vP22sdsO(-YhgZXOFI#o}$O#Y8ix<qyY_K%UUO1AawAH#W*
zOd9eZqhp^;?%z+Kj>)W`{{8BT%mU{hV;PDZ2NY4^Yj4E`yKId5i?}rp58N%KW(4jm
zeW`;WOtZkY3c!%7Lj2P>5s^Fw{2zl5jU4Zv{<ZR<lgA+bV~moLYyJCQBsApAQ2+km
z^e&OF5H1Lan>g^c1&%sxngyvfjhS2v_n-FHvgG;yb}3Pj-1ytS?NtdY^<Hp5Kq4gn
z4<G!xZJ1VORdT|AFHp88=f(Wz%GeO{xPLo=7fD_Ui75Bgb^r0Jf)Zj75OFo2iY+k>
z5c!rIu@y3&yqy?KF0Zw(hCJz?)75%}brbZLoW4S@J+SZXOKwN_iX5pmz3EG~?w@8f
zt>h6%{}}bd<W>;>7`T(<@ZkR#)W6BC|39*>JCMuo``df(G9tY9dfrVdw2;hbP)19r
zs5FR_l4z0fq@^h-MXI;9#-~AqhDs$xn^cO@_?>(2``ag<Uw`zv_ndRjIrrRi$NPC6
z&m)U1C9PUG^oPETOu_I!mh>bK>uod)kld>_n^*FvQ1`~h9=Fu!u&Ke?n>uYeaH0CM
zji0=n2gI=3rcFW4y+ES)!=|nT6&erOM#^cS`&@cI_7r);>o^DN(yR9BGw7AZ3>|t!
z6Qw7~J7POo83}im+kVzWg|<t!4YH_k`igCy8Y=kJ+KyL5g@QY_YS_f#Mq7DYC~dOc
ztBy^?DHwc{Rh5x(Gor25n6c<*w(u8w-=0!hlKro2)m2gRvQFDT+)Cw(ZH6pvRhT@g
z$pzks##5s|Ua}oZk9$VxNM3%m9jAcVGuJ99Z-7g@iSp<ks*tw4Y^zLHJfn;y>w9hU
zhzk3ui}n_2$;jj|XsbjusbPK#Wgv<FX?t7?8Rly+U<9C$r^`5n3*N?z?YNWgOc?91
zPm9eNLsXE=5nIMc4OHl)7-uo7WGF)x2cp!4@d&qq@43EaBbg<08MCm=lUT+v9KKB}
z7-?9KaT+5N3m;m?h{g(yav7@fsFl@LhFA_C-V#QIU6~FYOrT{qS@US$T86%)U>hR|
zH?-Kn*h~7TnD?z<5r|#E_mTy4T?s=|qPmN*8Ov=eV6fzIyiV7Tx%CL-G!;<1h#dX&
zEsV4IK1M6i6)(K9$`0Pzvq726OQZ|QXwaeWC=<#21B_Af*tcg!KQ<$ycZhGL?JzXo
zix^qh=Eh=%GVV)W3Bv;yT1pw06mi3j0PC|UFfACgp8=dmUEaaf_{w(3gm0%98{|*`
z(oQp$lM!zEdM$b<B)}{+l9^$z!3XaPj4~Wm*(;19Z0_(?h9PNC9x@`M8yeVX{MA6?
zCPN*MYrk4XJ+|<^j-iVSzZ)1INpK>Y$`)(~w{9t-3qV{tvy0M~I5sjQSnkV1#uTi=
zx0!JPQ*@p)Y?Y9=!(Ky3P$BUhV<j&9>R^Op;qWeoNC$Vi`@H$2lkm1%Il3jvibrRv
zGBxQ&1?Dx>u0WAlf!j?{Wez8+BS^}CFYu4n*(ArvTgcSw*LO+2;Ntf4S0#Gm!zp@|
znCT)BsWa2?f_z$&S%O!rIeN@Hc+qn*V!p=(Zhxki23pk;7|eVuY{+I(cp-HcGI>~L
ziJ18tvz88FUM0=#m`%9Q--)>g7tXsd<#6HBDCTTzi|x(~!jx1`W+rZK?9D8}lxu#>
zF}R=^$b61i2R}|?Vw<0*F<Y_h!!W7rx|z&lm|_>fjKYl$L@`Yj@PeH$^Ef6O`pZ_L
ze@|nM$WstoON24Zomjqh0W%C2L~%?7yn76dXa2?-h9xl<U>}QDF$*xoGnF|HQ_iF_
zm9g-ZO-vDHeaT{a5_5S^+U~yqa}`STo>?qs$;Lb;Oizg2)_mqbTsXIbnTXZc?_n;-
z6v=+3EY^4C5Yt2vd+ireZhR2bq$ts{TbRytohMU?9<L!bmN*_`mSLAalrbOU?X9Mq
zc^@l0P{BNbS;1$SpK!tFg4D#VOUxaZ5_Of?O-$@i|DJIPrmVXPoi&l=Oz)OstI$()
z#9ET8Rm^JaSXM352p103Gk0PW?)RCs*r>?^X$U2cm{+h&;!|cIi9zXLhMOX2c2=g#
zDwxiBax4uA=Y_QU-Y=P@$dglVnA>o>9q*araN+d_rVcjp{WDV)7ZiJ#UYHfo%M8V1
ze^Qn;2KVEKJZmFntyg9dkAhWMFdrb&hMKIiq>E2JCcfPSj$BoxvpgY+VVbOd^sfG5
z70C#F)>bV1z=&mzZFTo&IpD(J0jvak{3vCx?6J}JJeDIi$`P_exG<Gs-N6NFFl!dp
zvvn9th@0PZV3D*hbY@+`GLa)$C0LJ%2kRvY-YHL30B$tV8*Jk7&grOJn+BfVP@%2Z
z;Av+RQ%Tb5&mx(ZI+4|aqdsRc%OAHq7tB&8=0aIjICpYqv6f(#W+Y3WoK>#8Vz>W5
zxu{IbK4J)H9c8vDEn<k(B`I@RN?14}hV>H{(igG5V}+^9So5*BUskYEF)J~JMGjP|
zX)LlJbZ4;E;;tocWSzu?p_#0BEL@h&8iWfk^H}$>&lk3`VlYLxgEbYqx^WL{EH2zD
zWSzmbvPxLrv7U{ktYYkj-AR@PmT^1765!@b&y(m$LNBs1vCPLSEHbx#Tw^W6lqJ=y
zS6EMIEo%meY}0|O*Uvx@PAJhI)tJr_?K`X{Eb{&y>jiF9|A^IyEfhaxjm3peEv&Ct
z=4~tMDlU}1V%3v1_RDX}>EB_iIHW;S+16aTQ<G^adGv+_TLt9as}5ERZcz1+WrMS*
zvxl_|D~<ZWdV^&G<=Dvzs^~OZ-YEMkmzM2fj-yL2vJ@m-Wp){seX7PL<MUFJ9f6(n
z(PJ-?*F=qi&YYe%0a8VeE{$Tkkd<MR5u}T$5t{^hLqB#5ZuHZfok~(6^Nf=1TooCa
zTmzI}E|NMccDf33IGDpehGjK`Y`kWi60_w<n~d8}75;&H8_#rT-5$tE9W$}6By0%#
zH6F5Yj_hZ6e0d|-WHGIFVSmPbuN=i5f@Qir*kiEr5#H=yxML&y+2v$zuIhj3atw51
zj|y5O#?W;eSqij|rdV0xGnt)+g&zd7;Wz+JwuG?Bz_6#Y1vrLNBG{dn<r&Q$hfUBi
z>|dl1$38%e#<LYjPt4R-FDwCDJ<{1#w~VDF*_p^bkI%SMSF%5up&iwCCwl}wwr1{U
zZ^lOjt3&JxTxcp`Tj0&Mx0L-4+4;XM`L)X%5^K34I`Tkxs@Tf3_IPnW3I8N}GT!Xd
zBxo2x^X4<`o0t-Go^6OJ3o6+an8LlnuEdn~YwY`&^3P3nIW8pJV*kL_m({a5#OR^Q
zT{3IIXtg5VUg)p@u_`^zPpmIdzsH6h6m0EmWW!G^D5O1NyW!?_PuUMK<!}r8EiTZl
zY-eor!7KI|a%fcPRLKno&8c+VO|~2THb873`Tmw2jpZZS*|BnR;|u7AAK0#d60=Tr
zl>#cf?qVA$LE%&{`yWNXlh-+sidy3#Pw!t-eHRTs)si&ODV#xv28lH!u}YkDBqr%q
z=Tyt0!VOK%eN5S{&q>lozc~h2b6B#d;9<kD(bIARUGKggS*QoUXxs#OF9hbfog72D
zWGF{3`R2~?f=s54ijLu}nOk&H*6FeOf65FKuX0=`JH&hT{4JMmj^C=R-5hi>BQQF6
zK;6XP;HyCa>%<C&gi)8iFKK$RWNB0TnWiUa&d!sZJa(_+{?DDuKa6MG%vApF*74%(
zs~sO4lbgR?xEY<C)S)=A`1#WI6I-5E?;rTx`1Fs%BQL`D{F>j-+>=aqhgP*EIS795
zsY`zJ=3?uw!{fgX`FYLzx7Wp*{mu2tOTIh(w8}nu!1>V|pRR~+-<^kk_f;9OrRAbZ
z^Y4uPzq1csoZWDJ{Icm2hie|Un<g;oSC*17$YA38IHU8*Lmm{y7ABsm_RPCne0h+;
zu0x$X2Rl25>_x*HH+d%S+WGmkOUuJ0#RlHY+hupA@8Z%U9j3(Z+W3k))n>DOyIfI?
zx?#x7gHeK0pQj|Ay8Ox|K7{v~uX}A#+o93nX*=)NFCQxSXXnm^?D7StA9Gu`FlTzU
z`LoCJ$`=_5)1rGEO^@Ap{yF|Y;@Qe;##OHZ7apo@y?1V`pdhO{$TW0j@{9Fto*Oqd
zKCGBH{B7%T-uic^U3W#bezslWAAjC)$n1|w7Y482Uh%M2Fh8q$Z0fLwheFNjZkG(5
zU%tp;>5b~y@o#ggXMK8PE4ZN_6QkQJ;Uu2kIWRGG<FOM9BpZ(%FW<g=&5eDf^vwpd
zuBh=*Gc0$fM*ZxFovc2nt?}NlyK#e)PcA+7ZqB>6A)zmdql;r^1=Sm9d<h(@^jMc~
z_I_i)T1l@YGHaZVXg}O*by`t!ylmdt<kdz~j5R-me9&6<Gic6`JG|u5V@|DFYo6>{
zCp1}^`1Eql%l7bv-kf@!$&K=MUt<;G<by2bbmP669y>hFtzUOLbjpBrT7%CjyKZ^-
zGWnf)g>}8o+%qwb|7<I})2?E&=$o7_-ypV^yELI#P}KD`fKgaHx9R=cBPH)5J#U>)
z@V9!VOz(+LiTM&#FC1Q^7`3|IMZtT{%&N<hOJO(6A5Bw^;cd^G`Ggt2-gc(dlVgi7
zlvZf?)l7b&-ZL;dpJO&*Y3!TX`$v`R(kkDUD4SekX#To>Wc$dgIZXy#6+gE>u_`#X
zeRZDuMeRMMUsataoZc5_-x6@?zWDj3I5)Q0^e;WD!@ZJM+iy5%dvKAOncv0geVQ5V
zI`q-hk>g*y_bSv%P1!S>Z?>d6GK{s|Wy+|UnIFGiRp*^@H_6|tW&Ka$r7ER@(Cs19
z?|$LsJqmV8u8qi6c5>o%oJu?IG{mW8V~4x*om=(WT>g=D+VZL(%R4je*$L*Wm!Cdf
z+Bwxvb-`Ylt@DS^iz^IFhVL)zm&wm@ztPxu(8?#O@Q6p#rj_a=RAV&0UDnMRbJl8P
zEdRMy`gWVLX&tiX$91uKo~*i1HT0I@YyC-#xse*nPEH&Dr64)OSm$}{Oqr1L&o(^C
zax!U9dSb<AkDg*-v&_ce%jlHOhP^h+M+O}W{XCiz?WSV6*D`(J>8WEk+&4BX++i~^
zNo91o+v=*0OT$a!yc|DlTX4WZQ{_V3k%0y7k2L1dFFigrfA?YkBfBEMMYqguSLRw{
z{XB*1Tl2ivw9k+ouQ0nic}~&=mxgg043if2^XO6varM7<;<V1(&<6)1LrnT*Bu+Q4
zbDp_u`G%*qSM<$HIxl&=)#A6ld(y79L}}C{YsFFZ_1BK(I}W|M%KQ1fjkOsz>cNYz
z9p9={J2h*N8m;I#!_Z!!X&lUY-Q8W`6q{MnY(7-|XeDKF`s&U6EZx`%b;;N6o%y+9
zjaYH<z6&9}r72guEHZ_U?K4ycovKbtNH$AqxIB5{%T3uQ1do~yUpXue<K1g8FyW8f
zBz!#hRPN|~GEVcN9aogMl}Qx$S#4%iTl$ZPbPD1OIutj|X@7%x+`(~@x(KU9Q?qXb
z^s;kAjOktng5M0y{aQDT<K(VQ?Mxn&8Zx#eq_BZapSqmH=`Qzana2sOS&^z7pcU)e
z;+iX2<lZJ~pEP{$!kiU_pS05J=YI5FU}?hcNR2rEkF70Sg1@kTbkEY_bL+nz?o#<M
z@r}|MzqaU}pwwd%z9n36Z8QDGu)N*XU-siSCr(oOg(IJ864#F_IJjN+TUKS`)!^jG
z<_`mY@tQMg+cvmNIbikuRF&jo`}o5Lt@lut_BK}EPE<H3otL{Eabw!SZzug8-@B8d
z%&yl}?tImwmHHtdUc33gr&n!l^K(D6EYBBwU*oj7D)d=zz^}cn^|bHUAG0nLM21Z7
zc)rE9MbD|^T#)cVss2ri^o5?chaP#sajw)(F8-nOVT}Bc*|rno2PBVaIad5*$O@C?
z+YL%mt2USV9Jp?KBlJ~FQP+g;{qF4eX!-o}@&mWGU-Z5by+AL{IPFBcAK#3<r054L
zc>?@V|Aw52#?{v1-)UXexfk4y6?N&IKhimaGvL|vz+Xd^_xK;*UCNuaZBh#};Fs2b
zfH#T>y79?7#}D*cRwkTkw(k2+jx&4H@{EFsJ(*Q$Z`M?eS{T39TV#0e?cvE$UaO8A
z;OsO|V7oI!6ECbAp0LDnGViQj&32xgsEc!cPiHyj{57|Lgy6kKFZOY?KU1j%6TS^k
zp49RxaK)+*fjwh#L!Z-uBQ7<szIyitFC;<n^|X1DdU`p@1+5M<TXU+8Ro&5kEgPTY
zbzuAJ*}0+g>#4&}dWD~jaZw+eeOpUmRCDIM*(^0)!Ro~GkBp~e%$gH9^KSpJ_Qkzd
zwq1@X{$X^n<dZ{};7)u*>BsP@r5oN&m=(Tg{Nhjt>Z<y=ehza_&YLh{#`2`4Nzu`s
z?`*a|9&UX9>Y{_E&gLc;y2qI0pUdu8x47P8qNF=5#o?c#J25A&#T4G|?{nzbq1`#Q
zrX^1Ph2=&a9#)GqY_IYQ%npssiB*35eOGO9zl~+lRcSI4>c;GiiEckK<jEmMOnJ-f
zdB!?=?4qG37M~4zbk;P;e(K`!Es@Kg%-y%`+Vi%!l(6V~kDunPOdfW>AenO04=!9h
zc+eonw;I~ZZ{56|<!|;g{lml^yM(&q7ili-j>>xC^+-#TKRdy5l>D74)!9x?lE_L{
z{9%STOwMom$X`X}I>T-)uGS4qosr<}m1Yu9Y8|-ly5_1xk=m!+o2?DI3vXo_ynp*T
zJ3Y}Yvba2*y;R|a!!)0ZL!XVUKb;)(_H9$)qTLJo`)#?HwR_LQq6=0da#r2b8SXs0
zT(4VpsO%C+W0QsRvwj0Q1Jqq+G%%`%-_Kfk_}auFkBd`nXWq|TaNA=<jd=5rPh-Cg
zSy7r*Z>kYKecJj3A<gy+6!gn(dhd8Yv?6K6Pxs}yGd$I9Z0*19W_rlHPc60an@V0Z
zo=Nu5PBa?tzH-_^m!|X(`{!CW7^PRK^poj{HSc0iE}r}NLBpev(8edep?99v2MHY-
zr)_g<Zk@Ms(v#J5V$Xd)^tI<nRK~{rPvu80$=bJI?`^~EoYu+T%Y8m{+LtgNDIXhD
zlR0WZNu&7}x32CjIj;`dhtAO3_kMZJfKdNadM`{iBqznopP4r}=+MFya|Qcj&5zH>
z6FwgP{e+Dq=5csR>#fn5OV8{psERzkyVX9p-kh3sKXhW#-TM0#Q+5Tvi++11c&gX5
z$(w6Ce~jjB?VwJrFk+^upX?}lw&L`Q!8QKHex+(rTf_37>p0ys4&TYSkjd~}@P7Vs
zJuT}mdUZm#V+)cui2Yr&7jCDbWa{3jDh-@p5O?R{zV|L}vQa*R4dh<`)9iMPaqV@~
zjOSU|7KPK@-povMX`8^C^?Cf9UkVKyhWK2kX4Gu|P_)w}ht+gs%=gtHtAn1pt@x_f
zk+VB|;q7Z34~!emrSDUpVzT$soy<|rs-7Vim!y@=l<7xZx~B7WPV$}`^UqIYM*Z@B
zr#8i8LuzT6aHUz%7~#kWKiv|WfvGQV=4<YHfBg4lCok{QUA-l7rqq+8&dFNIOY3%i
z|7>w)J!|<<v#Mw3WvrLpaoT;(IA;FwXFKPt`phaD^i$=4UG*m4GoOb~IrHg8LXLP-
z=EBLwpB1M@WE(aHh6Q=#2Y3xijvQhTJgWOmbDV3}n0)VKy?;u}au-=GIy3I)&KqwN
z^BS~mug-qG+W5`%fYp@-SK^$VGE?l@pP9UTlyghFVbpHDm#-H17(cl**TExx;d;N9
zvd0J8eN%ZjdQWz&{Cuj)-X-2^)Zl${x6U3)Yu6tMuNt8ttEN%A>XmVW-oh~Ps8z{r
z%LblN2sQn9Ue&;qMQ@ALI=OP8{u~FFC*uy>9UFMp+t~l$(IfivZ~c=bY+qd*`0Te@
zlA+i$(&*ZS!tKYa2DgR(nBxBH+rVs#J;%0>O;X9`RmAX3_wM*PxVhiH$4NQPqvKD1
zs}1L@d)INb`(dv~S>@xd@NL#F7R?A)*L2RLCfV70%(OPQ$W@1*`wluHNV|7bZFRPG
zc*B?z7KQ)RO!F8N`$TTB<nrU{NWnB&wPE~y7H3vEp2!<Ke4nvdQtW7Fjcz~Vd3U@*
zw2z)v9Yy=?*<~HM+h<=)WnG+a#M{t2m$vUa>v}wj>ol(UZg~_pY5mtx2X)g#PGgnF
zr#Y^C;F*&=$$goRU;c#gt0x%^ELtCCC6}~P?b_NrZPnA0Ic+B`!{0odd1c7D`gW7%
zRYEI;!Q)@~ui>yV);vBC9Js;m_K+{$@?*RQCUUQ(Zf=`dU6;pymYr~B*1C-D`Xk3D
z<SgD%`__J3#6^|VoZ}`tKkM=53!KN4@0{fp=}|r+$YS3jhh*)#F>S&LH%C-mswvz2
zz9P57HsYJ7!lLS_qZE#3WSH=ucq(2$q&Jcd3~r6yV>>pmjTy;M$@^fdDEVCFHm-hM
z$71(ereQZXc3$#wf4com;?+p`$^(XV4VrV_C|Ar?&YY^uI;|Q~;Ul@9@o{`Y$_4r8
z;4DMsHy%zF5*yzZqvV8)U2Bbvw$NHx2KUy*G_=lX?DDdB8<hBBt?|Ucqe89Y7u}XP
z`f$%SPzkP0qG?6Sv4)N_+eWqZ1U$*z<u+y>71UlVV(nZuMSj@CU^RZ)Gy0_Ax^w4j
zY%BBwo5mNcDt?}FASd<R&#k{?gEUkY$c)~h(!p7?R9>!0BX?TS<z(->;lmn+?s{;T
zRj_MM#Fx8XjT_5XUORd)RnaWoeZBP=hsUZ*E4-FY_H(D~)n24|v4-q7zcXR<1*c(E
zf#a{gIXk-{hT5Y!%VOX9tCNN*e0g3yHq2p?Tl)294f4;D%z8eJ9=PBVUB_s;%a9Ma
zy;;?}&}_xFK|@;vv+_5Nl&ig!JeRY6#>~WP`Da?0el9-Yrw(Qtt($v(xJu~UGZACy
zPo7=J?XD|lT8fwC?zE|SsCYv%HMK2rYt&bN)wc=e{%3|t1Y^G(H@jM7)vf1vMgHB4
zyK@}IneLw{c;b0a?v2U(2D|b!Rh?H=^X$f&-f7vmclPclh4ML}c{fTYS|8LJwLN*g
z?666UXD)dTBQt_@==^nyM(mBZn!beEd&1)50xL#v%RX+)+4;+=SHB9ecXfD^yGC;M
zlDYE9X{r}L$QA80X-gk$S1`2kyy>l;qave&r;=u#G#k9DX?t~5_k?<##X0TFUY&V@
z<r`*e`9*x2Q8+~TdTS;7#tK8D^GfZZK2@ud4OOR2+<K<<MRoVboVBmA(`R)h`Mx`|
z{?35H`PQPR%ff0s6kZ<RUm4e8XJMexzHi9dufbzeXCCgiWsKLX1oxLF6Sn%DPPE}f
zzY+Ju#|1nc`|~`+-S}`vb6CIcx<$V>y?t{%j{Q@i%USWd^X^UXM?IIz(^hOMI!E8A
zs;()DP4*AiQvS){{jlkNg%ZOaQ;)^_e)o*=|9vU_*NedKtKL-fzq26!xY5$9uQPOI
zm;AgU^wa*pyyr1{;K2NK_utKU+Zvc~MWM?7yztWH*Q4u0r@V9=`y}$X($vK(hgN7f
zpVh7#>FUT+cG}5$IC8zq?vr(D676?m98=Q8VX=qdJLJB}TR%PzH%||g*_v@;tM>be
zU%I_2Udq02y`WlCQ@F-MQ$?}<SY>x~UDCR}zg2QB%67+G`t9c4W8Uyip0lTU-^XwA
zl^s4OHvQ6=GGOn95h?q%WuuclT%rwkd}dT$Ry#T}L4D8hl}~4nj2<zOuNr#h>42+G
zPTh;!UO#AuiF`o}(?8ihDzEX!n)0z<RtU@+M{kh3w(Ne*s0ZmI7^!z|ZrVKMR?hXv
z!P@H+&J};E{8;!@Z>Fq#v-orLii{r#%JI>xMFTqg4+d858#v19Hg$RJk@qH%k);j1
zcdaA529MsezB6_5q8FUE=k1&3=tlTcO*b!13Ai~(ujJsB0HJwR?YNcx$$^)X16li-
z*H<=Z`@wtbI!AV<tABkxB(YcY<yz70#XG+H{T$(8>(X(mcBE&=y@fuZk^It$=Q>%Z
z)sBqW+>p>ZebwUl4L_9pzBZU>#$8jEe;Ky;Q<!M%YVjQUQgBJ)vlmyC=7;TSw_muy
z;BL@^Q9DNU+u=E=&g0h0#Gp#W6Kj$q?tF7hyZ>?Oqsr8~H$N9`f0bRZo|O{QSXu0F
zdUAJN&}61pZ}Z;UWqX-tv|>Nac;IOIv)SkMhcA}x9z9Xom2DnQa?53?r6aY^{+J(`
zGB)d%Vu;z^I#+XJy^2e(EZ6^L%L)Zf`t>Qh)6@Ny74++fDC!wL=FGxz$2a?T_1m_6
z%vtND5gkXvADQoq-nFN$WzF~*52vNP4PHC7D8<6L@%*RTap$!Lk8d2g{hdJYBl+KF
z{m?bFx<dh3=(9fZbp0+<Cb~SQMc)pBn*;E%-1%~H;|k~to*X+s$v009T;YWaa$CJQ
za8C{j&3+uX0RV-F0M1NBRH&K4*@G#uQ#rZ#>YZ{3=Z&nU2Ur@xeX5F{XwXBJEND>(
z$B5Q|Z<I)!!Z`7`QN?u5cLgkKJ?v;%58S}KlI`n`MOA1~Bu9r%;_{RwKO#7?SoiNa
zoO8J0`Do5-1!VtVEN2mBnJwg;B&wF17Ht>=W>e_;d3;NHWjsfT_FBkMmZ&e~xZ~D=
z@tk3*sP(24&K%sao>a~#e8tmg9cLUaq-SuB;)2~q&S!kvSg@IM4O6~man6zZ#}~R+
zRiQu2u7X?X@f;ia)eNzo<ZB*hK5j63E9W>a^xwuISAVIUoVoaZe!&4wg9^UO&d3-%
ztO+ic#_8l8GBu|&12}Ls*`K3GSI!bENsb=nwBdWhxhFUkSeMT!PBFfb+<T7mg<Kq-
zv~q!IK6H4IVs_RFqCzt866Y9sT;tQxe+K)2k1M4<CPaXbhF3XLu)5fPIMt-%H#i&c
zRpaVgoMZSJabg|k3byTfpK}+>7(e8E#4>76Il8!D{+#m!vwpO4*jSkPma`dmvEmbl
zqlCNoaKX6uZg3g?s50$$pErQ6n=4kKtE0s_66QA!JZ}QmtP_54R$zbN_v~n_*+q_9
zNxJtcHrm<`I*=zv#|of145%V4m?zehI4g03ajPB5Tubc61ywFwum*)94Q?A|8EbKA
ztguv%I~EsujJWDpMzJ4vDfW4V1-CzDZ5znlf&CfI;2yv-%`ABD5>n{O<Icx2Wg;%z
zj|R%4p<F&Tp*oy<60<5Dx#ZS-f(!QwW;u`Ke!vCMXl^EXwq<Dji?m?q&Qy80rageJ
z3=u2Qu_L*vk{>?Y1z0x5j~jst5B#|nPI7JqlAg`n(@K!AbkTM$pMI9d)zd-~EXH4D
zO#@7t8M5e7J05uj#8sl1G`AOvDD8hydKpA4Wof_LDu0Vi+RA;7=72*!cL1J2Q@3%)
zp#n1E40!O(b}pVS?{;zz<HFY6+$>z+?&G%OLjOXpEH1zc82oS{wwOB$7aEUnnW%8;
z7}o(4oXWV<aA8L|Hv?N_o#d{?h0;^pXR_Ge!SBltpoetk%hRsUxr6D>Q(Q$!V+D5?
zmRov;+kp!a=eVzM!S{l+U{}fI;1yxkRc-(_bM_jyO%5x4W2*b`BPjJz$fml?^GdkJ
zlIJ(Ms#vPMnwy9V(Y4$yxbVA<y9w*w+`xT}3-NbR#y~{Y-X{@R_kg<|a||D$9zZhe
zY~tqQ!tf_t@=#0lQ|=t{?8_u}g)MrJW+k1~+Rp-;U;Lc=5sS}h<>r%ldS*<1_h*>J
zfvWTZS2gS<eP}JLmOihzKXER4zvV8)h3oIRrRXjg9pA~dM>on&c5-2jf<o~p?rd_u
za+Sb&gOR$7%xeqOXWCMirzmmh;<~8gn>0RWWiy*$N`8PlWBvjuyYx2~9>jusGbiPF
zo^tq+vU$awu0KHTp4wk>A|;-sf+~7uZEJ97`&Ih)1HnLKK$WI5#D;Xf8m|_GBvPGM
ziQVOD@tkpI=W6rPWl=tN>+qK2t!CqU0h`{b&(lWx%~5^cWL!|O=IO{HN`D*PX$4fc
z$Kt^Q8&DX=<q2@h2tKbD5oQW_M%Jj1=*RnrMPdSYa3c&TQzr3r<xyd75D)I+L1Du*
z-easUYC5k87u+IvH*i6BE{{^w8V8+fQr|zw3i>=wh5lH`v!-3<LeDmDfjg9|7x1`P
zPiY)48W+r$@!&}i(Co9E2LlR)kx9JaI;fDik@pO{5t7M!A%`{l4L<90O;bk3pM|!I
z0eQLbTt{j)uTB%mPujx^lG8*E?AWWrdkOh6m-fA_VnK&-dHRwM`*=T*e!AlT?+X%d
zE9A{kLWOZ9yi!$E_;HFCrGg4`F7m3hu)$RuI~H7pNA)%u(o~q9Ilb~BPfrq4%e$+L
z<i_0R>0sw4J>;F0$EI@`@^`CXxtNL`JhGrO`8;Jhtc#~Yo9B!5>Ch*<yQtxir@Y6q
z*uZD^#POvd|4W7rR}|RNPTRzqwBIw{CCrW0<Sq7wjvSJsKQ;<1B`z(zB{)bG&v`p>
zVNxq^C=Sx*mppiA6LcSW#Y@pZ1yL98I5ASQ+J15gs8LeL_H&0NOzM=j#QH1mA`!7%
zcxOWf+~+>8OFCLNg|9-t+yPsRZ4WO8MdjpKzKtHz+oH!e*M~wLgZ~@VWtn_4<N`f_
z&F?@2Z4SQ{$ETU%U&B5f9K;W{LM(+q{vLAdn8Jt0P+;{OI*ktx!$M(k2!AeFZMv>~
z40eZy7tM`{FR>9kCHmqX*mZ5f`TqFau`G%|9yh->j}JG9p?Ov;|Dqf|32|e6V}3$!
z6VUO6M?3C=B_MYZUm1(-TFm#w<~o<~eK5r}p5KcpBbM{!$r?J;D&!#AFfYiVHFQAU
z9<e&TZIf7yc8TO@N-`7quxWzH_9XsHC2aEX@P;Gxu=M28;SB;STBnDnNL%cMed+N5
zxb?q%4IiGIfCkIb_{Z^H$Xn0%!y8`mX8v=sdOiADp?Vb(!CMw3f(<?8px7|GR--?C
zc?<sptOoS5Z2n8MDum_mmGK%7najU~3p|>yAd7GJ)_WVjnWPO*u?;{wy)|ur2%buc
z*~$;s#%z-@+op_ze$ACbkGV+`p;ez}ATcW92Vh-u5An6-&<c}unD31XH6{EtYPfl^
z@{6yZ;E~^F@nl|SmWb6P8!Gs6rl>*Y9ey`%kbWNuxIz1sc8gL7i>@*m$lc9+UCFtJ
ze0aPE8YDmFf0a{3C+duzSe0Tr>@|Ooq^y~L7IWu6=XVh;x?_**ECMase{0#*#y^ea
zro8^2wGO#=3U}3HWDXnBt3vqJ^vVJl0N<l<Fo#cWJtbWzN*HM|6duiJP$yl`(dR4C
zM~*^2%D(bll(5(HFRtET22&x_I6G^VIgPUqbSX-hKlwZr<awYXT$aMJH^XOL`U<|y
zQ6e@WBntGoV`9yNT}tru4aj~~6%0djfEKC?9MKe*r!IgeNTAT8FZhiYu5VU?EIeN}
zumwl(N@PDsa8MPm0Is_#ZH_})$jhSr!;&sNE;ggNPJ(kt!y6~Tcs%)sxd=iP5oPNb
zfdiWS^kZvTc-C{8K()`K<!}qg&|jdAB#ozmf2d#<D#*r@v@A?uiYc|z1(ul7IYaOe
zPuuEL!CDovURA%@SLiAu^KCmEzS#82I)OSJD}jS{{w6`GE7Ip#CxC+i6eczZ;At%=
z9JwdZ!}==k3#?`FGHH<>FzY;Y%YrUDWnh6F&6^=mpiLhLnoyIT2Leqz$CMulcH_dK
zCILLW1e3_&nE;*<g+kYJ0X*CSGs5wuzz415G;D^$QS0mP1)uSrbnc^o9)M&6b%n5%
zLc!QT2)`}hjFx67{D}x_jf63n(`_QOz?O{r3x&AgZYmVvLV}qP_Frgp)?C<&8dX>b
zN8?7nEQQ2R&4EHyENfyde2NP_Hp0PJM!*y{;oV!EEj&Qs1AXV`+rEh~5w+yWsUYks
zEEDg8ggNAo$kd)J7`zc4l?tF+RMZF1qNPF|$+@Y*QoLl$4;OmjL-+aFLh=Aia+L5j
z4n*X9;WBdMpVn<u;tP4nR75imeh(rQ<_m@4_&l*PPPhgal$Hv|k>w}N_oe6;c=TKT
z-v)HeHQ2MW<Ao|%c;|AVKQ4Ss5=LNqL92vtoP`l+UoC{+dTs^u&b1IA$og$*!ksw%
z?bZvu@WQfggK#KH0=jae&<PFF?~TG2WKzDF!2k9ey1QHj9kDIw$|~^y2|r(`s)$q#
z-z6NNfC^Lg3Y&FN!TyBs0;YVg5auGY2eZx!k!-f3k_~;aMyyDms}yP=(W*+}Ib!~@
z&=<FPbWLcACvkVJuo$!U)d@Gqsd%Gx=*hfNde|MIIQf+S^i+-cDZZ&0(Pcy4`eo;2
zpST^vpO%oXmH5NB_Cx>AvbX!EY8}b4(&vRly!o}m9Ilw(?L0qd!n=`suG;7gjM;0s
zA!V6<Yq(yF>Xd*v+*FI4ecI~>pDi?qe&Nb}uGDfXUg2|2Ny<{E<aS-h0eKB=)xA;I
z<39*WUUKb&M{uheC6Y1yyhU4$*0TlmRm(Q`4XN{@e$PKP|90%4Pk;T{mUjWI5--c4
zo$d<z$$1w@Cf^li3`2!hby1-jDr_(k!J+~MdrMKd5)|kU4ABtW-*Xc$l+iq<C=o(M
z7c)g7gpZjbdxRz|(Fk-zp3D-BLiL?2(Nu)JEYS>vVQf;rAVo8dC<xJ)aYTU#Z*xQw
z5i+@=P=xEaqHu)oxS}Y8lX#*4ge5#t7(#8n$OmB<U*wDMIG^xU1fpP6pCusr&I?47
zQQcTb`16FKDX4x!NazDaL@q%@_;n(YAL3h6#IFP?)>A~DD+YP!=W4OY8{r+XXbwWB
zL83(nj}HQW0WAiLq7kkiESiV#J3`23ofEJkr@}X@;NVX`?G>5PcZP_DqKf)ZXbHG<
zsAw6&k3&VV2xkl<^xMNki;;%0!$pw@%Z7_)BkX4f9ssVkgLZ&F?L;#X&afx)kEH15
z06hcxeh1J8sN*P#Kp5{x^tC#|$U=R(lV}^lUrwSm2-l1t`a4Dt`AN<ME1gL@t_#6D
z7Z@3k?{Oi1g}D-XwJYhl{YcVo-$>D1B&RzHMi?+|6hsQJWfbw-Z8Yh}rO`wWdyFU!
z@e9U?mLfD6E1HEcc`VWYcC07{)q~w2(*P^oNdI{5#LhN%tT)d?G##;LdJr>J9z<;D
zIMQtUIO5JPDTaHBRwDTqo`gPjJR~O64~`dwpv7I;3+RARUeF%!wilQKbn*sw0FQb@
zw*k$4NPUx!XaTCr`hs1+dA<-<z(!x9Z<rq-=&w(v%;<7I5xOKucleRm1pAX%T=6G;
z7EBPWLj1A`B(|0TkbO|k4InZ86(E|A>hlB1n7$7rb@)gM&XM~QiQZ9@i2M;L8crtq
z)=U;HMD2Sfi?$%#Fh!J)kQpS}h46ZiC<o!RU=qZe!J-wY?lG0bTp~r=X{4S#joA4y
zjo6J0A^tuMfuKM;zfdx!6`{mWR+wllqL+pdf8pICI5&&JNqyjSf;*-|JI?}Ieg>=p
zARjn`_<wZ<iIZ?9vA1I;v7<eU<j^`P%FZTwmd_?R-ZmTT!=MC4K)m4;eLjNdx0wU8
z9_%E}fjI^Ec@F3SoEr(b3HUrxlz=cKiq!8$5x!S6BoWYWM?-%BN6!@{A-pn|)Q8U_
z@<->1mLNJ~KFoQ*t@8<8D+c_A`l=Z46R<ai&=<stQc(R%tSA{@8L*#yG24Z9o+mP-
zw=95_3V81q5ZUPqN!!N@iBExxh^?AMM7K+vXf=}mCyvNFEGAgCn6%?AA-0Y!A$9gr
z(r(96(g)pTL_Td9;mgJo`g;x}@|Jj!15$olN*tX)0(dq71`6n$<wUq(IiVXR65N;w
z0|@+{L`X!yxk->{fDe*jfB@ZBh?XP#X9b~C$&hGJFGwcx`YVZ3=_^I?h_0}T@E5Kk
z?VqnA`n^&}XDU;OA466X`$tw2|4i4Ac290XXAZ0p4M)nF*Fbgvx}`!^1D2)|;Q?z2
zJ#8&y9nia^^{HuORBNT^vW_@;VjXF3o=%K!Nhfj&8L&h_`=|`aO2E6)y8U|MOpz3g
zHjwto8;HKo8;JejjRdc3B%Ks&B0<`=iO}UX!;%GhBQ_I#_cjx{Qzp?@m`VC$m__U-
zXOUU(Qd;-jLgXv95IyGEB&Zv+iT}T|NzfB=$RKs+Ku}?J&d-H*fcJC34xn=$3=-hU
zJjfhCA>4yNxQ&Jk1;iO7*a{g0mFTTxiD=kLrmAB;!9pqOY$NpqDYi<{dpn_5NO9l}
zQr{rOuRF-n61S7kpGwhv7jd#oiv0^neYF(dOEGXap<j?9a}TL!B7`7^J%v5qaIa_>
zs(9}ukvzE<HU+3N_L20<m!igg!e6wXj7-aZGJ@j|!1@aEw+@iZvMVGRQcy@nLir$}
z#~mc{%?HVd_!JSjlSM?Y*&*Uo>LFsc=Ma&bQw*CU(qByE#fJ%QJxnr3;Rx|(;SuTd
zIYQ{(C1ixFONf5)QQ}9zQIbJg$H<zKb_{|G`ad2cc4w9nY?R`-GBN`$mJz!6IKcx_
zG$|+ijpbx|Dx4tvr6&mey|f;BlGN`?(c=`6J10e<gz)!Eh#u1lQqQa)b>-8<-<79H
z2KSyO{abd1=y`XB^n21-f>+LxII+)>%-?>F)Md|;I7gj_Ljv@><~*4x;tSHaUclp)
zcadxxi5JO|+;x$JDWsC9ud0OHgy!y-h&xv<k?;??OtzJimx)>C6@vL!NIS)=WVjYx
zCF#+0mFOMw522U;Lx!vWHR8_7Yeep~6n(Fg^t^PP45#1*;pg2T-RQkR^v$|S?A6~S
ztF2oVsh3v~J66@CU3xXCcUOz%<LxSHUt@70?OOxe)#_Vt@P<A<yhZxvQA7H2wuXex
zqL%o$rk3!#Y6*Y#ZL-}wyG@2{N*#&iy*lFa$a<23W%XoAm^BbgYaslt1|lDOhv<2G
zhonO2UBbU5MZ0^XUMNNV`=q{7itYDF>db5;^!i3(*X4n9TYW&raMVNMfB8egANYvK
zZ+=ATzaEi(ENy~196??-fjr>E$KW^MrN<C+K<*RB6~KK@AlC5nK>I2D5CVjCW&*;K
zPoX`aO*0(F0oOJ|JHXCnh$G;{XQW>F48{`bwk<G5fE%UwMT*m&6S?bBq+SrY{1@;;
z4&=LEz?cKhYlZ#;wzfh)0jIY??f~9tgQ)`uR|@dYn9DC=3PF9yD<Xg76~r6rR<B|6
z0?d6aT90tx8yFYBU2lkfgSP}T-V(WAZ(+QEzw8~v0kBhwbKVpB^Y_F~U^~GZ?Zlol
zyz&Ui=Xa2Hx*y;O4fUK4gs<L7?5ye}_J4N56bAn6k1+QDTRy^^1Dx>*jzfU2K8f-W
zCVwXV?fgvoIlYVcdA|#C9{8ibz&HY)_yXeyIN&SsYs*&>-ydJeIL_%Nc3ZoNU9TP@
zU(rMC5Bf&>SMrUtGyYC+)ps)9o!^Q7vwKPZ;J2kevM2rlc?MV@MU9_CF6Ad__wgs>
z9q^-mk$yD&g0%taBY%_eyZ9UDQLYt*(kOR5g|aTUn+icflVmBJJQrmtJm?}h3Mbtb
zISL1_SB}C-7cNiaZpu^GnV|~QG}Jy<fzW>{5PFm%!A3<Y6!C{E5zLq3cPR!dQ#hE{
zlqsB4b}AJ9?YB#c@~WU09U4@@YruO_bXEhupkAa#<TceP{97_kicRX^Kk%J2DEu4s
zum<7lX%dXrB=lFB&@Yhl(gHsKE3`=6LL2;rda^de2e4V2*!R#O{*>tuc{5!q1@U+5
zlDfJc;V;so@JZ>d9yJy5-Svr{B7I`l$bit}42b^^4ZtsmlZzo0gm8x;iHEik!4xA3
zPo`f+6rP-k##AtpduU9hBb;eMtwH$K1pEP<-;YW{*xrvy#`XRLKS(jwl){tdvnkQH
zz>G>oa`=#AU``D~6)$s~DzwBL=L&6YK}|>WGz(JyEXB|PWUy}yAkI2ll4Lk&N#PaD
z$ciLYniYj-P`4GK&mKth*9|1?Mp;vMrKz+g$v4o3*jsBuEkY}0uMGqlaJDV*0dLrX
z9Y7HS^Z;&SfM0-0Ob9YyoD`oUgdc&vEaDfeAZGMk7UhUKqsJyrrLZZye0^n;NF;HH
zlW=yOgyhC>VMGDXaVb2_hVV!b_VCEeQ05cmF;Z;glbPcpAi*gS5Ph)Bo6*CC)F7m6
zo{%)YBP5L-L=;|QOGLyOD~b&JPKv^7mx-7}GF?oDPh${?;F3Yax%NR+IMVAon9$D*
zhV+8^fFTe$z>Fcpsn0`*+{B?o-}RxyzHk_k&lyJi`aX<|K*(@XzdD=*Yp@-R2<SUx
zN9^d^6TOM{#Lg>w($3R?v@4UMu_K``cO>){M-m)wC*sFNCkpQgb|Z)%yG9WGD$azS
z;!NSas>hkcW04EVlzT2jubnH=Ti{CQvLgw7mK1M}B>kjD5jlDkv9B<iOuy*S#Q*!F
z34PQUf~8|%x<Y@o#u7i1#}YlSr0C;D<j%PfKHr_hBhMZCpXWhxWv&Mq)@L5X{Md0s
z&CzkBJ8VxfON%|J?Z}+lcxng2w(%5=aD^9@i_p-U%0zh3o9NZ|A!(E9L)`E5A;UAv
zmvsN8FR>@|BW~{SBXv1{QjhT`^?Ooum_X9$_ynTYCV)&(I)M258zCI^A_58C4uoz(
z-EJa<f8Cs(2x$U!_9Vj3ngnwO>S~jr|9~qdgMWaZC&R=944*>eZcYI|pe_u8egJL@
zB6`$<iQKYa@C)c4f{DI4Q;D7@Qz0#YK4BV_hVbz;Y8}GaArL3P9w}yoQkzlTG>pPm
zX|koL9!~5m4~J<1{HNiNet@H<6D*oe`lmO8__u5Z@%Pybn1&!XV<y3uGhsZS?mvt8
zb$u43E!16SLplQPn+^Sk-M}~k`T@8p0_cF95zr2B>Ky1d;Pp8$Zh+iKum_kG3F8F#
zD-zNQFd~XzT@;abh=%b2`q5~j*LE&xpFS7H59qyfiJtIz&=06r&m(neKCDSl-#s7F
z7Em_^;tH4%0}C;rax5%AfU9GPzE`otkAMZxe^_A8EdW0NZ5I;Uv=ID(`nQEJodClY
z5&F$VM4pO+cmh2y4#o>mV=>qPOkYguzooc%3HSx{)+OK<VBk`M*On5!{AC1lq}VIP
z>G9AnkiQX6mJfUh)+2$kLz87q0yqQMo&Zh)PF_w$s-Qo-exSBBhz?l}UpH%BPI)1g
zAd!gVCz5$-kVNLmswA?8cP5ctclipk>&hk*d$W^CJFpvw^srWvWo7e9GLK|e5nLq2
zwpC=F2BnZ?tuBSMcUVoZa5Y{&Xq`1=&q-fHmfvq{h@R+Fm~UX`T`HNMA#2HcP_>q{
zACgA=-YZ4zb%eis9gGLGdm*j+q!T|+rNekYo({?YeGtdO49Hi&{_Dv&u3iuNpx(Kj
zj8EtWQopqU<_*w=8%evp8zCOB;VN$eJAg5pATI%5ZUQ}kKAXWmz%vNpo(kO2Fr!^F
zsUfJcEE75n_&gID0Zz#Rrvd+wBDDpSLOp*Ak(19R{1_=VNzpBb(93g(ylF0xPnF^a
zDNe~F^ecIgJfN3N6T7=<SR|lsvK0miaN}0!G~kb|&<Vg<`2=gFIBXlSQy@j<?W7(f
z#YQPQ?;!MpQq<l_>Pw~AEJe3nu;_uEle?&u2!|Dr!9Q34{=(qt?k0nogb;%NW;dA>
zzI(`EotEOjy(H-CrP#F>j)oBYMf+f|0Xz4Be!zwM$)G$z2=?%x%sfB_W%~gbVIclG
z08RkTFNBN)d{qeNN5EMJN${!<lAsSOBDk-JbWZ&c3G(7YkWnE2<`8K=y%?N^`psgP
z0f5ejNzf&SA+w=A><Bmuc<KnuG(g7^;zvOV;SV@U+OIuI^miU5cBdXAdhQ-0asj2p
z?u}An*R>2*Hqduoigw4L9R&5jaS~kZa#CMjPIlxU<z$A%oFFr{^#tgJnKJVv*axgW
z2|)%Ne2T36hfaZh7!+Fx8H`O5Y7Tw`z~$6i?Y8SOGGWhYg$intC3-QOskYtT#c<dD
z9o!7JgQp|@_iz8IX%6(BbJSq^SOukzMYrwe#iYai`bH2R{XaRt{j1m`h$shrURUFq
zNCV5WLbAK<K;8`GUHixzxDfeurzuk`YObAY{SY4CdkxRPjO`<O#1)ASqf1?_b!qby
zu?GHZQ~!mJlbUJEGnAp+n=wRS{uxS$btQb&m^d7Ct%PUj0{iG1;Xy>Z&QLroYPv2j
z{0N9ffmx3}qHo3%(cbaa2K072N<#$&E3c(=7+r9dGLrk@OZXjUDRZo9e7@c}^n`vo
zJQnWWN7cDNB3cz_txpdhM`;W|s<wXpX}%OpmxAfO^6>HSbJQf<%?0+8MCEzsp_enJ
zA|(#A|9Q#?v!44UN6w}fAl}k2!b=Xb)}U{nr%3c?oVGd2he2HfPqmHd<B-b?B0uy3
zWrBU*QGC@p6Z~etOZ56izb=A^)<nQZl-9Y3i0^}L38po|6HV83|Eu~c-Ex5nz)Jt~
z)$2bV>|gaO4k;Z>|A@0T$Fao$`S*LxGBTcjq)~R=pzAMEL0BpN&@iNw1w^{9r?Jb3
z(&S3Y5{u%m?1Jb!5bdi^H-U(1C0O^PH7-#krSR8YX{$>RP?ba?03Ulb#lgnkC8aYF
zuQZA9;ESXKu^s&FNU(#xIn~!r#L7Q*ROz70lo{4VK53YI8Fcxj(0gt`Zr5C<tgtTl
z&K~*99_Z?u6wEb5*T^eUv;Tfv4&JoVH(aSiwBib7h1S-lE0mdBRvIC0O0zbmwK&ol
ziobpazBm0pdm8CP9zL9<LBrn(8{zy%-`1jQp(e*!|A%jlUB{m>0#yS+Ro|)PxQU3`
zZvxX#KT6Z{-*5N)H;0-w6M6WC&j4%{e@8}m4Xj?yBCK;+*8TCw;mpC`f&tSbU^<QO
z6N(tR@){M4{lniU0pHd@p7)&&zPV%+ymPH}=!daV|Ni}01UyvSN2$wJ;sks-!h{yZ
ziP4)KX_Xrg<k1C)GmLgAkaDnle_qcGmPhr`R7mf>LHT1L{2FBN{~S!KzQdVE>)xa$
zA{&u#`%upRAhGUs5EiD}H!1Y4KN{Uwl+B`jt0*ql*Hc!`Kpvh+R6(zGz2LI@plSRg
zSY)0V{<q@~QG)<WBs5`>cTS3pjLfF6|Ly`t$7#PRice>XY!qm%<M1us-&Mq@W;M9;
z;r?IjsnxKcAazHV`)DnL-fV*<xNq<tKKx7mpK6MU-0wh|PCxmJ<8+JSAx`uy;K;ZB
z#p!(kt7y$F;zAQ*`@SM<Mh(Tm*3A#G($wL#ud>dN6MX`Hy5o-~C0e_dQl^V*C_QB8
zLJerLRH1e2sX>Tiiio^gAUdf2A*#^u;#y03_;6SUQ8zcMR?ZQ@68i(94YvOL+rR1&
zT~|xtM|&)9gN_J&y1o`x@A%u40aCmf5!V<H;_KV6g&=jG^J{+hK$5t^vf4LMbghvn
zpH{TCF`=XCNavT;fs!aT;e@bl24W6&?B5sV{@1Y`v`#&7EUX@y5BEf!bD-@#p<fT{
zA@`9ZSI<Sbx5HfNgk+rbr&nkxe&kK$T^cA3>d4#%P~zxMe1JFW_NQyEif~FcBToKY
z#Gz=x9THH_J3zb#f8!-3s?zsUY%J&t-${>dBlgU+KiX92urwPzddGROhGpNk^2*3K
z^zlmrzNe0KX5FPs&{62{UC^X<j1a%yrTXLcf8N#$LGC-rcAX%ic_$#iN%z1VP_q6W
zC|M{WoJaShN@m^7nEMq5{TB>+-{ZyiYeY2omW?XyeV<|@CGqz`$&6cnIF|J5`w(W-
z9r!bxk>8*jcVX?C(5E{K>i)=srbdd1<^O$E@PE7CR8Qn%A5u#6twu;`u>7nMEQ?<L
z;V9F>mp00@(*x2w&j-Nn_x3OL-l-yeY-rCL=KVMr|D6ygr#_AacKju;@sQF-hO8cf
zCYz6cIQ<cE10ou9{UIvT&k@C=Any@CL^oo<CsBXcDA7KTC_}tP_dg$YIJrbdW?8kY
z%#c2Iy?^|X*PxHQf*!zncoQ_qTNc~WvSJ2B_iF-gfGTJL>iQ#6D!k&@0#SD%s@(}G
zwWA5r1gI*HfhxExr9Nq<RA~`<!LUlANW%)9(t^B`jfcZPuP~938QI4pxvSDvy;p4Y
z=%OPOX|V9C?8bJ;j&<-CBYo%awpwX}gHPbo47+P>mFSy_(pFz?c=;WI_3}5Y(_{LW
zd41>KR(LnBdIBzYHA<=Njo_`S5T+dTM)(w1-<qVX<fjx1Q4b;N&R0?@ypOp*?wNZ3
zr+Yqt$!XBLaeYjF@07~UYNi-S!^URN;P*vJg(#UK>UTta@>NQO*EXZq^3ihu<(KzL
zsqms^Yeap5sB?cxsqkuMOGNc)fi_DtXus!_m@a6Mo`H&~-iAq#c#r>I1e<k<=mTAb
zK5cnJdKf*vd7Zo?%%EYAuze#=)4tCsf1Fu^#>%W?!LYbMZ%6m(?cjbyDZd}X04}k@
zN`uDzw~dv_eb~Id>-|^h1#=?bVargW&zr-WljC1Vj|^)jd|Uhy{(39J6b$t-0<puL
zgho2FgIH?Bu3XJH6rA$Y_^-U3_>a62?b%8h;WI+)3Eyvr;54rbe-Gi<NB>uPWh>>0
zVp`J*G5zL3nwz(g<acTV;=PfG2roT80aLDKBtwHNM5wpJsQqjWaO4Uo?>pZw&i$*A
zWG=kW`+v!%`x10A7W~Bydr1vIF04YF#ubP|(RDB3*apPch!~dkhp0eLO@r7KbEUD!
zXz#qy58~ho8}`sXefzWyHR8~|xeOJ$@D;3Wpzh2oP#2o}hokeyFU!}!iQ4*yqe^#N
zWhldgKaBqLHhFSb+l^#)ZTqhbymng`%it8aIilZ?5s+70$g93*@rWIyC4O)A+&84x
z8{dFV^<95);O*Rc|DJc>syA#a2UQDTPo2`IgD>E62kIbJ2aPo7_5y|pJ*}Ora_MhD
zvF5(NWZ+fZcuo6-IO7lW<=~fi+u$Djd3`sS?RzBuQS?`%NAJjV{P7Od-7o%&1Mm9Q
zqC?+P46N?{UWa)dph^JqqVH*^x#UkHWBPoDbUKVYa&7rkn8@)kCHk7@l>L#{rM=q0
zEDUKh!uC^tIGX5<;r$WkG2+yn?#of3?K+6x!5zT%x<J^FCDIXxSBR@&XON0&Bs1>H
ze`P$cfDHcw3ADopkm<VGS4N*Mkg`h<Tm9x=>|Y-!bEMq76FAdr|KiN=BtN~f5NAj|
zE&G|WqhEKD-2H)w?(k0a&y+pwaR-v56W+a!L;UXx%Ky74J2VpcTOY~TzyAnIMm!=!
z=SK`9{6iXfGv^a<@|y{#@)Ko+*A6vhPTmz5j5-*MzCWC&<b9?BvGt@$yEmX;g3gel
zeSb%-e2vtNpi^JN`h~8BAVc+^!O%bNh#__t84S-ZAi8}ZME4KSIV6r<nDTYv!YA;D
zV#^t@SofI$#q_f-YAn*p`U1@#E6`S7;rc+r7qX*oM#R^Og!n>{X+YbJmM;Fi=ky96
zfiCn1izEB!+)G=2rTp+|7}23y_@7vcGBP?c?XHjM%&(LyKJ)&0)j9;p_m2=d^TJ;n
zef$b{(BZi2*A1S?Y0+8wVpqDf8x9dbtU|;xJ=#?si0mF}AR>D80CBAmYU%LjwZE2h
z%^+BTfc*%u<NDJJzEN(p^EXNlJNj!)Z<`1_oeXQSS05j)(6Qg(E+Dk5{RS;V*r=sD
zJ&(;)rso^OcmT)aJ8-gugtJ@7)c$j>zJ)j!#e`EUW~$MSy`;^!Uf@&?`OD2iy|85?
zJBYK^?k~<JJEkeVeud+;b!yWNbd_x?99jDMI>YI&M$t}8E&AavVy*rM=u~n=emK%P
zci<hu!k@5uf;Hctz)^$Gdi)93v7h7@Mib&JbVt#J|9(LQ#6uC*dj1i&qDyOF3ZdUF
zZx3(qLmxNz4y)AUJ~0gQCh{)7DK1hn?>8vX_9uh+Y^2zj7Wjj+#ahJK--taikhFpK
zt*hlu7u!I)+;w6zIs3_fazKeLHG{wYfp;w{=5~wmk4be|5OEAaO<n0ISuqQHcH=8E
z&<Q+4>t{e8&jyAQQBFA15C;p(XICt%f{)e9JcW$x`$MCCCh-ctXdb;znr@!S)WJt0
z)UkXyFrN~ELgq$iMlg+Oo~fApVtreGC$k8A*af53_m^D<?IJJ6_cn^;p}BetGGPyI
z;1?p5lmgI<7ygfC{^ytMImC#M`^z8vZs-AuVsq4Pgd(t$<Nq4*9g1R{UzZSPWfBRa
zrIHvAiI)-(Kd<^r+Yu$As2Xu{QW3|M-jND@nyN{rl8-WQ<TJ?hJE|<kze^t>qQ+(-
zp4<=qjMic^#1>6I9NWe->)xU3&At$aiG9Xm#1_(M>=v*QD<n4Fs(`xndBiXHN`M(1
zs!BNXRDsiyPdNXM$A^5FWKP!7)<{NiC+eyj?V~2P#V)MBbjex|To?uE(02l@-b13Y
zeh;K0y4Zjs`B4p&$Q&RXUv;PeaXv!%;y*++x=~$>uQ0SDj`^{_{DKb>;J`1?0M78^
zh%<)1t06|8z@gtGqS1-J#Q*n-Z}d$cI!Y7R9TkM#S-~7Yv&Ip(IuU38S;Fz{fnJxM
zMKc~QC7^~eTEO0VfecQqme>LjI}p+E@?XXvhqdTnZLtwv2AR57Y|&-99QXy$H%ZIs
zOl^{+J=&n-NEOlXzpo+m$APVIHAp!I^JWQbV|_2kKB^^=x~n6`D>r;6$xQB3JtDf(
z0lH!fY(Amks&hE(Cl5e}U!UB_qO)|xVOS_joH-x;;wS|_`~G|ir*-tiQ&2yn^+3H$
z6Y_BwU8yHVZ+)PDAmTqyiR0Iw!nDO_V6=4o`zeP1E?s6XkdJtFe$$8c^vl13SMZYA
z|Iezm(g4^VZ~kI88;DuRu&N<&+TQo&7}D^LJ$)RuSL00g9fW*b_x~1js*^N=;e`+S
z7?L$k(+Jd!>iWYmq7#h>ClhhJd;V}ZfA%3OW8m!UMSXFj5BI|NQP#_mDY6G~e#z3Z
z!^Ez6CSoh>(fjV+QSeC=nVkQ(l#fxMT}?<l4w*p9yUM68-Dn>xv(#v_<s?5X`vH5u
zs+2vEr9-Fp6Psf7l}01I++g^&L7Mg5DMB=fJbZ#;0BzBqxX9}dnoRZoaPY?|46vrc
zdpnxY&-Y>oU0+RB#z@|s78$ej@G6W(!rl}#xtQY4(!2HGV<!csVk4}{=k+Cv9?08e
za0zgBpWI6tfaKlKW}`{7&BT^SlcyPI`o{Rf!Fy>vA`apI>9R6Cg3r>Toy|!<yv%{U
zNJ!Y0OjsIA&Bf&WA#?7A@f=9%6X1bQAL|F`7IQH^0=Zg1^Mt`t=Pk(Ud=U{_h9RBy
zw3n+`nYI`p9*BE%fb*ju3Su)KV$*jQ({m(B`a80W=rCvL%6u%Y?X*Am@Bv1q??tf>
z&eATS&#RPBFvtQ+Y1j^k?#bAJ)7RhzR^I_QK9U%L{av57Qz999%M#oT_n;TB#L{!f
zCV%+ahWc6&-oB?;0o%h9S;PCM0$pq&oh0=1>Am&Pn{m(^?>-SK@Fw1g28yll3i0n(
zLjJqHKc-^`ipgPaAXuuMDDBroh{ON(3{Pv|lubq)SGw4m4EHTWRGdnBq&bzP@$cH9
zsE{uRfRNpR-_SvQ9McO!@*`+t_@Fj@(S{^JjSXmeI*X{+&S$C69kU=u{&)8AwFUOX
zNU2{a-p3FHGOh+;^jyM0ry}%?5@W>iU;yV%jI_-}aPBB@a1JaGFl*MrnbrfYzVscQ
zhDAgk@{k+=n4qL~8R?;bCDx|TGRc_TMw}7Je>m1S$iE(+ywD#sN5GYfzS;E;9m^8W
z#OBi-8XH%`pymI+mCZkm=!5fz0v(bDDfLu?1jvsK=3Lez@9gPAY_S#U;w?nHu~FJZ
z6c*SewQw73X!OKOgLS~rH%P_4TY7RPX|$Uow#1_K^%WL3AkEAF-&FgaO?<NAf-x}a
zj8I6E_V5KLWx9Y%B3^+w%K3=nO2Z)P(;Oc0emD;}%XSb&D|fKqjS_H@!G^iMEorwP
zVup|?A$=0%{+>Vb#`JJLIY)T&L6gNn#Brl}2U!Mm=x^ysTZg?ea5Z$H0J;#|N7JK{
zKk{0%yMSm45rC%qrGIhI-4N{4pd~|wr-4sl@Z&VHkEWE9q~9(=vE%=>btP~)W?ej6
zXfKjTNtSxs-X1%VOqQ6GjIBhrK~aPuOAABR7E4!T&o0YnUm`oHFk=~Gh+*tY#(Xo3
z@cqwo-k!JT_4)n$-e2dOd(OG%o_p@O_qoq=$QTLUV3K}R0cynYqj26%p1R(hDA_$N
z3Tt;Aj6$S}Q+^&d8n2a_%R(#PdeX@WLKEPWYS-C%l1XLvUg#s4iTsnU#=P%^4z51X
zq1{<EjR$FWgfLw$uo>Y~<|6C@=Cq$Nk4m5f^vTO=w3Rp~v4QRodTTNBl~c(*#jds@
zU$<3@Xb!ab&q~m$qiiPc5T@l#1yfZZoY~+BgsZte<1OxaAYcrvvK)(PsLC?+?&w6)
zoW0yavX{+sqh3-rUG$iQ(N)LcclVeczGy5y-h)dh&Xw~~6PkiXeZOkd{&#Ma-%@Hy
zrh3{EIye7=fpTII+)ARdj3T-fFdv>&kWtV|vXf`KzMPNY0YzbEYbl&sN3=$3EzTcW
zW7YM01K+sZnyr7EFtz?<|HCS3EF#*X9*g!*oljHi*fyYP`+;Qpi{duAC2Y{Z_b(?R
zwrY_msAKECGBrE-so}J?V6vvNIQ0#fP^lnsx2<lS+DA2nFbIWTErw3jE6}5~kc}ML
z<-$Yl0_WoCy|<5KTe+EO1*$vkB-!g~wud}#3t{aiwMY3bV==ltC-q5$SYcC+FcX_?
zz?Tj|<q=kD6G0hunr&W(#mHMrR4TGjTy23bSl+NNXK5_%+G7bQPqr#`0Jf{6j1^c2
ztBD~UBzXfdjW9*djJe|MR$G6NFd+YYY-h|vOUy%cx}Bq8HFj#C0bLxBoxr7NT-Q19
zF=P0cn!c~d=qN?XeS2^s*Ob1l_yNPFj>LfyDIxnxj31N=YRO7b!6e$m+sgrtoZ$<h
zm-?~}gF6u|-rc6($sGyUStN9HGu1D_lU|HVrE))^Uny4GpJd3H5%2wmUS4l~7OGhx
zUs1=NngOg%k-zTL;C$h|+#<Nl39N8~RP(k|4<-%i%zO0Y&QL7{4`|^B0>B31pUxav
z%)cQ_C}U7ls~QCejegqd%R3pa&%Ohwr}D<bEdWfM2Qd?Qa8m-<&(;z~GlUKGIe^zn
z=Pm%o4O7UCMN$_@o*%0Tvtblt?vHde$?VEA-=QlI%c7Z2cC;JsvgPso-22Y~X>gJ}
ztPtvGbU#*RBs)G<Iul{htvr|Bn)SQ|+ARDkz~7%_&?c=LZwR+_g9a(_tU+45o2_Wj
zouh|)cVHIJV5O-fm6+8@YtvBvVrp@_KNmX~8Tnv%)aTrrl8BRUW*|CF=fr{Fk+oX9
z4MJd;5s177z;puM&LLoDQ5uNo2w>eF07h+N;M5-2xC6MFfQ@%C@KX<o%8v@yo&W~y
zC14j3ve&JSNb3QOf!R$M(*sP7QddpnGv2x189iMDC#?)8RWJWn58<m4Qde>JkXt>O
ziA?Xma7ZOe#}~s})r<TuN164`JU0uW4Z=K!(4IjMx-n0|Femx=H$5w4WH)f4M*?b}
zKPpOtkgCy>s1KUV{z35e@3Bg$W74EE%yi}%H#?<|cX~lws|$>Q@u~{HV5G`WWN0uj
z76sI$K;c;6W-dAe;S7vqJl&XPL0>v5!i-Y;(wWQ<X_!p&X2AOWhoP(%W>TLIof63*
z(nu2VGz21EU1#Cld&BJkjP4EK<6FWyR0<Ylw<^l5*8J7}pU}4@h_~t|Kv#uTs5F|I
zPYXqJ`x4?AAig|6Z1pP9@gQ`iK0yEVKtc0p%a(JFO1)2?gX;s0)$9BHN37zrM+l?j
z9WuRx&4A8<pdb3xa5z6@dd*Y#KUs|=FZd3U?>=V?>W#@pHtP%Eo>vSU+ZS0WZn4rk
zMwJ_t(oAV2&h?cn8`3@ZXy+Ss$HD0Nn2i3aFg8+0if<a5i||q`4RjquZWMet+2jcH
zyN)oaZshY{=1+CXMAQF5QKiwX2Q#jZMx)zbH46NwZ<N_za+YP>cKqOG4Dx&|?%h<1
zSydAL{U!M>{fhqR=yYTH+e@G<S_K`i^zUjj85w62bgrGMeSjI!HxXJhjh%=b06W4u
zF$2KK+JZS99RNE5_!|MA;b@`1)IxX-M6|%|-JSyh9PPrC5iS~Q(cTJnp@^e-xaoKi
zP6!5g8(sui(wOMI#k|HE3pR<mA{z=ot8_fviut2JTMdhfH^=btqU10r;Lw8!io!6#
z@ixX&0^a&oBu7dOR1JXh2?x$5h;R)>Y&e2Cy0MUedxIIc?wqEExY`Tfc9!qiQD0sh
zod3B!{4fn;fbJ;&a+2SNawB|L*;;h}4ObS4Ufay_eLc`7V7$B(YI;tS)R*X;#ftAV
zmLh!+><#g220{GeFyS)>-uPu8IK9zfJ`rYq1hr`(oFakQH3*6YM{vW42%sAdQP4=p
zBBWZx@+4tQhbkCH;k5~qij>=R-pqUl9Ki>^*IcFCwc$jM%Rj?V4v(&{$@IzxwBbN4
zRrE!pnZL&vI9qrQ)(S{|J{XegMkyF)z2t*V=PcJi@(Ii@wOMYCC3<J^IvQrlYKU`L
zaN08jobo3yrx)}GfHfoW+j1fST}5!D#LJuVWp3)1O2?N|h}2K+$>isM*}p(wn`DQe
zsiKOR#`5RJ!^D?Da4ZK=4TnP1mf3`9C<YIe=!1D8k$~1I49puUHKM@tfPnqxGmnPD
zFl#A>pE*0fGzwl52v2ZTiQBMH3>_x5qNZ8H&@?oan?^0xn0Zw6aAK2pZhKTB*vvrC
zbXT$Imd-8{nWixn9ford>^U3^Etir2XR%;7&b}aJ8v%<1YmIM-JIV^~TzCHU5RB?^
zaBr>RoS4O=nJYB*V(<v&Jaz<_G+)J-?eqsYU!>n2YZz!eQgV_x2Tre%oC-_Z*EQ_=
z;mu5XWs}B4#ExXnGe?5SqTP%s|3<lu%&BtxFR^2x;}Yno9<yBsbiI$ol6rZ+#!Srb
zt-CV3JT(0GQ7~6qD}3os)v?is*f2>4G0Ee<*R3-)-n+MK$Es%m$5hYn+9y~k_dGbp
zS`Qt6{ddugj5I3#rl(n{#-osS!aTmC(6g6knF&6SF5ih*Nx=E%8HjLG7w@;RAwCnP
z-zCC0i<pZT)&(bYGH0fwG#LaP?T`_u2kTLh!pT&u9gUC%!N*2})ADPK*?AS#30kb<
zR5;w|J4&w-U?C5c_F=b3`*zfR+!(ai{z~neh&^K@zWlcHiEZv>DA5Z_s5|ab!lK&U
zgQx+Cn89G;6a^-&9ulU32#ewrF_D0_kC{9#O5*GNz29_+4ur?tbu{GM=>?OXn1#q!
zKbkXA?`SZ&_Kq>*qB(b6K)_EQ7<e%n6Bar=BjD0c4BTD@?I=tW#(yj@wZ1SWaV#=&
znr^0kPJ`mn#b1%#si)h(Dx%UPgo5#v-OYvhkIbZ$nAAr-WWwOv@p6V4I1a!AH5gb}
z-Q7$~*O9L$%q<hfl<3I+C19XA10&7c>xz&V_J_eSz-TQQlO4l7$|K;VS`55z<8CKA
zCiSRcEHKt}6^ya)vU4{Tv9Y>oMrg-+70~VN-A%-zRPM@cLgNd$a#waa0&`i{(0e>E
z`&<aqKtzq_aZDp%?`8}v7%w#;4c-#)y&LoJo`4+-fPoVL4D)1Q$^@Jd0Jw&L1wITc
z^>wcy9!=mmQ%0C~t(ozgVE1amH;#KA5eH18w%le_93FLp(J2Dn?w~NT5atuPzx5{q
zv(#T<WG<?-(8>dpK$rpFRKUb{cDEFs(OC1y3Hq(Lvb-C%aj%?=j679SB(MuLYEObY
zP6CrVAqo?F5&sigavfpjg(?_xv8}hetuT+|X<<4U=(l|c?IuDe!)K7mj3c0R1_2w2
z9g{IFXt5^Qn5yzWXWcJf3n>&b`^+D7OQ8Of{e~Cy%vZ1?<=^kehf}k3xq$v7{)R!N
zLso@G_@aLu@p_*wAxLkNEiOWrWeCga8_wUYtk5VX%e|f$@(32evKcZ3y_>wM0y=Fa
z95-==jwf~P|M&A$wwN$Oa#1adWSNb=t^2Hk1}8CB)jQhCtEokE;di}?rP!6AwIu~+
zOoakf*D}Uy4V;@ETFW+WdFaAxdQ93D>ojimDgSbk_paB`M{98>Ii3@o-tpiRkRy^4
zkO;?abgwCP#>3wr<0xU8Z{aqPTivUR!jDxj{Wha+!gEWe@tFpiR@)RBbCEWUF{=qP
ze+OZ-V$XK)eU2NxvWC6t^lMyzzD6Lu@mKVte6lo`IVJ6dw6N)zTF_&{ba1lY!x&h>
zN|Yw)&H;w^=)1cz`s#qbs_)13`;WrOf>%1Sa?dr-9(zObc(hT|AJ|XyK_oAK2ITo4
z<o3}AVB7jLxle90fw^>uG1F$UdKm=VafE?3)3tSo$G-$jKgPhG2?)j{-gH{#)^vzZ
z#2~9(Eh&!%Ads3CCZOq<liYOoM6I#-#!uJX5g)2wypFbEn9J&oPv|M4*NXUjMCY9?
zIOANK2u=y-81pI-xf9r%B>{N-0s}vucXyEQu*mA^%Rd-ic0E?W^gku>4&ya3F)m`D
zXQ8{5_%@kM6qXFkk5?G8qZrx@_^2E9>B|O8Y>nP8hw;_Dulp0zTg^i7fR667z+@}V
z-Kk4ge!}`hBOvRT;`pf9HZY-OyQ|7~mfR2z=1P+2H9>17{+h+!U1K&lt-ZyVV{zJ=
zLh9keN%o6Zj}N!_zv`^NP4vyh<zF!NS7&p_?txP!FER8-$wwqj(N-1O9}%i3x=zjc
z{vf?`NuNLuP^onAH}1mSI|w-c;zdfCen_|C*fyYF1$y<>-`@9_e(GIBZ+dN!;<ED`
zbm376V`As%)^(*;2Ii33n7tk{>5VzOdY4lB<UbhLaW3Z;;d23Wc*;Oj&)}@(*n+ga
zw$SPWn5vCC>IIpE-!j}5xZ8|UxAVwv+Nk<_{}nTwlftKzt5YCl$y*AO_HtznaXSS@
zpo<sr`>Taz!w9}#O@-o$^e*%GA!P{N06X(e;p8Yb&BOG=>F{yFxc^tdR1>J)(NJ_+
z1VMBPqOag#c*}W}k+5DMxrkBoagKx|fd%uyskkZuoyDd3I1HvYM)Z|E4BI130%?Fu
zB^UUBE$X66>Rn~DDN#9!BohyNv2y{O31fP60YuF*V^J$jJ!*?LrM%YGUkFTqrP8LV
zh_LXm5ycVg4ATic$EpH4eIDvkeHnr`W$4(U=<TM7jWL2g2#9L8u);$LogP&M8rcfJ
z2waZE8A7i`;JLWA*qebb9M2=WQE`n$t|berTB0ab6T?xypd-Dy2p7N5z6|XvIg8}Q
zQY#U>7*Fk~xy^&9Is@TG?~q!nCq?rnEXgVrPBEmhhqcK177>CPO<LPO?>#ISgof(d
zu&>>eMjc6JNGfy=@nE2~ucwI^=k8I5PZEGWOz0#pQ7IeQhwy|9`Ta|hkvIGF4_6vN
zv2lh8@l0=G*Gz<^A$EXCOd6Oh4<(?h*q?@TeE<sxIIk}Qt<t61vf=@nVwVdrdmOTC
z^-)0F045z<PTF9)%j6p%oeWZSE;c8eNiU}3&;z3GrbE=G!3=cCU|<^zQsvph8JGZ|
zEWeXm)`&zHZ8H`IHPgt^L@IxX^EEZqjN_&)mN37-B>+amF%ZRDm|wp=ZGLQonb{Uo
zT+Q#&WF~#CYyXAXw~A+Azh%rcY$<@FXE1QxQXSL%+9PqL@Thy(@2NLx;R!_QBo?Qm
zg3QOIY<|mSV6r?_!I+40_R)lylA&O%#g|;2*Xk?B81AnJEo1ts%dx2^N4T>7>>Wzd
z&V7|9jo-ke>o%kQR_c1p+gCVkq9Msx4#|Z%gmw_J+dbRpQH%3F;_3Qi;?5li126Gk
z?FZHIJfED=akGb&yg<u3n6>VGrXKdKy<ir#oj-439nvx(5t4K1cla&>I*XT?SOrL4
z&F*P$oiRpB>ln7TJ<RRh4?$k;K~{f=0F&f=#$*d@-@*Af0fVkEP%f15MPQ=?jQt8=
z2H#R+@KEU{>fA&uW0q5iX8f;)H2>u4W`<HI2h+N(YO(OVM;39ViaAastz#BA^(tXA
z&Cmf?6VT%U1ASK_)X7JJApZ<ZB~OvO67~S1scerL)f>eHLDB|{tNPUS+C%2?^ml{_
zO5<hvBhu;Fk3ioWb4UFO%=kYPdMnW+8t;%ore+ni+4_Vr+NP)}60?epm`a#)PuUEY
zSK(GA4bR?`hi8X_eF@Z2pG^jeq1ni7wAsiZh*Dp=$8i1l^f!s~mUWOx^(A}^Pj^1O
zXZeq^aUw=sCqDa}a~p@&A8`d=eGqgV<!9DPPRpNr+9=*JbT#_$Z!H-i;0R{Id<zfq
zVZzuq6K`|i!RR+C9F<$pwk#s)Ji53N7F4IC^-#PCB80Y?X9HydC9VOdHX7pOEJEBo
z>*(i>Q{0#EL<GevwGEBs>du^;*5Y;m^~)w_ZRB(a{Rq3N`}JNTQYt(l)~$u8{1)`L
zJXh^R!U3JNf490D^eq&wj{`EbQ#R<Q&^w92>(G6qqhr?*r!ZDx8~%_p(SRwQ6HDRI
ze?k%UA#E_Oq31|V#n=c>bN!xhXU6&O8$sbFh&SrkkUE4}qxMlXv28F6uN=MWYa|)=
zv}~x-$dQyRSq~*Mq8aEk1!bLfM}d=e1NWih2B1q~Dxg1&13FEIUQOuj6BwO8-qTWk
z%U<rMQfCPUQ};7^QU!LXzr=g|pJyH#VFH_+L|@g1YKMMc4=SDv$?G<<V!Jj%a?Pm<
zr`qC+4r87JOxQGPqgBr1V*#wxUzFw`(@&i4SzVNtZ~pbwoD5T+K{JVmyt(q-1fIr;
zEX^Uo(@Lb{*@WCrrMMG(P#p`#&QY|hL8YGLebh(dlrfJnZ8l48a&F)2-SUmbFcf{=
zMD3Yf7K!A|@JwWX`J2&nMY@=fi|n(~7Cu#~zXiY<OG(p4B76&<5X~T9#xlih#v*?U
zXZ3do6Th4>>B~HAWk;iv7vHVG%*tfN;<thkfGY{uWd)ND5}tN^lmW~q!t~5yaukx{
zJW^jm%E(Cn{tj)?Uu<P2%eLWKo&2P0R*SnAG2XS2FSx5B{G9Dfn!OG4U~nKZSje;7
z4tbe7856Xf)r%qE<6W#oS+1uw2PKdf5N0fP*SR=c+Hw#Rm}DOG95HDp{L2Vqr8e`n
z>qM#%<8~nHAX1|rYz`6W8!WSG(hawmv;d@}S;-EFTJ<Xfo9$$v?@j<$+-0DgG=VaU
zfa&)cxFj3j>LE#!JB&E64U%4cB`F14GE%Bzu1+a^tt&&NW<DlTDrPD6<U&f^Gj94G
zO$lhe3&7}?WT_@p^~#QbV+gqLA2wfkt*bh+Qu-=ahL0}HJ`;UoVZ0mp7MRrAEjd()
zG4>LtCVA8sC_z_E4BU-}r9e$5R8e&=vHoYzMpXC8-kCZ)JK*N$7Z`+CjK2C|hNUU9
z$y|kq*387qTJ}z7irwTPG;;J0hvT|`^k!IhGo5S{zp85Zpfh<7RG3?V!bF_ggMAwU
z{Zm3&+v*$R34U#eq?DiVJ@*1{<5Cfy1`wfg3AIU65p~+l%T{hGYumTor?vgDh3SMv
zNu5yiX`ydbTh!2KZR7^}LSBYZq^yI!fh!6B^*<0^*-sC(6`GD-R-)}b$xP;TbWrO+
zbF3D>Bdb?Oq!537tEysDC$G9nZ+Gki*S%f!coXqvA7@xp!lv@;P;q}hLQKeh#9wGJ
zn1Eh=2-rmQ2=%IkS0i=V(YxWRTT?y3cbM7gwOu=y=(|&U%>lG;87VWBYkS2U(5=$5
zV{Y6iM)T=tu3k6_hO)TFkzN*j#}ka+5~C->%Nf<@fCfa^K_F_5<R+`>4*-wR@1wZ{
z)QD<xG2E2o%Gtp?rFNO&n2k*nR)?{eppqG<UCFKUs#6b}L&Z+zzKGwP<Pq11)JH73
z3f6QHPG&u;&p}OP(C+$bjfnl3=mTV`y;I&bKMF2x;Owj7dhRB7?+9K2Sa+CH$Na;{
zPlAph6aM?AmlMZjbkOGrI{5jQa&yQv)9|)DeMX3;k=W$me;mBOK5(%9Ro}+zcKJL&
zhVU<OY<P#TC_s4>e*hRxzo&mApjK=<ireFKP^k$R)^`kM>0emN)ZzcT2Sln7CdYJV
zn)4dRpQh4y>k#$SGsOH6i*kDiCI0n<;&fWp^5>7iMxf2Z!%THf-1iC5dvid71?XI&
z%H~&IB4d(wec^PR{nhh0p!XT-D58$zsR?M)33}sCnbuXDD72|AtV(pJrguxeiK9<z
z{DID>!&D3^Zl6Jl>YaxP0%L^a!5H|oz0WD+xv6=4*14U4>*_G@X&&T((&7YwYwfss
zPx=GEG4yLyk0@Ql_7hl2$(F}EwzRp2kva`;P#+Cx>oe1C^}OwbrxxoYn7Ew;lc5fb
znOfhQ=Oba}5oT!v#_YL-$HcoFylablCt(<%UlRJdBcq{w4I$-Yc>tzoJ}}pul)lyw
z>G^!nx&xR>c0zj!i)$-qFjJmjB#OQl4nS*nXstfvYwAKGx)S5~Q()}Vm_=Hh#ycp%
zF5brC-wV3OAfH1<cY6T_<6(LA_SU+o(n!8}<9QmKy16oNa5HZ+`J*<n!=#iQ^csZt
z@kg>Dlg1kAlA9<zjTH=e)qP@eIh=qRfiim*tO<FYQfd#e++Q^%S49xLB$l0#_^Wa?
z7aIjXgTnQ&Iq0q;O&La{@^_)!&O+49Q7r18@4Xvv{Dl(Pgjo^Im?Kf%P722Q95AzD
z88h%4)^m`@5U?zcfvDV9UF4m^cmi{oFj<osQ|mmFyPgNoX(|K91IQ*)s`?qG6Va%S
zO4dM$KPL6rKLJH3`R<fD9XdFJNi`Q(l-~u2GD&1$iVm1fz=`;p5HWqE1AZW&@f-#^
zJj54mC_6Cq`Y}8g_Nxg8P{)viDLl?abK!CH6j7$XW<R89C}QihuX4J5^N6*RxRl~;
zBko%u%oG3EUov_df%gUcS1&K2i-gZ5$<K+XrX+=yJ%kpipi<v6STFnwqz0KMF^@2r
zn#fU=h8xC_|KVAw?jI#5w^K=H2Vs@vT}}1yj)HN%*BX}$xQn};;X++EO=(tBj6%Uf
zN~h)(z+RuS6ifqAQh+fB<`rRjBlzn?nThdhyz7Xu%Md)NH)UnX!5P*@Ml+il+B9yX
zx{<Nicv+V$ANc#De>fbv1$@6-d7to`liUY)PAW<=7E|{l)LI53ae_7;h0vzf(XVI<
zaTE%4DxtR@SI{-Z`C|xIfqvW?1qJcC=qa(c80WlhMY>VjZ(hS~D#juYW_DF6^H3&r
z5P#=m;wFNgWGpU%jP+-TiG#RMgoF>k=LCFrfjK*aJpp||QOQc|DVFMqhF9Py#6mV&
z!S7~O=-Oos*r1t8<ne37gNr1}MIm1o<H1Fb>%#a7p8unSB7GCJvd0bXqTh9IQ&n0D
zf}|@@WkLl4k#^nN%#f-CR8>BiX~p_JwHu2@S0x)~szcdnX5oLn$DouoFx)9`veVJV
fU&UmEoYbq}(8pN^jcuqk5qGXiR>sDzw4(hFc_QxM

delta 129028
zcmZ6xc_5Tu^e}E#Gh-OLF=O9%LkL-;PzXhqWK9u8(jplmA(d<oDv^DO5+*H5$(FK|
zExV#fMI}=4d!9R=-~0W(?_YD~+;h%7_uO;OIrrQrtLP<aso*7w?64DqC2?>N2pqhz
zSILS5-q<EHwY9YSSGTxPS|CwTDor$-MsK0#in`t{6u_a$vFZ15GRV&;P7V1X;TdR3
zY`PI%7x@>C{|o=z3*+oSA-_gMdklh3Ap>+W_Y5BxmP|n-zZ=p<c;weu2``2GZnMS!
zwjDO_5w?4pcFNqyue-Yzpue=wRS^0AG4u);KXsg+fc#I1S^<3LqmO~#-^^t8|JVmu
zWZXPK49w$|vWBeSo=4g_F64LO29AjQ&X(i=d~DT@P00UO6E}hUBku*sJY?7+mNn5G
zR4fNaBO(22wD`TMZ@O4y(eHnl!9Vxpe_p1-zpQ#Psuqm^ffQ5_3IY0gQ8U~K@JIsn
z1Pq;(MtP#qJh9NIEXo8PfyCrcmOK=AjyX*p?_^F6j-xzK>^-ys6uOxq!K#%*WpE+_
ztkqC17zD`IM7;vCk7}Xn@CZg;AN2+Ui)5{BL4Cj?z@!<ffXu@K3q9#G-9#4Q;E>gV
zq|f1jP$DF0$iP7<h72B7uN_KQ1mT$TN5vy*v5p=@nUN9TZaC@@8*>5$0gVZ#Q5MLE
z-Dy-an2+}?YL7C42`E8vqYxmX6s3YkfP&lqaeLiCeE~Yz*P}34pi@PVJo68{P*V!z
z7$l_t#nht+tV@k3DgogvZALjz5a4$YDiSCV@dhOffJ^--E-qv!cM=uNhXAzis0IQM
zs^%G@z6H<05zhl@_3|q~3=4)dOa2dP8&D@0g&qc4SmDw0Y=%0K6<Ro%gJWJi-O*Yc
z>S;#tLD7~BZdN1(eHK{YHy!-}taCyV9g73AWZumXCBS~5LxA{3<=Lu3_S+aFsA(I6
z#(FA`=4Y?*x%F<PK3JUs3KV8eg4NMN3$kb`=xLzNIs=^qBq!;hO%T1H4t?|*vY;0R
z=zkb6)nsmpz())R$97H#byWyVg@dBu4KF2`put+mThYf+fHppF>01bagTr0`aUBgv
z-G(8|>a#$f1Qy+Ci$0GBbVj`$>+fKhJ2|1)3ARiEi@Y2ClRf3Cc4lmtAP2`|1*o7^
zMI3s%gCWYY+>4GCL{w`#j6MgpVdoKaH30sEqFHRtQMrmo?XX>VNWhr+x6ncm*_J_M
z{W*^A1Il)vMhB4)F<au%T!7m;0X>db15&z#eh1VOKFE~2kK*7k#6Sg}@chW0uuLwa
zyHIHESQa@I9mtOWCvTzA0CT1geFTeOK9{1M(LCI+zyGTLed-4+;s+MEL6$9p%!;W%
z^Rq`;*B&L^g4h3zZBt|vGTQ~KIZ}mwfI%cdchI9~1c<nY9tIc(7J36<93P-Biy}i)
zZ_poMfw535N=!RT7(=9CIQ}P$BBw6paP;rz@P5qmLrV=@3Xqg6h75V_W(ctSKcZi;
z{cp$q$j+;9<Si3od&tw>umdp{(bs^L#QvZMxe;?M6EGBDE<6{8ADl578S@+f6Wo{!
z060X!7z3J8K1>k+>;y4PF!Wjo6AUm$RLmV9`Kt`(3pih6+L&{I#zzNJ2mrhu<{og%
zhXxpFz%{-Fa|R4~82?8+VS))~J6-*+1K!(tI5^-?1v{N8By|jfWnD4D9N<Cp{$-E(
zjN(R&LCZe5AOag512rEaDza_ydLO(m>W&y?FrDijOgaF*?8OX&dE4DFop``~IWSXk
z9^TNm(A8;CMcCTB(6|@8V-r4@HK5suAEpQZu?H~k0N{BLa|4Iy@HZGUhlnfvcoYM~
z&V^y_0g}9MOd|l?BL3svIDyFrn1WLnF(S+aJ&DC^1#X!a6chgd&B1}<WQUf?gA7iV
z(K*aGkSTT^!y|^wrdEKF2CLXrgy{i8(xsSY0DLINECOJl3eyLGiW-a{(D7*<rULkI
za3f|5@apmhm@I?_GJlM*Mg(7cj1dHa3!Y-+z+q}@!T17<YC9$h0Oc<+Tfoq4H-?KH
zg7kt@?<00+5umHb6_ubngBT&m{)Q?)%l<7!4RA#bV$J~I_d8520B(<CMgeef8dC@W
z#w?~30K;<_Cjh8_!R%wxEMm04q)k6DIRN9fije@o=|8X<i1G;=us~o&!+<C0X0Sd~
zBGhb*SAonpu>!2y7_0|iAaP>R0N^2E-vZzRH<kr}8+=$e^}({11+lU~C`}Z*1Tfs<
z*m+>j-;&ri_B7Y3dIv4wY21iNi2iTc>L(dOEGapx9pE~uh>ZZitO}NG*}v-8e1OT*
z!aA|#U<KBDp2EBS8vj4)LV0o8oUE<7*tcL(sy;RW0QrVkOGGh<*9xx(O++#{dH(N^
zz|u0ss)5wywF6s=2KG2c52OdcX>dq@?N(AzaK;L-!-jGqYaQByZ2`wL&mUU`Cb2$<
z{Rse*Agn1k%FN@~LBv&AuF=@@AhAruW9I?a%M5G|zyw^wc2dB6C42#TH{b>7;2}qC
z1tlo84a*Nz#J~qJz7kssB&%0rS3uNJc!a$TF#S!~^B{@rYs2P%G_W#)tph{1$Fax2
zT+&~$>EO&a{KY<GuWjd-?r9@9{WbGLj%gA~&|)k@2;vb`C9qmHuns^mVLWaQiJ~l&
zD6SG5xM~^Pb_DTD2FC-=23`p#3U)<W6(<ZZ1`M1G@BmL891jo^Vu(8lFta8&P9X1_
z1FjwnmF&e811>vHTnV6A_QBEFhhy&LcC;GoB}1H$bQDPix|6`*g76n%FF6!|(*u*{
z2jXz-iX;q&20-O$TraS9bR13^2rRgOO8|2zU&e(1uI#HgBD+?I@=(g(1m{E*E+oK%
zDM+mMSvVWOsc{X5Wz&5$?P}7%ad1fUKw$(LY%5bd8Pasb5h2qn3_L3?AEysi@wgaA
z0%~;J#_1wzG_Y_rK-S%dICetzX~JCun6J-pt^lxZ!xaDpKfl85019sI#kC=rh9TSm
zKyq*tXAc0@B<?&QG5LTyA%W~f0~#+0g5n?szY2g}9NrG>z7zqk2#9UC@Z(@enH!(X
zK)C9S@i;*9$Q0iPhEmP(CV;rd5^sVeQ{<r7Ai31T3a`ijnOnPYcbE|Do*P)CQZ;0C
zp2RD%vo<xWUR@9#S^96pAQG<tGO|w;egFUlO#C}EH<JIiUEDG(2JfpJG<6kk#M*Zb
zuMV>K#q;<e0IVe9Vb6wVF1d)WV)K|j4t%8q^XzByT)T`n0Hgy~@i72!&BXrzJa*Z5
zUjW?A#rp$5<OY5T0Hl1pI*8*2Mff)W!&8d?0|2gy|7g~$@M8coR)c3(84qjmlK^w0
z9zTTG4607z*M=7F<2j)__wk?%ZMu(70inaT1y2FRy5|V~B5;ZMN&GFab(d%G>{w|v
zhkpW`gzz1ILL1qQ7&*>$Kog_PSp)zD4bB{J%A2=vvX9lU8D}aOI=qc@9fY65cAOdj
zbIp<SD%d&=XHNL?1PfI0;1pq(lRhmU`Eub?p2H7G3lX%TUlnk@nCrt?1U$~{5GNG?
z?ngKmfIC@V;$-JTu2fF=HU!J+O5>F01kve1=5h1=@Fwraf#{T#&MC|?&gBdRWHr}0
z-ND)Bs^PQ%QOMyrCl$oNpjVvlfPUM1IkzexGLu(0#emn9t#U2^AZv{i1K6*T38#Q{
zgoFtH*pW(*SX_A;KBaYB$QmqJ{!~ITSooqCVFC#5l_D$ypk0o@Hgc>I;R!p8B(Own
z5@7C=WC-PpgL7Ifg9crzgX@!P>IAk))wKza0sDe3;SG@7Y)D|AGiwt<I2d|tPKaP<
zo$@=-v@Yz6wuJu?$co=aum*ImtqF<1Ag((J*6cm#oqjS2U*0)B3;ZvJ?~VjISSQ7u
zpv7M2&pm_1YjCz1{$F%ZUL&IEJ^~gH7x)u2fb`w~0;ro<j{*sKV9)m*CA<V0D2EgF
zvdg+^e$$zE@P=K7q~gVtAt^nA5bNb}!e=1i{z<|?KrelU5D$E|G>yOsyx~qZK@7Oq
z>zf2iL9q9E{<mAlX&f9ertGU&8bJseX@XVrs3Ux$A$z*5n{X5eZs;W>$sic>p9C(j
zx%SHh3-%I4f|J4oV2zrv(9*E15){*dCqc}g1Wwk_3PA_3^Q;jzln{1`Eb-ibWeHU$
z`xgg%wMRidJC*+9>TYImu|^e$qF{;@MPdfnxl3xqDp`bmivw{T2;8!pSj=`{Phagz
z@I`>56l4@_mXrt42$*31exeI-)rLbvIG(`V`oTnQWdyLwBpv}`SP;<*%s{<PRH6Z+
zq~$n0)Q4TmhK$_Rln?`RL6nC?94n!LXbp&a9uQA~?b-2^s19Pq=`JGs0wCE<6a|}V
zI7r;f1q8~ud_C9A3tuSJAjfX_w89GFSOe3<30_1M)(_$?BLpBYNSQ#Vo7yC}s{&)P
zbw~|BZwGyn0LXs_%t^-pX4sMx52B3MNm3oqNhpeh2SegaQa->ui6f!erncj>lRU@8
z!EsRx?6Z^-Q5aJ1W)N7U3nX@k%T6O{0C#CGC)J1}lb>!Qu~SfPI~-yWj8Qj93Cs}C
zN8$sTo_<U6&_RX<2wd=`4F>L#xekMvDM96`Oh7O%^SI!U3j^f^T)kjfQH5OY>{6?O
zYZ7SspoZ%upt(@XwGUus8n_;Ef_sRle5pMH-d+-9&ZH?rcM7?LA>-3poU9*BT!vsy
z&1YO5Kwe4*7yDkr>f*Wurt)~rb$|{wA-8F9oeqn6`QKf_fy%`PF~4vTA%|i3Rv|Rc
zB@cudec@s!T)l5xpV{}VQZLk%0zUXssRQwu!}VKeH;D{2ykiKmPA+j(@&WNHMtjkP
za4q3PVb_#!A|XR^BXC)B5<|WXd_{psj@1N)&?o1B)mm;LZvjB8F<B4EVWo}cWRR5}
zT9Ajpog{M`na&FmtP;iJ*K_!gaYD@tRAuCh5g^7mTtu!plc(6p&6Qk&w7MXTMP+S>
z<w2$(f8e~P3oWX0WB;$p817zC_L1Qv4g(+elX*cK?e__C0_bqXo+3{YL2vA6mx`*O
z7zYQ%5{i|fsI#u0BX1Hzn0oWbyu5%U{lfT^GHhA6HRIULuZ+ya$&#!gTVTL2--Y~H
zx+(|9w&4FYoL@`URYk-Mj*)Y%0iDTQ`T2M7eKQ*aW`ZV_xOrF)6u3VFjY^fc`9T-%
zp(;0QPIz5GTHN-Cga=yO7DNQtFyz()ZMn_n+*t$!({00D%8LM}+_{SoCYFRZcQpWB
zAK*R=fGvl)FM>W_`!R0#;sn$5pWq&sL4f)k?#)2p*PGk~F!|~&ZcP9vmvDOmuEg8i
zK@_0>#?5JS3hV)+WOj$j!JAuvW$>6=8%z`OjC-655o-6E`#TV7-Vb+J5zMwJ?sU+q
zeD{_67!QK6|Hpk8(HnZm&9ehRz=5t9kW|xolz=^k#CQl;FmEwhZTDRz4vrm;$aM*B
zG%hieSVq!350wzk-!?pZae(d)x?}VnyiMQXJdZU0Ch0t6R_ZREF0i2eyLt8lXJ~Tf
zc?6V*^5?<g`H=o-uvK`40L(cBXR#n?Ns334^)!eFzCFV7#gFhv3L}6?JkKjW1mMo%
zkpe@SIXsm{2xhdO2QJ=Vz-)-;nFvrOuwjo=3M`Vr2{}%2Yd}3e7+5HE1+HQ|7J0JR
zj&tBXRy71R=t~mf5PB@#pFDBEmJfdOlma98{o#2Irc&DA*$?(E5ksMXp&TsbEZ86_
zneqd;2e&XK0N6W1hN1$73X~~CpjVYDWf*W>P^UB^7^F9>4NYoO@K7X!0=N<x6gfa#
ztxeJ9=SJ+}AE7wk3VUoa^wb!yh>(l2)VEP4fG8d-N`L^e=o9XgcJ}H$Dc1ln=0(Zk
zM}{JfQQ-b63|u-+Q3T%6z@#LB<7IxG@)pPu$)mvW2&Uo7r+lU%!1@EqUcj~YF(row
zn6vp!Z_}hQ2geid|Mpg!LVz|fS^_N7F3P+z!ln9)lC>ESJH%Pt2!;cRH|z+=dG-E9
zp|ChLc%y;P3k+TqFlDk1?_mXmbH$zaDZn&(@zT&><+IdLMh(33QP3NLo)WZ3&@f(0
zh^64m3%7S*rYS#OxMv9i2LgD{17P70?<xRh5A%iqmvKJFdzK5RblGrUp*6hK-?$KW
z04fonU3^+xkQb95$CAFxyASL<Go3dR+<b)#d4t)>)#k~G@}C0meUkBiR)d2=Nm~4@
zo@(B80VLk`JmY0|R3ch=N7&`#_dN@{j=>4>iunH+jFs||_X@~e;)A@5O$g^M5+914
zL1zqicE5#<CXI)_MJvE<<%bj=D2A+sWo2>m&43_&mY451n^^WSL(~N(K8Qt1YWS$Z
zj>J+G<YRZ$ONIG1KyoUh@|_3uiKZ+cyQDIb;~N2aUQ~lG9SE&v@NIyESfk7L4Pf&1
z`AVsXayE{9;vg>{+RN823bN2^(ubr*4GxaBBaqKIUJWQFpO3;i6UNt}fiP^(=VRA~
zHHCce1qsGfmGA|F3kj``?;_Btw4Tp^-6mB@=x{0H=iu;AXZM6-9#i;OVoiLHKtcbm
zhwmZCm(W|jlEa8BQ#1a2P|!>{@V6ox4VCZaw*?Ngn;(AFfqfx+FMkv84p%q+0)Y9m
zj~^~6U|M-^emjKZxHmssFv38EFF#xp!@xU#ez*+-1Mvs><v?Vrh~S6sZZIb06#oPO
zLeBg*0}qoQz8u3to6qr6K$x{o<o8GBMDpM^WMnysp8-yv;&pzwTL@!*=kebFAtJks
ze;0^hbB+8Z0CV*@{|rbar@Hvz3I!(K*3A#!x?w=Rm%j=HyjMt1CQSe?7%?RFgTZ7H
zKPR-mmtT-2^@d*_9387c{!tR(n&$t*j@t`oayNV_92}Yo5Gt9U0h!8aky$|>`Qg?M
zEPebJzb2TE@|z#-PQn=5HGUaz2tqgb%fR`e2@7oCkQ+5!OaLB&0aIy#Fg&=_f3&~W
zp-koA(9lPY1p_*2CO~4XDhe1-!La$AmM>*+{B?l)@$lp<c(?`JxOFWBZtMmm6+*gI
z%CHmn{^!KJEBquDZ?=F9s5Lxt1>krAPdRd3paBC46xkw~4HGyh3_=dw{2GV>xLL#b
z0`|cAa3<4*q*Szs|8Er%aZ8{Zm}q;cz)w(x7(Eq`0GNF(0xuB&=~=+h7`CcJc=#dB
z|J~q2!f*p?UxzR}?=uvnrH_J78)AN*2>~wXk(!nWtGh!$3K(#yQvfasVM}Iq2~@FD
zOg{IvZX>vpE-Ar&mia%dtP4E?wmcx#sgXbB#=~|PhqRQ`C7{qjeqI(Vy#Vaa-6<FV
zPH?0&!pZ@*C=1SLAiW}5yzUa<grpd7v3l);fH!c=e;)-Zfn!#D6|e)V1J#=94*{_6
zMn42Xfx}h*5rA6_u(n%Jf)F>D;_4Wt@d<ok(m+9B({LSX#xE!i$x{S-5V94Dpa4*b
z%rB@9fbD{U``F9eF)Q9209z;x4LSaXZ(56+v^KH0sDh!u9A`xZe{g}NCcXY)_X%FZ
zGsyg|0$j+2XyI6u@`8e3H=30N_k(jIZ6qkkcKlOGgh@YcH~~sQS4-$>tVm<QXi%oC
z?GVfWt4Q4~H~=O&<Se)VcGu;IAl$5n6+Rs%_!yiq{WF4w>@-HLR`|XIA0#OeWINy*
zw_FsPWuV2!YDyCP1C)4pS#VAf;Vx+qB(asSpK#B)5AV-Qxb2Ko=ZMx2!%&OP!rvEs
z1}xF}K(GkR8QLT$DTuIN?Gwa{B0$b(!E*KnDl(@}Ki|y3A#?n{H@I#g3Y70Gh-aPq
zDmb_qA@)!Zf?HTHKvEWR2S9+T&_N#r)14wj1`8d#BqR*xT22+(3TO<{h0cMUe4H&L
z29o<oozMf2%Asx{b^%b+EA*Tl7Ix&sS|EO;$q7w0Vd2Zh4*@LH-7Un&dORQ$3M6a3
z6M|c6@TAwqgy35O3`9%_9RzcYPYI>F183PQonK%J@3}tue=VoSLW{_%GZOY>n=X2<
z#JhbkjqU$K!^`q85e{I}Y)?P%^c9>2GBlB9suIMo)S|K|X2OHO7d|-&^MFlU^$^x)
z+Y$e2R&Eu}LG%bDQ^MDJUlA@=*nVLiO+?e!OTwRJ5a7riVRdj0ZZrsM0Q0<hD7*xm
z=4p#?BdEE~^a{f-mN0SR8{v<DCTv*vF1rNbdw+hg5!M}(byY~6wQp2-5?I1yT-XH!
z$E=^ii9m=HO2h!94G)UQEc-mT*N=$%z`=1qo9$<sY9bWY1p$#T;Gt`(A};K`m^>gW
z%>mCbf@1H5cNq=Gy2ub=fT<p9i7bjE+STk5f%~p7z}h3S3%Du4O=J%M_Irvf0KnE)
zWC|o$O@EPOkb55nh{%GD+GM22WzaDQjS~p~xqj$^h%386li9{2H4UGL6L1ZToQO$(
zcmqSPi>v~=paKz3AhhF_NC*3^Va0kb<qaGov{BI2Nw_=IGbV(Ej_lT=LNm1@W1vV_
z4F3?P4qs<!D*xw{;aKbUM6AHWzSRqn;)6&&|Efma3+}B}+SC>>9rtGHO#oDHp<V_<
zCg#*&090+Kz5zh2EtLnTbk&YJ3krnOj#Rj53=1sSO;xr<fUcWVNkIIih`O6ykLe^a
z>t*3}<`R)+no?FiRhX4hPBjA4b>6000GX5;>H#3?#9gWh02=Q7H}t2DN(VI51}YW+
z5-h3+pxN9=-3|ceLn;vrB|oCB2!rNAk(;^%AAH)Xp{3hOaKM3m71}jI6^2Ik!*0I#
zhDrx(;2xyHMKP>8?+En<kX18A{RS}k)6_}!gX!~QxwtMk5N(1Mhh_hlEY{#074AO6
z+zks<4Ipp!8<lNsO_ZpqE;1CVCwh);io0<W8se~+n^+K3p=v)k02*%*RRkgej79lC
z#ddm!s4(c$Ts<ht{sbidkf<?`K5<x-{h0gUi0ChNVTg$+cE1j<^C{?V{!diFvlbIY
zo7q*XkCo1o({MvmOpyJ4_y0#8JOtBlv({5Y;afGVYF4J`Jy2KgEEnxy>uli{Oz(ib
z&Je|ZbwUmbw5wWl8KK`^Bgz0}^{EG<%IuCx<@c$u5Aam{ROICaxHXnF`cM>01Rm=B
z$@G>D+;sT2?SI9trfE?UOYViJ8+h|&PKn~cUM5V7uCsv;qT#?qe`ZAwNrT;;dbR4=
z2&*LkHQ%GEK#Y%~{7@Bv_7c(RG?50oIr2<iE3+fo9Jb9XB3pUb2?&sBFkFqPkZJpY
zMUyGCLOQ~wsY+`AlYCUCL16!5v}y3i5%ADwOB(#S1PnB8rwy=o#-GOa$?5|%FCd2!
zNYe*^O)$-hJ$ni%Z?^;79CVQUUu#Vbhc6bdkI({;g1S_XNdr^q$I-saAvKp;8BGBN
zYOeIn)tL9NvmAx^lyGpy-UMgtOXV~asO3_tXq!0^`i^_F1!)9e_0x($)wX|#26vud
z%(Zv4kz52g6+s^$Ab>+O-4%}j74h^jP*o-+(+^@nO=!%qLU%)s3;w?c`9A`9X!0bS
zYqwpY`+-R-(&(e0bCsAu|HOVqvfi=M@DF~i@S(6X!r}=nUUm!bF+}GC8n))q;dcpm
z(hCK2xG4p{Q+XB9*AawQF<lPGJ6}Q%L6QOT@rN$tFhs{gn&os5;*HDc2>^IePd8?#
z2WiRMVfAq6_Jn$19Lx4Ty%hy&oFP)S`~M6;CTHQ|%<lpH2|L@}l{$Zh1l#il7V531
z8?k~P(di%qB{k8t0r2=K9kv`C?AM;rKeBJH0Z!+)^}=p;1_i}<!(TuhEvNHA#?R>_
zh|x{|htO*F(9J;32<xSnfviU#qWdfVw;C&iq!T3uKd{2USDaWc$nMQVv9lnznhA)#
z1{huuvF#wyxQdCf0Kg|B27hV<b0w>Y1pyQM(i6)-1hZ1S#kPVudwj$aKqtaALJaQc
z!b7J|h{2C&FfegSOb7HGgyO~6Rg3xsv7auWfY5!};faGy5s5=Gi3uxYT#Q|-oSzgM
z0P1*t5ZeK?D4!F12g-r-f5lFKmd`(Z@dIq*?7ls;Y7C1>!9l%a@Y}%RdAL`gcu`B1
z^}<rz3Y;Y#EAcGgJ0&~BEx=RWXM6E>DP;HSkBW1#FEn|xntxhgBdfzzKJuBFnUy#Z
zk~%4lg?uk*2|_|A#9t!}Gbh9ifV)VY5)b7APK!N2-m43{Un&Jc3BeT=q5-QXNu2HF
zDyia*a91Oib+$shPXz%S`^DqI0T>(+KjDgCcIikQ2YS8GmjFFN2>v2Z8;Ti{#6d)3
z31D{-V+l29#HQQQB-Vg&%`+vs06@u>=wlZi$}*k?H)Y`h*ABXhmC}In(&0XZ=5>j3
zS%mZ56Nv=_1Ze*)kq0;r{gr^z4UFO3kaz)r*C@#=0Pw;}n&=}#H;p960fuQRIS2sP
zt&;Fzf`>%6NwN#zF)PX36A0#XlVmgSKcg3tW5C_$osuR1<Iy9@1YDzilA&N*?S~|H
z08H*X$!!3b8kJ<SyNSC#f3W@vZ!3utS&0FwbXsx)kd)0xHsXN;l|9<?Z~-O}{*R<=
zLGm9UDg7on1E#$EOL7Qw;ts7#!if>qFB>HVzhl9`d8`!tg&7Pi6Qs@o4?oQ(HADb{
zV>i2zR^bhG5J0}KQHC5kCE=(?lhOdP9!pDYW0!AX`=*;3;L_D(6XaMY{~w)+g4A1n
zAZEcQxUL7*&k7IqeuWb@5Mys31%EIE&ueBRl>nTw-Bju;h`RUvrGB#mT6MUYt^v%+
z4_c{)tltNvcCcTx$CS@{n8G99psOE5;kUU$cz-VjNjZSnHWn;ptcCcKSe_L8YJ$9)
z*Z9%D#lm4K6^)z@whqu_k(MIsUcMCEk%5WLZb>b&qc0=%^1KQxJQV)KZeH$xh<Ttd
z#c&jhErq2b9ISFF;67|GWiX_1(B&#A;HB5Aq>{k$6l<g=z+HsUC6xkpJF8b}3dDlb
zV^SAHfrV&xVphB0rtcCzVj)#X@~1QrGAY;MWjU=#xdCh6UYBBrtzNXWpc-Phj~dcK
zAj+(3N>jk5QZ`AK1K@$4^dG>*GLe=A0b|rbn(fXZyQRf}VkyqjssL!*E1k%`QE)9>
zJiG<IrPoNaU#~XH2(Xy$(hi`i?>z)xCy{vvf~2j$ypqAvt9}SZv`1QreeT*cF|to#
zGk0K+2TE1Qp+}mZmGVY<3@{w-m*xQ?&J0T50ufhoN}7E)9iNxJ#vb}2{RI#QeUpv?
zj``__G(iiPX@_I^12uSGjNzp5pPBerhVn9Si3)2GsVEZ$R{upsCJjiB)sZ<4hF0`s
z;6@f)G7KBYa7!Y<Cs!GEF}LC-a|Bch2R&uJ0Y7l{lKDYFw%6{c%p`__c+WGpr%$rl
z;NIsH3PQmZA{65%OM#9wYT=m+XNjliFN7AW>iYKkwOL(nkwbBA{Tdf9#%p1Acg8ZQ
z#<jtM|7m;QJK?MHR%zj(f=U@#55?5w97uJ%I||HVQbVC*BAvZ`Tb0#k)YR2yRDPb@
zc$_oVKYvGEx!}tN^U0I$!m;6;&4brAe|voT$834`x6?7a+BN>U^C>pm$;`Ta?gd*X
zcb`98lu4~}va|_msj;gl+!K^lB%G<_bPug{JFU)LKI2JUV47D@TPcst{2m*FEBoVi
zwRztWj*CdElVDzXF{zI|V>J7@uSlSX13#84n6Z`mDeZ0HRa&`7p<AEHrIgHP+3S`z
z@A6ZXolNnLDM`w&!;4Vcu4{xa_jDLI?YqkF#P7xFe5|_8CQYyM18?9(m5@w(r=s-Y
z-GbH;DtIq*YN=1(8~Hi%c`=0>NgUlyEzgTDWltVXKHl&%Lg?I4@7LkHt&PdY^Nu&E
zcuILDN@_S2AKfAH{*C<Vab*+F*|le@&;L$5n;gmBI2PO~v|7g<_oeo@{MJWIl0Xz^
zT%}g?$-7$z+xzMX-wdm!R~V}%_(8u=jKYw#&1RJk`g00ZOBA8I+a8E+nmE_LepPO)
zA~pZ`mgtf4#KT2fLJxgwacta~cA{L4Y=M3CnC?MJJyBWY^{!C=<jxhP#p9az6(7eH
zzeNr_#dnc6>#v{f3d7_dHqL5sndzuDrxg_`=J5;bGGk-2R=(9fJ+F0AlpLJ^m%>ID
zntxCq#TYQFNfYVO(l(kq`ZSl8_L5RYcMfGh&U1r(swC`_=1J$jYaY%$MH7vLKjG`B
ziTxHzPoSc~r4?@5p9(Hh>QQGs(#9P-ockmfXFOBZ3%9OI|Fa1*k$ZfhnR#<*S(Ezc
ziq}T+*<}=7a{9AX@(<LUpWB*c=DNb!WX+pCizkCWnlirL%%1nkUZ0>wY1nv`ec&k<
zO-@ge*)PYHy5~fDt$>#$d7p#DF!yuCo%+Y<2iy``J4tvIJT0K0cHcS8Vrt5>d~%Py
z#@>#ZV>o;!snJ5>(#)QzH&kZf&dUlFMlKSio&DdV(~Km{?HoFOe77{yJI&l?Vpfe3
z%TkoSgDL3zZceq$nu(J?oxEfJ)!YN8RsMFqVU(qQm^0(~AgXfOE>HR8J)P4Hb;4_Q
zd9p9V3%-1pt|;7>r}*;6(u~6={?oB)nk~>aGuaO>YNN7A9TaFrp6XWF$+T)0iZT3t
zm8y3B?$s+!Gld5z0iFpq^Ky;*&o3Qn6{%S;5@FIgFf%jMs;5yVWEbC8d!?UlC+7;r
zyfAFSh3-7^!dn*~lD4pS=0u|f-$dpXE!Vj6%gy)elUMT|@x(1BM^#0M4g5Z}Ez0ey
z(~Q6e4uv_FnS8Nlwa2>#;&we|Qh$~ob2Z@$4|Zr_%@AB}NeWoq&C{}xa5x|5U2X0h
zn}1!kP3z3owDbywokWXwy2{b4Sp9$Q<D~eVCN_LLX}ek{1^<Ssn4HDkw0~auMypM9
z^`|rWb<5zr#ks?2QF`mq;uogr6;YR?G_sCMWSurK@r(%*nSQg48YNJ6DT=A}YhFJ2
zj#JZ~G|k=d_}?DXD0-nL^g(rxkNh6bPZ^poyy*&~m)nmQt9hNbTjyz53L>ZacMMAD
z-gir@aXxQPHTZ4#`wZdhABHK)bLR65eKCUb*#o|t(J{MBK54lIPR=P@=P_-W3?Ltg
zO_JUq#Cd4l$M<gNk&jq8Y~lOF6i>_&(tmW)H&g`wka3?LH%47(o|GVe&HV5ubYSdC
zGbWj#WSZD)LH$dOyP&m7j6MsWo26ys%+Ob`CdNs+r%5+s?uaXxUTWS%{Y(B-_J}|3
zpw^;~rtt;wA4aoh%`=%A8(U*1w~?dEJD#L@rG0>$r}%#l4h`2FdOgDYFfsY2GW!Rs
z_U{&JOgee~A5D1WOxJf~=V;GpOu)^*B??dEBX)itu|EBb`s1?PhI!cS)QK09R}yoW
z&u)!dWHVb)8(ipUudI#aCz9SVEq3eHS*BStyBIGf?lj%>J$v)T`UW}fiC^4VYE{dm
zoAary>zoSfrPK4N8|RxZQJH_~fr~1C7aOPNv!28#p0`fUCsAba##Q=^(5+J3oljkq
zG`5}EdX<r?<&dwDOsaR%aVw~Gl2I+LMaz9-6qBJc^S}EqPpI-9FD^=P$xu0vqVji#
zC|6aiw!Kq@^OTU<g3tj|a;u-B8vgHI1@GA;>cW*~RIO87j3UZ=#*BHW?ijC*y8$l>
zb|i19+f`bfg0`kYae=Fb;tCDgm`RmQ1>u=)wb~vov+bSx+zhY+uPnTO@C_BLo<+^N
zCGNWDf8cJBSPALoa~ahro*P8e&tnb-V!{Ux5Rcb8T`a%yR6#;nb?4HIlA8go<lb~_
zd8OKO&4^kjP38Sk?{{FB!uR(%xtNi%gHyXMXsHUdojQ<Np`&8A8vk>5pt<+$)jD^l
zcYE4SeUg7sQ|EV%C*^C4H@Ac24E2?km0P9Z?AH9M-2;B1YWOyv>Gw+(P|5XtY)rbt
z11*9tZ=ay&+|`WzHgj=0eG*cxJ6v7tTbka*^vJpvN88e0lxA0upEA$gA}i6CbT6Bu
zpD4t>-;JNb^kB>0D|9_{b7?5+beWM0p6Q^5lT2=?D0?}Ib9V;1F1>M{A<tA&uO~IT
z5!Mc8{|t`$XNaG8Iw@vjus5R0<#l@IkGsc2yg!_$?u)OP$jG?p+@|&2);65jx{t(F
zdQ7w`qm#uD>f1hZEb0Mst7C)m$kN=7s0XCDZ%Up0ohP-v(xM&+$9-O0K9l?X>`bKC
zGrIqQ3-hbzj}_kfYt~4Nlk^SUglBm#%KnYKS~Z$nJb};g3F9EJ{5bY}qs{QRH3~4l
zrDb|n9AnkexA;*8KEuc9MfC&92=hsiQNH18>_W`z>ZhMLwN6<(F{7&to0?YzW_;X!
zCrz&=d?(<q?CA8X{eFM`zQbws#LbM%(#4h1l+pIiH?`l%!b_XFh;?SW^Wua&PD|X}
zpPF&A@^Ynq(7&x=`(8MH-WKH>J_orLd-;s+q&`Y%uF+ajO?0sSo3U4GRUQB2`K0bb
z?8N&wpQ(>xo3ABf^d-FgO)^+=Ga>z`;H;`gg(^&k@$;IUh1s)LsDFuZD}rsCI#tN)
zDa~FCGvQsoRi}S*rhPA%U)9>WO4#z#@5PeejDXwkYgJLnS8jH6P8^t#TwUGe_8Tht
z>k(muc}%?hPi#PHh6`$sl96Xxs=x5gD9Y*xYMei1*JR<Ox~GjEB>znOl4vD^DqHEd
zbW+TgzurA;yzp!3R))k)1&(b_iqmh_Ya?T-1}5Lj37(m*h|G^nt+K~|-C<0<uNpy$
zzLwmqLoV@SVB&J9UC+Grgta*18mUr_yFa4L_kMg%sJP&JmuvC))+qNProp$}A{hJ1
z3mx-Q*&K~qgyym%vB%RQ<r@5y@m5n83bhtFlJ-ETq&=S(>m@Lnc<b)BGufxkSFQO+
z$T!uT3oO&y5tKeZD*0iTP`exV_juhPF8pn3RqOuXIBbO^x^b(^$bouHs@<22e%;zg
zvdby;rkeEr<=V)qDhb8PHs;G9s47pY66N+Kt3SUg!QZ*9^=EsKX4cq+FNBx#Nvjui
zY%g)Jihn(SP`F)Qx5V%>^-KlN({wnNr#9{uSk29F-dFq9j(ShD`N-A&+xo7GK0iBZ
zBS}ryRVuxj6>cUp&(%gIR7E>ysT^3gP0`=!@+9GRcdMFL+vPv_6Qc&qG}6K%QOWOS
ze%=M|*KMU--gdh+<8|$Br@y_p=b+}b$@$G;`!w-QE|0OU?n3RN&YGAkmw#DB(H_p4
zduvkrL(ES1f2oa>U*9kPkn(KeTl;+f>K{+H$9QH<<`|d%vSHNUysBtPW)0L&Up&ca
z>$kj}939haNB!&Iax|;ogXzC)l@?iPmS|R{N$Y<fan($wKyk8OL-<Qle4LF}ouUG7
zv91KYjI#1mPHtH*Hlu-iyN6$rf1BA+Bi=sw<rA@Q&8~ax^4)5jHySj1l+?2M)6$8@
zOf#pGB!8J*{nbZpN=mI4<xUcc#M0{Knq7_F@?QSr+Eg?im?1j2>*qG6K!=%}O!-M-
z5xF4b5?;&4Lav9ae&mIpR*A7hqJm7U+}m$QVh?Q(-W@Dpxgczv#MfK0a<9y|yzGH1
zlc}#<zOv|h+Bn7c+e}9mj(@v-Y|8ma`JZ-%e|6@T_K#Ju%v3hfI{bESxixhu?w7yX
zwcZGyG3$~$uIu|66eR5N516usS=VwpZj$9VFWCyMzn;~Ncy*We?GdQ}%dGz8xn}Nl
zlrfdZ^3+=;;rfzlb>W@gO`0eV#t+Wy=SxhGi4^-j?co{heb~Zip!-MGNFnW6q#QPE
z{E&82y_PUp?)hD%U3+~maWEyvXcWb?DWwmW6qXP5m5m)@-q}Ur_B|-aTt1aC=-~8?
zlcUOT_MpvKj(02t;fXtu4w7#@^6$C&q^;$fRe0MTI~z&ZE|GuAkB@mw_1UUc-I%aX
zinXUD#gdb=%4P4{dY#QWYxD0Oy1PF#bpLGpWq)F@k=7k$#%BJ+U$2)H-%lMn8nS)I
z2F>ft80i!D8UJ)vNaJSN>i*}<zGCf~@4AC0>(5*X>`o32IUM-Pes~s_TKGnG<dN#*
z2oCRkk;h+ZGtYQfc|K%GTpRxy_-*lIeO>>Vk*HTMeWFem;?t+vN4HZY4y8>~R<@&x
zr(;IyMQ>g?l=9-tM}<E=4gz=cK8&`MeA<^?xi<Q$xv}TAn9vA|=TrSolv6pgrt!_2
zPtPkN^iJv!EnSI)r00}$<=h3bCB7i>SXtiSo43xaTZN~cp$Qg`yTa=AGG%iy_o*Kz
z`~SSlmwcppVA&_%Zb)`$NaK@++rOm8k~EKbqf4Hb@(zq|cRP#iky*wi^h_LyjudPg
z{fj-@haa1DeL^PQ6#X1h%{uvTf;loD_@j<hXMSVgZG^7oxA~t9zt5__a&X)lTWkIy
z*RU%0NoB{IM-7$DgP)d11Z;Z#HCSF!Uq8X~a`(jB{+_;p53wsw@5e?)$7g@6;cn6R
zzS!M1GHt4B`2F`wQ^2RPyW4HUcivl}CdNl4?z>}aioe~K+@N#qX?}tJZ0(x94pZ-~
zdg^Zr?tr1}Bu2##;co7T?wR<4CVJ~0(sp0sV~JX>&-qVczHUn&c%;lK;F{bTit*Q1
z*>pr-?Af_Tda2|~+i`D76svZ9`F-m^<W5&r>hf^f_3I`d-OMx7!~R{AowI&>LBKjR
zwjuMpK%N6r-(B+Z=VpJkCZWg^?t1FkOrA060aRc-X)`+Wu*AZ*gknmp)EACE>KwV{
z`RWnN<X$t=zxS^Yte$riqvx*cZSAfj->K*q?u&i1r6AwmiyHZ*=h+#e;S2HjZEB;c
zspY2!?4|CJ%JYj%ngg|EsHtBM34DJ3#o|P3>X3l}rrr9Vzssqy2j{lb-Rut=9^cF4
z8z_D1tsQX3$&BN;>(y!Vu@TeM(FXzbX6W-P7R{?#6?=C@zESvoJ@5_ujZwP4H=`Hg
z@%w81>AEweyt`{lkd$63&ntsV{W@3Oc8e5Rp+yA-&&2Xe30!N+I`d=U=~N;{_zU6J
zjPdmIW?#9C7aU!S{;o~IEnSf1fP6yv9_F{K{MTB7?nK#mos-Qy@3qBxHMnIS?iESI
zFB5unY|ipeV%miT)_?M~ZP9%=b6<jRn`9NMqoMQ3TVGFPc=%m}#a0xdUC&pKLpnk9
z%8DSzbJ{VDVCy>ZNWGjKR1t@M=pv)o<1sNX5L<q?bW1PI`dNNf$!7Eeg<g@7M>0$?
z(wt-V%_;1_DCTJUr+~U_$A2h%>kaSGD;=zXlYcI)6kb#ifZvRyYOsvut7g2PrBBk+
zVv5!UY4J(BYnvTkEEf?u+U{%KNg~pFL|xN{Gme?%>Yd%Kj}q??(T~Mmxb~4_!q)3y
z^i1k<@>0B1ZG71I+pj+Pd(&@3ignVMwMt@Br;LP;_6a1JY4Z3g?~ou?HZV-W&h9>b
z=ce=>(aoc|0X2qQeaAxs-iv=OI1)5kVPISQh)xVf9al^*iCJ8pmo|y4)OHN6nSF8S
z9zo&lvBrqqJVprt*0BzWg>T;|9Yd4N)<SpWSE^RaoRD%TNQ*TSBj|UTn1t+Ef6cs@
z|M!LE=1n2(pJ>WO^y#Th+qpk4CpHc0)?v)MhRJDiEpE<gK0j}%dN=LGez_5t?^NE~
z>mu^zYuz`$OW$&)tIY-uIQ15Ed}6$`)zG4e1O(fP{Pd_;qisjM?EGVEPZbrd+|0Xu
zzSeglv)hHsVvbiQ10NC@KZtFo&7X^53XoRroKvk8&WO0bzjcj|FMsEI+f79m{!XQ*
zb`P+y=Q<33>0W<opH<lN{861zqvunc_atYW(zof(x>)t#+*paI91nLL)aHRLjhsSG
zQo>vxQjNTQ+VrRfp^Y?#pdyv?>DukDv~&#@vtt%@sn>2t5A8c;`a#)#_#VU9!IxR<
zrY2C@nG*KH(&9#>(I}>6>1oQ+E6XUo@gw5(o7!<l(18>MO3F$89)k7B%*<vHajNb2
zL)U8qL~@A5{u?p9o@ZmR6&*3x+cAq=?f5I1HWmiB$&sIz;-p5*nOSmgoL%x{X3cX4
zxXyR(-*d6#aMQ2;>)pkU7V$P%jAJ@;;oXpU++?fS>YX*>;kH{BbADK4Xl^>ODfaLe
z#-rxHjq7&3hO+Xct#_^4yOhdJE$ptK@+hqx8#a~=BCjIcrs5@AmfsR27-}lA5)VTM
zx;I6CwD3}NE$zOSCw1gk-F51XO=(NHV{yhmRw*9_9<a8)e307mdgqzAqrT??MS_`|
zN?yFiTzTf7V4uA!Bktbn<<W4v%khPD{nsfwg1@w}_S7(TK>iukq{K7THUo|+W&v-8
z2dcdS(zA2XnELC%_xV?KkA6LAz1V)Z)!Qv=^Cu6VV#^>cl|nNy^YMtqOC6s*Q;RS9
zXeLVsmS1Tf5W4M^pj7YUb+Uz5e(9_EX(na0OW(R@`1q+vjj;wp?+_b;e<$Pm$)L~Z
z-a^ySqg4^4F423}{4rEDG_8W3qDN@)5_`C1PbpQ-`q{MMU2nCJ%%%u#$&S+o2Sait
zG!Iw3AoQRQannC-|Fs~Ng876=m`lIhu)Y1kqn_ym%Pj3f+glTMoEe}wy_HF8^v-1d
z{M6y?6%@1jN9C}#!>=RU3mrLjU0k~cz7%#kg{R2`=c6!D#hP(<gD$`LgSonBgK8pW
z&3oX{y$%)PR+ODj@3r}O>IK{{=oC*R2Bq!{O<CHzx$XHt&|&9P*~<ZPRTmTp{;v~_
zpZ3q*c$F>D*4qA6)b`hlY1;#j_J&aT$C%!Y7QEx?C8@U*V$MJRYRO+st0f=)Ga99M
zM_2WblwGwN@%;PS*4gB_A8v^iEGwZ~y$sPs9gg~h9zUYQb@_99n=bb{<Wk*|)98d4
zWrG)~gxds*L%PQ{Elr>m?(UU5p1w(k7yp27Gs{<g+2B<Dm#*2G@7mW69H`EG`?25?
z^EmOJX{Sta$MVhs6HT+TeKSiNhtBpDoobol-?x+^eyZhNS7wPdzd!3zjFZC0((lLd
z7RKltgGWsrwUUdU?=Mdi5)y`s-@A3ad;2-b+bH<hNfnW*YY}=L&r=NDHNS*;e$+f2
zq;TPI6FHrAaTiJcP!xLF-D{{dtlDLgH|Q}_`5OP*=#P!LB|o$d=t;GfgqK`a7b)T!
z)Z*zft8<~()cJaueH_g=6Q256YV>S^32nxPGI>_YSM!)7%2NL}#~u%qs8u~#(QC*f
za6k-gpxZ5PViD;6cA-;Su3Wdy&@*L*rklT#i(9<hOWo2JFn_{MT;P`XRPjOghi|p(
znPI*R^iI}E$@-GMzV>&wgBlM0Tv~fvWh|S#P3w)pT7HJ+NoAp1=T!YgCZ1I5nD}<D
zm`V8MudxDJG8CqpHDuK<_Aq3QXp|TFVmy~zyIc|<Uf??stFv(JHE$w^-2J}oIgesC
zU4NU^Ha#`YFq@9>UZ$rfKX=~j?CjyY^YKHb20d8Ig*aTVw^#db-?Ps1)wYjA7aFC)
z17F^2OK_MfHWRt?$9r#~${2hl8+LftX7}3K;<2DdN!ZfTmwSe^)WOhty`IXAy3RK)
zB4X8E|1>YPnuNI7=r=bE8#U+W#pD=-3~?Lm9E)G$+}4&dY8Ehb$$gWkO1b{WH0u!F
z4Ca*69R=QDhe46c@zeLE_Gf>b*XgQysU1}%-Y17WpmoUk=9qT1hH%m+^YK1=v(~b)
zbG6wAWFMOJFs~K#R~?GArQJP|Rh0DLBKE7`hpK9`fDeCDEi_uDo_uANRffCpJ$xc2
zh5Pf<@<xAjtnI6gs|UCx@&iLml*6G*ze4q`nUPVrD#5Nuz4+yCzAbkuceSaj$tNbh
zR4#1Id-ckG{ro1~3}cTSSdlZhS@G;Id;Ak+<M2QGuXCrZh3g3TXO`_0`kA>QH{7mt
zL;7{SY=!vxLtTGbgIQ{MS?_>5XI@C0S<tbCKL2;gmQuxvH2?YRzWY2cEVVYdyI{Ip
zPiixHFMt0Q#fObm4)Z0?9}47KO~u^y)2(2c?47*T%1XDphO+sGqnQu(pDdkT<^5<A
zpv`J})0|&>@0#1$3`;xuu|nzclj&SL<maelKg_Aa!8s}mTEaIEUi={Xk|Q=ksefR}
zZI*aLi4^i-M~2AMmVq(t)mh_I#V0q1F@X;H%&|J#_u-#hFZNN3=p%&=e0mQKWi%Zy
zvs#YtH$5_LS~A}M#31FZn*Z)iqH3p%`g{N8tOVrg@yhOT=wo4J<L<jW%uf2oh~&{&
z)~YnBK5gyXsCH<}>8HJ>_be`c-8FJL;oWrnV=?cF_X`f3o1G@Bj7u)Rk9Ihqr^QiK
z)S-i6CTIt!_lsojJs1+}LYozyyW2UNU%d6>yY{!0mz@f?eH8ljuFGHD;Lu&;U&hKB
z&y}Q&QO;uz@I_*@+3mklu5INKeylimW%+Z5NvpJEM&9Yfnf<yPky{;nbb04l^KzWA
z>K4XnX0sn_Ha=DweAex{={uz}{^e!p4IPoKh0S-E)1tP!a-^}tKTC7wzsamz*0%3@
zJN=FpfYVt}jVT=Zb*cJVvIfVEqhr7S)*iGUT+R$WR~8x+9QsGPd~oTp^=6G-WUY_@
zLV|&1V6Fm@W$@<>MTWSw#MnNsRW)GSmd1arO|P@6pLd2oFQ<;ShcPM#hB`ldD#tDS
zJ9y_{!X4(t-LDTNnF)&w<E(!@e|%QiEcocN>fdkhLwmOF7a1QdSRH6+R?2-{O!@Ww
z>_8N5E=RL`MUgc8^!w2s*>?W}`9o3Wr|xBkEbenw-L5Cv8Sr^yzvV<}dVu8XT%QJ$
zY<b?7{jJAuC;I;@e{-c!ATlal!YeCwRp<nHv+PT>TLm+$q|(19tkUrt(TupDn>SGx
zKimIfUx2!!SZQ;!rS`y4G_5uDl!<q?y5BZNwME5)x`pTOCJu6huF!K5bUGNezix|V
zK5Ae4*&vzs&F!4n?HcdOq-YuUKdxNe>lQR#(b~RK;c<kdSVh5Sjyu#7zopo6_9fb^
zYx@smy<%!HrMH-5#H?YiTuST+-a{G=PFq9GxM}RwZjF|Id-tUKcD-o)qhJnyv~lO!
z(9lo!&DU!+p3HubAO@$`5;uLXeJK!Sno_`3vH5tz1sye}-xkB%lh62E6+CtXh_}u=
zT1yyI9MxO1x1p9+Ir7FGV$RpgFc`eU^PJceh7&eXok=iN%5U7*#&cMI?AqD-RZV-{
zxa=HVR$aoGdhO!ZT^@(+61&SoZ<&Z$ZIcjrw~+Nb>S1M<obMf%7c$p|Y*^^euWhI7
zr2fS+@}4?fLc6I~{K0rUT%L&(+!Z$$=<lSz@uV}YMinpg-A{l0PhF$8przlkzhr6a
zf~Ct@DN!?K6k#s>edJM{>)8*(j%=OKFSCkU8zu05ZLIv)s+z}l<cBxj(!2yU+2|bI
zm-ys^{AQii-_ITeR}vo$^sQoY>&OaUem%@6+#+e5D%rDN;E#_$gYSvx6ExwQE<rNK
zJiXM!-u}QpO_$v)aB(r`<7|s?=9qNqQ7*lv?u?X=>H*B@1fP`oooZZGm{TS%MSW<T
z3UcAQ#D*ismtWSN5*buz;+<?pYfKvWGD0e~6HO<^x-Nf2=Sn?V+!#E+ku&_TTR4^2
z&>Ud7MXc_U!SKYd9F*BunsKb4_DYK<D!MD<urK3=f!(#_adR#CSUt6r->cpa#ZQr1
zzPc!QTywe3{0Yrf;GO6H6`WUorD#{Ay!B%5=&VwqPWcMu?MOpg=NdYx#7t9?bi`E8
zn1ZMF(&irUwmw%KR=jt?A=BmEt9!TK@5uRBcwyXbhpDe)fOu4G?(PHPc0pIdUe4kP
zjq|3wm(O_6e29JOg(1p^a@U~J{uIe&eg7gq*Wo|=-Z6!<CK$`%if#ujt}ga;#5(Oy
z$JeD<#pxb7%8lL3N10w7st}Kf%sghwseUO$js8K>_R~w*yI;+U9y6cnu&g|&=@u3j
zx0~ymP|`mZaDV%r{Ch&G-pJs=7_H-*75<m-&cQBmvpxIJ%D$0SV)GnP&+Qaaj*^cT
z#+TM!X}#FW+)X{|)OB2iA-j<!DyFxc_@VuAaLh%Yi&Fb)ujtQcqS~RvVo}<o4c&z_
zyDxVOq<4vDcq?TZhQGS1QvY7CL0|vGvqLdAR?2whggwdir60@4a$$BH(<0-7JeFi`
zZ^sMOPTcJ`f87}~*XnYge@fgY5crYv<ul@}u*QeGG#BQP!>@7;?VazX3~)_#CA@7(
zdh|zWy~ut|@Lt41w_)VAFMeoDP9is2nw3y2D0(G>>yenc8vaG!+4+Lp6mb<B;kkSA
zT>FI5+qdAi-sjk46z5WS<BVhJ&DvJX;G2N6n`#eSwKdYXD{MO8_3V|`8u~sZu@$P@
zrM++W6FCE)qfDYim)4CCZ|b;lGRJ1P<#<9^#Ja3mR%@-}rn9}#Z!X<ecSJW@mIb3$
zoU~5`v_32_n>eDjJR{X#IOg<hfjoMU{35#sZ@-=Cz~En39B2yuYw5E8^R5tet%K^T
zPXl)aWlq)I;`h9J;M5nv_CSNt$1?)=HkV!u*04ByapdtUCU<$KrPUTabNaV`--qWP
z>-AG3CGuTLuHL<^lv)?|I>J^jJXOzlRc<n4%we`<(R1h?L|uQP9uYO1q0@a}dgrZ1
zp<&r8eM<^&{)Grxx5i;kY;Gyj@ACQTWU2X&a%HgRdVlCaqLn=Q+E0Zo#1OIZ<!uFe
z(nnrP(_YK2YV2e-N}vY};(zq}#{YVbste2?{(8}^w0pZlRe)07%FMj;P}v99!e9I&
zKMce|vU0|`OP+Hjg_y4X?P+t7edn#wy7t?g61Ow+_iJoP_@<5UMJWopvP)#Q?vTjN
zPmb>$beLMYK40_in&y8W<IJ<*3V-tM?^B5xmzZb_{XS2|OXl|LKkWXRmaP4L5*M5K
zC+C9XK7HMA)<L_dxW=p4zlEOmfp<z4%U;nT?gZK3vTNC;$94HAC0&9RNf{~Wb3B1J
z`$TlTH$ADD)C@6vP>kAtZkx+UMY4JbtD{D@l_mXmps=F0=8#LlWP`rnDV`S5ejlOm
zBdw01M|qCPh7wJfq7sB#YXR?xX^W-D3Pn$JFIx#|oIbdx^mtq~MW-z-Ws`;KQdi+K
zi-%ENFUd8NBxlRpokRP66wCZ}yQosQ$w`DeG<?Fkfc9KxMGUvs1+7<PoDyFAEFq@V
z6N3(v2wTbT>806HqowY?#crud8%Gt|`Lnz#rBaJ=BW?#XnEQ?#zL|73;9AI_;lc|-
zs72A%&)dET2cmPX=YF=B@NYiezm^n*^SgpSpf!^IfQC8gPHIbjMdz0O^LMNIbkpeT
zS~BzFaNfsF7rc|?R@y(kdvw)J5~{tYI?zjV71Ph$@#XdTXR9r5LL)*IbX7+2b}g9Q
zFGRl_^pc2m?=v%Enux}K^SylYBc5>hy}#a<p)k%pEq8w0u~mF-la3Y~G2%;nd#&x3
z$lhH#8PQrhG*0H6YLMZ#9<ndGU(mHbAXVb)rLD!U1f-LGD(`P?@iu+1!X58^>+0=8
zJ0)6kV)`%RHe1hY?vB=?4=dlE{^#o(-BMOoeSu%h^}HMEo3ODyGy6ldS`J+^Als=k
z#MR?=4kRBhnD{q`HWc4n9#kfHZ&C2lAF^s^MsdZf%DuTEc2iW<<#6VUl#v6w+DYNQ
zbyZJ?Z@yVc65c_il@afGSz0vG;&<!SZRtBxC2}cH;1vr~^-E(U_pR~LDeuDxj#q;p
zSekuYeX2Q~V5dX<e303|^)~9m34GR)NBZz8|NjR>K)b&)H-bl#Z3JOFmspwkJH>A)
zbDlEuvn|SmmWnE6$YryI-H=PAw{OU24x3#u#EiMd_8Jy_b(tOTQ~}lbU$U6XiE~x)
zbY)sglvBA(hik*$yO1riGxwL=G_1nJAiKeb5*>_~2vmxfDi|sPKbjwCe@30S4xAcq
zhIOaX6B~@0BB=?w1sQGYjcv|Yh--P8C`J0zrk|(>4TZ7_G}9;-s%aF{61AQCYRlTt
zD|G)QvtK%G&0|OMWaAAQFb+7pL69~#WokGDk}P0nk)Pb#CsnnMwsWpYHT#quQp1Z%
zeAcc5MoGxTv!{7^&(9Tse?%X5(5JG(j01$$@O82Sa|t}tnlkX=UaE2$_mr9and-bO
zRm6X!@7y87BlRd_Z`<^F1~|-*4RfQM9+(M+0BD?M&T*vLmy3V!;gL)0<^q@D(Nx|X
zG|hG>?vQXtfC%->{QCiY|BduHtB;11AN}^@q_TNZ-q`I*xm6lve{Oyu_sQH9j<#ab
zj#HPWeE4&5S{!7@sogzB!_`o?O`;5SXJj`c%wjYnf*;CuW3OR<#fMiFd^z2t#Pv<)
zg#|E_o=`tSlTp_BPfJCfu#Rq5+E3eBz70#v!~3Quq_EA+MicV$mM={1c%#(jg@o~v
zmHZ|Pj$xKBAZmC}e`A*n3Z!Wtoa?o~A)h&rf?bStQ5r1s0A_-_r^D884mML>FXG~c
zboO|Zbv=Z6P<m3f#wMMD)tUs>msk;I{^H#16)Ibko7kD4kkDm%$ISwtBhNVISD06@
zrN>wq`GQZ4`Wy5&6Z&u*l<CE$JWVr)staQ@6WovcD0U%<e_fX+51`>AL-76eXksu9
zGFC^l2PR+w5SwZC0zrcxE(5X=i-v=YoWTr(sFlUKxG`O&Cj3A{3{k99Pm2`DVa0+&
z|7g&7<0xKhERGZ@z?Aco4>{xz##R)J*TbtOf!%U!IRt}w7@(kkL@;99Ri<(+J!g8#
z?Lg-s6e?aKe_kr7zoP0(&X1`2vifVPzT*5RRez(tO4Z+r8WoACU{D1V*^Xn;4SEPM
zjXFPd{!Acq^PNJ*%%RS|IzN!q-%<57_4m~Iq4Oi?xfFbM0UdRI?EHkPud8oR^-c9H
zs=lqhBaj)xYt`+yPEqv_>N`|@SFEC9xmZEPv0{~^fBuoGf5O(ir~X+||3cOG5%gaX
z^wC9Z-lts}Ma2nN)+n)ziU-1z`hj?`K<Wx6FXp{4lQA%^?o_O2DlSkzq+$$%9u<b|
zWAzh=6BkkSZ|bL#`WaRKE`9(B#En$_hx$)}95nO<ww!-a^<V10CG~TvexVUb6R75J
z&83<Xf52)Y1mY1`-Vr!ZtBPunX#_smd@veTlJ*V_(Ogt>YZBFDagn4cR8vJS)ijM#
ztpux7s*RGgGOCqp6_Qp-wb5D?)y8OJC2btls<r*7HeQ=RwTaqTs_hShs~v#(YcQAu
z`Nc-DiE0NTq=Q^@1u_NcQO(q;Cm(X^)TuRne}P0zG*-iJj)66=#&jKs<xZyB!3bsw
z1ma3@6&0U$z95i8I-;nc?Tw<>Wh+Asy4Q!dje~ju0Re+zmO{0u+BC?FJ^CyL&tp)}
z0tDzUs)Oy0e$%}EnwP(3#Zhg#HiL>^*Ji?#^93p%hg~yETvTio?7n@|9Q~SA$cm%d
ze{5|I)#hr4z>^4LGS77nb^aaEY+Q<s@|gEMGOZZ&lI9XfLlIVxIWE5e>ZZ-7+M(J4
zDh4qK0V&iL!eD5NFj$PiVHhmL`W+5Qw8fZY5t7V5;p-AW1+5mJjz9#f5hqF7k@?b-
zVXkMv$*>eAG6v^kumJ+?C=8Cqz=Lr;f7&vt)oJwtSz0U~W6BXn?9C<+)x25*)s_R*
z(N^Hh^-*o51|8EVCaBhgL9^CE-Me94y6?ux+3LCnrr(hCJniBUs;$=AsOE<v#I52<
zRBIQ*0-06F#t#m32h}>YHB@{^{4v#zaWA57MchHflbx?o@dx5fRQw?fs`!2Je|oB|
z6|bS%I-noockyYxxC0NrF%Cx3j-}dh+VNEDg525(7zB`@bZbFeQm>#|NYkm-BhD`h
zO>^DXLbYD44{;$(wG)wU)zt-}HL+-9YYp&LHOW4`#&on$6EyPG#CmGbRwGecV-dJ8
z(zj$yfPFv&3nOj;&<(hBEzoAbf7}Pim}XeGCcJJv7#K|GHDQS6=cBNQKm_kC*_xuG
zREywB(vLwDgBZ4<rMQw9m4?<2MoqU|HT>K+)dmpuMhxN@B(x;e27#^7Hffuwcqq=`
zE!tM<eoQ=7(g2N4)=rVMQ-R^pz5+sz$ywR%V4>P+II^cBj8g3kN&70*f6mm-qT1KA
z3S4{6229buPPK1{w+W=(XphaVsV1?tzdIHQ2W#*K7PB$6tov(1F`W;Gz6Bay11kg{
zo3uOv8Jj6kGG3cqtI2>;?Huh~flSEK{@RW!QSChKe4GLo0H@_`YwK$AG&XcJ*R}gv
znkDT*s$JxK4YwOMMVFx6fBtM-y{JoYIjHtc?P7EbyeYaNoLpiYSfb)&@n9<6s$GI!
zT_KZk(Fzs+Eq+e5OA+%KFg+HT&2D_5+GX0e(7YZZ&C3?3_@ekrN&7aefX+u?Efk-l
zQl<K9NxK|IO@nE)P1}x>^-+NwRroYYyM%(eTrM{ipA?^>;_FDwf3L*l_H{&vE5!$>
zc9nP=)xM)$O||dhP+tR8(XNF!@pUA!Z(wkQ1{^iDbKjD79WI~W!&KkLRNtrC^{{}!
zdiFi4-Jk(oxKZ07X*W^rX6+U#E!KWSwOh5@B<*$}f7(uDbncL}JE?Y;wu@?aW3U^8
zJqY9;5fa`@wfnUDf2sC>_8`<0dP#do1KRbl_7m#<O#Luls-M&3l=X}IGhECbL9+d*
z_84$8h1#A`?Q!i1sy(T`C23Dl?Wfw)RC`AI84~^vsP-&Ee-69(dHnDKKK&e@et}Of
zB7gQvNaB7UUw?(KFX7_9VAxs=;bn_zFKaM%uV}xKv{$M2e_N1b#3|bEsP-DR?)M@r
z^RGjk_6A^r_9g~z0Vn5@T_EDzFFuejtDe@ES)QN)l=e2&-hseX?y4vXXqG>6fCv1U
z_6H2!MansWC9yM=ChH3FG1dO4{fTPtA(~Ie;5}^Ivb}2@bLy!5nQDIl=}CKEdt1`}
zii8Ko_(N>)e}^!OU>d;F`#9tu0cWXwjKO;te1yaMF$SL?UH%&epF&<BNS`4;2i(k+
z5V-pBX*vcAF?bJyzhiJ1PQLus(h+?mQ|%ubpuxYie`C>~Q`ZIvp#0CVe0cf-0!pYr
zse?Kx74g-D%*|oYGKd4j`8&)+c#^QmF3jt~ycpmIe;Jny5B9vr`H@5wN>%k!kY8Mj
zC_q{y(Gp5a)lY#TPRYEe4fi8qC3F;Z)w+(Lw2YQh*HYJfN-J>854MjqTmEcf2YUIe
z!CMijGzt1ky@pmwbTp+^bPT0q={Sj23#2S_Apy=&eM2Dg3hq~673hAzjzFN@O~+F@
z0ovwje|0rcI+5;A=>b^bnXnvAoeJw3^R8Nh+ta|YKvko&L*^~*mP|xzpwlQyXf8jl
z9uu=T7Q^*MO^_M6%|PJ!!afk@zN?>6e85H+sTq_WL?=^MJ3W}XrT|__6)<q_8|f74
zKG<~wrBhue2*gtaZB6&lN!@1y&PWrHrXA1@e=H6gC$njr1H5f)V{48;))Xamr8|e6
zoc?M^UX?jwq2Y8IOk4=03J6@ftB2C*ICAq0M#gY2YF2m&GGEBvrHw^RoN3}`kCeyM
zTGw!;bj$GRlQH1<YS=-0d`9*#rTd>#(;hdu%Nn#!1#UCNxDE@^IK*Frdkc9$MV1?;
zfAuEUW=dxuhR&q31ajc8%M(*VNpv=)bLd>0(1%bukIpZO1ZR3bMZFG?%{!429SX~u
zcqgKE!Ucq*4@IKM$d{z83Cw7?hTlfYSCj;@{4NN@3m|}5K^M4ApmZSx^0b&9MqOWn
zSJ!12cQ^)1aDvxTph!o$771jbC3&EGf6z>1fI;qqxH$SG#SOeo*yT*IT%DfJoTkkC
zTbnU->`TVD^~Ml5A3bi8V~pNN_|P~E(1Ov6y3TQZgSr}^yIc)O$d_Vp6vWY^u~#N`
zL^niZo1-a8Y+s!PQeV`e%?uZ%lzOx|5HPkCiP$pNC6w0TlpWU`t6|<!W;0p{e>Bme
ze)TT5Kn}~IK9=->w}{uIZV|-1xWmhYDjkaR(s7hF0Ov%PV@Zd$_gTp;8e7vJ*vf!G
zuX5XQ00SKhpXagm+t!|zZrq6nd5W%}u5V-ICg*b=6K9f-x^}p3q^|2-H%N3PrK{Z6
zQral)q;BGd^}2~RQ}+%e-QFUtf2q?QB1*J{(pJ|~l&*%rb+>Cbb=~2*69yk9q3a6T
zCQ(17?X&~L3))HP8Vrts>d>|BYbCml()ILM>inJaHR}952Cq9`ljw1j9#6YqK_5o<
zk@6)76E3f|WcvT3^aS<Sc*rIk?=rX46LZiI5|``%bv@#Gl+tb*q|PUie`yI(U81l6
z^n(0D`)HWb6RA#}&p3ZZ=>{61v>&_Ran}>3m}vSwk!Y0C7%+2mfNrF&ms~I7Q+)5n
zAmzCQhdn`QQv5)ogOqNfK#8}|t(2aG!O8R#>Uz)hXG%{+QuP%KPD2F9qtkMDWWvHu
z7l=3~**`$(8T6}^o{1pOe*%$(evO_DOJm+nqfiV-_fXV*5dAvULKH~FIVfC?rsq<6
z9(26xk2tB$rx!@{LP{^9-=y?ndI>HY@N_BtrbI8J^jq}XlwMA+pmZBPZO7nBdX+@K
zL+RD@yOdsolX8J657hv*k8}rs1Z)b&m~niKr`5NlhWor{oMH_>e_NS=seLWIPNLtV
z^!u*2D7_wo8z9hX@TuSR7LbiX;2IMjbsGSC2Z+z~M(nsBV6cJSgw7CQlwlS9A-x%W
z>GubE^|@PSZ|M%hNDWBz7D|7lT|nur+Ha`q6W2%7^)UqWHhMd1Uw)ItFgFEYly=fP
zD7};3Rn+>L>7$0ye_g1SbV6QA?*=;Se$4e+Ub@`5flz-q%7kP?X=yjU1CUMi3lY6`
zQ@V#j5u$&EXC9^Z;&UlemDnsQSp+k?WaONRw_<1B=emc|`*D6gKp&*^A?;~_)b7Qx
z5lVjybJ~57doraDyMIXOPe1^7&vze6-AB5YQui!3@Gy@cfBAcqK1SV1_aJq9+{>u@
za`zR~eVrQ+=W+T3bzkbfjJoFmBjP^Xy@b*yo%!|H@W=U~6L7HSgkv}vfr?4=DJuS3
zyO_G0+(72nyN{*r4tFPYdvTZ=Fj$Vk8SbxA_gMPVq6koq<G2D*kKlhb2PddhNuQ?f
zXPuA0l4eHFf7xtWnyIJoKTPR<4iix`W)3?OqAulsEWz_Eff+L=iq>nseRklMisvG#
zJVSwiKTDsZ?$h0;Qn%)&AerT*<l%?*5NDsK?k+bF)kBM*GSnS#cT;zdyO+`z=+6Zr
z&Ecm8Dg6bKnHODeN%WVL{>t4)=}YcDbLS_=;WmK?fAK;nFy>(t7@F`hQs9@VdmEze
zN$zf-B_``)iC|P(gfr~dNbz5B12OsycHpb<q<u<%OX=_2w?Gx<!9Q^HueooL=<lgE
zNM9F-<6vmc8`@Y(-=xr{w=wfO82kZ)cQN=Q27kifJq-Q~Q;q%w)dKI+zf$*2IQ>3w
zzCh`RfAk|1PCusf6D<926q0;K|4!*Ykj~epZ8jp_)u8hd&a>$?8_|}%CXh(PKw!X8
zVeGiY3H}qfd-v_wynkWvZ>+=TA}sY^xOY+ay*Ps(#^8S7a^3g4AENFj+)q;XPu+m>
zzjgnPx_|F}otBUiK_FwMalyi31exc(>A>bse=}`;Grv)Ho7)d#QQ`o0d010rflSNy
zTqZ4X(hF#bh=B_OH{el;gcb{98gtZei7Jperk*~W7>ES6F3CuO@<BH<Nv=VQV3n50
zB?=5W<gE7PZrc(_q-y8GDpjHh!~^1kA+vylQ3LbZ#xEb7n5uRUnj0QQthr&rHUbiJ
zf1spQ1;apLuUprnT;c;U%Mf)D+KLo3W0$5-U`$lXs92Gp`i)Z$2rabN&`g0IXa#(P
z-x@Tg*U<ouj|~>HGS6ai;WVOy1rmXskOIc-<_ZC3vEqDcVmfQSaA;UWZ=OY@b&H8a
zY29O7Ma}SNgr3R2q@mEPYp;QEiQG^kf8?m{ib6}s*kd!wnFI5cB0W9O7X{eiP|Z|x
zV7mCaHMJ%X?;Y%i!l~pCFQp|VC8ex*-9CmvQ>DRl6Wsh5>o(Qk2&Qr&y0!)gFsp@`
zh?a~hDWmQ;+;7s7a-j1i6?ASMc2pU*)71Te`$LenN-C-Q6ZhX}$!P5{T2iIHe+o-A
zw<O2D3e+T+SIbnV7&_HyTlM7hn#AD1KrD_UNF|pf(ULKeo0g2l-WijnD`34yOU9K{
zQ)!%34GWTKZp)g8=};}(k4C0EG1kB`iaB}SsfKD|K3kBU5ib?U;T>&_X<CUK5R4@A
zm_|4SpkzN-uuI0fcd;{meD@ewf9)im|8vZnPfI40OvG!FqDj;<(UScosQ3PmN16mn
zoHPj;up&5U%hHsV901b3G^M15x~@ev#QkWRQkjxc*wV%<<)nGA_?Aq9wO{?Mb_*3>
zMXmE;VilDRFF7z@9lX63QprKIWU>lEntPCWyrRyZV0+wL(Mp|<f>`f-e+;8s><}My
zK8`OUW~R<3_%q-$bw0)N#n}l7>ij9bsj=<^)Aj?dI-f=b!BP+eN)E<g3W@~VTu%w4
z!eoJ`nM55pfHIS#oyI*8K$LVO{{y@%ytn5SB~7#qM$^uCwiN|pgfpfs#RAQBNS#3}
zV!IF^W*#{#vcK$Se2WmKf3a!l=M{?sf&i@Ddx0ETG!X94pa|OmBfoV7zi0@iHFR+U
zl6KI%xJuYP2^4`_Sr>s8RS))JTHh6=3(r2NE0E<ybx1BqMPQge<x#PyjY5CAM@GE#
z#;&LZn$2{zK#1+6RZfxAvS=*ImPc6JX7epI=e+r90d|L(W_-{gf6*p(Bw+f``gjnX
zf_lWVkAl^^X#3`T`+X==;(YskI7``LVc0EM^F`<!h6$#rUxD3W)}$W2XT}q{ae-{!
zLt*B(UD8){6ViLLXfWv=n%~qO`O?^8&F?esZOv~T8}`!Dy|Az42bbpLp@W7DxMp+!
z>nRW=oLCc%hGLuXe+C3RMTQFMdeb_B`_&sgE$89jGJWG<Ad>JgUj%jR$ex==0Vw+^
zXug-nuMS6_1nhR$p{>Y<Y$~v#=y6sc(L7Jc3`4(0a=m1F^x{{8iUWfQpq*24wJJLb
zSlMvG+dqJg>YdZrVdnu|-;mjnR%+(}dhm4xBYGfiXtY!3f3)B;$h&w5Kgr$Jqgu^=
zn9Fo$k1lhvW1%h}KR2_p(qfeTD9n3ev?ttK^j*X0Cr_Z{i!-m?*e7s{ICf`3fjapn
z^XqFt2FAVP$rhZ+0B177nQX$DjBqB0x+f21_U>5kL$^%v5O<6Kqv{*l!UOUmGsMsL
zip?#}UUXC$e@n$p8QPVMEw6EGkez3++zZSYHmf~t?a+qv87cYkJ{D8QmiDP57lH|E
zhd(xyf>*w#uB+A4zM`wSrM;`6rK7nX(A~rD$0%vBWJtVji!>EC=DCj!)$)U#DQ4h1
z`vy;kD6L3*wcUN8+C6X$z4wp(n>xZQuJC%GM<r-!e?1e1D$)o9^Js;pHH|)Rb9+~t
zr^{1U=k@!$+Ptefd~M!(JXy+IvVg2Q+`Ss9fiD0DCuOHJ6;zF}Uc4R$W*45PJ}3vw
zjFbRwetruauS6gkV8#(HoqNh@9<g<1z4NFGJC2RVVvXb2KoeHN)ETONF+OG{%fPSk
z#i0qMe+JULmpV0U2(l`i=tT9Sna(UwoVF6zmU4Ds12X(6K$4LKp4POqt@1T5hvdsV
zejr5q8)(q!ZS(tpG}ZH&nZkup@U?BNeX3R(S(bU~Azh~r^D(~(`Jl?Mz8bAHG;efL
z>ROtbeC_R6Q@Isu)6(JRv)nX>#<SJKLB#X-e>T@Lsb1?SZu$;?sIE5K!*-EGXM}Q!
zBtCXP$hlYt`Abnf4R4lzk0QHg_yd1<${k%kq}*TZquv^!*dlw&4hYFLpdH&l#xv@R
ziaEE<e1SySbvgy#la{SEfhvto;kDhXg*!IDoncV4<ZA+;D0sje!dL$24jDI|jm9k^
ze{3PU#oh9dBgOTBNC5r0mU{etZyO#9>T2-#8U?brNKq{BD;<V80m&}bW~xm+#9c5#
zn?m;69?`*oK+Y~2uZAo+e<ZR%AiK{TbWFC(65i-we{M+v+LACFT~%i1K+%F5J-C|<
z94bHp<clw|4g4w7t5ZJBv%^C7SPi~Le^_KB|JtTTU-K%wqYqIhN7YyI)svgSb57T~
z)Sh8%L!Ry%GERYJ`-5|Y(bpKrxpgQbw`@jt5w2+~eK_?-_p)oMGQEdp_Qc4(Pt)Cp
zqH`oYO><X)k}FesqsQ7nh|Q?-#MXX1otN;N+iN(G?EEN@lS0hNOieg)IjX_&f3l0j
z#^i8EHhujv=z)gt7M;l_G29L-^|f?$G_PuIS<~FbGFICz8$+LLQJdk#>QwjGZ#&B_
zY5lTwHjV}zISqMHni7n}5{4Iwak=4Rx2l{-@pNTKsM6JAbwzt_u}{%F{Z5XctV3$t
z+*0p_j`beX>a7E&r3-kmdPYh?f7nNjNvWURi0<Xb5m3%gJ*v!*WPlUpYEy=?0rR(e
z+L8NFQ!*5EO6tYD!cs$Yuom{RfO%BDArOuXqBE1jr{#AWY%U&HPFgn`s%Ua=z8sMY
z^YWd<jHai?HrtO-;nW}<-70fL!(@oFLjkU7>zAQ`UzV{)i;g_u6MO{1e=Ea`@wT<K
zwDB2d$<l#h`Qie&;IXNSMPj|M-1p9H)Hk84Ng%+eZm4b?A_ZgdybYd?#&&_6lD|BZ
zs%?8;JhmAvP-}-QBTvj(G4hyZWgB8ROJM~3oS1T*rJH;E6v*tHXgI`aX<TrTdUDr;
z;xtYv5gVYoC25ol%53(ufBQPUNG@R}wi%UR;EWY}N?v6{p&JXmmd4-@@>F8xEK?09
zfVGcB29ZK2#>Mkk>otW;-28X1pvZ~C3T3A1la<>TLmE;AB5tm_k3zZ#6<=i>5*NrN
zh4$dSxuYmYFI!6;zem&VNY0QJ40nl!KU(&(AV>9w_6lwZv7?f)e|lhDLa95T#paI2
zM(*<si!yyral3*14vFBZwkf(MSl{jM3&e57Nan9^H-x3)t_a#^t8j);tDpx_!|z>b
zH(v{_h~i7h5C%<w*?=sSOwGfRg?E{MV`QbC1R0ZWt&03dPC0O1IASGp0D?N5Rj3cN
zTwn?qy<B^a%n>?Ze-jgu7ZeH$a^<J?%ghB*X&xTiGxFhFtz}ne6_fFQM8M3?(;BNd
zZUUlol-Lj+@I-@pf=LjwMz|FyL%=c|dZ$R6#+`DSo+eSWW6mZGzq|%*;tO?twqEHS
z4a++&wYVcVKaVj^$LU(rr@d`sJC6;;3?M5DpA=SkNVu76f5VP8pEt_LH}pdxtFE;G
zh$qIv(Ge8eDSxB+xNGEaoooV?AUkZkIIt#5xXN-_S;AQ1)Ma$DhaMlUJg^e`b<AHH
zPT0-fhBh<F&YjxpF{Hz3*;ij1ZY=pWTxUMBJWauo=eAvG($)kf)OB06Drask&20c4
zXY*LgBdDRye~$21C6aos2q!X)4Grhj_5!gRZ4OYdO14+#r!|@OebMlvG=w)5<GOTz
zhBI-299bYXXS!J*W@|Nd3H+#Vg1I<J#k3T80qszi*1*bT9NA_XBxd3k4l!q}RpEr8
z8Ab0Wwn`Z|SRdF_7YO$8(dGI`er6bkv!fYAFp$&gfAijePh+gJ{K?>ijq973c`mvK
z1}x*7I88pk-`Bjni*eUDH7x~r0+&bI7}Z4ri3BWJxpk6khGPVuq@yeyv&q_)XC(uq
zH?JOLea9|iGMp2SX!&7^eYk*dJC(!o;_q_`3sT&yWeHb;TRR$Ax^f=vhPtu~Hx#rD
z4Xw~oe??NtR<UHCC&3Jd1aeT$MKY~6s0K8PFuX@|UnChq){vcF%<3=puq)UartKqm
zEB1<wNqN-4n>jcd;APs;WQ^UuQFx8Ao7IVDaS^XZXQ`Q)_0A}CI*~T;s8u(-o*bN&
zC&&I|XD-+)+4wg2?OUY>3{AHT*U2uNg{Wile>SzYuSGRdGmruwKH9wJ*2N+bJ;*o2
z#00yLr`o<bochl9q0wnW10GMzrh$8TZ5Kc<H<XxMJIpnh!*5?$bFWZ|6D1zp+a7~7
z(`Kg!+#~1Iy7pES%@ESFg?9G_eJi71<!M$Fobr{VMF_-K^yJ7eLafCLrbZ+vnf#3E
ze`{*;*84o|UO$o=MqBtcM{3W-OzmTHp=?bZ!`FIWo42mLr47)o(uguF1-j~5S|PRy
zVmq4s9j&b`ZK!K*XlZNmw4)tb!rZfQvlCZ9-jAI&y~thKk^K@uD{tL5JHmOCRphR4
zIw+`d``-JH&$11zW&AkXHZX^H?U&f;f0b#2@Ab5Iw0XHDSEIL~y{oaM&ePb{)Pm+A
zfe^ck(A>CS9^-|X|Do#<@*`tK=jH~01zspr`0Y`{A7y6FqCCcO;I8*JdfQ<vW(?1=
z+cMP(!n66`?qLZs1&jhOl6Mx9l>T!G+3rAa!w7)vy|MQx^Dq}P)A8$;@f2zSf0|{#
z-KWtIoTb*s4%@Km0s@V2X);SzThDGPGd4<KHsg&)c<hIXQCvrC+-R5Dc{{w=owrV7
z6EAh=#R0?U5BU08*%Lz%!7@NMZfOjJ`VFpI;rqXyh)pIK@!BJwbtZ+~qKkdtJ*KX)
zqaIBa48Df-hMyJ9I5l3f3+);Fe<`i8#X(kJ*9Ai9LiT8&jxEdl?QI=wd$yys-h&f$
zjD0K9E(l6^y)Nf9!XSS14n_j;lq6Y#_I9mpEv*L2HMACfgpI}ZIXK$<_Zp`USF8<7
zv0L+Yw$1Ow8^sle%v7G+x>rW^&HN%8dq1gcWDJv@%krmW_Bm7#NgfiDe}<;uLm7T%
z(lI9f*RAk0FGum8U%cEhm<-1HVbQ#Bm|1N1_m%%@nj+@;sk-*neb{?7C|_QxVXoRW
z=ohEg?0A3eaN5Vr#9Z^!WFJm4b0p=bZFxfyo`;4E8^M)`%Z$s5%t=xXQztVH^@!%R
ztchU_%558&+%%aZT0<bnf32104%-x;xzL#zYKQe7l$9K>I%1^2bZ0k*nOUq~mS3T@
znQB!|qYoT<`#mK>l?=pn+=n$cP^)rf!sV84*BZ;vyh3mE9EL(<Yflx+kO0;cqkb7l
zX5~SZ&6^!N*$Qe_T>@&LZ)xcn;*gdPILsz*8>3DmO7CVHEpK65e_6L5pno^4byl<;
zC!GU>Njzebmp-pEbz^l=7iuDa*(0z<wn@lDWGBeRg`Qx}RE*DCjJKy5_uS&?uCMPC
z{<}akjO<$BOi2K8#e<D{k4dcsvLxS~kW4y{{Z+vMw&69i7Q~9)lv4yx!Z4^AdL*(3
z4lQpKfZSwmiQo<Ee|>s5ZfqhZ>{~sGNiI;s!Mi=>C@$M5Fdx)gmrW@W230if7qzy!
zjCZ?<CmwNR(|1a4mN)ahVL=!*tub$(W$3T0_DfDa?3A(j)~e0jpgi#j0j1xL$?Sy~
z8LFO^8#E4brMW?dF3v2|yWn2hv*l;DhN#yR?l;V*5l79te~HCujDY0lInR{mot}Ci
zwX=us@bpZzyjT;$AtMmDjLhsntGC|Qp1+U3K!Tkr;+lv2Ys)hlwKbvSTU#SDGx|*l
zRj@i?)$yS!8OuTA(3WZht}FLO=Ir4)4KtJF;-Zwx-zn*DXv5E;i_Np97C$-xB+R;&
z=7vUJU3*uXf7jpA*y(L!hcLK$&N$kenoc8eZvL#>Y4gPj6TaNq;%{$dhg_8=U$eKX
zfmxtw?JK;#Hox&EqX=x!>RuaB?@c4>;xr#ld?hi6Cd`a}j+y53<=j~qor^Yrz`mIu
zE_cTbe<n2sF9Jk)1Cojy9LdVOc#%AJ8^@wUvYf>Pf9)GMxYv;LHM_|C6X0AK%Wt{0
zYS3<3XD`fM{)jEAupP}ntq8wy7B4Nv1=zZ@d)5%-I@i*Qn@atmg{H2^9K3uE0}by&
z7pt4-3(U)eTxK0Lv08xVUbqQT8SW2yq9L0*A@A_o>ueRvvdnW1+;ITAnAfnf<v1=k
zw{$W7e;TkKm~u<S&vsTULwa+LBb}?XO={!nZ}f0FqCl2GvDkgGv3|Vv*RahwB9BHU
z@Y3;ca_d}U<*X0)>Iv@4L2YbE**@E^4cVFi<PgX|id1Io)!RO_?aknG3R4^$o`a_3
z)WZ#7nQhtP<tZqwWA+vU23^fG)XKDq;bK)Gf2%?U7u#uxH|@-)#OmTUyoME2Mj0!J
zITwKAX6sApJr7?v!!VfuuWm(4i{IPTh#RN?Z<O)g)Kc$j@ZsE>m}*z1qhZbqn$kHV
zfeLDiA$O;jFLNyeh65EAkNc`!?QNcBKbBWN)P`?{q>zpp6Wg0wyZqkvu6FM+?I}*6
zf63Ff%G-wLpz)A5Fb2F1<tYe0=n|$`shXC1Jw-}|$0vQ!rf@JGL+v!%-bF=0Wx5$Y
z+U8@9Hg8=^TYVQc&ez<~g2oWoPG7UX-Ght%DF52#I`+A%q0zG(tH)l<>e1FV@5)s2
z8nbPv^Y*s2ugz>9<VRkkqjfn5DPCqyf8t4^tqVK-4GWZ?8A{0JHP%QZeIsLHnxY1e
z3qr;U^Wc@8Kv!g*3PcR><-PZvX2X^3VazytV(51$Lm$ie*s6R@nbQi%>B)?pOBjsW
zfXDa2h0_IV!%BgZ#SIQmeN$Is%kq@rTxz>W<viRn!?h4|d(6cz+<J*I!*~?Rf4z36
z_#qgypiMrTKEzqVTysD()CgRWFa|(#=SH4LWKAEimB8sB$2&gtp+7blO}6ydzm{8H
zVR1AF&6o_rVo@AdPlS0Es!UUtm~6n21?Wq1TE1}?69Iu7m1{W~TDzLVBD2ib46_}L
zM!H%(ZJs9F6pIa@TS|i`38ieLf2@UuGeLY~Eq$wOdEUE<!<nC&ES6bWPHtsGFsjcm
z8#E714Z8|kC$B5*#?PI2O%bZlHPfhZmA;j$fEpOT&9@6xKx)J0k~!fp$k5O?x|{Y6
z!+*{>xK(;IF&Njatx~TsKTy^-jZ`%z4YkKOSFo@MH5gMC;7##pJ!zOSe;ONc!|q2G
zyfc&c-iKx^rsxJFf7+FCQe)%|K9k~^C#Yaj!gs@<FvD~cCU{6sz(9noTc}OPQPkJ$
zX>El?%(ILgjJJ0FMm(pVe&B#ia>g8`gpf%@K^MO8q@eR&_WPLe`?&G@gz@{N@%xnV
z`%~lhY4)q)y*)&5J`2wdf9G?g+WEZm1$h5CzLOR3{tM@e=DYKk@ct{vXTHA#?=Rcl
ze+}=i*xr8w@2}e4e+%!wbG`=8)p*Sj`+eQ`eZyAHoACaY?fq?de<$PnA8c@sf%kW9
z@9W|HkGA(U@ct*;dndfVXM6uMy#K}a{yzNw)%gK?{?Pdm`~BGYe~Hyke}n%|ZT<FH
z**Lt59G<sB&;G;tPx$gLcx!+@6ySHljK@gjPU6@`N_G?Hj9o<BK~(<ax|u=vH-v7M
z_C)9B5K^Ac`2`y#K_sGJz-)$ePE0XlCvndd#aVX~>2?c-3MCTqG||X23{DMCD>_8{
z#V1j8G1%1kvFOJ7e*tX8fPF7<0dzv@X53BW8TS%p?cGGZi)ipj;j!c{Qaa;KQaW?i
z#42$Q8Ra4~#Jfltd@YBs6?c(J_*z-*+C@gMNmc1UB18Br5y_Ke6nT#9N1i9s$O~jP
z`8hd^{DLeaFS4pG<waXntrJyIV^ytVm3FWv3f=5vPbKgqf8rBsh>JC()M&_AkOouD
z$!y3>Y=Sep(zDX*yg!j3{FPDXm&j=HGN~r7kjdmXQ14f5T|39B?;M6Q0(&yMc9d9V
z)Tj==;J0clZ5OH9MkHYeDdBHp9wK9J%fN%zY<N&@6e5V_Vub;485DqBq9TZy>DA|0
z@Fr2nTMWt=f1c8+sw!5BSc)Ky7OM<+i;W5@yh`J;!2JQn@m*V`6suBWtV(qml^Sof
zayzfyE>b=7F&GG_=6)%#V_?t-c@Mz<nUs_FNfr4kAjgNc8jrVXJl?ADSgXcnmzF~j
zW!qpv0BY_b;{}o`qLhu%Cor0SBW2_>TkXrO+K&^fe+_{3M(q)jHggY|;2>GO@K2ap
z|FTulKDG7}$FnL<fGRo|#FOA1zaD}R_mGJKX#}|Y3uGG^0}lrX<RMbiG;0r;B#<3n
zyu(u+Xm3FU!|^XLE14oV$Xvl`Vc$gJW@S2{ZWF|b;{L2<hwvJS2f(ukF^52nYQ#xK
z8|NCGf9As8%D_3nZR;SH)j<bZ%}Mq6E^^Rg&`<EQhfL1uaX|&_)<~I9lHKEGy~Kmy
zf3kS6QLhCCXqAuR!2-#wT$v4)YE^EEIMt}!+mH_XD#S>X>wYq2t#c=t>R&7FB-8wR
z$aE)Zp0J(F+DT^2zLNkd&YE)*VRM}@m<Vq_fAfDQnSC3inzM_{y{&onE;4TynZJ`9
zdIOQzmj~I{FDI?gyDLZw`{i|=0+WsiRe*+LVR*-pdSL=tAsk3rg@edyVKO;hIGA(`
zQ(0RUzyugi7K+ovnNa#_QYp?7XR~^QEUXHNbHur<ej)J?pm>h7ah)g5H(LJ{qxExG
zf9pl7^{m}Zv!KDvvv-mO*Ao?f7D78<2@;(*XN=n{QYFkL`w4Sc{bq28DGDbZ%IZ=D
z1PSZxfW8_nE)W+HXIiZmTebQN)CwtSB*&O6veylQ#fwB?iK|N7MrzD99EPb6hjdGv
zWQn`leJ811;!11AXiPt<+O?A$aeY>sf7r?+913HxfYb;JVg4*4(}l%kj&K-^%i&~|
zP|Mo60_s=~xepU-*%}nFS{yN2Jf5sJT3kaKd5dAB8^j~n8Z;eNqaz{CmDUSO#iMvH
zI6j6r#EMg9KTami+)0jv>I42QWlX_QyUEc@T-XB7Zn6xb>y*o`Br-nS!V}TifB3tL
z)Zc=6Zy<-vdW=-fdf;kOHp@A8H}S$!0uQ$UmNqPQ!M76pCeLz?akY+dA&lkQi8Pw5
z!0aor=$&NM4Wz$Xd>qSfOe-IfEq2YQ7I%@R#jYJ>`Vy&HvSI(2ounDl%hfVZzk|4|
zr3c5jpc>oB*qx-MqP1GwO;%$*f1U!Xu#>d$a{V`u&Yb14BHQu(PSTMD42It59tNU>
zrBd}BL}pL7U{Zh!OH4JOfCN3U2D8~)bqkEj4st8mY0cDKu#ywuC{iID4H)kMvRg-H
z3iad=!Alkk4diHHIaw~OAZrC5IZjwbf<hyS2u)<8&_a?zD>+$MO->Wqf5-)bpIjoe
zlkGwWxlUL^b_i?9twImkDXb%R3MY_<g#dX<=q4`+LGq#yA}<NO<Tas>yeEXo$HE5k
zsSpudLcgF2QK3SJ3Hu2fg#(4SFk46nhYLx;BWxCq5w;2g!b!pw;S`3k*THJGACbkQ
zMGw%BAkfxjz_z=9{WRmAe=?qAawnP0=!yhOEsv9+CtAfi%pp{mIbc5UCpS>5MGV_r
z!hi)2u-BXw@Ki5)8BIP#Y!H_tErh2PqL0y#Q`npl)8@iTag{+4I*6Om&Pi;JyA6tP
z45J8Z{cB;s)^WO!N&Zi_ExMDe2|9^S(6quD#U^9oNszY$@+xVCe{u4&o)u;zLdPzf
z#3qw#(k)1mmbe&Aaw85cxPdG%Y0_~B;&{l`1vCk;{7!NL%ebACR=KwU`vem%0Q2J8
zn6di?a-o?qh#5nWQ8zR8;5>Sa^i<2cN$(O?$!aBobT3h>RjiG+lk{yT<Eu4B{VMTy
z;q^qjmxO_fJ@G*+e{Wj#Xf?&^?J#RK=@zR~yU94{n6rTKI0xwBxn#C*9`F_ykcGm9
zq*l0y)Cu1L%>Op&5-ukjgsTASuO_Dm-vvy+hHMkAC07eKkn4eiy-&E2{6zQx`Mq!x
z`AqmB`CPbJ5QHBIl5iUvu(MzQ){=2zv$z`Y?s~FTY=Z$)f5?4gndk=`Q^`+At=JCK
zQzM@NKhpu}D7l0Tik;$G$gzz?#dVMaDY;@{pdzkkba@i_gF%<4kT=9*0i&H{A^8QP
z&@NI-e#R)YI}JUKGtmQN5577bQ#g7oUgWBBZ6gPytyCNAD^<ka+ng)76MFkD=xv}p
z!rjo@d!V=Pe<4eR`+z&RpL7ZjT5?b;)Y)8(j<Jya7^~Hbtya$$k2hL<5Nm7t8q_78
zU`&M{0W7S;h4+&FwICHmmxvR#5v>}U8oP@OOa#oW7C|uD$XZmE-WhS$843SdH+IQd
zpzKNiT37)F4IE`;dnU9Sel{(E&oips7Jo&Aa)ZOdf4-h&`>!?rm%{(WP@50U+Uy|j
z>>zKN_1lc~+fLj&$n#jhmhBJ?zl*mMS}lSAx^V~DookX=6HGCaU5xp*ZYL9Xb1@PM
zIXP7<_CrOrSS>wfFcUn*T1;^gq%g{5<!{+WJgnF~<YWiIlAsS5A5v{Rc3%&Z5^|ox
zV2|EGf68}~Q(@WTi;{3#wU{Du*MUq-gqMga{F;;suaGgqtFS8l7WkImlMdl^a;)$M
ztUzy(D};B+Rl*-(m3g1sBz#PMBz!`437?UBguj#fg@2M~gnyA=3ZIkrg)hj*Kr8>@
zaFTyJB*Ep71;wEVqa2!0>7c^?jxymuN4YT1e^Dtcbc_~`bc_?49M!^F$9_W0F<#j0
zm>`_w*k3r+aiDOH;~?QY#}tO0JuqY6Cz=?*ISDJ>B(WPX5ohOx*6h5{<XPb<h&(HM
z3NguD70v?O)d530gu}%iTxFnb^Vy7bLknk$y^vQ*!{R<MY+$h$a99OsK9D@VGP6v&
zf1jL&1AaQg(lZ#AewAVAnG8$MVp#e$|JpK$IvcR!>mUOF<9PZm@{NbcIZH%%K7&1<
z%lOK#?jq-HBjb0H^Q&DqAd|A7TD+c=>?9Z9uS>jn=5BH!=SD7qc>Mh)#5->WxuV5*
zTkc#W0jM)~k&740V`N}GF55=Rfc#!Ee@2EUx41~ElD3m-NOKmX8BH$jhmYT~eFAvc
zJl4cL<l7FyYX-Hvd=I$-7Z2wmkfp1!n6K?3+u-MH_?d7w*}h1wlDCtYEUR-5xzY*r
zb0R}htiZkGs<l{_^KSB;J>+T^sgjXdcBU2t#|%>Im_?R5W)r_-4jFXJBbyzEf09!j
z3&;hIh2$c~VsfS9FmkoyaI(X(gxuq(CHFgyBriIal9wDulUE%c@;ex$&m9ed;8-D4
zJ5~astrBKA8ifW&3qzm*AoN!gk9Z=W12Q6qi5q}`Ap-d<1oBx3<P#$dfog?Pv0sb=
z0xcID3|U0tCw~)T;zmHAQ_0g}e_Tue0)0+aiAh8tK_Dx{LC7nMn+&m$!`PB0tT@E2
z;z<T_oo;XojVM#N#HG$fZefW86k*PcnW6~%>35e%GjQF$=1y|0@p~Qqeh-81i+7Xj
z7rCq4+etZg_AL0n4B_02Y{7fN5?NTH2usviyU7hp6qW-}Z8zDmjZi?Ve;b#`JIMJn
z@gqE($sej*+eyGIX^Cc*y_5U^nBa<=c9S12(RPrTsrZ|(Clga|w_Hy~?Ib_4C{DF3
zRBIxuv2!=M6${$0S`o|woa~E;Uz8cua<y_dxox{a2N!A8%5HKyaw@l1tGmh0HC5Wp
zz+YrUR?`P(%$#*M5w=^xf0zT9=PCh-+caSY{u%`D5;7Sc{lw*HCz7L+sE%VuiDNA(
zcdR4h9qY*vj^jv^<9O2I2#|J1H(BEdl68&{InL2Tf{tFY!O=%HI>O{6#|CnyBTCM3
z#K?t?0dj?7Be}s5C$~8g<Y~ts;N=$buH!WFp5t`E={QHIa-1jZGv_#8IKXj%Fb$sP
z!t(-nKGN|`hMy+^u3Q1)-pS6_08`hHx5ZP$QvpBM0fX@scv8r5mzT^UB!8LsRb);`
ziExy7rg&Bc(fgWswt<&}#?rl-v4E98YevCxXt93xk~`q{&LyI;7~SO{T=LlkGy_Q4
z^(eL7U9o#+nk0n@_84T4@woSJ3Im*}YZti}lL6N|BaQ35&tNOrQg=T~;D$A92dtow
z{D>P!H3*3n53qu465?_A^?yNRTH*I0U|R9_$1L^36+g*LJr}<|ay>Z!e}Tmvi@%Qo
zCgbm8rjReN<d0WNkFzSEkov@K^5ha3rt9cx-WAm{BbRrPrzWIF{uCph=BqC!ew)Zd
z=;$lS7{^uQ0LRs2rsEoNxZ_$<@3@XMI)H0++(3F9I{@i^KoX9d0DswjNG@~SOfCn$
z>N>}*<QB(m(C@dC=Nvo9D~>zJ8;(24+m5@03dbH{tm7U)xci04jt2nY9uy9D{1}k!
zVWHXah{Yk-o3a-<hm?w62Od}^w^$O~E7lVrfrW6Z#cvo0w^}^MSY=m>=Q4yl09Mp#
z;(35fGleOz%0>a<)_;=Ej8(RW{7F1tya0&gWHMX45S~&*lBd5ojgNGQmxz~gWE4=Z
z4#-HFgl1uhh-9jnQ8aPJ>}sHZw=HtbMrr_5<n|q;1W*f~s@)G(xo%z}rG1k5C;9)7
z_8#z26w%}Oo86t+dg%!)gx+&^h?D?F69GYK0@6Vg1;l~{3x7qi3o3|+qCo@!Nfc2+
zgcPHK4OCPVQBkprV!_@U|MzC+HkXKgzyIG?Kjhxd&hE~<d41l@Z1>IW*eD-|pcTHj
z6||AR97{UNAXzs!4u6k><K=HhEa@0Zkp!e6_#9~3^C(GnqZD}&GPIY#*It1}+Fod`
zy#}rDx1+WPI)7tXH-vj(*>T$5Fa(F42~F&w#_cNHHq^L7a<PUQWd-uRjx`4vcOqoe
zLCswXH3=+3nE)4M9tV$E!{pzDkpnMv<@Coi3hg|CZeIzV^UMH<M&sqM=lZTZMgb56
z%sifF;telO=y_%3kv)2$T>^Tpy=hn(?8VxzRl>f6;eV6u@_HG(Q3-FNl%*DrL231>
z!prfHfp~cfg!VQ{)psCEI{@`GG%2<BAf~;KxcC6^@F5J-K7tY2$0%VxMG5;EjMEOm
zncC-Yf%Zjc?g^BJMJNq*B-E3Pl?WM-1p|z`Wyql(9A~UT$b<&a%eV*0&xSLRh>2hg
z7zYiEn18Wa1~o4Vv3!xlD3cIjG&QJc8*7Yvm4o&pK1U(QS*Rva;uT1y-(OmQR@e|U
z!J@@AWoUchWiPz-*3j54$U$6Xy^U8R$lgOF9bXOapqM<6^=>)5hr0Q_a(I7OHGD80
zG5TQzd{nAueH_RXR$7O;zCkR03u)R<kgffU7=Qc&sp?N?r~M7>wIk3GyVO%>&`;N4
ztZu*=x`1<aE2OTTD6t3^I<$u_##;Ruq^Pmr8S4-tY|N5+10WkF8tc)9VYR61KD0Xn
zT&&0E$Q|sGYpjHLoWg=t@CnT%G>uACFRg_fgf|tFqj4}s<dYH;)oX$&x|cHJ)+HR4
zE`LTb)@BmAABS0!&;!Os+0ZV=gKEaDi?K<1nn{@v)OrZNAg4o(hp`izQMv{VKOdi=
zr<xQ*vp%hW&xXdbJ}rks!(v&V<4>H7)h{aH%Nnf9P_$kTEWJLY>wZcox=Gm7CMqy%
zK|Ny&+Ws1(Lx%AP;k1?(-5Q3XPf=5XS%27!ugc-@(Ads@1dQbrkKP2o+%#p1FDv|N
zR`^xN*hV8+>s#e0|AKFwrM}f%YV0hOl3%ANY;3?cvH_LwZQWkChFrZJG}2=!-)|m%
zzqzt88X@v4|MC4Q<53&}`u-m{ur#!n9QFIi9+}vN@30NS;=51_l*WcpeCT^+LVx^6
zP!7E$l2bpB|NA5T`KcU!Rx#UOf`R<Crb{yFp?AbCbq8NhKr_7;w9<P+8~u2ES%2uD
z4}g*S31JMr8M;8#iY+b)JAFww19FM+m}H-JFhtesfMV!z;|WB;NN5pwlQk$&)VLi{
zv%`2&4b7?e9TNFoL6qtFjdHO!zkk&UHR>m)sD{+}J*96EdMePj2tBRlqdnsp;*MGa
zvcq^*sfNaZ2?rNf!|yl-e<VyC1iK(w0e=o9ZzIz;V?-2(kR-Ojy%btHHbx_KD2QN0
zvi|a|a=>EGH`z8=UqX*y7ksNx1^kT#<YeU0TadO7)kH7u^Ua#x6_R_SpML_jJ{ltW
z7|7PgL4AEZwALp=RG$Q$^vQ6%eku&sPlNIL8E~q8CS0gbm)Mwu?e7Gw4N5bi`TUDR
zyj&dO<zi!(WJQ9WQ+T;p;>wWF)6(!I=oxAF+Hek9DYXq>&3N8;As}P64C{D!XA4Vk
zmOy9BCfRp|^lmLhq(_KI8GlG39VcD?3DWf+pBg^>5gji48Qs;SpP$ewaketH6Y}X-
zlNXgt*UK5vc7m5cUce8o@9qT0cgq>4(%h`S5}am8%rYht0<Y}2&wZPMT|eiUM`M9u
zDAz$h8#{Ck2>m=n{rQllUw|6pLev-+!AbgT7@=Q+=)M##(&xZjeSa=2(C5MR`W3K9
zUjU2sD`A;_6|B&&hL!rYp@%XT32rwMzKi<hL>UZp;3Vj6yeKs>qAVPqEg}1CF<uJ%
z5`<n>Y_>%Xl!5TW#^YE<`5zA&dyH4`cNsKQ@3Y~4<5j$C|AV>qBALGy%Gj~^c6w`W
z;EFI)gMSyZ3&GVFrGJRI+_1^HO3b<_X7~L=%)M^B5qu8O8aV7v$<Nga1~H2$g4sk7
z%n2etLt|J>UJi4I#ZrPmSZq_YhR1iY{uHl6zeY}@?jX;cd2%j`Mbwi7r^)K%bX1qH
zOnPK$F?^~zosRyOS@U>?bZ%H?@Hi48USz2Y$G3OFq-5PPmVaH&a){`*vfOf(=i5B!
z5_QI)&Q!8`6w|Ni2EjqweGeNGM_M#1S^Y}p4=aI@<de@xxa$4%qg=!l8u)G%YoG&l
zPrfmd^2W5(H@YcrY)xI=Q4IOmuZA)hLR^CV!|QxvpHfy@r#DGV_-4?la@Hu1m$Syw
ziDXSGS<`qWYkyYbiLD^xUtf$mVhNg7w?J=wDGbzaLz%Q3M(MZ1Y5E;#Uaf#j^*dp{
zeiz)J7r|}%-LOVq1)KDHph{m2Pv~plWqmCi*4M#r`g-K-`<SH{vmCvI)zj~1jr9ju
zAAKVmtUt&`>zmjF{b4p;-@-0LR9~h)!miY}vYW6wi+}Y;*($x7ZPOo@bh-nX`7~%~
zyovsl2`|G5#(v`+q|(FC#^{D+9?JPa#sQ>Vm-WFisz-Af`;2!fBn4|=m+>B!S+EHn
zHQtx=AXV^?@c{)B*kzDyd?-U#SAr|G8u@!qh5p`CiYwZ%yOH5%ArEzAw;CT|nGU_#
zbt)(}kbliLK9)0kt58~hg6$)H5it%Lhm@B`dM)V1m)NGD?Q^j0L5sh{76<M88owWW
zYfc>w{KoiJaUkinG@3`MHNW3hl56v%$xzK&jIUrV<@5k+wGth6QA##L`!d$L7|du1
z{v$#)6$7;iqUkbS2KmJf5@uLaf+%B#wI!)u&VSk^Ty*S92rMXqH6*5^JE6UAN(d>I
zC>vdLeN%XzO&4x#+qP}nwi;WF{lvCy+iZ+4&Kuiq+_*{F-T!o7dmqfKSu=AyOSA4f
zLIFon>QfFs4p%agHQuSdpEbaRP%x6g3y$>ie$eMcuXf`*?GAy^(gW}ySA~(iRSoxB
zLr@S`-1~Xa>~CC>7yO=@9)$9gf~{QBg@IHE){jkO7Xd-NS0^U*U$5X}c9W9hw&Xy_
zAF7ip)sp^at}*pUFOc^LSRgJ#-uVH<mv6Tc0N%LzEiCUj(6#E1K>g}|FzgerS=#{V
z^s{$z6v`0d@4jYL02Srp4zj{7s1ZQgzbqR1_FLTgXHl!i7iVT2sl?jfQ0~P+OZ6|t
zHF?qaAJ5!^>VG2>K!a8m&vzR&zfpl}k1tss#lJDe^?zq^E(Tlcp7*I#`@#5Kt2oYu
z_2OFp1{@2f|6~of`WR^)OtqR-$|PT<nNdNyGM-R6_CJO_nMKsgeJFdtw9kjHPnb<E
z72EP8S2f0kxoPD5XG+qq;=gHuZUv5YYlt2<_3bN5vGYPd?+G=&z}EhIGj;=>;nt?!
zBmsWvND9Sx(H5!<hd&&DbnM+C-5lDi>Yv)oE@n5sKgpwJRK68*JRp)|E}s09C0jP7
zFI4lYW@?lCDr9bx=5|b_4J_R%1fiq+{qkKqCN1LS`{^9AG&#1g{WogCA^$rwQrg9m
zl)i`7ITc;Jc59(DcZ8!JT2wt?-mg}SR~?~uXO8u~Lc#oLkt{oDoFd?<o5Hr?_GuOD
zS;r#Qzp}i=l>3`w*4b;b4}GUAN3Y{~cn&$O+1+q7nQ(=8ND2x&C1fvQ4rqNcEJ!90
z&-u+2VQC4kj9!VyU{qfQiFuR9wQv#VjPT|Fp**7wjgc4czsP|(Uxq#)Zl_h6`~@ds
z!?3&=H%uP<rC1Q@y!Sh~xhtQ?xlBQiae_O`N^qj4Z=7<{tustEpNXP;O)^gQBD8<D
zoP3=vL1&#Es8I{z$a?7(0^wTiOAg%rJ*b-Q!^H~nC!e~^T{^Dp2(E16FY~zVSgzY)
z8>?1VB^rU#%wgAQj8bqwSF;kj+HwQl5)(OH!5UQU=4C!oZB1Jei=Tfm(2{|?3EyxJ
zO^YpQAxgI~0aFZBNN9w-JCRH^kIWQM9#_By<q};yf1#ILhm{s1(-5e#sv^D)PKq!s
z@Xob87s<bT;%@+>t&)ZNJiT%6=;hX~1ChSqpvDP~4l$v2QhNv_JLe-k$D<z*R*At{
zAZcvywUbPY%2_~YtV!{WW+T}UY90g}b9Jxq5uf2}rkKnJ3&wMrWw0a9Jv|m<Tpr^e
zQ}`@)b3H9BE!v}mx-5jhi`a~6-4;uWuXNE8#S4=^-yAlwi=nKNkXY(@2XhOJEZ;Nl
znnA0c<9Afw*%ty+ZRyDO6a(DEf_m9=Dq?4Z>`ZnE>&j%Nloi|}3Y*X{$P@H#lLs0I
zST0s4#rWy+rn+tHe8m>(i;o5OT*yn9OotQSH)b}wGtk6sg(Ret6_>F^$-LX(GaM;$
z(^}W4d{G;qid-zxS`Jp4!C?Jj{Z!QsoGm1qP1Rb-7IuJ%$jG}pR%J|%lSj-Hh<#3p
zUy>t|OA6)hc7i1XMKTT1P|9TeL0bx9MVPBkm()!AT~=#}ii5_nIaMNE7`YL`wN(bh
zPt3Nrv>0hRd>;}}qT1%akYc7dE2{F8UQ&Wax!S3B8t(bFlzq5~7h^>^(Wdl#2+Y@6
zENq~W%{YO$!!3Y}HB?754=n@Q1~yRedH*5jMsRhOI4M%j09ue1yXCpXK76l0XMP@e
zFOZAtLnUFA;_)FqLavRMLUaepI3aJb#25)Oo|<h;51}l<ifvpETr;6BnKU*T_cn4n
zUR%v_2l6UmwRuqw(lEilWJ?crf#52ImS>1i&L4n{mpz~?LkME;Y*Vs;t+NrDlOgEa
z)SgguEP3GQ8{ZhcWiv6Wi`U)sJLZ0gZb=e$_%Uz7xo7#2@O4dj%>2^x!1FQeBfFdc
zX)xxa>)`yOYCQh6LuG<C^=?|-f+(0o$nYN~fjDkq*pd*$;6HMOxPUAeO*6s;%BTWi
z#5TZ3IGo~|n=fJgKR>%`1|O;U-`$SnjuMH*U1YM<{Mh8<H3sA^L-fbnOIwctd(nK_
zm`eie#f*X@gvWXOzaa;I(Y!%z((gZ1F2#_J3?z$$BA0DOrFIp7%;ERe>NDpDa(U00
z!{m?>lZtDQZwko-CmT-fi)iJSQmOdk<WhkGRbSj|h#c=>mN8N$N%Z89h_;9SP=fL~
zyuKgg(8fD@!T%1)O66)!U-mbNB^6a1_zZae6_@hJ^4Rmt*B4$pm$G^`ZU1Q5@!q<1
zs&|9Xip7+(a;UM>N?^r)nOZjzqe^c4`tr_LGV~v=5zEz@rYU;FHk=f87ul(=S4lm<
zGta9v8`5h(S?IQ@E>4`@!1cE*V@2f0kJfzSj@HURzmgi7Z%$<(rVyRlgoK|b1TA$f
zrP$@hi)B65==C3eso6s9jQBrh&K3!6(%T#^%tefi>R8Uy8kVOwJ!^?WU4vh%mW%8b
z$#{Z~VCv?dou1L2Yv2m-AgqL$SVQOm`MKiO(`w)KnX_H8ye_rV1%0zPoQlqii4~jz
zMdsA~F+tubLGIG>_@x=pA+Zfn<nm(5Zv6aE*+fz^v2jRM{5SQ7FPJ;L!BOuC()+##
zTq5>A*0!asaO)ecEE`bHt@JzQnmzwjKEMekRkdsi70jLEJCZM0cHJ|1!7i8qjJ_m>
zqgO3i-3u=dFq1mSo9jYFU&DkB0xqTSdq$7Ghz-y#F-U6)SHs)3{l11y0xnf^XV6>P
zLbc3?>`v4!Me)}qU~<O|bQQ7vP;Hi5<rVLs{H{vZ5FTQInK7}rY<4Wv*YKl5l06z%
z3pD$o?NT4SD&%C$A(;He=aWmojll=ipFbPHdRdQmFOlPWIUSh;bG0a~ei7~`XZd`Y
z=_6iJT?L_J#(Rz-TK0w{h~dY35hGIh+>~JGxL`$gWX}=<%(Ys0*SVV~!W|k6R#dg)
z;qRI{f{ml0(2eQL6@8)q`YM0)1lgXipi-=K#Lru_P>ZL(Pl<I7i`xkU|IsD<fOo^{
ztB7YFA9NtsG~SH`?&@0VrZ^q~O~y0X^^h-DuR9+^noMU})|rOWz*7v~?LwN<G-z|Y
zXmW(<lbC*K)FPHvXKvom1(>Vv*PDA^h;^PEA%l{asQff&A}ToO@4fxm@eJu0Hhb}w
z7AqW12v-uZ4W~B>Hm_L#yZ9|j-(>b)>JxN+$=ReZ3!iUz(@9Y|KS+(HKSnzOz?hC`
zhnxb)cIH$=?M3iNjz<shMTinc(+;skFi`H*@8LzM^T}mSA|^%fRA7lt3Vdw%v0zV^
zu#Gc44<nW$geLobIm^Xy9=hdhQXgn=dD0inggdBDVFnshYdP5gBU|KwFsfdtMfqvD
zdvzC_A&@&^uUaPKEevzsUXHY-?XlR4<@CHf)cp$7qq;PYklqSyj#kA8<`|aVx-HrS
zB9*NrNcB=PNVV<>%J4tV4!QT!(WVfe*jw~-*zhLE<`(ZfitT>K{PGs~oxePKnC#9O
zz~nZ}CwGoXmZlmCtOal&omG{Q@?lThYnl-iL0~@kA(*KCx9|SG;#z4>R4%VVu`-VW
zYvIL**GApT?Kr+dmcjyE(nc+j_IgHj{@s`Lb6s$XcB_S9%_bGbNI@zK>A6+G3sv0{
z+i<Qpw!w^J(73_fKaUK*vyaydJH4&Lmf1ktu^^KAirTCd_`rG>^k@-hhuNx*9+9ce
zrZ3p2k*8HLZdzq~Z#tQ5t#;9FHE#u|o2Ys^rGB{va_wU4N}I#=f*bavItZ-SZf)^`
zkQ(WGa6yjx3<<zVL-a{QD&?F5-=$V{l%zKfLT3&g?m~#)rw|vkjW}r#xZ7F;TgW#k
z&NoM*M#TdFB8Yxx{(QLLQ^BLTQKIbLeq*>P1o!Rv9()kI$DTZ30e6`7lcw@<T<M<L
zE!stV1%OcYAyo<Iz?y#l&KJ!ikdAskFiDRx8?625b3%f<Hk9+Dh>P5R$o<D)e)GSQ
z@$`L`JS1M^ppuAK#NaGd(~<Fbot~G(P#qlf4+B(S;1n_;Ve-3_5SJ6BVW`H4PDd}T
zL&*xCz&Dh`si%)i26nP0vfTaZ{9RG0*0M_77FeX{wH*BOE{dQmag;%3YNQNY3_laO
z3*Uh3-2A!Y(Hh#0u|HE&O%6Br4OpfN>EE2nB^2dc=As7-UBCw8oo203WgHr)%q!ld
z(+zw9odPPMOX^boB|-8N4WveM?NTU%%K8%XJRUKXxm8KRlV9}j;_dfp*dP~Y@%B(*
zq7#U+4(@WOqo0Y)O}W)DYoqH{ZF3!E$kZU+-CGqWf>LuU_Dw}$>R_B7VE%dreNpPM
zQ3df*fqr<XhG5YW0}xir1qY9P#n`N&eBWY#S_^ECqt_v@0fN&N0=}H42u)x3{Q31^
z`~YF2Dc&LO&mb*oR5A2@xVrbS=1kFWlKD}!3Et5%+t!;C!vm{7a6iVoM*IT^0~AQ;
zn}S7ss4=v#70;8R(h3{2EW>n!xYZqUW0RR=Cbf<V%-Sv3j2LxuT(AFw5W&ciVB@p`
zs5Px8!E(${jIC20(NZnL{^XFasyBGBiZIya*>YwGUDrZ58ggAkj1521D+Wxk;j>p4
zsHJe|&P{7%s<1I<6Pl$5^kfK!dIk3&D)sCBq45(j5zKUx5<y)uXQ}H48$~fWgJN|L
z%PMK!hUT<_3&kkEh@iMf+tAr8Zuk`eY^Up@Jy06z^NYlbV!ttb)+qT<gJeYXr)q0A
z%BJjB#XJ5BwNE;(B0`|a*MWMcvj_{1U?Mdp#F~|RzJ@m_TC0QN^JG4`b5KhK12ByK
zVAT#(sXq(H{piE|_0DoJS0wq%k0kOQ*A#0%f#F^{y^3|1Y5=zJxM^taQ=6&@=$A8T
z8txAubv$SqmHb3**V+r`eGBr*8jRq0c6y5+gcN;*yvGHy@IQsmexd67|3SYR6E!n_
zt4bZa4fWUvgQ4d?LVv?|d#5i?wu_bwy{v_suws|@A~<QWPTlaBv_XF7OYekvirilb
z9|lW5JGMG-f(w|UorH&MEuc{VY63VNQx%IGyO9k=;IH`QKy~kyxf0?2>WcZX&p!+>
z91(OC{SJ({xA*kW54>`n_NTqBwQBL>3RjBf{rvwxAH6G19(@z%`3pnv;G$W1Kp6F_
z{d;SX-jzp?^$on3NP?=a(tUnz=r^^wLV|C@g)|Y)jus1VodXHNc^<M3K*Lz2QUYbF
zpSZwJs}9^={ejt4+rfmJ^cZ}(ZIvN%6m?FwNtUPS%jdTgjs3l8F9oy8X@vtUj#xp)
zV?5%udl^(a=Jl3B?KL-^ZR+u2#WhK?3%kU;*0``Fp*D>C&x~KG&U7!C-XMi~bnpo0
zMnkGPdKHTW^eSOi{u}5iz^+dgn(5>>hrnyLWj0bSiWG@Np?-~sLW4}mQs{IYHLChZ
zpy_`?DYMs-OctlE@wyTYPZ4+<5@8-Cl8tP|MF*~_Xs)qrW~I%hwasRguBMr;hvtXF
zRussM=$Ec-lfiw`G&{7d2ka@x3o%4K(kCM(DX=avey(C%!IGuqKma|#a91h&CsXdw
zekr}X6lW$&ZX45Lt|yMu2HRq00vfbqeROLK#e{V<UmmMKxX?>J#xaY#n$Ln5i`ypB
z%C*gu-H&;;<OQh#_n2CV0Yfx|pU|I<Q{MX{%&~VtI%%{pN|wxT{2KSFR_~uiQ{J5V
zETX7)xvm&j^*<2u0Aus^Q%lij3t_4%fsTuhPpYI#MY6ci?dz{lI)iZ5Y3z*a9FwQl
z%{@N8=a~(~&1)-pK`w7XKK+DL-j|gg^zen*GS@MwoIVdJH>k;bef?%fd1mo+2;9xl
z;-Z&HtT)b@I<lUbWE+Yx3Z5?^iU@WOW{)Xn9{X$ScC@4c0LdltH!sHDX9S&U^%Grg
z{g-3x%_M<{rZsx15mD-?Usy+G{#LLHDOy0k<vXDzY}!An3@=81WWlsf?D_HegH`1X
z{7?Pxf??7pc(eyU{%u_dUoBxf{(hBA%`LBtB~=Pa)kgD;VLfdB(FoJ9SX*v?_ki>k
zBD}HtL5|KMVCpZ!hG7g>?NL>Qc1ssBR%-m5m2QiJWZt>DZBqOSCetF~l9bCNdSLMY
zABsWj02=0hl15Ka7UN(S)GEQ?=4AO~DpE88@XlCahdS*4(Bmb|I`Ci!$6Pn4R3c@^
z;4BLlC;2Q6blGu&Ffs9PG4-XC%<aq(9LQ8G=Eg7Ufe6014s6a%yze}DO!H<ovF@Av
zM?zjH+2d!ih@09+8eR?E(Z;OSZKp@(of1Y9JaPQ>MzdD_<3cZma5~X<VMew!`R8y?
z2qiAq=@UM1+;AoAAc@GVrH$ugdggkrPF$fN@LqPys~@BsCm*ro%Nup65!{nzeecps
zZoMf9fchp~SL>mD%vynC^5VDsIHaE3=L{wLVHm92v2q?q327yzpF@;PH0v$BrY*ec
zi)t`)+>Wi5OLF$Pd_{AtI^fle+Pya|tJlO@60nhKp>H7D`qc5x7Vk0+-<=gjGGQH<
zE}W>)$9^nQ$)7UcAyHl>qNAnhcwNFR#+2!Mfd{=!GX$*;$<6QZJQNVjr?s5O)Dsn-
ztzzbQ+9CSY&x$G&t*@H27K`9(hzY=cDHYr47OZ&b_^>(ti#YoX2yxC7Szo+8KTz-D
zAWjtFEMSlE$&I+Z-mO0a)JPV)^NXDyRoX3wak^x^ZIf0uP11goLlDpPSm%Yl0dA%Y
zus<~7Z_&5(Z@AdDnY!363I8Hpt=l*!P`kDFbK6D!fDm@h3$^CiioBl5m@@4A5wX<n
zw1FD8RTSn#Yo@h)OUKN?7!vps@td7^xp*Xz<#aL<zmaq@0{_OF-%`HYH~f8gH|X-j
zd8JHKLB&KN!vn#Sh|=OqWepK5uJPnWAR4Q;YnM)H#13aKwBOSiUCr&pjUR%wG!qWT
zLdL#XJZRVK+M1=J#kzVx4<50o@~O~qbr+Pi9ojyC&?!#6^x^FBS2PU8krSawwj^v#
z%b}uU+zmg}wBb;SYTq!~F)NhSIU=A1sW)c3I7ts>bo_=*V+Xu!908B^Hk|$lV9BP5
zJuqs)V8Qktg=j&*iS;+_(M$LVAlGADndNnpGK>e_S8oJci?Lth5FTQ-;EQ0Qj+~og
zeo~Nx?n~2ij^S8ShMdJV)K_dw2t*@rfivifs*l6O$!^lA&#8zL+Wy#>r->oHW_qA9
zq$@O69A9?K@QG}|UT9S|r&VYM&h;ZU7D%vJoBtbgehKwS>1Q%AZ;BPZR(?Pbq%*N9
zitGRPMKLLmb<b2ZrfZ|=h*%jHmP_$RomC8KyWf#yL(Q9>1GUKNR;+3}#CNs0IM(*W
zBgJ--!KFmpZ<vCd;K-)Fbf~1-ZY&T*wB$T|KLjxXLHtX7L<!ELMh5iIz%kzOBU-B&
z!sq<?u`z7ra1vb-i+GJE3(;AYMb3XDVYj~mNemH|-?2IVbHR?!$|2%f;EiJ~PB-u(
zXG$-@S6p8FBG<RKgD#%2VfMlinrS-G4XL4)_=^*vi1+(0iz~i8=+hqi_uYR@DQ<k<
z97dZm@RfGCbor?Q+lT6~r+^;O=LiA)jnChpxo$)Gb#Pf+Te^gSMtMf!+UhStWOJW$
zcrHha`qV&&<jw}m{nbr#<$x%v4`D7eQ8C5`N`;-G;<`8d-*MkGsqTV7jQGVz+6~3@
zgCTA?4*E`r?-bY%fy&YW`w1B>hV&ZvX^TJZtiVJmabzCXB^ui;gMjMrz;=~t86J|r
zkLvFBp`#G+i8OYsfZ?Qe8b%|-o`^F%e`h!^)(w+*j_!%!YGXV577i>xV0vzTDo=F1
zN8Z=)I*UMSz7((e4O8g>m!X*wMD#(ziSNO|ec_0J=S=aHi=)Iv%s1*`mU%f`VGYH?
z$!S`W13xpz)V)0$320lB?AWY@X|#!G<%($Kyx*5^!kKUoj$T<~`iwfFz|P_va@=N@
z$`Koy);-6~NLF)&n;?`N%3Up=I_s7l+FMa7g}+bB41ps?{oZ9Oer-gOwC|{XoH$Xt
zDg%kVx=t2lt!y%6a=4^%fL>SEhB}@$o8$vu2vfm63Oe7+fi9G|V@>w=@~vOZv0o*U
zv3u+RlpsMlcm_#NGI52w=xSEEyUB8$eXPG+?`fnug0gDXeCRmP!;q}2IwrNu{VNs$
zw9(+1Ef_1@R@V#Ripb@bX@+aWJ*6^p=|nwXS0hK}(GzqUz{wNDzLv~WgeAucN9pbj
zHJf^WpDt58;MWwE$*ua#_fxY0!FJ7#KGl3`ADEe{91Lj7#O$YL8?~^E{5V^@an;>A
zbT*C3`s{Z?v}G#luyj(}Ot8e<I4MsJiz1JmS9Gv-=oJ6ujQBO@#kRpD_A7B1iW6md
z*5W{-4RXhx1kpQ(xMb@ZN;Rk8(6<dSz!qmD$yyf%u;#^K_ir|8qn+XPZ_Bh6U7Pqv
z%#ib6OQZF-%%LljGcleaqA{6V+7|dTSDsCx*~)Cm4c{|0FL09u9@*xZxs+=KcP>N6
zM6<3ui%sG)pU&z0q1xG)YkhYP|9K(qo$5>3`*&rz5f+Ckt@xSBaFF>p5lfv$WGA9`
zOLzPMkf%0BG{uG^H12_a*>&jqrpXZ>cIJs2#L0jT{<y(bBSrV)J;1hHl+<r-0agj>
zYx6mPz3OI$#qzk^oPC5Ux%i}aD=zyDBPcHRc^1B$Ay0Si56L&R;Y6f_7ALy%2h@*q
z6amkp{79v10-Q1~)`UWe1N4AaD1+rWEKCks;76%z&wav8%hHApvh9m=-GmoJQbsG3
za_d9|R6$z$M*DkQr96t_ZJU(ggYEBmGE%J(BWX*M<OHP&b5MYTYTt`eQw_p0qrN1G
zlmfTpn#zQnFFaDTBKWS*`%T%peW^3)a~fBOk*JLL7D5af6a%#c0f@+>aSUW3uO*xa
zc$;J8E<~2lZzE4{)cE3ToGHn1E<`#$23(k%fC<kcriikHmYf;!ZRR6W&c&%;e~bNO
zhqcaoJg|2cF>){g=gmeuka=V{$#F1E^JRAAZi?caBRmLnM_-=J%dufGQ+LNFv}Li8
zoZa5EeMIr<?Fm)py|X;e^KRikn`V0enh{rYW8^4Ha&qH$pe)`rEQF{@T7Ail=QTZI
zCQyHCbWMK=|E_j=b`B;@2n%2m@uv)+eI&JavKz~K*#5(O)6r>0aauC*H|52?G1AC=
zZgJV<{TD!mutP#1@u<D$fykXDv0e8x{Vj$koTioAV3du5i^5(o^UUvFsa<FmKn8)N
zO4;vFX<G;)XTl!F%_I%zpnTPm_SL=DWd|r`KX)5=AO}wN)zxf7*)2y(*yVeXlRCRb
zb$pEW_JY&tS5>W*>?swZZ*o%I8uV*?GCK3$$&NfR$L69y7e08A*%hvtJ<#(!r1CAN
z8d;t&#_^+M{J%Q-e9i}Hc}cB+^rX}sM;%iKhQHK3??snn-VYR3YEM$-nqw};ZaIgd
zUU;b~OmGzco_PI(w$<|Q<>hvcx*=!8<Lz~}wy=@-`0dBgdnT>mTh&9Jn7;#4l@xs#
z4BH%ZUwwPdpdw|vxnM93m$Loo<4tOM7)zvc&a52J|8!^an7k4@0v=jGMW#tv{y)cH
z+?F!e6tjfF6_mctanaB>RJX?QpRTR`@E769SM+R_Dj#*SjCWw4#LPrf4tEbzqY=99
zQ0V|++y{*GX+Yz7tQ#}!;Ua|gQ?lY}ejl;2l)^nLGgTbc8~PJPfJ<GbqWFNZskXf@
zheQ{dLdCNl_;cStkxm8h4pCi#e6O9HACl!im7OH%{|KKRAZVKY&ZWd&6oP-&=9=(M
zv|~O1#yFb=st&~W%Jw%Md}jzSy^Tnk3%sv+7YMK!03Xc#IAncfrkRCgS`NtK=GwPu
zm_ya4eWYBQ`^-k>6*a5MhTYVAL^FUaYO_1bx+Z#L>jQlfR2%@j*9eb>UJ38QhIW63
z*0Mzvru|XvTw*y=ow}*RUl=E)*9Vxt(L;W_Dt2iWi&%v%*iTqFYp#K7kT9sg&-5&L
zGQwps(Eso5u<o?{RA3--#ux{!7q^I;svU=%rNq;1*va3k#Yn)q^hZI7`C-wBMS$>H
zo4!N0QD9fv^w@V`(-m)g`91JrtPs*Tth1S4ZHV{YTn>>r>Y(4<{?2q%@$GAx)DZI?
zEB(zJm#nVX^9Q1@o<lTOrYMy`CHGb(H%m1rmrCeUQGYU}05qKRX2LXp$ZXP}-&}Xj
zp1yU0xL=;^(wKIoV>c%(SDqmja@X>=#JOjUA_eDpdAbA0eB*|1->O_q6T5OUAS`cp
zYq;TI=A~xZ$jf#5gR=7pseSzojs0(=5h5As_&0aOsLssbZmSU}M%c#A++k%McRlBh
zU~L`64bu(;<)Ie7<jYTR1SAQ0x@d(r87by8tDDuO9gG+s<GqSuZYrs;8R{o8l;mU(
zO}G-gaCkC6O-|ryD1kcD4JCeM$<@Jcw7~nQK@{ETO1&Ry&IF+=c~z|45l|=lrh~29
zFVXOLp)!-}EkXOcW@(GPeQYb-HAhFS@(^vJw!Ir%vQ*XnCT=M97PM8xLYrz2vWMN&
z0hel^^Jq5*tqRbjFQ~T%c0IVo#NQ%_6Eq!U)Y1b5Xw+`Y5B4{B?ZO=>o|$=i1&OVk
z{PzrhY`fRXXxRB0ty9Qv`gWsBbeqa;?|ixkl94nF>en-awlf_5vvwdpb?hXRhWqMW
zI!RDy(6pOMxv7`Ilee<<gk1lL($E0a-sLAoT1Si2?l+28=aSvBN^s=nMBr4p^sQB-
zgWnVA`tJnmTCHb532{?76AxI^$Qi18x2SDefURK$6_i)&iz%s<c*>yH1|=NuvH$^`
zI*p#<?2Xt*E?CmtYaJ5-DTaJ{kimwuVq*l+W1?^b`m_>?4s2L@lCDHi61)!C*DI3;
zWoEFwkN>GFOrmFSsH9>5p)Og(H}l^2H>tpnzDHX0BMiUTWfL(XfyXM}?*+*#oJLMn
zVD1mbPnMk52hA5Mladi2CtRo6de41$9U=g;#iwVjERonc;U7&Xyzd&Ft!+YN<yv;S
zWof#yl@(`pcs1fvi%bBmgdcPK-O&R5FQeM(I_zog_LS-NLR*UGrD9$Qc6jyZu0_D_
zU~x&0xNnLeDIphZBo_*Q&C+qB1~i)s!Cb$r*;!(X&C`et6b_ORuE*ZV$Von=&U{<>
zCR@(~6*U-+<`p$K`$~7|kJ~CBzn|b&BHOMu?+1n9C7__!XLMyO<y&TDP~>*gO-{`w
zYIvm>OH|X3{L`vIa8+DGfJB=!Miaow`qHRHr6)5kifcbblt~E;pjX&NXaGuNRWdp-
zbJrS1H0&p77HMI$9BAW{&it^qh6ErsBtmSBp$fSPIU3^7C9}i`uQ<y4`9bTsh_w2T
zrs>?IIahAo8@(832D-!lka+bhjB)4rUn7|QATW23359p>;2pV@S@I}n?gE&$8sTen
z;6G9ZYdae^CSMu;x1_PjfTzgqq>@T^RJ0`pj1dkJ6u_?NV)u)O*!~RW4#qrFbX5C`
z0*rX9;w}wQOXc}qMa^!)IrR#Lsn(e8Ui;9OPuoseLgEl9u@hC&yv&}<3O#n}BG9|-
ztIC3>mCD=ZAZ6KI4-IEP0A7|gUdqlKBI73+zFX|a4-LT-C9ZUQ+IPE2^RP=~{U8JJ
z^y_(Y>@AR+6J7@`U0bTv=v2MOX^<0jJ$c7eDT{P<H?uf%D2L#MMsI+C@cYvg^*#QL
zQ}9?XM(z@=`($r=`<2==#@3(gAf?|mk8G=hMO*Cy288S;4E1=x&w2zWONuaRjxR2S
zjneQ$N2hd?ngWf+1R4fX&6)&dOC5*fi8}8DRm&+xS!1giMn&V(H~gT?qMLIz(X<Q)
z%!%JQ8Cz18AyPW{*UxR!9r9Sz^AimEmLU#l+7WUTx)MRRUYT-LJtay8_mT1Byb7ha
zZ<nWAHBXXJEN_<p_7+y|2-CU>Ww^EGx-Ef;V82nGLFijbyZH?Q!a{NcONh-s`roiJ
zXBEcv%4JNR{t5M_9CE}{OdIk^4E*rKoM`&>h5DuWH84dEuMih3ndx@-)(-a?i=3cJ
zH+7Ebj>nS<9>qp;amm5x#`*sk3mTm(>kwm8Wd3<#<?G-;>zg^l0GqxeZ5*xUgY-C?
z2Ff&xtqf^)LQ&TKK=wcZb}`p|<;AUvqsZ41&cm>pNh+L4+%ZUXK*w~{jWR;t<F7`K
zFEvCKbqK$_Y5dMLhl3`?9iX|mAo(?J-F)MS`-1^MErHq_7fBwB+Q5B6Bz(I3jWNx#
zn6>0WcC`Tr@nKu-CLHMTmed;}-PBXNhI%6An=wb!)mynXcoJgi&!{)<CQh6pY}oF?
zYwMs3nKguG)ob5(dZGq6HAIRwaL;z!TG_1$=<FLTZ0WtWyy&oBneQ(28WL`jU5WE7
zZH>*hlbCbX&p8fgPd9dTHlOO?8#)M&@E96ydes53!WP2QUi#Y`k2?JRqqU}_rkmnS
zg5iVvhDmKj^|Tx44t>`8s`i&_ng)nhcFfMgWu9$?tBGA+_L2?f?Tc%OTUZWVUY*aS
zUM<h5UKJg(hPM5+yO#Zx%xy1rb@jaM9cy`8fonldZO@rHX8mQtX2c*bgFAaxgFCyA
z`d6T%s{yq=sUEe1wIQkfu0E+_zh2d2PN3Rwt;#R*IcIN0pj@_L;aO!3*RSNcBB=E_
zLu5~&UbS^#tx9kIU(j^-e7TnN`+ZIIH_?^Nm;DuPAiT+b#Ja<SAEn9i*a4a?3?Lx@
z5L&ql#Fb8wh!IQL@{hd<eu7!Hbbzu4;{Y|DZKQv>^>DWhLWU;#JYm%5lSXg-Yo%`J
zo2^&!u({y8#f?8;9QxkX2zyn`kh;0SIa}7J=+-~gp{*`y%alLKe`YhiVD`lU;cC4y
z`iGaF7L%aDVBt^9AT$nnO)72z35KJ(EZRWH@N}1GP~EV#5?nux_XoM09ap%>IG~e*
z@tX-`3nz?j%M~tX!;e9+d!}GpuwuLZv!L8LPAp|Fn)Ik>{X6{toa&eX-75ja1@_#9
zdgI(pM$>MbwV{k=Xj_M`I&s8sKn`S9QBg_|tEH7gmhAIqaq|VKL+l9)^jeXr0YE<U
ziM+{E4wdH@5j&8zLy%~8j_{sk3y|4uR5!gHx~eKl*509eJ`FYV*?~Plt8E(}5-Q}n
zr=A(fyC24peJ7~sDJk!vC*R*8VI9Xk7Z+&{*FC)h`;=3>pax)v#NG)#$|;r2H(@L{
zh<-U@{&GUi-9)#wGX!mQmZaT?u`&sg%)lJnxe7Ax7!;?K3WlutiFsSr0O5oY6f5$|
z6$uC5W}Ln_idp~4oXww#qyAyms8FA2{$gn-CLLy{&a?Ao-bUA+iLn%u$pG)c$gRls
zX|Hf~V!ZczukJKuqA%j7pE&M0$ya0+N#4`NBPh3<qE#>j0Rz2cr%nlf%gz?#6?>qj
z=V5l|!58Kulmt<8x1Ni;fSXZxFGxH`-tZPL3%*@vh~=AqwfkM9vu)<$NoQojYp>?f
z#K<^KG->h??<nijTTuNDac)MRWSg6}t<EjV-1KgVevcp*qqpKjJ9YX$`R|hZzpXD)
zYwG*EchqUS-$YRyp@V_;*B>&_>JjYNv?Zta;pL2qe{bfsJ%Kf=jsHR&yu)?8&RsbT
zKc%8$MaUU`hgV-<mX@miKNLCqQ#rXQ%J6cbT5A6wC5m8Aogk10zWjVLj2%Z}JdSwk
zkJHlE3Gq@5gC)^aTQPrku(``}4g4c$=6EpPFGNc49BKQMoTp#cPzY5dlfbrcNz5+d
zdk^nZOHx?O%R@<0C^O;%kMP*`6PnAi<PT-k|F5F!CWNY@<Msm{DSb@KF!68tScS}C
z8PnM1WN&oZHa1ThyAcNFbG0LShH;!;Yk7UPqLr-~<A?C->!;*zdP`-`EERd6!ppP5
z3wgZVdyN2+m!3qUaQDx*V-1K`jXXachxNoJP@`fwZ3vPm@r~DShBEJO3k)5EpGcp5
zXv})QO=-5`sM)m7>eb!zR-9&r2-H^}|Mt9hT+&!++WVu$R$;0O6+ji-41;z_Ail0k
z=>A5P$qC@kx5y4zz0h?pks$K|+sCG5!r(mHm?cYvP^w#LW<`MvM9o!0;vZammPIK0
z+nR^CA4rwk%X+ziI1W||me4Po^&pX~=T4iJke7(VNSF+?b5TOV6po_s%un2K4qIWG
zzt}a5X%iyxa!E=WjG6TI;~dfraP;=la_Wo{u?FZGE3wI?I^kFy6y?<bHu=9Z=#|>G
z!&n1huh7!9lTw*YuRn&ZH*i)fvC4nv|Eg&W>-tx)2>$%k=;(x-I+-{*`?;m;=I%Lq
zzPUALOI=(lYL(ZyQMKvh#BPAN-A?^34cg(Y?J%6sJWO?Ts!=c5?Nv6!Suu#zCRlB7
zGgPzkRkPyPkryVUVnYF(gN^*j|CI^ELjozEnq5N0U*_1xOyYmr!DEbQ@a+#^H@0OB
zGr#;w{|d~Ckg(Fv)@+OaTZ1#jd<;w(wM?*W+s^!zfx;d_3JOoX&_t)PRTnoM5v~b!
zDJ$i|tk|8mB-55r`<O^wRvT^Y5IkB+bjW))2IHFgO#}9;bpQbfmh0@KV8KS`<;fuO
zWwOdUf?4tSP)X167N_ik>+|JBYSSHt`zU0yT!%}{=)3<ZM+zBX&6P<^fbHd-z9SbC
zVWz3Cc#+=3h%~(VMv9`-JQO8M{MS{mc8lNTCm&o+o&UEIq1VVnqvWfu&{2YuDa$KN
z9%X-hj{!;gIfGpw$MqsOnrTTG{nsut2J#do4jrQ>*U|)Bu2voY(QvA)&}3kNQ;zLc
zbR)@@*azj}A&MKMY|nq(j0rH?W@%3|+yQxszH*tXa5z1tt0r+z?I?D3!U&lk$%Q<{
zX8Q4=6;Kl!uVv<bU@C2-;rK5!-4j7@I9sS?!J9}kHyYi*e|w=Xs`x^-q7X?Nh9z5j
zFsj?9_w~l`E}N?*<Z2B_np>mKqpo@)NHzD8<mvVwYT5Q7Z&4$uEDAP0awM^0Reabp
z1y#_wGj-w0us?=fyOl{mro(vM`nPIMqe$7bMEn_E$Vw@)jNOMI*bWkf-65=)A?!j8
zo3IDv>iGlUe(^uSOrbxNzMU`)AWcZ-q+fcfm?csO&f=y_r@bCT(L$Jx)N`Jt6@H41
z>T(V;tF|_vAS<3SeYG4I;<}~Vr4tU+@-&Lm5UM3N&RE-(WyNAaWkgEtZY$Shj;8HJ
zPccj%U1#KAu76~56!8;MUtBotbi9<j{ThasRa2jU_026oC|@2*e|s0D__f&8iM*|i
zXavsma&mJ~$bc<eg1B3O<(*8Z4?6UmqAlDYQr1=znb~!O)r&*($R2FnHSdAQhw_Hy
zT~x!1;eGWNkC4?MB<lvOY15ZTfFl4_v`HF~_a_0?Sn7n~bQ7*(N`L;O#50F4d|7Lg
z1CJ6|LRSb|HZ7SPGE<InKX6NlQG-F&m(z=q&ZMXxB{w6+*^F&Qi6iPje=tj_bF3Vt
zP{q)}^x@|Vf!rGAbi?#O?5~wQrMcjtIzX2<M|p}+PQ@~QLy`jhP96(2KwUMFr}`Q5
zTVdWPL70rt#jdd*qdwG!|D)HyFk<?&5UKzu>m_T{L7E{Z^T#cNJ;|`E>#}nQXwurt
zs=1PuWfUd3jHD>Ep6xpN&V84Y$>{XrcC!~Q`_D0BTz34u#o$zcvJrYh<yXu5#OeBh
z>w3Mf_Vg!l4@3%D`-3U40g#Img&eD4qPpQBd3oSn;jwKWvi*nN3}QEHv8c*!RU8G(
z^ce!UnG~fV|2Iiq24SSLW;vs;(80-*t?1EokW(eVX-Zg1>0ubqqT(0(DNAYEO|xLn
zsjc)SBWFE&EE2(%*W`{Q4(VOcRCO%dBP$^;YETEX55HI+gJpb1K}3^Qux+2q(l@A<
zY&%YW)jP>RQ6|uEY*#i^*xe6w0BbQ-AD8wk%PSX^88FzP*ogR4uo^BuBQAret~6Ww
zI6skoY5()$pWACgf^Yu?3#kaqfwa|OM__r{Vrxvhh`g<GtoOdoej0RByU6Vy7&&rE
zwsFpQ8V6O<$9j-~7v`c)b)7JS-;k<KD{;li?HD&pF&x$5kywgzL)!2p0fN~l&QSiN
z4}2|KR1j6*b~-~(<DD6|PSu`Fy3ehGE#0Fqi4uqkBG8*T!ig9COk<vD06rIz&o23@
zTrwmrWGn|Bvw(?jc`CB4fQWB@DuOZpw`>3LC`J|d&QGpT|NM#Oc{>Qgg39~kWeA0W
zOtsVY&;k{Qjq~;h?*gxTAPv)^5z}T<#eZ##KN6ddc!PburM_)B<@vinTa5~DC+Knt
zN3eh6M#aUe$lWOW<~y`UvSk*^t5~Gc^Fpw9iO64qhGiu$LCa{JA9{W&W&~i2=ndK;
zvhvvr>J(d0NFxdoS3Oeg84iS(n^`AkCR&+I_2(E<BAMaQfsXI>!0dUl8X8M+-xyb6
zc(fgbE6tTnyL6>|n8urQdm2V3!T=8R#u?IC=~BYcI)|pPI6CHc>U9G1xM+NvC0}ap
zsIs2LV683?nXWx5c5ZDj&dXEGco;`-G}Jq(oP^U9VJQRFAIAHH?#3(!RN8u5@pQQ%
z1i4~s6<rk+fv;f?07k6W9pZ!^vZT<Rg3D7Sl;<DeJilZ~8z)k);Alw^CxnWd%!sQE
zmXfPVNL&7Qv!f#@In0~ydUCz9NT+K`F<7aFoTp%R7#gFYXvi>A4LKMcM6hPHd@>{w
zYgj5+#3z*sHFS0Sb-uL*>gq)*V`{SMQV8a$tcw_pg!>*eK<KGbD3J}vi>rb{0H<eE
z*~?GUSfoFm1;oqTi|QU4amy?t1nr3~z|Wvs4sWOLElT%GJh;Cw(EOSU>|eXnNsck;
zmVdrWAY^+8Y^x)nYgtfDy5Y@X^)iLv97@{Ow|Wo^x@(XWl#&n=iWoqJt;z~UPP7Zv
zYvJpf*c$mR0kx$?&*^?I(VwZ9LGdW2AAql__08+#vuVekzlP9Np5=#O-3xE#TvND9
zm`gQkJ*5Rx-oJpM4Rt^I0`qMmp!KD|cv!0HbH4n*RJ8R4G{(4F>omMhtt{9Ozqcll
z>qYp-Y$XEmP;J0(x^@}4^|D+z%dd3RAB0VBLm-t8T+)%*h+*2$aCy&1k<UX<LgJ3d
zom1f5%tlVlkGm$g!|$9JA#@354cptG?A*;p%*_kYd7qWJ{vaZ8Zw$Vfhwz#1!7y=c
z4C$Zma2@JF5%Fw{aw#A@z_lU&ykRn*?McC(SDy87woYuzt`O{MCbFTgJKvcm;G5BN
zx8Y|5Je+O*<M(b3nMdH6?MX}Uj@_WLp%&cLAFmXAZO)lD@akzxWcFNZ6D;`HAh3bl
zzQ$@ps0w%TCNcHTPq_B9Ny~5MCp3@{AxOHR`s*3oeZjOWOB37}-@Rz71|zfMy7D&!
zofqRPbSS!yI9IW4A#4?-Cj4C#q4yxhEkN-e7_;X38A>}JLjRMnZ^T6iJIF$CfZykc
z{nOxnEaaZBD02Ue=W}BJkT*y^D2zC2sXC4hDoMJ;`<`2;1nC&g5P>$jarjTNBTy~z
zqG&fpm0tD2zR5b?$5P^~p~G!+ilB?$DY#)DS26l1UY8vv)9i@NdAM4vJsTV-UN=$z
z9776~=G5Iws)1ZW|EOfvc(3q8IV~Dfr6U=|-<5Xa>Nq47+qHYz4zt9<I@YaBGj^zi
zSwM>iOJ{*+G9xdpM2{zHTSixuIwK@#CStTg2vuQFpOk^7Ya+eoE$BXq<We#tN~4U1
z;*y0}6Uwdp(;tMd<Yr7tyX=og^}^}_kd)Fi#1?+Nq>)0X*Mk@u+AAT`)P&Ga_sE|r
zs6MG#GFP3C^eft`l9`W4Twa9{ofjY8;+vp3Uy=BAu1FX+EF{~w35g=HLrIGCC;0FA
zt(BN=0d|8oDya(gH(kuXV~;Ze^I{B^WErwExg-|Xs3^Hq1obQ@jTs=;Inx}0mh$5q
z?E{;VF0_OaMsbt~?GkMq>vL<|VTG-%3lx6Q1BP#5LJ3U!l8=kOmKoarg+^RBim_&H
zY-wayzSvu3F+`#^bvgx;6-EDH_&z=Ql#+Z2rBvUQ`N`8-6%o>XgmxF5uRmU8Icz_~
z2=K1T{>B=u3G$=wV9rB|<!Y}0GSvMbDnOH0BENc@!JH75Fv^kLKI?b#DYVQl@(Dx4
zLyIQoGT>Pg=nkbtDh8HpA=`@!c_(PBpd;l~Hj48t!|Y)KNSw6JuEDo`p%c<{)#2_U
ztmhp-dz(=clUHmjzL4{tFQZoThRu_{gqZ?&LkQ<!2Gw^Xf%E>&tG=W_p@&GYZb6dT
zMiA1SAnc+0x#rvAJ5rE4N=flosFlFC*35a``npGMgcX+!xpTvImBFl$7Vy{!Y1`;0
z%&*056NLX1XE<?n#8AcS=pI25H%uyG)g(Lr5ZuWmp7m+kGm(l$4J0~+=9se*v~(O$
z(ADYODkF5Rxa_d(FzoAq`ZYWGE)??9HS+Qu0UqUCrAj7Bhm}+-%a1J#in#R@Z`i2<
zSGZV)5?<x43UvJ>iV-`yW*T`-X5wwXRzCE>6!1Ac;5&wX1E|mwI}Cj~G^oA@FLZyd
zahy(ay!k$vMpp*nzey!aS!;?J%-~##5<zY)rmrjprzk|MwW(Kt*z3u^Jl#-%q}pkP
z`(KxvXqan|c*--OrNAJi_9r}K!Js-bX^5r~jtZlUdOz|x>Ll7$wi;YKIxQnPn@qe~
z<t1JWxv@k;hMj;+B2t#xQUyuc6CRod38VxU0uQm!Jg@sNJRv@L8u&gow52edauvqd
z6!UZhSb+MG8=M8GT`QD&_@y-xoyu$f4|<l+?FO7#(8oIOg-O}p^il=NqIROOSca+k
zA;0!PDD=DbaYV6<P<4ypst@|`3Yf2dDLOAiXC4eXFR?*)4w`4%As#O*Ot&xFN&_mT
z5vg@I@?k)i`ad}K>6~y3$zMtmG33e;36=qyne#*R=_t&AOdLCdZ8uzt+#{J&T}M{)
zIqPySDpvjK_btTv%%fF#^rpsK8E%Mzm+an?;nU-v8c<oPAf=^3x<7R*CMDIOgj=!d
z`;yPU7^bV}ZeYW;&1GwFV&2iUnKPq{XC(+RPn~)?aU<Ha#c)^CwIj{z2<~L64<3LX
zLS7FHpQaSxpB))NrkABxdod=s2~2Jw{+1@AD)N10{SBwV#2<Aac=YfmH~;9V%=aDh
z<l71IbthEhU5ny`ZE%ELi|^M06ucghoI5ORGtA-q&b--oGzT<Yuseq@;oQzHdgm_@
z8m~SZhc97SyMOKr{UHJlQ6fff#oi`}p@1G*j!|M@R>>Q0#xtr-=XS~r$qk3kygr@L
zn~Y0kf^aYx#{5S-Z%~*sc7yp$F+0ks$+p^U2lD?d45!Ly6zXZ@RKHSQ-Sj(+mYpRf
zanLa>-+GZPG`xD)NJ%tq3}JbpZX`!*bL_v-&!)KX_h$;_(b3TVz6KKSByy08z9b(g
z1Fe@lY`r=<T>^4=;<Rm>XgL%Pv})>B9S83&v9}1ZLLb^RQvdw2T-(iK$Y`NCcHwc#
z%S+@^6Z}g2P>JX);_6XCeBy-Ee@{|)>z9jo!3kp7U66=SjKu}kk7QF7cns<F{ZM&w
zGb1arXgmXJe-g{@dIA5D=_g3H5+qr2gA;UPmJAgj_3vsPN_it7x&LcEzrA$r^{1Kj
zs2YC0)xS^n=h5muAHuxtkyAJyHoRrxJ1_w&>K-n?AlJ%p5~DU9_OVK{Dcj{qCgli9
z<%BDWfH-ZVDj_R}gC>`zgG1Jk_{}NLVI+}|p8Q8C6$$=wp&T%1r)sBBOZLga%B3tZ
zt>X)oWA?+KFe6D(rGtjQqlfmTsMl#&i0Dtf=Qt#9r&1m7)4zvmPlM7n6jwp7f-WVI
zS54a|AZ}XOtJHVO3Hcem`QMdYp69egC37;pSq8>0)t3UiioXI}$HGd^Xw?Zc>~i>H
zC=u^4%k^)wxrYE_abr(bs4FYvLP6M)Da+WdFKDVDN#n`w;>rX(YzLZcr=Mdd7K{*^
zBFH29ZIS#)HY%Ewn57Q?e}fsFfr?AtjZPez!P~suBUerkC9B5?h2qqMU7H_1?*3l^
zZ8_bT^tilyFU5;XHnUXaw!ytU(VyA%Rls%ks-(~#kev2#nii1ej~k})h`ff4igW{c
zTz_xm(^SayyU<at<20^|xipVNcz;T!eT4YnfLjiCM;VZ9C1b#J<~-)hE#yeuq*l+!
zcPP(PiJ6AlYqyNK%P^k`K|VNG=o_yGH(q>!+VWrW2ogn?&skF_n{_aFXi88j=gje%
zlWQ*qVi~CUB^Vf^f*3G*R<~e}0~rlJnk7EyQplT-JTv5Vzk8-=Hv|gpE!2WU<WJ<;
z!iM}XW~tEnV}|_2LNXN<@oD0p-RZem%QOTpY!-`@J~bgEF?`ckvi=b$|2*XMWvIEU
zetyLKv*`Tx$4iv<5D&{n!H)=Q`A2lJT_sr>z>$AxDlc9_XMk11k(!?#Pi4?}3>73Z
z_KI*ahWs2NMHZ1luv9s@RrU9Wyt@F5&=B8D)W5_p8quGCHR(SnW}_FnDM$MtSosHQ
z(C+x8v!a^8Ug(k={YhV!1g1B>!tC~eo;Sb8cbBN+9YNFLK8Vd*6}-zm=qfWx7B}4y
z0OHkIYqHKX#vgU(XJh2)EkXBoKQ8v8fzOa}62`NL&)P1S|E{^uI&+BR?bm%++>INl
zbz)ymMPCKef4d{LX0`);DcoM9mg?S^SD~+%K7*)xcS*0RV;_>uj#!xqqpeeVJad8J
za~@r-?z>Lc=3V*Bu8bSp&eVoSBGb<9K%IWd2cO~Tt!dtFm0rgO*Y=IbsLA&ttB>7+
z>*SAs3%Y(pCo6LolIb@Yj+QQxPcZ#|LL{!%_uB7*0t!CU*A;y^-uyex^d|Iuo7TFW
zD`o(BTHvx7yuxA5kz;yW*9h$qQ8<Sge*oRQG#%n?WY?H)DXo2?XS43?h>bgN0KUOI
ze@<E~u9h&5CvWEVeE?}Lk#!vUvzSY8K#Aly#;PG>^PvLEBQiWS4eFZ$G9{IV8QBV2
zE|a$jB^}$lr<a@&RY!~|?6@O-n}Q8&`9O7s94!k@*1vWhxq9QIPIIB3Cwj#2n0kau
z1oIR&_N<DQikze6o?;#{DEjySfAwE?2u8~Fg$66D6X+k&Ix>w~pHxkybes~_0*1R{
zIT`qh{p=FE)s&rD^lnzL5ThAT9fLAT3f>MT7dFeSn5fG6j#F9SP478DI;P8%j2N?F
zF(0<3z<=fO{@g0E7D6o;29pe-zalTjp`*dL97M`=t(Jdb4`W;|5oIX?BAsPZ87H^#
zRNjpKv{q+2h55$=@%eqQ1bt0nir%Ddw^yLyKuG>q<%_f1sNq{fwuwMOn%=u1k5{nV
z<-1{{*TC+bFEE^5(h;XySz8SN>9x0LDC}0;XY31WdUxSK{uNE=E(qmghZThL8)MIV
zFjRGS^uFVR*zMspzDE=&_Wk0VaRtP0zcM;p0SoBcyZW>bShw4v$rhj`ZFexmA*q?2
z#KOjhAn)eValj_L@4K>YrWVOHVu|y8Y59yJ9+LJ_?{o<JeRI2sn?C6zR@RcS7l*)P
z7J0gfe;)`W_YIBU5>bLOP~5hh6)xckx+G<QjQ>17IoExnPaUu;$J8puSi-3eZ=bks
z4>r_;nN2OpfK%A3;b@l-WavcR`folsGPQ}b`2SFK4S|(3%6ekkwr%r-6HIK|woYt2
zlZkEHwrx9^*vaJO?%u!XTK1}{x~lqve-`Pn)J6pu9_6u8B(SRO%v1Ux@W{}6jJoyw
zTYnB6K|ZlCi+X>kF-*9`<|=*@K+G=@lNz!QF~#kxSM3|1zz&mQsh?`CpJJ_BidX{n
zjXtR^15%}rIm7b1=<wsg@<Z`@F}ghSWABO^l%|1@b;+h5n)bOc;W0iq?J6;0Ro~q8
zn>>P81&{scpk;ThM!iodb53d1iB*@xru^l+IQQG0>DDZ_<8=20Yh_F}ld4)_^}OQl
zC5;G!MG`}e#r1FTpd3QCQB$*6T5CLazHhrP3NQw$WE*+-lr_~!6E1)fmPa01mM54`
z1kFJYOw0fvW+3Qthbw|q!vg>CyVs!x=g&SzScD!N_l7l$bC;S!)(WoO!+LL(-iAZJ
zlfjhPaV@{tzEhnriDR2s31!{{#hiQK0y!@NH^iHii&HxE)?kW~_+}}xw)JOsE3MdN
z1n_)xxarHA^+U*L;{?J{Jc++hnQ)#a|J4EE_Yo<)XhUg(!(tT4?}PB;r`ZucNJvkD
zU6X5#!kJiy;uRb-FI|IX_3(!^3{0=BUCtW5%`*yvrWG=sS$-ObC2N364TAIPa%ibu
zg@OR|FrCVb7&ugEw=#*wqUg=iK5ob^9I!|lsrI!L8u9ekH10g1Hw;Qr1(<Ql`pR7`
z4jW_5!I*W_6H<Po4Vk9Vf>-<D-FRh>MIRSc%hX*}GN>}+cqNUL_%j#BsT*iZm9>M1
zHm&Njhzk)ELTC5vIv*iym*2NjF43?j6>&LKKfgWl=4BSNy9ZTY*S5jxE<%9ZHgFc5
z$j&)@cZwvCE6N(<J6t3qwP@-vO=Uqkgo!fWg|~{#JCRIcz!lv`>tjTj1UutLV{ncC
z2}iIZwlcTeBDYi9-t2nu!#x+((j=T=0_D?w$6Ru1ej<1h%pR2Llzs1pB$1kS><?2k
zZy&(}3FSg{WQE1`E)mwYXCLeWvW(suE0f0Wk=R31yz5Y7PDt~E@s9sHE8VqSvn!DA
zNGo+yr$)R=B5eVdF8U=OtTv+hy^i?%eeHaZ1ubri?QWBg-cbSo*D4lAasi0jma{{A
z1YTas%72!VA&3mA-omvXy7~f<>Qu6g#}izF_RgJD{90A%mA5<*`N#%<%U{Dt1Mv{J
z`D8Cik;G}%Lh4pM3dyb0%%5*L1LQ4SH^m3YQ$Ke2;BY<J>fBF+?XPu`F;DU&G9d~&
z@0CO8D4>a+T%ud2JRrQ!0Zbe^fH+>AiJ_}<U{3koZ}PCHc_F2tKRV7?KiviGAL0@h
z>pre}MwB2`I@h>Uv4XCEx}a;@rlYyextUy8vCqebOeY1~-T1@a>cL*P8<<ZnN~;Uf
zPL$v3R0OnjPKg>MXmmWRn#}EFalGyBksT`6Sfw$Izm0>!h7$=QQY?GIKCv-JNUm^e
z&Vpp2pQ|N8+aXD}n-pd`5H0V#EY7#$>%#!|wNq27nFtp2+C_6fdF^`DCd6PA@h|6!
ze=j*&u4v8YW;RPkHcO~BOAM>!MPDUqRp{;&YPKq%W#$gYvNr0roVk#XQbo@~UrF0w
z)q1h`zI=zC?grZG!ZO$L7S~%LMrF_pZ7DR3+iW)OGx4Bak*f9IW1ZHVS4qMAn}DJJ
zC6@Tb!oQR>WfeT&)j3u{Z>`8WL*GH8boSAGq0-N*bN!}LLA|ikqkI^9j`}BDlPhmU
zk1BDPPDG<^uhUCg|9^TcsD3cfkAEeDc0tn5ZDmRRIb@^dnXHsVEG549V&}JS!^S3Q
zg;8F3M{vxiq!-RAX1-iwSd)0Zxj9&c#a$7SN>|Cg^PNfqlOY@a79Va8Na<$wi2|7>
zHUiPrQWF<;E6i}?>4bjrAY_1;F1>y5*6C^D7U!4HG%8D1qMt=b$`l-}Cy-iTCJC)^
zxL_0s6|ubamETnZVlHuq=m@+noYa$C;|XGpaF2Kg_*QT#4@dVbvJ5)aW3x(s?5PGE
z2*74PW5ebFN9L3~KsgTFEcUK?>pW2rno9PtuW`7SHzN8iu^#TS0RvYM_!V2+YE1hY
zSD|Cu6EtI}dcFJ>C?_xstFPe2!Ny$Tn<Z|!8Kj(2^;dE78Z1{SN^k-cdxSs>28at3
zYYQifR^v*3BU23@x($&I4dH@7>^_Wk%Io2lbFUPj9riclB!w66)Z>)O%U-m-g{b2L
zll^{MqMFZtxVOXNttV{#_)|fP-QR5A&(ExupVbt{wDz_RE^7#En8lS<jWZHzfFnDU
zeCL*3gKjQ$`L*^1EhKdEWP)Q^B+P^Hn)(-Dr91MB-K0I9&VjW~iVH5kj&_UHV8RtY
z%<&g6!_NF-dX9?|p7#kQeS2hf@Ex3>55TRKGvMgq8|aQL;h|q}^ekr~#nl&Ui;A>Y
z+BOT|r{^@rTF9%QPAN!*$cmAGMzM@V>JZR#OO>Yn7FABvMqI(|VHmqzu#m$sg^`7Y
zy0QqfMIR^lV1#iK!`A}k8Q7;${ym)f^0W$6J8e(oj7`l<o$v01#K5>CR+3rs%Y%-Z
z*m`F@aGDXKVr=n=9X!)m2FG2vJw(jAn_c+p1UK8YCsMMkb{fFJzzaE`62^^Kg1%1C
zxBPWu!ZM#vF1Upt?^o6Fs=u%}^<{yDsrJVK&ZkA^`DZMC{55UpKgYHvgPPXO#kzPP
zr+m?asB#vI!8{JwZaKr*1;wu<_;Ss94GvOKD%b?jDA9KZbG<e=%R?|`QX&BR9ZzGN
z&)pY?`_Zi;`r4Q3itMv&Vp;i^Numq%GX|?PHv+O$t9`f*syqk^28M|4O*gXrt%eST
ze`%{f6g2862{b7qtzJ}QdvBme)qWkY8Y(~VwM%_#AtU1Qx&`<l*fTRjcJ1me=e}}L
z{;a3k<)wd${f6!pCKxo2+#EH_f{p)%8XDXknviF2U~`(o%<{mXgZ@Tn2mkqlE6gvL
z4<OXHJ`1yo{D#vU>=&{EpxO(XwZBm=B|L{<?lGVz=C-EvxrE;{FX}fT3mF0qhof_f
z7kZT~^9IgWG~?S1-`ddR{pq*uotnbcOsrq#c`17|ILGfOv&ape&d&su%<D=DLK5_s
z=jCIR`{xmh9K|QfvaD&&%V9vSY?d;u&6`@3uHBf)m+;CS974po%RTHF#BdXQ54r94
zT{BU20#wb1RjYVe)jm}JvUPwLof;fiDYIU9m4DDHLWOQ|JzDWIgxuVp$j#nhFAP$8
zSf-PZ4Pan!L`7nu0p2LL@ZOMOlejJ#JhYkdno;t+mi+c1cx|mi6Kof_R74y(_bx{&
zTx{lU(JM}xB0!Aa=7iO`J!cp(JJe{h2@qwZc>VpM^a=Mwflau_%^tv0_RI@2H+@Gf
z^T4!vCp9Nr7X(6S(4TZ8J^Vq5|IYiAP<=vxR596~Z5LVKJ)?&sq{Bf=Hyl$SilMSe
zK8ci#fk~E`Z}TUob%Q?S;6xyqELrD<rC7(zAo&`f#mE>_wd+%Tm<+_~je&&u9LW)!
z%u+7?dHD?RSXT!57Dzy4F~Lb>7H&!Oetbo6tO)s9VV6*AajaH-myj?qu2S@&Z5IV3
z=(e@bunx;2>6q#pvG)GYT+Q0m&1$G`Re7g{tK)uz<NISc>T`(GxvP1`$);Hyb1e2G
z!Tu<{k2lm6WyTLKq5$wGDs*fJ+2VMeWG0krxwsf{n8*UG$O0f&BXZHKM6w9f9F$SM
ze&B)5scPPAg=n#M2<EDryRwVC(uL2Mi}PUJ@!#ZeboZ0LtgKsJZHm`*Re83Zjpr7L
zRLVAvq8H&>6@851kh6@b;Fcha8UqDUU>2}K1(WK$9g>m9m&sX&HuKi-p-w)sJkiVS
zhN&v>{lkLT^Fu)7k9|Ph?}5B5Y>=!$sgJvYT&BCAAq#AhVPT&62%}1<(hV@se*qRZ
zfwLgLtwt#QAzMP+bW2}<-GZ|XT~sRT%<yAKTzq~L%FdY^O4jf~i~&IBxG%s*GsEml
zw=5ck^v)B;y{diZ9=$o%o<p*E>c}iJVHIb!Hq?}iPa{y`ydu=yB1>$B#U}LA>)`C&
z1Qq&;68=3=@DBX)4owkDZirC`hSZ4lry(qQq-8c-Sk7FQew1*mo^}C}{^3%MR1ep8
zC;?}`;qpA*mLS?@)@Rdqx7ro*|78c-%VsP%(u0$tk9<$2J<u?oz(IhyBqlQH<caSy
z0?KHA3>+zVwesMkaQ4Jen*TK?=tpEY)7IG&pNN->2)%B`^A`9<&x+$Bf1aR@L($1W
z6EP|EJCO{vaF|VrX>h?u=a};)9`&qWvT4(96)HL?E0O(YYa%LB;(VzTE(VO^-w@$W
zsa(YbWDJzKStrb>Vn*|;e9H;Vi4W)*X(5a~IbgYGwZsnVKhd+HX6zb;*cygm>&AXT
zvqXm53VTl2OJ*h5XI`y=%+$jBeQ3Hd0}4g8#I_i&OqGGmG!xqchImWOL|gL$p|zi1
zwpCxvby+T!0l3DAW`T~B5IB4r)9aHPYIsReWNvC4_U7h_J>$8q53+A)u4%^&WoxD#
zGQfMze@R!2Q#s8(cGA;ljH^6+1t?zyvp#tEVhpa~sJZyXBh8Xp2$G|(>tZ=3*#w()
zu*c+>Q8%3)Bw8N!zkR9zAGm^iXUC<_cLytpK-Bx}3{fQ6*H19GPN?F~6QqYPD5OSC
z!)px)*IEMab4G4($#_4|$M4@im;B8MS3t)zN0mJ9RTR0n1~joPcGI9a7$_F7z<qod
zCNsl0K`huon?=i$0>R9nw@XoMI>t~~7OZK^``O5;u=}ARW_2AzxFJvtddz;?eOe9D
z>QJabj#^P2xQf9?1uDDXt9{5-61za%eKT%yy8tpH7JQ8V9VFabK(9?gTZ3K)fm`&X
zskN#5gsD`2O$mm4D>XLbVt0dVIz7Tw!%c1KOHCFAo!qiD#*QPx)<Ekbb;$?~xgthZ
zm5mrSsI$$q2ffs&IBN;^ahkOariOT*B0U1HuzuB(d3>UE{)5o_f~*0?t;8L)DI0Ye
zh9iVhWU~~mnurZGNF=P<xL__x0PPixqtTj%#T3nTzTHdRBTizLj7sW6It@C>-Ee9m
zv0~zeWQL{d!X$&yycL4IoS<k~=DjUX{djf4Uv=bbJ!e;Z25dmqY<loQ3>wrose^5n
zQMYEerfxMD;~=J5sKv1_M&Xl`bZOP#zey_8noxLPMCYTyE}Vq_?6M=&faLwOyZ*6?
zqXtQPz61rxrVG2e1O@S9(?KgA^FG>C`40xEp2eB-9HRhU+b|HEP3E0B8eMJdktuiA
zpDUmT>23NYE?0*5oI4BerjU3*j-8c-JDF&{Nu-DEPpD||<DCb=bc|t+V~|57gA~Ui
zPX$SmOV(*tq%$$19Bkc5V2^Ts9C-|Im4AP|vdvBcHdD6k8fCoqJk}O&&VT7HU!qQZ
z9|1a?i$webLvFqs960ba8Cz8`!p^0TnFXDG9QG19W_D8gnt+F|e(-V;os@7Ill=?o
ziog_oUWNZR=!{V0O)N~nTqbF!@;*sMW&{KifO4Bepr4OQZy~@0=t0-M%-P>Tt_N@q
z9_panY15vsc@}2-Fq984{$2Zk6T{dsLvQDT`^)v0SF+#|*{h-e8j^tHg)ACq*yFyy
zBGz?5^~(?5NU+n#e*}=>1EqAay(W(6W)X1;l0MOId&;d^K9KI=Glm)5kiWv2@+5o^
z_=di>su#>{%r8-2;EjL}t)D;9;B6=d^l+C5ZXA$z*mZ)P{kb~H4ZH1Ae%<hJd%-q2
zgD5knwR=EvRnYnN2&n-zDW%ol+d}5iCcZ<LbtnTjAAY`3K=>q{Qu`cnL=xqsI3d+S
zO4E;`kz_sZ_mIQou0xgr7M~8*x-E85kX;J$9V67rl6^E8@ZaeJiU<NrcB=N+w%H4J
z4q|W~GOLO<-kAd-0p#h8BJUrfxGA&eg*{Vinl*63Em_Ghd<WXdjm!W<I6k;fXwLQK
zr&<&hKEA1l^`v$iC54=NijedLGm^XPkd6g`DS5K#;x_neF@Je*n+ZO{IhZJWB!x@D
zcAT>ZrVwyW;0s12`2=RN8<PywzYM!deKREmgHXZx&4SX{mx)Cb;O{Bo<z<`XReZj{
z?NHkjX1=I>3rh75`&V2!`3r0IwTKm|)%doIG%*jRcD$<__x^Nno^VSI8M6^;&Ty=E
zXSzJ@95IanZ>;x-27bm|o^{I$vuKz>-_H5sl+&Pm;6i?>jzSul!&Uv}kpaq6fn8af
zoF@U(W6*X&xpQ_k6j6uT#*?pDjGM^;g7l(=`5}s{BgD6G*D4SQ!6=_k1%!RSv5%)j
zh)0!-orm(AM*<YWnE!;M9Q!euD3Z>ky!$f)wnYj=rZBjO6+VR(6lnt9Lq%c_CIbe~
z6mxMDXtPRUyGrJ~i?9a%G@-*yo!OsOkMlvA$tKfmz*A3QO`%<fSkG}mzfp_27W<fX
zwFbQw5R>$3Q%-NdW=fLD6t#L(Po_=HS65+T?pAd<ZkM{X`gsTc6i#o3XX36#=Uuy1
zPvxzgT1!@s^e*;fsz2&?iMN*H%LG+>P>;n2B=N@c)3lOW8ySuFMbLg?`#ttg!kVYo
zBJ2eARtJlJg<$3}0W9X9Q#^|bBFFHU;V?Q+e>#aIF4hEFjHgqhV;jD)4%G;5%b4Tv
zr&DL0nmluMBF3-;&)n*_y$RnTyKx-<hKHm)mtZ_wbdXbOTBr+j?7ZOPCp0SWfQJAD
zkYZPG_t?A<$A3xGo1iLv$_-E*tJb)diM%`)$rHMBk0$To7dYf~iY-3oq@hjFQmR3>
ztP+PfU_*(|`4v#ikTn(7(wKv6m^N@x?Ouzl=h_uiVGwsgpaa+8%DO;r{D+T(Zcp*4
z{k1JNNbK`$4~;N3NHv%0CM4?Dw>88uu#x~b%oSEShXv_4L;swH%?_WvXCCgg_%`6R
zsX@1Y)!wh*0COR_WeRvMRjG3zjs;FPQ@Z?mtDHBFeJBN8c$@lK^@P2@VB4O2O<qWu
zaShDaX+s-PbV0Ca&&|fthJhu7a)=GI7sm2k2VhMVXs%i<ccFSIESotKY|2ys>(WqM
zq8t^2)6Qxu&_Rt0Vr%Rt&OL}+lp-0jl;yR<Hg!HX9D~2TJ+hyxf=Swig=qcN^3308
zsN^tHX`}DY(3M8tc|7(kMDC0?PyX?i0;epQOwty>Nbdh3{ICH*=*0{NBN^d}*Ov%Y
z(1X^|i{A2OL?4sM)tC;_a}rDjjzKVMFb3D%!KTyK1g_m#wF>KjVU1nvI(Z7{kl6cI
z9K|?Pbi({ijoJh8gme4Su6y5s(LT~upt}x8JM5}e7X-f^Grh^G4Bk0}wVkdRp5a)w
zRiRM;r*oBr7Ui^YGhp50!=j22?K&5Ts}kIv&HaAj`HG+IQJ%XpKTCjmTs%UYtM;x9
zBtMFhj*)nE0iAWH)~gzcRMLLzaUCGFXY%dT%?@}({y{qd<bWq^TE`TksD1Tt)O}DQ
zmD0Hfc`J5-orVxX+&wGM+m1BOtW<C`WC&#&tW`;GjP|N4%IU0)Uj^oam+ZfHR`MR*
zPF+d^t2Q&_akl`naesk%QgMGZH};uv^0uwdiOAmif4}|A=UXuXEAJUWTx~Q>K&q}y
zdEz4tfwAz{*f)CiaqA|C481Y{$c5z=MTNTFWhjV#t}H#fw4)OJKBe1J-aLOKo~|Oi
zB0yBVH(VUQ5OO)k&2LwN#Lo5`?>Lb`uvIblPlyv%s1A+)U<(Ew;aX7U1gHDJ!XA2^
zGI0sF`9L0z$2gR2f~$|28&WL4IBG)t8e_Pr+=Q(exAM?kHsY%UEZpP!khSzVwq+HK
zpJXKRX|S~=H6?dw<ZVt#jHj)FzhZGpcTX0Nsju0*LUzb@k716sbiy;M_u<}CbtTzQ
z(9bW_gA#^WKezxZf=hOhv}|cEEuE*(R?qvneLR<ikT)!GReJTdhLzWBpwBv>*`cl;
zmXHxo-cBnTyPIa6-LbqZgyE)gwyM71IM#_)PP!e|1)N4U6;?vpnbO<wA0gJ`I9EP~
zJ}|Vu5&l#BXH?03PN^m8!b%z>@NB;l0w3$?cvmn-YBGR56lJPr%V-i+gcz><-t!Vg
zA?#(_q@U<hL`ty2S6B#CJ);0V`QJ@53l}E0&6W4n7-xmntKmUz!ho85cc1H0S7KQH
z#c9RW&p-&dtj?xYdOS5^7k2;6xZjroqY2jlx`-fTPh`k30JD-G^udv0I;l{g^Wlg?
z_6IuV=nSy4web(+uI|ktV)mwCUQ|{1pH$A3O%|@I6f)Z$M#*_j$KH8B3mk0dl?@A#
zWqm??jW)n2kavL9M`nxUuZ?>+UNMAscebef)m^{V>L#^%^arTV9d`O1-NQn+Job8M
z7Z#HCrtfVnk1P~>VZhGaT(sl9WaEb#eqa@rgDy}2&Q=zIXzoS|p^NM*r8d^sGp-K*
zm3(Q$Uem6Fd$0Ncf8X?P|GpI1__9b2IK7nMxCn63O=TqJ9DA<63BAT%!o!o5o>6~C
zrAPqMJr8#}ngaYcE?^~o^dH`+D`*6{fj+4?_(pn_`Y4`S@a;)++k*JVP|#HTFMCae
z2Xx>Pds;im8F{Wh@iWjT^U=$fKG?SlZ8D(f=34=@&>3u$s4refM9NX&4!m$8Cokj!
zLTe&vRxMl9`yFq6!|Sx>M<^X6SqjoHt&pq&rK~#UpBhkRNtjk~=~itTjdIpK5sXk%
zT7u<rX#TwXo5t}#+7twBRYafM-+drU>kYuV&#uZn@mX1@%C|b0l-Aam1(Kl|SL6!@
zVi#);LmaUORkXjMPIS3_-f8{FTY+W1M0eevBsKQ<^?_PcI1ar(E%DtAi?r-OCFILE
z^H(cb4`hDc$Q>B$7p_vB$QmB7MHc@;y>~HkW<W&8T)bnmj;Tg$&dTnU6vS1KBMJaM
ze54c5H~MCP#|}#Joz4Ulnz4$Hz%MFK{s{Q3g^*ipQCGHCh?=o3fB;ia$Ab!nz?4YK
z-dWZdKK+J#)fMVGBRlaRqyQt{4im@nSSekc6Np9i%DTY*$S38C;E#J}+M4ROW6O{{
zoS+8Nlwg~OMZT&C1iPe;nbhRyhD-$F`XG=uHMX@3eij9Zzm==idOtE9gcrW0ZT!)<
zbN74Yw|!gsiRYcdFh`ay(tzHNxO`VPVJI&ckcn7~C%?qS@2$gucf4t#CC!^~MuEbY
zmHKnxKq$7=+Yq)9dN{)l(O+6ndp@_dh{_+HufTC}%xV-&;fkdEF1PFahkz<j@F`jp
zyC!niW(mctOx_{y95k)G+9Bv1lB?XvL&9~0a2Bk&BD+>QrB`nW?x}3sK_#Uht30}>
z%#R*`V9<;^s#Pvx<BvNTT0vqHjXO?RZfFyUJ6)|zwra$YxK$)kCsaOXQ-C}0R9bh5
zz!BS3G2BqIs3{>O$DVIxwTT8au)MWNwfQ0D+wwY0>`ow772gBeFEQHnyYHztBlQNZ
z^9>Tdsn8w@ad11tFLi!HzxJ0$P?;>!rNF{7e`-OWN->5+tTp3S9gl}AF);J3Frmyg
z3F2TaN==N3EPKl86YGp*k?j(6t3la-F0<@2N#$FQM;qs5gMD>sSW^)w@MmK}LM!71
z9_D?Om@cX~HL207*|Z~c-?>xBRv{akY|<T<ZRze7!>w0+VkT1j1)N`+D!$6XfQl4v
zFG+(TCt6Y&Hx_@>w#9z=whY7q-M6qfsK_iAG7AR96_H)JAvcH@tG!~4St<((<NO0$
zr+x>lf~15(#Le1BCvp_nrX<EVl0cg3TxijU9fhh+Ib@^J)-6XEAKaj8PRVp+iXM(!
z!KwCAzIMU;*S|~UC-8ZecOUZ!tI^FCSDeViLlW_>4p_pM1W0l<@di!Cb5nk!`B`Kj
zqJ0VPn3NB8vlL=b8r56EDAA__dS*pvQt>*gqYG=hBs!{`CejUT$A_#C>ScC?kX2GQ
zDrsAX^Og+@2R479Ryql?Kkq}Ec?D*kfl6aDZ*?vqDCC%NEPd~lNlnI?=nz&MQ3uy`
zbPCLi?B@^R#GboK*N~<>dm4757*<MLhmkICq*S;CZEPqPmO@Ysm`z#s1hOSC)gA$@
zi3^c2$+(!*&Vj%j7q9kML>HIrVIq#lYFp6pisOZ!58&Frt4<hJ=C5TX{KN(dpB!-C
z%P#VY+CkRK@bZMWz;zc%ZQQv48Cvj3OAHoy_951bwhnRa1cVCiy-u!Fm1^#Nyslg}
zO3%5f-ALt2N=(5AAft~lOACaj`1f923iY_bOPg!eFs{ID$x>%qYZ;B>VdAEsB0FYD
z5c*r+!UM&QUR!y1rTG(!z3Z!|MS>S{s{_-<l)~It)p>`>Ywa9poXHtClAu?Y$U|r>
z^yRvg<iKTdLz<I|M~yacf<gHR&yFR)Dpgv53Y~&vO|ag%;c1nc=dI)w$$(Ya$WgM_
zM8r}**DcUW<Jc3)RE-W82fhn9k^NOUp#8w{QKV6_tf%o4LNN2q>B57|GT6Ja$HN#L
z=c>Pa1WjjE4E=bRk-lMF!**-r%8kr&<d2{ue-2Ao=nVc5<vX0hL&PxuQfvDWM2Pk)
z&tHDDqU%SD)$V>RL2EjpmfUYdj%w60qU7{B&n2*TqqfO5%+3l*t2?XoNY9^bsX93R
zN^B8JGEy!tb7|TtPIV#(Q7u~@h6{S$#ccL)dcAMly~2%*yLSH7QCjJeH0Mf;!EW!w
z7FRVsx9I}{94M_%1y?T+QfS=0NT?#r6jY_xmwiXu{bj9pQ-2jon=pFc)iNy<Gis~`
z(hOu&B4wy!r%BMPKI|4PvpYEXK0s36V(=zWl`3wng(&TBu0gO#OrTlI(5sYsY2h<O
z%2(orLq0?gTm(mILbXAvR95U{q)RJOVJQJaRGN@j7dKXyb^=fz8QmT~nMJ#x3YOlP
z<q7;P&xt1$!a5lRKta_=-1>gF#V>m?+XD?-qR;v|BZ45I?vn)9>1*B^*asOGPIxU5
zG9!o0p%DjoOmZ_7f(IOOxZvHZ8DjMtcq#o9N}@E#d#AtT{e7mtvVI7Ofe?y=_yvQ0
zU_-pXz}_gM@0wHh0&{=F<^AXp1Mz$OQt;QM=L(>WT_7Mx$|^Npg;5`=&B5!NF9+Ix
z$wePrYkP9pBdr@(8=aMd-EL)>_iXqNGkxT^dzBK+V!fb10P%eTa&jYh1N?fKPQgB4
zvlhp|o933ho2s*&7ngVknr;cUt`J{K*3Jwyh6soMe)~{u;6p*Ah&_N74sqT`m1{z-
zyZSj6guF0sQ%v^4JBNq*!o1@;bpoHq9G5iEKh)fJ`VI|LD#Dn~1v{v+^IGIxbF`*T
zI6b0pQ3Ub*lO32rD7lwBrREX5wQj*vq8?Hy{W-^$X6J(FwWe5oA>^!IDR84c)+CmG
zf?*(vG}QVp8)gt6bLus%d!*~wR_dwQZwanz6s@NySrC<#!x*W7R7{>9bOYCj)hE%b
z^ua0<7=r9zoEj^;Z_ltRa^8g}&UY-JM0#=kom~2{c~8|rRx$SO%U?e{%x-8~iTjzV
z_S3{)j#NL8P`Yy?nWAs#%3o4Y{8TY|c>8P0SR=_k)@l88gZ1@??89&HDqiF^h{K<l
zi^fm8aJ~+r@DW5h=Nbb}xPVkQQE1~2(%e9q{#RE-qP-TifjL?-p?>=X_*i1Q6<H8p
zv}I(!D1Bo1A&b2B0`W_bs=7WG;hrM0w{POWHzH^j>8%&};~N>#%Z?50tS}E}z`Pl3
zo|YS=12bTN@CRaMm%w^<gSj$53jn|GzE{v4#Oeo?6PCr;t99@B0kng@!;wlO?t(h&
zlDY<X3C#<U>P9|*6aq!xi08xN839@mE<E!XQtG6>*k`nbam2ppXU0<MWWM-kISJJP
zxwnw>O;YY8x?zp5XJ}HH#J;FBTPHMyEo8p9X9k5AB)xusb`Wg7@CO{|daMMy!FM~+
zw@Mrnw0Klj{*;<?pmoEZR7<YeKZrB6!iPUrh0X~^GKWo47jNqyJcS$ac9L(MIEQ@k
ze+Lh+;{W#FF~oOUK>DU~Ok<r|zw;7{AA!0P3xLIWlQIP4Udt91B&ZQ*g|A$T@%Gdp
zaA|n^svER<Cv1m3*vB99`5y@a-jE9QcVCS?{?QfcA9yp>YCOGZKR0~>5)c7i-)|KH
zNm=8OG8dWMG>l<`u`ea)9vkxbB7A|2ikBbY@<2VK_X(2o$Wi|=hnVViGq5^OD*N@^
z^aZCN0|pNJ;|DbK4}^ejVGGS^n>2eqGD(n&v=%-xA|R4aopp`E{A1#V+YQmHrd%{j
zs8FxaxX0hY*z|ZQsrH?Nr%mTyzkWU6uRJUNz@W!+#50CCZB-_ARbTVQ9ZqSh*$oJU
zfd~x@gQet<we%QN;Horcazf<1A_I*2l38t_APt3$Lh}XeL60FYg}1`n>~Oo$%7kvP
zo-f<o>jGW7O#jqjtSREN7CxQBznYFbgEDCuO8uI-WHl-8KZ5_BDtD(^xAvVz>|PsL
z7m;JHuGi<4|Jkq%{lXr`4Rage^yORS%IuHK3POl`x0CxxqR)oTfFcuS?_o7y&=Ovr
zOZqEcvng)693qxUlxcP6a4x`sgMax(B`ku6;1h^FTV{LDi+K}m_^@B#!mn-^1)GZA
zsc@szM>okvuP`uKXh_L1se-`v#reNDvtq7--J81-<UdhvA4XEro#I7d(}dWD#-hTQ
zr3L0{cGT0{#&DmnzWN+D<7y+M_DvTvf5KItsNU957TZV+<IgqM>GBeklUgYl{aZN)
zym{2taciy2;`Y0AN-M6Ta+V|6pl#GZ!k-ho^AtNMsB)$_^>drL8lKW^rj1@`S&`f!
zrAt|Ip$XytiA_#O$`;K|L;MfY?XBPiqHN~;Cs3TS;SnXHMK_Zy^GY+urrP}503e$o
ze(KpK!RAcof#c{a7#J7|T77_7Pi+ipnKY=JUNSd5Z&G8J)f#H6G05kE6t+5qBD#+r
zT6Xz|Hamp|>L#>4CBlA}a!(~66HQfSQ9gfDOg!SJvUo1qI5x?&L9#=rAE2?APJMjg
zYY}a-I`#wdzgZ`<!CsZdCrAbaevQS@1;Ks!e^4K+EkIN|qRdZbda`wT^0@=;YV3c&
z-<HQ9bXpj61P}yNm+T1En`NI5F31Xh7&x6>*2}tek<p?}m5rZ9$wzp9lQxu<v~kXT
zDe)O>i@RJ;E+W*d&{8lLMBebS6!urdO6VDGSeorfKFjWs*V@w7G7=(yuH--pCw?4)
zv```CRPL^ab=++&p;?J{KtN2(H6`fM=(I)`mNlSY=`4A(?suqf5O;b8bqPQ>UiC}a
z{PL*gAt6JXF)o?}tB7_Yyd&ptLvak1xym?Un0MdNb9hL<;Z8Ednu)iKIwK8Yi)Qu*
za_p)I(kG-F1mc%{im(vii@J;z?$s5ynt}PlT&`0h1c;dn(~V;F=Qa<{27OhGZp1AB
z3HB2G1$hf!+yj3^uG&Notm#=DIqi=M^R5Px$rotayAT-}!vBi7B~TKc2js^O{50k{
zRI1cOGW4{Xb{2#*XJIlLpbv@w1}X$muO!K`WUvJ_^3>&D4|lglzb_A8u-RexaDFWi
zPB0r5mE+~ff{0n;4Ax8c7y@T5H2Gq)Lyz`FeonQ!f4S~}n0a1`1w_D<28Ws!d3I6X
zeA)bX7TX~bA{2bc=%!4lm%8Pe_GIY%cBG-GY=yN^0(`J)w_XASkV~;p@ktBIiao#6
ztEj0_k#v6Xo%ekzZC+lhzK>}CDZ<?oOFXnyvgNr-!fl{ib5%o+wx{~F;mU(HH9zu)
zHApiK@7L<U?2QqBp7Gtqp2~1+-lw_9C8?wkxF|0|Wb&M^dV*(3uxYu68rV<)R_%!m
zF*&_w{cSMp(NYa0MdagUSArqh1v<cM!VrujSqS96IcX}oad48>BSNMO+)>99NB@VJ
zxFuIFL)^S%(X^DxsW8f^GME?{f=tUPM=hN@M9XN1+q`u-JQli3ba>k)xQb778AW(e
zBl-ApV1MgDC8JF}kN!J}&G}@yYv=QLx~oCx^L?u2htdmsbeci1BOwih@pp?6#kM!*
z4|Zop8SZGM4wc5R#7I*Cc9t0Zq~2C{)EsI=HXn>vj8|nY*^LB$O+3=rP7dB4oJ|ZC
z9@aHS&F7ggd^NL;xlL>{OQKA5rYr6;agwQQNdd7Ru#!5}w&8`d8=zaM*hK%k-g&^B
zT{k5WH1|(-`bc%4B7@MnwMC$y?hG3vjcve*f0$r_Q!8aLSW#yj$YjpSc-Gvx&_S{g
zJeDb+H{E)sSxpu|g^2ijdW(fiZonyqXTt2P`iI<1J%sQrW5WU|pMZ@_|E`~(Nyb)r
zZ9B14us0o{ram{g9E?{*{b~F5gI0l^7hdw-)+9wKL)uQ(vxc1Loxw>wGV6+UYQro@
zEc3_#ru9q3jcpnlFt$elri-yZ;ooiBDd&KA%NX6{4$i7HKaG?Xccd}wF^5lh1**J&
zWIg+#gPe#S00a)U+FC<QQA8SmBZHgj2nei~OQv0>k`{xud5}1fEJ}Z{az)^(6V3P)
z6A}Sz<L1?!oJ32CbC4Mrc@gU?51wGsibj3oYcb4}U!txAZW&^bIv**NPPjy^WLA#3
zsXWd3J{)Y3MdMU=*`ae~1$O;Qw`nw8T4Q`$!@ADGm_wYSy|4e%@qug2K1oZ0L=~F7
zM8IcLhB(8YL(%lFfcxKpOS3n!VY;8&tw3Lt*?rMaX2q+hrE9gq^o*P3Ey2s!UrTgG
zQe)F|k#=of;8^2nw`P>`TI<JsrzRP!<f+szt8%H7zbY_2HT^gNaKIj_8LDir{wHn(
zflsA}cWl#<x5~Dy#*AueZw@+de=-I;&&tEM^n<WobPjUoV;3cdeIN*7Rj}oGuXq#}
zN&yq)QJP?m0Q<s%*ug|2t3|2>BH~V%OHIQkY)riZ@Ei&GTO14FhE}gcvmcLJMD36s
zf$T?$%cC<{m+ga3gmF@U$FB9P&<n;P6Y&TblEk{gy26k=J$W!Oj3LRa9X;y8sA`VN
z{?AG#OxpsX>cJyU$fpgs`Ry)5G8~e(yLX=wWQy(`k!7Hm)E6PjC)D6$7<ctow8$qG
z`J+AyFz+ig`X8Uu8xi$6&`9+Q4)1Np;StDt(kbqN0>4XML`N*&<ZDFI6{4J#?)qn#
zcnEzS=TFf~P-`T33<x<(5J_TSdapQq5;<9r;vX{UKIm6)XaF<e)ge#B0sDwlq#<UF
z;sY5wkT~og*ngV<1^&OOy|fQ;GHW1!QxiJVK~beMFqcxN9$X=r7*?c8MO--WTN4%D
z(6AwMJ?qCCjiB~X1C!$H9oPr;M0N<MSeXj7ezCb%`}@PgS;p(@#V(XTd%a?#A#tS0
zX41eXH6byH`51L5^JXkcbh%X7tZFoim>K;DY6E<pSp8_O$(HN%Y(fiuw+65xxwXYA
z*=FA5M0cS!D%5=JF+m9>Gj(RRMadafhu+&R#d}|O*_G2~0=)*oKJ&w~Xgv1_Kg?Tm
z<HlE>u)=eN?jqj^`fmrG=(9WimWx2OcI<Ap@#<T3M)o}1&`=Y72%66?cuvqU<Vbbr
zRErJd)C*>hh+{+6R|eyeSq7jw&~lA`fmv8iqZwXd_1H~9joBnpAT$Dwm~GH)3S$Ms
znWD!kTrTt_XN<Y=Z~L~J{0%Iiylt_RyV>N1yIJk=Ww~?Dd88El`{Uodm;4xbLti4x
zIEUp;Su<|*Mmub&>tLNdX37e$Taxrk+8*I*Rz=n#eGq^U$6T~u7y6AhUykpKjx517
zyOkYsMsQ9y*LeNX?Va^>iZ7bS<boKefZMB7tlC-hh{>@k%XWSMJ0Vt>Jiuj*W(VNZ
z=^m4ISgu{bpNTQ9(eKT7S*&vGpF5GhGWjXTT#z0}ckd|KSV=7$m@r^Wh+xG~OmC+3
zC?uMDw`R?cYj;y?TmwCCE)P#V<j@9@i@D(_LdV1o#=-wyPzYcJYfvlV8c)4RC03j~
zW%F+uej%_kN~3&Q6q*0FL+@H+AV1rm#V$yZPfUPE@&$Rvw;8dFmNKo3Mf`0Y26;M2
zkvPccHTshmC>%~7aGRi56r0K`s-GuISKt~vK!iesKtwAfVhCK=+v6qe`f2Y$WCcwn
zwWR=UNp!mk0%^PxAM1;xV2(salsCSHp@YDRGs5wZ*z!kr1Yw*+{%cBZo`(FOHDn|C
zieO!Rv^$Re9jvh<nBrEe6dQ1wA2`ZHOJMnq@ZYq5aNqXg1pD#BAL_>s)gM28*gKi0
z=}VKT04;x^86x}XtrawO5JOuDpeSfpL)e#Lp~q3GE*eEd_^mQB)w*<STy{4N?id>x
z?Pu-Y_7Uv@=eh005t&MFC-~TAruo^fColh=)DQ`QU;`LqxnoBXM70RP9N~?mtOk_u
zA_n>`0zc$WxyufcV;A7pAy(XnC_+<J+P|v-7{oI@o9*uFSD{98>oCmd8SHWlHu4nd
zcKXvBLuD`@j|IO|`yNhb^2Rg);lp#rbx@9v{+{{wUJ7kc!o4q{nE+oTciYYw)LtM3
zZS$@oGgIYhf<2GOD8mXC|AXyJIiIn4mFVrVP3jBy+|w5aAXF)s1K2(e&~6QwK`#Cc
zoJkmCT8p!pK&Z5?9%0i)T@1dE4iwGs##!sYl%!|-^AR=)Z?@Hj2X2&)u4-F1I@{ca
z9jYM!J;BpQ2TwMYA~AJ)c)8qaoQ)R|_?`|q>I5Iro0-{2_ICqA6jiXszV_VEb1PC`
z*UdxKjeFiP^-@#;j)0NQ<aE`e07bJ42m)3d>kK(<yeSNc<)Xvx0F#EG(-*u*>1u)?
zyH_4-4Ox8vIq(3~Lk!J|QS)l<F_243Z6(95{!&iV#O=$%t+_?WT>gaWyhg$acdm+p
z2TaK(QnvJpyUjfwV-G8}xioka4@5Pq7g)L$&A&c2ql=xs!5y;HyXuqY{CN=o?iUNV
zipp=Jwr*)u&n^C{nPbwN7pid!93QW#BKHlmpz&7TfX27>iiD@7$fRZY^V4>#TjE7$
zY@CC-_-C?H;~I8ocJAB8RdSlf*6gHxW-|eu?jTCzym`*L)R#X2`B_mxLkxWsIawKE
zCz$t^$EJJ<rN}*wTcVwhyD(HcP->pnn9Fl)mnpb8ksb+wj&8LsF!fnsIAsr`)O^uS
z)i*HK@Nop}iUyst+O^_$aMM)ncGWrRGS@&|AI7OPMH$7T$t9Q(?XnC%c-Bv!Sk8Nh
z_Q^DCc74NnpP2V!Jo*fKydt3&y=|*ArH!Djn2Y3uK|!O$bw7MzINehcIYiXr_-pz)
zqT&gJdCAf+W`rauWvpk#>GxAHCQFtF#YRz^&q3!##TAxI(lu!<I@ji;Y49;NtqZRI
z7Fb{kHFjy*hb&nLFzxiNxs%@a2|`ow<upjBkLbWD2L|)^y7<Bo*vX~M)9X`9Ps6kH
zzmNBp9T4<A+|k{@07djgR<qt=aZ?NgoqkiWngawddm|kNdmIluG}=NF15|Yvoh3)P
z5!cX%Lg?Vm@!8CY73@YQjT8700+gHA<zw8q)Gdx2{vi2NV4L4mOz>Oh_2OY@I1Xg0
zRv+qff2kmuj~>i20I~rUoS*jH4&NCz!>zy6a6(S~j$0?qtrKI_#eah|o*!0cXZtDg
zz^#e1M~N})a3kS_NQ42!W)T+iH@{O6G*~G0ih$i%+lgIUGqi1pHZN)}MM%w$^5-^v
zCEQ25HbJmVAlXC`AADL)AXre-6+=kgAFZg&>P>@De%Yuzd%ozu>f}2n*cY+nV}}(R
zUj9`hI*d_r+X(Y=uq5QhULyx`MQ)V`p|PxO<%V>3t@+aKz}89@)xZce>{-W!L3T6Q
z&Hl>R$OxWJ<NiKdf_qBL+R}sA2nrQf`pnj--w_y{z={I_v<i=%L8upn5lKqHVJi5e
zuRKp|d2-NqyV+W-<-d-<SU0_BcQM-2`53nM!+0G}S^lv>NpIY<qe&!R2b9B~5Do;?
z6Gq}*6@!&};_9Sw1?!trAJe|ty-O0*wE0CbzL+px<1Z?tBtYY$v$!=n!Tu@(rq!19
zbcHK70-fk7<vdwdSi<8>#@u5ES@Ms<HPnX8`914sgS{OlVS*q5z=as2?dCA2uYjLH
z)<UmcbWacdk0|f$zhNj&H<RGng(P%Gn?5X)5>HjEHrluI7UtTBhVw5iQCdn;$hEKX
z)7Bp;RT5W%Vv{^Z&Nv)5HMS8ijC38W>iQ5PfzGrtbr);-W(6wBB3;f-e7EZN9DhQ@
zcl-xKyAi!DN+iRUMczynrY(NOe84`*++CYn$kCNN^2jIJHiIz-n_HTX?(;+{g?))K
zy;<nvGgx$-u8Ch0Hp0Zn6~cB%75NRGiJt2Nz4(1;yP$kYQ{+AaY}7UYJB)8V!ju)J
zK$`K@fw~kp%^3elFhVls@R77p4SmDjH(bpNJb3M$d;{MwndRqJqfdX$3o3dIAu1j7
zJmd6#*&}c&U@RNvRh3w`N=jp-)4Qhq>dTs)q8ug;U?-y`3G^!tgf&V{0}-$S9tb>I
z_b>%0e~NwM>7)E`{)h^}@J5t<yI&~CApigCR|n}Ym^4I1vOpjh@4`gkf{fnXW(I%Q
zG;(p4B@y2O(bAcwV+;&P2~)+=+*-p9&&kHG_nDraFPK~;H~6a4xINuYs<3Bc>|Q9R
zCqr~g_+jSYJ?iTH0_<u-@=!{hGyr8J=B7e?j7ZW16m$8m89WhL$u1g14(%vgquXir
zh^`@Tv-`lqgC{VGiMbXhbTr;FbDtK#obbm8+Vl^^^lUnpt)QA_*2&*O7c+}7zEC^4
zvuc_h_h^zj6EAoKGz{;}qY0i3w02XLQl5=tyWzyl`R5DI5r(3{a>mvZ`pD$xUU{6@
z3FTsjR_hBjtEp2wDU6cgVm6#Gn~VH|*Z3gxg{svMR(GIl26#|rslcg$pC&N3M3#!f
zO3UYF^#_Kb7OSvhh;~ptugKqac*(!A)tW1=o7$WA52#eLB7jP^haONBNZYA&2YeRR
z>lD{IF;zc80l?PpgX%+Yebdt_2CVX8ij6ibZ4P|zIaUM`A?1c4D@`?E0_Xa@CB3?~
z(VA;enlDg^2AfP65ZW|QtT9*C3YjK_^Bc)*nXW<M7Iz&TT_yUUIT8jPL$<s%hz4V!
zwPH6r633@_w>xs?HY89J!+92CvVyrbH_%v797cv#{s113sgEnuB2$*2oBv*=U}%()
zS91(Wt)XZbVC8-Fm6(=iNu+1!mw^|!cT6XqRSb;XslI^~azK?QGPDQ6$hf}`&+5WC
zmJU%cvdR>TpU<U@Qdk#d=?E5SV~`G&iLv(Rr{+7zb%+smjjV_dCk?g(>drK<8L8|o
zv7a?Pc@$kIk**Re1*IRs>FmAoE&PUjDJHu*eG)Y{MAw*==*_4ookQx@<`VE}u7(Z<
zMS#@>3`|+F0IA%Tdt+++3O>J6GH)l1EJpmN%`5e78aY4BVqLHWobn+!BQ;N@Ryr!{
zEl%hyN_g^OLq>g^Vfo5(s$SA2uQ04Te7g#T?%!BVV?Yjbt#Gz5_B)#;!Z0;)9lMK)
z;Nwj=&Gwd9REy1%sxK;2?uK50g(Em`RG>O~d#Q(@vAIJ4BWP7_5XAB#rD;MnhKLtc
zQ4x#0J&hNuS14ajfIyM-kD3MS1c@u_P7!C<4G{Z%d;y$k<yC*3Nl^64SR3apfjl{I
zPLxeiY67D(hZ)NLJ^j4L;IV8(A(0D6Qf-C#1P>E1SM6}OA%No>wv41jbHrO?JrLxP
z<@f&hPU#oedY8Gy3mstuowmj1$WoM7|04o!qy1c^Z&>S-z<N{I>AatC&l6c_Q%?Mn
z->~i#)}&RO&&M;0IM$vI-c>SI-qx7dG_S+lj2&Xy4dNAvISe^X4dfe`Ya&Ci8M=jU
zA}zBlO8Xe5NGj>`tSpHbF_A<_rR2a-SH0VtVnC`IyKVj}OY$sQaA1#!@A=A&K@6D7
zLei^lpJrR28G}oNca%a-{z;Y8H<aN&m-JXOt~Il?8C5cEkkm9fH8OJGkl3fVpU43e
z&|herTN|2*BUnXfb9&O5ZDw*>_G#t%dmv6`&IyRp#@QS$75Hny9C{1?cRxGoo$-zl
z7XFMX4}MBHRHa+N+=13gj`=|qK$DtS6*_D0Nk(c?TMkON)P`8)3(adL5RLPuj;i@i
z92CNg3Ws8kddTpT#)Sg7??^xDqo~?`mdRizR=JHQw4LCW+js-83{K_0a}S#D)URNw
zQlpKm6=2(z*P{GZ#yPUhYlBHKnSGtMoLEBW9{5yvO>OmI6fx=_MP1|+S7|2r31Jpz
z_(a6YX5t=%Q8d{g(K$863;6580x!_<)1DExZb;#>lHE$)gvtdtnC01q6>hsxx;jL@
z#*uO=yeb9{Mg>Q=PRjp4dSEm@z#d8HGucY*>EW-5<xEJpk1}xoMMTOVb1{yRCI@V*
zBLN+_InVJ>FH^NgO$bNBWAT9$bd!MG=eI%|P@y6yG2{p-s|=gN1<>?poVw_7c1{-r
z53?jQsl;t4vGD?v<?g7ncd#bRGv8xdEptE_MmIofv}Kr+?6seJ>e1KLYZq^sEou%H
z*a$6Tv`dZAExlq+mmk<&6AEn$?m;yLr6uaU_wiO&mhI!F8zCBq5-7I#9E1_U$j?~%
z#qa9-U}^dT_R1{HiFDtke8cWnGw?|&-qYzN?MD4X8Q)cL0BcMP^KC)B0Hq3qxe={z
z|M+653f(^Fq2to0ieR2riBf>x%Gp;8=9k<<5<WSDoV_*CR%O_sSo<^5f0Ijv^Y6OT
z_kvanoz^D+NuB0zOoo-Vr9nmj+=+22Ik655pr9?yEg{L3Ad?ErgB4=P1W`*}Tl^c0
z^{J|+Y4O@e<RH|W<LoLxhdN3y1W})ImXUo{l5_TVZLR0uzb67=#Cu3tc<k1gN-IbN
z_&!eNXdSNVJ$bJ0bUcqKHCycU<)6J(7)g(H3_T?K<#G2bblRnOJQpJnh--ez;2HRf
zYZ=p%`-J|jkVh3(XQYNVuVk3-r(CrM3P8V&B-^tPfdJ(-wh*U*8XO6(8%_L=nrv#I
z!&<5}I~Ih@eC%?_6(mWE0Es6x{?4|8^YhhDSFdgbXsH&OnwCIRO*WhG3|=IHGl)PE
z*%l-|J+JFZzGkddSf39CpnvFt4}^l|(ZAM6g%Ub0oWF#9Y(Y(XsX@ZWSOx85>eyaS
zNrtEE(EUsKht}|bE5(A{7g|8asswubln8^B*HR%>stZ4*U`HQAWRX7!Fqr)+h!}Tx
zv3TNwRwMzjoUQ<sT{Nu%f%VU(HE$uOeLhqdZ+5yzWM>2nx{K^@V0u3r!His|@Z6wG
zvP&l?OAHR0J+pOwbYv_Kn!N~42DhKBBEm?<4MCmF41M=WwTXux`KIUiu1yfvOSY(h
zxBtH}mVqgUs~_O?Yg1r=<}9UrTAkzi+Wl9KP@VR4%NFDm&!t;D^d+`4*)p8fNO*xd
zS-McfotA!O8ZVhupo_w0{DM`H2inSwL;Df_*Mv;*qs`GeBBv^ZZ4t%3Geb5OCMIIs
z?B2-mVSs*u_P^LPy_8<x-~A|m8vWxlKk7tI$HU7);R&uOsW&QoqPDe~q_%J!P4=BU
zt`^6#zMISiPqIjJFY}ww{NKf8{ygXpSOwwOx6Rz{6s#rz;EC(G5ZvyrlLyzFsQgh?
zq>w|P-7hb+dDV51L_LYcr@2weF)2#OZhzm%l3z-hDnIG^Y0fi+uy)y}6HK_{;2MA8
zd<kO-2=nlj+7=k&W$EX|Sg!SnIVX=IQf3w$UL{NP*pd(bA6Z`+R!6gCO>lR2I0tuk
z2o~Jk-GT%S&It+besFhpx8N2uxVvj`{m46aX71eY-+HRMclFaHUA6aGyROwK6V2&f
zIO4K$7#0gs9Tc7r^M-dQo%}%!QKYs|FLTte<xCOUWURKn5sQf+_63t7FS=S2r*q6l
z1j!q}-t&Wed!;S*L(a$OEyM-{WO9YgLmC!9{Sm#x$3cbKDfn$%ogy=8f^;g+#Cn>8
z_-*9hQUk1&@%7TevZWKzChcN(|1sSg7}2(tLqR}6=);3Q#NyC`jXT*WKm{7hUuQmH
zuf`80+2_YViyg07L)qICQX<=n+mkEP<S>UpB{{)QhUX%OV(MJQeUdqlTOTF6h8l8t
zg3zhf6v-x=o#k*&C7LvSWUrgZ<eTS{di+ym1%ja63?>d@t?U`vB$jpN%MvGJ-nroG
zj2Q*<$#0k@B~|5XClympfv7^6<y<A1<LN6)?sX*-DSU@-44eXUx|HqMXlIQ>If%Io
zvgWsMDbdnybEU?r33walYsIxj1oA00S3)+W0k>BA(G#%85}&!&_f2N&@<L`d^9ce*
zgRGaoOZ|j0kvQ($gr?xpH@cW?5;E(hQ^40O6E>=V?XwS?c{<S;0vY2!xsZ@9^`Q6!
zRZq6{hqZjJS`H$@pLW<4LFwzc$^T#*>5ZcU_LH(>*Y|*$Kz<CGfroUmXFFOj4K&#>
zW<^ekB-bxPShK`GXW|Uf$L2>lTa{<rPok`$nH;WE@~mYjcAfTF$Z6ugBSes~VplGq
zAW{6n-ww#4RAp1B1>yAN^zNbr<-C+ck8*Mm_d0p?zR;B=PdSpTTNiKYd2R+Fs`WA+
z5$-vv^)sQMXcMN=er}FT3i1p+lddP9GFX{$BwH`J&)mFv`^*~j6UaSr3yy5**EoX@
zI{sqroSAv4IcC;br6*<hGs`OwuC_(bIH<<3)t}HNCHyGt7{tVufY@MK)d8H<Ys6Di
zh{6loGt^<kXnkd0#iwf@8o9&=y>PcG2$$Hdge<XLm{PPAIyzE@x!Xvm$Heo|xi5R3
zOcsdK2V0c}hqUHpt6mwn-Z=7hpvinKolCCd-X}ydZ&oni-VH*gc@u(pc*rP8;Z!3i
zna-e{)lKHI1>F#-V<1j?E!^sZDjb>)t*--ljjl|+nxX{4e!H_oZgzXC-pC2vi3s<Q
zzhoXriN2KzFWH>fkWdU~XG~@C|G_?K+PR0Wu#q_u*<$L^y@OmEXshRF557CZrK`il
zHV^f_CiX?LN~AdeLGIG2T2N7_dP~q(*#TY{>e&!}gP71&6!+EMVoFHZH8lSm+MAE0
z`0TlxlZj6h{W;=x)}xi)8)DA0-wZIn9>gD_k%e03<$upo=ZTn3A3@=ZkjFn5@Cs4b
z2`T69q+|p$KR-DqWOrcyT>f+~c@8{WJ1?w{uaqF$FjxI9bss~&2+me{-`mYz)1*@?
zQY`il$_1!ib9~vt60=E8?kfsV*KQ7h3>(@&wqY<o<*4OI>hr=qpA?q2M%Rj^Iq$7k
zDyRefM*slFw_?{E5(2^(27FlzU;t+e08qd&W&k+wxG?|~q^E=>iv1eIY*4)HTvO~J
zrK}ggjFZquh+;FzY4cIfJ`x;!`jruBnS@<H?y1Q~bnAymH<^W?T1*;6{(ZH}xR3WZ
zk5#7&dzataJpy_3F0}lL%m#DewKI#q&Dg<iXJ{}rJ9RDc<-XxY2_ABdeB*#Iwq!g<
zL_){6D#=q=5coVjNNLDJr#Z^VCBNtnE<1<2J%&Oj^t)E(1VcO1SNKL*(Qb<=_nw%U
z^TgU1CcOrde(_6<#Z5)yHZkXABy6z%_A&`imz|ca?Tx7l`kV#_4L*_tU7oRTnw*p;
zrEyHkD<9IXg4JM+kcsVHPYZPHm5+k*>Xx6VEtZQ02yAi*NfR$Y(nJ}cYZI^>wPY-v
z!5Cyx4A{|>x#SkF?3$J)HoDu35vW;mduYU^=e!KL)xeMeAOFA~h{8*nk<`Zj)YF$9
z=()qVpv@ZFbb%j^n{?6FrxpZ$TNDkNTJ!a#v0glmR5+s#n#ZH8h*$gqAiXr(W_5xU
z_8mX~^?4R!^y-T^s}<?$<M0S}4aZC*)V^@b70nZiP%2EP*gZ%mmBtxP=7y|1v|0;S
zoOy2*nmAJxS);TcDs+qO{VsoVk-fcsrb=DeKRS;|ADQsWZ@XP(lBZB)K{rUr%==Kw
zX;p8So1u^tOOpPAdRuX~oXb`Da|aGM+;j^Cis`}E@%rYNlIvRgF~ZT<)M0I*znj_A
zn>CXlet;DASjwCZQTz%^b$CLWrt4Z7e2ax9-2g6(zG-J@mQ7h|3z8X8P&u7P;Bfq*
z{3F+4`b|&hbs3*ZK+%vGja7_?h*E%v>_1~tp*H%cKxhbv00ao|RWX46fBGaY=x?0*
zO`&d>+60akhD*Dm!5XU*x4cl6o)e`2Md3jjQoDS~f+L_HZMC`WgWw>Zk<aB+XZ;(*
zMCP`rBH81?4^YCOfQ;NjDe<J>*h+NDdd5?myXBwx^$8;g{J@YrEPzv-aBOb_uW-MW
zQ@)b{YS!QdTW5$FGC|2&%o+=5mz8-Ifo~;2T(h4EhYu$nIhH8N3}zcS$NY1w=x__p
z&q<YPVz!y$3iv9!@&)rl`sP9t7Q#%b8}KJ8?K&S=LpxrzBqnEv3QHJd-8H8Ga2?7z
z-p)9#epM+P7XZDpjqu<#C@-y&#&r}SU?0D+(<aJrUM`$Nt|eWru_7CE4q+NZ-Vwy1
zhnI<=UD>-qr4*e)S58C}<j~S8F`f=T3D2kpnLvsp0BAu-`H9=xz#%~$#{Dbz7<Lh-
z%K_RJ`4kSV7k$;WWANeQZ~P!7cTUQ|q=v;_%^$i3xvIX5R<jyxl9!{IoA=zJd&91c
zsl?x6OnmdGQx$2l+3PGoL4VGIF1Uqw(B%>okI^re^$LqeTOa7pVho*$GU;^3|2zSZ
z<rFzxH@}Cq5nd(FIikVf+;NQ=YxbuHd17-VD9=@Y^TP=zOu9%6g43S6;3EBe54-;P
z9yOX1Uwg_pw}<tTj3_3jPKSBfvGnm|q?L8pbzeR^4*U>g9pbwRTKNO}L=fd$Jf^kw
z?W6Z?X%DMMs$ZUFMHqRL<)XxiHG3AnebdNkc+hJ0kvolA;Cx>a<b-o+z3Kf<J5^@+
z1f<D~J-d)-S%FEVC(Ng~VCJV-+LB&8$LrtbYImyi-Vs{5B)&ceT1)INQ2}QwXfyQs
ze4gg(!xC9O78+g5Ao)@9k@}a5YXbCj9^^C!C#71)=2;H9)<vgY&cO4#$cPA5?6=_k
zyKmG03Bk?DA3ctTMg$2gPVJO-80}tSaZ)wSZ$Hdr?MJvvU)gNo^V75^_!D!pfAHAO
zn|2<v{&BW%+Xd4FKRNX4Hc0F?Ym7EWpg!`eu|BG2<)y5#fe71VW^61ugP-0Yo+=K{
za@Z&%1%EV2&*>svaC_NUdf?&N;MiMA7Kg;14sXQN{%{e1KNTZTgT<5;Lzwykw^?)X
zEn%31AUt6DGwu61c&`$Alve`3tqv3duy(?Q#rMBqyJN_eEr-zBGz70?FzM;bNHsZ`
ze6eT5Sd(0y{svNS$UIPUBru2bA+l#G@jY~7o=IT7=UsY$X1+>m9;rLnZ({9pN#2Q1
z-dCgj)8^6r$D^;PX5>6)9BE;L<34s`i$*xu$OED4Dv+8CO^>f@M_l%N^MzVU$q|7}
zS)I;cAQ(P}L}VLr5qrxH$rl*tgu~?%0CZZ3cFVU`XA=#ehm{U9jrqzDz%9Ys`-|8W
zXnjUikNOyVjk;r0!kN=ooNluc)%W@zR2Tc`QO0-}2ncFau+tXxzkYJ$)&N}4q8hdo
z{u`G!a@!a=IdBn3O^WZnt9|j&A`&s&mi)M%QX)hqXc6|4rIn+lW;gL?W|!n%;J_81
z#vX-I;n)B$QLwL6a3@-J_gLoxL4)~}=fQSb73gJk_2nGY^#+rTHJ|H&>z(I8@FY<u
z@-74}`Sb<b<{Dw-CoMZK_D=@T0bZUz{MW5n_*!1ZPf`*toMC3X%&(|n)HItC&?p`i
zurzFhKhXzrJxGe6uiu?_3J70hl&K;(0`86q&(6%?`>=YEf7U1NBiq)t4o71nZLg53
z4x;38nlmYI1!?Hv{b}pV7AO!vZulX|kw?_N{vI}A#ozIp+4;JpOcFc;dRr^EP@-P_
ze&jru>KH$+!%?Ect#nj4YOlr>SEu{FdvmxSlIFL^uphTKL`|WTZ?h)N*lavHN*XpE
zWPnq!P%5*U&3B-JaXpHKkksOV{^*cOL}x-WT+?7yDj-SE5^P#LRjBR~xBmnmmE+sL
z@I5ODj?+EL<cZ$ZRN1ltBs%KsJ&-}5)Oe&bntA5#nS;qENHRPU<oJhD-F|A*rc8Nq
zm7;@OfA~|VwM)+sc$LG1EkHlR3&AtaVn|bAF#Bbs%S&_f(E=T)cD<24U=^@Tf?&R4
zJx;$wi1)<td%dmRfLC(hk2Z~o*Z{E5{D7CqL^tR|E!=T}@kli*2(XQ8hY*E~XGJwO
zk}R%2AUHnkL3A$bp)}yBALE2^K6($a4D_Mh2KX>;V+zM!(h0|3@QHg#KJE_2zhq|n
zZvV=~NaYHr&U5)OrrGh)JcKdM0_dpIgU8<4r)65J(KF9pxj{s*z9m4Qbt%;AKlqC&
zh@T}1CG4Gsc{!sGav?yiKy(X$Jokvjdk_j;x<-F|9YjVBQa}^U<_gE?oz#_qjiI4#
zNz0rLRO8=%36=dL#Ym<ZNhxV*CKzkLZa3cG<`T!dL{`z%jfKiDx{%<I`YTiqeWalX
za8_n^cN%x0Rm3lXgyZK|SWK8Ot#Dbs{#F8A;E7TaH%r0;D$3ekyPQ;_E?KZawnf-a
zR`}?e?;$Z$U_kVeU#leL+Zq`qyaaOxH}a!;7%_$Bhs3^N3;$fKWoI&RtJ13m-3E(4
zds9TZK$o)Pd<eSHCz&c!EHZfenLi8Ul$CwIEsF_{3w)CI{<sqFk~kGzFm6+gnYd9?
zMa>XY9@6)FfaVe7#D3wqs@ZiK6Nht$HX|jO9(WrY3JS^%c==++RvpA>rF*Jj$*~9V
z%Q(+J8N(=r2(C*t6_H%xc->_}eZyX_I}-n~Y1~gFywOKNz)v4YVWmnj0xoFY;uu-L
ziY;|EW6sT|FTUOtNCnn{9k>kbiL&oqi`Pn`ycb4}L0J4nP}x6=cD~VuN7k1Qj-frC
zee^R#q_X=M!F-22F{RKI=G6*TeuDfJ_nYHLTn_}(cKG5KyHrh1e_Wk8;GE+BF}1{M
zAp#r{j$2n2gHE-SG1q8}pg{%g09YWggKr2NnZfKaphyh@7j8CU0uSNJ?L%Rp>PsJS
zDOabXLB(I}<C9o{k8(x`Q)frX*hsbbm$NJ18NDPq8-6ZpZ=+NKJmMGRifs`Mr1azv
zZtCxqIMb1zBN|%PC-J+PINhX7V?oM9NCT8qf^I}g(VT%*0Qx@K%@nFxxPzaN7DAsB
zQM8NfB+8~ENJcEL>GW8OfsV3^VSEKJcnO;NAoV3D8JVrxX@4SF8b8&>ocxnMGFiM=
z&9B~jX`(1z=-s$|!}>hRG-pa7@O7(PCHM{5vmAd&>M@KGc|OyeLo0_HO^Vi&Kb*jJ
z%rwR_=sKY++h7lnuab@q6|wr0EChZ&DV!A*TNdYC%`~L5%k4~SHoZPtg1^)p%|_ai
z;rxo(iymE15kVZH5@4Pk*biX&LD_fA{KFmnf$aZ!1Q~-UC0Ae}AO<o1ZKER4&4vZ4
z&^~r2>c@GDWb&+-EkEh2`LP0t@HH&GFG*pkStszLBc^gLZ)o6Ys#aSZ_wB${Wvecq
zzp%CcG+usSp>lRTN<GSM;y{5SBpj;IW5JuO$W6MVwH#81JJkcuKK|lVuz-NOm7n{b
z`}s;sSr_Q>3=ZP)qB4v*qNEw^uFeDWvHyn$?Y+)!(bn;O5abUdi=H9MqAh%RoI$p6
z0FAmfZ;mm00JVHgwGOWd_JsnB13Ut@XLgY(l<Z1|rIYH<67;1@`0y_^_uS#<)%VOw
zew+b9_oU(HbsiD@+l-mU;UXIpO7!<R-^u9iYd-cmj5f9lLEh9<V)%D|i|2p=rK%>`
zqb3!y7kXF44#!*ijtmn%VDvUL8>zsyBb3o*qa>cRMdb3CEAq|cC&?^xull#EFs5F6
zeHn2Y++IuAOp)Ag#$!=jzAWEPbsD{upXa{1j9=`0_3$!xbT#g#Sf#6S!7%+!z8dG7
zZ`>MW#n<?asEmXomfu94$Z0ebL{@!eX)5_G&T5x{T*zh*YfPcTH=Vnw1v#GQ<kBN0
z2P#UA^-0O%7i3kGX4xL2`<FtG-xt)-l;NkCwn@G#Di>;$Zmz~gmP3rZlA|sw!SVTc
z3vUmNNuz!7ueY}r{8d3Rv>svF+jwJU1P@WO6j~pw4`XF!7?JtcROT5|L5(!zX8^<6
zH9CKivJ3dY@!^x0Z4U{}pEPBc`P+)rLN2n|Mcimp4u6PqU6g;?0E{SuLw^tpkB!Hq
zu(ah*Q}y;b7;fy@>QJ6+=3t8kKO^)~F$~g}2t!O~+AeON%*c$6(|PEU>*t)I(?Q?<
zR($yW0KIaMI-@y-=H<rR2MR+}R1-N(SScS?p{jPEs1a%x3$<UU+_1tF8RWp6*up~`
zmwv{apz|=?((>^C+9}2;*B%1Ke%9Txc>c82bf59P4zp@QBXoTm4e^!M3AG9#!Z0}b
zRDVUtIK|Vn+Jc~>FYBVUkBD)t?-+3{&Vy)wxCSYjFnWpV(n{Z$9%Sk9Y(ff>*qBU3
z6|=g@sg<x-G1{VirF3Em7iUyugw<*P(N*h!cZ^zh1|Kaj#4(Lo*G%h#06xsFWHUkJ
zoDjH`-U~=6$n&}@{Wx3`KPYQCtRLg6SCvE7j4Dd*_>}4csP<-}QOw?6YB4_3hPSJt
z;+di&<>~N82>(&Q0!lh5<*K{9j&<f<MnBeNe!DJjw;9+rW0PM<7_O_7$<t985ACR-
zy4%*!Y)vvWkA0w^8ze2_)L~u8)$wzPWcu;3L_4P=znl_g=kZAMd9~I7)kRS}rNLUr
z^l?`vt`tY4$VCC;xD`}U;<ozy7{_U`;u>lLf|Kc7N?L`e0Ey<I5Oe9bzK*2a6;kyX
zNU9nAf{SKmVXtKYT<k84{H%3NGgoyg(^_4)DW*;u9qUXyLLsDm&@%f{(MSs)rjr-f
zQc4Xy&XVJbQ~8>nR-CcA8^+XnGi=oUThuH}Y%6J3-1IW`RQsV@Wy;gTo@;rlth9FW
zLI2_EhT@TM4x}k_*5fsEbIvh`{76Q9oWw4N-9Xr)?<vv1%oP1HSPNaH{-*W0v#i6(
z(f*;ZG2Q5R9)TP1DJu_B?{K+3O1Jby`l}j?VnsH0^9^Mm%$pn9Fs$YXXxjGk2-IXa
z$#2!UpIX+~3YFfF^uCE=Cu?gY$&#y#M=TWCaNOhzWS|pNO)go`1+lup<*b-iz#8p!
z%%p~9K${gtD{|shzm9xE>=tIvD#~oj6}N#sQt)_tz@qgACa1wNceu2=tp}Nc*$s!a
zVl<3paXSgpxUugeyY5kr)LL&)jr9&m{Z&F^_(CzmN{8r|9qQ8Hag$u8;!IBr*$raI
z8-WJRQxFXD(~$qb-PHJy(M4?60bo6u)HeC2!XcXlEKhu*f?Z$@H#qhS9l-s7!h!#(
zcg1dM)?OudS8n&F3A~vnThB)L8A(cmf_YmL2QOp_*G>$MkYPnc=Ind>_mF3JrYkeM
zxVQIViPty;GAnzAUcKr%NPO!>eW3d~G7&TR4dl(~pP(5G*Wk5N4?*2Pu4s$GTSn)h
zVB6=(6hOcffyNcuWkXnLt#B`4i|e+;k1;(LZdoB|_j{=?a_Q4l$tpRfZrk~j)?@_J
z&Qr!g@OPP$UacA=Ld6+Ex0NXP%E=M86&WQmQ*3W1ypDp9VhJP>lu5=-k<+3Ux7V2u
zE1*a(2??|_3IhnHTqGG{pxkP1Xt;6h9K*A0vd1EYm_8~XAS2g*)FiAe09~I15MjcO
zMUDgr5IT~&n0F*<;5X?r&Ov*gm;TW96Xc5R2-h%JOw!6BJC*h^bLp$sAJzsvn`b3L
zu{XH?`$OEU=1?_w7e9cp-2i4F9}tIs9|W>Q2L4Az8VZdBw36bn!_A~gPSKY7?g>*d
z(+#+bJoL_OSloaZ?dKD#!ST9v5yN$e-!&K}$fG#rn$^_GzK)&i@SM^xw`t>d=J>@Q
zOO9bvqRQpdX-e$Lza+-?W=GmJOz8Qt2SdgOwNiY&Q-b99CBUVsD&Uz5LUF1*ayxI7
z{v`T9iu1ECwvnG0DdO~`5oV;OjlzGiu+deR*mcOLB+A4x=Md9kY2=uZdC0kW_IYMj
zPKhouWHX}Kjl0gIO)-0}I?2aQJrxr#^OgRPqJ+#mu5x>U?GC>Ybnq)RH;L#GXa&93
zC9*W}dmi1S^t+q?K$ilJMe-<~ZNlkr_&5obX!h&=?Sfe71Zu)hxjtTR9|U#hbjE7k
z>>=0c3Mb$neEfB9e-F!|0GmcE0=|Y&f?Hc7nB;!3Orx<=%sm3Ycw+T;KK1{UOSFp9
zuYs4o0(3wvicoCmzT*w%bur;(lDQCw<?7hvsW{ov6xgCUUvaIrt81vLu<n`Yfr!H2
zqQ%C7G_tcrb1%l)`PPX4OMUXQGMaLUv{BHG<9B%&&6(~3oDG3)M~OCkCOpX>|2o;h
zB4j_x!Lo>M1fut*NvEq=;S;~ya2!%b{MBI&D!xlddU>z|o>t&fu>-hcrGt9jIa=d!
zX~hXSB!ohW>Iw0M214Awi_047O(>_;Ri`y37Lwai9ND?d24@2IVr$|UPV;9eH=|Yd
z1JHtA+G6h0eVm`VE-a6c$5uXFsam{K#c_$PM&Y!@XM0h5`@3Att$o(7Ejbfo%?_Tm
zQV6|iC%gPfNl-0n4<1`?oqyFX$~*?#V?yn|t5B@i5sPEX&Bt{SJ}my!f}ESu9!Qg0
z6w9brs)6LL@js&ZzrEOtGV($2y%&>0{@d2P+XEmBszU#leCHNfOqnuuaW%!)^X2yS
z3Nbs}o=mdbd*OQ0gqA5FgZ+1JiZ)^;a+h+Apk;ABcdY67<b&p8ih=ppjeEgu2^$L~
zf-vtV@z2=Fdc%|OiAf!H!g0fi`2BtL;#i>`w3vy5M&`qc8nR|p4XvZ*!hckwQN&MG
zLAEK-HPUJ_kDk_X2u&^~7M}-_isXI);-xF=6GL&?x}sa9d{|Fbq5Ub&exAKL$b>&a
z#Z$$a;p>XHp#3SDt^Qsb%oJ4jhH7TrYSu5N<N@N0kF_{>ZDIJToGk)LVSs3Hb+B@g
zZt>6>AS}7k|M6ji;A9x598=SI8YB_<%&=qyIXCJ0uH7L*sTH<?vCED+`i~iaO{*k2
z_Wj!(gV(<T_`vu*Yy_Z+xL=>uM6n0o;^+GEYwQU{j^@SCYnb`XcXKI!8&jd{QBZwv
z8@>iA3b+@J2{qM3@5(xELftd^!d|W{i?vmUZ0tSnr>CqxnEJgwzCwLOi`LWb_JTqq
z^eCQ8A9Uq39&rx*Wg^e<E5&4FJHgElvpzDk9!Z`KzY6KAVe|l~Ee~*|hj<z>9dV1;
z$OZ_EJic$KAm`TKc`6zNTGLEEM-Cr~hYcny#Qp|-C1JVP74UC^{G!Jk(G|wxLU}aE
zdNa;WLR+kac%#M4>sL{I;bT@_y$}sIeK;}+v&2-3P~gjPiK#>M$@X~xsP%~VQ}Xo$
z=yd1Hw`Wlzn*0ew;D-)b(8=Rzs0q58-~DBOZoxM)*vUD39hmh>Q6)c5*iWgm<Ya-A
zQP#be!^dX7(&G#jjlK2?4nr)n&^=X1KI|B#(9t}2arrDLsvwN(2vy5lgI<xRa;U(`
zU~h1Mxs+Jyj9bI7bvT0e+Rsy5<y>r{Vb_7oJuw;U^7PE`Va~CrwM%c&yP0Vzu8r_4
zFMRLI|LyT9V_G%x@2#fr-=Z~4u(l5XA7s0Vv%6WxRfCR1t&Ura5{iHz_Ti_OHk|%K
z23uWSc9w;O=_cGg*=x|{+2@Ezwt>AB?+M?GmOodw*T~s{zG$9yd<#z1qZ^g=I<6HF
zra_iUX#`EN)$DU>quT{ro!oJ7BeHoCLs&!sKD=jWc<go@2>=^Q=NN4xskod=HPGA0
zL~41pj9_b5;%{Ak6m{bXf-9*=Hu0RiDjTr^JlaL2+)z#c8$xKwT|G-r4XY?2C=SLO
zE5`7S-C$iqO+mF)R%Ql4l2}eQ<K;0Sah+dA!@!L{wOPRXo-1<4Q#=FT$PoIlb?L5l
zPoGhez}AuEgsuLqCO9V*bvs9yLti*~tl$fQE{HS)YUe;sRJuqsR<M;NeXLfUE=LMu
z!Zh3C8U8kgs~jsyb=p@l<@rkL1Gn<8s|Mub;+Pv+a4$FaX6Jtdx6<{~<W=8;Tl`?Q
zc4#{Ah41^s_E}OzMWs(Qpn>)(o9$z$Z25&U)TNWR!BYR4p-U4Cna@SnrAB0|1eTG)
zb6!N<pb`T$Rr|@9Z_0z^ZCcCA&C@a(gyfh-%+E;9X?!<Fjz~TH(GBha4(W}kz(2TY
zj;x0p%;NOyIoQIz%ARU=2$hhXOWYNWC4KjRAV0thXf8KoM~v$;!i@2O0K9K$YMdDC
z%aUCQMF)?{a@ENtQ__#>@ko}4i0>%9c}%}L$P@H!0OCxkKFiy=dknuAY#E*wNgC=@
z#IXfZ)S?qL_YlM>MQR3O7-6_%?2{7TkHPGs@72m(0s{3=1*i0}a%$JTji)))`&g?<
z>CG^_K{XZ~7_7~sx}(*<u~mR{rX}I8;VzALH>z~xClv(8zyhM{*#gfN*KAaA3Xw~Z
zJ^L>~T8-C!<+GW!3=?=^!G|fblc+*Afi$bpnputFPO<%-crW<I_~(@oKj`p??})Jt
z#x^<&JT^?xp_nb1o@0VMy_lr`c-W?j%|Cp01F3lhnbfx74jR%L<Sm}2LfaGds)OkV
zT7bLHHuJF*3NzZOZUid(e1zMZzO-V8{2DrAS;Z9~x~<4Yy$NN(nuGTfa|FaEK4KzU
zZN?2cqWabpWQ3d=+hOfYl}@JQu_z|Ro-&<$^QA0;!#j}IVYO$K=xihU7T!!eqyKZZ
z!)V9KiO)Fy0!Bz=vl?y4S8D6V3dnSY)A62@=Y-tXJ-~J6o9m9Y>ORXf2QFXc^$T0R
zP&01UJexeXoFO5M{&!y(tmMr9FJ^TBP2BGFKB&w7YbtK~_Rds-V#5})Df+4_Rd(|N
ziO2j|GPqKo)*&oRnM}LnfSF{5Foil!#@8na2}A$>gI|INN2_B_Ho5=PNXLG<py7I^
z5ybCmWeHR)7>{IEOZw;(K}!PX&|OVdMxOe^phhW~Tmf!*2X%ZKK+iI*T_bAh?^z|q
zv#Nerak}YJtkEG5X*emE-o$tx87fUxrmeqP_knBf!8!bA*)fu;@@Hu()W?oSR+@Ga
zwStvNjA*?TX)p*^$eS+I$<8Rbl9&DQ5z0ZyjZ?h3D1r4RnI<&5a5XDH+9FUzkXo|A
zt?01ca9+KwPHuf;IyPKkl_z!~R<Y+`-oJstuNMlN4bK<^@c<!==sCt=_lCsN8v=kg
zt8Cpgd6Jb#qR?}?(|qFifO~l8a!tl=tjH)icBmjkg89Q7YGk|^AlIqx3t3hvNU4?q
zlDMTHA)(ZxCch`~@WX?7!|d(sW1Ynl8L&?D=XB;|j3ibGn$r$rk5ajkT>8TriE)4a
zujv-!Uy6S=)^T6E_okVG1Ya)xcZ54T5dZ@&{0_hYDaeV5VhiQ%$<_Vt6bbE?B)E>t
z#g!xi!1sNeX^fm0{*=kV_NDw)GaO#`8tPGHDnm*cohb~zc_rFqBHi2SpLSBOjuXYK
z)5&MuH~HC1DLx)TM8Z|y$b`jSK39ME@U^=l<T~*tPj44)3BGHwvWc((DoB21l5m8%
z*Bn$a@uh{#dG=4*ob)W<<C5WMas99AKUiROP5gfGH|F9KfxYn08fs^2t+(PO`9h`(
zdT-)ypVBBaW(|JERLM{s^@>U*yR0Duz8{W3+Sn4y{3>0Tu3y^E>2_q-{Gd3SSh$-`
zPbJT_qXL9?x$+h*IIrh4Yb*(-MyHuZp!Eawe`yKaixK4xW@Gf!w&Z<{)+0d7`r<Zs
z7~aheoL}vv@7fzAe96Q1Edk<xilL7F*-NWT%X{iHX8nzL(JAa}Y&MknXj-)KE)9^B
zR@V5tT`KDZb1cpJCPE-&;nt(8ofRvAl?>~i3bglsEMI6Yg~<eA-dlzi@_$Hv=wSB%
zz()|tx<sJFPq+(}kPZNhSnfy8wzb8}6OWhI%SYJkPy;egJCB8{>R;~%K64mb*V_wj
zIZ&s|o=jevn>5$gY^@p=nZX@}Y11HEWVoIu{-!iFc1JEyv#%F08#*VumSzOfix*Tx
z9*tS~;;e`GNl16t7le3G&e?Q8BRP~~1$_qbYC5+j*r()J!0Qea^F~O-(VFT%TPhM2
znF1(Z$<qc)W|vv(1B6-!lvLQy-A@IRj#P_!ZPyp2uxijhXe!@U_d345IbD~l$4m7@
z+`EBt^UbVZb@050roQ-7o+3%|Pfc%Hq!a|vJ*r=p!-fU37*8w)YJ?SFGYU~;yIe3z
zb`zHBbS3rk(<k^I?N*1n{eS9h#Nr19i}!E03JLyT3iA&^5*@tS$A$xD3If1`wCo4x
zJ|90Z!5b7KnQ1X&t9%MDRZ%Y4VCIPAKIQaJv3_CF`i>;hz3#-aM$m??6&Ajd?t(ck
z<k{}q-VRx8QW0V@=Ba&AEj@JCi)2gU?*I=lu-7F`LNEjWs<VCL<+bovE+xt{6^WC{
z#q1I79dLgqJE?_sxKVntQr6diFqe37hzLUcw3l%zKK_Q|p8fLGJ76lm%3wj$E@OTE
zQyWyz#eiiz)_r3E{B98U(Mcy>@x3f827?+3(MU0!S;mz=@77Z4pM;l2#I|`qub9@B
z2Ix0;ggW(3i_<9$P_pCLRzXL!xLfXwVf;GJ7x$eXj5z^LXbb^)Aa{Vet*RV`j0?^9
zk0`{9V2z$vkVC5SlM8FlxRIVIiTHCt_m3=SzE97Uw3dGszNvZX=+h*JMnJVxSWRO6
zph#%hQ)9b}LfoF7hm|+w*UK6{Vnh^FV!NsinCg}M^k)ny>)%&&O&P%e&kqQH^AQ~D
zn)tMU$wC1dpizgJkJv(LN}uiIr}3(;-u=n-I>r|LkbRJOvXYt~eW62Pru#Aq)%ZAO
zJur>^J$y03;Y0ssEBN3pkNb{#!d;B4qRt7PmhV`MKDbun00v|O;LAwo1Xrw|lZ88V
z@2WAjG((n=bGQab7UE2(c)rH8<~Y`}OEFgr@H2rT5)TclysOjJ&7{i(xn?UFvk=|K
zCdZWewDU*umrD~k(LNc{R6CD#lVTZZr11H6u$+A4|14yc+)-8Uj26<+GHbSx!k2(t
zp>MNDg7P$d7VamL5x9b#dxB8rBV_OFUQQp>!c212vpk3FejS^`b85|GuNhVv*XMD~
z!ypS1uxX&30ZZ;z^4v0xBHtLcM2bibE45pFYK&PU>3u#w5m@v5PL;0Yh%58m#hTjs
z!4CBg0&X?FY5eBq+qtOUu`P2TX};1UO>K7B$#Wg^+(FskbvS4D^GE_)mm7)ROzPJv
zK!uUi9toyl_7M!^$hX;Bt7`5v;{ovv|0b~fWHPxO99H^+L^^>!P=A22d;Qy=rjUC9
z&IfPCD>UsrGN;hJVHP3%f!W8g2EwXs#QtPU42QT+*I57Fww)haVjzmZg5mFqndc)B
zAOIt8>SFOdJB*S27<^x!xq<V<c-vj4_t~lU%fs<88iY=HAGvt+_J>-;LTte>fd60*
zV<~=Q{GZSeZB;gki;^%I{|R*<jIdTLX0lq0m9pUcO_N}niTUd4uH@ZC@lH!*T>q)T
zyS~J!S*!k+Wjqgo=4hqX{7cXw=uctW{_(HIym|fT<D_ku2{!u|1E#ioqQsk1)2V`n
zyVsLI1DE=WLA2F9B8M*S7hl*Csv|klFY%+F!wwW?%3QK`erals=#{~WAKFKUNi7$y
zVy?E!T6r}T>E}xZ<<#z8+-RBwd#CM1DKN+?+nGh@q%xBw+p9Gx6jc&+f~@#%^b4hS
zu`HS_mvCn4BxbAYPm)oXeeg!6k*|`>9!8P3!Nt0x>a@%2P1c{-dP@Zg*RQN;=$ME<
zcUlGyFB`O!DVD{a%Lt6-vp6&}RSn1`S)1nzn209)cGMt#rbA(=F5jRMuYpVCT9FX#
zC0RlFMLWPH56?j-ubPZK03v{$xch}(vREmuIyjwDnPPWBe37bjYW}82(rbE`hTvd)
zRtx27C{r0zkd~1>AyFTL{rI6L6rDy~J}4QJHyyJ#A30^NYLg$oF!UFC7|q&;r-)7t
z>8ud86?AW;ES~^;6g%n&BMGCJDG@}^GbBo@7)i19mH@qLqbIB&9ncEuGp9}M%uldF
zE?M^2FQp7hujgo27@HiD6mm;c`n};-m8)2O45b&MozG&iiaD9&xG~MdF|XgOW4|Fo
zo3j$e<a|SB_&}i2g%!{5icsnd_wtEr`sX*5$giyC>WQc%V_4POU1p*2*h6I1VyXqo
zOF}DXjvutX!?$XCgw)`QUHyl~GW^#2kQ=NN1+W8sXT+eCgU-7Y)S+?ev4pjxQ4tx9
z-}s4kk=M62`-7Ymnq^gOc6L>AV)<#5;Tw9I@QC(h^`1#aj$j>KucqBea$AWbI|pE}
zu4ON@ChiWd<9PHwB*${MohOaG+68h@mcd<YwaptUNY>neN*ti68)r#-nuuT6S8o;{
z;z|xGAGyTSadM|Ovv#Ymi*D(r%WLy8$NyeAH~pz(h+QUb{7YrR*Xhr(S5H8}F`+ey
z*ms}F>2tE|+Dm83qC{qikMD8YvoYl!WjEvzDK~yDXkl=2Eci<OfUOH((R>TPM+9wv
zTlQKhTbf2Z(a_c1L(;OvEKHcf&^WvG4f&Qsos&_ueAj#z`$NYMr4LDyj7JrejZ@ht
zY83$*jCub_2SIJJGyM)eiw4+$Qp~HZ2@uLsH9x78=C=-P*Odctg}bFfmxVB+NpO9i
z-cvti>D_5|bqaMs6dPB5Bc_Iwhe@`il`R9jWn0XqFGFx37Zm$dKLr96X7LZjnBpX;
zkxhQJQs2$@jP_-EXRZ*E>d~~Y8}b7<yTTc4)9s>qCo$d6@%%h0Ij;3V!@&Z_<3rWz
zZP-oUo7$&+j8>G{$Vv(^I(LD+TX#pF1ZI0UJ$EwLf8ESvC_GY2JD8UTSQ^tHuM&;W
zzLNp<bSpVrgKp&uGZJFqDvpC(rE+sZ>E`ViT@82>_sGnPx|CfjI{`HExi;gsq>XQ^
z_dH1a78JEic%wpzw*=21dIN=h`rH72h&p7wx08O>i<aWvfr1Djg^Tkvv*PC^s6PkU
zAk^zghbi%pN_?2GjsO8=;P2qq2&+R_T2$46I^qLePe|{ve2cJEx|A~05XTy(Zq`qA
zkJ`9{7?W-C#Ypk_6IiKz@K^u6EdST4oR8aoTKvO1%Z~*TjIl!X&dF(ILjz;S0mO*K
z@86Fu{l|5BLISTcNj^2^W#vBi<lznSgaJFp0hW<C7Sxy*faT`qn;2m2cmM_J-=FVN
zbcLnI`-(^y>R$%`GFiLg0mPtD+1`)XL2om2pKR+J=AKCO)nUw3Tys2f$Z^A%>2X#R
zW@;2dIpXqX=bb6OBawAyumCgZaIjZAC>)(%<5SMZK<q4ElqMh$wTV9x$I}5>EldV_
z7;{8i(`wgl3j+CilncDPRLZYqq1*Bkki$CR#R)K@M)<9Hry4@ci>pACG$*u!v;MAv
zIKv+i)?3_=1QhX9f9tn}Cv~B_Bgkm2d(<js%i*fbAc1+{(?n>9<}!=gt+T2#-uhn?
z=_yoxyWOTRd&_1vR@t)i;&E*Y>djSNlu=$poZ(>YH3zH&XQ-kXs%oV=UZoxSh?|;~
zggL-f3cd$&V<!aW^m0J}y9NAOwg^uoq=4<WL%AXR=53@|$MMfhho1s|h`c(934Vb!
zxMzct^U=Zb`La!ZZSswS6dBfEe&GK6^A<%upQW}v#Q<82u7Nj1g)rsU3Hl(6C>cX2
zFUcgA<sEs#e(k#_4<5zrtaY97xa1%=-hSVrSg4NwcE<eoM$Asc_%!z28x!#FRO9!J
z7!ip1c+LTP;Mg(boR)~z4Kde&l9!D_XG7e?@^Yr2Eh4Ux%OKeALTXsL&ziF@IXUJY
z9I>C&Zx@@4e-P(#w#YZ(o9W{9B^u=Wh)5nx<3!t>(M>W|DqYr`)(zo2y)wg^oW0|#
z!&YRX{^*H9cSvT9AMYpHFCLV9{NQ%RdJRh1Z2(KoEMd$R0`RXj=5hR{HY0<qSsB5C
zU6#;pq#;2~B>0g+^VNbz_>DyH>$_2x10ziMo79rguiixRUr&>*LM}ch;+OScd|)f?
z^f+~ttE3(sE%=2KzqwfEvJrafR758!GGRVpCQ@*qA!AW%-ey{%vyS-+yB^1(Dh|rM
zu@CwsZv#Ge>fLns#R|3l)%M|pPZ=#yFkHamY&ot*p{%)`+5C(}_Nc?S?Q8W=48P>m
z=SKMh<H5qkK83cutL(!W#n=dWYnV}+AHPsf!j{YN##crtZRC;-XPWwu^tjm;bOad=
zUG-xIc`LRtNXy8(XE<t)nj^kP5ha7{(nKQ;@Dr)2e&K(@e{9pU2+@t&kL!t*Z!|+b
z)@$oQlvY3Ml4Kim?~J%m+*J}_S(Uw#<7+L1a-GkUv!Np)7g@S3X(WsHGu9uEqQ|M-
zZiWv+2&;?-E9Ju6eh`uhX)g-d#9T}stN9W#6H!@zyg!9S=@pzK50bcs4}%6>yMCyg
z))k@a<;somBxGI;y{N;^A<I^rkSC^Wd_!vvOH&na2;@?mjG^$(-63(K%!-^)rWgOb
zgTC}(%Opm*Cz}WP+8X~lP!z<79Cw5lM#;p#g;Nk{SchppwO@g0OJPI$?er~06j4Rj
zPm1ix-|1@v-7S_&KHKzMLcc5ZffXxbku)s~Y*5m4*MD#a3p_mClHPeI6z{x~|8XD0
zBm)RR$KLO(lY#X}i_^~?HM<Iq2ox1*)cxFSrOQBc%m@n|=Rmj7v!&4H7F!GZ1nD-@
z250FnALVkG+;y$}*S_dOg^IyTqWK;SUTIwzUF&6KrWnv9RV2ZgfEMQeq@~=Yr|=!?
zfUdI8-aZ&Zo=c&Br^)lzz_<(bkp6_Yzp&i~D&O}$x%5S-!}KHH3TA)22$4Tf82|xI
z6nmm21*y%@qgk(;10n)wB%aj=Vxs++-w!*G!B84rIL)&H?f?ZDw)hBog}p?@40~84
zo>d3@$U1;I<eOTQeoSU#QdQEt%$pkTXV_!>nK}nrWBRddp|PVr9w=eDB7kr&@d%_?
ze6D#Af&%6x+L_I!rM}1}gD;Xonk;}m*HIzvFxLu$H#@mWV|#dUkiW5_y!Sl7%PH?e
z-PCaQy1cdSr2nYwYxz#IX1Serl5JYz!s2va1)DF0J7uh6h|tdIvYmH=kJ_QUGh4<?
zqzAQl%7rCm)~~|IhB;kBjI}G!Iza>jHXaI7<_w1ufDd5&k!24vyqzU6bmC~oXfn>-
z;1AhkTxdIYZ*aa#N&7dUPmR^ZG?9`3kmoe{pgw)PB7XQ{GdKA6kg-QaSN1NF%r9C8
zVsRVXt5!Cn<k>Bb1l@&_-LX>1r({0+%G8=Lo2ow738rO+`n8a{Mh^@;X#FCt6UF6>
zGgFX&u8OqNx|kqGR(`|STAjuqt|1o#iYEMF>=Y9R3RSvV{THZ|TKiqXS*lSk&{zQ?
zMy%8*3sSSU`Jcil2Mr&t?S!$B?}te`3*=vi_JRq7H5*6Q^1s0en8&O|G@d+v!lQ*d
z_h&zKlVGV@D4chs%X$*XuPI;yFeHJ|=sov`tc!Ft?_<ii1bC)@$vjt;CPpRF|4h1z
zs18u9l%ufWDIILwTcDv!Di=U$0+|<#oOHv@Pc#Sit2?r^(VnR}VklsMp~vhbtzqOm
zlzy@^GiY}sz|c6My|C%9AI~-0YGi20?u}P+yQVVMcbj<Yr3IGN42FHzS&_7AmJcUo
zS$3N!SBI8&!-=-n_xhFFMM9fw=Je>19;a53)ZqZ`*T?ejy=`p#KGr~P1hP9%K78zG
zo70T35Tz6h5!r~U6gPi(?sQ{<;j>(yI2D?&KgPMjVO@1Y-cFTq1*pbYO~D@RpG@<j
zwdk{H9jyk<3<o_F`NSW5%FpgDtJu>m>auRY8Op0zn)?7V_)x1K9-(*{n0RU-^)a_h
znXu`yETsk6!4#1b*D+eF0u(vV^d<dQK6?|GVK<J)kZYAANscJ)+(C<JBHIYd-(b$2
zqx^Fu<?Fg148NSM2UA7rXs1BC3y~UDwp*GGMYUb@84b^~jyN{{b6^FZTa}8Qlfu_a
zcO6u7wl2%5byV!JKklV3d)a6?Os(&f-6Z;`j>E7qmW)PO(p5&RERaCVH}T`Dudn^S
z^)pgRPpPzX%0(>kQ-LK2kK;;HUBXamZ42u@-&~m|<+B$*y7=!wF+qC?Dl;hyDFY@w
z3zZjz1`;dT$-SW3cuPnIm{+1D;qOr!ZsTgnS`apU?Vj+3@QSIrcK|x;Mi@D5HP{g%
z0ru&)rys3PpsxKQ&_QX{74|)JUi7c5+Jd3>CrNoUb<KD}2Nt1`t3KN}0fPf9;>621
zt;mO48Z?QG2-$`{A4x$)Z|A~0mA#zc8{uwnbK_8E*(h?(n2@5{HAgYD%%HRmcZb=z
z=t}aL)baEwN(79$iF-1mefskRYCIKh@k4yzA9S76@3UgX#h_1K>MentTR5~@)i0Qj
zd?fHCQ@F69rRirIu2xlE21w!(U44f)>1T*#JoVLS2a)M#o7bbckBPWJp?--o9qE1w
zs&@_5SqJlc9icO^*4iZYCJ`6Eh{-lQ1nEng>d^tuC{Z-Lua@enU9&x+J;A)fW0w_E
zAzpe&Qt<2Jmmrm>Xi1BkC|qiU_2EnG!At8b{#CK>7s!Ld#a9?^*PK&Tc;X5tli?i-
z`c-(n3MW(HrdZxLxxf1qyx3$9AP{O0Fuw=OP%02p<>Y2i9@<it7=3rV{Jcv#@YSm`
zh@w3T$^&Y~BYtF?iGQZ)5`TPKqx}c<T7Q@0hpg$~oi5WU?8g#E@9$Th=*;u{)A`Jg
zCDr3w%hwJ#GUupL#k3P!CSDw{G9WR2iARp<)qJIR)OcZ~)~svEX|`#wj9Gpcm5}tK
z)HERf1SJjV`-4-|i!}BP^51<HP0CpS;}8Gj#~dLKvx|CPaeW1wIAGKL6;Y#uZAaLU
zK+I-#CN3@o>h?-A%GiD*tqnvZ=g7hLQLX-}MdU}Yig?n}Nf>I$I?w8|Dg9^Mhpqmh
zpk92lXEb(9HbRuF7nK1QmPmrw<m8577cZ~1_tlpJ==D8d@DWwcX{b4|+kT8rnxQ$q
z8{L`stQ21{=92U-S&MCa_j?#N_)bF}<k(WY;SX&Q-(k8&8bA3(oq-|K7P`tn?|b7w
z@+nxqZm~WMlN2n}RSAc}QJuD?n9Z{+-z2y`M}oT`%wga=F~W3|u;p2@Gu8HD+{$2N
z_+9@Je>YNNtlMTr+;w)bsVTJE^+v|ir9Vd5XUZj3d)ZYl{d`8g@y^b9c$vBo^ur=}
zF;UZO^p<CgNtjqNL1#VI*nFhTa{0GG{Hz<`f<$w|%9~kG^_Fp_BDJ&kI8f5UlH1PV
zsf_%_z%dz%QBFGJrxlZ4!NEp>xJxLJVn&MSXpwv@GEXtgD9Vp4xBkj%&Adr7z-S+%
zi3ihqtrp2zk7Ls@F-zelvC(QhC@9z?{~KhIS82&6B_d&^34ee|gbn_F%oeLZ8v<0(
za=t;meoeYrirqZ?T+>&326EY!w?d#v&XahES%QeInj*(Ao{KAM@PVsTxQ!wSIUnhW
zIxS5zaq3PyKq<u$bDzQ_tiBBR@ScO<F{0B<LO7Os6VgO}VU1FeqZRuR#FDMleo7W7
z_y=anY)CNsT)o>u?6eO>s~Eaz#u1^YFPc`2Cwpv6k%Z#wMYJQ#JfHgtx-d@;rMO4W
z4vJe(Rpgf#TY&5i{1L^Ln9PvaAzm0Rj;tyz6k855{klxJt96I1bMUKqgEgE?9`3R6
zByWK0g%vEF1j0H+=pAPR8=CqHU@z1RxRcNy5mSf1tCmko!2c=iaQ)vqa_7fMHe4~?
z_bdSIu>a=de(%6I;HSKIabnCP1Q`xlgN*vz0zG|5Tq3PKA!F#zgcN?c_Kl<3@HV*s
zG+|4A-;xZ!+b(6|-zr5$0^9E?Zd%+qsI<FW55V5z4;kKT`)8eR$G^xRu99b~p^T_=
zHu8BDsT}!3J9zVA9X0zyf>hG6hLV-Dw46lYx5a3SSz$VgO~od2CqeqEPCC87PRt-9
z8fDW1x@avLTdaASLfLtSS(~5*JAY9I93J#v>1*h&F0BSd&J!g8WvEIUL_w9Z6@pWc
z2S@qG&g-t_<QpG)AL8~|@HcaDuDa9EBC`((Q6~0-PJ>q5nFgDehtP<2Ob0lHdNg~)
z?O#9P^INcHC95nq^n%!e!c&;|GnmY6k;4vGvjfzqmUnk|`}xkaD)>~yT6ee@i!2`+
zWAw5y*Xm0$)zh+M+}F%lo01|N#WcP`t2}M_({k~hdxvw4>QI|gtF>BiG4<B0!2BRI
zX+r`mzR_56gvGqNL!@3>_uAYDWMZ67)34R8Z%FFpFV3HNNrRG)dB3$s3E}^)A$vhc
zAQ)&$FNmVsynsNRel}pJPpfy)a`g$fA;HO63iZ=nS5=YH2!T@NlxdT54Aa&pX`8Cr
zriZopQ$j0@eL*$aBsQUxU1$b7@A~_aMEv{{pm5LO^3#x`gB%y@&Rd<3g~6?UCtaE~
z;}+YBP9yPB?<we14`Y`<t^kpLv{r_5CAXvJ3oEd)waMVTvTbqoGy0XJS1XcW`<A!d
z3Yr!HD#&$4xRJ<QQyZoKNt1nX5fVi|=L_zn%uA6!IuAKD#bG7xDia+R5#^yD-C$_m
z;k0K+KEG)IM9B(6^-8Q;pR?3F21rpEIcqAV@ME_S|2YT{`p&TzC#E)MW$)b|f{Yu*
z7y!BlK=vQpsu0@-dMe$DHN`z)l{6_I*&Y~IO+GMY40QxNV*6qw>;ItMtW>D(401rY
z^MNk{t~^n!&}>M{j`F_!<_KWs2W9*CNwE0ka=*xPJ%8W6$1(E=kn@oDeu7@#=Hb0J
zm@AcPi8rheRWE3J&@|v$B-xO7jGte)#auS}sJ2#e<58vQ>wgw<O3ghxWqKT@ej@}1
zEFM%#c`{8&LlLUQI}1^8yh1+hMB=|_1YI5merOelK#u#r+TbR`B7o2bNHl+NB_#|e
zIA$LJiwXttzXKG_ziGD^Ab^01_U?R9b5TtA4upV+G6tXfQL})_mjH-h(lIvJCi_}I
z1n}KT)6*Q_0P-)`T?DK_{RRE20BP920Br{#_fLubKEMj@pG#)|3xdCZ5gthJ_a&O7
z5P%slf59FqFdX`yN^<}`@}2M58wo#v*`_e5!PQMbG;lo@aOv-DG1$Ox)W3iP0Mz=Y
zmap%gn}3WKvjS5I|FNLIk!8p5KEWiwf!WsSn8D;qK+L8XIiUJKZ?mTeH2w!js{-{1
z|Jo|B1M=hk1)JZ2k<fpEV=%A~782FJ2|o(>O#T<(RsrK+{({na;56i4;MW8ULi-C~
z2Z2`qT>3HwM27xb;yVen{_q#<PXX1i{{q21;6Bt}Ky?J<|K}c)GvKd(?66(}&;9}A
z*FY7hf1F;EWIRr>f3>p6VE^^MNf}D1P@3xRfcemnDE>{l&%nuwzkson$_DZ;0GCsh
z!~F%4^;CaQ{sR6Us_74Z0csyr65?M_I8G%G^N;nLAqAC^_s{bN|5tOt0%qN2Lj+H(
zv0*mJ{idpedcV1GfePxMs$f>Aa*_T%U9wN5hwvA`UQ%iNbIIU_D(s&c4sWT_|0xN6
zqB{Sl#N&ku9_^p1;(cs{VBaNrsL20YRns6cH6_enTgMpGjsNvZwb3C^fBAwu?{Uw6
zvQU&#p@NII*|3`K@u>eFTi+c>_4ht*?;VA#!rj*$No9meqNTKxXz#R3GTKq1<j_J9
zD$=}_qS79s9VrcM?LB|bInVvbeSd%cdCqzEdCqg5b6)rL@_Kb=O8sm&E18*#_MG;5
zR9v0I>0(410dh{M7PA+1Amn?YzM7i3E$Mf_)q~t=kQpgLI&k(g-?jZYHB8sTE}Z9l
z4Wk6br74`TS|&!2>Uqn~I`=bHQ|l!m=Kh%KI%L^1@L>52&TwPO{5Y1gLXS44tl*@m
z)5f2boXJMCF?j<=Uz0ZGW^m*hw6Sv|=bSpze4(>V`_3>nq4IwCyH}v}=w{AvrlQqW
z&Mnq>o5kTV6*k*B@Wm2PF(i*u%rJU|oI9v1{^`<f^yufOL*gS~ZDdz+%t_Bej)kJb
zF3vtC^{R*y#H2j-a!zVfJ>L((F@ZMj9pNn0qK%<toS&>QsDe{KtsgqWv0{i;7dQi%
z(6mZUH52l$=9p_3(-38Sxo?#Od9#PSyX!0^^$$3vimlf<`OI42ZH_u?1lMqeG7WhT
zIAthkpesnPfGnsY<{p|{x}fzH*^fAIe-C_F{hZU430A-2#A~vMjcXqg`V-Rsl_C9c
zMuL{MyydiF0*5|vq-Ip|xfa&|!}6r-!6$>jvy*!CanlZp4m#X9OlPq^w<9Zd&keXC
zbYXiMa$)sC!^DJJ#FqMT3+{DIRyH(6hiqnmmO6MlQKm76__@m+iQ8DNj^ag2?gmye
z;%&LTji~rl4mXqOnZ)PHSRL9T;fff~B{}ymBVBIKJ&l^}R_4zf3z`qWip%Bu5vOFH
zwo-E^?ouW--G`fl%mI;}H5*`#!*obV8P}Ke{Ufth%<<=DF{LfLamO*gV|#FiG0B>q
z+!RKd(uZ5bFs=J@12m0k0q^HuSTh-Pd64%-JU>!3o2x^1%jHIj@`2oCR4Bju5H54S
zM>zKh)8ZDX)KWKwyN6+t$8#q!y+0;#TQl3OrgIH6^{IihxoxLEBMT!egv8H;YfXx^
z<*tf#Gr8|sbze4{tHr8&(gN;ZregIX?hK~lZvr=qVX~KTr!tIbB3G9&Td(Cx87X)j
zw<jZ!bS~EJ#!PNoMl#>RjbWs<IoyQ|W0c2LXX2(ixz?<~-@~=RkSd}bO=iIo4ACT!
za(;kf!#-}3I-Bzme-Fn@f>b+TKq7ncd})M?N%j!FmLm25H=0@aahQ96#i68>`++rb
z%ak_ToZ@a~nDW!yugvD*i(C<tdRobC$^80L&E3K<TW)bHSyZOp;cj74Mz!1u##4Qt
z3q=*uiuahi09}rB8Ti->W^SAg-NTeAv&c$rt1x-S4PfE}UvM`v@%OLc6(m&L=N;FK
z>FN84tIrz4zHxgqQsGbTNH)<18ax#5r^Q>tNcFlrbgV?5cbH)&8S_fnaJVgaT1=0)
z70;eEdbQ?xvBoM#UNqZxwYfY`rrBT2^Jb34NqAD$*el~*XN~3Vys=DkV+Wpui92}n
z;4|~!^G{#iNybywg;&J%Oby~aRcGlN6F0;4IRwF)q`LF`6xls_P-Q`8S0AMl&-?S<
zF-*-M-a{7L<3o7;8OA(}XNZ;}co*4VUXJC>#o&fnbxkM$y;{1Yy3W~+m<7nK$xV*j
zR8cXJ2W1pY%$vd+$Migy&il<8_h<2bFoiYqdDEDq!EwB0j8wgtm&8cnD|oLNrdJYg
zxdt1<qhK|kUSO-1M9BGU2^uK)$-D?=B`Jlsfbr|3@!GM57vbH)!Ot6|S*Q+0qZg6Y
z!rFzw>kx0TyoF+3CeM)ZF5S!v(`IQb40*WXGNiE;yppyLKL8F4u+U3-$hAm_o7_s#
ze;e->^G}e^JIY*tTEzRI!9*jCHbu7s(V>PU@&%Ne5H8P%jFdnudhF$OV^YZnc}6UP
zn~(C`nB~jI|2IV%x1aerf_N-3Kj$JL@uzuQh1Ch=BzHfpoUnf9c=MU6OP6@h(60N?
zNUe`Byi9$PI-46nM!JKewpW$Gwz<yZFiZZoc#oMRr<Qk{VgBCdb!UyhN4zgAioOlJ
z)2yNWoL9}V;LZ!)DCV*ETORCvFrSVecrGkm1HSX-Gx73YycdjTrv^WcnGovob+lMn
z^9)*^x`OmR&FhoyEq78B81hq@7B3V2c*dG*!Joyn*tF!IWsQe6{ONdrjWSPd=Kv!c
zrc3JQ!lQ{1d$^V)uCv@ivB!ZAdpvk^w+;WM9&MBe_<NYbNC_W{%Ro6_gYgV)&+o=O
z&hqBhvr#2<=40V-^5=hK{#bS6w`cR&E0`a^^sMj0|HH)B_vi0t!|O4G|CnLKVSHWI
z@EFO*2*!@$yD^^P@qAoI*^~LfOwa4-{6E;3&CkPeeTd@(q(LSp>)?!ugJ8zKFW_%w
zu4KmWTe9=n-gy28JGwvTZQ*y;rHzJM{#tgrm|Ms{%o@^Sz60B!L-z8|utuwc{0cmz
zDEK;f4De4HsZO8sUZYJj(@!BS<u76^dyez1n9$i1{KE_rU%@|tLcC55V@H8dhBh(h
zLP3}2@eLIj=lJoA&-NmJKWkjQ%>Ttaxl+v+FkRno@V{!X<401=-F7oU#VNR>nal4^
z-t~v78-9l$!zAz3@B^8o>jVB>iaGR%|B_K&KjHf_RpRITqYU%nB_9t_#~S%jG)lzn
z9p9hM`;2$|i!8i8pZP7>3=aIsKf~t2PF*mOHCE^d&ap;_k>C<b0DBX`Er$8rLa@k`
z{TR6Nl8en%xLO)YX6#Uhv(+%UJ*jXOz;$qfVylb5#exmVVGGy4i-nrneG#eh5Oj-s
zQrXKbg=@OX%<A%(b!LlKTJUT?q(sOQT+B3U=C_;GqC2-;q=R>2+eh0EnmQJ(?Xqj?
z)HVkL4Errt`&_-^@bKEkFMAJ`)*URZo%{36q<M;>#%XmAj(n|jzL28(Bd~1Y+pk+@
zm3{2|>?h~Jw^y01Ru-g}zs?=_Y2%XM7c1nyws(p9n_IPZ^O)^%>2KpwAI{+}cNBiw
z)8|Kr1%FDH#CGwWbM5MLU%OAUek@xb8&p0sBrUcv_d(V4v7hJ7{n1x_e%BojERQ`f
z%=^1e@po?3-zvu^jcW~l2Tdq<t;ibtRHE^@+~9ZCdbgb0OV^YOK6#{PzB{=)D*e=5
zgIdeV8S6I9vd@Uy=Oyd7`Sla;Wdpf4^>%C;-)W-$)%3{Z^)ov@sMI!Sb#a&aaIHf}
zhCH<3-h3a%z54jOfkf?NOzLYzh*?jovO7VaKW*I7>fwc?vAq2sT|XQfptIscIH$tm
z-PN93Vmgto!q@v|1vr!*>3?hI>oD=9OJfRVyqj6PA#$0~;5!TQw(N;Z+c0o$*~QAi
zhG!?)q(7Zuzb92OaNn_8L4xwY`?nh2w~v|XaQkC4w?ou+quvG`ye9gMajbv!`q;?}
z;$!_f7Zb%Go0=!rov(RydpUPmhfe&<o2=eM>^rzD#&dm*h0)80%i~+FdTzes(b*kO
ze~61l9Dk*l{pHiNg0Jp}Jk;lpoy?2#4ryV3V_US#4acHYuZ`|)3!Ho`rzE_^%^w=k
zy?Z{ZJkj0fXy=x9OZ^Q2G2b{eeb3qpKCZ>9YVPP7jdw9P?C)c(-7cU=F`@Lp#vwNx
z3nm(z)u}zuCcdNRZ%u!(t>KcND>z+t+n3iBXCEQH);BBs#UcA^hc6tsX3rkZk%7JA
zo(<|duj}ZM<7d8YA8MiAxujR+`uUS@>Br@?@wsD`sJ*?HRHGqsD$nxPsfDd`)-<%+
zHsyKlgjLpDyU!~Yr*@C)HsGn|i>bYiO#ba3H`_k+;N%~{#di!Icd$O2b^WF3%dK}J
zvK-!6IPExfD`l|Zl$)nw;Sy+SwS8=c^LW2^nLESctlG&64Gw%s3*I-vDkM0$gIVJ9
zv#st#9uxayjmloV!zX-Ek0-iEruf*6+vqgib9P5N1I3Hfl^)reIWsNB_4c@a!E3!^
z${o&*F^NZdb@;eq(#GHFi^f$}-%)gHJN1gzmflmpy<S;RYxDl|&94C-6RYie?LRkD
zqouBK&+rBQ-U$wItFLc(lO^QX&YRTz%;^hG5jAn)uP*a+#-HsW(92AlaK~4gUD5Yt
z{*|C-#o4-^tEL$Ibndq_fCOpWc-rk?NkNcZ?RI0^exru8$=24L<hgfnl;42Nv^>}6
z*S|{J9~TabU*%lwKjHIE!$E<6LWVeAI~Bcg)rVtI?<RD7x@LKH-kG?GAC`Xp6aQw-
zE%#hCzilqYZGFP}cWLdqw9v`8Dnp~{-rk_GZ$sMd{nV@MZH<18*An-b-}AfQH$OP^
zheO?_9p%Pv*CjcB@6?vRPy2pJvZ+uU<S=@e$IxkxStpi8#AbD_H=VoeU_`f%7ez0>
z-f+KGe<emc_+Y!Ui}(IEUt9dsX-r(lAIS?+Y@fYq=d~eh`h=(|Q`f@MPbKAXd$>33
z4IUV@GCFtGpmgq}+T7Nj#<$HpB^&!p`K*0?l<l#o?r!J9Jkrh%n?1r)XJJQ6y-yRv
zdFRWzCJj*^{Agpwk!}}~CkT%46RP}{wA4G1W|KX9b#$Zdo$R5JdFh)r_~<5ne6+Co
zOPp*%eNNAo8#PwNq*?jrWcnt2`7tD}JT<Cu@^STDduPmDJ}PpL+ZmJOEraHy>mLgK
zTD3$_=dU}UrsvzPzj{s3&9uG0%<oM1dxh6JAMKsz^&&giv}#E&(tG>peut9^N7bnB
ze%Eq?Vy5C$hk|<*wU+mbKdgyaf9mbPBV_uZq1(?{#k~o=d#SV4qR<YPU26D-%eRgF
zEnT{2_pz7<A8IdM(k>s_pdKBTcW(ZQ;L?d}4KCGfdsigTogdQRv?68XxIu3Mo_*c<
zsm+g)i(QX}=9NC5Hl*Fy%Rjp9pY%ksp<?yEs0Qu4@C|Ue-mlX|*^c(@a;hvW9j<-&
zyt+hT^xZ{&q|@B(aSm1IB5q&d>GyEjVR@o-zT#9#ZFp?f#h*_edu*8g?02u*$0{nj
zH+X%Ezc??^(Y~AY`w>Q6!_)4S?v9z5doN0ub>Gx|bEglXgQmSL)xJ5bVd1y%4G*q5
z`fYMAzP~fZF)rkxY2mNPKYD#+Hnw^j-aebQp|iMqY`l5DkDRAkaVNNOYwn%;?AiI!
zwVAVq4tZd6-MLy$E}Fg%9Q(~W`f1`(`GQ45@&>=yB-oNC+2tObZx!3EA@I9wgKuSr
zgiW)%m=_K_+V^2sf#cJ@1(x}tQ7>kjz1Vl@SL(h9ky*(1_1pHJ`>wytH}6CKi`5si
zQXd9+Rt%_#NGrU&x$T@m1)mnXtX&s3TW$Y=fPizemgLAg&3#@r+v2>Rr24kipWVSD
z8?F|9O0<5h=QwadhVPztp@O)C@`87=4Ovfr8~ASjK)%5x-h3^~cHCjr*Y@`~JEzaG
ztkCZ+Z__gmU(A0pHSG<#dR>qe88zqgCzF^FfBbzcdzNdbTwaj=BGItpR;g7fXZHI3
zaj{|7eHQiEy3N%m^I62fS+geh92`15G%#@CIm^Imt(GruG+g&u68vh^fjPa(_*aW`
zUbq*Q&RyEIG@#(4;|h+$0!gOc#2elG4lUQoRbNq8+B$oyk^4FS#rF~m+x1S=7Z=!Y
z_t@1<8R>Jq^Ul6YTJ0@6zP<Eh|NM=y*2_13_BkIFXa0DQdhazg_wK%$`1a-0X%8Mv
z9Fur?$k#!au6uTVb>+0>7n2bm59(?z>=$r$g!7b5)$K37KA%zBezR_V*~be}e6DTS
zg4koZK}Es4KfkIzUi8DwzA<9%!ddOE?+lvj<9o>Ugmv^TZi@(u{%yOw&sb<^{Akk5
zEdv@iX7=CjuQTKI#ket#^h4Dg6V+n|dLBNIY2)LfdDQbu%bYs{Q(rhl*34Nns{CbL
zj_D*lpS}x6hd%4&=3Ch{_*Vy8d8gK)zgvVJ;Y}IlB!3f;TBSa!s_=Wvh*g&|R_R<F
zpfl{6Nw=p~tF6P@uicPp;?tIMNq^JT#h*5DUm0whusXa2F+1`*N9y4bcQ_;abL0Bq
z(utdXJ?TAV|5H=z!Bx9P)XH;LzsQpxSv0vv`N|`w;Nx6pHhq}+^ihy{)HdUnrPbzv
z2ea+2UK|nHW7DVG+r(Qd#hW}1&YRu7{TGi8H|I@#F=1WkQ-`|APwuR#+Uc=0{LJ`!
zeto@%j_dfyrqON!IXa9pym)I{mva^HS&7(X9bPWlt3F}N#PqO;SHFje%-WY-YIlE*
z?R@dXl{0fD{1&a-o0AbAu{CE?b-V2|E<XAAcu|`rFYE1R{Yp*W+oAO`%@!tq9<^Ja
zckJVc>o+c&X}7sum*BAKLiOyfU0<bFrWbv<Up?T#o!U1O8~uHbo+vd*jo2}`^6c@<
zFmv|_vbYOB2Nr)k&?|FXf?#MxaJr4#vFo$VW!V<X+%v7tWo71{kdBaK{%F|fp1Qr)
z;40U9<JM&Qz5Kj<alb1P-)>LVrfS-2XCL1iWgR4W?{jEl#{S8d*M!cK_8ME9SXexM
z=MI~Tx29e>6;zPf{_6SB<E{*UJ}F~qnzVLD;Jl?VoC7iWak1MhUat<SIJGsYU9s=(
zpX*wg^|v1Np`A(9p=+)Kf_JUt5w~@_%#Mw{keB-YUZBGKdgIxjvA>`Mum0-w!l~b%
zm?Mu*%#)3Kle19$du+_aF%=!E&%6me{pR)hw1#5upu2DOk9o!4wmCFy;kvXII+>;s
zn|pS$-lKDE!;|cr?wel5ov5-sdUZ%Uy=vXDUXOcQS48$J9=f}6((38k?7q%QTjU+&
zaXTYyd`iFGYDq@d1E2pfIzRN>**1HwuKcCuqsQ})b+|gkd$8u+*yO|~=G=4AyTj^Y
z*1bMe)u}*zZN~=V(0;G<uI#kSyE}EDv-|k84}Ig~H4+TZ2PIA5A1TSaaKa$&n0for
zb2M-5(d}kv)n9nU+0?0n`XR%rO@)g+3(`Gv%8GRMPb=7Kc6G(`?GXoCeskQu!hiqb
zrx9<=yQbYt=dFEowfhH0ZIkHLou}!4ZrN?$!z0IME;UH5>N0P$fobS_Ju9o0rGbSm
zCrewunzc4%)RMz@x4ZX!`t009b%$1GCO#Y*Cul763~04*=URpTOF@suLJ!&Zjvgb7
zP7Yi5sCe5@>xC!Yc&sel^7Q(e_`{j$6`94`I%iY|-cB`H9b3~w(=1vy`}gwmt>fGK
z@}JKf7V)h|%liG#&9tuQ9H<y_MQ2(<j?Vj?jk7a4N6x=F_lJv*$=3b`k<p7gkL5q<
zcPD)JvHq9iei{rs8sI)*toiDr))uF#Dh9~!ABYJ%5zt>da?XtY*Lq$^maV+o=JL6c
zeJym1uQyocOiDb}W?t+58zQe>5|`~)>zCsG;G+K1(MNdlBV${?bJ=Q=9C9~uW9WB-
zhAnwLqx)3nNfx)sllLLVyY;Nu8J=_G&Bf3I2d-okC0=i+tC$_v`{v++Us9|3hn~Iq
zcneHYOJBM!KD=S8xyFz=b2g{jZ(Fy2fabPKucqufdZJ~1&CXfwt<{7ksf*894J-_C
zFDf-nUf|_&*VO)=`ZJ&S`M!Ed_cVXr>v_CBRyTWI+v4e6;~o6c>c;ojv}A#<Pf*sf
z1NQF{uU4B^IOwh)`q0TfFEVaIr1`NYA3s^n?frt&b6T*t&azE$KnL3cCHstjZLAzV
zKd*7Yu$$}G+}-6F_+nB;{H~lFyUyXu@{VqO-B!@J`nql3gZeMdo*P!MxAM@5xpvV*
z2OD3y6u5Cosd>@VPYxvl!I16?tR2sOSzBdM@~q40BM;+uJzU)SVeHf>Khw>{t*6D^
zHk`$=TiAZ)t5z>E9v;2BJj&xlM`J~a`gXl(?+@gdhzm`w^ba&y{M_b;#ZupCdHvVd
z=vM@cnL1|m&Wx>j&qVnT#^re|U9h>>e8k<z8<VH^$ZPE4+|w>0c&)}f>+cPPxsNp@
z7kZbS>Ft)?C%Ij6S2xQd`{D1?N-hUFwYhqET2WlDC+ANm?>D}9&djgxXvO$z2Hncc
z?Uq`V=49^8@ea-}@(I_~&M`0W4)l5Bpf|a6=*8<pcdlr+M>1t)=yuD+9ot)ZJhtCA
zvQ@tEm(Uw+Pwso4lB#vOU$LWWx0vBM&)g4=?^<@v170y*F(54S)6Oe99Ji?H&beW7
z+kR7R-}rL#^KqX<Wm%ft>>8e0)>o>{w6yu{{yIiy?)<IO@>;Fm*r+wAZG!eXPm>c%
zDp#j^_Ixw1$X4-SUqkSIvpIG<>}q8nkMA$q_fl^|a>(EY^O?z2=@+-VFI;+Pkp02j
zjvkfwM`}0jN%%`120gp>`ndeUrQjqoYPa`Vh3Hs$iYW7e?tznWr3K&hU%IcU@7bZt
zyp875PAoj7mf_iJSFf^#qR-R!-zYzP@LI@U@AbRKCN%O5!;Jq<avYy9-Ki`*VAOBU
z%O?u8_fwB9|Kkw#K=aAGkkREywm*G_Jk%{YVY>eQp$q%e@`pOr)rK$Kz2m-c&0O_3
zek+fkiH>=ntv0_FhHu+5BzR|>BJD|vZLL*)>rk!DXHUI)_t7!`d%1JrB3;p^gERj8
zwOCXa9B<XVJYn&(?$QSXUUcsL_R6|@_q}?x_SrFRy2Flubr({e9-OxHk;bOnLz}fb
zg?ueA-&`2RZNWJ-j0h!$Ge>$yju~RLDrlLZs9T>wYu;Y5PD(lb<cQ6*W1aZ@+x3d`
z`_!WTw`J6Hr;G<$Pp-!Qo>l)>$1+xZ@DJAw*Y`vejC5Z0yJgM?uc~NG{dc`XqBSEw
z{2X&}_p+Jc9{s1<L?_IWZZLi~S2(uicH33o_pLda6;eC5=hShMsBvM#Vq9O8$%JVw
zIUCyV$e-Nq!-kZ8@fq(9B}L5L<{R<mYQ}G8!O6HRr~2U;e|yRoCzkx!*YD-Wl-kOn
ze-28Q#Qiq@U3BJh*ZIM{Znb@uw$bSG7LFveVd96Nx1*OuMgMiRYg@4FTiYAgw35b|
z{_zl>?PAmJNXMi}RXtsX1(P%39vNHK_wqX!^!sMpjO5il{r0piS?yOps(zKh8wXdP
zKEJo_caQJ!piNw#r2}5R4UZ5W3)p&h*UaFVJ4eo6=k3}lukSUT`H?}Di5=@EX*5WZ
zLbJVOohJ0YmDgA2vE{m;{9gCBR8&mQlD5<SVk4g!AV_<e60@o?w?xymHt1tV(+|5+
z7Pc&ExO?OLtO@O&g_^bs@om-LY;wQzGg}es=%KoqZUOuLw2Zc@j=NtMH1%HZxbYLZ
z-Y;7-Q2%Ic>aa3RpC{YT{dBvQXzcL)_n4hSM$fmZ9_4O3qh`S!dENd2bJI`xXg7S%
z=Y0@e@r`sz9N;h{v1(|tB2K#WhkB!YkoEAi{;zAa|2F&N2fb-nRX8A(zKL8D?*Dbd
zZ!$_|D|~|m+vq)S^0=3v6TL0&&|3gMZNhI>$NLHb@Fw`HL#zJKJ0NSd$;lgHM{?q<
zK%3N$lWUXSBj65JK&SxjV}Qi!fr2r37kP|gjBo%*jMOGFuGlf%QmCtN87`R4*fxw1
zY+yHkMI!|-Sff>>0Dd+G4Rxah@XJ0l?oJQ{;WKuHGgB5)w_B0DNjeV1FH)dK`b5a>
z6*DIZrfINy&4(P%m~Mq%zRL_q_CS#%$sQrsB}XFUCW^LG1qDps<r#um%#{Bu!9j-k
zHctS*M1ra4Xh8>krf18jYiC-+&&59Qv;ufd$El-uvP95<-icS(uMl)adnRuO_Wl7k
zvBqlA-|*~7NrYUF1dN8?U<+0Ww3yQ3BtbE2geMC=sx$4!&+MEO2Lp-GAu}|EE{Y{7
zf^^2xdcEKn4w?u`n3GAFf_<#vyGa1QuY&PGTLn|}n3|x4dI`yTYHBvt>r)f#iQg%K
zE=e3GH&Fc9A;@5N<1_XMoOGzr(Sw4+OwDYCU?;;kl?gsGeXULj9x&tIP75|Mo(*RO
zmvDGRIzJ7%LpUXd>r-Rd==2q77X-tYkMFJs_Am`O)q)E4?7+C&f*VYgca7jZ<B>cN
znB!9b?`I?^*3vQSlAIBOHj3$w1tpBP%~JuNN%wjsSj)Vw`zR1FAN79-(wK#;--1}?
zn&V#q-2Q+8jnx#MU?i@tFoTg!>IvbY5c=;)8VBEx<AbRxEevl9L!lotHPBetz<9k)
zg@mcO*+STzHSDd0hKxsGE1ZX!8}z$d{w>G>4+9onm|8>PH$$$YsB;w7Gu!3P!p*EP
zf-B5J+x6c#JX;V7)MXK)bE0q;2;tr-I6Y1*oW`u(k_q7sFJS(55Q>>cZk>dfj14|Q
zxZek)EPr7IrpwB4ilLh!$t<);&Msk_^tp0l#n!IEgG_K>fG~wU4e~5RxC{9`a+5ci
z0Kbz4NhoLhZ55CE3#}Rd?@*zG54{0kpDH{;eIQph3&o^lzFdbGW(e7{8#Wn2H^v;4
zDYRmZh>b!=)=1bS45ke#<qI(1WQ&l+%`8i}i#3kt2;sgA3?L*|*vJ~b`9gT`hR%$h
z?10%<@GM7*B<$C)C-p~!w&dLmsV*sA2!UN!2#i#8!!F@i*7#K<<g$iqiO>smj1C?M
zx4_{`^xEX1nL6r7pCQ##6zvmQFy4~~g!mLp??b}n%<G#9A>6G2#fl@s$E>lrRQQH9
zRv#BWV~siG%0~D}AuL^BPCNsZi#F=d2^(1B+(ls!deOG;?W=9U3oq@ak+dRW6D<Qp
z*cG9iF{fM=u0!U9X+vgpfMIXYApIseF_&ABB26t_#pG+kK%6x5svcM98>YfFk>}k-
zp*6``0!3B*h7i}~)|;54`MYjo%!}>{lbG+GwJ=Z?;rY4a4s`-GB^snnjDbDLUM3eS
ztm}kb8Q+Ne!c^9H_dqy-W!bRDLK*XRO@j~~o`Avfo(qGp*q0`*9cTq({H{eF&Na3t
z@0Q4INXM1(mWoTSgpQ2)b)&F^-o7GR-wQqIJ(QaF!jJ5>$kmU+ajendvv8UrkPhaH
zWbE!rjh3h<d$x+JE9%1@yP9Vx!Zb@Z5}jarLrg`!%+XXc(JJ;Rj-7>QA={lYEkzwo
zOdy$7^ByE=nZmMgr4MA;lM~7E){0hEB1`rFnAk;R#vb?bbrl_9R(|kB5zKCwNaV&;
zt#%Xrq#NBTiKwMBZRGS9y=N?G14Zxz9bjUIh|JkDVyVMLaCZzad&5Qdn7*~6MYXIk
zWrFBDYj{i*$=E|@6K9Ix=?q}LIY%^ElX<%&c+`|<5X>*S<l!8VND;k2^i6|NhD}>I
zumGlvuZfi1F`^^P^YO8wj%LiQWKq3_F&#4*9OaS;T5gl9fg%@Dl`Jw)97`4LWWG*F
z6Iqy0{+Ml|VGMI8R|Gpb734jewR;zA^{>_F#^^-qpNX`{P$D-Yq4}bNRLGz}G@8|<
z>BXWF_Gng{!=g#7Ag?(gx@bakW9U_pDZ@;<Eiz;I6H_B9WsOevMOYz*JrLcaQ%5>J
z6#b<_ogRs{vAL{!EZV{vF%2RQTp8js<<l>KTOxImb5`I8H@d}!<mEF_0~M@(E?Ug$
z(ZJ6l+ywQ%ivBPS`rk!xuNHXf)x|Crw4q}uwr>Fq;>r~>vmBn-4vlDj3{2euMlP$7
zhb@GTB>uBVo6Hu7%h-x>ocVWn9DJPmswIj1EOJsr2*ulU8O0(uD`Fu`%ujeo?1tEx
zOy2`Fa#uDz=d=?qV}4wA7Y}bk&GQF|b6C;1JWLEvZ~$g_xEP-4gvQ2^;wdbt^+t);
zv%qedEbhg4UQH8UV5CDc#O16pZ?-rXy}rIkF~$I_mus+{#HmoMOCA(}2j#g?D*w(E
zTjHsxuh|edrKza}lZTORZ3wupMXpR1>neK97h5x(<D$hsu{xY9&}gw2BB84cH;Y76
z9%RAx7;y!4cETcY0rD1p6P#@g|Bd(2jHabCG1U<3C<5ce5|$+Mmx-O(5Vouo?_-UA
ztHu3rt8aNLcq2{Ht~yLoaXm#0H+Vt$%Jt$FG$dq8n)oS2EZZQ~Wve?mU3`)?`elf<
zSYvRec&jPhr@j`5VS|T8>P|7NY<hn6y;m+!2Llha=;_Qwac#HQ0V%CQCwK5PP*a;{
zN7LMyRPB<RE985`-3+LP`A5WFt=VI9hs0xM?*<KOq)nW}fmGFq%@uENh>x>7#KpJ8
zUs)r+M*I_>mfIN}wshBj`0v+=k1@8*_2SQHevZ$WgN4A>s6#WxO>yP17;ieSdMbv8
z1HgsY7fRjpUW*+JDTaI%$LY|9^&fErdz3L+$87`~@m*avKX&uFwV_)FS`x?rBR6lh
zp67(0-Qf;rzak6z6tF#s+AlXIFZaU1v(Ct^vmRa0_Ev6xjcLQd*)3I<HuehKcI(r|
zNO!k<*3j$h2H^&biLYBPRx-l;-A1w+cD%crml2T2J!f@3sXr{&C!$a{iplp3bu*+w
z-r?}%32pdCxUFYuZbiDa#)31ye@1`0vcuJtdmdFVNFi@c{KmLlr$Sa^-R`!bjd#o4
zmNSp%uXX$4Pcc!|Zu(5|!s~AEkQro3^({9GwwfAlyE(Il!Cg0V*08T}GiD7@ty?y0
zRNiw-VT&>1p__tbp3M_Cc)9}gL_TxtOCKU8u#NCZZKE68EM7OdePk8<;RiS3Nco~I
zB)AiKTS=x-rDS(Y$!|*8)k=aFFLt&P2WHN@wM4=iQ|%;D*2uD#u<eV~J4hgd;A+NE
z(hZljsqq;P1;nMDI+@{b;6S2I$xX=cwvwCd$$>aB@Z3S53d!C>mX4I@L}HvJ<y41{
zi{w7jZqJdpqq5POp;tCQjWE<=HDdZHxY|jnfC9CaC&^;GQh_8-Mx}2LmsB!L{s_rS
zT&MbL)cU@F)4i<$eJPX!F*_rdDjG*gJ|cO^7VASJ;V4_IOVq8j;Cd@gVy3X0AX$#5
zgBcOKZ!H6IYaox(R+8^emcZk&U@m#O1fJ-DhTbg6CN>3mb0kYyLpWa&%o_8eB|#c&
z*s=pNAVbyETuI3siG=h$FV|IQE|Qotww7^{@k~|RVo55FdvT=2&(XkduTA#Ok+>;(
zEtAZ~6=>+Tba)X2P#-GX2)H0)AvtnEZb@`jN)&XNm9La+VT&q!wWK#&W<_fx9yEJN
zL$bt&t*#SpTb)y(j0juNZONWII3_V8DVN~+t0`+Gn^-N;-ze$N9(^5=C2?fWp2TjK
zJTRvgMjn)uF^uC;$p*UW^A8=9P~P?4IxfVoN}{dubU#SEJt;Ycu2e`unCRbglGdyk
z*i}h(GSc~K$!ZNfGbn#DMQ9WWyCIRs?HIPJi%tjsf-YwUPFWLu!==Hc@#FBGBz%Xa
z<KJZ;OE1Qp*dLsuIXO2%mh^PuKCir=k2A-(#=O0p<{8SH(c<i-$yPdTjkX0uS?!AG
zeLmN3IPX)o-J&76FI;nm*qRPAzpX#M(m5l4x7D#1-zS^aFHofQ8F|0e@XF!yrnS$i
zuKpklFDpAP4wjvWm}F-<BY9BwMXPr%9+&uj-tak#j&4eA_E`ZlI1b#Dbk#6}=kRYz
z5<Ad_zOi(N0d4GUC55sCjgf7n`*ol}EP2xQY^b6i>kgBCJZTI>k6h(Rr4*|3rJfY}
z@THyU*>e$J+LiWC@uguDItiqsDO@JN{$nNd7fOdw{1%~fAcdcV(m@pV5=lo=SR|50
zQfMZYPNFbIEFD1MHL)~;LU%W5UkaDGNkb^S?S^!*L^_=I6D6qckwiL#_PwP@Uni9g
zrTs=J;sa&KmnB2`XPLAgrT37dUs+1{MUMO-?SLP~S<p_}hr(~|q!TC{<u08?;ca*D
z7hu=+(#aH-w3kk$(9r`Rq;;}~v={B)^N{wZP}%|cH+PWEr~Q^4rBM{F?1=bJ9i?-q
z+~iKui4@-IBppX#XHT#Tu)q`K0Jim#j-ha+7xMpA!l^rCc4VEmv^^zW@CKy-+xtkz
zQ@GU!mFjnfNrnE3&eDw(I{QkOQdsDVMq2nGe~c0~_@P{gKf+Rfm=xf*?}E-P>w@@q
zU2xDNyQ2L0uF@%#&!ZbmF2Kxg5F~&)0qFdc036KI0Myf`yA(=E0y*7XI*&r1K<QWt
za|2PoX%Fdi+K=x6Nd~Z?2ac~_5ZWmZLcOlR(ovMYDj553gOLwD63paI^hAH0dm&uj
zOBzr4^?GA}a&JgV=wI$F4Tm~PM124caBUxu2l%NE*aJAKFZcuSdS4hfz%C)!-yb5K
zLHnG3U>D%Jeh^oHzxtuRu>Jr+|FQm%bO2j~VqD@wF%Hi|alD}eqzROMYXHVIU?3zN
z^p6h2_&N`g!f$U0Wc?tVPxHapPZ*4G{W%!*P8fpx)k^3I?+c}Jg+rw?DYPFZg{$QR
zvUiv?lfquZrCTX{JzSbb;o>li-<vRLEbUJlf$_elgu&t1KOByB+KfcI$s^HU%?OAG
z$jyzw`K*gTKYK??ms9-BNc6YwC>+O?QP>Y0jqv1Xl;e$o#Si?^W6=K>V=ztw#-hEG
zW6_TLILx0SCFG1pJ=x<izYQjUeVC8v2@r39k0zl0poy^9L4VFfTvXPRP*3V4%uC(L
z(r8LwG8y~dCnJ646wIGbQ*gW!r%D%5zUNc1KVlm4U!NwOOYuFY!=eXxd^+OWMWNq2
zqR>yL8Hk6URu)q}+nLfh3OCI}y!kAID`p|T`fT(gdN%6+FdOxaog-aB<zCJ~{)o8<
zZ_P!yka?*8#ysrznU8WO=cC^q3y^>J0;F@I5pOPnBBO|w!mmQG7?j9~3o&T*3vqJ#
z#vt?Q7{q%mLbz`cPMUozCSPhSCfDy+Op2*-(uK_FIK&T%$K*O4kNh1I(5d1C=>p2f
zUyO9J80B@Bp#GUla4-!^(2rqD(SG$(^v`b@$`vnzodEP`Eyu+-WjQAC&E?3~Z3W_Y
zufQa;S&99Gl{kqXm2m7T^zZH}l<$&=b`^=p$4|myv^EKo@Vl}<ay9yKMG3vupnUEc
z)MuTH_TrWBd9t!Nti|}0uSGgH1&iD26x8=41@WU&QQxIh9FONZw4b{UliqMW_UEie
z{<`(3r%M{fb6*<z@3H~oowWhy$1WY?2_JT1JJio~v@?d_{L~OkngJQ;Z+QkJCoDFW
zJfWG8JkUwW1SbG~%>*X^Ms7rSNeSC;!hV(#>TkyWEG4W{!oV$v->ZbJw?ZWWeVJPk
zubG8#Y8E&N_*+Won~nVfB{a{$ezX!kR>EG}5Py(DNEV0f(ohO#ZO0(iY{#9cXD%jP
znG(wKke-o;lcKW&gE3<VR?_!7FsZ`xF*#1>V=zSph|erQeyu{BjM;_AS5t_3{db~2
zJ9na8`(4PlW*6>&?{^{p;N1w1@5ZFz7ok6-NV#Z=5kIRKC-+@3>L0uZ{W!e`lc!w?
zR+`-<5KkC?%e`oKl@k6^!s+`k`Je1V`r!QtFDjwW0i^FcfJwwZi1f_|5pRA7`%4dD
z|GN@SQy~7K5)L?w^b3bkkKYmLEPeW$TlT@J@fS$dVW}0VJ_1KT@Ktmaea}0JiR@I0
zW8G4UI?aw@3}Te<`7w-HpX0ayP8`QRrwn7hwhT`TAIfmS3@%s3xE$xu^#tw~IVZ3x
z+nmIhEjfvH-k!wWZt5xY=lLm|iy;-bo77aG-Cm~=!W*I4X-;qk=Pu(6vy*-n)lNE#
z=sRa|>U__kJ9+2O9pm!|=bXn>eR>|JHuM7GOE2IsoGzli#EWR|%SBwzQ!Ziu&Ly<d
z{W8iGU&g-O6?A{~6?FHHvOld7`}LI=uC7<nufnUyZ&QWzq$;cz+SNEsvDFy9AJypR
z_-mMgx31xm@V}05_jRP(+(7;fH&Bo1O-zlYH<A8c3Bzw;|B@1Ryp8=lCA7GMskG`2
z;=kNMyJPPvH`BW~Z4+wH|2s8E53EK01GU(9zK7%3d=L6iat!N$AK=0|@EhRMI*2pC
zko#B{&)<jm!j*u(6gJn82hw)519irZ<UEjepq-irpb215JsiIQ?y3h30IeQEL;)^*
zi2a6#Fq6;^egrcFaGw&|KF0py$H@0u2?sqveAyGYW&?h^2AFYx>lz>u0QH~3hykv6
z3Yi1&+f!IL0Ove|nFILj87v@x!=595^>c_k^t-=+9Sq>n7t$mO17E@n0jzk5`a8Ws
zxaSq}IlqRP1NxTN5D|b@jR@B?B3}0m+KE=e#y4oMjt>!we=GH-LS=7J$m1QHouPl^
z9WqJZqp=<D(TTPnU=;&B=>x1jfI1&x)d5`j5za&ajXp`!Da`$ZgSPsNgI)0%o&EV4
z(jMp&zreHty!!>F6=1io=%nH+2D!~QoYpnp(60V>v^(=V^4EPw`$K-<Ag}#EIq#nc
zcl^XjxB7+tC;h_l!3Cuqar`ayphgG(hTH>qS_x%;kU9Sk3b*_Vxd`;Nf7xKtWMiSX
zVZ4k^<Ax_PmQCH&Wh|RY)MYFW?KEWJR3=74#<J*%hK$YrKuzRVXv$asowQ^u`<81V
z-y1C%^JTcUYy_1*s*U)zI*4DZguirTBPo4^F2XV;bkxIsyq=5&^p&2BWmmYqj9t7{
zC?U@P^g>xrF#x{-{!qd(hTs?UuNWe~+z3Vs{Y-@E#^645M;Xi5wP}?xk~^3n+-ib&
zBU2a_@Xa&@HvrZt`(4ezJ?Q6}L3jXanWOn>=IG8XbL988kg>D-84K)7TOd87g^XR`
zn_9}ksQgq*)N{oW?Rr@uKGO=_|6|1_i;Qh48%D!*vL%MYy%oazRx-AzoULVSk>*&-
zhEu*j*0NO;uCkFWrO?zC`~kS$R<?*ji`KF@)>lGHJM3?;ld*MUZIAlW?Pbd-AFD*2
z9AvB#&2+$Ax#xhn(!)_UiZbnX#J;r?!lh0)=kJ}+*)eS}7cRGvu}bFE7ISKMTNztK
zcFu@Taz_21ol$Or3rkhf;DWgq=!*7sxyokI8tTM>AOlR|03Bc>2kZbG$OSzB%emkW
zKp_u;3@}p(b@|wz!$-fMk_@5a=paCU@&z(h!CDJ32-}3{ADm$aQ@%+em`s2VMKZR&
zhKX_9XT`WCL~f`zO$mRw;hGsM!MI$LpgySieW{*xQk459MY#x>j8)icGW4Un94Gsf
zT*iu)4}7$N$`!Z6Nt3x_+%~zRUl#3Uk(55CJ>nm<hopjjHxGyxz&#%5k97y+Ti5~h
zz3zba2XsXKBOTE%$4(gcC7rPUq7%kxs3*(==&STZI~~1HZ;lt*G4e*aC~uUzrG(x-
zh|l&xyiR9~%dF1m$CJ)7wj+f5q8}B$s9)@d_<TPZ+o|mRF&-KIm>)m<QEzw`)O)%M
z;yGOrpQwayy5cwobwj>m-OxTi02f_K0Q&zk0P*m`Z&urGc85g@<82p+e&z<E9-|%z
zXZJw9hdq$qKM3Pd8ifA424kM22IIVH_eA@Xd!qdHo;aR9y>L-p?Iqhp?M>+|+f1QB
z9~q%=dmq^b3O)PEQfM)`+!yo$>=*)h18`>u_z%#kAIuNH#C|Y-fN%PNJ%9uHgP#CT
z_QyUq6#HqR*#Dt~5d*Mj-5!8?g9gI71i51a!C!zbgAlG(!cT)>oPZA>EMq?y-5(5j
z0{uQiknhkCSTE3*42AIn+&&cjvmS;;aQQIgdoxVw=WrZH`Eb-D2}8auVd$6T2-LS`
z1nSWUhr9s2^TTB;C{!OQTS;NkNQ{$x1j0QLvb7ZN7b#;u%p6ui=_s_5Jqp$Z&^1S6
zF`l4=S4QLbI*dX8wv0i4wa3Cb1pbvuXgCh%W8OIQ>-9LuTcD2{5BUi2{CFI{_XHfr
z{t1Y;nuu}<6LH+HC*r(?OhS8yCgD6ePlmh#J*$=Q^JL_Yn1b_jeG2Lgo{I9tQ*r*B
zrlFqY({LQ`l>I@|p&o(0Gt(h&0eVDXT=zsl{e`}02Gk#b1v5~e(M<GX!AuxG)YXSG
z!5@IZvk>l|1^z(aVK%HMfXikh{>^OUA2bKz3i#4FFkb*=bHNV4;<?y&nTK%WJn#$f
z`t!jrfYD0$YCh`izX0J8C3K3${)%WAC-65$WBq_1T<yrTg|bd`(G)HOX8>BnfRg|h
zDdBS^3|)lyvPHNUJH^6afp14F7Hz9I++nlhaEIl@qmiU|lw-y$63|%h1ld^jpY(5>
zWLIX8ti|wlx2go$0IHC)7^{4S5*jRlYyo`S5*R(e&r48Y#8QNpmSPoYzYKSs;$>Kc
z9hRe>l;yDMK+bFh?w(6lV6}O>0_BIT#DSbsLibfj&t3(y0&;qZ*q@yUQG|YNBF_Gh
zB+v)Zyp#l43($8p&St@C&<B01H8@L4*I@ts8dyDmACQc4=aO-@MQd^P)7C<E0^KkL
z^~_EI|DgYXLa@v3WsFOewWpmesW@oebsz-&*mdaSOC=n%9-S{+k9@o|q^BWF-+<jI
zN_b}jviqeY`%WdaB-oEt!si4s2+Z}#K(l8upi)5JCllvrUnV9)n~j)EiAwlU3Bxv_
zozqGv+Kl})CH$p?W40jvvJ$#)#r|d`)XKvClq{%xV813y#x7UFvT^P&XQSU9IXKR3
z6hbUbw&6;cvkhZ>UkL-ZW4}ZRZF1pQ2>cnjxB{*6KtJ?J9?przj;1;3N9~{3fhPv%
ze6+tlA9K;D0FRA{1sJz?1?W#$A;R;8I1cGf^mpS<+yPB?q5O(nm~(G-VeXIFjq$#>
z8*@4gUY|_u*B0TTi-eCm)BfpVq<7nc^1Jq+eyb9+n^1y!zLy~1g1u<BaWC2(w+~NN
zkCZTcKgwO)k9yn>U_bi+?#OKp;@V0(h<TuY2=qc_Ty+TS1AKP~;tO!70xN%|0`x;X
zgAZfe_aBx`U=KQ-8hWBU{hXTGori>fL^jxoKB_rkXyueSaEtvFJRm@y5&z#`Zi0yy
zkzJ8-Nw$}>C8<3kGt#5{J!{>I$lD{bmKrraNUu6AGa=qbW%i7&SR80XB98+7jIUDu
zsEo(H<ukTR?c-;p`l!rGV}yT`ZewD0T&6{wN@aG;Ay>OUR~~{xSKyhXA^-CRU~WP|
zKr^9~Qkk6bf0}nc+5?_Xh=*sp2CDG??V-xAL+p;p_)KW=2A*{R2u*@VYl2jS3gDG5
z%26AW%wsZV#$VdDuYMRr$P6A9=&r)A2x-O-BXMH<$>TcQ9S4J01yA1hP~o39uo*uL
zLW`IUa<(8FkIRf$kOp|XshLUk9ETuv9nze2w6iX$8{%wA%*td&%*cq5yra8e5MeNg
zt|~@ahc%OoDwEkWeyc@A4fMJCMc`C`3O_HR8Gj13R2kuHMEaaiT3R(R%)|wTzZ72Y
zrYiY%l&WM4GIgRH-J81hl4w1c;+Xt5W^>0k6LOkB)2m!Le9`i@0r$weav1*9sm-{&
zPRJbDApZA_<^&i>UzI`Zo~`7kpS>tKA>*=qWFHxRa02pi?p&m^d=;IPxiEeIzLxu6
zFCFGLvk%|TwIrtg%6K$=CKjCNsp3T0f@VVS`B+zGr0D~t!0)fZe|TXte)wpqDak&i
zG}82`O^Bgt4vk*)Pbj@Y*4B|O%%<-p{vV%O6aNa?Fy_d=FZaQNges2wffG?v-v94g
zel1ArA}P)$`?MT9g2V&$s@_~%f|3wd3o_-jGTHupO${EBSFtpESrfk-l&SPHGCPgV
zE1FsFe@40L*vG%XX6^s6d1PfXe&4e)BXaYMtR)*F{k#-?gs&39rn<E6B&rJG(q`ZM
z0VDJ&Z&m)6Ynt(|PIhiZu7D+GgnjP@gmhr}sV;~WYf;GQoJ_=6@v|)St1R$3DV0D>
zNmc4sey7EnMVnOt_T?3F^&Bh%oAu4SfRC@(l0~PLUi|y~$A7)}nbu4QX0rwP6{cL4
z|GvKP-xPRDnhC-87_5oo1sQ!XmxwRG95rrjMvl86<1$a#3$e+b3*c$r>}Cw~rPxIK
zqRfJEvDXe0CwR}WM(6FSTy3a<<cnb7_YS161-d;SoOa8S(>MMRxNmBw;axz<0up=)
zoC4&KOCYn9A;o0-B^iezFHz*ly_B;(eOs!96Ma+O_C=&C{Z2|-$O$i%IoNoMvU-p&
z_oOYT{HDuP>0Ly=y$oxM%A3kJeyao7z3`Gs)uID;Ag|zWmnm03viLDdKDi>Z1$F6_
zfcyEB;>4t9rA)xQu`lGUFtkxqQ}=~W>!^4$<_%?)k?gB7eR8!@>HTKc5clK2*9sEO
zPlf*yJd<}-#vT^xcU5Mm{xton%$w}IDihJM+yRuvG84)oBit(3U+Gx>z2f!1waB6c
zvZhtZ9N4gjXI%g43f23s^M6xCLaM7|L#Yu_H5fV8mP(4rFlQHQvbGxMXA7lR@saYp
zTINRCt*-$xP)d>Q$cXDQJ(47o;w1fhb1b}3NoAOigPZvE3A{_zk^H%aHjJ**A@*q^
z%c+f2ihR}&4g1~%8*BQzSdjY@WkzgRhgKK6)my2lJ@NT({JW7hH)Or3j;I@;BYrW}
zAtU8CWbK$_kY)P=0dOvfH~a5`GbQFXWdoe(?ZB9eZ*uaS)YQ6#{x{haYfzu#Etw7(
zne3uN7JZPiXK$-+g1LjmO=Meop7Xi|$e;sFNL`Y8OJ+|gC6r>XKuXDF7d?`HL25xM
zt#1P*?`#uApM;!qu_r0FAznb<O35ado5)VY_zqH9-vNqURTD*@oU3waO_G)5&6K>n
znvv6M!F{)D;QpqoushH(Kb@iXHyLVSB^<&as!e~n3AGLXlhGx^@5)+GFQV>(vePgA
z5vIO$(Ir>zq9?VKs`lm|waad43uYzxwEKSgc1~SbimFzwzWc|%xdyH5tpPpdAOA<d
zYX9%;zG`Y6o7|+QON+0RQ%K?uxayGEwNR;`E+y51j_*I4QEF;s^#2gZ8%nuUNM_uV
z$w}vXvKDL;w)mA(&<A4RZmy=*MMb>_iMl82$99CxExN7W1eK&u8#Og=6{aWq$-{fH
zU{-SLK>yv7s6Xqot3Fv?2jc?En<%BI0x2P<T`kD(I*1%l4DSOapb{yU@5_wI1bDMB
zrNmIm`s+;;R&?J|WY%p&`aVz&VUn-+Ur$3dwcSqt-LG=Vj0f<8Kd7sG0FphPp`=4S
z)H*<V)&nx{9U>F!WgIrxjb~rKl0f02|2+xyuIVo~;nyc*g~6G!osTMUd<aTbenHA~
z+5zMm3OPR!S@%$RI`9mewXFcEQyK@>T9aNnm92gw>(Sq?mgKoyYQ*N|-}{jNyLj7>
z)JL#*=_zWb?B}(?kY4v-epJuYiRQ%rHEciim9B<FYQZrhC7Q51fqO$9gL_?CAvyc8
zj7yOhDDr`IlZ+m*c_MS76t5>hnP}gPV&uSSLAE}@N!(4z*{;pVzbFO-Z5seSku{@C
zq8Om8q%g+=DOC;1i;z8I6M|zP?DTcqs>zt^*Gx&EKgZ(VInVOys@<u4HMJdc{#(7`
zyP%MhDJ<5#Pi5BhS=LKW!SbXj%_v4wIVL3W3={^{S3CdLhw7+iLh!O@N5(&7P5Wp$
zT+b|R@!!kQ#j#C3>yppU;6M-Njh};g!xhaaMJwQ~%u}C3EP=d`lDDj+WI6F$#nB;p
zd!gV0<pHG_Y@n2OMEXM3f?2otI`i*oh?oXMtiMW1S!Ez=<3^4yIg!D!6@~Ov*Ra%t
z>p}SZ9vx|P*NBQyAR7$@O7$EWw6RInnz+40*SueX0~VVpr2~OCQnw(Ni85x|>EE;H
z8*?i_lj_m=&=%wm-wIR44x`laOT%j$_XF<?*qKx}&g85nej~E-mCS_>z4#SaKD>=m
zx)RgZaLAxa7Dy@*I>E44L-kTs@->&Tj;EqKUxR3V0V@6b8uA&CZ5jcYuoIDe3t{%*
zeb}}n`xOp!Hzg+)A=$i0%I3}H4IpopAadFpRFp!I8HW(*rvODXB-DiZTc9jF(nQfC
z;crnUo>IOYr<8VtP0pRSm>TaW<@2d#l<W$Q0jYI>MGGn;-T^u5bTe}B8IBRDIi;M0
z{o$PxzrrQ2i_w1*_t5!fLW1{j*+JvCQ9r5YbeM!;P&`zBAuz6N#=r5s%$D&#pEfk(
zFii4Vu%Wt_)mKq|0SWm8*RjSQpn%gLe*kwsUTdP55qSGI<^UyUQu5PV&B*UR$Q&re
z{3B3a+-*jg_)*rDQr1vPw+GEAZy#{1uo44V?-P)<9yO5#R3?TZh0mLimZau6R6=%@
zNTYB)&T^PFWKk((k?O@x)T<^TGt%cX&R*1KQ1{_YGYY(E+@fjPpHuR{Pe_)2k+r5S
z^!@_K6<WmnC&Vb~E4)5G>kDjM)cU_yk^grN)|2WlGWO2^ysseMTfa%1T{UD-<O&0d
zbSE#rLgK;^@Eb+mWk@d)@*Lg(oMgx~CwGN#Aw>_;mulQc(tny?0yRMOM}Q(@ve!uN
zPoh46Q0+IEK~VSh8>kDjpf<elg~ENl%i1zc|6YC$?@v%EJF=EUW+v}T9(;${1SNmJ
zgAzwusw9w%`GK0}{{ZAP4n_7L_kTbzsCzBC+Alm0$!H4yI@?=CsXj6LiT4zz{RByG
zc<Vlu{4C*`k}7yXIW_d2QYOifGWZuPDL_vD1<1+miTQ7tKdJmBb7qGAy<i=(U&WA&
znEl3|au@yvNfRF`*@e{pmf5gz|9jiInp!^<$-RCgK}YUK2K<42fsQ6VX6DI8NUQ^}
zH;hnWJ=hif8Q+cTz&3mEH2p7_v+qH@XR$USWB<zRnYWG$>`ZK7ooYa6RJ~n5a{e-J
zHyFubQ|W`!iauQU|E#vkIsfu~O20E8{Txc|7!@~;_QN?h?aFIGN`m=XL{D9A%S<-C
z2p)uns|cwRe|0%~0;WhEY&HyT${Rz{N<-d?23@KFlxHK9W0CVs2+@!`QOXfYxe|dC
zmY{KwT=-f&J(d93OB2X3V`y{&NjB{OvW!CU_@>C1kr(5+@NPCMl<A=b<jhG;WFu0f
zC1;s;g;EYpqZCj2rg?i3J00G0-4q%2GJ2?I{b5C@PSB|tO+qs2!b5G)<T4v)%}+<(
zh6U+F*oPE)1rZ4otok#qfW+&_$FM9IKBKthS77R>5C3qe5=r5rrtlk*5M8+w<NtZu
zVpTifKLh0`M1_AVR7RS`A&X&2Cl$ap1D?Ip1<!n!;pkaF`|8P^nI@x!R(F$OXe(f`
zs}8StRa3NdNJJteVXOxR^RFJLQzSQ2Cyj!FFnul8hAh%Yo+N$Xd6C+TXVW@vt0onu
z20->mNAd&%IgdGGIO5ze1!Un>NGR2xBUWePbbmFFvlVM<2=XPHiOfPCNG5Cn!~dJ<
zO_bu6gHfx`;hK<pPRb<TAKLIF9maYCt^!om@5-h8JxQFA9Ix5WzsTLS3s`3YtLh3a
zE~Km@nZNzQ_qWOie;0$lgH)#Bd@)W#^d1;=Q)T`4$$<ZsuE%?uMe4J$oc_o{%uQe@
zC-<YKC=<CoMXsgD%)^L$V<LBDp7hkL9<U5N=>wjq`rEe@S+hTJwa9!^<<cz+Zs!dD
z#HTg_5=fQ5E7@x*k6=n&Z?5f5-$T+BO3GlB;hi{1%Qw5RnPCS0grBDFdy;o%av^on
z-W-sFFQVlb+5zN73YS&l%zQVOTeJ1ieh2RxA0j;)QeXA9$QHO7k+ZwYnHC`FeXCiB
z-rV9^5Q7$&Yt}7*Y;*_7hwnh*->JjIPob1uHI&kUG_;U=Qa{>Q0y648vfDl2n&Gh;
zC>fM;?h(zZ9wh!TnD}2-IamRu%Tqd_E+p1U8TGt}BfB|66f+@;ss-@Vb7W0!3IDli
z(^AfUgL7*MN>W}oQMfG1&w^WT&j%$dp+KnaXZPM>0AcF%h(jy61-toOUYD^ugS7FI
zTWP%c*u>D1to2f+xy!T|ol2Otq2SeMm1+C_wTa)1lzxLZ$kT0+c`<wZ%2n@So`=A$
zs(OXc<0o5X>A&D37Qfpo*$0Q*oO%<g;t`m+0V*~M)k&%woDuq7<LZEnE|J^FEos<$
z*ud!D!56n(<jTFP$VTo+DV3BGr;8N!IT5j~yd`sMv~jI-Hwex&7>jCl^o6623oO}U
zTX}1$<dQ8Y(KkjVJ6pq>J}Ql&D4idGnb5B_kk7&?g<1!)n9AIx$jdDe3Ex66BAxBf
zrIB_(d1d==DCB>Y=N_f-94RG`)I0Lpu&sh>i?RnwE~klNOs)kee*zq$`Q`032$unb
ztB*>!>P6Ig7c$5}Zp%h|YV^Lbmw@#Lj9T?_%K^?aE)dx&2~T<42cs_>z-WjJhrnXj
z%MZxy>y?(L3EoP-Lozr*09AJiSNCS4t8?cWk~eS~U~BTLarnkEu;1{1_N>)J-ATD;
z<q3XeO`=otf0&MYq2}q{yq2u`(&)T&0!KIcsyb>(Mzp~-Jh=^!M|43!IBVDtpB_kg
zPbo%0C<x!J(IzR~;J@%EwUx8uXKY&_e+ou2%wa1w3~KQgr3AxqhfaA`cX;!}uRc6e
z;t9W-Q1X0dAg}1(B&b6=h4M_u`A+b&3O$(}>vLxPT$qT#Fh<qgVgWI8k+bJ|qg+5o
z*pOyAuDakE<~^m949D?=xXP`m$w{t&JU)^lJCi99JO?63fXgy!?M+vcL)u_z2+Wh}
zF=5r%X6oTv9eQLaN0}@CJ~{GV7u6@C5M+cd{Rl~GW~Aa7zws9&!(lL@nuaZ>H1Wfl
znF3*o;9~fvalz-<>69Eu-nECXf86F`IeSehi)K*@OG+)$mnUz-41K=bq2Lcx6Ak!1
zS+zVYn2#aZ69faf%ah}Q`S9oQ=Uc$&he0l>Zlo__oAD3l<65832g^~5(Pg_OJUi0J
zM{j>p%J1b$nH4af;s3j=>33~#mOTvK6#P=Hv#%1VCQni+khh`J^j-i;X01W>5J3Yn
zK#0eVDMFwKQgF!kQb4^)S7k-4u0HH=9@OvuKWCS`_2|yvG@cpps#i|9=Q+O{(;>YA
zVc4oySv7Dhq9KJnPKR6&VVc*8!1BHf^yz<}ZDG}OgcvB!o6&~KH(HFzD?R0T=HItm
z{(Hbo$oc<B;w(-%==F)-6<7kZsQS~%g&kCg?ae>j!2Gfzk|U81BGV*tyh!`^0hs^p
zj0q%Lf|mwHQjioMBqycvv1F}OZo!sa-@5IN^h^~DIXYRTRC<vUQaO80+gk>blaEu$
zu%<$Aks?FOn`TXiew50LbdqBLd&_~`P@zhe(&@fWDeul=7@+hRlA?1wYZB2;xd7S$
zdD10SvITkBj%{n{?$l~!Gqv!|84O=--sy8kVI&72gsP?Y@HOOT)vVr~U5KQ&2SxQa
zn-QSQS&*pqavSPo5+$F3lZ<j1GNhpgAh*IvhNer%1D<8m`Fb^_Jbj4T%v#9}$Xkj5
zMaCTf-ha|WF(DZZkjH)jINB6S&VAOTQkxtK!~p7b1j@V@G!B78@{*@Z^g1eYx%=EU
zM)P2#{a~c3b*1(V@;~bc#}%;thbk$1k4V@(bx6zy9=!eKf7hXnoA?2`up;Q$MYRk*
z`Gzj1e23+(@2OmMVMD*Yo&^h93O{SBUiF6mYG%alH&nF3L@fMSp5Q}}2HEQe`vTiC
z|9Iko+tv#x7j;xAdStaBUyrQv!Z2*1Jl72VKRk9#KQg#^15XY7SmFosvc_9^mN_;*
zb*vhU%@f9^dYtZRfvoh*M1ETEEl9Z*PKUq;G#$1=YuPWLm`lcTwMkS<;Q8OB)*i|e
zZ-XjKIxDUH`(V(2>&tt4R0m%VVpqUfok4zn8$^EVjQf|ZFChC05XpkHz!%vwDMd}v
zjPgxMvGxPXCmB+*<$TM3mtKii?`xfb?5KxQGFoL-e{-k&GuYbi*mic$IZzXaLzGmv
z+|I<`AGh2be=y?IxyigP8TDMoeo(OO0+ez;N?}(bx@18YrOT9Z0IqE4j7N0i+p)4u
z^U<y=P+kR5ia+_^PaFnBR1Z%g&~4e|kbmP+@a76^OsW^=@E&LtAuVFpO>W7Al5PgR
zlt5DI!B4CcR0b>Wk3RhG7{mVY=zKTu;TilyqRdD3tvHLO71<{M$d`vB8RkrzEDGZr
zkO|((#dqt`2d`VO_`D#kRQKAO;V1-o1Nl3W-{Sw3btPa?R$Z7ZWf?Yc4-`a17zPHX
z+<y16T#!XGO#v0P6j3A>%0L141qC&^B8q#avYAUR2xz96ikO+Axoeu@mTTqmzvnw2
z-^`tS9-nzQ?>Xn5d+v7b_Fa)aqq^O^n{wbFg3-R1-^wkv@h}!bz{K6yt+KM`)8T?j
zxImsNhK^MA(<@@HN1{pw(q0eT+O<1u?i{BjZ!7+a^LH1;-MLo(Oz`}11b5Y*6|)m<
zdT<j9=|S*B8CE*4azad#S+7zn@m`cNW=He{(l(i85L_rbcSngBk;?2ZQvF?(>436K
zeYVAkCl^p5@7A^6H0!pK`5&zGcNC-lK}Db?*hzNTZjIouH!w|=JDM3-JD`%oqfkwS
zF$6ipVs6I}q+Ab61u9}IR)%23g*4^fIkjX1$}145%PTG?@-6tidz<JrQ4!i3n(h}d
zl5ol2UKI9LHT|9VDmM(8l2F&=@p<QV3r(>*{2OV8MTSCM()Si{&@TTb3anUXejm$v
z;GVvRg}Q{9g2=FhFlY+frxEK3mlAla+5^uC{<Mr?#qL4jm|H<GDIAFB4;Chz4>vUf
zk`)2q${`KV3B0jY*KAw)`H}74M}7w)zj96AeMA$o6=Qye&_5Ae5O#f_Gya$bJgN_y
zF_(}rCoK@qU;OK9_B-_jyzEyEwiEGv(KW*UOhOi&(GXjD%*&UMh93b*IwvDeqWyUb
zzpNsjgBO_xe(_RFReWFBvS@xH@^={dlP9~Yu4w#q#NewI>hk(Q-TdnoNp`w{hFDz+
zhK~UsyQ#r;BK4MqcM1ufbK3%T?a$t6*&j&cT@A4n&iDLvVnu&$!F0j4#_{_EdyCus
zO)k{x@m97+4c7-utnkr0ioyr}IHIpEy^kIM`1i*aaMBYCxRT(<|5(7yKjF6B;}alz
zZN%1rrXVrs4ZXXjavves{ZtV9fjo2t3<UAMj)=`g{6KY~bL#1fkG_Iq>pNQ?HY&zI
zJ<y~aHhN<aM8B@X`a%aGd2B)_5V1}(A{xa$`UAxC^xM&gIe+)j^A3ZuTVs9~4d*4K
z?ti$5i8Q^hl(qFItgHFfr#<VzO8<&P<cC8gPEkndyAW|D8f()%=(HOhOmQ2~C-!61
zl~nXehH7E_u1~wGuzHEGP`$HA+KCPs<`$8X^e|H5CA`Y<;pwMQ=xl*FL<2e1hmq<p
zVK-FH3<S4udHyzBHWk5Dkd#JbKhZVT<SVvBBif+j1?I10+t{>}SoaSk)twctr%kqZ
z?T+!CIxUmLH6n`h=Nf|vX7muflZYQ|a#Munx*OuMAygk@knGNXqh+Cb;;1{^L-uqE
zxM)wimToY=os`laLu4UmF)jzQb9f?T2t1KDj9?re8lkTza)+R{1IZ)g+mRN6_-wbU
zNZr6LbQucx(I^@AC&9^tY>gvldDCaS-&Tz4xV-RR19J2oaugsLmy@6=QEFLG4CGzM
zlYCP#HU<>}O6L&qaH2-E#YaN)I;E%;^^<NtZgdBO^~45<izW3vCv&kCeTBB^o~!!G
z{H<{7vYR%IoiTlwi4Q4HZX0g@2$qjWt&_{5Y9_OW&eqo#_9d!n^XJ8_`CH=f0%Z!{
z8dn<GsNu-elzFV=;(Wb>C>qYrFCipw0kdZ;gyqN9A@reAHh+iQ+L7KFq{&+h7=g_u
z_$*-rl-yp#>I+67ECjKfh~H*0(eYCz8a@Sa&@v|O&DJ*(E?Y2f0Q(|BoR>3lg8l&U
zF8wxN$;5Fv_?mq1XB>R={tU>H4UFKk=G;(x=e^tJJSycx1j7DO;fyR`R<uFI<iAON
z?sg)2i>e)ZS6(cld@t=Ad37YhhjviXLQ?YnPFAvXB<5Q%FK;B2+%INgM2Wt(c$v&@
zwI2oKk1|4<iC&|aJ%)&fe_-}iqu3**L>%!W6VZ3*M8zRA&@X$drC|QZx{ZxqvZf_Y
z6vUd^k|9a4P*QqKQ_@JZk7c)BCM2PPktU<LEw&vEVyoYX=q<hkQ7P}^A<uhnLe={Q
zn^khBr^7)2rH!0}Wfw<t7OP0fs|&1o$R(;dn^c=0YF~4=?ulw&CH}@DB@P1zIlGrr
zOrvW^Gzp=yoV^FvS@qR8Hu^;z(sRGf#N<0jPdRl#N<1@e=3GIs|AgiBK*>jWe=)z)
zV~iohPu?mV15Ib2GjewfhGY<($ATFDf{7<yLVe{`^}w`<@O@$f8xLc~;U}rT_mcU;
zU!zGCjAh3ZlcslTh&AKT)BQ6Ri*RJ)&4jpSebBhG&~M7!($kvEI>0u-Neqo=CGqi4
zl8LY3lajo6wTNnH->$b-@|``gHWRkvu$G4Gc#ea-k0Z-Rk2CSLg^FG&k-d<UrYK^0
zAkjG!D-R^ccF#zDg5Gm2%A}Q)-}P>+&?`YLzDuT$ip!9z5nwk;tX1_j)>>k2f~kSx
zh5nU`qXSV=?GY!)gWlf_ng4PE3`YiD(eL;sOziNv+Q8@dP5(FyY3)G|ERS&uy@|E4
z$oO0}&0~<wZW_b$k(}I{8hn}c{^!_fqOvi6mfyM(p7LV@`i<vG7(X6XwK6a<Z@j6V
zBLBD7{fpG?tVI2j$Ak^RxN&OgL>X#20ixxt#r}zCbTJduKL2U-wfn<SBC)7jttAJ(
zY{RLPO;8K3W}Bvi6Oi}z|7oAwJ5VZq!Z4AC%q|m=RD2gos-?KxHK3Nrs8XAz`LzHW
zn>JE<@4QF+ACReblOXTYjnj`$#HV?~C#ms5>yy`JN20)^V2JG1o#7&FlIcCgA?7y*
ztdA)T??b8RMS0(VdLko=<EP+6q<5^ZmY%l~#4RtW<1+#M@Fn!aa@SCm!K@XDTq@_k
zg#5-VBH|eedaEGd3vNd3z5sH|j5vshWdZI=!iu4_)?X_+05^CcOR_r}F4NRGh}7%=
zH}Oi<=}4&=vn^n;JfOaE>p;<YyDY2iQ|SB`I@?Mvj##b<DFKXP_lg|RavEB$$7D8H
zKN;#TD8yh9wi4D>pBP<3$fcFU9xNhOp|^OU$~b%lBpnwi6l6@Wx<y5Gd;XDzM(T6y
zv4A08V(`S33gXXPAK>I{c`gw(;1Vfx#?1<1NZAM@dR<d{L-Q*Q*5}}B<5q>rkKQmz
ztuclDFW+>70o~C+WEYRv%>1s&YC8(6-{0qFcr6+YqO0V&qj}6aI4;<U&;C>1M(y4E
z-dXTZ1%G#m|8W8H!+&nrdB80VWJ)&$nQDn!9%LjmIf$pp*lYpvB_WyH7%>LCr4#R^
zVvCQ`_`0jx&vX)*?&Zn;^Vq@s3wEL;x=iKL3!4f}>vuA;VyfD2zgx9!LpqeiQ}dM!
zowbWupY4Vc<&+`J@l1h|xIK)x{`jV?_<j)%>I0cWNMtc1C^$SUvoFA2oLk5v+e3o8
zl`z~n75h1miAn`Au#Abh`vV+B`WI?hw)$Z1$iHFNTsTlZW<BsA^9OzrtP_pXxL;|R
z22F*B81eckz(cE=n+VA|!pO5UH54~LgJE4&t{f%S-eg|NG>8r<XVHoiFt2i&iElM3
zFJp)`GY~#Ks$d3s7ejQI&h|u1hv@WQ7|F%^6Qpl95y$?@#1pUIbQ2FwqX+cF;vB(&
zGXQ^u`#V$#0M`;}GdLt%PDt`uM($RkJpQh}#&*4<SC$EWN=GG-o3#Bo(R8NiL(&{O
z6Y`7BvwYduU{}#-2HSa_5W@uxc}oP&QU}Bo_Z>xbQ7dL*K$A6>US$5@%K;7|cNSZp
zHw&8lafX7d|7VsOTSPB@6xIc%8PLQ!O4TdsI<p?X5#XZT%SxRMCC_lbh?JDi=05Zm
z5#PJb#MX06K9r@XIUw$>Vxr+53~4tU0|~9&QZh(V`RAej;-;(3-L7LFP%qa=41E$%
zQ@ol3!?AkdI2W2WF|xG6U?)Q6s>hNl)&*R5gl}6zn|!Y+_b*noT4%5qm(%ej^ommr
zZN<-XdAH*VsjT%_ORTvl=*A1AA@hJFzE%(<<|*RmvlWE|Y<g2HT3~9VSaENj$&Z!+
z8qNoRK#Tw!1gjPSl1#{l4vfH(CQ7X!=UgHrT4z>P>S(CTNdfJW4%E|Gld~78=^XK|
zCS<6K1%kZ!(F&Kt0w8x>Wkk*OkOinqu*YE^ct+JB9>wy#B(qle+e19a!d_Ic-ry{p
z7BYL&g@9jp6T2C95fc}p<Ab)j1Uvg!!@n=YaVWt55`4r@hW*5p7pMfZPEw}N9zh*&
zd-Naw(<%Y2lLQ24Law4TgHpj4s^~W|P^2wKP+J^is4Z3}qQrpwFB8ZoL1JsBsf8#r
z8fu9SdFon>&yBo!v}O4dLIF8sOu*sEOj8GvzfbbR`_bS2;`qk~ThVb5iX2GDA|Rny
z|0iVeA`{;UYMj(;(rGB2gi%qRF$^6<tbXEdHLG8V`^hE9-#kRaGHYryv-Vib&Wv7+
zqy}S!pXAr6#9c&ekF|Uvz5-EkoO6w`{kNcW9Kt?XY0WXB<r0(f-P-si5N-Q8i`FXO
zM2-+~{X{0Ze68v;zaL|*ulASBIvT9xkCd+=|9%n?{l(d(TuaUovGo)pdeXBo_QDH@
zVyUmqI~^!~ptGx1?q8ts*A^Ms?C#8^(9}0mLmb4JrJQgTA#Ij0;-7_C7p&=(1!4%!
z6H>yd>4A14BMU(})vXn4T@8PrZjFJP<hWtuI<0Q`lM;6UC093awZf}49*VqUn?66h
z4Wq;UGbyb6hSO{Jt-+P+84dKa>b)~74*L)L>RGQHbi&R-CRS5c7Z@DG{BAtd`Y%JG
z4|cMqh+USN`fM)Umx2jSE6k$hNl{cO^B0#H+?155AGt!B{BUxQe9$DDJBd!&Ah!EW
zBRY!N+1L^X`$|GWDlL%TmNN2!5W5TPhyN`%wNL_>+An7tGvLQRQHb)K&;KH^@|^Ec
zkL2D(Xu+@W{~f6%+g=u3bFeggVle6&IV!=)FewZQ=_wO=$g;aatjb_GHwU)lU1eLG
zt{XT$Cj0LY5^`NbTt)E>j0YtvQGo!5uK+y#4~7@4Q0G1)&wSFWGuld2GwU^()%Z5V
z3R5c*wOa{MpT{iP?wP?wWS8*(981XACmPZ~OYWG0JY#RtBR0Y%mj^`uT*wsKh_rQ7
z^xt6RbPN#110~n4e{j~##^xbnIeD4sv>Wj&#fZ}-xt#h1()1YbP_08BjHi_xL}ZIV
zC%&c(vpcK;{KS_9C$BQ`w<gTb5?N2e>-e*#1bv{pdDdZmsK~ki-_#Som-t|{x)`_`
z>78oH=~cg4#2L$~S$C~nQ=H=IW!>g--r+=*5oSn#n4hwRbEjVeb<g|Ba6J*Rk=w~4
zf^!BE+*DMo;nlk;BI=`A2KlHd(gz2+X&wn#3pjQ#!JgvCkU(6`!jV(O^^XrdjO>9{
z+PHyr+d4Cp`P&SGrtAi4gxh0IoWpBW)NKfj<k~-GH1W3(J=dwFIw!UH+GMcO8ko$w
zXDqRDLvh!gjib{TUxN$nTl=>@ZDs-+@OmA`-5%?aiw`GoDg_e*9hF>AMNJ}P@gzc&
z3h|cqbQ8}xv`3o|7|NDhPZST=tCqCOJm<3o?U2?(<f(Y8$*fxOZ1$8u7iBSB@t^sP
zC+qbFQ<5y?Dh|4%=Z3k@H<&!$Xd||6Fqy=Vq1-xRzCjkQOd%1abtpT+#YF5rgNQ9e
z;Y^fUvXN_n*G3>?W)tEmqBmmm6?*3o(Q7^v(fPYcx8ta*F~1dMJ*-X0U@`A+p#!?Q
z(C>i7MD!3!zEi%%h82)Cgp66ji1M%*-pQgRzpPCF`h9HyblQX#f;cROkm#kH!jR24
zOJ_eAa|9rzgm?)HnU|Ze-b6dkC&L>2IRImg@U&i=^IfKCdYhCaZHAIV8!eRV-prey
z=Ls3Q$pUG#1u;IUH@|9ST_--@V!=Ot3l^4$-~85<^|-ws!`T*uO|azt7NpmG7n_%x
zkKnO&9$Gb!UU@)foYD}TzynyeB78BTGE#4o==ME5k#!#<tUSg|`OQ)&4}%8r-~Hik
zlOpifM!+TWCstbU_s&O^L-H~CNPfca8lqfED<NXsC5@;PN>BuL_W~fpFxpV{LOyij
z_%&ENx&UJe;4caO<c0-YhG<H$Yn`F|CFSGQfASG}%Ywggp~`=+#+|o*#RA+GL<w>@
z^x+-mM~~W=5?xq`L_d4VL=5Y-#Ia|AI9goDHvLKP%@>+XO%YJUuJ2p~q$d`IcU1Qd
zQ;N7=t|sK$T8va=B8QH4K~Cac5vzPb@NFyvYl0!VAhlOTm^5fB;AT38Qyqie63e!#
zF}C@=FzXGy7?uC>R@^;+5~uH=q^gdZ##YprkLm@P<M;%E?>4o7w}Ya@W3w9R-yDFR
z`xypKdDAe}--7?9KB%6^Jb)Y_wRYQ}F6bQ#_|i5cx$51ZTB6I3%#%YrXFA9{O-TAR
zAs0Hzh)#re4ssQPx3lz^?cfRM!aRyo(z^!XzAb%11S%>BPXE9{Mco}7x#HOzOpW>w
z;w|-C6ubH~EFM^ZS`z1O-OJizm2-!wo8pm2!&kP+M+g209k@Ju(nS*&-n%*#R8tst
zA|!+@;X7fA>kuVHk+IX{t0<WsfBJMelqCIUtk^J=mFR{AIrCjhGR^$*n)OoDfnlr~
z&#<+i^isY@de?`ul3t&}X*4Gz<T4?pGZ|5A)XzpG(57sUj{dpso33~oG{<^m>b_7D
z(s5q{b(?lUUFQl7aTL#YnHnp(oA%L8Jzc9VK(`?;kN5gT<F6wwE`?#}>yvgv)9TZN
zc#FNevBE&3$c={^PaecTO<zKJUmLJ#mb(2njnzRI_n4a3CjKUK`+d3(d`-aLRy^Kq
zY9+c<2G!+SiByXBAeE}KEE;|e_4PFx5~c6C7s$VrY}qjS1H@GNU3s2~)g@X>l<!rS
zfb`vleH@D}=rJM+c~8T5*;1&udJn{B@`0z|UyUwH9`|ouW&W`1D2<$AwrNu_k`MmF
zQqxWxb6b5AZRiE@pahgfg|sT-X=IEYXS7@mrb@F%UtG8r=5?l7jpRWr4v|n+lo6W@
z`w*=Y`zV*a-*?9_xCV7Vwy@}7HM^@QIp$_7ie9SgtQRi5KYk)|bpy%Bdni3?i$103
z*Yo#dAdV_gz2;wdCdd~BbOADQ9Hy&F{2rpPgr`y`O5lK`dQ7x0RV#&aJD0A$kWE4D
zl4syw)hAZv@sEYjQ{zrU77h0{+KLmU9KqfpME5o$quh;nxUh`<9aaXUgF7Rz!B(vH
z!258kR5+jDcn^k;Ha2>Q-xFD|_I@CRjWt0>F<`&CzfMSA6G9X>D0})9MEuK(*<qWP
z7CyH<0OSpC4RI7x53nn832|)3NUV>swun5a9wvAdF{=9=_%i|im;F)Y!~8vcjdjG)
zr)nT>eq7LccgDK~^QZVB+Y8?1EuPIkAm!J7V(TF+J1F;OsHHu4bRvSjH9?o<<mUYi
zmSGNIpD6So`#bg^<P)Qq==CFN!tR3@XVJXQ5;81CLkvU=`w_&gpD_`y65{=H8ZLnB
zCuG8CM(`k^r-CT`L~s92TLNJTT{4hkl<0WopL$5014lorpC5tR(*n~9ne`0TYYv$@
zQc@2NA*qR2s-cWrnuOZZ`7j$1dKkz*iHs~g%whIsB7TVDm&E=Th>B6#<A*30Ii*Ed
z#35F^hsdlsm9d*VU_V_ulv!_JX@^)NQjE6NTRr=KLb73L%wT_nZE11@#4FR8Sosz{
zA%ln}iHM74ap~ThZNx{LXaf((c|sP>Cd5<Rn`3knV>ctGK-&HcByc{<%u6>m5T!ay
z%_t=NBDL>}Yv@cCq5{YZJjv<IU%3DUM_ZTFN4+3T+ZTwF$1&q*e-!FL?0FQ#M+(uO
zo?uk&`sWkz>@wnPE*>1ktzJrQ-*Mx)!|=`{ct`$zjv<#>OOIivbMP?;!|-JK4PC1t
ziss*m7_^;<p2tnfgM)pJgLrS3M#O6UaWz_8-1>Mx0Saz8Vgb2+&)iG=-6$nIP>8Ei
zWt8Q*%KMKZtel+}RSwN1mdKywh;4Jru{Ng!)m^^JstNT!U}Z!u@Z<v)>L8?i!o%eR
z)RiByK>U6(Iw@TM*%3qVopKFsfKP(49lHn-6&g}g+y}+0`nAb?6k<;lBBtcpzx8R&
zPl<pEQ*(N-kv@}K!}eE__YjvVOgbrGA~nMuL$`HACCJAvlsx0@Z5C^$q_`n=`uG_5
z(;cyuy!difCr+M3k#}+mt|dZG!giz`c@nm#)@LO5BnpPoo0-2ka}=8SHta3Sy<LzO
Nv39O?#g|5*{{sOw20;J-

diff --git a/plugins/svn4idea/lib/svnkitsrc.zip b/plugins/svn4idea/lib/svnkitsrc.zip
index 79ac0e437b6a8fb1fff92fcd4def62c8bd113220..2e9466e3b316d9f49f6d8379777fd25616cc986b 100644
GIT binary patch
delta 41607
zcmV(*K;FOJn}7kIpnw4kP)h>@3IG5I2mn-{kqjpYRG+>;yjH%kkvmxx$Cnuy7#bOv
z8XLqLTAEt$a`AEj0GE+B92$Ycg~I`b!vclF1BJr`g~J7f!v=-J2Zh53g~JJj!wQAN
z3x&fBg~JVn!w!YR4~4@Jg~Jhr!xDwV6NSSRg~Jtv!xpu}7aCv=J)gcnzhpmq#R&ia
zOe~k-1P>;c&|4P`mmXmk2Y*`aZ{xNZ|DL~sXJCzd@i9rUVZi0mEoVEchs4fer`e$`
z0$QSN^<>FMQcjH4|N9<NZ=^)Ua+=$Q>O&k$&-=@d4=EqNJwR{K`72yfPB&U@m_J_#
z<hX70?a9fX-+g;>dV(g`L{K!2X5x`Bimrr*5xNKhq=-3UlvB2*9)AWQQqE-IbHp=p
z_&@Mn8gl9(!jVV0%ls*P@k1mQ6wUmAqVDMC(_r|I4tiYp?m`OLL^0xvC=NWdAZrRr
zT<WhA87smBie|tL!abi05Eu(T3c;=kh!m79xfCMxlYmEvtcf3xDQF@BEreLTKR)K`
z@Ut(l8!eAh1MxyE1AplS8q82gA1Om?$~Xw-xw@28iC#rqfJNX1qa9`Ol59{cpGqNy
z1aKFKiPw=904YP!N}2qM89Y8%5%)8hQxvf|7E4H*Oalf_!A(Z7A3|tC5@2t7c5vV?
zR}lpA7YGjaBYX*oI5TbrB%EVLX90Bu?m`p<i(L^hlL{gq;D3G?FR#g}kXo|fOYjR7
zi4o&3!9S_!Ke<!|;H)XfgprUFSMpp(9&NyvyPF6YlNlA8E4rpZ17;!11rHL|k1^kT
zPeL!CtTAiC*_-akF!7f(ikoQ6vO4}@*k>$a-DjdwroE<|L!mSw-<7CJaXq?)8WMt*
zogQecr+<aw#DC*;I0SF_4TJ9XLplMdd5Ih@fM!WUAuYP^_NHTZL6_te<YYJaGqO}?
z07H*X<M~xIZ$JuElg$e9a&Y`sf$85#EEW;7fpF6C@f08lxdGuEfq<;)(60vv2(I+G
zbO1gmv?-F^1CLR9fg->nnxL^qpcV<2cuTx@Q5bBbl7Ec!7H*E<UZ)B3BlE%H68F8l
zS!F+Vfd#0WNV)GST6JT4ralr+nZK4YQdeg_BoI~m7xns=7k5{ahmUvTPY>T;40~7o
zTXZhb8r5~6b9w?-`^=_i8btvmAqpUK1wwI<*aEnuElj_}um%n0Ayifu{Bp({SP7PR
zPQ?ua=YN^lIIVOs0wGvvQd%9<ngKU$wL!a~K2Nm7a{WOH#UCn_+9~QIzxf^FS|uBD
zpb1oNx={@Ooud;|jb3XY0P32sjYPXTDo3-pt<|4gR-wm0L*|LR3bWGO?B|wKA;YRg
z(j0D$=Ex13D?4@L7!@%KbIZ0`xh1?ZO29VC0)J)W&ZB5kzK(nk+Bbs2XhSSm^r-qc
zhh0saKSPcdYV-yo69<8=Q3aH3N_W)Vf)S_c&J3b0a*1#k$T76jvUJt9$0nz#Ub8SU
zu+XzLeDU^l!P{xMIa=6_FD-$HG6r^*?&1WH9DQxY<9}TZCjE#0?d|Bc1H#YhWhd(%
zrhoE_1AkSKrr?h6yJZJT0ovNITW>g7QH~tg5cj4RQ+`9lqLTpo68<zPBuOX3FPU%#
zs^xe|!Z(EqOrKyq=1%){<9a!M7>*_nm!rF34**a36-ENhpl3XEc=+qd_V5s(urTE7
zg<f9O>eHZ0`jmddDh+xD%%G;LWl5tPCx46;$+4|SRwiwNbt*G09$j9RxJ)0k`r%1$
z$|X+&XuxHYKgBQJ(}1~ovwf{bdts(iXKa8}g>^kx0Pm9m)AmN`^B1DDB|+)>gbj<*
zami70Li>*fjkTF8@@D>*5*s5)LSfBsJ|M_6=U=MhLotvHLXSS}DgqcaV6a1u$$ynE
zcZD0r$4J{D$jtWWjKqO}Z;)vi2puClounuPZ1iE=bg3jWm0%H#1@l8-Z+B1v4TIt3
zNK<O@o{Oa%@`|xbno^RiNsvXJu-L0R6}Mt^1>2P(uC)Rard;_dF4K0D%(f0h6bjz5
zU@6`5xP^o+jb??ngHR?VH^!{9-+z8XwTyQw*p$#0F!pFbHAZXCsazpJnCxnK5HKW5
z3bAvXT#UM{Nl}r&I(>O0%3@(`d+~78>yNeiNcSdANx5}-SGL-><$z_$XNp*MDw~P&
z+UY0pyi7!@$RcUG6BzQ+NShFS^Nmt~eLker<F^!6*y?DbNLcdBHprHNM}N|rh*RDQ
z6-`%ZkKYSB$)>j}cRC;bhUk-^p~o$nwQZjw);m7|5giQ`iDTl2f#nI>fhm{74`N20
zlJqp<owV5TEMiL{oK_Ku!$0vuHS>8Ce4w73_MSntx)meIvFVu|pq`lq<W*gr)6f>D
zpgRKW7L<B)l~FRfnj}YC<A059s;RpkwKZKBI&hF8kt4U(H6vYKrONMYO86?%+}&_|
zcXKnko%DMTm;H;$-EIHBGt^bK+4PCJuib3ctYrV4n^VP(<uv1}*%TLtkkXGT8d-OZ
z$?<~9N;(3nz*@$^=bil;qv4)8w<L5*=YFUiyE)cZ1$*y_ZPCvUaet1E%o3E0KEE=L
z|Lj|2nC7}92%OeOs@D910Sfs`OgT)9Ep((EyB(oc`#qBPq-`Dam)h-XVTxSMpyrq!
z2IZR7Ci^}_Ua;q^#8-*2uj6~fA-i@=zL&5P=+keyPwvQ*)gp3Sx(X{sjal2u-Tn4N
z@~ZZaEeN$Eh;2~axqpP}wOI04J@UDF)T+lv6BW`aBs;FIDU;{=$Ly6iP#!)X7}Zfp
zcD5N~F}1C-c5U8NeaQ1*HRGC(b=*tEXQ4_NVXm|Lf$whtiR46}IACzMllA}Iy}BC@
ze#lANQl_2uwtvxk7!9vJN!rAK`cvL$x%5S&1B3zrzC$OqP=EC9-S3B@t}?1A7PXo{
zkoMN#ylTC?o&}vOO#fdnlUVf!1RA5%!09kjIhQ|dFyBNq!x^pK*Od9Q%`m!;*ysGc
zh=q>D28xvCD(#VO(XK8k3Dr0|HLa}BA)htm-`BCUMqi_;q}nJ=mSj!2{yNdvXO#8^
z&1<#x-3*I@V1G*7&&^-YoZ9+;o?<`rMVG{!TFc)uik`k~7CqhPobuG@fD|O2#lrvX
z0eIEIZL(zv%K57TZf#2!Io`W)Ybs=q>iBwze{s@nfyzd#1>x#I%gK-Uvh%gQW0%cQ
z`SGB3hLuc7$qAoho(jUc2&-u*h#$&BzD)fqz07%G?0;W3^jdV(3y>;&r-QF5-)!nh
zGqOyq?x?r;u3Q7lQ*MJvqd1H22Wor%<IfU+T{*!{7V<|d*o_&32g$c2M+H|IE)&~6
z#<Lk^i07|?w7X>vKE-4OOSb2v4%I$yz5gjJ&o8rxfu9fnU;W4fK0YM&<A8>9v5++;
z@2U8}<5r_18)_Fi6z`Az&+3p%9%d!y(-x>Lcn<O5v(I&z*HkPbuZht2&4pgU3^<IJ
zQyJXnh5i(lrB*=yMZ;#AI{ln;$5yWN10+kSR)308`jt|?RoNc=mjUhr8@Hfp7gVYb
zQkcF#a`Fo=GKc^GF*^g7;bIUcmw>Au2A41u7!ZH`cN@2{F#L1+SFF_Y)Ko4_+iCmU
z_pxK=r6nrijU=ih6*q66dw5pl%G#RbGP_GDYU}^~#SFfI!G2JZ<Mf8-SSELY!C)|$
z84L!4XJ7s<`Z9X`03U#Jm~HOz^!;@ib>;`rSI?jS>FHO`Up$Ydr*WA?lkBRzjq@Zr
zDHngeDC#el5f(0@JSmd=CRy|t5P&niPK&6J#o6~|I#1R`vWVg$S|r6hPcPYzbRCt~
zNpzJiljv}C{^RiM+irAwozAZT$X&LLitB8<TtwILO~M+PC+Q7`v5E6C%C1;-27Hkg
zB?GuE(`?P~nlg}OlCKH?0`14kB8%diI9-3nm#n3@jIPUa^YYoV;%5CJEqn89^-Lhx
zyDnEt=tVTViq^?(l1Dd5UNFFgYEBeI(3`9%8AhxZdD2CUSMgo6g|`62g21}V3df5s
zV8DvzQMN&pA8-Vp{caP_Kg92oD9hjX$`u<n7=|9}DeGpQ^wKpW%{pH8Zs#xl^VNUv
zewVH`86#y;#$`HhRH?VP>`i_+dv|zr*-MN5WsxnnWuig-ol&}%X1%v}Wzx^{_-?q~
zY|BZRC-Lf4u+V5*hD#kY2Js#aM}wc|2~yC1SJ7l;OXGOG$X5ONJShslRmNe<9-@1~
zST6LgAYL41%Vje6amAN|^>#H$D0qM0#l`h$ya~La>kQdg#buTguTIkShh!1JJ@A-r
zo^E<lGUg+mFSGaW)Ajq_Nph1cHKzo)jWO3@yq+gZe|*C=j#$a-2IU5Mp5=$xB57Lo
zlyL%^Pfd!qK=(As-zSXO-X|8>!xhdL%HOB!MT4T}dA3RNGEIu+h3{Gv{ULu|Zky2K
zVti6pN(mM&Qzkzx|0^k(TsdtpK&mchJ;nlY*}jrH!<yE^0UWNcvJ3X0b?x)Gyxyte
z<U`WD((Sx=JV8YBw|A4|r)|P!Rh!x{6SMUdQ+VYMT!*!+eUx5ZNeGA68B?5-@^0A{
z2R;wuHJgTc%c>y5r+1sSEkb{_R^!8}#fw$CMv`48^AE*#MJk#$fTnr8E|!)oZ>pe&
zLPPIdQL6YRGN%^ENoJ^pU4e`?$-0$X2mxYRs@&Gf#xNN8(_bu75cMDd9u88^{BfKn
z%X^R>{=AKg<o*~+C_VY*0WdpCmdV4=&xF)7e>?z|_s0&gdLV4Z30r?{q)Zyz-5)O-
zR?q(V0Jy%(@(+L6CfnWEZ&%?ZF*r)|^EhYA&HJ>@iLx7nGT+Y2ZQfp1shT(jMekm6
z#szk-N#_CsgY>}wjq;Q&5FP~FdCm;#bp0^6y^EJ0lKk*GUGB(AH|uwEm~HW*mFZ&D
zo?ORy(q=w>)ytL(s6BsLE-p6j^SFW1%z*8+7^o}H%#@*F9e&4_&CB{8iduu4WZkj~
zw_+O>9^opiR>Ru{Zhzin>1NmACT+VqN9g@(v`(}uGA1h8*D1Ek+U2FT)mu>xhp|P`
zHWbG31}ofjG*s3YCpT%66$&rSZNMfg173cbC&^AD_!Z;Gn{|Iv_WcTGtz17eEY4jC
zbptIIkSE!D-fLNOk@WK9{W>jrKlKW+M(iz_0PX!nE*VeQuW=t-b!>?pziM4`w^}gz
zyyowoeTiP>|5rLvU-bTjzvFFro#m8wn!7@`mu$SE`7$nw2(>yJ!ZP`}jQ;t%-$m>r
z3JB*X6aMM?eRO{~Iy*iY9!_VY^V!AuQGYs!UPt@e&4M+u|EgKN$-Ck7@H?ni+@|IH
zx@o=B!T4KjZUuwdwAOiFG`5L(TMepxKRi2{O$UFSLOq~KqsFk-`FM1Wt>xLKd9CSq
zfIVZ&;btAfTI0cg4Gs~<Jo$SvZ-M3L?PNN>IGhfSpmu+DS)gi97K%K1dIM}DV1OI$
zYfCV^i6+zj^kOm_jgJQ7;n}wg&N{h`v=h}S-#OsO35fs1AMkPDum%32V^!^4oPB>b
zdUqxOG_7;^UH|Oc!BMMP!?XVRIiphl?a823#a$Xhc5YWi4_iCz#MrB9AE`-jl`;b<
zT4sz{hG&02^iPJsU_YE)oU);P`hsFDUW3_I42SWce>yw-j*Zo9GW`F5nP2?xKmI>|
zBBvX#Cm3`3-EcBH8jjh_8T=P;<08#xbD>QNlBKQsFyUY(%*1r<ZP;X>r@2*6O^B1x
zVgF=y(tkTRf%=_Qwn(qiWN}d6wuZq3;bdw6S%QChDG#dfxMV8hZ~v`fuyGti4?6o_
z^G~!N{RfHWLGOK1g2pN2tZD*(aCU^y-|&wE-RQt>;3tFg{<uFKjj<82>9%jfs^p<}
zhqJS9XFm+ali}zL_~)x?o@3?T9m42OW~cqLA7{tIlflHO|DTPkpNu9`qrtjSXEpmr
zr?Y?K(fG8FEO(XV%$%ra7g2F=HXRQK6R61yzdTJEaJi^DJw@eGu4vstRXHCIC)45C
zfGZ`w{A*nKY;-pGE33~?21SZ`be*k}pBWs6`%|V<Y4z;_V}NA88KVn@vH#+$|GRdk
z2(Hww;&~DsE|Yk@-H4@-v`XM}lcfu0xZpqQ&OuaO=h-dVFvccRP|RIs8Ptr@q7Sa*
zqcmrllP&5x0@-!EN)8PDlqYP-yT-@S9#eAL<udxiAEJ)o2=A938yFUU$85QHSq$H=
znW=gh7fFY=`m#l3UZtX=%CZ||OWat1MY>7GidlWupALT*%m$+q7%etblRGxxD?mwZ
zbanR8E-jKxj616PzSyW~<mA|BKocB3PyX-viF)v{5wyc`1+=_9v<mDb%&v#03)-N5
zl!z~0`=UvFpI5?w5$u?MFbnwGl@OQ}ci^B3F&RDCGV4fTV_+A_u|Te0e+)5;%T-r-
zw!)oHIg4)Khl@;l6?O1M^qNm3w*Y*eeHm>8i$#kpDb`QQ2<1%=RxNI6IXju@SwW}X
z8IxIE-lX06k5RHL62xqO&AN7z?92JZyFj7Xv{8iDbtY2<0w>3R57+o{`g5}A8gs0o
z-NW&Nx2tDkWxJ2iV{_)xZSUN|#rnfKyIs?a<W3q}CMWCd%8~{e3ATQZ`s--BW>P+5
zYyW>F3qDOvewR&KwOB8sQfz}_2vxz>a#vUT5nJ}Bs9P3%BASqJDp+8qHi#lAqcUUa
zBV`)?NfGgB0piIc0>hcR0U*{MM2DRm!`SfgF#+MQ5fsygz<9e>J0_zI#P2|t;T#wp
ze~m=QKy=HX51D#vYf9jtR-^W|KN+yq$?52aL1+JxY5J#mvdWm0=_0qWuED<H7@u_x
z4m3T%nw<^L*rMR%q_Yn}fKMSpE?zEmRp`@@KlJM!j!sX9Q&DxEtyXDi*F3~$P*K*i
z0Z6P7fQvN%2w`nh^DCW_RUp1`HXZlRe<rXHITE!cZ#y6)o7r$CKb{@p8en#O(*JhS
z*)Q(a^QQ>sY8k&TG>i#*0dS7tu>}K`pql8gko1Xu&Yn_49}f=M5*#rYo*j=m`!JpJ
z1!9mgNunW)@dY0|CSgn<%)Vy}sVVxNW@>45+8=+<mNgx)`=7E|^%U6psazvJe_h4-
zha@*Un3PjiLb_y6`TJ?I+K`RGB4{w4{^&NS+mi~}ZPRK}8isbWUaRM9v2}6&?YMu$
zm;@q3w|o=EpfGzVc4k;j(;yOFDQj_&ZNMyk6(~f@j!b?dfcwQeR!iMFn4}5D>oWVw
zMb{`HA-y*7lVyBUOkl-~?$L&?e+-<4g;sN0^dZq5Lco#)LD(TgKiZB&x&Iw4E?-$M
z<Z^7j%!=g5d5IyDU%R_vZ=%H7BQtBD=h0p{zL85s@w@O{l}-iMRbgtAj<JUp!E{L9
zcOw@=3qg}~Fwz|-WTyukpzrduWUM6tmiac3e=S&)HnPxjfJZC#ha>1Be=R8=Z_7+f
zH~lbSk}01jgVm<Id-s=?J?t$m1&swZ=7LZZ0DfP0ICc^v3lkdy7l2?F)(jBId1>M%
z5urKBL(Ht&+iZ*LPCN1&e7+OW<n$mqdc~~d#1L4YsH^bT?5@`-CMV3_9m08HHI)`P
zrXBE=pf}~E{eF`qA3DM2f6>+hY^^puq^^A;`~AJH7**a*wh4C42A6GWP%a!QHNhAb
zNqaQyTzPDj0(qC4<NeVBDO!@=EEkkVT$@Z99zihV){ff;!NYDtObCeb4It;qd+<5t
zwy5qnPQv-M*@z?eac6{;2o86pOVNPK1XJX<%=p-8(CzU2x~H0;e+I|J*BVC~UnOVW
zLr6F^=cFW|`U!jJ{1m}5Sy<h5&K5WW=}+|l4|xT9ZkyFZZt5$vL+~rzO>jFNq6VQ!
zWt<OSmEr|_>ELp3na$%RTMeG$YEY`a;ySziE?q2=bsZm+`JK~mZgk4n#t7_w6zV-_
z7_EJ~O%+hsD{#BcOMLQy;psRTo_!ge#vhWX*yc%ejW|YY*0(}Zqqtem;K2->^q#{E
z<%!un-xI=j<f9H?E^wlXA-A%HYjl<|yFV$|P`?Zpn!xe5m)js1M1PydX*vh$2^_{@
zZ2$UoWFF7yy*tG1nAzEAIy)X+oE=s8&3sygJBR!pCDoHt@1OwOK4T>@pTMh9D?4jv
z$cCI525H6e&x}`(cp(PKVBA-(tdNCX+m(CRh3H@Z3Kkft00~yqk}>Fp`)SJ-A4@g|
zz}*FBHnZh|%}c&4yno`me0NXZ6ify#woCMW%kQ&1*(~FEvM=W<N#iju^a;ppK7n(k
z;GMb`>BX*!=#B&_OUvIzG=l{jJZ2LK9~6x)$SoOxVNeXqsC<MpR8)YSD)B%N!V2H_
zc@91nG7_HG;g2rYbvh5jcL%WTs0hfu8~E(GHMLwObs|Q2Fn=P*xWKdR>XNBxBT|rI
z&%boB@ZbJB;vo%o4fLVvz*tsEeia_qCcFwGsVmC8A>3q@NC?u%#(Uol`bR)G`5p%J
z2t9(zB5`>_9hKrTHcE0>FgZ_qb2dL17)#h5o(y6Cd)%M(4-W^E$!t9M%f)bP1>smN
z@WWWW1b%ebUw@>Mh%IEIJ7}1jy%8gF5WRUFJr8(asPd);QaddbWC}r+!y&6IB<%@c
z)s0ePN2x)IzswzX>V1z%-S_2n^d@=^Ma*W>;)i&dE*uW0fc)+Ge^>201*%l3QJh|O
zJ;rM`QBSPb9fy}5fFM+t0)1h~*>9>kN0No)fW6!q41a&!DuBuOvW6`5ZZ!TLLP!h=
z;1+?67mCY3AXRNY-&;(G0HnbYx6lHz!fL9yya=!wBLZwiy|(BGAAg0yi7twR++e8l
zoglsub%PZ0HclHEv+#NLrEhG18IAccgKboR9~`?1sVbPI1dC_zR4&-cv~!uT#dQ*~
zWn&bV6n~`r|NQaK&;QShgI?4xBW6<+B`$jSZsiO%Dwb(c{t;pbR%wwG6b#mj*<d`z
zfTSO_4c#Nk`Vj|@X|cm+cLsF2LvWl0za7`XC%AtOA8+ZPYE^JAN{M=@%^8*y()XUP
zZ~GYMI)q8vjrL((9zA*T&*vYXJYm*W!R+{m?|+^`DibMf_PY@=P3}QnQpECZw~~x}
z*B9ctD`ew2^mlYI`JW&k>4lIKeAkd<La&DiCES2JaV0b7pxCQ_H#Tj=r<HsbeG@q}
zik?O<qL=PdkJBI6f_G?mVMg4jK9sEE?AK4*1d|tmuUF7nP*a&;-|(L=qt56Oj$a(O
z7Jptg7n`RKxlnK{CVO3{_?%$y#_KWdSq(Z1^q3J(VNpOl?&Eo+%H^nUjA%dYEaqW5
z_xF5Q;Hq69dJ$ad7BP(;Opb-Aus9tdB^N|t;T{Ia^Da+_1rbtg(n?bnytX~e&IR90
zaI73|3@q=s<DLP`wq+M8^P>u!%L>>>-G8J>0nuN=t5g^!jbX|lx#uRG<q`!aWbWDY
zAPDQ_pbs%*?)xPvPJeu76ZEUnIpgB*TDM}b`JhF&alyx6@eBf=7EgKNvs@d$?Cl-C
zi;8TU&l4A#l0uzzR&p)^$WOQ@Ouc5-FKai2=)AvgnFSmJu3aA(wrd~eag1EYz<<?~
z$2?mP@U`!(n8$1R)}2dUijH1}hu7n!VhLLml3Xa7^Xl%Toe8cq9cj(iFvAk2Vl3wt
z8=bhs2xV~fMpsPhz^+WJ#~6p7T2z?JAvUB*UOu&kx7k93B%KhVQheHyGh`<jc4cTb
zV0Hw5K4^Y1(<elWWNGt@eCzUymw%F^2eFv!sn{WNQ0C3?P)=2jTdcB82Y}BqPQ`#9
zEX)R&y%8B<A&`%5Q#MoAeCSh%-rZipLC#+EEkwXxClnZ7^eF_+w;Xqa2%9*EqvMJO
z&gl_6B%J0>mkDdo(U~0V(AS(+dzE`MHe_3db12G_u3Piux%|XM!6r%6v43j@-RafE
zY^Qn^F)SG<`W}>o4sBXXLimtV+G@B)Ci0m~aI(R+YdEd8<lL)y)K)O$S&RD!9M66Y
znE+wK@YiJ$BIcJ5XkA@4u&XW`Syb)pqmZIRo-zy{p%xb?4VihfN<b*SM~3W0Ct3CZ
zGP_Dn^BAnvmYp+P_TF7i&wnpxEY$v;KOP>h`edaKcf32C$Sqz?E7&1E%Q!8HO)^he
zH_`q#2*9Ug_jgvM33%A~0yGxF#H_=fg)1o4WK`f2K3qo(;0pG!JG^l8AJEK!2}P8m
z&bWvJhk^t{k#Z++>d+>a+zx-`7E|HDs4mIy9;!VdGTe8SVLzg5*MDiVnQ$So5P}AS
zGKu#c)477imnh`<<xn@O=mDE{J<dF#Jw@3G0-~^1RAi|JpuQ@ZDJA93(M(!zZL(sV
zEL}mHZQy7QB~;yKr&*prxVrlso|$P8=yjt+-Lo~2HNbX1W+s_H&@4}Nz!*OnI7P=y
zRmMuy#z@t~Mpdy+D}NSpE7iF2;X?#aiM|3vq8r0C)BGC{E`CP@Fu#&meb_br>BoHC
zpAuZ|QJWZKV|(=UaysM#qhKjcGnpLB**)t`Xwj<rrlz$W8Lt|z+Qd;ys~IDNRIs6C
zoSOHwtGLQVnMnh$>5Ao9n@-bIZ^X_YeRjl!#>>dzMyfx0=zq9;3l3aRQd^~V?x}2}
zZgQwr8f%;Sc3Vw?Y9iPKaE0}r8zNTS)cpiSECT_phN|Y)?!o|#bllG)Bt!^(rMh8G
zG2_$M-fxp-cKeRMwPti+=U7fq0ZeGns@OAdv^A*_@GdnU4Plkicvldg9)KO>LNL;p
z-s@?yY1N-h27lw}aCA01?hj86>bK|RDRyfP7>dh?T$YA3{56ef9d-%_NKZv3q$;yH
z`8l4KhfJl%d0J$(A@eGS=+`nu>Kj}_4%NOaoMs3an6i$tFVzEx#5R7;MV7#>Z^NiE
z{CsY*n56$my8h#7x-uVM#|t>%YPJc%CIzEWz0oOq2!D&%j?)RhHl9>~4h3sEM*~pP
ztTm<uPsQO;<G>>Z6Dmfdc$EmuPJmC9?NAQ4z1Om%JOa;>1n6o~B|?4+Ta|q@2_kdU
z<2^X|<+b@3=mP(T<QI@e)!ehI!clF&IrM(=<LSxp?E3)D-lEAG4QE>H(2QP%0+7UC
zrol%<e}8F4Hd$uL#5&3C2e0gD!4-}HWDg?AFvQTHst7IQv7;6^LTqcSeKUm!0g}Zb
z=C>Mun3f06UOa#P9PzLbj0-KZ$S{oE(5eUyCC20<!4vi>Q>Nj<A6n>PawYx-y3;Y9
zzdHo$(Pr|l9_g=*#Hep9Nuj2`F()Kv$wYU=*?&^wm7qa?z4#%?)2lm2B%6IPFiMM#
zCpr%T@0A?wdfMcbPeB|Qm7|Y{V3K4@i+6``x5DUlT{uW%cS!~TN8>WPgk`==(vbRk
zh@2K(dEyy^qAM7)8$EX;LMWaQ945PJs%%9N?-ac|ScK;GSg>n&gbShM<P#VhhIz5G
z!hgq@G6BRTxNOdwjvqZ<HPYOSlb^O}PC2gB7nLCd&5F|cMV}+#h<K?RoSL9)%tsDe
zn5XvPuQSMWADF4-KkryAs{~%wk8V^~D0ho|NbZ<94x?#57k+6EYe%V39jH<gCX=Zb
zElmIm0|EgToN>9CyjqTFDgK*UADZPQzJC?Paq^U_jS$^_0XpK^gKX~9LM8;vN0a4{
z3IbMRCgliA-=u{#f>r(nv&rIawM^F^iph2Zd8b3_Qht0wf`LBaZ356H%g4&aG2KcH
zm6|l#ZjJsJC{Xrb6|t>!fG8SkX89|Bkz=;qK$NIWa*@UYv(npX?5Z$^k3x51UVqIb
zckKqF6W~9YBB;mnv;BB7nDOLz0n!=c)wCyj6+OXJV@zUIb_726Z3uF#)e&rW$G~tj
z6DhGF&s_t@fFfljLha_IJ;q9ffulzW)J`p-9ni#b-Ti>XZBR_=zXn4M+PWo2Xgyk6
zk(-)3N<>O+JPhG&$W7^f?}^i7M1PQCk2xfSX(m5Se1XDX*-MK_yh?ETugjw2v9e8K
z??e^u8!sti!BjbzAO$sSCAe@k2d$cVeESP43L~d3Xpl7KT-t<}j5T>ctW?HwaV)_G
zA`485t`PSNIz?0{JQYwtHe;;KRj;hI)yDFQf~6q&Kt2Ny4T6<qteXY_o_{x4S$Bm*
z(}*~r-dhm|DvO?Q$eMRUy&*RI&G#L%+in<x+NSv0@GYWS!UVycn8sd!@<2Y^$?dbz
z(SYg7!C%h@aQgw?ebJ5f4`GBLp8maveUlssnaGe>khTH*b;T>llD{9Rqc$mz_KorF
zem8RHK%(8|l!rSyH9-ttTYm+78i#UcXm?R0Jw!HG$Dd>YRX!yRR@KZCIFo6mbh3D(
zRkVE|64MO3427gu#9@-Ls(eFGL+Q0bl#{^OUD1Q8zSYNB8+jWZY!-M&Px%x8KCYYq
zlIL*>Tqg4vZf;M@LPU~bH0csX{!Sk~d-y3)Pcu7orYfIClQKF$<$vKvzz{|J)|UH?
z1Rng0A$4@}Gh2(7m^d0b@mQk}pof6NH5Z#a$8ox38l@B3?$r_4;6AD^#pYbIf_xvD
zwCpPC!va<8KzGIZqJe<MXayxZE3;|XGQogh%HeFeFhsHOrUz#Pc(Pa3V6V)?6VsC{
zyx-i)AOik$Fps;{V1LU@1C^jNP@5-ow4z+GIL1TEmWVBD((moqn`oJVhJGR3-SGXZ
zI?Ky99A9`YKEKRYUK!s7sG-%klMrWTy6R>cRQ}4TED31SN8r<yu&tR+FHC5^CcWkm
z;P1WU@v*bH<6{e!AO^Qfjb{6tf5KmPxxIQJOmBSRU5Vvnj5E>IzG_pApDTb{R%S4-
zkf+=#l{LPquc1PsdCF>Z%|pCD6YyL1WIDbWbeYm&gB2~(VwXuT7<qruNph1cd&k4G
zfu((q2FLx2lPN9L$Pf(DfnZK_ck9C2B5kszxz}<xMdxB{x|`4>7l3{4{5Z`ExI(l{
z@)cN+w{Soe(-|-mQXW0I!U*3af+z@9RJ#x9qvC2AYQ^D{JH_F6u{Ug*OK9~6t=%&;
zWfm>6h@Y^=L(rTx#hib}8;N)>MiIB~!h@Ed6w1u5J{SF<!>3m?L>N#tQKBO?y3n^p
z0!CFV6HUS+U_|e5mAEPZ-kp;tMJJqt@fv}OEiKGSrhq&~k{B&Z<ibcZDI43n)n$g~
z0vQr=RrHGUv^t56mqkGm1n#J@>g?OG8#^aPp~cciis(W(NJD=FuDwI-VJ#<VNlG^`
z3E(<4R4t}+-+^dcyLRstoAABwLw2mw{>kyh*&#%r?zc!xqHW=zVMYZ!7~5ygt!7Ea
z7G$UK=4(z+`TR|!UH-~ok#P+20bU_6V-RMz%pmedcceV=I051vWfNxFy*>HR%*IaE
zE{u&rYi|(40UdwTv`~L$RDSJL=65mSVm6<zHl6;tx@fCwLSU6<lZ&^L>CCx(4A6N_
z27=Np%01I)&o*(4GU)iTo9V)+9Y}tZxpJRH)6vl=!t0wMnS#*5or7nPJZ*G>(D<+K
zle>37<IVwG1eMA9UI5O4sqFQQD2LZ^UL<AnoHu%N8Zv*VZ1mUHk-qbg{qCrnqtssZ
z>F{(goBnui-5AU<S*0r(v#LR&yv6t8#=II>TKCvnf3lCwARm6$A5R9;gRVk~XEW+r
z`PD!1fEjBw0l8&@V?k$iVW2r$cf?pt&IgCX{)tar1;IK*^2r$2xlR$Fir?+cQ@MeZ
z7OX<H+&X{3h}Mlt%%b>KIUWTC@W!|vVFYSgGxl;w?U_D)sE5-oQ(utzBuedz9W}RG
z;zeIDDcb+UoJ#2*6BZF?Dd>fA9&Q<W$Z=B!T~WR=h-$6|4zIJUfP6G+V4*aa%^Q##
zFQX)dJXG99UW;@#b6AuDRWSFE3GQmUo|l;RAk%+!;<Ak42o6962RFTjz!-c<g^<~Z
z$Tj7u?*~7=8;y@9Zgx76lOTzUyNC_tEi-YbI}nx?co;nB2lpASTO!kj=z{91zt{T1
z*~R!I+U850IO8H;hAeI;ZAHr?*!ND+W>CV`J+ME*xbu5q1|d1S&@00$-PK!y7Ht1H
zpwfTiH)un(lZ-7z6&$xPq*tucSX9`69SlrnBCv$78MWd?4piBpUSY>9m6#eOY}`B%
zR1sltm6Y@AfeHn-9)Ir{#`t(5V?-OJ{|m-Cb3FJyiC8Z<$T&z?jZ?$bo(jIXR#-+q
zKX{b>BjzIO@rh=4!3e`}bc*c}+3@K1z&(FVA~YVZ0iT!5=r*j-!0w*CMPv1r+@&#D
zJ$hZEbSuqEt>vrHkyQ4)k6fY2sRVF^(OlWAp$M$bUFoG82PKwoY?-sKZX7mCkZ#)4
z3@js~y@L^aZq?-HO}t)ckx9%Y6P>Qd#0?INC?ZejVDQuk6mLRYX)OB(t1CC?;IDtR
z@TX*^LyyogmD@bkbKYi=6Vy7PIp5$MDgfiE*zTM-!4nz!$t%M%XcCEQ1zbz#d9`g%
zvX8nwY((zjsxz`$sple73H?0FN@jaBwiu-PCQS)9siV{T)H4If@{kwUE^Lw3C@IDy
zb<7C6tS1pt9-yR&Qk7kTbB0lc)2n|MZ#Kz#ft%(NKieKY_u4s-C(aB5si7PZCS!54
zzG!GQnmrcPYLaO1uJW=B!=nV!@h@mZ5!sL=qB_BW@9$TPxSgQ1YQV+R?44bloK&+M
zYtVchmR!}Qtu1V}FkhVc(8P*uXS`~s2yoQkXESwGYtIN<Ql=nT@TeIN{4jr^;_b|i
z5h3>wbxq1AqK#+ZPlGL+yWEIW0I9#e+0>l;x22r@c(|}m@Ow%65LZhgh$(NKp|z&6
zr6+=kiL1}~i&NW(pse8>cE)$+^48KBHp=wuZXIoDkBJ#K`9>w6lZN8W`rVvCyN>f@
zVMkxe6afc#18yMSs6%oSI+B0RY&=AM3l`GR0t58)!3?Q{pRrxc3t&aA-#JCD;xm-j
zy3>ru%S`-~Q?Oz@%p6N^RDQqUc&JQGjm87<yX0YTI`x^^2o8&hLr)hE42+qkw<%Cv
zyh5uvh}LMgqclGUhZpyqEUaIzBa1!<J#>vh%3LmW)b-q>_41AyAA5g{v>Y>1SK4D^
zX0fzz>D{tItYzc0KT{TVR~t*c!08re+Nl(nO{AR%2dA6@5fEQgZ6ot0Io0H+Nf)fR
zG2Bj8R+vp89Azk0^okGZroWyi1ylGPm%!#Ebpu%7(=2<MW_Q9yG%_-aa&A5j`FUt*
z%tX!=&zFT1;^u&0whe!`Qw{8??h`|BFX64=-AjPOCnUr_2^Seut7jqj)Y;Va+D3-5
z2h|Nv8%>9MoZ~xwtSlG?LAt6n)Nlf-ZS67%<4iW@%BbOTsKPVve^Xx^6|hNL3w{X+
zlYa_ty!__DLLZDO*<tNb!W}&?u#oRYK4%lF6v=ph&(d{=4-bFG`eHmBtZ~WKQAk;9
zR@s7@hGrw4Ij>JN!=>8nVJW?`@^^JYFrGT>EP-Hp{S2H+?z3s0B=D?d`tFwdAUrde
z;kHn{@Q+0Wdv7>&gN0n@uFm~vG}-KcfQ=Rsn;8o;p;Pp(2u~7bpP*xGb`X7I4Nmkj
zq=zbZo?y`n2h4wDCy$b1o~JlEZz9>JLJxy1R|LVbrFln@ngAQk7YtVgnm!N4s-D6&
zFZ5xOl&sDbq$yhP*i-SMpf1$ZtO)@vtOkD|5utNn(6>NfK66aXy}pZp6%^Kx#3;$<
zX#vY`JY^Uc(P}%tj*=@@p=3WPfa_!qVR88#?4@RxWsH9pN-PrA=M-ap<bEb5^5<|j
zn<Z?2h&^lvARb?YAmkFlJr~*fNr@TX0e<o`t2s|gd8H8F{Kadk@l;m`UN>UB!mCe`
z0(XD&l)+~x+-6(2@*3_ki7u0<V8g;jlZ3+<Iho@{zl?OZ@m(+KE86i$K90vaD@9-<
z-h7m8*Cl^Rxb#ZgtYd;G7@seBBp?tA!qh)Bzuu8?lr+>)M+R@pl^^R$jyjV<&g5?7
zwG*%w6yM8x++}t^CjeL7Lr(?fR+)6TU!rA+x-K4~bZe7xmc|sSNldHiT#7EkHiQ@d
zC_haO;~T@Juc7`FgXXsOKW6B1tK$zjfN)>l@>73|ozc+$m|<JWKHqD^jD?A|>69{+
zJBQT@^|vW|pRtEs+qPp5b;b!?QTeb8APsnJO|b_xgOB`c6szciR~Bqv+^^A(4CC>D
z;ZVOQ44x=;Lx@!vS~#?C&6cqb7FcYzfS~<g5m7fVP3%}!A|Tj-+8}mcEej<%5Rge9
z4*7rAP9&#;J5WjlJJ?;ZvA-XY8pMaXMfc2bj<gtnVXgQY+qCzyLW5xYTddS1C?Id=
z-*XWuR)Q!N{oI(&Sjk%U`t@S{VV&K2Q4s!tFm?Ns$jP$dc{955=nq2#4jb>o5wU%|
zS~bVZ<-7isd|&DySsPfRQ(>Xl80WUFbg_R(M81-=0HOaKKB+n}$LstXkU|`GGk8(l
zJ8+n7T#l^m?eGfjzFovO(Hx?W+21uRI<MFgaUsqE!UFV%{>jAvR=W@_fDy<pAk3Cq
zrkCk5W!=Sl%UEZhzB_z+_H6_nwS($ThjM)yGe=)sb`;+n0=iXk8|tL4B?8D)f<S*!
zG&js6b=<3{PSY`i>a{+0N9TeG85}`RE8^)rLD3b3GhtH>-Dhw`?fdOA&XHy=bzL<O
z41#nB>B(vhsF}p}8hVT)7@7#W(_cov|NZYH)+z*&;1zlpR*-Nf4V=+Mms9d{3<+w)
zPQ&u<DbL5VKoL;5;EHSRo5_Ux2ONJ^{ln=+|3pLp8Wp@_7%F>5712WxAs6`)u4h4G
zyfq1R6f$Zpb(gw#C_r7C$e4Km=f{s!wAD5ztr;si+=3pC5Eq*vuiRH6l;h@XyP}%%
zp?e*oi~`*&#trY~_wUh@ZAB-K@ka4FTG~8@4n%pJ1CPyuYY@&s$MaI$Ni2UCN?pc<
z5gvhsJI6uj#KnhXVS?l5u#1f5BY7|f&!V$-i<|W<+mthT>*8zy{GF~D_#8!U^i9+$
zz>9mQ4=IAIW5U8A1;{oU+`s;1qCiwL+2*@J-xGqnpI<&a84k{-v$uT=XB$q2qqF;G
zUoz%H@NyS!Y=BvDD6U09c9Va1B<Wo|^EGk3ihRvCOEBWif6U13XA<;zof!_>WhwSe
zyw~3KhZ0w4)jV)pGl1_#<L`%O-}-hwG~VMom?mg{U%;G7o@Ntp_#8Ju<z{dyso<<r
zKOmfEbw__Z)Ksks&xqAiS%D6nv4jS#_%Yu}4apBjr>Dc|bZ~^(PwIb4pTkTTT}&!d
zjJsr(+{!~IJ!U-!h6uZTX^LDB2!);f`)Twd;7zGZ@Jnqj$q#HYu?~w1Ao#o~FmDGp
z>6gh(ye>rsjDpw$(twz7FVaPl`|@(T#sdLx!9+!N-!J`&YrK`X>%X|fD?4N20--8!
z;+8PjD+3J#32cb{8U=sA-?x#U03TWRQ@2hTPr1N|;K`k}22&a1A7`h-$%F~A8Iu-}
zf&q8Iz}}PD{~+5RTllco50%Ek(=s0^)gn|6rz~aV;Qhy*mN1PudDy@Xr`hsHH(h2K
zK-Fmsr*~^jHc!a~EjH1v=fN=306VcjWI-z$hAbiNz>08oFT8(SciGMZWp~}{Ev3f^
zBhuH}J+^#+FGaI}ivb(eNm7380eTZ%MapLb3r-bW!7uf(Tg5T!%9cH=;S=64EZ_Sl
zUvyRP>TogivcwEnN~m%FYG4joSH@w{RRJ;fx8c>o5(u)E0YqJ4PSkg=G7rS4dzT=$
zFeAa1^Z3s-<$Ql~8TMR&AOQ=9^#8!=bi8#Qmn*Cdnf?e6g)eLT1tZ4_rmI!5NSV}K
z-np>in>by@m&=6Bj!IvT;DgoO44Qy2%9$w+e4Da|E2?x&%?VZ$EvL#trhqu`%@ZG!
zKu{R?HyC|!i;Rcm`NLzK+@{CJOgTzfs+D~af|%%rHm84;toE=YEcVLA%wV^w7H!E-
zce`cV+v-m8fpUhfH8I)htFl`+c5kFmXxEC(evJd8z~$60`2^i$=^CPso-DLiHZ8F4
zvyv;mG85?}zr5U*B*0rXskb>qoi6X#lwV^VW)mmN=yv|}MRb{5$2V!V&3n;#oHHu{
z9E!`ku9JVkLIaGit`dk_TR~={r%ImUwZa8DReJ#Wc8(-Hc*)HBchFD~-%{W(JjoP8
zF#-8b8n*ELNr7d1(NhW@YYR;Yu(>e1vkcbq=LKQ0e;Jaln>fw6_b{GcN5%FMHdeXM
zdzBU|a67ZPO#zhs=tb|?(j(#7KEQRJtPAkATw#Agkhpxw)E!%22|tmyvA}`x_+c)s
zaerYU@`x8%BrbMlO9!6VI;z47nFy2ofy@J)P-I;mfwlrPxF3sSE;a?0>4yY)hJv?9
z7r1I+!+fXJi%21tFtpJRi`oS_w^=lq6|ew3H||t#7m{g16x)Wd)|#z(BGFKob(Mz!
zKJ<SyMkgT*j2smhDf9-i`6yk=81Bam*CiWIu71mG!@iTVPF@7fi3qFKHY614R}j%r
ze3V6OlRMzs5-#F~G?_34!#G6FAIPE<YjBYu;u0Cwq!i)-naJVMc7r>0qK23vsc_5k
zIl<U)xojT6NYY8?K-g<;DiDw?V?nXt!GV9wtKg`&pxZ}jEN3Z1M}yRyI!3ou<$1@d
zr2kf~d0)4}wY0S=xz?a-Wc5i)slK3P<<wiv%)ossMKhn<D>es(?ph?poQ-zOMYExF
ze2bZL<g*nfeOAG|U62b>IV>_ZGcK9NT4gyu5aq=ve`(~YwYU^SuzJAA>RaW6i*<k3
zD?<39GIT`<^(NcEBCn#VyOzUpB>Pv?l`GUL@ZL&QlY=iiH{4Fp3dg$N#OjC*L@g7E
z3sLNn!KJO;6hV>@9KE`xLAWby2Me_}4j>RTg+qejkjvi+(QyhB;k$&sC0eF$$mcU5
zNPmH)nunA~4Zx7f&4Y@nX>o@{zc_!qPL~V?o0BXAth-;WODRabWVTro>v@kgrTnyC
zTQ+aJdX4F0;CLC6Tb!jGdH}oT;8aAB?ywZ~Fl)<@HZNPuU?5$?f(>a*t#b*|2G+Z7
zji3eLxw<86>5qlKrcc&B@;$<)`O#cqit<NQ$K=!@{Y2!b&`{bsYN-S0jl6%U9)+s1
zY{;clqa)}_gV~QSwkfgAq{_H*x=Xz>oxA>PuU+{Dn+`k<V+0X15UEBT%?vYv+V@sP
zdi+FJ#~EnXH?G-G_-Ae9&N#C37$ZXT*KQdyf_8YXJZ81=uwJ-B<-Ig<a$nLTBS*(5
z%~ubh3+EImuj7J;_R^US{P2H)@Qrr-y|*a_AL8_Joe#b`S4@M9Bbc4rkSA0o7_lvC
z5y7V+KoTX>B2cCx0-+E+@hSyQc|Q`tYlfW?CE?+(n1PQiu0E4V=!}EMT6>zeP;Yxe
zjxm6-)(9|A_25@9fXxI1JD3_*L>))oy*sV5CE3tym&NYMg4Av(-ll)#EAY4QSTtMZ
zDYUUuz?6IsEckRmceQ5*)i%BAQ{zB&(^{{`3&UD@l%;yxCAg(ZA7iPmh%Wk0F0jLb
z)t<W&hJ%(TLMx$hTfhZHh=3|MQVw|-(Nt)>5U<Ft)krXSjfvoo2038-t~ALBqiWe6
zqfi`plhKx9JSX$%*lK_N9-=segj3rXW3!9lh$1R(3PxBa#4@vH>2njrx<x)#%S6F*
z?sIdPsCRPq5bs)Yy$Q|8Z)N0Q*<mKyfOedR1`u)rHsv{|R~`p?r!K<bVj`GJ2SQ<_
zT7M1+Fe*;IsEr^MH^(E>@!RXD{xHld7e%AGb4=!VqEE<BU9f)>+Z3l5qUq+v*)%`q
zK&{c;_@#|#=|Fv>Fk@C?l3&I1BpRY*!h>e<da+D$GfwU%OZlGOF`SwTq*zzy`}kGu
zL{BIT6zF&H@&kGh^JGo6;3K%!-wjX6b#}{-${|umtmW(Imchnv-RLk|E)zV=AhJxq
z5lLC$UV>T|iadX+qX3$bO6nm-xh*;e(VN!_hu+}yeEOq$Ll*zqC_X$p9-a+#4TB#I
zd?CWz_+=ntJnj|gKj3uNo9KD;4LTFQi;HUr))N%ySQL2aX1FFCMr-jc;4pF)FrI%1
zImC-QGf&UU2GpJP@bZnd_@#lk3ug}yFYu;%9j$5+W-EVaPTYx2ibF*=r|Tv`UA1Yj
zZBNfByS~%6z_OJ}=!7$;Vgo{78Gqla&+UuU>4Vcdbpdly+0bCFB>8tty(GDt4&Rgl
z=Il2ny*V6|pMXMh_xS9y(a~UbarXV$=-t`u`{CJ9H`+I&vhfb~Jeg<j*O)LF!&-n4
z;fvT?255i#K4>W(ea0n3ZJmt#r!|C@IMPuArT{XozN5IrT@W`FJ#`mpx06yD;lN=k
z3C)nQN>2EWBLkc(kJT=Qst!3?$f~9gXm;E;aNBL*I&FDs$m|$p=T`|td(6mdwo%Jl
zlUSyydl3D;cnIANq(DGI9vN!8xp3oVr+J5k=HY*L*nhNfkd?vpzmz7A&ddslB-s=P
zb~S3SBFMZ>j#h(!ICO+}#mu88@0(x%nVvVAhucS(Mc~g+JWPBTvvn$??ZO>)>qoe!
zyhSk;%~nAR<GTYo0Y8GZ6g!rlNbRoRQtI8o!q@T!bhJGXn#fJzLsk}u3)fNBoNDrA
zV7`C&eo@WX)ch-MQ=I!o_k)2_thq?5`Iq5Bwg#^#SX~5*F_D(8L%D?($yLmjcj4+g
zTwaa>1j*4SgCza@PKI@c9OsRJG5)kswFp}G!_(8j(Xc-qOq9VMNW<W3V6zj|rlb7O
zCZr2Tbf(3f9JPdCrWq)+`_jP{+%t3}&me!u6H~r#sB}|GI;&=1w{8|bM2ohpucH=x
zEKO#UJ!p=)4OdyEA#G|LM2qKm74o}0Et8XM{-NsjH}>>He?7+=NaQoF!k{Mjoa%I=
z2^YdAaDSSE#Mx!HYqsaKqx;D$G7je5A>wa?c>2QM1r(NzS&;H5@OU;C!$&0#v4DT2
zavMp1Y=9zSd(3<blMMmx)h>~CU$4A7MEBLva6CAij>bRo+ti;tDP?9^AQ0q5U1#g3
zIw7lA(u5Z+7FG|EzrduF9yON|(n%8}G<=LGds=@GLH2b2)W~ya->dY0ZjvgyW*{Aq
z3B%+e3so;c7Lw<|(*f=I>41PyL<)a}+2QE?N5-H*rM_DW7iW`;^YhVoIyjmgkH)9{
zX-JflS%i=hHR>(kbinKp2K{TN9DJm}Sfs_@@c`3nII9aP;Yd8GVjqdoo~$0~t0RCd
zZm1=I-e7Lsz2@y2tu&Na@VU3tGMUlvv!wDgj(LuxT2xu+?0gWuH5D8Rw-<jwA&w5D
z#)D6-j-mo^thSns?t_f5tCt=^E!}gx?J;*apt-#woFm2=e@kw(-X0=k5vC6mmq-NY
zftGbZ{KyR_@tV@b51>em^Jxu^ra6_HrUY;|$lBg_No}hd$$G}Jni;HT!g^&>OxN*G
z_?xJCR8kcI7q1pPw1?Jji1vT-8BF8&4jVE;fc}o*;>Y4V_>dUhBHp-i7kQZsoPp%U
z+YY5!tL0!CRT~Z`)mZpSKfC{pFZOGDLdqFqKf1{t*&W{#F%9q`$#0$Lp@)E~&j+2T
zOr0chDvJU1E8ByJlO~iD2neqek1Nvid_?lG9sv8fI}A1;PRJYBq$q#L0DnM$zij3~
zI@+!D@^*xDYqz7MQ+w-^GO#?{bFh)eO)XiC=O*`@mc5e5ck&=?$iL`Qk4M2A_zeew
zhz$Wu28cEl*Pa1l3vD9&LingFd`Wed2k<RKZ~kSQZ24Z&?N3@4U>-U3y2=jWweVuc
zVVSI|vvOB%E~5(K-SYiQo>Pf`B8`<r>JYX;xE+Q4@{>qO<Lh<~g<iR@T^Es8Ky7fL
zr#~UXbzCgw`gfIsi(m6D;MNVLZ_oKA2s6hV9cYGsd1_UOP!AFzAE`JF{nn*Gx>i?h
zIj^jc4P>ghkV^LK!grGB{%qRSy!5Rb_iC|+uy(>Znyl`L^`3PTm^lT1+E^~RA>V7P
zqudbYb#{%7M8Kl4hB0iVLb;IJP}8G+30v7-gRuSDL;|5BIQMMV-q*WtoR8j0d{CFO
zomiZ$?NwTO>BEsJRWMb1?-Tl&HH9a^n=ozd7+}}{KiY<hIofbG%aPWNAj)qw>+lf%
z8dSsdFofzhy5S<N9UOvxr5ku96xf1-7$k*F4*kupPMFyukIFqv>s*R*@}-pL)XS~E
zun~Jfj`7N|u(E#a<*wZ-3L(%P>4q5830svRIK->)LE|9#d6Pi46#AlL(va5FbnaHM
z&@<Hbp3{h=hN)L-c3DZ{5ax2ih34-5InL9N$8=&Dd+@0?f5KLOq)aL5oMwMu<4j#o
z65n8w+^}J0n5Gy_qYYKtVsdYKDf}8e*QC~Ta|#w7Im04kcjaa6P!0Oii}8TFra@T=
z=8#J4Wt5gYGnSRm3TE&lDzu>SQ-tQ~r>2IQxzP1bOo_)d>E%J12Qc%^hjPBPGX3kU
zem^y=FF$_qwSnw^xmnDYJ~BM6AS2^ygWW2E+}voo2i?Q$PbP!$bT~Sj9ruSP54Ru5
z32gH}d_MYJ!!^po_G%Z2P{JW*I3mb%g4y?q^rC4Fm-?<&P<UOGj1eAfFSiBl#PaQP
zp`N_h2lHJ1Iw*LS<*Rr}%(&qia)v^G?3ckvQYV7c)_Y2SeBSRo>4rEP%2mKGbH-E%
zcy-v)7Vvx+l#ut1cDf}kK~Emwq-t<sPo82WiVK17pH-zs&X17F6G$Woxt8Ps@xyFg
z=Gl@kD*Ygah5=H$2S=R@j;FJe(P95&b~+;ON~^p0OnqY<$b=!VfmBOyGQx`_w9k19
z(sv`nhS0o!$T^kv|M1fT-WdWQ1$6s{X+9Cu8oqWHr~w6|<c6=L!6_>rx`(z@YdqA`
z{B8b~)%$p=qjxko8B7P^;$$b_<8^}B5b%xTh6s0~=M@K(n{5zG;C7UF8Q3A1IF|$m
zw*Z)#&H+`l>a{mF9?%i5=74$CT}Qg{u48Yn%iD{8qbvEvyX+V*H4gcT42Se2a7VI)
z>{e5Rfd#+mLn!W6%XIyrm~1zjEHB}pO7smE0MSbWQM<{>kEbWYv+v!_pz76sSO!(>
zz$}u26}fwNr5}M7j@MkIG(C1~cA2;>aN}f&2%p_iq0h-xImuQ@c}?cIdDxXw^@-oW
zGNtZ+oGbNi!nq;jhJ?d*@(e!h+M3*~aS{~U73!+Vb^Jm-aL*mO6~scnwvOH~)J&}y
zyvi+FJN2bk#FPdV@QgV4c&Tx5LG&E4WR8&T1GpqjK%^G52Ouq`#)B4-h!&hb{K1)0
ze!GJ6cHgtG6+AP`kqgbUy-WWRu1AkVgb!tZZ^Nf56q=4eC-}XEIXoA&4%9ct*7+1c
z>do$~-6?#WrWrlun@GxkcY47opUoImCSFlCO;($_Egz2qE6yb&jRE?3o)%@gc1>g#
zR%KE_lw`zE8VA1ji1%`<!E0+5gbDbyI4kQS#1@@BEudK^Z28P2wkb$If#CclMWASZ
zNSRUGX;QT%YQrFdv5Z_Q{M=<O?`{VHpt9OjG=PV+#lA}d69u+gndvH_h4<E=aHA8j
zHlL|R2x`_|LT@%2(9QH^^zuWBg&L^v2_G{iE*U39HGIM*yoo~BwAwAxf@r<Dn3e?E
z?K<{)7lYYG6N5;RD<s}kAA@h)RRn#1B?qUI3a!|o|HIL2FdmP_zt(PtF{#9&_KH#K
z7h%!4;TPfESaB7)yWuK7JYFRjkpZ8!3cs#9Vh;8ft2(nm%~rgCWzQNNQWb{<M0*8+
zh_@30&Dh7KO~Au#_x2&<v?^8i4k|mGAI2DJCp*kN{UZh-1Cd(@cSak_ETG?i^JDgl
zl~%5N9V8|WSqFlhGq{-ONS;SS{wK@Auxaqph%|Bahtc86{&LCl!SIZt3>v?KLxUCG
zQ0Wr){Gh>sF+5)LJljn3ga~+XQ}Bew$?CJ8V@Kw?YaZr}g2>4S@y1Bx@YlnWi=%;=
zZO<<Iwcof(9PtT4Blw+PKvy?^Fa)pIiy<8*vjyj6dXsR>_a7@LLVfjj#vaA<Cy;M+
z&n!`=!ei(ugimq|xycyI!>MUfxZ`+_v82Y+8B<A#`y~UcPV{#_@;!JU@GncyioDa0
z6cK<7=7a;h&p@8=pa8zs5kUc;T|hu%!Um5jenPVTnqpM+H|PoJfe<NwiB!r+-ypN9
z?yUSJBGO0;Cy(+{<T^^bX?onyu9wC)&H0yRN{x4~=VYeh=jJ6K12>WS(?8#*8uhvn
zvT<Y`!^p8{;<W**uL+u;SkGI1*@JF3ct0<e>A}L<H6E;%`P<z5x}pJRV$_)}cCM~A
zp`9+-1V05c6W-I9F-xm|jBKHE-2Qo=%HoX+hEM)jvx%!1yljMZB%IRs8-wpvzBa}o
z>gn<DWH6z<4zBrbv{{?+?cN><_|Tq5H{A=dNgeXZH%v7uKVfGDe8L`0o8#%gD7#0k
zoEWk<j}<UwkzhAh9pOH!a>q4wG1m-zV4*?rGBGRac=|VP_*C3~V46TS^_+QozYU8Z
z61&^CR2p)T6H2EXN42d}CYe3_)B(Y*f(<1$;ebOYE$1f=ID}8@phKG`ls}Hg8ct-U
zY&=XDjyAN8cUb|s`est%pqJew(U=I;QxDpognRZZDxOE3G825EFK#88GeQ&nx85;-
zv%_B8l`bJ7k?q%iHWtBCc)s+7{=9f32U?qa0Ptz%Porp6b7Y4kVAa{3M-RBRT}QBD
zOnRgkeuz|;JH&Itr)f?CYb=b26NloJ8Bv0*5C@)fHNV_hP;uX0V7lz!5`!7@l{aIs
zuxxh0C%!n4Enhh^$E?BU1%%<Sr+s<<mtO)r?z#lEm54-tw*ggYBIwK?36-ZQOrI*J
z+Ig7s<A!z08?pOb*O@<gPs4XEPJ%fGsFn|ii=^czlou>~Yhp+Sk_kCm`4)i+f3}{~
z-#W=TlI-5Ybd9tU0n`8O2!lGtvoXFe!`aeI(kZ}Vl;V+B1GdmRRuxz6s3F&sXn~EY
zL?<gFRG=(>zYUyZsySD{*b(+u*&^+V{Vb1?VxFg5S;Aoo;}y5GZeV9{)zH+c*&DZE
z`PtTm_at6eXxO!=KJgo0^cMTh$r2#TYqHQuLm-*g=yqMy#EIh$F|Yfe;Si&@lj->4
z5H<}i&X4-AIM_eScu${VM%r}!XsOYuB>^i7w+ga<F;0^L_(cYm;$4I7>AvGxlfa&C
zbCdVLPhHjemSv;W3IQFu7TCw&V{=>{_BOTM@-fw9&9`rlG}(kR59JiC;Wf5Q-p0#M
z%V};ms?mqPW*1JA{Jqg<)D0{9ncb6f>Fklh?}sGEBef86CBBpI^Ys0-F5pgmgN|VT
z>7QMH=j{ePP;gU7VVoz+@5bA8?X?ud^=V=;4IxUGY#HQDPTt+>s~e4<*L(!b67s%L
ztCW|%A|NkNxmMrJ*l11~kqw?b)_4}SsTm57_@zQ4h?UJQ3dgga_k2pj5q^(UY~>oN
zf%39V1)U7w;i-FZHu&rL0QLD~+Mixb0tUQ)Px?icaM}ZR<1`gBmKgx$b;_AKd4w_X
zXM(x+3W$iUS3`94AdMDz!5bP%TIAd@5j;-bZ<lc{pL8V1&|OYD4#C_0(d>LYIv39A
z;Ia@&FX*fC`$wzz4yk{caQVG}%ZxL4{eqib66;F(?>GkbI9Qj4TB6&q#C%_*^!%iM
zMaPq;9;sbeo}m}$q;0}DQ0O(0hc<V-8VZsQAF%o!Ys;Xf%j%|T?;alwf_GS38;-_z
z`%Ep9ZD@X<tX_vY=<eG4>dFas6pKag4nWEb;dh`jsE$4IRflgg*eaSUV#^4zEe_YL
zusYZ^>Cv@~3|vZerH$bPya>aCG(63JOWbYJ8S&h9B9Ru`r@A^Lkx7f1fw$^~omI8-
z$BP$tN;1%s56Lo;$*Z{w9w?&nSvym~C`r#m6O;fiBq`pfdjhuylDJCq4ugSw`OuY!
zv1#B=D!Hk39T%tZ`*dz;0l^~&U5%O<QU4R;jSwLT9@)t{|Ed!#1mC(5ZM|E6Gxz@X
ze1$n*pbh!9#;A7}Uv7!m8<vV?frX7+Bf$JeQng(+ptVPIBE+S1S)z|2t)vDo)Phj}
zB{#tV^gK`%d-!d%Etw@L5|(h|5_S8<+2MEnvu_7S#46*6XPlbctg+Qxrl1nPUPpXF
z9+^)~WQMxtd|Q;+%Bgs0JnT?^%N$vM%+-S{WHCC-1RUHU657Qq+;f+{q!DKIxJwqX
z=Nnl>ih11F!dNhw??pyTGLsbw^~y|Tf(dOGSd*13QL+4%A9|*eMX3o(7WC(B0A6VN
z%8xO9=|OSTGpYR4s9R&$Y}io`{5IO3>u8Hly{r?up4kMa#tT!{=&FQ&L101fOz;pC
zPaS9&_A45KY5CZ!3n%d8%Z_hfC=kAhAwt_tflNqXM-j5-MyMbQ9gGCN3iG)lZGIf%
zp}%n465Mhx8ed60Py<R>d;-72(b@6I@Nf#=it)4?sow)wL+iJL^ZvL$9gT_IZP744
zB|T5FD}y8z3Bx;PDGsB5enITHq@8mHo^~a*sezOP$gBXjZU?+B+HZ~jqcMnU<>c>>
z228kz+dHel*8bYC3XM&=HxT8A4~-oUS&no|!-xB9NPy9N0fF-p0_CxpFW4Gdn&xU-
zE_mrUD=rxedM+4EZ|!1;y}GJs`rU8>*DlV^$AkZh{v$#s4f{HO8~k+|3`rFO(>R2`
zvJu}&<Hv2*H`uJ#&9lOLT+C0&2<pS?tiM3_jT#WSCM?*WZsd6AOq2fZ2e_CE)d2fO
zyjd}IM87FB`Z=8V`T-KW)ZSf<C<0darO{GzlP8;Gjh)5TI-<3%f>TvkpxmUW>UWdE
zihM+2qZWVH6V>^DsAwnWtGbd($b#PzJ(y-%ZYUpbpg2E^?Vv)Pv-0{88q02EGE~!%
z#XH}c4=vv7z}qtwo_vNH{H{z)efY0`MaEk}CanWqk)aUk89i5>l?{;#I!@k&psfOA
z6W3bYF}n{vASedlF_PDO56`+zC8l2x8P^=Z!Zp{u1aB>WUzcKwW5}~#;(o(yG(H-P
zhiBjRm<62tJi6j-SU$uO@R>BIs?fHF)2jXTYmG&q2Z%w%7P4%{qPmq1RjtrvyJU<q
zQHmZM>A;Y(cATtYX1}=Tg8|SJL*#Zsy?0>1ir9W)cHG67!0we>CV;F(EQ&r%YAo+2
zZ0aoW4bvrmG%@ItnD^VB);VI1(%khmi3|nYS8RK}v_@OE)o4Nq3=P~wq`X17B3rUW
zTU!rSU<CYRpB_@8t3O}{Otar8*qqWG*>7jM89+i|XI3d`cOgYc155F=C(9`5)jJ)G
zza6-_T7pMR#6?$X0}yM^hG)kkb)}H(XD~S&=L5cf5yy!q7dpV&+&IftmrR+fhsF}n
zAcdhnx|~JKM}bo|)<A8xWk)llLMc%7At+l(UHJHXxQg#ClW&uClCwrElhK~o75h74
zs_L#<(^Poz#UxX+P*b`~%rei*pn4ZFk#&54Xd=Y%pAQN6(*~U<hqQv#`1Gw-o21GU
zoaQQjH_~8~qAg6lPoW;dV!uXTxbikzE@<t*O^j9w#pLbB&?>l)c3>zMCo_R7_ePy7
zebqNk05%=u7Y(n&A6X{#Yi*G0x6&L}X6ZM)&`VK9x67%@cTwEd_@hv3`fa#1UPiYj
zMZ#<S&1g?N3pHrG4!0-@8C#Hq{&pLtwT;<-wp}9Jye>zqGus#;?+yt!(2M_!<_q>S
zdR<XOtmI%OIC2x`s^fY;8jksad-Vj)+-nJHrqO_=drU1(^7)At79B%y1WJz$(a|yG
zh*91@Lf6c2vf4Vm!<~EFn7>%3KW*J)x~_=8Er0Q#U+{6&Z61VOK@veRZJHoAy-w19
z`~mReO*X*IonuNwgqEv@@^-a1RoR%cL>r;CzF=_2^uKoG!k*eFl23fu<xv>+5gvfR
z92uX$6(_Q(-uQ@OWStaa!jk5l3fj^1BrwIHfMaqk2?;)m%pp?32YOi#!4tH#WNKLb
zml|I9gsELW&*5`C;TsQc?<Q<mlJz`)(VIG8>-q1)+c#>%#@^BitXf9flG&b2btUmi
z@A3L~OsIjV%om{rDlV3g=)PN>kAU}5To252jlI*+bz`mQON6`8ey?0@_T>qlK!@R@
z`e_1YgT00y$65Z4@d>DM-ktYWcdFq2MUKu1Tb_>lM{yY=!{Qe{l1>reEO_gGIclpI
zupI(OqzA&l6c#P9VB=nt4}^x)WMLFmMsz|)4nbGbqH7=|7jm2{f=L+Qqt2lZM-7vh
z>>kuCb5wUDq`?WGp8g|QsFUXv-LD8lPMYPw{}^4R>v*}Wn(fxiUS>kbax#X%Hg*VL
z1Hu`UuFx#KiTykb@Da(R!ARAACO41It&qDmRL?_)O?#Utz0=|8U^e~nd{AjcX*tLm
z!8@#s)|{GJO)-M!cV<b$npp`z!@@6i05?++xp#mr&SJ2UMp78@+$HATvdCuAKMME+
zjV6617_c6jHOUjGG&Qa2;SG+4?(T5d65gX$bdCBmPU6CDpFa`(sURbNVIj9%)dbtt
zM^9VRGYAvt>BDn<HoB4#f=Etk(p(ONIJ_44l^Ic>Lx>_B!svKmL}DG~0-J~P0l<f!
z4Ck;a2E<#p(;3?Dbp}b<dgH-lbn?Ssj5h&`RHOm{roEQS%Xt1Fx=AxofQzVqK71)W
zOYGNLo*gK9513y#$OVUg*ICL;-MRhKjPSBcx<hID(PZV<egnPp(PVl)IveadIL54O
z(%k9rY%n{%I5}z79&v44%Lb?44Tj@Mu*nKfv#_LywecgM`L;hHhoAyKAp}1Wf?`i5
z82Uu422Annghx6h9_2cuhnn@`;2Q+Cku%>yw0+LD%C)_<<tKiB*h@1AgEMSPkHXqa
z3KV!5wOPv5ZUS;7!-@Lp854=pQ1vzuP}D|2I2a*d+fV4rN)+joAH^kHT}9zuZCgz{
zK3g|P4>EaUh}s8pEo@`;fmg_y8#wDST4GLP`BnwaJbCrR*~G_!ucN0gTnP|@5Iym5
zHios++1rO})}HNuOBbGkP;4&?z6tTX8~qtBpnz~IXok&@7k>uF>wdaollR%rPk+8l
z%T>Io0mAAYD36yzINTmIU26D1+?L1I>3{og9-mdW8-~@&)rL4&*VJEB<0m5hLz={v
z4=gL{{XzoS%3X-8=pk)*XqmMc+{B0Q>HG$}`3joI5bYCx$mnyhaz~Ss(_*p)VNE<A
z+%FZ`<n}tWYkjZCCb_BoZy4I-EN`phny8C2o9%`C644@Z)VN#mJ`poPqrjp%&(cg0
z+N7qly%sRW9xRF}V4wI7j+#MizMD&j!qx1PwIt+c7o7EQyhe;#sIw0eMCh`F-OR6-
zmJb@N)j$n@^5cO2Bh+9pwreN-XrW#ou(e}gt6&0S&~Qvs5w|KvPmEVvPPR$xxlIg~
z7KGY`e+|@e`teK-pBLiJ(xhhE_}%zz_B`V3k?Hvy3q-TrXBTDfha)+`eAUK98;9%X
zr~L$1d=~nz;e@6{>Tgr}5vTMoJY%av+w4d~B6in*D7qIYN<gh%gUX$X2VcO*V3)^U
zuvM*WRJ6AjoufTa<Qbh~)*Wy?`6qS!kaSbh*w6id@{sGkS!k{N?6NUdODhj>{i+gS
ze#+%|^Sy>&kKVDnY4{oHBQ{RsjkvF{t4^DZL5aYLX1FL3FP;#AYv0Aib#(=Io4N)(
zzXx=GSK!{vTclT4)Pxhg=<@cu5j6qDEkt~}m6`p*ZP?hh1J!Hp+}RjiL1NcZJ)26n
z0ucgs-42{?ug;Rvo-a>O2PAMa@v)2Os1zG*9Z}6D^shp2|5~XIp9gk@J*e%>50P7^
z>0t*ezFcAs?Z8obYd5UG|6aLe_?BI=+5jAXp#!`^V1h!D%VN8-V6GN_md__N_)yK_
zI)33+_3GZNWf4f%b9$s2>jYdg9zI64F?}A*1l%#c_weu&gVFT?0plN~?-NLiVXcsA
zke+<ke^H0EPm3MU1|VGmR5ju@e|ang8>Z$%>Kv)sbk`))4^4a?DfPdHv~e|@`_9yV
zxQg+QFmbE6ZFq6nGqNa8`Rh=+CQRh(%$>SzZ@a~Av|rq;_w|N01cbOP6oMz}_OdB-
zoYj^wNaU?I!~~LQk*R6iG4Sh#3ia5;o%K(?9gT<6?@qlg`rV{4q1+OfeZ^uiqEFQH
zYTl`Rn8E(Q1hA&WnvZtP)jx9bc-eM;Z6Cx&eKos{Da3{)82MSQuI^4T_o^(f6TkOT
zQIgG!DDANp&yt@Z^N$zApj{l8ah>(Ix8_AXBh7TL5B@qhyqNaio(xR)I=sSlx>@x5
z!H@4o<D*G!!NKTcHktm|0OaI+a5(Irc;!d~!l`>U7#vOD>e=tT>VEy21Kr|(wc${)
zM|`-}nh|eziq{2(_X&<9#4f+|i7(8Og(r<m31XV@%NUrPFywNcY~nO$gnT5STzA2g
zgSS~#bsmLzY5jU_QHQudh~HkU{}P_*Vw22MG^8!qJ@MS~cMY=Tq`YH<PUIK2mV9CT
zFdF5-Q}`lpP}#_yXs#VOm^aaXhvbf#xr@SsBwyIlUUVs#nLS=icnK@nxuZ6WT=!fC
z%&+5|*~ok_4*8EzWtSb<ppV&XN^@K$%b{R1PxZ`5AEt<IJd=&@Q8y<LtxzsJa&Cmy
zkb2}_n;g+QW6j(ov?Ni(J%LNycw<>E<1X2(>yYAXcGjN`e{c`RAVBGV0107poc_%E
zN+P4CdhoD<4}H(+E1RkhAM-pMshg-l5YfK0W|7KAgX8|i36&y}Q-DapCO=g<B<-=2
zzt|iw<aH-tl)?3QV3c_~6h;hQSF&?guuNBvR##04`Zo58mF7J#qLh<Nm#VcAiVJ*P
z<nww}WX!U-)X$lvGKa~3Fvc$H=i4Irc9~tq%js(4ls?QhclW*9@ZnUC-{lJRV``J)
zeyZe?>XFuJ6S?7M<dd20Ob~}Vr@oZ#AVqK%n0zl_3tHlCjll-CJTh7Y&63Y+yooYY
znXScMkuQFLFZL_jdO8MFK#kdqOjk*M-o%)tanGI(zV&RfKY6`>G~!Giv<v#jR2{y&
zeRl{Ko65zlHzPuVMnFQs)Gl)ob{7T$TEy7xinwjrc}^xe;j~5b;K?ppix(9tJfPV4
zL^H}GyK@yi<2rjBbWsM|<cd0&F1e<UWDCDGWlbL|s^B?W6VKV?@2?k16n9VuNxqaD
zA0bJ?8LVrO+Cj&EmL$F;@bs-w0n_0NRm0D$)cSFiW1eu}PTcE*DF3Pv8et~+e<eM9
z@VB~k?NktWJSZA|QNxMh-3m}&-o0+XtDzSi`gY=E@hU(LO@Bmt3Qi5a-cGJcVcg&@
zsQ6yStW>FjKA_Y|d}*Ze#=`a^UPnB0dHZ2PR`@0=Ryaz3udc-90a3>Pr)~;@VolQ9
z?a?{xjH|DB_sBJ)rmj99E;mA4kL<+1OU=BJ6mJ8O)OY=)fh)r<)*sf{Es=i@&lXnR
z|8q8);TF#;r)JHqX5xMb#5ye?rP_DtVv(#Rkv<_R_K<rw=PAM(JA&Rw+V{_O_?++~
z1l&LYHB91ve`A)I)5Dq<*5z}OofZEoj(ydHIc4|a#R4t{`O7we4D$jR_X0L|#~N=e
ztKez!*0KtbqQyz$NHr~Ws;byDH>8v8C1f*ILvf`R<>jrDU_r)uY;jcQjnpJ=;fyrN
z+@hLAX{w$kyP0V+08JM*L1{)ZHnm9EnYtI`_}(#pA0OhRqAP&K%_WBHwHCY1)KNPZ
zDDsRQU5P^r8LfKNOf*K%o<+sYdUiXXVTIW`<6nGR)7yTLpN}@eyce7Zgea$%OVCSR
z@w4cV|4qlZ^25;$0zKhCF-%dhi3Bs14DqziRS?;ga0gPtGGZ|0Ge%_<T;lp|HMV5_
zB&<$<Cj}=LhF%}>Y%hauNV7J5G+~Dj=S?{Mwt8|S)1*<|_?-uz-=LZ(hs<JXGA7=V
zrQW?e<m+;K4)00yw1VwMA@(-Js|+W+*et-0juqGnwCGq`j?&r9CxEK6>urg6v#=yT
z>>XH@X%QHguz_Aq^Yn(T7qKkv2X}4#ZL4N~ho}{C^y;!>n*<>mP`ekhN1+W1+8}C9
zf0>8Gy!cXeq$&VQs3-)^QRLf7jp^3JNUR7>4Niov5-=4Pio?gfbnVayRVCAmGz{M}
zsRL_Fp5?;e$Tl3-gi@XbT|qkTGYJzgNHtB^*0iH^Q-wwE`XJ!Q!B20u>2fi-ThDQS
zi(?tTFRFF3Yb4$Nq-VH(p)WG7GXMSP4fFaYN{-mpoIJr|4mx4>Q&xSu>;S^zM9<8X
zkt!8uJ8Wt|Qo|70@ZzUZ_!w0!NDxlP5AC{)r3kII9^w`Famr*}x*0uKJDWHcH@R7)
zbV%kzChvl*MH3Sz@9yJW@U=&s2&ArmYqeRoh+B=3=v88?8X}K__2pv4T$Ud>r&DV_
z1966M59M;{nkzPu#GUliUV?>wlNq1dvt850`BaLqKsutdIE^6$yD!Z=?>6$<Da;q)
z(ndA%=sH)pH?hDQnxUcN&+TKJ%p^m;MOr1`)NWtMVIbsVk!@MQhPQUQ3!sXBg%31S
z>7Q)AJPxgX0so4{j>kJ8K}{c-2(IxgFQL6LO>H?h+fEMd8V780NNLsS?7p(JF5h()
zkR)S!t3-?#<Ol@rDloRn{S8;WDNZDY;~R)XC9(VOZrXWciN_=Nw7n1H`eljbuSS}(
zG<;fyR}k|l5L@9=wpCn(JzOn+0xNtbsELdqSgJ1i!r%s<o|W9^G(-nKg;>-iW|&P8
zxf%iV8;jT@^*@?L;8PKo`l;}#3KVHAU{&;HrGTvp$S@cPt0`^lN1upWaK&l*2A3d8
zikNUK7+e$BuRyT1p{Mq$+)|ZpqpATlyHGu-*bF(MRfxf-mg9o?&+J8ivNTmIqM6N~
zfjQv0bQxL@!)b(8$-PZ4kjpj=<-(|E2jNM4TSi3D(NHJHbR<+=j1opc!8B<V!SsmH
zOFKp`wTn|S7b&*4tuAUwtaJ&TCRSZ0uuu$=jj%j>Xd*@JWn0lgnhOH~ODb>dEB8(C
zEGpTY(~vU*_#{d5b8E4G2!%NOx)q=U-Pl{T-?*CzqRG(SfqG4ZM#4{c*_qrGWwJ7_
z!s+b)J-&&1X$G;848}ga>w_MPCMOIPVVt9duAc<Y(;GA++<C1|9tO{i)HzIXIO**q
ze3dO-fBtUK1LX34H(hU2(cRCiQT|pWcMBCy>R}nKe8#xfQx#m7r)wA+f5;woH?UE7
z4^R8fL4FP6VBF!jUo0T@0EQ8m2&mGn*&-&=PU#(;CW)uoB$|4#U=~4d$o>Iw<&JnV
zvxSG8W#-xMKvaBXRUZ1qN!jqgcUR#XmdHjbt`d?!Na_O#78wjEcV64fZ6f3EMTdvJ
zcDvEoawRq!1q(Z(&_^9ke{Im)0CGzdB)?!NRjtLgvCZ)J+(fpBNv;<fZ8NJ)S8u}j
zmUx4B0KF$q*~RA!>EtG1{~=2#yJiE=^Bd_skw49HZRp%+(>X*O+U9n5bWMzVM6|gz
z2>~Bma5?ql^FTGkovNo^1S;~5QZ@A(VjJupd(QGh?0F|8u)CZtf4E1G7t__ob%{x0
zbalVGMo*{|KKDe}clR`4@bGm#O=8=utATv+6P7;hBVnwzwA=}0J8HjuO8QFtLwI$r
zP{JUiy^ZE3d(~#Ot!1POFZ!k;{_JJsdL*cAZGu9G%QvB&YkpaI6$$O#Ca;0L;HG$m
zvI@taRP9$=M61}ZfBrO)Dat4{Y>8@{nRkF6tg`Lnb8RzMXv9W_HyL8y$nYkO>bhm1
z(c?vO6|??1@q|a_Q|o|=s3@*HT<PzQ5o87$1|)+~85%Zf^z=C-3%{;48qPp`N;{7f
zQFebU#ElM_*Yp1J{jdhj=zzL+N=OWT^IKDs?4G$`EQgz;f8ayM1dXY|OM31%V?I@v
z;G~pgO#CQZ(sk+@A)Otkvq?s}DYa-MUc0V3qxDMNY<3saA7a(xX)ZhaU-M7&zlwc}
z$!g;+2+#^xPh=|G4{@TRQYGekD1E&D#XlTx1+Ed+7FY$Smn|1TeDxSsB5bgykMSG+
z;TRiC(FA21f3O18W2{2rT$6swnt-9T)h=gstyK&CmRN&Wc^Zv{2BqNZR)Y4@?~{AQ
zs&~5V^<s?@5B1cL5`iKu98GecfllrBUSC=lau!)M`1HOiHKE0#wQk$M(Wl&5WsI`7
zgJ3P2cWuCA8nOjz;k{E6mM(JJkRJ3CJlo2?jQNRHf1fw)iHY0Z;6G)}$>V(Mc~U?&
zJ&g$N^uWf?fn~wy$KLjUK*jgwD^FsTL*H1vZHNOHx}Ujol_4QrH6{j(kQQi13RB2b
z(*j51!HD75jcTwPl0zb6f}sfFDg#}HUOxh7>HJDwT$3C$YeHAau@=k69T5_AvqiuI
zq2yn|e@V|p#}BfgPPmaFVzzh06$t8DPfPdsQM!<?26)#DKj3j0D)K<B9IUIJ&->Hw
zW@n@6?09r>MtZ%1{S7KiG62H|j9N7c2l3sDEoiK}t`vVDE~)c&7`uez4#Upo53$Ym
zAQsWX?El$5r+}4Jx$)Ozud>nR;3wM<)VK%_e}tP9<KC8>dGEaJUnma5%5>u4)|q&h
z)t`?h)AP~Uz;lp>jxNjkM@ccyQ%+aBF+0Na_1lfPIRJ%PZu2zR93#0(GZE$GRD^LU
z*}Fy-QWuh7Ux=+T2_Ss6!0s_(OfE~G&TKrGj81+SjAzIF;mO6A4a~m8jp>Hv@-m)(
ze~50<j7RA8&xbFCG-AKjGSyA7|B!)Z0b00Mq*q=_<j$fZzDW#+ChffrwGe$1D)7=`
zlm^E>wIE1t;-%QGgs<))Qh}##*PcjVSei?K9ruulJ*bBu1U+MjZFFKsMAF52ZV5nl
zb3)Z1{1Nxjx;E>%^cQ<80r?j2l-hfHe;+FeQNKf1XBGs+CoML2cac22E^p#JsnqN4
z!8da_@Nfn}mlyx36ic{>kf-S34=GTD(qmK>r;A+upx&Q~b4Z=$sY1Sqs1zV@Ylf{(
zH4d@3&ECuyM3kFeCu#1j8%eDB^3op>val8s0ZFNfPV)JQ=9`YeLxIv`gNr&Qe@pq6
zGp|-=#F)By3-#PVIpZo0<VHUou5mWA&K7KJpjBim754QNE4i-rwN(H?M3P0y1`yUN
zG(MG%C)qy4d2v8QsFxUm@Y2esCMRUqM~)sVTd4*#sVA$WIsQjv4tvPu5|8**v!J<X
z+hMyG!KHkE{+MCltsZn%U$`@Be}Yu@4@^C1DlSfB;Tmw1<=g&*$gN<aPdejN%ezFI
z)ZsM!ZZI5AX2%yNC)KFYez8Zz?R0oH2w=8L>H^v(X+<V!mGJutYA~0DiFgxWcDst5
zKD-So-&6qX9ey_&O$M`*{&X;z^6;9PqNk&y;qlO=U4yL(BhQ^vcfx}Of8O3r5++sG
zb0HvdG1dI{BA7t`bs&z}nlfAU=X18`<H8G4B@8FzK`*~BlRQP)v^2!_2Ff~zO}6YO
zRtbBwiST(YL$9+US&Jhk5)R?`wvO8HO6uMtRn5H)4nDr$6+Q;p*f_XdCrlou_;PCP
zYm$_LWUCSyh9)!x!BS5&e}KP8_Blz{$+&+MmoWmxFC45>1T7Etw!_<Q2otH+0H~mD
zQ>aM7CSV1v3AigGD5oR4-qi?qjaJM^W`mKsTn4#Id+9eHjw;;d@VVDXzQK4r8Z$Ep
zgv$vao&E!^w-oO8c0QM+#_ht4xi!;n)U>ed!DS{E6eg8uRESDpe;%OA2N^K{p5}#*
z6?$BY8dp17Hj<yA{_)g286j+Atu4w2LdxIpX%h5HkkhEuaHFPGPEVO~)@)TGr)zr#
zM*DzPqk%_@XO*Njd5t15jrf?~{AwWjs4?!%gKwQfYet5|PacO;=bftCl_ES<k9frF
zemS9oX__BwL1%?^e|4!4F0lgU{d$*w2s>__I>;%^CcIbl(Mm=?)i_03ZG8nqU+rSs
z;iyl%fmN61(qK)(2oG&D{<fiY-^>X$n+lEnBnYdSuY?!f#Y12iENyYF@T2&shkYr(
z2<|~Y%kJ2~Cv4~31J&SZvWkt<ia7|M&wU<RIPP%&Qgvo$e~T|k`q3Ee&KC{RDpMy7
zefzh`M)<=SzVK;fx;G8aHBEu8t<x)GbQ_1~RyI%-qgx+zs*NN6QpCCtP4n2QpHXwq
z8YX#Bb2zG;v{zQ?I=MH6Ec-fiS$KfwPGQATX_asU9gv1a35#D*sAdssSF(+>s_4J_
zoj5jHeW2*Se+Lc@aL#ZzW5YKx^SQkmTNF)CE7Yt}G~^cd&ls)SGYT#$F>};T>~!Dq
zb;o&*d+szQP8LTAp?5~ablgi%+JUi5IX-#v&*vYXJYl-8jIOfn8n#jm96kHIt@``;
zyJyej_xEmIHDg!zz$CEiHW80Rrv|G{d3TZ)rKuBTf9c*PPd3SVf#L3~p>eXrlxz5#
z9??cs>2Y(bipU6cBi4v5%JCjnOz1v49sMwX-j6o?x=x#|u-9tA)1c47PKY<q^x-v|
zPn~cSuYH*o{B1lh<MsSH%Z>BMzfIJC$BBBs321PNIdS+20&6O1cB-3%zOev54In1m
zE{~srf5Jtt_>gYY0U48jO<ws0nm4)X-$9Pl$Pg#wMsE^35loLJPt3+zNR;2i(63bt
zeI9lISvACqEhqos=={goblg9iKsd?KXD<iB>za@_$d(K7ZJlH)Q0~JciGq8myW2Tf
zvC(V7vb9?Cb_`e#g>q!yj4*dYg@_}Y{Xz@`e>T;H@-pt$gSt*`1yn}2R!~{_AXG+q
z0hN7g1r^84g<8k<vN_$5eDX5d->;uGk_fuKeA2AG92#9;KB=kyNOOLAdOn*BrnBkb
zuT$;jJnfIaAB-oT{p5!@aIs-b%yt<V`XNa+XIY8)1lDDPEVB=w7zD-brrBukzu1S7
ze}4W83^i=H%*KPy$GTJVb(g_iW+0LjX~)S;s!nF8TYmI=`1wgkez-0ZFiOfyN)8K`
zUY0K)G^x|XP(NXPr2xrJ{{ptcXU9wxj5JQ>jM~6M;5Ve0iB&j)7!NoylCEkGJA6`8
z0F&@@yh3{-fnjq}^!zV0ra2^B0I>gumkM_nBq3dZR7Tr^En8Qs6v=N~xSm@~`Z%Hr
zS;<7JDMQg~73<QMPj?s}0h*U@cNiQDuYtfZ_?4Ii%!vAXmzQ@K9~0NFNBZgeT5MMl
z9Bc~ea7Kf_!<Wf-7>@yBmsxliGXnpBmyUQC9Do1uA1zVFcwT&z(yKqZ6SkVZ$<hUz
zd*kg|-3r&x4u19w-8RYP_Weor9*_}v-`Ovw50~t(wF}s_YTB+5Kr#9Wgin-j*DslN
z&6x^&{p5cYPxiY)*GjZ3I48*sV|wse&<a|opQwyZG8EG_RPJB^q8s^loy<QR#_M^q
zTz@7DcV>alQ;ASK7IT%9^K12ppXaup(I`lsw#)XkgbxSiUb5N$p=#<aQfQ5X1z;VE
zOx-BZrh^^p2;6P4Ov+?Ib;g5}E<6TxPIn<6df53R>1%@~%3x3FypVXn$?2=WsF=rV
zX891x@dnOf6|{IpM-QuMYE2njt58wX_kTHZCBL-JPvI&*yU#ZlN^tH;`oDyu^}L&6
z4u)X4ojmB$Q_}qCI-(7RJ)8CVXL+3#U3b_6tSCQR*7@)1FQ2_v0L9z>(X4-TIy)JC
z+l}@w*5FxtzlH<Vh;Wp`giY6sMH4||wp7XHDIQO_O_^j85f`4Ad*vh8EX<-J8Gk#I
z@_JJzN?``Cl68qM2;TQ|wBszb#%dyxT9t5~cV7P7C8TfrISU_eO-P29tB|b#yXaZ=
z!kT3^r{HE5PUwiW^7MuMmQL%yi@%O=b7&LiMFQW5>HSqj!|KTY*>-iA<i|KCHAU7}
z<jGyxw2SCRpMcE7&kD9ABbS_lyMHdmC!!pq;6+YfCoNCLLb;1=x(ESNdw(Jt$}fb(
z&c)Ul(F@a_leQES5e1r4(VN%NpXht86hI`8FA8*cmc&uX@W093LL5i-gBZp?TEqC?
zK74*QN?^gzd>)eIhM{%t^EIyKb2cq?Y6IFvkRRyH7=|S+v;59Hk;~>|Pk-7yAa(iV
zmnAzIg>Ga6I8Kx0qL*{F3B2UILciQ@EsbxFlg*Hjng%+`6Jg61CxJ7zA%BA3f?{P3
znE$M(Ab1)}1Nyb9By`}5j(U)63D(;Sns?kV37UCev|$`W<NTgy=fgADwnt4q=0gOt
z!F`siO?>yc9y9u#U<MLn`F|nmT_B%CO&CS+hkn*#@Qr5;IY2!Kl~=+>6z9L`(n9cH
zN%-E}N`VgyE>GnE1cX@7DxuIw2$}rCmf#$&WIV5hZe)+YHR76d-AJ<!XRcsoDc20E
zHd&0#-rsB%{h>FsS%dp8_QPw9Dr3ao3Kyw_D<S@|0-_B6_U9|5<bS!tB>Fm_;RPHm
z@6K~p2~X{@p<KhAw-(o0cQ<Z441xk&w{xGN`%{(GXZ^D7p^QpfrrVcP+8yL~G3dX3
zc(!pnxjG!#5&i2r8!mjdV)Oi>ba|sXzcpRH`jFhQ&Mpf1TU=yGpV@?q#LQCR3red9
z1f(de-SZj&XitfN|9=z%j^@|#`hBv%@3tOg!@VGAt`(S3^}zf=D|fS@ij&m>H^p@Y
z9EmN;(`=DmrOCoU#sDe<ipT_BRqBN+40FO)XpH{a2<9TFL!IbuFYNi){U+<3w#wB8
z|Mz9X!doi1lbg7(g&r+i7&Vtg#C^H6a)G;PrNEB7EU{)uW`FVIw|Q13F!ZA5L~&r?
z4o6h%S^n!^(Vi`J;96QiKB>s;l?0^*Y(#+uX)!S#b_7J5*4_d?q-AXIekM47n(mo(
z0#Z$}UykSM8{r5air55BI;Ti$dYZ^B67U@(*9tI|8nU$l@OtymGA%T!&z?oo(b0%4
zYm-G(X3<spbAJSmizsGGfU;PXn;wZrTHuYsw3vSwsrsAO&y}hHjtuZtQ#zmiTBywI
zK*A5RgJN0~Wg|dUYY*q3C<C+?2<FjfAMj&J4SB<?_tN-9cc>l@-RpLEnDt&7zh3>0
zVovbw1G4zPced0$L+VRHRn@M0G#n2Or=#(Yb&?un27lzpGtclE=PQHiA<!<wCpKvk
zIp~4focwrtGCcdfu30{6le^V2U4Jmnkb2HYQ3U;w^m$RltF_=z=GCu4dVEUD*OCkO
zX{lBMSu_7WEme6%{009btoI=u6f<q6=CYrdP3F2kyzF;Y{q~~Yzx=ZS!&}ktzcIZ2
zG`4k{P=DD7vHp$5)=cq2%gL?E3NPiG=qqwjVS}VZP{XCf?r{nI$z(8|4o7F0C6QR{
zwTvjRInEj|wt52|yJFw<umKBmyv{`kvg@~^<K`9A4G9uGzSfJXWuOcRcVYRb0R%;e
zm9x`a*F~)5Y_yk|pT&eE!w$Ni(L6Peg+9;}m4Cq=_l@0vkH*Z1#|PIj;N4-3R8FA=
zM@wZf%J8?ipDj&rrUm22n!A;qGpem!$_*VWyI2i$vXNx9`7CDBXEJR9fytq`WQAVF
z&-{xt=L!OwMl}oEnrY)D2~jPslUusQKelc0j}2SA%|FmB{;6$?f2wcM+)v6jB=bT8
z$bZ1j<S@pfYm%vJ_MrXj37^6GZ35|!aa7A-mavwAEH>41pc#A6ql0qa=MWRSw#x#2
z9I5fJfAI;&{EIKde>(E=i!Z*I+^k2-g}}Ran{E>GSQR$xMzb4^^Dn+ov6fbg$<GJ6
ziDzF%XIaFEkwd!V>$Hd<{QDY@UqrXp34agdz5PkV^%hZ{FjDlQFP}*WpsN!cR?|%9
zaaqbjSNHsCn|*LL9sj6Pu^mWwUm%qjmZ}#vg^<+oVwK8!&6>{%$F0=|AV+DQ%psP~
zKIz4q0lK6K6|?B3Pn7s{qj!fG9}V3b4kk7{9)Z3KxZ~0Iv_DnQ#D8q`-sNm$aDR}V
zaOh8P=jDk&{Rv(!TJ(^mzrgwO#qWRr`)JB4FheEDqg8yz{*@*B3P%D8NQ_);uddR0
z%3v(-Fr(Le2|tQnFS^{84k*qwY)GSQ&5ASjD5Av{<;hk|x%dje1Codh<F7?@nIvlm
z5)b-XL`j^p_HqdY>Ip~&<C%12yniWoihZgY`M3?b?iV-fr+>xIKHR&?7C-y${4rtO
z0-dKB-@!}d9wQr_Gq&m!gFTzD|IRQje)6<GIUEl6Nmz2drNC&uaOAR-3cvFH8S|({
zaC2d62mg7Buugl1&n-bLDK152u#0|$lGhH*l!f?7rrP+J0yBx5Pk2<I{(pTP^KQA%
zKna<Iq2)GpcrvLMyssU>>t(^*Ek;R*X?Hj!VtbNYs?+o-QmVcPSm&A9!Tb~7UaJui
zw0`AQ!8m+Y;d>r{s*2k|s50I{VrG_<&va?&S5f`&S{3NQC3}+!yx{%!79zNm*WG(<
z1MHoFSitCx%0epQy1L*b$$xK>obl6gyGR!9XlUelVnnwivW%dtps~rbgjdfB-M*Ax
z<UOyAqPFFv@?*K(a2vA&vMrBKoNlOcHiOu#tjpVHDd5i9Km38euOGsyQp2@8UFbP8
zn34Q7x6a=%xyH<FCR{BF9*T#qYtVv%hy8?+k5ItcVJ5nSNQnRxyMI`q(fY#;)Dw-6
z$EGduZZ=V~rD%>w4aM2O=((`x7V0n96sRc^nkn|A^{O3VT*X3h2E{o@TEP?4d$Hl#
zCaS1DBC7!_*LUlIFe1hkHLPR|sxo0HkUlrhT+k`c()a5uPf!&$IYes$=_Nn26)<u7
zRl01KhI>&&g@{)+9DlQ1=b#%sr%vWAll6O?aCTLE>Uy$36fCpLc<E#vbfP1%Zr4Jy
zi7i&#JBgR+gB>$93#){hcrT~c;OAt%E#pgXTg9!%)-spLgf}yCn<2^t06PpP4s1&%
z@)~JPlpT}zNCXxsBp32yLv3rMkh;)z!wf~Kp7{SHn|}c0{eQcC{6nCg^}MrT3=KML
zT-4fle0CtFsto*oEW_FLSTr)6J+qi|lK)Kzm=B?S5RuD*4|d2jDFR9m^;>I*D(!Z%
zC{8$`-)kS8GrSXhNo((HFgTjbPDY2{+ml!nU`s!kMR;_@cqE|f=fRzS=&Hs_W@-Wr
zOMo?A`)@Iv34goE{gi=Ts6ip5eFJ$$#Hy%CYsVOSxl7E^sS!Yi^!jW>kn|&G8@}Jz
zjDH4y9UNXv`)^MM&Y(*`fjQDtPdxB=aP`RTV|&-1usx{Ii@MQKPOT%AVMN*dJeSLq
zzYI+n?Gr*V&B(mgk049G^`K)n<<V=jEjQbeUs2EGG=Ki*!szkmulzpf4mdS7RxGNo
zZk$~`lYmt_d#$q$2~Ogp1d9=(F`0JAU(N7LMZn7H?p{s`u?PyAzR?xr<6gSmw$@n7
ztPr802(v2dkwI%xe4sf;U`vdy=31D5O*mHF9L+;_UdwNA{Uy}zC_q&s&Rgfc$c})3
z>)g8%6MxSTntnK{Q1rV;6b(nS!FW6xcOyhV*$95TMkuZ*k%?iBhi3yT%;;!v+`l-P
z2CZ)~UN%V;A?3&v%|``jFShgwi=VA6L5&Wf!o@}GS)RTJriB3pEd+0Qb=gMOY2vE`
z(j-t9yRVbxu>M#HD+MPCbhk0QKQ)3UJcJEl{(t#^B&2Y?$ZbwFP2MMK*i}^beoIEv
z;3diVrJh}dR@Xw1Y7`VGCoru&1@YaE%lTmCzO>CwO==plF%&yM*Gv|GZeW0eQxQpI
zFsxaHbdXfmZqyIEFNWWRLKh5F7y@~oOg84(oCX$wPJHwS|B{K!zx}tWixQOThGC%f
z3x6(W6(X-(Xn<}TNKoE~qWaJRlB`46qR_~&c*`)(?|h5YS29j{-6vyQY?oG<u!)(j
zFcuB&<B6brKhNX4;aaKAjskR`mJe<8)kkyiq`yk^x=r_pIyS-Y*-Z=Bj$QRSDp{^g
zM~ON%x8Jj)7O-7AY6-Tzj)(KV{$=wc`+w~YpeGNUU_i9+SH^c3@YD?%?CkTk0vZD_
zvv_u%1K1pfe_E!y1?W&Aeupy$j@nVR-!os4b>YHivZj7P*2C+e$%@7syXNr(lkDbi
z?<P#lChK{^ui?(+!9DMN$I}AHeny`Ri<Hj)qY^ex2Iu{8f6B~AvYdf+Elf=s+J7L1
z4=j4HcVn3(_qknQ9IqGIsz0AID?=|;hZ8c+*e}fVT~RhIjazGUSvB3PrH9JwYt2Zr
zh`Z9G)6{|2J-xab;e0IE0$zXDZh8HXN*HX^0l&f!w+;Hs<-2RPFkve!#wFAd<#5$i
zwq2K_t6l34MkjboN!9xQ+dJ0YHh*s9XZ2UC{l)g3swVw%Kzhj`wcSLBExD52pg;jZ
zme$QSvZU@xc8wta{W!zdkQ{P%6}xB;w?G_8%g1myB<IDMpqe}FlEh`QbDo~z0bKm3
z$^K02LZjD!_LJ#m>TQ1UFjuKI?18vjefOk^w?R<WRaDf~ldN~a;}5H1mVYA>d&h5w
z!!abCJ?a0@KRua1+R5=HGZ!ir^vz;h1y+}40w_F>CWM~BVueVXF=^E4jg?4~mt7+I
z2-Pa1laTn~fnbWO&8BgAxq~!sUTsgc7Z9Aa@{&0MdU^vtWmWvX6!*`Uno>;0G?ti9
zOXF3J+X(_OE?{cRkIFEZy?+XWpE0oRpD}#Ei(i)e--VbWtVu&m>>p2;kV_XL>n^4b
zFT8%hh4fmoI&-ncgI=Se7}Hf+ZcsDfi69|GaAR=5;zi$JHk=nNXQa>bUi_p4{Ndko
zVi<|;izdfchq4RJSFr{9C|Akj>CcEVA2quTTnMnB=RYrq=6S?6=YI(pzT^xu1IlUL
zD2=9#M<zk0YB8p_uw#Nod5gCieoRNjVTV^2GOwgEE2?x$yz+es1N}-uZG<YXgt|zZ
z#rCLT#!zZ}SN9@}UzQIjBdxOOe2zShS!@tp{FmkRc7txs=I7}GOxh2b^fKuQ8t)p!
zCRfN~0q|j3p-Z+D34a6=AU%2JQBatb*GM(UDERbYmYSKmaY}I84|58Z@)r1}@cRUU
zlo`9vSU13@9OSKX_(_g494k>^ru4{93Av&|ywd=;2BygE=MXJgo?DN&RMIeV+7mc5
z4Ll82ibMQ+Jn_SKpTLlbi5wZx;mBBtt%jq|%t}V;hjL~;%YWt`X^@XQ7KeQFPU?`6
ziW`X=Vq*$Q59tYqu;V^lx63>ggt&!DirEFZj|A3yCHQe*aPbJ$z_I<iejGLkaJ5?8
z87^nI3@@KtINqeH0$gzoenfXBWMW(mgjr(pYaI)zTfJFrm+0B)`B&)HhKn%sfKy-~
zSb$^!xPl@rc7IGEz~3nUEuU?a|A<?LRb2--mH!v#z4qSYUhaEQ8QFVO6osTABqc>d
zMhTg5MN(8+`erL+6|!d`t7Ioh8I|mvtnmL{uU~)lJooXO&)MgE&w0O|>b@sjoP~$3
zjx4L~tTa5)@D9;mcsH)fdH1>gUb|lr{4@8e-0Y+dw$z?KevE3YIc9fLZS@7;3&yNo
z{ifo)Ne<h!^j^BB3wm~rsH&f3c$Z>#qh@p98PP9AHTHuM2UkKC!`@x51gAJF+rDnT
zZo#Ztw$qBN_2{gP)04ET4%f5zn5b9GP7)cZH;=1^Jl6fG->tS|%NwonqYrna+`Dlv
zs&lb>%yfR=_R>%FuJ{YtybD?Hma@AV_Pzj@G(xZQUQ!beV(`F?_^x`tr^{t7CjG+4
zENu~vorC|U7R_jEw46<|n+f%Pb;aj1db?{*=3@uAJx_M~b^XY8)yK78Yf@BVPx?D<
zlPosb_v48c-zl2qu|O|cEz{f2^?WxeZRv{neV3&JpOa9*T_A9pcg44pL21XX)wXgT
z5gCqeiFOzAdTX<ydc;v@wY{!}YWw5pY%25^o%C?<g}$-gH<!-!ZSy$aU)Q^1f~D|j
z_nz{uK$lwTL2@I}hr=dD1@Heuz@3Juc^+42;$Hc!Lv~kug^4zK@qIyFU{cSo=7z#B
z&iG@3E#JdUYJS<hxOT`&n={HgciTn14tC=Lho3}Ms#5NJDUm-kb~9g%MFTWEM;WT3
z=f5YE>{9EJ^X=hY<anNJX|gprUqw+k^(T!?hf04$&Q3XUSi+8b?|f>$-F{9?nMmMk
zGVQu?gYI^1L+0C$@a;X30}YwKE`8xr-dpTWWz`zR)|NK5;7L=Pf3GIrbNNq^>Oy?S
z$9ylX*23HH6}C0zaT(?Zlx3XeRK6zNl-MTs^sJ#L-nsr%`T>sETy1sY9nzn9nlBZN
zwN_d4-HgQ%=jh4awh?uVnsv|mGmqWaU+tv8i0t)trwND+j-W{&d*5a+lQi_`mcNI(
zTTbGZnxId9ikevmzaJJu+9ElI2HndlMn*a6(}lYV9gIYna~+Jfi5t*O?CsuDDC#22
znK9TDt8SiPuR|-I+%&DM%-CuliWHnV@uceLGwD*1{;C@d<OGTG!}h(ZDZ=x1QkHWn
zckaCU)XwcX&3{&}L*m=yz@X0IA-6)K+iB0tZ@jTi<w-86=DGVOsU<}1W3a7l%pJq0
zM*1U1Bxe59oAyfySP-0CYjHN?t=H`@iNA0@#~+@>l9(J`frvdJn$mW4iP>qjdXBqg
z&>kO_D!nx#UN}Q`EaDm+E(>|D%Kcr2_Q?;vyvGwvEV5MiPZnlf)|Z9$F42EFCC?H6
zS**9)t2<D_Wix&!NFViEq)Pf&Ju1c{^KN*A@NzQn5sm4|#7Yn_(fK}Juuw_vC(@)u
zy27$x&e$olY8!)FEa0VYy&P*+&}KphxMwFsmUD6q!;4UIV)Nnd(RPP!suv}3ixXkD
zx$G1*h1r|@G=)!HnNDv>?WK|(+E$kps&3R#wAoOh3KukuyE!wFeV}PaLWB|jXOFP9
zLYH*Of!^Mu^wy(=hpZ%hi=(bGsf;V{di40qv*-f0zTuTCBUBfOQ%7iGm+$fJba!j2
z;&&0-@*=8$wv$W>uekdmbWh;TC{3Q|r7cS-u7g6mukYb2W2|EszmjfUV0OTkY@^=L
z?vnkGQ}$MasdVf@rS+^}zPa>3wUt7T$wg{M7v`uva)D+)KNzu4wY9cbyGc4#w>&;n
zp&o|Z;K@5}lkz>R+VW0&`I&qb>IcVoMbG@SDXkA=z3!WHnLKGDeFs%l{nAXFHvawX
zuCN6+lc*%MAd^cZ%TP*R>-<Ae^)o%sHib>4kY2rw;gIS6<_LoIcX(_m(2}^{@1Yo6
zP%M8{ThYjBb$PL9DQ2a;-MZ<n&4&}7T$vok2|_IK;*3Xj1(Uk`_X_)_<5yft8yt_B
zS6l6HNmj1zqsk-CZnaX3t9PIa;9Vd!&dyq2<L7!^7GsV!CXcXWAHHa(E;YL=N>_{S
zikoD0nC$ACJ*}e_)6)tzk~jN=2{~`r6ic6IJ?NV1t2pl;lc*hB_3o^nJbQ=5Yjs8W
z&m0fWR^d4jhpC^7f#_o3N`KR{-Dd_WK=J@T(AG^;3TW~q3u*rlUncp9Xc-2~DO_FB
ze3?3|e(KM#E_;cqo|uK3=H;n4JGn6=p;4OJ_ne2QY^0f@=EI2_T<p{#CFz#l`L34T
zEBKHzFSCp;NH<zY3R}pVZ4rLX{o}sz%YEVp%|c%nbYJ-Kev;ad>jJy;*{UPu3kySr
zC<_=*3n`Znj3PfK2kmHh8kKEisg#ZDqFqWlwpUy}n)&^)x`46wK|`DcN|Lq14ZFfu
z4dJ&!*#@L|k4&I9S*u<QhCGRMJIRz>o$U>@>sp3m4j;&lusxY|Vr!F;?=Thj*}eMt
z;+?ma|45XCJMGW*l{g~OQE+tVEr)i<VIq=yI-PJtf^XXlc_e85D8rL8^2ax4FfO!)
zs07`*AI3{FkY!1D%f0f!<jyz#KD@h3lG~_e@~zw4+m7uD|8{OA;CSdgt82ZlqX+uG
z?WEfmF<`P+kVP)XzT`yaUYW&8pRLgXHG-B$yF4#;&gOEs7JaqLLkfceUQr?U&sAS%
zkbmX=K=avXwVq-y+0{>Zro8T!bEMg~*R-4#Op@8cOp^Tu33|`ldt?2yj$O^cRkSI8
zN+5sgAdWGqyB=)HjM_bN!DAmG%{%jf#p6=cq|5B)*lFs$&oo|D^9Xb<yG<$Z3shcy
z0w&!TE)^A9hk$SrA?7Oa_k9~L+!H?H^E5`UgBtN=g9>U#M#)L_@@ZbAcZl@v5G&Sh
z*6S1WEoYSv55w<_6l?F&dV5cke68)5t2)6?NY{Em&gyn@@3uSp4Qswre>YGobWE<V
zkxi2rD>#Q_-L(mh2hX)V86MN^>Pjs0sioZmziGdF5WZKT>D^pyU!zqpjqmKC_H!S&
z{_K8zI@!ITRy2>BEb_TH?k$ba1)7lNwrdX`RIv6R5uXd2m|OfHa-wPJ`z7+^+2BtZ
z-8W)smlOs=QXCcC4}Tfzc>BSFzfFE7yY}dayLVt8>5-4ON6hcZrK$cwrtz8s8M6Cn
zR^{%b2L{45g$j9k$PcTuX?@P=JCwL0ttyxy*|e`d9XxLP(Lnx@+}2X4E#&N$P#0Yt
z6;Zj=SyCIL$1J6>{k>`IFMSn27Z=o!WWrbcZT3%O{TxSZ>$p$%Wyd2mS39_zMNE`G
zsC=e6s@iazWE1HmIl1l3J6_Mo#?3ab{opM?Y|0_J#f<jAWouIYFXb!`vtD9;`}NXZ
z=EA*q44%x7sFzQY-_Jx1xmUQcvbRJA2eQ2H_nzx*ba+_g&nVr@{$5+hn58$p<!HVP
z|4-NR<H`Ox-bZ@!dM<=|9r;Nm;mVO{=3*(Dp~5=$g%q75D@A47N;6U*n{qRNYTL|W
z)J4;qZ-y^ubUvz1OxY68n4%YzJ!>dw8B6l3iW9^4G0fj2_>!M3Mzaz!1jMPLg!@Am
zt2Wz4)#j(1)}tl6z}H765`uWz{BHF)GU<xqpW#caUS~zsxj8==SY;Bs$QMPW&2#61
zj@SJk(s_oWGs~eiMUg}~asMFyl`SH3O-u_VRI5w|HA~BTStK5+5VqdGG}Vx)&m?4N
z8aUX3=W#z9X_`fz)Z(b%i%)-h>RS7ciNwe+qNXYWXAaW)xeeu}9XQOr)n@ME@9wA7
z&D}=2JIG8W=QZi98G1D;(tJYCsVm0Pc5cr((4-w0us<uMhl%ep>RNyHjf1mTU>D8k
z6v?n#nn9^GBPTQX+^@sMj*B1eH^zRIQn=<9A1!gP{Az$vQ6$+IEYcTc49RtWex_2?
zPVmV*a_L7|LF5qkb1f#T(_@!r8<5k(OQCmDGtF%*I<0P>wLdIdFHie>I4y#PH_+0U
z>Pk*f>3L@d2fZ|nlh(tGy(calvq5#*zUJu^KmW+qVR5cLq42EC*u9Urmi+omTZ*>x
z?@IrjRQpVND2pvqg{=Qwv}U_sXO}stUpVmM<)Y$h$+#9dyUD3g&j<UheRAHFiZTcG
zyzF&D1TN?aYaQZAn?Iep^-o&1k;nz+x3iKB&P0Zf=e?SIK;&jNf#fUp7kKs%=csUh
zOkx;a{Zd7np47?K@^7>3ZdP9GO0)1DFz7f|qpzYbl#whqr@%sv+!tbVT$H(bP_fdy
ze5K$)5nWf;NU7siw^PY;IUO^{yo4i8`f9!oHwj{XCcf!VAIaLhOHnN%^}v~*8ehE=
zO~NmB^L=x(jtsbZ(zHi^`zI-MwmL=o)hPS^u-In{^)sOs^~#4XegAE`==kziEV(4E
zYI%Rd$myPYzpG!e{wO9#nLZo37jh<psq)$oj$P|zx|Pjyd#C-W$yP7AL1*h5Ew05f
z(?9dE(@a-i^%z^p7THR^)eW1j%jtO$&ECUyspNWvq|^0V0~IF-iejW$pK1Mqc;r4G
z^K8KB(%kr!g#)>Uh3|ClcDg&zM|x@tm5s1>@4FMsuT8#$l$7ZPkzJh6n0Qv`9{DUL
zkYro6C0YEa=88)QotZN^?lb?8qK-Fw3CN8}zOe?o=>373Uvo`uYaa^aF(!>%=50Lc
z(PFUBEW4m$cG(L4V_>bf(ZpVS_48X1k3@KtqIx9_Ego9zn#SK1H94{?EBjy)wf#2<
z&%$$CSf+_JX@kmT(sD**meH0hUH<vc-OI)T6Q=nF5f=7Bd*mwfj<+#TzYSshBI;g#
z=W*i~cY9kWO(iRb5jFA4QOyyjI-D<2ClBw=FV3hE++rm=I>4ysXg0oy(KDi4d&*ep
zINue9ZOvretnCKCgH0bl!0KFTDedCcFV5CbY_8HM?DQlzxwXJFgzVbGAh`I;z08Y2
zj6B5RanJO&h{vgD;mb>`PIvPwITzj!Ri5us_P?hkI;Laj+}sUB`t!M>^ewdSH-5O2
zm7`=>A2^Y6BuC}aFM6{oa!z$_nxeBp0LdWSznUuHsFhsusJ#s1BcYp)hQg)XUx7XR
zTP_pNU*zdys$gebxH9=2t9SLsO&vB*KV3hbY8xVGEuqG+$=6}?4bO<6JGHg1-7i|W
zswb(f4(6FN?FhEkN*#U#--CAGA?wV?MK-?trM!hra@7_V$5n4}u*X|jqsi%gqII%D
zT4TAck@i8_kL}cki`mXc^xtea>CJXEly0Bx%bmuDOn(HMsR?z-93@}PXnn(@u}S!{
zjK!0j=+ugk!c9kuzOnVX`YbYrF<p#0ETS9{vwwA;;^Wn^*02ZEt_sBCiQiRd$|tub
zT>aSbFtL-{R;f@npgp*~%v87i=a$X<PiX?LI8Nwk%n{te@|AXJ((H0e?J%NO((eRr
zQ_dbD26K+T-v6BAl-O$n$WFf{?o<lqHa>dl{hEtbII%9l>inX_NzT~Es@%3g3tf65
z{hmb{9N)KBWYqLB%pW`&bgWnQ#Zad}cS`&wRi2r{+*Y}BtK7Y-%GCJFuRjk@*0(7&
zn51`!sqMyP$@jfqp6IzqJ4n?uHT*mOlk+3?cP{1w>0V|fLT)1gjZ0DFKjy7`Keqw5
zplN|-g`|^KmO|4Sr@4<X`u>g^BcB)9bc&_Blw)*0#;3O4<3#8$Du>^-POln*9qKG`
zHJ*h_S{lUIxH-8~zU&=RrBqXjZI9!p*hVJf@B6)dINYike~PJ-a8&(+l~mLt^Ann4
z7ma<hy6qMsLpff`9}wT|r9hTRKR&#pWAcz?9veHan0un+pOj>4pG|&j()9*+we@bC
z9^W%)zy0~6X5;w01CbBt(zlj6ANH*q0M4A}G!IJ(IZReoSaqD<*Klj{{j>V^?7L4^
zGxnSdSIMt)rYAd2n>c@Ox42>J^+?NlOw;P-<tw6JP36q{pIzW7F|OC#E-e4Oq<<;m
zZj1Ilqr%Cdu=;&%WfC;2QS<LU)3mW(A7Bra?(EU;>KAG0^<5dBIkHL{d_PJ6egxqM
z4?hI>5h}PJB^>+_F^vNR7orM-Y1}KFQu9|YgDqT$1r{#oD>b(55PE%D+ozh5ifW%U
z*p!A|LWb-?%L`N-yh=l*5LpKbAqC`l1!#d_I=T~SaK?}<XMS$Lk^!&GN$DsNQ4Pi5
ziF9;35>kZ`PF4IYKzx?S0caceIasLH|0G_uY`_GzH}InrBOGApIf_R@Ixtx71*%EC
z1vI}vB>>$x^i%i*+Q@qWMRrb5M9$z+=>)*lVu3BdIs?_l{bXCC<Un%<s)3W?TB9TZ
z2bTahFvvt%L`)vP(s7w)mQ%bzMWvvHqf-4Z7Wgyqsxj}n0!)()JkLa>aBVT`5X_Sf
zbVmuWgNSsPtXLLG#F-?lGo7+fU0hP>8l?e7v!LR5<2rBGOBjlJ_d2!xivSC7XC(=N
zrk5xiuB=x8JUNP&1dQ2GhqiB>vd%`g;cQ0Nsn=?FdeE4SsvtB7IFyUZgtG_=0;3$*
z7Z+LzpaA@Ef^1lYYjR+99&loC9J?SFU^0VsRmp|0ga8FTixh39{M-s&iwSarxm;)`
zPLhHsffwR}%wVY!R{2sMRPa}#z!ZNB;I4uoCy3U7x%cG3MsM0lVJQIld{hHjKDZ_a
z9_OP*NShgjkOJ_F7}XH5FpR@4kEa7Z1*jInf1iSE1*9UB4h$8bO31kg3ZeiG6hc!h
zPcfpT5LHJwU;dR<LFg4hOBuAwB9AA5TLmx>e>Wlxcv%DkJ*$H8&?1x`tQ4V&NU;Wn
zz~XTL$6}b{=>r&Y-WV?gx+zG@VGMaCCddeS4&iAjhlB(8cM(~@i4v3zsXj&#PzFy+
zpfvw+3ZVtEykIKqr7*c%YYZu0CD4IpD?AT~DTRWeHX8)9CSaNzWl-Ai+y?28GITe>
z2B)eFy@L2&*uc5_3f+N}U&0X57nBxoyoN>UaK#Y+*Qf!a>j6%^M@@k9WjsHyZ-z0S
z^TKZ&tVkbB8pbLLO3PtTYW^5v?1v|S9TgB6yhcGZ!Eyjz0F+XY!r;F?=z&xvs*LOl
z!H~5K?QY=NK~^Octi6T7S>Nz1peYj;E`EVP3uNBFp;y0$@$SBYWqR=jCcgY&gAu{|
zcuw$k42En_1shlQXag^)3Z9RyNJ?(o0I?d~h8V@IJEGJ)rW)3v_vr?Ol{#2>!5XL~
z`V52Ps|hS1hJvW4ZcruELRFI&8&of(<9UI-42;7&^Pkeac)6~(o*NI4se>u&=TYFD
zAhHhCMqCU3m0<^o`FL)i^9JPvW^YkJ<VWcSfr7WFJmOuBA+RhQK;i?OFuiv$|F%jD
zh6QE=sqbL5o>u=wn1Faa90~WjzpBh2r5?^jX+4HyeTGxe{T4Ps`zOp~;r&0ENH<X`
zc>|GXqx{qXTN_|m1V8>YPX|&P;90BcTsP(gJ2TP&Pn2*OG<LiZhWF*`2I-<knELg;
zzpgpJ^Bz1O<wS4*hbAZ;`D2~;4Ub}Q_`p9A)eZf1MF;+y3>q*#fajtdV>n}Qt;5Lx
zUCl5{foV+oU<-`f>(>U=#uiwXgL4?NcF-JW@vM|%4JV-$Mq<5)@!+&D0rEVa5ompY
zygmwV_78=p37D4Pz#6qduj4D2baopw+sFX=`e37bJMb_vI>MT&6tct&IA`IpO!$E6
zA;RpK4BP??K(QTFMGo_TzFw$xk&7UJO{5ARVdF&F34lw}s6GhcBQOD-kI?HM0+{*?
za}~lvq=bS9pcG^$km!JMycMAkTA&9d5I|7}WVdaic-;X;MG3+{=MzK-l2{xsKEa2>
zMQKa{?L>8vFgc8X3xp1&%fQ1mL|GH{^8W<2qDTqKh|)(+p!FHnJYEe$%0HuW2(u=|
zh$qsx{ck9A;CUB3qzXI#n%{w3(c8d|b$}xoy9-N+15|v075CSt)J_MSxD0nsdL_yW
zjK4xyelHe%d^ySutPS7-Svz=x`~HcMaDZZcCy?)jt<>m-bDVkz)649J=aI&Y!d}~A
z^ni4jzzY}_V4~(d&_RF&CKzi@;Gk5P1DGBC$M%h5e{E|Z=n1Ta&wHVd0&5E4g<L#E
zF<}a_`d~ez&rpbaNcDNl?v6ybl}f%r@c^fPOCSJz=b*cz-(eI}&J^A@@bWucsP^ud
zpuZb|2y}kH9*X*46*usLO<LRK?LVMaiZ7V@fx010e*apg2bukF9H;^|grM{jp1|<y
z6v3Tfq8!fvimnk@vF+CK6B?rl#dxHf1VPGK;s8emApGgh1|!7-aNkbf!@M!vC9q@q
z=O6r2vFLD$fEvhnK#&3A)X>tmL1?M{F{U^22v*u~2&Q!^3ah4X1c4LOQV{;w4c;_|
zp|@*KFeE;XzzmA-Kx4d5|M6y!NHMDmlt$p08%w4T|L-&d$Qyxk((s%D?*wblf{8Tf
zt+5eWvKWP74Q60rWsbrd>+hGCpwbwu--ld`n9PRr3Li&Oh+P4OsE(tW$iWgUddDJI
z$MSK=PA#MKLl?+Rz?J!|919$-FbyQ23L|1Gp=|LR=-Y4-`VOgGht1(EWKBY?Z|^V<
zFj97)GX;%SH&75Q&{Yp-eC?s&-SAHVUNm8G$W5a<h+iw^q})VqwPRXvGthzUGpIho
z{|OVToq=M_U6`BEPS^{}U(n6>ZY&hI(pUk@S6HI8L7V*r!^C~3%%(rm{}a>tFbgA{
zAEpqRVE=D)A0jZe!5!N&ykKdKK+735luXC}3HQq622pGij1%}Mvmk{$n!y~b^=Wbr
z7EbOrC2BozaUM3r1HMLqvOve?;l;>ni4yQW;J*MzMtYT^xEqu;!extFgo<g@pkfJ@
z4L&rvv85lq2vZTJ#o)C|)BGZwiE?@jf!82maAOG`B2#7x5{QJbVVrmtArg37`1dmT
z2iiHviSgFz3lr8s4)9>e+BL|5OGp@GEW?x%_%OJLM~ELtuRz3CaD!mP3UpW_v;o2H
zE32@=n@Jns$W`cLmneo<kc2ov$#;|^T%CkRB4jqm{ddF}!V^eZ$bvk^VwV#lVB38U
zHPkRw#^ANPSt>P24*9H#A(P5NeBkR0%ykkW(STSw5(|j8=cfVPT|_3NRf8h68C*d~
z(g?pMMjZStL<@w}g*d<+IuZx?cwA`XGmX)DgA|(;EW(=9DI5&L-Dv~Q#{uTF#;c?7
zBCl@X#gT>BF`f(!<Q<&<%i~*DQ4-$hbV&sqq9aK?QWoaM_{$VEK8H0F5Y7v)dpb=E
zVcK8}PNOAlLz>euqCNFLRTVlYLsw3L&*5${5<%Y^Y60L+Ph<w&&<C#ZA4ry-q>B5@
zyiqEIp0o!i3Rn666@Sx{ba6q_8zE~3(r#R}JP|yRB?^No256aDVVz=Qghut1)+rqY
zA}_eD@?VQ?GLrDP8nt!iYZW32h|I7L(-gd455pfZlLWzTCXymfO8+my1ukl%f>@(N
zjffnq|NWwyc=eU>Unv7zjODs<J7$srF8Rbd)yxc&Ft%N%U{o|<?<pd@F0sJa_ncYB
zwQY$+(Bu1Gv~O5oRAF}O%w-mm4ldkjor*tBqy-Ngpb03y{wr4I6p;<b<VFM{Ni+oT
Oij{<?+wVq%f&LHwPx)W~

delta 40813
zcmV(<K-#~bpnw71n}7ifP)h>@3IG5I2mlp<kqjpY6@k7$Ec%kTkvmxw#FrTv7#bOv
z8XLqLni*K|a`AEjk<1%`!-c~Eg~I}c!vlrG1ck!|g~JAg!v}@K2!+E5g~JMk!wZGO
z428oDg~JYo!w-eS5QW1Lg~Jks!xM$W6otbTg~JxL!xtK04(@=yK%dbgH)06@01+ye
z;RFvRm(W`m4VNBa7YBbD+iv4F_B~(039yYk@z6=Jivp8L+l((;FA_UzJ52{|5zrDH
zt0PMul5%3S{`VeIH&UWvJ537g>LIqJbHDQ_t+xm0EjoXJOVVja%Qf@w=K?uy1ATpR
z^3Qi)pPZhc$rTY4jiZ@(AdI3*;bDX>f&eLCju_>Xt*D2Ah@^irnfn~^3>>}(zDq++
zJw!P2D0i7Zg&%&1#GIm;A5hdDUVrKj{@p|mbKjjyBI_tdd>+MthvsBOfr(4~RYGG)
zm_X4C(1Ez;a{&Zn;YT6JH35=>vIUn!B!3d{2$2=>12P3pM4-74%lEAoUxlB2f!%1)
zN(IDou?VCVs6T&0A$_0>ttjI_nCI+LP(^wfaRCy67K}EP#0#=Uv3x3t7!*KV0482j
zN&uh?MN1{}3wp41uq5tha!*mj?y*>a+oT&XXbNgFiv18w6OsUX)3bvEf3b|fkiUU(
zupi+bIO5E>8IbTEGdc^XD{vdEAXw~*h?!7e`2csrcyWJ4mIc+41Yd&Rs7Qnue+m9W
zMfcIA$^d7(VoVqbIdLV<Rpikf@N#t%0%J0xVtq+hG}r-I$Z)~^1odOg*FTWZ3n<$e
zHNosm_e7ZZ3mV0{aLl|q{&CP{EMn~^tWt)(qMSpZ>;k^cQI+6&a0@mh1TI@O&`?jm
zf#AgBRXBeDZTK~V?Dj)Cfl~7vI$QwEf`&p$bldJs$L^di$P3WPZty2)smuU`4xPsL
zm(l$Wpa3;lFTpPdt+%R}eotaCkC?3pCmA14p(G(UAe<v0kVPH({onw>l|GjWzz2mi
zMKXKfF-k9B1ht4J)z~8ti-gO1OT2ec7_23e40L}4H-~VqxeM|G^FiVg_N}~GMQ^!)
z0?@lqxos<0bz^g;J`zotzmhakRcAgp5LNRRb-KNao6E`F$D8q|yB{tFoy+bBoy%&C
z>N3zdJ%Ounc3?2dO)aab{va)eA1blZEIgFo{1$O7mJB)&hRQnaD28w6=)`2Bdm9Kq
zWD$S1mi49%%F!flXb~VA8$>y9$TX2xAy#Ug{nT<QU|0odBjK<y!ZR1_UdgEo$Eb)|
zm`k?N9G>7xD*@UtGn5TGx1x>tD)K!@pomjI6>}Cns7%TWpGMA~AxAScdIOe;gFxq~
z49eD}JL+zMh*NfF2G9n%M7VS07~E-@x=MeXmWgSy*Cb2?Eck2;UA#S2@U}{BHg~)5
zr6z<ZV<2bgE>22<qjxtv{_kaf(!J}BM#E7Ph@aKdPC5^!@`nR|Rgk9T72meY3X}}A
zu~kn!;bcTPa%4i>n_f)$H4*b>Qd$@AXO}>daMJt|31?-kY%dA;reJ~TBXmUWG+uw!
zuD$WyU^uz!4Q~dWCOTAlg^@rr$QchE9sPc?IXXIQYP!Cj>E%_8KCN^~ozh=exk2}U
zY1Fh|l{m_VZuA7l))TBq+6?Jbrb;~Q^-5T#4qE*1BsXQ#(F!!wWfMQGU%aCg=G~L+
zwG!=_o=%mq6{Koe*Np|`eNxo4y{mup`7^7u#X)I*!iGfYz~ao{tVtXHZ>6!;bA{i`
zZz-@bk|YpT|K<aNbaVcrIzAKwNk8=H<F+7xQG>#$?U-13yDQXawU9QWOV4)bjKqO}
zU*PEg{u<_KCP5+Ks0~L_mr5{`2^P^<Fh2zJMiV8ap+D#iHKrErxmd^{uNZ&3q$nlI
z8U-2T35q?sQ*uj2mvCSx>{?4OLCTpg<1%bh(QN32h(f?y8kXWM7ak;ZX*4Ue?T6AS
zxiDs&{qYB?MZ8(Uv4B1Uu|or@AzE`z`3ecbWLC?g_<$@Z*v@fsGU~QQMOgyt@a2&x
zvxRZ+#Dig{JJ#X@(=Rbp4X1y^+}hritoDO3)UxC=typ#_n~3t-sweThj6}-FLTR(L
zFyx_;CL#LjE5!i&d_bwkM-)12b+l0+EO}-dWXpv|!kZPRd=x5@u96;qwd^Fv&bB=1
zeE1I0M?pi6TR3aSJ_W32eo{pAYN$XQvwj%0JgIgdN{{$K%&1eMo?3srnFc$aMQlNY
zb68m7=pXz@&3qmO9jGU#y(g+#UB^g#Y-(mNP)|$)@~U>{)U?GOa*Ki80#diG5=vTE
zqvU8k-Z-Y3yz8sB#tTCR_R~t_$fI@5NS8;c(mR_HUS*oQ8H{hPuZN>aw{zF)UQBLA
z-M?q3s~ofGBXwUo*{pwF$-bSNQ^l5cnqk!(ii<U%)T3IBtf$6gy`a33j)2OrmT~ZD
zWnW`7+|%b4hfe9eA8M<4$GWWF`%G-Je!j#xJ~l%TMzl5w0_X4}RgJvh4bk}}rX0q=
zLv*a|(vHz#<2{o1B*P~9S1G8aC`nU-&|$hZN<wRUwjU?t1xJ6!ikTD{dpq7TjrO2A
z>l0~uc7<cRt~i%+Llw6*>b*`R@~TF!P4?OWz&0jsZD4vNlyp;%e6AiH)>kJpC({{V
z8btvmA*%82Q_*Wi>KpK?&-;c`D{+w>g;-2&J<iU}o2n1Fja3t-`B<+yDf!G)DI!c&
zc0KUz2<m|B#|nP~#%4QM_ow#d&A9(#4%(13?XaWnMdxlfxcnqx69MXXtkGiOi=B?|
zMXG*_PHGFmyLUB(pshIVS_uyA1wdQ9pI3#D*OMuqY5R&vp0N0zPIJT2pk5d$=g8OU
zg`#}tEZ3rKMVUWa52D+Mea_zrSm0P}<Zx-G&>ra$ZHs^55>XAaS(8XAH}gI#|Gtc*
zHT-t!$kq7XrH^UMvCwO)He;9O;@xAl_Pqp)f?!JA&%3{xIJM;gJ;i?Li#CZlwT8cC
z3_E?^9Co_Tj_%aRfV3RcZqjQ6{Tr9RRS7rAxE_@KSFMw^DP8z@@4&5zkUgT~^&J0f
zr`rsb4LE;u!qqaz$=6%iZfS4ZWm8PP8q@YS$&8Y0w;XdL#^E=div{sRx!}s!ztD?}
zXWIT{O|Mx;E&r?KI~_Y!_-5lt>XAhvbyK~;c4ZIL)h-sy-9Vi=fBscgR#y&&lezrg
z2<*m;!Gq*iV*CQj*cK^<ALH4KGQ{)u8roeQnooZ*Swau?oK!;Vv%~klg!<Sqix`}l
zKoej6rviL@NaV!<4e!NV28+C>6otpf$CcA{PFvyq?Ek8^G;$l0ELh9S>Ky(EAJsn7
zX<bn<kGyTf-tR{25=OK^yqHSk)f4+AJhDd3bLYR*CHgWhpSL#$e*#cT0|W{H00;;G
zER>g>(+CciAhI3=m+(0pBeyDR7cHs}ER?T6igDrcRE7WmyDS5j;bIUcmvFHk2AAKl
z9}a))y=`|JH<B>=IrA%8+OuOSL(_I<=Gpt$v2$sOO1P0k4N1k5ySs;{MYgOSlWeBD
zDMd5m|9(-0cc9QOl;k+G;W?JcZlF*o6sih^LgCq$zl*+%UO&JG;2dU~yF7h=T}GYx
zLG;!0=YM+o)$<q6qv>f}Ceb9jDsSUFiB5mYMK6l_%VmUxizrWuB)>@(Jq85eOs~@-
zDr9l?eVNXab&)KhxQG@>G0)RW_9I<K<#iHWrOPBb9G(9-Jo~mA-Cn2jYXEYWZKL8k
z+b$Q;b$pYsM&?O+!(nXVyo|CdR-FM~q(#X9Zp$=VGrXn@WSQiv0)RmK@v_LG_$Gf&
zm+>WQDK4YyvfR9U_N=&Be@M&TJX<{z2==ba)e?FU4X>hga+~DQO_CQ3aG{zLMG^ES
zD@ukD>qVY)5#v>S7j5A!0I?vj?y|!1q6-+XqIr~U5akCP!DqkQ#PbjF`y|Tp_q}q(
zh7E?H$9l@TnJ2w;%}BG3m%ZEhi~oOk^}FAtt4+p8xk!3>@_wBby`OqT^3yh1&y(IV
zT_?T2OvKL<_G{dKdsik$aT&jAU30fu$BZ|unt^_OSyw=Hd~w;E{BSn;Y5AW?d33pB
zwccsANE+8=oVjd);qAO#;drr1*MQyObu#}@Y*(Xgx!IPJGEd^wPJpI)ye@y1ahc^U
zs=xRTAW|F5d5s}!@ZI6jy{f{W{$i2Bd>XE=vYz?lI8By|`@w!27YV|ZUmgJFQL;=F
zzUGeyfQ>L82-Y}ZQZ8k@aEDOspS!`A;E&S$JkFV308l$aL5y~TQ0Citxy=*oM$w7`
zzv^YnMQ?Jm9xWFaoA-I#Kp=l)fU_oGUHK-001z26EKZaBeNsDJp)@Nj1x3T+2z#6q
z+hti%1En16-%0j<dbdfma`_w6z0h~v7kuJKMg44<y?>vs-}g?En`EiM6lGkd^VZyv
z7X8a2TW(9h=-HQOpZvd4CBNwX34h1i@;b{YJBKUP?IqLt(R>*fMTCEV4>Q)@&t>$F
z-~BFPA5lP{$k>YE&rF)L<CEdxbT&GlU7R2Fr-SHqw7=afSR?zdn$?@U8%__ugL=hn
zTF$SV);k@Hzs2TOFm_FAo%cm!o0zxNpxXDtv!mH`@YgBS1DZ5y3~QZ_N9WjDo^6`f
znvMt9Gp62}bqs5b2mgOLI7A%t<ZsEm1(u_?lj->4a5^}G+Sz4+LL*ry^5p3au#JFm
z!mQD+!Bk*Bw*}0EH_>F;pI%I6qw&#T%#2(HhgpWK<oZLhAj)?RIC28wKkx^995_s2
zFFID$-o@GXXQOv#0zlI`hu`(jz8xI3sx>_8pPw@-_1~ThT2+7Cr7>jZc2)GSwZl$~
zy{h(+ngmxV6E)E?W6Ux<`=Ng_1P1%z?BbLS?b8<&Yw;RPN--S9gZ}C4@H;kEv&r!P
z17?2lfByLY{E3`yyq;jp>374)>}WV<GiUIhz>SMEpUt!N6{}DdBuiWMVZy;on2G7y
z+px(%PjjoDnh<{{qr?8m?4<v8a02x^t89^8rOD!;zHJSI3Bt+L0I~#OULI88amkh)
z|Mfo_1{=pQ^q{l<HUC8W(H}@O4|?yD5>_pRoK;QW56+Gd`Wyanpc@_74g6$q-XHg;
zqcJujmT&tutV$kwcQ`xycJ{+yJQ<G8fPcQK<~dgW-64OB{$zIAKl^cZJUkgpjQao4
zxcbRxGBp~k8+BH*e{?!K9*s}?$Z}U%&XjjOyNHT|v*~y^m_W^B&E6ypxLj17o}zLo
zSF~=Ss+^C9lj-nmz?Bjc%xn$XxboTPZ17iBpP>wj6!qvjTPHs=I1KlvOsCT7+Xcn|
z$$m3N7Ycu4|HW7Ty>_Mu+B{eBJc$mMNxa@}zKhq3Ws*y)1U@%ex?qM2zU~}E<#nFj
zq75_nd7hyEp+d}EW*O9sm<<I>LuRfs&B+YcjzD%DuaW~pKjjHCrq}p5+G9#?yIe-U
z|9u1^78ddsVBMv~yL7!^NE}4pMCJ>|{B|p63`~FLpqKo#jhDsn{hFD1hiv)P;jO-G
zQJGh%=%}*n2HA2_-Ys#BXOgjER-g5!!yg8-!RQ1=iw)J}jt%$<P&#LZO_G;)oqhCe
z6v-yeVO72Fi;bE_PL7QRG{NEX<iFQX)Ps+WpdF4YpylnMRbVG!c0D{@&<6FRM11ku
z7fpZS`@9kcj9|xvS-{_}gutx00|!;`?)7BLtRsbufn6lW0=a(uF~lq`S6$`V>W6r_
zP2?=Pfgdh1=~dLh7tw1zk=z3CdG=+r5iAxhvZPo)DI=6OJy^B4rRD5ore_76dS^^#
zb$OF^=RZctvPclK{Wa^_O|mcN7w-avV$**{5nk7sOce;696wy+$LY_>qHD~tigpjj
z58kexjg{>_LXXXvOSipq3m5AT>+E(-Gm<-LY?+*_w<}8;Xe8MBJ?gKc?V3sX?EO0Z
zd$Qou)Z};Bv{j4sGAe~z6P@t|TgzQt?MH0cpQ3JA@QG+b!l__^nc5(Vq>RdpsgE+0
zY4|5a#HR&_CkqT`?goHZd$7-Natvd`$HxSO!$wd{8v^6)`dyZP_{%ogCL<;oc$Wzu
z7#)9w@tAx_meDPPK4j{xtto+nT8-M<{$#*bC#Rzy2A%y&rs<#N$tq(~ri<Lhx(43Y
zF+S@Y9B6uiH9H%gu|>hjNoOCnlb*s}OT1j_s?et)f9Tge9G#vHr=sdSTdmU4u6c;h
zprWj21CUrF02gZj5W?E1=2to;tH4g#Y&w7LpG{yPawKX?-gZDpHnZVOempzGHNfon
zr2p-tvtQh;=T8yN)iQoxXc!ar0^l6OV+#f>K{e4~A?XwSoIRz8J{}yhB{*U*JUbqB
z_F+2b3&bF0l0-uo;|o4`Ov0Ezn0?O{Qd9Ij&D7HBv_JlyEo(Yp_djK`>M5}GQ@MXe
ze!7bD4@quzFe#_3#Gxo~%HL0u)rM>g7D0pY^hdWr-JVp)Zktw<(lE4}^;$h=i>-_E
zZ^!*3#w4)UxaE#!gTm~g@IJGera>gUQr6-k+kjd8Do}`)9hv+_0QZY`td_cUFi8`P
z*JbvVi>^^ZLV9iDC(HPzn81n|-J^dEUl}+J3$5n1=tH7Agn%Upg0Mq~ezYBla`z=#
zT)whi$mQ64nH9;A^Kw$g^ABG`-N6l0Mq(-WCQ6K7b`A7A+AGI5a;YeO7rv{~so=UQ
zOl{HuY(}UViU_7d`o0^v7+MILq=S*}2vRWOu3^iyH%{WkyF4u!Ye|4*zD<ARUketc
zjV$yW;L(cx;Rw1&OUlRFG85BHKTMcp%IC>owJGo3{iS6Ody7j!V}XsiAQT0F-`5?E
zoy5q(#Kyn{AlQX914MFOnz%_sXioAFGpqJC+v2*@j{F9n??f~?J&2B8F)KMS1lA|&
zD*QFO>vf9B3G;V{aGqFAr3HVEX$O2I=uLTPzuzRuhfc70wDka6t4$B7YoEw|f3GV>
zmA8{^f?c!0Wt$q53x`TgFos3a9!)z}9$TeA-sR?af3!e~mZUe!1?3UfCX<Fo5DdAs
z<Mu)Du-gz50-}5a$a(S}e2%#-symL8aDHtz;>dm68DS-Y!(Hi8G~j<S!4&x|Gd^}2
zbUQr1?x`lI!Ey1m#?i)C$(i>Mx<k!5DM_e)!dCfVyq+h^WwNlk%b!x6hJo~_dVq(#
zf<3p*>LEAv71|;AmF_0E9S>21(4=CZ&X}6{K3xMB#S8e-!R6pGo5xGG8a&6<pj3Uu
zb$0t*x>zLZIzA}#JEvsd+~}0iDiPTIDAaq<Fk1U|n=0I-SKxM?`Q!t`({VC9`!YI>
zKO|AH&6DUFag5fiZ-t~rakHMmgBdvKJ%<^}6SI51Cxq|FM;*Xi;6xQeZe<JC=qzJ)
ze^Riaei<$_fk4Wa>LM6Ke-H9J%TJS{h~I;cUp_g^U=alVQh+0$^xhrfcFgQ-G@Tuf
zF3yfB{ANC_!kt5YkCN)isdrESZlAG|m`~tUsg<3zGh{=~41=^{`Nsty-{y{ZAqL4{
z+*huwkcD2`m3!EQ=%4=#78t1j30BmSG3bW-Y0DNLOEw3<-38IVf7x=u<|SViUh!SN
zyQgmoCIc7SC3?T*_gS87mhn8<mvfb*@t7C-1Y|a!K!h@Qr|w01v8y7wBSFg2^0yJq
zV8I5D*+jwzMWYLHOGaQA6vHyM5g`o~6=0`IJP?Gif*^gKgO7!bgy(hmqsw)j&cpEC
z0c<-e0<!N0K6`FWe=V0uorqB$j0of8CWWA}v+e4VscDSl<4+j&{7V-L|JVOSJfy*{
zfj(3n{KqQEufpTngjZoCbw#;1gqy4q2|*g!c<;MG{|E>t-@||&p+`_zBrZ=#`6*;<
zl;p5ra-R0)Y<@5>masiM8N&YexIgP39u6jx*?91mi{aP`f5Nd^h}R5M-b>&|hy6t=
zi4a02x`T$f*&8t;2hp3?(er@!g(`1qAhpv{L8cI7IUKUeLeic9R^2Eyc9a^V_{-dJ
zr{4FN)O}xGM{lC%P{eE|Eq;iX>B8Y~3dnyw|DURTr$Ch|HHy>AuE%)IChCdxy5sQD
z0}zDjQlKvke>wY2Rp&^ukQ}g=JA>h`TLmx~U)GR?-i^lJLkNi>0o)?6@j`JK2&Ag*
z=X;9@5r8x};ucy!R#;6nmlpw6V?=<hsMi)9;p4ARIMGFMkQ)qjz7xbZqHd5v-o|Mo
zV-`NozVwalFQYLZX0VM4@PlJl;m{Malwk1;p2`JVf0=eJ6SlZcBDQRd;*x@t|KC6U
z`T75SanOtUWyEZXqQpfH->sa%M#VBM%0EI3!7441f`Y+%F&m7>7?AX%wxN4OSwG_7
zF)eoZ?9PBrcL<KN;J4#C_yqUQ;o~hGRILi`MJZ7)wK>C*Li*nG^=%*HT!%1eyU{+Z
z%cCbxfBy0O<C7=M+A5eGAMxE&I20$P&3-o`rpZ0XONv<D?N*YJ@A^VqcZF;`hyIQ(
zCjT4cBfSukg6}$Bzfbgfh)}`}xD!`0a}J8V`d4GqMtoYyXVEv2L!;<v^dfrcKJ_^L
zfh~B4h8JeUjp{?mI?jImv`z3BEcki_odq?Oe+l*t|M@cNj4t8$#er+#WplB4`j86+
z$6~VAb&Agk25-C`)1K9!vp|m-@e~#X#N$4mN2*+o`o@U%)6QZZwsU{ahXt<M1)>+h
zm2MH!=)q&wc&M7w5e|1l6c+AbfIRQ=qty^0#U`yZWx;FP!*ky7%>>8F;l{x7jyvud
zf52>8cA+vqs=&FdfPK_WniLTICA><7VbU0;43c|p(pfH1a6;yuO%H;wUJm*YL*~9;
zlH&BocQ!%4DxEVf{;qW^2AdCBbQ>3Z3>MEI@M-asAED2+@yp)c;k&5Fw)s49p(!cU
zS!X5ZB7ppad&1OfX8p2uQ;5#{+m>0te=*?N^?_l#_F*2!$aM@{J$cN-#sFXY&Wd@w
zmT%p;<Q-A&WqJA@fGU=-MIp(BqB*bbPTHB^O4E_nd<`=!VJgOQZn4pcON>wkS8sI1
zv<~db#CnWz_^CyOxg26cn&jnEYj~S2L`c#JAu7eEEjdGWl3`bdW&@t(_UD7<e;4zx
zceF^BHowTXF28t3#Cs5n$)1WGG6!Ye91rDG<+#Nv+jIc<EaOxR_`$+#fO$ZW5f%dZ
z=r(0Db<Kx9h3MVwB^>1JMc+aM>~%tc;YFW9;C#z*H;Ax_bGGW$G;mIjV4{gMce+ei
zgO1MRV28fuwA!oOqp=~|GMqzEf1Y&RnkUcYCoT#$NurKjGw4pQE@nH`tB7IAK+*T0
zBy?!gS`xyCoYGdqH8PRUWP+0owq3(%wI%0X&7-!0A<tUeN8ot&Ysdr$8-~9wlMpe#
zd_e2!vVmQ7*~p@5XCH+WCGwPE_z1PQKxxR#n^gir@jWtRFFMJx50E2Be{!0~V6C?7
zoZ+(f?s9s5Ib)&r@BH!bc-1E>eYoS@;Y4onYFfb#@ma=cQEZZV%DRd6zd-;#CA+_~
zDowz{&KIDu5GH0F_AFdMsV1WWpYY*2VgOgLkKN&gqd!112PPCziaO&W4jc*+3`O#a
zz^Ox<Tyi`7m0L`O2cx<qf5UsI_JqiA-&KbFh_YR$&1S-d#6k!f49X<lcTDFB8egK2
z=a)m>sG<jK+Vwc|g!U9=CkTkbT2Yau8i4w$WTupqJ4Z8Vy|u}Tak6v;ZMK1<Ih0U!
zpPgoT0^#cJb9iQ^MWEM>5_QkkK-K`;{g|0#0ztDp)d6GtWZ)DXe=}7XD^(jKRTCRk
z#X7B6$gNc4%7+gTKqdML5Q%OK*G%(oK)CoF5y1RPV)bFy_=g|!b$?25xkqhckd5up
z)640Q4~&APIL%~oFlYCyH=#wV>YJL@c4WM2ylN9iEv;sZ5K_U0mT_v{*RJ9!7iA_5
zyrwIbXKgx7Q@s&8e}DAZ5f>USBZnKQ{^+6O@+~-UK}l_u+PSB)jk?L9T4}6p>f3EK
z395-;6TlVLdv1tWbyN2f6tN5hv>K|KTe}MbG}3WDkB|@{^p)y{ImL`mUwgkzmf7t)
z{??k&ft_PHK?N|OL91fVz|q#EM!>t&d^ChrO5<HYe0l(Oe~=5oNMm}hr^%*Oe=-@2
zr^C_N?6^NXIjG;Bm#5gRIbbL*BXU_9((u<brghjU93VXvnUJc?=H%yiULG=)9_MM1
z)rQQg?1W!~eGW|V2A7aSwJ!^&8A1l8tfTBp^#CHVjh}Oo46y6lFsckcpPMWu>EDyC
z|9G0N%*WU9e*zA;nr%X`Nx^7TZ*<BY!Xmcgbi%KVCl#PW!J5v|0Ms;VjcLJCad^}?
z@QA^LiqU8f$C=GefKQd}P!6}f*RrEL0?(2J=xS0WLVgQdm3=e`f(O1~OZG~Bd2K!h
zy1@S-`30m=HTUeQa8w&`4!xiJczQBC`#ylPw`j6Pf5Vv;J2azLp#UWDmuc`3(O;U8
zO_o_Qu}*UP!7F=OaD`(4*@H+j3^6pQDnbi+?5G8f5ZfAS-%KGwfMjuq`K`turscu2
z7tfzRM?7o<<3h_UG7Mukv?_u_i81*|@Pxg}lxeu|hZcI6T#3Jd?sSaj?+(Fww3)oC
zNBV0cfB)$lOH!z*Z_EkFSu)WbakkWWC1}uJFMde!^y<zL$!1>+jMAdxiOz$-dnHG^
zo;G>qQxFG6<>(_Km?YWK;@#m%HvcfXT^A10*j<uAz|pwOE@7E3lQg8h9wMhjSDtvr
zpy&$5>_*Ssh!Bcr1c%A4nkrin#5+ar4i=%ge?1oL8Xn<7C^`8A#)e^D?5yxHrc3~F
z2`-!SrsGGCSB*3`<K(Apnp2J|^+ja}L9?Q?e$nShI3ix^2B#({8}pIF7Urpa`0ETZ
z-3MlB`OiC6%PN7F^`jfr70TTrACfy}j>Bl$&xK#w!`e}5R0pb*gvn&;MN1RF!hk@)
ze+4&Ot2FWQk^-is_-|@`XqK1wRusp{Q?52bbo&M9h-(kBxl;?75HKH2mP0BCSdE#K
zBP@NB7S;$>`4`M4i@Vh_U4JMh+YRKQ4yjA|@d*hA`h>R$K$|QdD;LLfD>YPV(rCLi
z`eUF#*@IQYw$cHjXsns#ulz-h*>(d_f1)<YMH&l8H14FatHKyQ3f+l$)q>o$8;nkX
z|741w9?#GA<H=yglj8+QXN*_Vp6pfh1XGPMiB;JV_}sT4$gx&Ou-zR4!_iEn#D+X~
z4IBfCl$8jzo0s+&D-{Ng9wksawS;y+6U%k?0}{7EF{%F=3^i!$mK>q=Xl+Gqe`@Y1
z5h=CtFod@uH>LZ%Cr*<QL5e-*kPxPs{50_e3WH@YEhh0Q!Rfy)i;l<2Hi^9xRk&}w
zq>Keq<zRvo)UcJ{!qptKYU=UrFRUnxoVuVv(wK8;6J9db<N>i#8Oz171RIDfFfF=5
z+!y2&QK9fuKmpl|u{Kw|ves4`f6FThmV)F1`3yib2v(A@ZW;u5-ehIn6%tJ&;(&T@
zMI5Lsdcq+qD{!Z*zu|Ab@0i_o!x+>y#n*;!5#16d2=2r*_5zd#^5ITypN)<NOji#6
zdOm>L5Ag1bZnS?0BLwmE??vpJ<VeUwhQxxj4dAaUUO|@p{YV|PNqMwye~fSUyOBc&
z674ppJlxT#31ax#D&W&NlsiMaiz4YEvcWq3BnznWDQU2(W}d*AOe>|6#T%`n?E{gR
zX4qvYB)uXIlZ;j68-f~2uN9)41kUb?9#r+MKF-?6+wfqsz&m=%rvUJA<phvCk5k|>
zna6MkU|JR;k_@9smoV~ofBNXz!%vBNn%SW<RrxfUl+ghy4?hBiDB`!a+;1fC;9m@>
zqm!T6TD-)>(a?#<8ifEo1RSop*yK5m(<Rd=ozQl#j=%=@QGF>k=b9Dd`^cnaS5Y4p
zsA31YE7lhc1T;n~DA`$=O~aN61`JaUXUl~lij6ltI3vK5y{ZO#e`O|~n4V<e{pMB%
z5%8yjdEBiATV@)l1f7A}JfWi%<%-2I9$L0UY*~|jZ^zz5%M3L13*qjD?_bqfUcTY@
z!gKNYWxn#t_%1*Vt;U^%I6Ko-H`Ac<S59R~K$|`SpRR;$&2)NULi;u8HHQFy?<J3q
zoy{E|Td)K%xLs;AM%(B76aKo(?bQomdgBxCN-QU1jIQ=on`-=A0o<}OgL#EK<yNVz
z@l|~d6%x%;R-<bk;{BO`-?Asu@x`Falnxs#xTkoRMKKt8e-U1c**hMd4J_?@G&t^G
zoJ?t{MuuRJ4g_<eyIU9D7HN|$&ApbpDLNNp)7^w7xd7~Q=f`PYz%|rxQ8-wTw{Soe
z(-|-mQXW0Qi^*^KP2a4jb|2D5#nm#@io+>)io@|@Z`d@K(CQCbyJu+1ELvm{KVglB
zpgC)bIgK|GfAL(5B5vP>2Q5D-l$l+9F8V=-Pp@c*FraFpL`Q0Lp>K->jH*~BnuJHd
zh~D8Uaa91kJ10+yPB;hSH3Ah|T9}ng0eOrhF<O?$g^^}bHnw-G%M8y2G9=`x=oRN_
zbrKsdi-IHw+)-oI*|%dic20~!i=~eg(S>l3h6r4He}~w^T29iElx|=Wz;$Y<T1@A@
z1JSs4?cOUk;d|eQ>{zG$ljDoCLx@1#Z;_Zp+rmM^j0$)#w$Gef&612Q$WG(U*PNj8
z`I|_){FT8X;~3-vyh32cAk1)?LFA9_NO|IM0>nGYCd{;Zd-9=~jh(Dr7#oGw-XMkp
zI;d%(fBwv<{MxC^?_$EmY(8IYI{kBX(N@=lz$(oq7jGxinRELXp!1vz1f^S)d#2Hz
zZQ>YZ(D7$C(}htxko+if<vxq1qoYxT*Ed5l1)+sI2hSjR+UNwK@n7F3ckh74oddWC
zDwFlS0GtC;+3Ooo4zJ+~_Of}-8@)LV8B{j<f9vZ=-+9P>cht>MYA^eAcsiI(e>}Ht
z4Ca`u(v^%^)gV#c;(KvpUJWd*d+e=0*~ey(55Mb=CxhuhS0Tl-8Fj7v>YsSPjJ2A8
z+%mzjptHI#&>XEhVyq_TgTrC}#HX%;U>zd)WQ^-vrwCBR@Al@Y+(6Qo#M>&}+^%63
zf5o@T@hB*OH^%h{BT&<tv6n+?&-C#_J)Cx#`hv_SQEFf8sJYz|FZzN>(f%jqR7(Gt
zu!uNIK`)f^aLdp`j+-**it?2~RC6_Oc%5Yh<fBmo3#Gwq-hkYA86_#?q2f03TBNg?
z!=e<Zg1LuGa97*)yu`EznXVI;Wei7fe*h{txal<n#^6gTgv>@nt|?D_Klt(8XnZtr
zv(t&31W8=nMQkW<nTbQ)fv~K=!{9+bxX*Ci5}7tc7gSgMz1APjF2*O(Hec$*85j97
zWN|xbD_S1GzITc?gA%sxf&CH2o!<*H2+7%nUKw8LuHF)~VEfMjl^(xA8>*dTe{3nL
z;JAe$y<(NdqQVC3U|=#6fhBy+s1+}Apvn&Q3Oi=0#MCHZ<K~H=iU@<Nq?}(5R4B0Z
z_<PSV#>W#GBibnaUoh60<H7ey#CpL&#zDeroEon7RPfEU!ZP~#!K3u=F&9~nPc*v=
zMi_>pQ*4jOhDW~#?qL$4@o)|Jf4pQyw_$|_cK7Tp8mqVDE{)0R(d!zeTWMZuEnkg}
zq_XFI<O)qrC4ei8=E`ObMPPOAN-y0wD6xEF%bb06<FHwRbknA0U>O<h9gN^}t0q5h
z;`Ks{OkysX=yW|MZg5~k5qUxfgQrHIcoX7EW7$7gUAaLAf31Z-B{Lm*e}s;y+~%pC
z^EQi|pw<b^`3C1u0T@@scIU(ip2*NoUKyT2lSo`E;95G*t8IIdebnt?BXSp4osrc_
zJr|iu=;v8hGTWoE#URx;X-c?B9i85%o*6)vhrGacVT-gzNiim=V@B9zJ&BO=03}V7
zs_YV+GmI*nUcGp;N!AP8e>9)?+4k_c*Uo`Fab_4u4dsY18H=0sMMJC6?6Ig;lSG4e
zm6v509wm^De?cRP$c7{l)d>!Kf4^eH?F6M&11_d!@9g5_q?+YegXZh7<f=ApZDF&8
z`QprnCRS`a<5fFFfTIRKo2jc>dq&ujG6l(kN6mQPhY1yLXLgJTf4PUKYf?TDZ9D^i
z8f@9z<wm3eNd5KArsm|oE#>UT!-aK%-%HYmxLOiHOnK`Jtu>V`JrPVyTz$@8oZ3bN
zWew-BGrlvIx0cSZQKn~i>u5`ROw72+H!1<0G!$>v@8%5Jb(|*)JNi<l2spqSa0B^9
z9g>^Sk#uI`A@W<We~^wA7@(&QW=JLcjO}7x04s9+&M9&gpP{_gon|~<X5y!uf)(Ro
z=2&{8^7{qHLuG1eG#-fGB@ctssn5(ta9B(ndb)UEV9YeVO@Zp-6<W<fv_`ufrTIBH
zytwaVVf}g?S@b#Rp=%6M=5nc{uIC=Dmv_|o*kh#Sn31~De;yk%i=~B2@0Jx}EgPr(
znX<6E+F0rZPPaJIPNl$XBJDglIOP<GfcT<n8<{uBsU|;7x?shP;dZjJ!fXoRC_}NL
zSA0k}{q;O4n8NS41U4tB8^8jeX4%s;yAw8|k&#)HbMtY?&qGUNCUUNLzAU5=HwOf>
zZMdCkU{7_Qe;9&$32z1OUIH9GAtC-rxX7SdJqy97&Ze%{HZqhwsBU=LXgb{E9N+O{
zWx+5A(p9aYh7(Y2YnMqFXR<L@Mh%xk6`pzjoBHCYfKA$3@JmRT{8M=2<u?x&`e0Pa
z4r`AR?&x`eg?u;iIh$CeNXGkHmaaQ|csSM<<KbY9e@nKGLdsgR$`;f#G#l~Ed3~Z8
zF4blaOX-!BzpE31@zh~w2?W#YXW&$FpH1^5foCn#cemUJ;hDh<w}tA3e=I84d&8j{
zEaW<Ob?!%_$z}%xY_yQr%vhKSouYR|c#<&t1RZ0ugXkM;aH5wXJyf~#1dCocU?w|x
zloazkf5p*x6UjamdKhH6A_$f(%{z+J1lVZ4V7MyK^m#B=^%S;wp%0U!WOc3}P0@nK
zo{AR*b)lwaO$caVHTVOG2%Q6iz6ApFnPY11^<4z4ps<D{MoB(T3s`>RDZ{vkR@?b?
zlw7e2CHqMMTqkn~i_7m|FEzU?W4usek+43ee;D&4_cJk(KZm>7EMfaY>|r|q@%SPH
zA(s&DxyaT}O3e5U@ROfe&3RhND~0&xFJ4oPr@BJ$x)JLYUVV}jxci%@3_e5QHrv9L
z*Kn6fbeTj28x}U2Bpk-b$s8~GWu&`}?|M;R(T+#*aXi*pDFPeu=A&%8E=j_rSK?+J
ze-lK(_<YGD0fAT$rv9P%^^T0Aq@j*FGI(3A{8(3V)R`1=CU+yRoq)BV_+H-QF0%tV
z0l4ZOdMYrt%A~{n5-m&Ab@33TTbq=#G^S8ZVp>(_Qgj)%A-woU`Dt<(-xw}^4fUrO
zG`F??HA9zM9e>CHg!}TApJMEchW^(Kf7?>_`CcPtEKIabr<AGOIjmNwzfIZuj6Lky
zwjFz@Gfv=&%7<kDX~1i1ian?qeB@uFSVbSavS9n-evN))7>@@Ghx$cf@I<K_Laf5j
z!l8X@wv2tSz+$@v1nmclh`NDkV#l%)0l^N`2C@5USt!YYfK2*u$iH?XIUU@Ae^MgY
z!S0HU{r!m4AU@PBx@U%Sq{RRXYsJ^troEpP8U)+lVx=ZQ0eL(Bo{LDa5=61+=f-r#
zO4hR1uNUhN>+IHxg76Q7soSSSPL>VNo6(g=e;6Wg*mxg~i0$LmsySXR-}SHL`%(wV
z+Q1r}3Jb-?IJa%3i$x;xm81m-fBo<9N!5utUguwc6ymU(!HeSFfx~R$a%639hgWd-
z?IOO3<`8|%{;pxsdBv893vm_@7N9@$Pc8<q+J$HVj6ik)VYb{dy-b%W>n`3~#yb1-
z-Qm--ZzJ%i9aMKZl<U)&Ir`$Vqxj|!(5;HwP$zXQ5kRIA1d5`$VIHaDe_lm(nvNM%
zul2DzIu}gH;0StJ5l`<4imoV}37c~0K7%W2-*1<3jx=+r>#BiZ5Trv$PgZL{%_O$h
z&|@6I&_vLk{xbTvfBUzHwF-eGc!eH@6(rnA17~#6<&^v!LxLKy)3CgI%JcCoPy`e%
zxZ;}oW-{Ua0f$xpaC*@{e-ROYMg{K}hRWViMf6Za$VI+{>sinkZ%slSg^XHD-KFjw
z3Q*T3GG-pY`SBwaZMDrwYsQKWx1fh3#KmUFEBBQM<+wT9uBfJb=w62?qd@nHal?E0
z{d@FeThYm5yivT4mNt)}15qC5z+<!E8iaGu@w^mw63c~BmvLc)e@9^9&T$Yraq%Hp
znBe$1>>{K2NFL0=v*@hd;$}U|Hsws-x;R?^f2V5(K1Y!oeG_#G@Z#R-Ly92ln6Pk2
z0kVw-_s@TtC=k_5w)t+*_k`f?=a&yphJ&-|>}?;z*@lzh=<NR4myG!kyxfHw8(>x(
ziffUO-Q*ofdKb@pe@$GkB46{(5{!8BA2V|MnFM`aXNJReS&DrV@3nXRp~MwhH4og@
z4B)%b`1|46x4xYZjraHtrU}~L7ci%ir`ZG?KF3W^xfz^FDmd%Z4+!U3-O(QpHC3y^
zGh+2rR-i*?ETKUwe$01LL-NDX>FIDf9UNiyle*I9FcU@>f0N1-<1U#cxAM?Qk690b
zA;NB7nj#kjLSbkBej2?9cvI>U{8F1s@&lVpti$302tIEL%-g|D`ekwxuS<~uqagNx
zG$1D2i*%9XzP#M7@jw7vFj0}+_e;Ox8gC`;`Y$f=%FdX$K&T3wxFrns%0L4_0vlq#
zMgj2mZR97we@E8+)U8v-Q!X$fcyed0!Boch$Jyy{GGT&j#-s(LV8C54u=iy4KgjmS
z7C!9tL#46sw9H3JwFuS2DN9*7c>l4dB}`*Z9yYMUX}0{)O_x~)P<0x^>D^kB%~Ntg
zi%qoac`(d0z)ma>S<s4xAxlU*up*q@3-8ulw(~&Qe_i)_OX+dKi1f8~k1ZeIOVKRg
zV!%dql9XS2fZjw`k@DHVf>Q-o@JoH{R&mU_vSrU|_=GnM%lH1t7hTo6I$R9BEHML?
z5^CJP8kj@Ym2p^fRX~jWZFse?1cIz(08v+%6ZPGz%mXp%-X+K_%t)~1JpOY{IiFmH
zJr^KIf55^a{XcLz9dDh-<qB&<rauBi;maC-!N{?K>1vfMQYLkmcP^~>CQg^}<uYNj
zqte$S_+WK6gC-!1a%PGH-=^&0iYi@GbAr`G%c-)EDIgAf^Tfv_5EKUf4MtzwBI99s
z{_t2Qx9RaQQ;t%WYGq%9ASSw@&1og8J?sdJf4#CXGuW-FMO*UI-EP_Twz`vipq!y=
zO-#1>s_fQ{-5V(s+O=Y{U*o_ia5?o$K0!BGx`ybZCkySBO$+S%tmKNX%tSiLFE6(x
z3GkLp>TM2Dr^`Dw<=0q;*~G~*x}86L5nU$N@lBd-^Imiw=gdj~hvM?C>twLd0OPBx
ze+1&zR*>1~sgkF7t#E-()gC~;og+yPUNZCk9W+$Lw-h)GPcp?&OhCSqhAn)5QefF$
z^pt|f+CozTY%a|1EQ7WDc|ln0UxuXXCQftiJ&fnqQL(**jaBaRUZuqf+|F!nQvhW@
zdeJ+!^hkKN4{)6)>jJzjSC|kaE?+Wrf5+BW!cXLFEO1~vewa&Z++SFTJmN(biHn`t
z(t#(oj;gRiCc-3tAoD;c6j_%?psfH6?#JSoi%o%L`XND{q2Mjj1+H4yFyCqQB2vgD
z3~ltoqIN;fZ5B;t1uQ_%jXTxbg=E?g#kL`=wPtIcNHi2?UFBhb4?T_1NeBZYe@6vI
z3cZ1BK1!D|hWjzYb;-t)tKTx)u<zuolNUjABEqV*4GD$%6-0CtA7v5S<PP|@gp0T#
zO(u-NFb<LP2eK%|8eAlZxI~6EDTR1ICUSVR-QZ50s3E3ED%`SsPB1oHE}KU%l62BJ
z5cZmz3Irs}SWql@a3J$4IO;9vfA&!t%UKH1(I7Raj?ryZdET)q>A#h0-q)>gEp4qz
zt~KZyS$)z{sxN3+IrUaEGjQKZ(ah)eip@cxyB0|?XQLf+(QGIk-(uz*`D}$rpH(n#
z7vzFe4vUP<j7z4mR$0yuM0qjFUmAI8EiMHStR673`c^sNV%_zM5Wc7ke_atmy~#GP
z$g8O8uH~>C$^I2}<qEY5yth)-<lxKB4Yw1t!m;i*u{vS{QOiW)LKM4XaA|8dMUW%}
zN3X7F5bg@w!9uN#0|*37;gDcB<np&dbezIO_%5MuiI(Xb^7%{%(qCYy<{>3g12Cj=
z^Pr+?THGPgFAlHMB}2jHe<TY5>+V<UQVLQpnQhj@dfsDADL?JkmdzWlUSs+gI9|r&
z7H4UP9>A_SI2BQ(J1j*#%-S-f&C3=u7)aN!U_%;H>s*4gf%UFiBWOW*u5Jli`eWg*
z>65jOe2=hcel%B@qWn?SF*$WeKM^@9G?ccETIv9LBX6olp{gt!e{w0+=m@&fVD{sS
zZAxr2sWPsd?ozKz=dS<SYgfL(rUQ?|7(v7gM5<9oGs8@v_Pte+9zW65aR%D;jcYa(
z{#jeOGmh*$#)uI8wOfXapdH>Tk6CRztQYQ3c`r?z+?Vvo$k8!M^VLJ>!Z}6C>$u>d
zy>zAnKYSp3qaA<me{G7vhd6y)=Yy}#71JQ&2xjLt<O!7tMr?~(MDS?{kVMI}2$ZRa
zKqy2{yh?#n-j77^nqj9zNqG1xX5eFstIuQ-I^*E6)}H1q)Z3nrV+>%dH3AG&J@^$2
zU^4;14yMKxQOA*Y?@sG%Nj5awWwCp*AhjEcw<-Aw{4G2df6Z2T3T^BZFeTpu3qD=Y
zUG14cwN0=3)HqPxwASnK!mw5zWvSkF32v#<$5^T>qKm$h3+%99wdbyc;h^P-&`N0B
z7H~lkBA^P6ltUgyG!+^z#4ECEH4+S7V<PyYK@J$dD@}63s9LtiC=>_YWVEFi&&hl`
zwwk|(C=Mavf7CX{*z96BqKJx{f)SPpvCOPl`rHJuZjq1GGEwlH``jER>YbcD#JiSU
zZ$dNjTNyc6c9@AapdII-0fd}@O?l4gmB)eJsf%#9m<Z<5flwH!)}KQHjEa*lY9mO+
z&GE=|{PsGkKMeEAMbW749FsYo=o2zj7wp6~#VLkpf4X^bHqDPYP-}EIerY3GI#Ayz
z%$Sv!<X7=LiH0bd@Ss_|UM!Q`jFY>`Qog5m45y|7Dc05bK7Lg@(Gv;-1^QjQ{D2<B
zJXupM_z14`cf(V1o!#=Ia){IsYxz35Ww7yEH#*Fg%LETIh%D1@L{e6`m!Q^#B9H1Q
zfM%qUe|m^fZi~)A^yam~p*J`^pZ=)ckj1|?iVx3@hi5}w!{A2)Ux+X_ei_IZk9$S>
zcR1bkCVC!ygU-b7;^G>D^#lbv76o3q8LkP3(OP^9IE<VHjOQOh4)Nm7%+vF-0d;3R
zynJIVerX`?!r24F3%sdbN2^+d*$SEycVd&`e^AlQ>AFc!S8W<>+tYK(uJ80MuxzCg
zI^oQz*nrSi#^3kqbNeE7`r!0VUBH}FHZ+(kN&X#EFG=pE!#AaXIs1)CZw?3LC!o;W
zJwE$vbTpV<oPB>bdUrPaet34&jrPr`Y`lX#Pv+VCH6~2PuofUh_#*a}0ouL~T8c-X
ze{l&>TPGv`VGW@rj&#(3DS(Wt?<g*D7sO3PPu)e@?WB}OIB=LsLNlbSk`un;$N=Zc
zW3`K+szZ(zvZ^TrnjQBI+;$tdPFtQDGCM}u`BehZ9y9WqZPfDCB$jFF9z?${9zwSR
zDG-p5M~2#NF5I};Y2IO>dH5anA8j0De`Rp}FQv(&GqXY>NjAlSU5y&72r{peqtzfF
z4jtiLG4trj`z9Dbrss|3;r0<`5%@C{4-+58Y@NzzyKsly`VsCaZ&6G|vsKW-`0jvC
zz>i=p#g3&XQoAd-lzMlt@U^@F9c>SUCUR5wkd+1E!gZ82r<!~jm@mFxR5La;fB%Zx
z6z9It{a~OJYcA4i{$;q3t-&h_Ru{oyOr)jjP;Q|`auu`XUAX!VmzSdeL2~rTAW1*J
zlVP19$9ZF5j6ZEuErQnl@bq+WH0)0Y6J@Xm(lGcM*z82L=_o(63F*QSooR6=M=c?k
zX$H#dzI3n!_Y57$GYIm;l<ylVf8CUl&Z^nht(%1p(V{Ku>!<}EOOx4T51ONH!&O#k
zNShi5(c(E?h5Rm0%j6`Rf2g|sjXnL)U(fLd68Vg)FsKPWr#jte!iDe&+@Izkadz45
zn(aC5=zcPbjDvZ1i1^zep1$yR0fl8_7Nk51Jf6+P@KMP_EMTeJM$#V}f1rri9y8y<
zWJ7>^wM(Sk*DLQ1(S3C^91jksqw$aYHuWb@N|{*}2n2ai*V+21PRJ^jG~q>yh1G-P
zFEA;kN6n>#bkYO~4Id-Qp4J~kkUiZ$HS!$V_bUCLo21IF8Au0Y!Z3NrLe)!<h2(kg
zbU=H4Iv`*akwRg1I6D84e=%rKsqfap#o6TI{CqT?4vuEWqw#5f8WQDX79pfWjd}|>
z9WZ-@LI2t*2OlXg7HRP}JizoC&gz0nI1*2)*hgZtC##40>Ih(q8)^xlH<(*@uX(#h
zD-9(UeC{o^OlCCvEU7$=W1b_a7F8BHJ0FB^O$CR-?L|<CqXVh&f8bNAqo@EJtF30E
z`yeCi>ZONJOZOaad(0gUXl}0v=ZJB}-;x`xw}%K>gy{ptB@zL8pk*BpKXSuKyry*V
z11M7Cd|HE}X-?&)DFNIKvbOhKQroIVvYxT5W(Mn-uwK~|({=n4{w8W3l~hH*#j6Dm
z?V<G>qP=_u(>T7ve};?@puc0d_^~(-J|u>>h&Qg>MP4QYXCQg;wnJ&wYB`uj)rP}K
zH5R_o&+dQYi~ZW3kaEV@k8ZL@cE|TbOapvK@>?f*=pmr$^Fb#nQzwa>%3=Wh%Jv}Q
zqzNSj0>bOW<BIe=ACY{l2f%*r4ucJd6Y>T&DGD;1d615Fe=EJb9U<M??I`Kg-uk2r
zED!e_Y~*oMOIG8#$vvlKuO#xFJO~@|FZ$HuQ7{L7!+{`TLjaQjqD{rMXMos3n+U%U
zKI#fzQk~@id<)T=f7vEmzL#|Slhy^8M^3%2vO{<+yx4JACadbK+?AWlsDgO6eE*W?
zRH8^@Wsy3Be{B$MM`6GGBvR7&x}8IzSMF=qMdTGw8(iq=Psnf`7mK<6UFG27*Srh3
zbwlafbG`|}%rQp?n&DrbT2&&{gG9(jDvm?Hbt#ap)m2;0D=TCJnQAVil0Ccdog}(H
zn|3uXee1@(TI?aLop6pOt9xR-XWay5PJuR-OK!;be;Vs3H-veeU1K8=uxPAd3|pyC
zF61`U^r&CLR<_q5Y`-><K<Eh0J=?YS_3j(zqqh<t)a7g^7H4aFm6l%maAZmqOx51|
zgnnjC;Ysi&Oj|n!7&gF<wxME<Hk{3Jq;(^R@>|V1JcPdn)i6B_p}LK3xJYXUhhXUj
zUI_)Zf1n@+Nnw*if3vF-X12(qau3rwm!h0}Ddjo!a_cW_#9okNymBn8tRH*1YqyF*
z2y{ofAqI8AR%Hkd@hW`KI7oipB#<qIzUY`Vq%}32yHzao47I)IG$N^C>Xn*Z0Chl$
zzgChsgt?q>p}D(%j`K9+F`Zb(9(=0JpRg4vQ;IsL*?%9{I8)b?#5b5EH*A<0rYT0#
zXhYSunB1FQ3cp6rHK{e-oPvc%&aepCU3pnMRD=HXVm#okX;4;zIiwPM8Kou9jAbRX
zf*JgX3N2{-6rs8Lsi~o6E_D49Q{pjAdU=rM0nB{!p`356O#eEo-%kze%a31tZ6JGY
z7W1W#41bR+$jG?bV7H1OH#eH@LH98GlgVH_9gfas$Nk~S!|g|M0^9r#pO1dmaE<b?
zz1l@0lyHa{jtKIcVD`Nty=a=lrM{~b6kZo4V}wWB%WXkBv3&bns3$M>!91704ho)S
z`6^x#Gj6zsoT1Pk`(-ea)QKRq^_~)+_d8FzA%D(>aux8)oG}#wULCfy1w0=HCFH%M
zoo-1>(31x^sTy3^lc!jT;zHp2XH}_@^CP741QH2Ct|fUu{4iUWdA1~sN<WC9VSv=`
z!BHoJ<LT^Vbl5+cosP)6(&{cgQ{NZ|GGPd8Ak`9_jPN1}?Q`CO^xep?Av7;?PNn@n
z{D1U-cZL8+0o}e~nok6^hOgZPYCyp#x#25maLUSu?x8K!8V~g}f17`0^*)~J=p7AC
z2Gc>fIN1sKc%5K21bpMTA;R70dBp+cW*Y<(xE&>426hN0&LzRYEdXYwb3hfXdhN}P
z2Xw@%IbdFO*O6|#>)6}t^7i8BN`CP!JAcMYjYGa7!y!Eh+>tCHyVVq7V8L(t5Q@9i
zGF^WtCfm&>%S$+@5`Du3K=jf;)NXR}<LSxp?0a`JsCxAumO&LeFpH#MMeg2R=|`Z2
z<24s4O^+R$T_$b|+&Ebx!e@6>=yP&aPO?=}UXyul9(JWved0H;OsPBPO1+zKZhr{5
zA>pu{JcCcWwk9`goCL*og}Q2T9luZy+;fL+1+mbtt)n*#HB&1FuX2mlPJQVWF{MET
zJR=T1UTR!i5IsjMnIok804_-r5UB<20Z5Cf@t{Q{q6O#ozjvmT->%@i-S;eP1<%ZK
z<U;do@6x}7>(L_-;X~Qm@Tm%grhg;Q34U*34$noc1NF_Zbv{Lqdb2xgcM2b;X+}@^
zCX(`BonCOtXER2XiC2_Olhvkf%g5uuigU?GV}O31r$w2rT@%@bRhd)}B^fc4#)0oW
z;=SBz@Y>o1VFG?F&dRz7u|;Q33ux8}TRt<1Z3@y)AUJ<X5hxl`W)ydtRDW%W+Azpq
zEF+f+KX;kSyW2qksH`>>4d5YdvG0<=M1k#AX1Ypf;k`8|+~@?X&1b3+f||9L(3_10
zbTfS!z5I}3p#~~^!pDq>OU6l24WF<HZ=%pOt#-?_AX;xOrX_)PyN<oy#bCD4#2`}S
z3W;~s$KV@x6+vIg!Re$zD}Q$A|8O)LjK`z#ueIA@Oe(Rcy<*h*MObuh_(ga(R$PVd
zZn(-1k5>ssWWcAb!msO&n1lVrs?KasvlTC3*|SE6RK;Nd(Oy9y;_ZY$Gxl+56Yy}`
zy?w|ytxDCsgUSx)hcSlQ$qsW*|A+y|K;#y}ozccJ3+VU!nEhg<m47Q=2Z@P8)`4K>
z3@#=*lIPKo|H-m2Y#O{YB28TVVRX2%zg+TsFg&9ugU0XR&|rl(RJz1HKWK1Z43F15
z&o<LMAp&096g;7Evij`j*pa#JnumF#Aae3SyfG3v{PpnU;%H!I+q27l?KiFxM|^_N
z2!7`m(A5nL!7KJ+NPmaPY{7Y%-Xt9J{l^N5P+$F>u}AUz3FI5yGfUK|@ECdu;gcLg
zZZgL5aB7+q?l|6KEUEEy##B<`e#ro<6aC$fd=DN7{L2!wBJcDgMFb#&IpF~BGms}d
zD1fhZL{PwI7ZA{xu)(8>pOCD-rWh6d4SGU)AVf+cl`_&d$bYP=J1c*Qh&0l|$)mg!
zxsK9qnjSZ_>!tBcbN;27Qsdq0Ihm>Wxp@i5z)ht7^w0OHM!jx?Y#dp~Fmf!Kcx}My
zYl7w{*7H_h_MqDh-p`9=da$r|jR&h`{x&ziu4urS7<FcgovW)&Xs1gy!B4@=g!eRN
z%+e|&Tj(6Oe}CSmvUuZy;gdhsY~m^gFB@SU38(b^#^8IEuZ?ktdU`xO8BA!egKNGU
zZPsRdySGOIKD6i2P4_}<Qipu<4O5NEPuN)jpRh;M=6E_V%I;AsCx-0JV+BlEB-qVW
zN4U?b+;L4^%r!$FSZGkZOw5Wpp8ky+J{32ZCXh`%XMf(_Z^I&p#P0Sjm4;m8gwiR;
zQEls#NoEf}bwF^dU_*&bIN;Dp%lU}|4&l=}=+LGK<&WdBh7*}78xIqPqYbU&T~<J@
zzL}Ib=w&xaG$umz)PwdX;hsH<isw<M%miQPi(852jL<~?t#{1d?64PirAvrNWc#&^
zMer1!FMoZZKQA81fz~D;0DPMH(<oZi9N8fWSao*i(F3k+*Ac83lO8FCA0pM|4)NUZ
zX_}M38Ve)h#G!a)MwDPH#DV8r%`bNrRNS{0m@YfG#9+pJ<;@r@ESp{Mi7yUh%U90K
zF>CO70bw}oX<y#|<(B}DyDmX(B_h#nKvkLuI)C#=Lgi@+)2GU*b{^*ZxM7|0M(jS<
zb>>gr)9{^(lVFYks^tUXB5C;v<pm4hni!ISWJ1nXzD1zIpRFhLw@z}7B)j)8T_deT
z!1Vt(!k~`vY>e;AaJDp)bPBK-rFi7kfGzZnRmD|1YREMuT419p(aFjP6)4MZ11Fhk
z&VLm!c7**^wn)2TKg*+}nCB^1mT;KDc*QNP8`v3KH8izq_Qq{keztYtJ&6|<8g?zJ
zPyEIgy~VzBvINNTnk;nE5J=`Vx?LAFapJf`%<DdAIK=4fWIDb$giV8s^P@g24))J7
z-qWX;kv3gFT55D^Nx;g&t%7Wf)1&}?k$-`uc-LTiy6<?_B(SI3+~hs*Q&+XVW!Y%8
zLO_SE1@<xc*c_LKy-jVmd`vZ2^X=OsO*Y}oLpeojc#SQSxAF4Ra+=$XYV_f+*@e?2
ze{b{|b;HVjX7}V=I(ww>`yt8kNG*h1iSOk5Jbizy3%FC?pd;9S`e)a9yFm{W+<z2O
z80X3IyYY5ido2ZVeVSNILx|EPTLyWPlXtiJ>PF+|H6H=9guHLmD&?iG2*?XmuGM!l
zHky-0WP@jqHJ*iSYKFoieyPw1Vr8?7!tt!<J)hEWgx@0-Te*g6puB8TK_>%vc<Nr9
z4gPvQKz%-$_NNz<fC2B5evu`d_J6?LI8DWjWd=ZbopPp59$`%UnPBd{0wQAT)es#$
zNTWqw@P>wx7CCoJ1do&V+hv@~CmjhgbeGePL-4kLG&>)U&V_S2xGY4{3;L@3{?RJF
zL+W29Tz)U$GUE(hzu=~q#JZCHJC1=p4%VfimgqJtG2a&{JwIvD@#LvTYJV4&XXphw
zX`3((6nahMq0JqyhJvKS2duuw+A^r=vbw3-yT?a^;2qZ1hNJP_K2ytN8=BuItJk3p
zy1Vwix^luD#bVLB1CTO9_#NmBs$-9Q)#2L=wu<J8*fK(Fi^DZ5tPXZfdUS0g1D8@=
zX=6A6FT(I34NvnDcbjxZJb$;HNTkK~sjkjQWYVH$;H`RLXI1U|@#4juk_`0ZL$Zuy
z@@npa2a2eC*3MKgO42jY1SP-=Ns9OBp1|#aB(BoD!(bp^K6E8wY#O+eN^WXh$Hi&<
zKAl@yK=8;xSEFV|)c?eIBSc7oM|QH#zv=`F!MAQiTkqD)y}vzQVSmmSXhXiOG3wpL
zms=wChNWUzU|}QI2r&PVRBe|HXzdZ52yrQ0mgr+hE2+T?wO|xL$xUzoJr7jH9)25b
zOJ+%mgeBa#MBRRIcKBWY?AyT+vC25&8K)*UYiu=_DX7G+*AbtPN9I!#nW3&Z-xg)I
zaw;Ag4?EN{N7f&6^?%?BS&R-d0S9-8gmy6t_uQo~X@prl?vh39`9>CzVjefPFcwVa
zdyx^7%w&Z^y)sjoU_#pk)?_71R4l*chn}fqQEI}H1^sy&fESv+@?%V2dQe>TOe#M$
z>ed)G8+OzKzm4|iI@;n>FYAP^XEwp9@xqifx+-B1SP(oDJbwhmQwJJ`{fdTQT0S=G
z!U;V2vg6wq3WRTBh|qRZAQKYUQG~3y5h}<+2P1*6!hEhsn;*w`=r0_%1h?Fa##d4g
z)PNEepTO^Mbas3)Je-2JVm$3e>h}QF(E9D*yg%+wM`L1lTQtm1Nzaq)${<Na!tjn+
zio>X15PL3Z=YO1mr(H>HY9J*6GAqEX+X1hO_FLosXbj?7Ir$r;0Tb@w_ReaswZAs3
zLSvKe4Mh3jLu1E7mLuKL@Zmli5@0l6K;XQDKzVHD3$})qrn%ad3tl?Tic7|Vo(o3P
zTe}!yudXVZem9)JwTrX!@!&tBKSb!HVP9v1zfOZ8sefW%8i(*#HsU*J{J72f2AlP|
zc~*Fji}@)TL48=A^%v;AQ3E2^ga!N4jT{f1Y0}^Q02gzi8erduH!G%&=r?6XKZg@v
zKR|+)+PkX}MZgNbG+JtI@??{&v9s7(N3_;eaH<Lml$#V){cciNk&h^B)Z*`YqB<WH
z?c{t_SAS9oS@2t;2h&W;4dvqv6z6BL9aN}uR$f0sW7&;NhH5&pc;{R5p~ZV0czdS8
zlh06t-<64}5C8ek$apKrq;;SxG895Rqvxu#vLSLo$H}`8v{is?;#!M4X7`~71jPV6
zM)I2P;aS(I#Pkay<C+6lxaPW-;H~BBQfzSyd4Kjx+;5nT#z%wk@a)?jvw)MIM_0TJ
z%ZFG3K9dGj725W2TD8A^t+5F705Pc8LYB=~RJYQhsuj9ymyA&+O3{NO9T-y9j+0f)
z>=ze(FaUaDh}=%7_YMqL5!+A9j=LBW*u8Sg1dz3eMbU>zjpf~hO`RpaVY-AS27MCq
zet+B3I!DY=n!COxk)eS5ifzxA)@bXt8cisHp@Ex-ls70>WJ|VaYwN)ZjDVl)(?d#h
z^#{y=Y4#fhn^U?Y`|V6O14t<B%qk`AE~E%)U@4yVWEmyBdZ&Z&w*xm<OYn$^xadl4
z0AlUg@a%Y`t`w5}3?_%;e84y2IPv5{2Y*<b8)w<-k|}fb&{zT*q%ibHm$QiZC~(Tg
z8mP^->}ZBmC<UrM1Z69!3m=~kSMl9t@@=wCa@L4tGTIZnVt+?WRozu<nhGzzm}F`e
zYD#yBS>|~eRPRD2vW^cBO@ui9^C1C$+Mx5~kXEo7pT5;<lT>+v(_H078jMo3g@38{
zDbzz)?APcESKemJ1+5*piP1`-n7sWMS_K!<4h-euWF~Os-l%h>ulmLbz@~%zqTzM;
zBg>?ItqpShR+{6=Ed7QTdMV22b~#n~E{fY4e-vs>zYVv>%jnjmNO-Nk8SRN@p$3iD
z;TA<9V+)ed-)_USwlUkbON5)(<$s8EW*Z~q-67!ydhs98e8GN3uPcg(l^o0jM{eR=
zbzJX9!!bW_ub#k}do4lDG#b!!kEz8;K0ndIqGJe-K<Tj|Iy$BtG0OW#=$aW$R$Hfc
zxO0yi^B3#%r>&bz*A)@C<u4xe3qG#8&4aKjNFpevO%vp%*GZZ`0Dip527kD@b4-bd
z&~nvK-mdnhDjRc_Xd|@N7Yy#0{@0FN*i#!t@`*3IJPN};!UGVPBjXde;zTyp8y``O
ztdn9)Skk;xK|7kB1g1C?a7?ZxA;CwHIYdhMKribdc!IW;Obx65Qo{?MFtzLFIed;M
zeB<Hm-GmKGvYsb;QwMB4|9^dW`$lcp*jqY*Rm*5wGTW1>t|VURJzoEg2{jOv`69GH
z#l;d5-FK_=5%6A$>w%fBv3EMUZmbo3iEuaC@0F{~zC6Jb=rDX#KTW`Fu-EY8ILqHL
zJ^@wEyYt@aP8Hn0$k91r%hPfHC@y1USp33A(kTL*1#dk^Z50EyLw^8?^gtMx!lES>
zY}||TfzXheER4d+h)(FpA?RvabPa^$LXLAqFbM;E)H(Fws9_S5-GiECj_PiNG&lj&
z)4wMRb@IHT`xSx6NwXaIAET>u9WR$vv)!86%S;GaPR0<}#ts2&KsbZa6`G|tv7d(l
zJ|dYk7^&Li=JB}|a(~x`>Urp}X>SvycRD;B%%(q{4=SxFEeBa6c!!nInp0D&DMs-8
z&MawIGb;gTSop;b;ASc!_YTm-SqwJPND3pKyTsgE7THYtM**Lp(WI{g1J+}+CV2vt
zrlwUryus1X-5m~F!h6(;u2Fx+NnF_N^CzM|6=WnV<d&<NV1L{C=xJ+u24Mm{eR!_V
zMprUI5XnhRn#+L@ht~qXG9wCf2vMX%7#%N+NUWn=VDoT30Qm5e;T%@QfOzY6Iz#)t
z&LAmUZ#<ZcPJS4S@g`uAic}!LwAXTZ8P7jNH)#e6a1r&-hcAU^iTzs3vjau%0rLw7
zx!~|ROPQ%Vw|{?{5ngslcPLFinymcVZ=iQRnoQ3}XM<e_$C#B(nmZky4Q9s|CnwF?
zBd(2W+2HiM!EihYHd*0m7M2vTHhu&&-}Wcu5LDnNgy1JaQ0&PBL!XG%fGM7x@JOe`
zqg;pdP_tefe1pI?a^_ozw$IsCxwf~q{KOA?X$E0%hJS78QCOQvfdVh1HcPqMO+b!h
zI8k3cV<J%+s@^67irOd$2O|V*`w4wni6Wiyqqu~tt0>&7ZL4X=XX^&(K_+huQTt%7
zg>9@p@CsRT17}@EOU!93->SfwC$FA3oA_Apb@cRwD*-|fq9-2C#;|red;4(B+OvJ>
z!c!26?SEy#HzA&Pqd&t16cBC&&9E8r;?LlC-A`9+@;>|d>CcyGxr#S6Kv>-a<?(U|
zhueduOAQ~0+w#~t{lET)$7j{;hGDgGwIL4HHT4(O_=!mWkS4L^1IvnfzmPz-au*^i
zdPo}{T4rqqH}N5SI={hgzJew)MEe9X`W&p>(SPLRw3w_xSQF0&_e(`KxxEhUTHh<O
zNp5QY3x+m1%iHR>ChFqMW_uyOM6`$;HSSitPsB{nD6pu`vouqLHmT`suLX>;2a93~
z*eAY&qh=7B@8;5>a5ej6EeZMA1!p}RuMwjb>g<CA5xOj4H}mVI<%0%mHBf{6IN<*Z
zHGde4?b=B{TBz3tZ0#7>Dwx0+G#t}Z#I1_a6XVsElWh`vZWDv01)+A~UjucVems-I
z=Y_blG^v?3em8!bJ&!nhWO_cw0?{n@*+tp=;Ydy}U$t@3#^L(;X+OagpN0NwIH4(#
z`rDL##3}s?&)DkFHapUgh}|`c?gfexP=Bk}pmL|;!51(x*yXVoY*i~8747Xs=V%WU
zc}C}$bq8Ee{z)A_B;AxW_H#d=Jmk7>7FsJmyKIcr(#iu|zp6x-pK>|ge6Qixqj&6X
z8h(cQh>g>DBkn8gs?%m;P$F=m87@l1izh_j+IMkrU0uQ5rmg|c?*ZKvxHt0_>3`J~
zHQ_`ry1cz^L`^_(3lX1gWoEx{8#cD>K=qnCcQ!^>kl3|U&!!TtK!ku@w*#l!tFxrE
z=gSk+0SVkpeC#4RD#b=yM^v*3{i_h%zgDWl=Yd^e4{AH}L*&+Jdf35=FPE4@J8+cV
z+6^o4zgKP<zGauJHULNH0Iv|3pns6$ve>RHn5)H~<?{&*K2)=~j$gP{y}CDRSp?Gc
zoF1vhIsw;=hmVnMOrJ+H0e6h=Jv{uxV03*z!1zb$`vlTrSSzF&q$l6?U({jk(_#m-
z0Z5ksRgJjKUmi=rhN=0GI!CHD-8ISdLld7zO8xI4ZCnlKzB4thV*Dda+<z)=8(v)Y
zj4aAi{yLPd2^0A`bEj_G+itNN?H4!eeZ8R#0U>S+h2V+0y=)2{XSHPv5_#(lF@a=S
zWNI3B4E(yGLOnKdXZ@3JN8{o2yHl@=em7}MD7OS=U$Iz>=o2-)ns;g+X0Sgn0jw#p
z=A&J6^^cr9UbbD^2eDCK&3|rV3bA1cMt+v7tGiRoy(-J=#P7XSlw>m_N_(uuv*c&U
z{Nn{NXcq@&Txb35t$9(;NHg8*gTD?AFQ)ysCj-;H4zF;XZWjH1@Z-DD_-ImFa4<TV
zO{PCK0694y91i;@UOCc$aO$2721gUPdiHy-x?jKMK(}~pI8^KrAAhd3X2jc_;&p-H
zeS#wivCA)g;tR86;Ys6Cf|zFfG6p6m47r>qn>fuGAs<O7*Ih8>;B8h_okw9_TEAXf
z)FCbq;<p#;zl3MH*d+554QUH@PdvB$U4v{nDeoAe6ZyrhC0|%Sj7E9z6u!tCR5r3F
znrlZ6=1ue=xnpMTqJQup$rrY?7hMWwW{(#WUcyRt?x+nT*FBd3^XoWgHZmWKL;fRF
z*=0vI=wmjU(j1q`awyo$Q#~`%hbf{P&t&6!)XfP*E0hb5oExDvq#pU#CP(znSTi>X
zElJdHPv8<a-dL8)xJx$cI;1$8o%N@~AKZg62v9meLf9OqKYz2nlE|p39z3kzL*H}y
z%BJeW$2<>5>LzLsM6@rhS)}sO;JANrLZyi06d+Qt$xl@dNqg+%FE$4ZdEE&ZWpF(n
z7-ilLg%N|-mF(OVEYsDa)m2l1zKy+NrFjpGDCH#6rE0B&;sPHR`Mh2g8M7=d^>b#a
z%waN&vCI1Twtq;zU1pc@a=O|$r4O^s-F@#id^pwPcez6SnA)VcpDOvJdZe}5L~i&Q
z`DA806U5=psV}8FND-U`Cf^I#f|j^jW3YiOkBk;Uv*hy{Z=wuUW^1um<clBRi~Y*B
zo{j+(P-8YD(^Zn6H!)^u+_R^HZ#|prPhKyLIFkqMf`9%oRfjKc-yOomrgCxX&4`eo
z5s;8DwaZ+D-GzaG7BP0aB5qrDo|B1AIBn59c(RMu;zflD4=6T1(TwuQ?p#IBxXvC2
zU6jE#xuOoHORni7*}|_)S<}agDtOM;#B(<J`|E`g#U0c^k}u`PM@W)z2J2d+cF?gU
zi7yE}eSd3Iz;yUR)$lVbwSHXXm?s>#6ZiTc%D-xaMwm(dUr7%i{H<<XI~4>T4~m9g
z)No>Ww*u6ccdr}pYUo9WzMVK(yb6#*(;v~Ef>VR9x09<<7&o{JD!!L7D^;qX4=8mK
zUmB^rv9SG!*AdTL-hP;n6~2jz6^_!YD{*;1lz;L6shfhJSd;X2dvp#v<LWEkJ#x*c
zsjCl&%Z(7%BRlc$QZuh4#oIt6^<6({;L5Oz^@nwKOXT0fvxSxS|D26xxW)6zsabQY
znYbSUu}%v}srFsESR`vnq)&*7J>=fad5W;cj-WS^_Wg4mJ}3ML0XI-U4U_oam?h@)
zuz%)-b@`lRXT`sYV_!94PT9S9v4D#~{<2LV!@NMoy@1W#vBn$ADtMZ_wX8y<XmQdw
zQcX*pswy_k4e4Zi3E525P+X}+d3oz3Sdg(ETO8GSBQ=RzI3rCmx2R@OnyRPCZf2Sc
zK+}ayP@0j9O)XM(rtSqfzIV*Whd8O|3V&d6bBQ5)t;Mc0b=1xUiacXSSK`n@Myp;m
z6OGZcXHjvpp54x8SYfu#_!r;S^tNB*=cA1<?*%6UA<F6H67-T+{46@;f73Cp{BU%G
zKu<VO3{zBWBEd{0Lp-f>6-0I=+<}y^j2KM$j8Rzym$-ggjV+l!39Hjd!O4Z8*MCPm
z+smLE(yUD%P1qsCc@s{*t)AS-G-*^fe&@mGH>f7cA+wm8jET2osdw)V`MTVm!+R1v
ztzf%Rh`kN*D#HmcHVg2hV+FPXEjpH#BXo9L!UlCY&C?sU9z#)v`>kDDKiaC#L7KdT
zmY7+gsYUGxNIHbJ0cbNrm8hN8GJm^=d7We>gPNeF`NdJ>n>CH8)x`9w2>A@MS65Bj
zifg*z<6dQU=mdb0$vYYb#hKKBmD?lG#<N5#h{b&mVUh*uq)FMDT9k~hu#DZcJcRE5
z^mdyr7n8g79JdOV@%y4$$GOJF?N53p>lgY$;3_lPkAg6-L89b^Z57FrAb;kd6Xr8z
z9k)AWFDy6oa9kNFM{$0`<^UuI43P~lP%4G5PSt`$+jJbxuFFA+(8`4$ufQKtChOA8
zjKSL3#JRW;%_5~kGAF`!7i2A(m^gWN2=9WgJ?cb2a$T#<x<%X$j6|;zRMil9JgF}U
zE9SEN$T^)_^BIUUg!>$qOMh4G+e8v~yHh@S3;iZDKDB4Nri=5b6k&n1K520pLnw1!
znoHiT-nCPhFJ`5!XXK-Gu0n5O$u>0SLdS^P#|oLrdVI^SO2DaIv(Um@$j2hvvVsk7
zzjPN86$=Pxrqa*Xe3=<qMFRd6iw2K(LV}t;dJtSIS>85#gO}R6ZGW~c8{B<$OkRl<
zq=xErc3+`cm)JTBF_N*p)fPtHaRdT6|BWqYf8$bbE)xmX_(mL2N$jG#n_u2o;xWTL
zZQ%pCepzDq>yM@^4WE`_3dDR0#3;CwZ55wj4_Au-1)m9OA`A$Ys*7SUxWT7qCHFZE
z(LqEZ7Bz_(W>ZA2Mt=bP#v=Ae{jX*b_*BGqeky#b0xnt$SQQ0XDPXGt8w>`*YDydX
zQ5@nnS#c`8!DWJyA|~7l2G<1kD-djL=&8LbM^vSwsA@pXE>sUHHbahR6=LwI<+xxT
zF?*3LP1TC1VDo2S4tTCnh8Dy^8X-z@kI)N<vQ0y|FzVUCY=08pmXSqtRME*X9Z^&l
z>x0omFil!T0zG0B(2fy6?c#mRMT+fhtBd{-D_ugTiB*>gEELOQBP`GGnMhH4!dBFc
z=E6YWkIKLL%6$_&(@8exG~~<xK1tI2+*&L`Ar8N81?WIG_9*Q)?oHyN$<Q{WdQF5F
z!cTbFncNj+vR5*%l<DmMExw6+X$CQd48}gadx9Q|CMWe2VVom+uAc<Yr5iLO+<C1|
z@CDCb)HzIXIO%N}e3dO-5B_eu@Z|D-H(hU2(cKrUQT|p$bPE+v>R}o7dzZg$7$JY?
zo0bc^IMjEJiE9`(;!^#7p>x;+7%kux=zO<kN0rFZq&IGw<Y{V?m+8S`KLouYSq6k*
zJ5tC@t{w7;nMb7qLFAQHd88C4WyAB)U4?I0@EVz`O30ZYsShMrWH6xIM{PFmZzhKa
zyLKPZ*gYk75e3saGR{X9jy2H!eYt<T2_jvvkgC>Vm(ynPd+rBY#3UC2jdqOHZmKs$
zd=tCD*1q0erwrb6hIDe1u>X)Dl)<ur=lP9vi^!j5xi)lew3{3v4sA@kTeT*}Jt7?2
zns$H>uB4oL@_C>d;!f35F9H>LN2!|n4Y9v<kIiKHAvUv<64+f%7j*vT#dLqQaeZBq
z7+u}(uF(@J$IU$v_Wd{w7(9HRO_Sg+>+T$1{Dh@X`=A!9EiHFK>44hri;_+d|CCyt
zkCU*pXg8v{dtS8*ZEG3nn~T1w2+(>NxvmCkznY*B;_^*sOPb&2T}48B8_8>6FSy%X
zp{&AzB~=^I7SSp;qCZW@i86mf4eP<MVE6$e+weWt#&Ct=Yh+QAq1KHoYSLP+TgDA1
zH*0<uF~j^SX8k*r7Zr1>?8tm-8k|PW`L-ytl~eK1cxWB)5Y@z$fh+ypv5`!m0l{HZ
zhIWk_J$;VH>Q~nqMP~p%r5Q*{FuOk%;zoze>urDeeprKMbU@wPBm{p7zd5a`#dgnJ
zDwd<o(f^@icE*(AB|W#BF%PRta8k-LCVmty={j|7l+KP~z$7Exlv+g+uU!|N(R!uo
zHoFVj5wYs=G?AVCulXnX_hR2-vf6kH0<;3w6Pf<@L!79nREfDBN+0ik@(;&bfop`d
z1y%v-Wy?hnUp<DE2pfOw>0|tce>lblQ#3)@2CP8!7^{#t*QBqqCSYjkwaZyoYf(eL
zC6*{wo<n0DLh1jyg`&MO{N!%3>K!h7Ia#CpLp?R5M4(6u&y(C=pi|?$*O$J9yhj!d
zKE3lwO=z*Et=lee^eOjV8Kdm&99XOBT^lf&hHSxFm+#bsrHg;uHl*kL1kZ-DFJpcp
z)aOlmV&Zl;I8<44@;Kajo)nOcP9uUlJh0(&U|BHwv9~QCQ1QL^%C%VK$Tt>u8{(*i
z?q}{?1xQF&jfnvxqy^fM!W1&qw7}7LFk(1%qZ;gn<dDdiU?_sP%0QQ)mzTg<IzN#Y
z&m;%Un$T5pti^xoaz}&&-E0x?Kq&cFSkiORag!{l6Jlg&nC(1q1%kR3)6zYDbS~t3
z0p2yk4tP9<ia1a!2kWZj^ZxX^+1Y41J04w}kxsE-e}f8>47~6GqgIW=!F%^&3mWUL
zE5#p(OX{2<#_k}w0kO0BL+rafh(+`;8-lh=Dqv+*?gW1}*}QDDTlmR#2sJLk1K}o>
zxVI%|-rFww7mEL|GKF}!btc|r@8_e*^n7$S@cgHtqrbBLQButFl+zV&oQ^R4`*vgQ
z9YCR$yFg9$&PcA(Ohh?B6=7UT_O6kI)P)|{7h)$(0tlz(-#s?$0k5#<XcpA%^*aZc
z1!xhvfIfeCD$JZkMSPPO4o%v*y~`E%CZjYs?x_VqauYAbZYF$n5045wb-VUN0>jc=
z0_?cOOl(m-1R>}dL+r8>8zz!2)^ke$x_cL@2H}smkJhzW&!xZEdI`w4fTz^n`ukW(
zi24n@I<p`kK54PJyNl%Eb$Ju-Nu^$Q54@Sffro!G2)exZ52aYbMT9&>4}VC3B9tDZ
zvN%=b>Ie1yRGdHRG*7khO+=;8fLkYQb*gcQ#cl9r#vP*E^g2m%Z{0{@&6k({h>(S~
zkO)XhRdkZiPc+|j3?2%U9vfWLF<HvDoO!h}BgWLt`={p)${AO2AUFEyWQ{YKb+%w*
z1Fe4|+o!OvuUN@-wXdxL2qKa!QZ|6FR-y5!bUexSA@GX>B4WS95QLXjJ~cTZyFPOC
zSlLQ7ph-Ph9nJASBJ<WmE|++uubKtTMcWSB#0W0s+xN!|18?=9v*N;?OB1BBe^BZ{
zQ(18$3)g_7EZ_DgL{0@0ebO1HTHYlXr4E0m>34(ScrrV_I60|CjrNN@DsHF4vq1o}
zT~Zd%Hc2ZoNvnkC`>(-V7AC?`fZ6RTcKYo$sC-iauy^>~XfzqjPWscqWXhv&YKoqY
zj)uoWmv#-dDvUgFPTdI)7I=F%Ntje!&xL@<#Z>d(i(mr%*MT@@YszfZpU>H%j|+b<
zNRcp{kO#c{!c6iMWz*6S>>DWS95UImpI9aA(I&#?xeUF|iexR0mPj~+<J&r7!z-zK
zgH$#5IyLzCepmPyWMkvtcAYSJnBvQ+wXaE13X-i#Xc(H%6a-5>(E$D;+2<r(C*%H6
zT*e3#zi_Zl5wtwm+YWELAxxxN1E7C`x=o=X37dcwv?k!LjG&y3?0Q!t+%;M;1Dy><
z>T((6F72h?d^oCbo5SZ`C-?^A@o3D<AP_DmfOPtIxE@lt-`n|Ik{Y)QGv?MzyHV4^
zvIm!$SWuW$qER6#g?WH3A7sP;c$ybJR_JjpYFzDT*+_nd_s3K7WB{>^wYGmK9|$Rb
z!>371FhNeER>O^&Ryi?c%2u;giJY$O85r&3U5y4FE!<U-+T=Bg#5Ce#esijU=%a?f
zH;>JA4yzft5I=bwPMvqEZdZ!%R6XLEv-{;#4yHMNumznJ*43p#xWo#W_v>B$A?&zy
z>L8~uoA6%IM=KfqRO1wBwe^1$5Ph|aZHJ>i@dj31eoKQj2_rnT&G_4f)_pT3)NCp=
z_LCs2X1)?$bQceSVX(Btxx$a)qaOC9{35sq{Vcm<1D~*+a}QL5hs`QBPAldhd_MPi
zXyLfS{YBL|oGrd2=|^L<J6|+NpiCV^^zGj!8{rRU_`;`^>E1Lv*ED|xy0%WQjL~fz
zo?F>KRg7+Z(5W_#{7VJvLNv`&t$rrWJ!_ccMaSW&a?)N|rR(J06te8=&}G{Jo;!sV
zOQlu95p+Nr79}ixMWLEStX;`A&Z?sS?sp*BX!U`j{~kCvz&XR=j1Aw&%;)xMY*92l
ztx&T@(U4o*-(s|G&nSPm=)=rSJF(Mz%hw&}IqtdBm^j%RC4}A?5z}!mJ!uEVGUfQ>
z$v>WdeDZ|pzB0PXwrki*HE{Io^S0{m<L{n5li%OF`P7VE-2;=ruG>UB5}g{XHs#$(
zT3A=h%hJ6~o@|o!0>j-|L*rzLsn+l}J)(`O(&Oe<6_F9@MyY=hTa@EHrkKcmb~^fD
z0KFe=_;r^yTVb!&f~P^Bg`E&@py|VFHlI4-C|>(AD)`%YUdHSBb(S0Fn17q7|B4g!
zeiP8(6m#P669m>&((F_>34LP$ei}ebxLqDU1%-=V@gd!)12QK6n!NH0G;ea%zk(d8
zks(gVjou`7BA9<3O`e#IwU8*kiJ@Ps82UWy0J3U`7h6vL!_oPVv+1~hHi2-Gqt9Lr
zgx578agZ$+;@djORG{34M-m11P<OX;uwtXvgk@{B=It1;9t!2iz8PWeh6)i!Hv5Gb
z2yChg<z?Kh2X&p?3aE^3t)Q~<L8y%K0xJ8~3M!773$=fa?PYViA^GHGw7*|JZ6pzN
zefgwWeK|C`zI;+s|B>eW^z?i-8BAx>!C$A^&3W1%e?J&cKKscJao}RZn3(M{F!V!`
zY|gS0^9iiW2H9mFKrsl4+fB34-hZ(VBmMjr7;4yXnT-dZk9DW!>n?-4%s?b5(vFjx
zRGrLFxBFG-_we(Rj{I<4CSa75nUowBF1;*YKxk5@iJ^YN`bq(ko&E)Eh0l(eDi~>;
z%o(+Thrn-0F%zqB1Th|PWF%eH9(MSorT`}2=XizoL;}O+r0Dr~mq2+KEg?;SR7Tr^
zEn8Qs6v=N~Se{!<`Z%HrS;<7JDMQg~73;E>j(Hd#0eY9Nc^DiFt%1NX_?4Ii%!vA1
zm)3b09~0-VNBZe|T5MMl9Bc~ea7Kf_!Iubn7>@x$mza7OGXj5ym(6+@9DjfKLrat~
zo);gb^y-i9gsrA;vUI`b-gvuKx4|{EgP%P^w@q@neSea@2V_LPc=n6w!zKG`?E-eK
znzm~MP>g;8;S=TC^-HE*bEd*xKl%6K$$nSpT8Wkg=OnpdOb<Q_T0!gd6P3|PhGM#g
z${h?qbR+++llh0kcs);+%YS6y&MfeGDiMmuVy=>Meytwy^W63`8U@MIcG;em@ZrGR
zOE&vIR874_3axRl0IXw?sT&2_bg*L`fvYc;NtrCD&UkRrg~y=I=`Q3$4?BM(eQnT0
z8SE*Y7ZMLRIeirv74vw_EFVHS-oRO`f)>x{=wUTYtto?R6)I}_K7U89<d@a?DO}}e
z_xa{R3C=x9|CeyIo_ABs!4NFBlLuXTN}3;CN3_APXR}`aEU(j|>kfN>73GJ^I{#h$
zrL*@6pm^Iqn)Q!PXD6d?yV3r|8a!+7*KnX35sp%ru<4qyXd-CLmMYmi#p4OLDU(bh
z;=&ViuY3fXg;`W2V}EB-UT^9|Da_zivM%uj!TWxWcATZwSWQGys}j!h&dZ;>g!FAc
zXW`?m3CZws6|xmz7d^{fShLLL6x__h2_3Okp1!c((rF!d@z)V<4sGJRNZ=bWy}znx
zSRMI4+paE?{21q?rpWq=Jh>~Ib`kyP6OftsS;3ZM<dRcx*MG(MM3iF`yvXTmq~*z2
zD0i_<7a?G3?@vTS`Gt_!x!5`*dSTjg(w1T(qCj&hdh<H^6MYSq0*K`CMS%{_k~k_E
z{$Fyp5XX`IAcpae)-e8$51*fn5?C-apNAy5VQ8KEe2uI5oJ~ue+JLqZ<Og~)hG9v|
zEWa~P<g)qLlYe#(NL@bpWyy|4p&Qu%j?-kh=;fSk0xvnQ&@Z=JOXJ()WHThBrh$&~
zMA)*$N#Kla$e-Z1pjep$=07Vc2%g5$fPSqi2_5*NqaGw%g7x--<{dXof@U5VZ5YSU
zIKSuF`S1+3?NO7D`4GWuaG&LB6W@KV$Bcd_n1RGtet(F17sw}36GjpIp`W!FeB)U|
z4p0w5<(04z#rbc#v=BU4623RLQs4uF%TqZ30U;K&N+>iELMFekB{+vG8P98>8`<M;
zjkqRVH`46GnJbuC$~D8PO%`Lb_cxnGf9MTu*5Lk&{qS0&${6vt!bK|KN{D}~fGESi
z{rO5Md4KLOiM|eKcmYStyYrk?!c%)}DA#Z$uEn+1)s7nvgP;J{?c8VR{#0f4S--4n
zDx=bt>GmC#b_e-g4EnDho^9Mpt`0|bME|<Zh6|sq*gU@=UEZY5Z%dc2J|uUnvx`Fh
z7WZ7zXExy?F|$<o{?aM}0VxV=_q;{`+EXInKYzu5qxp5bexEGxyRApra4!g&YXxRh
zJurXJ%H3?J;$*eJO>tcTM`DZeG+U%sX|iyTF@VZ|A~Jzjm3rX{!<_IH8l%59g1HFl
zP$#<E3wu6xzsY*1t#Y-&|9#o8@Rkbh<R&g`p-0OWM$Kgrah)!$T;S?jDX=3iORQOv
zS${nFZJw10487<%Q5+b!!x0sGmjC=`v}a2lxV2W0PbxBdB|)hH8&RM^T1<?G9Rbm%
zwYR_zX&D>5p9#*Nrh8_cfK*fLm*ctmMmWNUA~u1O&MDHGo+fgO1boNHwE|3~hHR|>
zyxu&tObd<bvuDwCbTnei+GG)xS#*{D9Djl1B8u4(pe$D9rbptD7I@(>E#@Cas{ZEn
zbERs4BLlqEl+LHW7AiA4knqFopqLg#*$7b8+QT_0$^h*Jf_XIB2mF{)L*6j!y)=H&
z9jeDe_qrV(X1$ljuUEgLm=k>afGqy+oh^0GkouBPRkiCL4abAS>1h08oumet0e?C2
z%rm^k`O2Vr2(%0FiA|bB4tk(ACqJH^49~u=YnG4N<ZiW0*B^{Cq@FWU6hVI^eO?st
zYAraFdG)K19-q?kwdBHmTB?;m*37?8OI2PGf5HC<>wQQE#Y~&2x$Gxqlez8>FZ-QU
zzrE=9FaK=7@K!YZZw#+Ljcwf~RDU)?tbe1iHB-FMa&oJ(!b|xk`ifjs*dQqp)Nm=W
zdt5?)G8v4g!_gULNhB6~Eh7qSj<W`gt=@pguGn`yY{0@CuX7QC?E0<fxOoM2LxMz)
zul1s887M=-U0D8U06`IA<?J-qbrEYh8|`K0XE7nku!HVrG*8WAp${}gWq+{8ePcJ^
zqcJn$@xgTrcz0MMl~bs}(NbBAGW;#>XG;^DX~Foh=5A%@jB0C_azn?;E>;7bY$RE2
zK8xA(nM|8NU~(ufS)rHlGyfvZxq`r^QOyFkX4-g3LR5?E<d$ynk8NB0W5X72^AB{3
ze`?#}pXysQ_mi>>$-K}2GJmi$IgGLBnq=ylJ!n6B!e_94n?U+w9Mv+IC9Gv2i%s<$
zXvQA&=%C#9ImE=S?Xo~0M`}FmUwpzb|KbbrpN_oz;)^dPH|x=IA@J_qrklh(R)r0_
z(d>rf{EIJCtfkdr^7Dai;@OwcSr##3<d81;IxQjy|GviK7t!r?!hZvKZ+{YTy+xEK
zj1;}-%V!b-=;{QA)il$2T$ZxX)jhx3W*?kQ$3N;+YzGqF7f2<BrRs%EAtZIYSf%n_
zv*vTcaclJf$WfXnbBN`$PkQlYfG%l5#Voq%6D2;~=-na4M??39gNY4~N1*Ql?szml
z?N1dn@gEz#cR3pw9Dk%I9QqU7d3hpGe}b2b7CmI?FL1tm@o)e3Z_$)hV1`PPN2~ab
z{VPlM6^;ZHkQlkxUR|a0l)+fuVMed{5`GlDUUa!F9Z;NW*pNoqniXg4QACR^%9E{_
za`6>_2P6?2#$Su*GD+4BBp&p&h>|#G?d1{*)Dw^l#xv>4cz;vw6#G;)@^Kq<-7jv|
zPydRaeYkg(Eq?ah`D4Pm1v*bNzJr&@Jw`S<XKd9e275MP|D9o6{N!nWayT6Bld$A^
zOM%gR;mBnv6@KOYGv-l^;O4^C4*v5LVV(92pId@hQe2A4U>E%gC9fTrDGTwFOttYb
z1!fXApYW(a{eSy9=G}6iff6zaL(6UI@MKaicwak$*UN&rTa1zr)9!Fe#P%e)RHx}v
zq*Q$ou+B5HgZU@Ey;dV4X#L8qf^qn)!uLD?RTZ~`P-VP@#LO%ypXt)lucG?lwJOkq
zOZFxec)|PcEktlBue<l!2G~0Tv4GJXm4#Hqb#=i>l7HVMIpe40c9AUH(a^~A#E5Q3
zWEnwOL1U9=39p_Nx_v3X$a`KJMQzJT<;QZn;WlOmWLqAeINea?YzDDeS(mrZQox<H
zzyCddUq6IZrG{&Hy3liGFeCYEZk@kja*dhUOt@MUJQNRI*PsOj5BmutAEAJ?!%TDu
zkrDwYc7L%zqxFXys3#gBk4;<R-E5*}OVJ#W8j7=l(Q{$XE!1DIDNs`;G*j$J>s33#
zxQd1142pA*w1Ow7_hQ4fO;k~RL{<Y<uJ6_ZVML58YFNn_RAs_YAboD0xu8>?rSI2S
zo}emha){Oh(o243D`4XEt902e4fmpm3K6etIDclj&OtYNPMyqKChPY&;q0pT)b(V6
zC|G8f@zTjU=tM_i-L8dZ6I-mfcM>nt2RmkJ7FG#0@m@}?!OzKjTgI2(wu)Pitz|Bg
z32$cPHbayP0CpHo9N3mj<TcWoC_5(akq9hONG{~ZhT7IhA$6hch8c=dJ@NlZHva&~
z`+s-)_=i9}>v?Cx7#eigxTv-9`0PMTRT=pGScbFfv1nvCduB1`B>$TbFdstuAR?Cq
zAMB86QUsJB>bKSqRod-jQJio>zt=uGXLu+2lGfhYU~n{<os15@w<obEz?Ob6i}2`*
z@kl_|&x1Sv&{d6<%+v%LmH=zK_TOSS6MuG-`zZsxP=i89`v&rih*eRO){Zgua+jE+
zQzL*3>Gj!&An8ZWHhjOa8UGCaIyk(T_TQcioI#g>0&}FPo_OH#;Oddv$M&v2VS7-a
z7j>hfoLWaJ!-%r^c`lbJe;JxE+9!l!nvr>}A3>IW>p{nE%A?n4TW+=`zoMSWX@C6B
zh0){BU-^B|9dK%FtXNcE-8j2?CIPE<_F88h5}d?G2^J$nV>0cKznbBhihz~X-MyR?
zVi6QJeWNSL$GvpBZLP7ESs_A05oT4^BZJnY_&{@xz?K+Y&9yKAn{ceUIhu#=yq4eK
z`b((aQGlvOoVU(>ksSd6*SU8kCV!qGH2rW?q3CyyC>oAtgYkGY?na1!vJw1vjZj=s
zA``<L56=cxn9<STxPNgn4O-t~ylj#xLduaTnvV+5UTo<V7C&2Cf*Kt{g^P>Wvpjtd
zObY`HS_t0q>avZl)5KQ?q)DJIc3&sWVg0cZRtioO=x$?pe`*9zcnBN9{D1QSNl4*(
zk=vYVn!Hceu&b!<{g#ZT!Ap|!OFg>^t*(V2)hH-XPGDMl3gWvRm-E5OeQBGWn$$F8
zV<>iju9++V-M|0`ry`QbU|6#X=^&}B-KZaSUktwsg)SJVFa+{EnQY9nISniVo%rYv
z{v{Kc|MfqrE=o|U8-{__FMqh4RfxQDp#i#WAVGN_it0lPNU{!Li$WvA;w{5Czw<3p
zU&%P-b)SrJv0Yka!X{?A!dNu8k0*li{XCEFhHIrdI||T&T0XSVS0By6lm05v>o(mZ
z>evLoXE!ZiJ9gFUsARb|9VP16+<woFTEKSgs3q9;Iv&pd{HM*2?0>gAfSx>Xf&tOO
zUm4$Fz*9G5u(QwC3TO<#%;MR34q$T_{%M)+7NA3g_#Mt1IBG}Le$RYG)`bh7$(s5F
zSr4y=CMz0m?3%|DOtPE5y_+yGo2=&vzlJ-P2lu@99Zw4&`x$*QEK)lEk4o4)8JzdW
z{V6je$#MqPwJ<elXn%tkKCtM)-i>9F+~;<IalBq+tNwh>tPH(W9ZtwNW4|!dcSYH>
zG;XcYWz}@EmL4jzuQemhBJN6$PE!Y7_w?#&g!8dr3wZrqyXEymDq*lu2mA^{+&1Vh
zm+!9G!i24`7?)5-l*3h5*>+uyu6C_I7@goTB~{C-W)C}Oaesc<InB@T0b2Y;vi%8@
zLgPM={U|PDNBD))Tvfr)3URmkwx$WgFi6%FT-23=ET!P#b(YQ(Bx3LIyU}O@m(Csy
zkB5V!8C*L#nG$0mazS4$w}rRs(rf_=p9fonp1@><Oq-$AsMQ*|BCR~^67WX|sDw{~
z(}zZaC@zFe<A3s8f;0y&#8d471Z%FmCR9LA3h)8x;&)eZe|Rl9MctT2G81}foXX*S
z0&f}T88zym*cgo7_{q-*T=!21JK*JiulHa1lrl_{hLqSpjMs3NE@akS#&<8Bb|8fG
zlAAgUHpjhIgG(`@sp@ru7zt+y;&TMm2MaBF>FbS#^?#z}hzx1liyjouKKykK46&lS
z*WkGBP;#QVE;i2}WjlEs|C!;;N6&795CSad#LqLPc@fx~a~2rx${9umoYNAhnN1s2
zra?>rG32+<eFC8Lj<@K3$VWv{hjteduedWS=ya=i<;D_v{*?;15xTr8+(mL*Y|nJe
zC{7Jab$=(r_%y%6HBuJEiv`*^YO+Cg@&8_5Zc7YnR*&N)Y-!&`Jj$fUc)Y6!TRB4>
z3W4jmz>sXdBw$7WkK|bdQ6XktBiA6|;FHR%YGmsA$<b}!%@}sdThQCY-(?Ww%+Ptp
zx(+^OCs!iir?Q`ZUkwLll^^*rF&A8jXByztK!1$ZegfH|x!!ufsZxz2<vjtVsqkqq
zQ!M7+qnRImy9|a#Oh9D>yTfxOw(5@5ng4%#N7viNjeJ&r#o8~n52~8<<$(6uLu&gH
zA+h9>>;`=jWNF=OBWu-N$!-w%zaMAFA%~y4tJp>Fa0|qdwEP$jhva;5rk0WVp`2dN
zvVXZJ8syWC#UdZtNi8x`aU*d<Y)wJwAwA;|_S}b?cA4jb5VufCG5a9*iNIQxf*%J4
z7mrW^F4({A$6<m1*X8P7b2;O+fBEFn@+MUk;EJpFBf2vo6Ju*2^b(U_n^;I{^|sut
z(X-R>ub|e(D?jsqRbV7ofMfx<f+8(;fqz1Pze)aEzSt`N5xWe(<X}6}1K0ZxhJ>@c
zUQ`8+@<+4VL_jhgDZbHXSu7_K)4r)dMIYyJZ2`1ndlnrZ7qj)*H3{<Cs?I7(*ZSZP
z#oDbG;AKy3gqR^HqoN^dmy942Vb3*IL(hcjSJZ#hCKSF5i{PK`HZjCnFzF4N+J7-L
z6Ke}q4WVWjYoQR}UIh*#!K1|eMiFz!{22C)kIC?sdlsh;ZX^oG&B6N4?Ns>8J-mXK
z=Ll}L6}hm=`?9-jsn*N1T13N&*qf6=guQ_cetI<x2DJ0KVDuWD`!*e33`gg)e_g+O
z*Qr-Un_txP)tmF-WZJ!NvA(`+#DC|L*J0ITi+S8{jHK}d17zz-p-M54hwoU75p=hY
zz$@6H8e}EzBbf!V-I0f+zt#df8a#1}L0046A6j9?Md&|Um?ESFLYx%strp=i?C19x
z4!9eoxuhGXO9QcBqKr180es-GPrbzbGk>1@ymDl4k9z~IsJ9jH=Ahhj0DsikQx8I{
zvsMF;9K)W#LnmDTSISOU{Ny488Z7nm=f`kcdszB)5B)6kF#>caBYM12%9tLll`yK)
z6S1jB%ZH8V^zd}MdhTHZz&l}O1>q+^n{RIt5zN73Mj+<I9UtEn`q^RS`kwHIVLjE7
zS~-oavFS)PCuq5;DaV`*dVhHw^_f)O2Q1#m>Vf(`YVl09jfiN`c-;J&Y#kBPrune>
zl|PnS0->aD2GD1{QJ7Y;=i^me2RN1Q8`gL1bx6oL_>Pv$B4y8#N+hLHW->EFBph2q
zM0iQGj0z!S?=(o1qKwRp>^(C6?>XPE{?&Dz>s;^s+|PWU=lRZY5hs89!L#kX!%MCX
z(<WJo4l`ECE=1*#l$)6<#+mUp3T@-WVr{NSvdMvlsL8zU*ws__g_MS!-4v447N__M
z1C5XVGMg&nb<2GpPPVa#f5)UyH}EA(@tQ7o+xd;O(X*qIw8{*7m`=6dO}n%;WjH*{
z&sA<VH+jeFkgwjK6n2~THItB;yBxzqj=8lXqa5|=#P&ibZ55V0Cv9`x+ic%sOY@y;
z`xSN=P2Cr8$x#2|$Nb^8O8v*CZHLmum`7u4m{V?B)>V$2&<*=a=D&d`rO-PDwE0J*
zK5{?ZXES`$LD}WdT6Ne^&?AmDaRD3AMBO3%$IlKkyDW;u^sc;&LoSuJoSkY}cDB!G
zZ9eR_WYfuPkVKAuW<-Y@dE_uIuO{x$rYA9;!aY9rcw?;p>>)n!-Mu5~2H9n}ke6K5
zu2~*iyY)}^SQ@ETC6cX2^t03PqSEaeVFeq5qKKc*my7K#q_HuxFmND$$=x~TWENVb
z=4Th-cXe=y=FwXN8(L%Vt!9NQx^2_V2)(=~KeL=_s~660)bo#IHf1iiF7dPK{!kjn
zqSWX&Db;^Y;zGengbw>q*B7DNj?)?C38$qC?>$+k8NQ#Q^Q^9uObQO49(Z6lLvPc$
z{+UdMKS#)Yx8$}mJ~+elTDT(V9t(T-jmALMl54qccZgA&_ABY{RE?5bSNXNl%h_Ob
za;Ql~x34bq<-NdQYv%H=xsQu4E$7MNxa~UZf+VDhbPSy&s#DgCM%2D4^*(1*`n6Ro
zU~DM-dgI_hx3jX=EYf6k(K4Z@yqWY|vhF+O@b2@+N1EiXv)+>M61dITu~cX3G3S@9
z+I-KdC@Ir2h{a(K_f6}fOQ(H8GPy@AT};J2I?mA~bX28Ey)}z5oZE=2%yV1e71cb&
zUmeE$`bw{Q@{{dc`xAY|_g%^$NS0+X#f?7W5ZS}qXN)>XjV3$|B=cIhtYqi(gv^U{
zS#=38FtmgOoH<fSLuaV7?DqMRt+y`cy%$cdQExm?a&+~ZT;p+aewp6K1r+bJ3v7Bf
zeKo%3oN-(wiqlS9^IiS4_F-Lr?lepC=6v3yTCoGoJFnt4AF7UN5_-GifqsOeK}{Ej
zQ|?y-cbEIeMn!a7<kTF<HFu8;XkTei%ie;%Dk@*PIjPZGAUm^MQ|o<4{qj!<yjF_I
zZTY;kDlMSDVl$&!b?C10eiO-qtlQ~4-?WTo2eVoawe-&$c{&r!g!v?ea$Y2%?`!s^
z@Cp+Sas}u|#Bm5^^Ef%mEw?($lrC!)JQ-D5oL=dj{>gjD{q-bY1i3GCC7JlD(OTGW
zvRtjZ+{FHw*Qw1F15Gva{8NlPWhN(9guiPSR6b$Zuhx~2xN}p3D4#%``+@7BG_{=u
z63Wf;yPSOIYG0iBx?PdSI%5+Z&(WB}3?sBf7tUogGoAd>i`rj4C%>o1ZyQqqgWR58
zvF_g96??`I?W+cwX3=3f<o6W;y17HC_IFwW#wx9<e1~H{&9Dw4GxX9<in-=q)niBN
za`FtHOsn1`*BT$?FmUQz-J0Y7mD@oo`Vd2^vq{EC!IH52**1CGs5yRI;M|cbCZC?-
zj>bs}d`r5pXJF>e=&4lsck>U8f{nUfCcooQy>UVi$-D3)Q(_ZK($W|5krnZvraI#D
zjjci6wy*AL9DMhNIly(N?Ahrc)mzbz7c~n*IuD5`=YEj4u%K&<)k|57uOPKPvg8$7
z%mP>Pm$%_k#a%^G!d{;?ENi!~yK%tO(<z9nL2kbok!wPtB%b%Yq{lgZF~4&=hge9Y
zE2r$^Y5MGBi!AEYk8aDA8zc+w!5^K4|Ea0O+Bqrzl-pa{b8hSFGHySg>9qiVMT0p*
zfHCQ1m0)L0`IOD+%Hcq-E6tK;Jqj$&p7?V0$oYpezK0x6OT4_py)!;`k>`Zj1^mpH
zH%4ZRt#lGSoy&d2-e+!td=jxv4S)4;PI<5%%l)utOjq>e9|R6b6`UMRX&~=@cEzj?
z5wE>r9PvH;^@P?(t7{_po7;vWe~u=O!XM37*)9(?h7jL0eOb~z-6t;>@%Tj4yl17{
zCke^+<KMn&a;L0bK1xHcKguy1)xdzqo!D=4SH@#P!$0zA=mS}WSI(8W)2mM_TxEs)
zpQ}7u-jIJ_@sa6^6S?gck*}|FIFOaaF9awnBEb{3)phT>L#ESXe!ZEy>NC!f#alD%
zCg)YAWq;cGz%Kara&DSN`{LU~#)sUc=Q@9MG?tD!w|xF!CL>sT>DWY8v*5Z+*<GWW
z&c$zYKjORBYhB#kW|wOFK1RASJT}}@mZnS;)cm>Y{2lXz>Dj!MMcjbQ73E(`WN&GK
za4n(Y;}-;9B_vgc*0!f59>9qzD$kxwViRTq^rnjqDf&EZy>rt$q9>|UQ^pp|TXTH)
zLbGE@o3;c$aBQM~`@(hr;cRx)_8*i#@w~G6vLxrPhLYoViPug0!k&wI{tQKOG@Cg}
z(~*VjTl@M;oHv|%$0@RjEWofi$&&1=*p-PG*VN<<tdW#m<;Mgc&JZjm%@CGZoGV^W
z0JrEhE!l1$wp#RQ;Y6ij*)fkXkCOA>fIQ7Jep=g@d$HFqI_y_0U>rQENoVFSQ#IQ{
zzxOzYAHH;LfN0QLSZ>;Q*+5F{C!Y;s_c7Jp=hXFB>uc!LV33v^;@cbh;UpR4GKGl2
zKRmP&UV0|)^6qngj)WcG@v20Ax;ym4r-U>M&_3Dr>f6^sp1yW$*)_UDTA*X}N7w4x
zgxZ!GeCXqe<4N1(_d7(rHClgk=6PybJ(C%!yW;TM&RmT($;t})C>P%f9^ABLL(7c|
zM&9)a*O5@(?HmGU1FKt(<}%a!l3BKVMV{Q{4>8qQ`|#|YgoZ)jaWD67tpweX0hzry
zTddaEzn_!Ytgxtlr}2KZ<InIaUc^&3`{(x_zVI;Xs>_X|Gxb_}O-wv<=c*nFo_G9a
z?~QZ3;G976R5}#Z%AygG=QK95#<zM;GC?vwIoI0b2&+0inv0HEPS07S_2v@!uJ7%U
zyX(Cf4kml@yeuYcxwXD4rpK#(FYas7Y%zIKZsO;^JidkX^J%e<S@u~6mGeb_WgOz_
zZg4E%hI-}>n(}y!4>Di#nIi4j19sUW8oN9Ma_|q1dkEZ?On0x@+wv{=ct>_D`<aW$
zEwzyWhsP^Jnx6P9<%npX&8QLUwISQT`ufIc@+J47D{0;5jAK0Hez2_3v8gz6T7O!)
zXnhKo^|hLD;*7Jx2G)W{;qg1!4ZL4`=JqxCmda5Q+`k-cCC5P9m*?GGs@<T^xH;Y1
z&T-Shq<I?L%B94^-7ET<CK{1G;k!H!eJ2rCGsRmz$ba&PojP2@89Fjt@55TQgM8=F
znVpfr=iPACv2WHq?i3v?DM={(De7jPhQE2bUh#@Rytz+#=^g!Gw$!cLTzW{RttFzZ
z@lP8q2juOP^`CwyaAI~T&T>~jw%cy}F`s=*#PTKSdnRmJgTjr?D_?3YGc1#y6uMs(
z^?7;5YgdKx(O%!I0g-PW$v!UjxT0}katx>PrJVPt)Q5Kabejub&KC<a&>4ufYTG_n
z{yuiREAqjD{#2h=ofvJgudGf{zi!GlymH;vMsL|mD&C5(#|ZRkd3@4IT9a+J1vjLt
z-d1g+<Gx)Qm&JRb?+4xRpz6mR=3;nttM)7bo8DE=>C19n%8CM}Ytyw%qwL|_byeh;
z!##9(W7`PEodR3;$=|&&yhzlSc@hvB+EM-%Z1_}iK4wQ)!I0xYmSLH~W*x1)mycfm
z7^hckc-lPC9b`u1JEKfp4O%TVzT|`V!!)`(+3VtL`Shi7nUbP{HLq{q=0qd1#eF-i
z7|ww3U|)E^8wRgx(u8>ibILH=^o#eEWI;AXx9eFAon1jwx|TPiucxH?&TcWPXS=og
zc32$8*;hPYIh*4<buBV<E~XM4R+p2<H!3tw5F{nLPx^ou*?hU0<oe(xrNC>Mb&1<H
zIFTlgc{k4jO*vY@p$eg|g30wIep@B_*__WlKP6v0y(iS_nZYqv?Q=WFo~}rM-chow
zMu<v9yS?gCWW~-J<820y8;xzOwd^WV*gl<<GrzyT*!lZDyxE0_Yy3O;*o%KjCwH7W
zKf^ep^(nrMbN=#<Vb94#R>I3vj#YK;sjl;Tvqo5r!bptz5@sJOInqb^qa|dc%)Ui#
z7C&62_|fMnCvqvW`tf>h`-^hc>gUNWj^rkhm*z!0T(vJpj~G9Qn-6{ws5V`2FyI<6
zJg!tedGS|>J7e0)09w&fSB39sJ^HNpN3dxzmt}ov{`0`#Vc*B9@3f`pc@o$xUg2!g
zM*6(>8hL#Swn!6@PkVZ*nt^NLpmD3Y1jCi{%5nah-H$eOp0U?+-Nao}V@C)dj?Gjf
zpBsL7lRr0nnO?lhP`8!wMxnT2Q7?P9tH<(G1haL*2_YGrqQL5V>A3aQ6x15WUhA11
z8Q#i4Q=@9fCS!ae%Ia8HgINh<3tGqUG{o+`PMzcdCi<n%9oJus%j!j>?m4Kys^RuD
zEhRAi@q6uZPYn;DGYeHi@naKPougk#wv+jt`Iq+C+>_9pGnZgKdni(?<kPH6<rXC=
zryZ}EL!G#mqWk&>)WYzzC4|75zWtUlO-O<5Eh`J}^nj>1z4wheZXds|AM;yprhW2d
z)h@keS7W1$cILQW=cc*J>YzRNiuF9M2RNm)ADzZIY=$aw^@gU=^~EmodLscJLfco!
zx}SIklz?0C^yVh1G&4~N_9gxo*VBVkLU*xO<Z(pprgt)7y1eqeyzhrXmZq2A-d_{O
z<@IlfZ_nahdlvpugu`USnq}q_AuC!+Gb6qA=%i<;j;G$?iVH{FZ3Rei-tz}}=G{SE
zs%D+`#s0*n_!i=>E@#dyJOjfSPb3Eo$cfsWgY+s#(p#o-&cD*VR(*_qwoPb?#msO=
zz>1K@g>FY$1EN`ekRy`m^XZ<9Xx3D<&Z>~9NtNckC5;qk`$}!b@zfm_c2+^wQl?-;
zBV?^4sWkmoj%JABqD8{#0Af~}27i5S$Fg0Etw_sMyxWN~@pOmgo%0E?I$jE?3z8!X
zEJBaTai^Vongu{oD#LNcwbrSaceKq5A%pBUCBAhDm&{2ucPsnOEq)=>gf=H`hA%$&
zBET0BzW58869qzB5N>~9<R-Y6k=wsqO?)}3Ff`sxupr(IEth2<_bXSs|8cAAc_tbf
zPElZ)fw~|ecHrZ4R2ZyhprS}U^&kqma!@*O7XG9jv2&(~MZud)R2gZ$fgN@~hX>(T
z*rDkaFDoe6fN}tv23`(Un*aVK`!Bqw5L^-AR*dMJg(@I5W0Zq1upQ^+0%xuZa)9|P
zlz@C6$2dyas3LNZ9`s~G&Vy`JbweQN&PMH!I!+2E3NGiMC@}LBq~*Wi(ldQBgodU>
z97nV7w^#U{?EiBU#)VnPAyEm~fiGz@H#qYGCdv5_L!Q4t_ahgIDTm!)Yc48-WWL8F
zfw`zWve1qle7|pIr6{t-=AnX!_jd{^47Bo43FOs(2espT^dLK)j~1lmp?eXbpBRS<
z>%D}f<j9BCYu5jQbr3#25SEXM;-qkVKwX`0H>jZFV+RWqNFV<n)XmAa5w!h)Rl58V
zCEy0R|HEruqI+?kTd60}*d2UaK&}AlnF#+U9~I$a14^|}??nOBQ<b9P;sAPO1h_(2
z<31IjR*2f+N_GDeeJez@aZx9zClR1mgv#Q2!~T=$NfYQnX%VW3Yl)yjqQE4I4-Xcu
zK@aZnd>m}Q>!0ku15g>e!R=yH9#?;#dXfff#ppg<)ARpp(}OcbC^zsffw%v97vQXd
zm#ZU9Ac2M=loeD43(^7iy#)MU{j_}##xg5G8GvdjDvex`r6REk1P+i{3a@sn4n}!)
zjKB}jGKkzhjv?#Y`IrFdB!LdRiG;11?I*|z?w6tLNRT0gAOrd+>=r|iQ;(_xy>e6*
zaWw`HU!fYHz8rS@5i?8@@d;%H1{LTYgwc{BRtNPJs3y{2L$RU=NLz@^!094^4cL0a
z+T3&`{5=s$_LxeWBViLZGINzMeX<ip*%gU(!NhN>Pz?le$1IYYVa)eE2qGZ;6Ab*x
z)qgA+Uctgr>mss%vQ=2Q#cFgHGVg;ahx-wTfLsGJOADYN3P2^8uo<jU5RYKYo82qe
zvMkpq2QMV#2F0Eh;CKPO?z#oJ_lu#|gOUGuT?og_M?@01z^__ptTYlcb~c*83799L
z%JtVUv(RV^9(WB~?rt2WW%35rlQ|I!{QDbN%KHy6nrc0f9-Ms(xjm0DF*%jM3ntz|
z4-2UnV)PCwaHfOEcc>p?pY<o)O~A1Z(&%$BCzIpwp1SIwDe0GgIC$`*5JpT*DW)FA
z_qdoM^FZXw|0F~YF20Au8dV7%zK0&nYbfuUaJRvgu=n*}wEhN|#?^NiQn8uH0USTT
zo*a3PA;0f!Be>g0V2y2ru?;r;5%B;Y3i7oXOZ;aes)7WzVj04_WCN0I1a4qb0SlSf
z1OrWIrzETi)|y~Onq7aKvV!3r0s+e?<0B**_F~!MKf&li2QiDVX%8YTqnH+KQFcIT
zhB>xQV2IN+ytKLq=qq&gpL>>@#`N)@Ve<Gnj14cH9%L@S7H?RADo;K`uY!wM9;M3=
z_HKdjmM;*_Tc)Te0PR)S?_pnH!kH@+q7pc`PGH9-U}Fm;-l7K&zr*oqnuWGu{<L5h
z6OoBxNfaq&!eo6daLzhd|02REWdyFR=sslQMhvFLmc5C%85@?%@K*j>Ai_Kt3tkov
zVEhQ@lbQb?LJ1#`8bkMk$*<66D?jC+4s5@{<gcL=Rdujq3y~Wve}iE~ZNZF*ZYPp}
zXCX8uBJz*1wjCIOn$vh295P8!%*cCjA{WR$4Xbp$9VV|Uff2jgVH1??#ttw>>fOQ(
z*#VzorhET_S3BSc)X8G8+9|-v_v?fa-BQHNk9ET3HL3E)C_M;QhgUAz3?1G$@K212
z8Wh%5L{$@G|880$xLXXDb9fgFZ$b-`{k|LOo?!$Jju7dv1{FE>kIlBDSlyhvVF%hA
zqbkSh6N!{X!2!5?pvfA2Ak_nhOZ^mPda@rbuH_!sl3Ip;l$pWAIq1T#7pC_897g<o
zzqG*51j?vAOWy}AUWU7x(m=3m4B$c^D!V}v2=&26Yx+gx1djc%QM$~b2KCkzEdL33
z<UFSPo2rQfS^tSk6;Zzkq<)}*NVX#-G$k<o1I8)hhA}J#&_hU%=O5>+AowbABi4O9
zgD^1bt5`y=gYeG6y(y*+fyqHQ#TDc~PFR845bU^<K^S*;4S^9XhrlgBO>pBdrDWHD
z)Hr+?IS<2U0|@&|_17?}gyckE$l)j=9@Baj^G}lJ?obG_U?PSn0X%Rd4zP6unvIUd
z^u*)g{<<*&OHGQ$5V#ar!RiQX+m-|jq2AKfQRr>|eGH+t#PTTQFg&7!?uBHeP;T}x
zm>+{f6ZVV}a{!W-L7}UI`Ei(be%7BPX@TbiY}Gq2K+Xg#uy8&m@tB046Y)iV!e9W;
zOW-h2*GfUzKUvw7U@DGNs2XBf{#R6R<<WzMDOhy%>c8NwSFozoM!Yc%(?48`$*8G~
zO~cYYd<&#zU?M^Fn1ufW>|C1#INl|V|G2hqzzEcqbe@I&m76exI=V}<(3mz{@07%S
z=TI%A<;!0RjPp<-;u{vdL<cN>!aOYgqYjMod)5T83EQ^-W3BGSWYifo?Sm_f`hlR3
zB1`VaEO9Tw6;d!nAu51~Mf51r`jc|d0$0c29KZ)DyyeM%@=zQH=1XWOVlYLyEG@7!
z13O4<83r>xgE^$m)bnLH&HENG1m?^RI+oxTJNye0<(4ow`xo5MBP*0p_Jfrs_yCSs
zhsG4bq1VC<{C}@v+jT79$`#lE9SCq)g~JOMARUljg_A(0qaYCo7ZWB?UV~$Hm=#2>
z!)m@=Lk}Q$JP^W>)WNZJSV;Db6v;K@{3eV}Ezvp;|Hc>xk|?6YOVx{MBgrDc1k48Z
zNn-;^1?d;SkoFBEHDm(`GZ4RppA)S7fN@_zNCf1J*k4+^Gl`6#A0a6sg>c8<NPY;H
zG(}4tG!??9*H0X27ZNXn*?~jE0E}r#@<^mCI8H|r1{Jh0q892w6c{V;a{v>1IE=ie
z|CHyg5rusb*?W=lE(XdReiNDKVLXOp3M>k`{rT|}eNhBIk0G&(FmS3xrhNi`7rb~6
zn4%|HBVTMN@1nryq5vmoWQ49$7@);hL7<9(WQ9aL#l$=r0$iA#%ZyN5TZX}<j3i}5
zn*m6%koZ6)6Nv?&OwjwSzY!-U(mo`f=?~{P(zE%`ffFb*LlXx?{~#>j0W%4%TuBNd
z2<TX#y-Mog<OX`Mn}vje6c&;y61<m6h?NsWfhik|dk-rNELj6nLp243KsYPZ9X{{}
z*$A|Y@NA$=9e#JilV|}08`SX8{v+oDf~+KN;6#Cq&S3CUHqs%)$_P6&I>2usJnXPb
zSj{mc)IxAG2xEtS=qxbA&r(njko>4F1QA^;3{}CyZaN8{9F&}(89oZ-zpovWGlJ~M
ZI~R(K52(5cvH>Oz5(hooB|-Qt>VHbQhW`Kn


From ed59b0029140900054d29866c994d1c42aa3fcb3 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Fri, 1 Jun 2012 13:39:37 +0400
Subject: [PATCH 071/239] IDEA-86868

---
 .../com/intellij/designer/designSurface/QuickFixManager.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/QuickFixManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/QuickFixManager.java
index 8ff91ee66a96..f57f100283e4 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/QuickFixManager.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/QuickFixManager.java
@@ -54,7 +54,9 @@ public final class QuickFixManager extends AbstractQuickFixManager implements Co
   protected Rectangle getErrorBounds() {
     List<RadComponent> selection = myDesigner.getSurfaceArea().getSelection();
     if (selection.size() == 1) {
-      return selection.get(0).getBounds(myComponent);
+      Rectangle bounds = selection.get(0).getBounds(myComponent);
+      bounds.x -= ICON.getIconWidth() - 5;
+      return bounds;
     }
 
     return null;

From e892087bbe82a8b2d3a0af979a12e68e82face75 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 24 May 2012 16:45:29 +0200
Subject: [PATCH 072/239] refactoring to make the code easier to reuse
 externally

---
 .../codeInsight/daemon/impl/MarkerType.java   | 240 ++++++++++--------
 1 file changed, 134 insertions(+), 106 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java
index b12ab5e29c81..392325af383f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ import com.intellij.util.*;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.event.MouseEvent;
@@ -56,22 +57,7 @@ public class MarkerType {
       if (!(parent instanceof PsiMethod)) return null;
       PsiMethod method = (PsiMethod)parent;
 
-      PsiMethod[] superMethods = method.findSuperMethods(false);
-      if (superMethods.length == 0) return null;
-
-      PsiMethod superMethod = superMethods[0];
-      boolean isAbstract = method.hasModifierProperty(PsiModifier.ABSTRACT);
-      boolean isSuperAbstract = superMethod.hasModifierProperty(PsiModifier.ABSTRACT);
-
-      final boolean sameSignature = superMethod.getSignature(PsiSubstitutor.EMPTY).equals(method.getSignature(PsiSubstitutor.EMPTY));
-      @NonNls final String key;
-      if (isSuperAbstract && !isAbstract){
-        key = sameSignature ? "method.implements" : "method.implements.in";
-      }
-      else{
-        key = sameSignature ? "method.overrides" : "method.overrides.in";
-      }
-      return GutterIconTooltipHelper.composeText(superMethods, "", DaemonBundle.message(key));
+      return calculateOverridingMethodTooltip(method);
     }
   }, new LineMarkerNavigator(){
     @Override
@@ -79,15 +65,40 @@ public class MarkerType {
       PsiElement parent = element.getParent();
       if (!(parent instanceof PsiMethod)) return;
       PsiMethod method = (PsiMethod)parent;
-      PsiMethod[] superMethods = method.findSuperMethods(false);
-      if (superMethods.length == 0) return;
-      boolean showMethodNames = !PsiUtil.allMethodsHaveSameSignature(superMethods);
-      PsiElementListNavigator.openTargets(e, superMethods,
-                  DaemonBundle.message("navigation.title.super.method", method.getName()),
-                  new MethodCellRenderer(showMethodNames));
+      navigateToOverridingMethod(e, method);
 
     }
   });
+
+  @Nullable
+  public static String calculateOverridingMethodTooltip(PsiMethod method) {
+    PsiMethod[] superMethods = method.findSuperMethods(false);
+    if (superMethods.length == 0) return null;
+
+    PsiMethod superMethod = superMethods[0];
+    boolean isAbstract = method.hasModifierProperty(PsiModifier.ABSTRACT);
+    boolean isSuperAbstract = superMethod.hasModifierProperty(PsiModifier.ABSTRACT);
+
+    final boolean sameSignature = superMethod.getSignature(PsiSubstitutor.EMPTY).equals(method.getSignature(PsiSubstitutor.EMPTY));
+    @NonNls final String key;
+    if (isSuperAbstract && !isAbstract){
+      key = sameSignature ? "method.implements" : "method.implements.in";
+    }
+    else{
+      key = sameSignature ? "method.overrides" : "method.overrides.in";
+    }
+    return GutterIconTooltipHelper.composeText(superMethods, "", DaemonBundle.message(key));
+  }
+
+  public static void navigateToOverridingMethod(MouseEvent e, PsiMethod method) {
+    PsiMethod[] superMethods = method.findSuperMethods(false);
+    if (superMethods.length == 0) return;
+    boolean showMethodNames = !PsiUtil.allMethodsHaveSameSignature(superMethods);
+    PsiElementListNavigator.openTargets(e, superMethods,
+                                        DaemonBundle.message("navigation.title.super.method", method.getName()),
+                                        new MethodCellRenderer(showMethodNames));
+  }
+
   public static final String SEARCHING_FOR_OVERRIDING_METHODS = "Searching for overriding methods";
   public static final MarkerType OVERRIDEN_METHOD = new MarkerType(new NullableFunction<PsiElement, String>() {
     @Override
@@ -96,57 +107,66 @@ public class MarkerType {
       if (!(parent instanceof PsiMethod)) return null;
       PsiMethod method = (PsiMethod)parent;
 
-      PsiElementProcessor.CollectElementsWithLimit<PsiMethod> processor = new PsiElementProcessor.CollectElementsWithLimit<PsiMethod>(5);
-      OverridingMethodsSearch.search(method, true).forEach(new PsiElementProcessorAdapter<PsiMethod>(processor));
-
-      boolean isAbstract = method.hasModifierProperty(PsiModifier.ABSTRACT);
-
-      if (processor.isOverflow()){
-        return isAbstract ? DaemonBundle.message("method.is.implemented.too.many") : DaemonBundle.message("method.is.overridden.too.many");
-      }
-
-      PsiMethod[] overridings = processor.toArray(new PsiMethod[processor.getCollection().size()]);
-      if (overridings.length == 0) return null;
-
-      Comparator<PsiMethod> comparator = new MethodCellRenderer(false).getComparator();
-      Arrays.sort(overridings, comparator);
-
-      String start = isAbstract ? DaemonBundle.message("method.is.implemented.header") : DaemonBundle.message("method.is.overriden.header");
-      @NonNls String pattern = "&nbsp;&nbsp;&nbsp;&nbsp;{1}";
-      return GutterIconTooltipHelper.composeText(overridings, start, pattern);
+      return getOverriddenMethodTooltip(method);
     }
   }, new LineMarkerNavigator(){
     @Override
     public void browse(MouseEvent e, PsiElement element) {
       PsiElement parent = element.getParent();
       if (!(parent instanceof PsiMethod)) return;
-      if (DumbService.isDumb(element.getProject())) {
-        DumbService.getInstance(element.getProject()).showDumbModeNotification("Navigation to overriding classes is not possible during index update");
-        return;
-      }
-
-      final PsiMethod method = (PsiMethod)parent;
-      final PsiElementProcessor.CollectElementsWithLimit<PsiMethod> collectProcessor =
-        new PsiElementProcessor.CollectElementsWithLimit<PsiMethod>(2, new THashSet<PsiMethod>());
-      if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
-        @Override
-        public void run() {
-          OverridingMethodsSearch.search(method, true).forEach(new PsiElementProcessorAdapter<PsiMethod>(collectProcessor));
-        }
-      }, SEARCHING_FOR_OVERRIDING_METHODS, true, method.getProject(), (JComponent)e.getComponent())) {
-        return;
-      }
-
-      PsiMethod[] overridings = collectProcessor.toArray(PsiMethod.EMPTY_ARRAY);
-      if (overridings.length == 0) return;
-      boolean showMethodNames = !PsiUtil.allMethodsHaveSameSignature(overridings);
-      MethodCellRenderer renderer = new MethodCellRenderer(showMethodNames);
-      Arrays.sort(overridings, renderer.getComparator());
-      final OverridingMethodsUpdater methodsUpdater = new OverridingMethodsUpdater(method, renderer);
-      PsiElementListNavigator.openTargets(e, overridings, methodsUpdater.getCaption(overridings.length), renderer, methodsUpdater);
+      navigateToOverriddenMethod(e, (PsiMethod)parent);
 
     }
   });
+
+  public static String getOverriddenMethodTooltip(PsiMethod method) {
+    PsiElementProcessor.CollectElementsWithLimit<PsiMethod> processor = new PsiElementProcessor.CollectElementsWithLimit<PsiMethod>(5);
+    OverridingMethodsSearch.search(method, true).forEach(new PsiElementProcessorAdapter<PsiMethod>(processor));
+
+    boolean isAbstract = method.hasModifierProperty(PsiModifier.ABSTRACT);
+
+    if (processor.isOverflow()){
+      return isAbstract ? DaemonBundle.message("method.is.implemented.too.many") : DaemonBundle.message("method.is.overridden.too.many");
+    }
+
+    PsiMethod[] overridings = processor.toArray(new PsiMethod[processor.getCollection().size()]);
+    if (overridings.length == 0) return null;
+
+    Comparator<PsiMethod> comparator = new MethodCellRenderer(false).getComparator();
+    Arrays.sort(overridings, comparator);
+
+    String start = isAbstract ? DaemonBundle.message("method.is.implemented.header") : DaemonBundle.message("method.is.overriden.header");
+    @NonNls String pattern = "&nbsp;&nbsp;&nbsp;&nbsp;{1}";
+    return GutterIconTooltipHelper.composeText(overridings, start, pattern);
+  }
+
+  public static void navigateToOverriddenMethod(MouseEvent e, final PsiMethod method) {
+    if (DumbService.isDumb(method.getProject())) {
+      DumbService.getInstance(method.getProject()).showDumbModeNotification(
+        "Navigation to overriding classes is not possible during index update");
+      return;
+    }
+
+    final PsiElementProcessor.CollectElementsWithLimit<PsiMethod> collectProcessor =
+      new PsiElementProcessor.CollectElementsWithLimit<PsiMethod>(2, new THashSet<PsiMethod>());
+    if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
+      @Override
+      public void run() {
+        OverridingMethodsSearch.search(method, true).forEach(new PsiElementProcessorAdapter<PsiMethod>(collectProcessor));
+      }
+    }, SEARCHING_FOR_OVERRIDING_METHODS, true, method.getProject(), (JComponent)e.getComponent())) {
+      return;
+    }
+
+    PsiMethod[] overridings = collectProcessor.toArray(PsiMethod.EMPTY_ARRAY);
+    if (overridings.length == 0) return;
+    boolean showMethodNames = !PsiUtil.allMethodsHaveSameSignature(overridings);
+    MethodCellRenderer renderer = new MethodCellRenderer(showMethodNames);
+    Arrays.sort(overridings, renderer.getComparator());
+    final OverridingMethodsUpdater methodsUpdater = new OverridingMethodsUpdater(method, renderer);
+    PsiElementListNavigator.openTargets(e, overridings, methodsUpdater.getCaption(overridings.length), renderer, methodsUpdater);
+  }
+
   public static final String SEARCHING_FOR_OVERRIDDEN_METHODS = "Searching for overridden methods";
   public static final MarkerType SUBCLASSED_CLASS = new MarkerType(new NullableFunction<PsiElement, String>() {
     @Override
@@ -154,58 +174,66 @@ public class MarkerType {
       PsiElement parent = element.getParent();
       if (!(parent instanceof PsiClass)) return null;
       PsiClass aClass = (PsiClass)parent;
-      PsiElementProcessor.CollectElementsWithLimit<PsiClass> processor = new PsiElementProcessor.CollectElementsWithLimit<PsiClass>(5, new THashSet<PsiClass>());
-      ClassInheritorsSearch.search(aClass, true).forEach(new PsiElementProcessorAdapter<PsiClass>(processor));
-
-      if (processor.isOverflow()) {
-        return aClass.isInterface()
-               ? DaemonBundle.message("interface.is.implemented.too.many")
-               : DaemonBundle.message("class.is.subclassed.too.many");
-      }
-
-      PsiClass[] subclasses = processor.toArray(new PsiClass[processor.getCollection().size()]);
-      if (subclasses.length == 0) return null;
-
-      Comparator<PsiClass> comparator = new PsiClassListCellRenderer().getComparator();
-      Arrays.sort(subclasses, comparator);
-
-      String start = aClass.isInterface()
-                     ? DaemonBundle.message("interface.is.implemented.by.header")
-                     : DaemonBundle.message("class.is.subclassed.by.header");
-      @NonNls String pattern = "&nbsp;&nbsp;&nbsp;&nbsp;{0}";
-      return GutterIconTooltipHelper.composeText(subclasses, start, pattern);
+      return getSubclassedClassTooltip(aClass);
     }
   }, new LineMarkerNavigator(){
     @Override
     public void browse(MouseEvent e, PsiElement element) {
       final PsiElement parent = element.getParent();
       if (!(parent instanceof PsiClass)) return;
-
-      if (DumbService.isDumb(element.getProject())) {
-        DumbService.getInstance(element.getProject()).showDumbModeNotification("Navigation to overriding methods is not possible during index update");
-        return;
-      }
-
       final PsiClass aClass = (PsiClass)parent;
-      final PsiElementProcessor.CollectElementsWithLimit<PsiClass> collectProcessor = new PsiElementProcessor.CollectElementsWithLimit<PsiClass>(2, new THashSet<PsiClass>());
-      if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
-        @Override
-        public void run() {
-          ClassInheritorsSearch.search(aClass, true).forEach(new PsiElementProcessorAdapter<PsiClass>(collectProcessor));
-        }
-      }, SEARCHING_FOR_OVERRIDDEN_METHODS, true, aClass.getProject(), (JComponent)e.getComponent())) {
-        return;
-      }
 
-      PsiClass[] inheritors = collectProcessor.toArray(PsiClass.EMPTY_ARRAY);
-      if (inheritors.length == 0) return;
-      final PsiClassListCellRenderer renderer = new PsiClassListCellRenderer();
-      final SubclassUpdater subclassUpdater = new SubclassUpdater(aClass, renderer);
-      Arrays.sort(inheritors, renderer.getComparator());
-      PsiElementListNavigator.openTargets(e, inheritors, subclassUpdater.getCaption(inheritors.length), renderer, subclassUpdater);
+      navigateToSubclassedClass(e, aClass);
     }
   });
 
+  public static String getSubclassedClassTooltip(PsiClass aClass) {
+    PsiElementProcessor.CollectElementsWithLimit<PsiClass> processor = new PsiElementProcessor.CollectElementsWithLimit<PsiClass>(5, new THashSet<PsiClass>());
+    ClassInheritorsSearch.search(aClass, true).forEach(new PsiElementProcessorAdapter<PsiClass>(processor));
+
+    if (processor.isOverflow()) {
+      return aClass.isInterface()
+             ? DaemonBundle.message("interface.is.implemented.too.many")
+             : DaemonBundle.message("class.is.subclassed.too.many");
+    }
+
+    PsiClass[] subclasses = processor.toArray(new PsiClass[processor.getCollection().size()]);
+    if (subclasses.length == 0) return null;
+
+    Comparator<PsiClass> comparator = new PsiClassListCellRenderer().getComparator();
+    Arrays.sort(subclasses, comparator);
+
+    String start = aClass.isInterface()
+                   ? DaemonBundle.message("interface.is.implemented.by.header")
+                   : DaemonBundle.message("class.is.subclassed.by.header");
+    @NonNls String pattern = "&nbsp;&nbsp;&nbsp;&nbsp;{0}";
+    return GutterIconTooltipHelper.composeText(subclasses, start, pattern);
+  }
+
+  public static void navigateToSubclassedClass(MouseEvent e, final PsiClass aClass) {
+    if (DumbService.isDumb(aClass.getProject())) {
+      DumbService.getInstance(aClass.getProject()).showDumbModeNotification("Navigation to overriding methods is not possible during index update");
+      return;
+    }
+
+    final PsiElementProcessor.CollectElementsWithLimit<PsiClass> collectProcessor = new PsiElementProcessor.CollectElementsWithLimit<PsiClass>(2, new THashSet<PsiClass>());
+    if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
+      @Override
+      public void run() {
+        ClassInheritorsSearch.search(aClass, true).forEach(new PsiElementProcessorAdapter<PsiClass>(collectProcessor));
+      }
+    }, SEARCHING_FOR_OVERRIDDEN_METHODS, true, aClass.getProject(), (JComponent)e.getComponent())) {
+      return;
+    }
+
+    PsiClass[] inheritors = collectProcessor.toArray(PsiClass.EMPTY_ARRAY);
+    if (inheritors.length == 0) return;
+    final PsiClassListCellRenderer renderer = new PsiClassListCellRenderer();
+    final SubclassUpdater subclassUpdater = new SubclassUpdater(aClass, renderer);
+    Arrays.sort(inheritors, renderer.getComparator());
+    PsiElementListNavigator.openTargets(e, inheritors, subclassUpdater.getCaption(inheritors.length), renderer, subclassUpdater);
+  }
+
   private final GutterIconNavigationHandler<PsiElement> handler;
   private final Function<PsiElement, String> myTooltip;
 

From 7f07f93ab28f0afa5ffc49de9e6ab95b4a76c0e7 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 1 Jun 2012 12:31:49 +0200
Subject: [PATCH 073/239] read ProjectRootManager state in CoreProjectLoader

---
 .../intellij/core/CoreModuleManagerTest.java    | 11 ++++++-----
 .../com/intellij/core/CoreProjectLoader.java    | 17 +++++++++++++++--
 .../intellij/core/ProjectModelEnvironment.java  |  2 ++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java b/platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java
index 07b3e10b0f49..69950d9b08e4 100644
--- a/platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/core/CoreModuleManagerTest.java
@@ -18,10 +18,8 @@ package com.intellij.core;
 import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.roots.ContentEntry;
-import com.intellij.openapi.roots.LibraryOrderEntry;
-import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.roots.OrderEntry;
+import com.intellij.openapi.roots.*;
+import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.vfs.StandardFileSystems;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.UsefulTestCase;
@@ -33,7 +31,7 @@ import java.io.IOException;
  * @author yole
  */
 public class CoreModuleManagerTest extends UsefulTestCase {
-  public void _testLoadingModules() throws IOException, JDOMException {
+  public void _testLoadingModules() throws IOException, JDOMException, InvalidDataException {
     CoreEnvironment env = new CoreEnvironment(getTestRootDisposable());
     ProjectModelEnvironment.register(env);
     final String projectPath = PathManagerEx.getTestDataPath("/core/loadingTest");
@@ -43,6 +41,9 @@ public class CoreModuleManagerTest extends UsefulTestCase {
     final Module[] modules = moduleManager.getModules();
     assertEquals(1, modules.length);
 
+    ProjectRootManager projectRootManager = ProjectRootManager.getInstance(env.getProject());
+    assertEquals("1.6", projectRootManager.getProjectSdkName());
+
     ModuleRootManager rootManager = ModuleRootManager.getInstance(modules[0]);
     final ContentEntry[] contentEntries = rootManager.getContentEntries();
     assertEquals(1, contentEntries.length);
diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java
index 0ca408a943a3..635f9fa27352 100644
--- a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java
+++ b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java
@@ -22,10 +22,13 @@ import com.intellij.openapi.components.impl.stores.DirectoryStorageData;
 import com.intellij.openapi.components.impl.stores.StorageData;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.roots.impl.DirectoryIndex;
 import com.intellij.openapi.roots.impl.DirectoryIndexImpl;
+import com.intellij.openapi.roots.impl.ProjectRootManagerImpl;
 import com.intellij.openapi.roots.impl.libraries.LibraryTableBase;
 import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable;
+import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.io.fs.FileSystem;
@@ -41,7 +44,8 @@ import java.io.IOException;
  * @author yole
  */
 public class CoreProjectLoader {
-  public static void loadProject(MockProject project, @NotNull VirtualFile virtualFile) throws IOException, JDOMException {
+  public static void loadProject(MockProject project, @NotNull VirtualFile virtualFile)
+    throws IOException, JDOMException, InvalidDataException {
     if (virtualFile.isDirectory() && virtualFile.findChild(Project.DIRECTORY_STORE_FOLDER) != null) {
       project.setBaseDir(virtualFile);
       loadDirectoryProject(project, virtualFile);
@@ -52,7 +56,8 @@ public class CoreProjectLoader {
     }
   }
 
-  private static void loadDirectoryProject(Project project, VirtualFile projectDir) throws IOException, JDOMException {
+  private static void loadDirectoryProject(Project project, VirtualFile projectDir) throws IOException, JDOMException,
+                                                                                           InvalidDataException {
     VirtualFile dotIdea = projectDir.findChild(Project.DIRECTORY_STORE_FOLDER);
     VirtualFile modulesXml = dotIdea.findChild("modules.xml");
     StorageData storageData = loadStorageFile(project, modulesXml);
@@ -63,6 +68,14 @@ public class CoreProjectLoader {
     final CoreModuleManager moduleManager = (CoreModuleManager)ModuleManager.getInstance(project);
     moduleManager.loadState(moduleManagerState);
 
+    VirtualFile miscXml = dotIdea.findChild("misc.xml");
+    storageData = loadStorageFile(project, miscXml);
+    final Element projectRootManagerState = storageData.getState("ProjectRootManager");
+    if (projectRootManagerState == null) {
+      throw new JDOMException("cannot find ProjectRootManager state in misc.xml");
+    }
+    ((ProjectRootManagerImpl) ProjectRootManager.getInstance(project)).readExternal(projectRootManagerState);
+
     VirtualFile libraries = dotIdea.findChild("libraries");
     if (libraries != null) {
       DirectoryStorageData data = new DirectoryStorageData();
diff --git a/platform/projectModel-impl/src/com/intellij/core/ProjectModelEnvironment.java b/platform/projectModel-impl/src/com/intellij/core/ProjectModelEnvironment.java
index 5fd165a41f17..ea05242bea81 100644
--- a/platform/projectModel-impl/src/com/intellij/core/ProjectModelEnvironment.java
+++ b/platform/projectModel-impl/src/com/intellij/core/ProjectModelEnvironment.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.projectRoots.ProjectJdkTable;
 import com.intellij.openapi.roots.OrderRootType;
+import com.intellij.openapi.roots.ProjectExtension;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.roots.impl.*;
@@ -54,6 +55,7 @@ public class ProjectModelEnvironment {
     env.registerProjectComponent(ModuleManager.class, new CoreModuleManager(project, env.getParentDisposable()));
     env.registerProjectComponent(PathMacroManager.class, new ProjectPathMacroManager(pathMacros, project));
     env.registerProjectExtensionPoint(DirectoryIndexExcludePolicy.EP_NAME, DirectoryIndexExcludePolicy.class);
+    env.registerProjectExtensionPoint(ProjectExtension.EP_NAME, ProjectExtension.class);
     DirectoryIndex index = new DirectoryIndexImpl(project);
     env.registerProjectComponent(DirectoryIndex.class, index);
     env.registerProjectComponent(ProjectRootManager.class, new ProjectRootManagerImpl(project, index));

From 96f1c111ed0318e2c46e9444996e4fe083905910 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Fri, 1 Jun 2012 14:44:33 +0400
Subject: [PATCH 074/239] Handle icon renames and moves

---
 .../IconsReferencesContributor.java           | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/plugins/devkit/src/references/IconsReferencesContributor.java b/plugins/devkit/src/references/IconsReferencesContributor.java
index 6086c6cc5839..1ee44066816e 100644
--- a/plugins/devkit/src/references/IconsReferencesContributor.java
+++ b/plugins/devkit/src/references/IconsReferencesContributor.java
@@ -36,8 +36,10 @@ import com.intellij.psi.impl.source.resolve.reference.impl.providers.FileReferen
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.Processor;
 import com.intellij.util.QueryExecutor;
@@ -120,6 +122,45 @@ public class IconsReferencesContributor extends PsiReferenceContributor implemen
               return null;
             }
 
+            @Override
+            public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
+              PsiElement element = resolve();
+              if (element instanceof PsiFile) {
+                FileReference lastRef = new FileReferenceSet(element).getLastReference();
+                return lastRef.handleElementRename(newElementName);
+              }
+              else if (element instanceof PsiField) {
+                String fqn = ((PsiField)element).getContainingClass().getQualifiedName();
+
+                if (fqn.startsWith("com.intellij.icons.")) {
+                  XmlAttribute parent = (XmlAttribute)getElement().getParent();
+                  parent.setValue(fqn.substring("com.intellij.icons.".length()) + "." + newElementName);
+                  return parent.getValueElement();
+                }
+              }
+
+              return super.handleElementRename(newElementName);
+            }
+
+            @Override
+            public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException {
+              if (element instanceof PsiFile) {
+                FileReference lastRef = new FileReferenceSet(element).getLastReference();
+                return lastRef.bindToElement(element);
+              }
+              else if (element instanceof PsiField) {
+                String fqn = ((PsiField)element).getContainingClass().getQualifiedName();
+
+                if (fqn.startsWith("com.intellij.icons.")) {
+                  XmlAttribute parent = (XmlAttribute)getElement().getParent();
+                  parent.setValue(fqn.substring("com.intellij.icons.".length()) + "." + ((PsiField)element).getName());
+                  return parent.getValueElement();
+                }
+              }
+
+              return super.bindToElement(element);
+            }
+
             @NotNull
             @Override
             public Object[] getVariants() {

From 2e13dc4c4b991e22c94fb0f9bbc74d98b309d0d8 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Fri, 1 Jun 2012 15:27:41 +0400
Subject: [PATCH 075/239] IDEA-86827

---
 .../propertyInspector/UIDesignerToolWindowManager.java    | 8 +++++++-
 .../com/intellij/designer/DesignerToolWindowManager.java  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java
index 4f2866fa3ab7..d0fa6234802c 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/UIDesignerToolWindowManager.java
@@ -17,6 +17,7 @@
 package com.intellij.uiDesigner.propertyInspector;
 
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -231,7 +232,12 @@ public class UIDesignerToolWindowManager implements ProjectComponent {
     }
 
     public void fileClosed(FileEditorManager source, VirtualFile file) {
-      processFileEditorChange(getActiveFormFileEditor());
+      ApplicationManager.getApplication().invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          processFileEditorChange(getActiveFormFileEditor());
+        }
+      });
     }
 
     public void selectionChanged(FileEditorManagerEvent event) {
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
index c0819ebdf19c..edb2628946f8 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java
@@ -22,6 +22,7 @@ import com.intellij.designer.propertyTable.PropertyTablePanel;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -77,7 +78,12 @@ public final class DesignerToolWindowManager implements ProjectComponent {
 
       @Override
       public void fileClosed(FileEditorManager source, VirtualFile file) {
-        bindToDesigner(getActiveDesigner());
+        ApplicationManager.getApplication().invokeLater(new Runnable() {
+          @Override
+          public void run() {
+            bindToDesigner(getActiveDesigner());
+          }
+        });
       }
 
       @Override

From fc27628d6619ac143fe2a0015f62358feb8f4e43 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 1 Jun 2012 15:42:12 +0400
Subject: [PATCH 076/239] moving xml-tests to community

---
 .idea/codeStyleSettings.xml                   |  101 +-
 .idea/compiler.xml                            |    6 +-
 .idea/inspectionProfiles/idea_default.xml     |    3 +
 .../idea_default_no_spellchecker.xml          |    3 +
 .idea/modules.xml                             |    1 +
 community-main.iml                            |    1 +
 .../fixtures/CodeInsightFixtureTestCase.java  |    8 +-
 .../codeInsight/SearchingInXmlTest.java       |   27 +
 .../intellij/codeInsight/XmlBuilderTest.java  |  257 +
 .../com/intellij/codeInsight/XmlDtdTest.java  |  320 +
 .../intellij/codeInsight/XmlEventsTest.java   |  238 +
 .../intellij/codeInsight/XmlInsightTest.java  |  144 +
 .../intellij/codeInsight/XmlParsingTest.java  |  649 ++
 .../codeInsight/XmlPerformanceTest.java       |   89 +
 .../intellij/codeInsight/XmlReparseTest.java  |  165 +
 .../intellij/codeInsight/XmlSchemaTest.java   |  757 ++
 .../com/intellij/codeInsight/XmlTagTest.java  |  960 ++
 .../intellij/codeInsight/XmlTagWriteTest.java |   61 +
 .../com/intellij/codeInsight/XmlTestUtil.java |   22 +
 .../com/intellij/codeInsight/XmlTextTest.java |   86 +
 .../XmlWrongClosingTagNameInspectionTest.java |   23 +
 .../codeInsight/XmlXIncludeTest.groovy        |   99 +
 .../completion/XmlSmartEnterTest.java         |  121 +
 .../moveUpDown/XmlMoverTest.java              |   66 +
 .../psi/formatter/XmlFormatterTestBase.java   |   54 +
 .../psi/formatter/XmlFormatterTestCase.java   |   25 +
 .../HtmlConditionalCommentInjectionTest.java  |   28 +
 .../com/intellij/xml/XmlConstraintsTest.java  |  145 +
 .../com/intellij/xml/XmlNamespacesTest.java   |  249 +
 .../com/intellij/xml/XmlSchemaPrefixTest.java |   47 +
 .../intellij/xml/XmlSmartCompletionTest.java  |  118 +
 .../xml/actions/GenerateXmlTagTest.java       |   84 +
 .../xml/actions/SplitTagActionTest.java       |   26 +
 .../xml/index/XmlSchemaIndexTest.java         |   91 +
 .../commentInjection/broken_syntax.html       |   14 +
 .../commentInjection/broken_syntax.xhtml      |   15 +
 .../commentInjection/broken_syntax2.html      |   14 +
 .../commentInjection/broken_syntax2.xhtml     |   15 +
 .../testData/commentInjection/complete.html   |   13 +
 .../testData/commentInjection/complete.xhtml  |   15 +
 .../commentInjection/complete_after.html      |   13 +
 .../commentInjection/complete_after.xhtml     |   15 +
 .../testData/commentInjection/injected1.html  |   14 +
 .../testData/commentInjection/injected1.xhtml |   16 +
 .../testData/commentInjection/injected2.html  |   22 +
 .../formatting1.html                          |   18 +
 .../formatting1_after.html                    |   18 +
 .../formatting2.html                          |   36 +
 .../formatting2_after.html                    |   36 +
 .../xhtmlFormatting1.xhtml                    |   21 +
 .../xhtmlFormatting1_after.xhtml              |   21 +
 .../xhtmlFormatting2.xhtml                    |   39 +
 .../xhtmlFormatting2_after.xhtml              |   39 +
 xml/tests/testData/constraints/test.xml       |    3 +
 xml/tests/testData/constraints/test.xsd       |   13 +
 .../testData/constraints/testCompletion.xml   |    4 +
 xml/tests/testData/constraints/testDtd.xml    |   10 +
 .../testData/constraints/testIncomplete.xml   |    3 +
 xml/tests/testData/generateTag/generate.xml   |    8 +
 .../testData/generateTag/generateDTD.xml      |   17 +
 .../generateTag/generateDTDComplex.xml        |   19 +
 .../generateTag/generateDTDComplex_after.xml  |   22 +
 .../generateTag/generateDTD_after.xml         |   20 +
 .../testData/generateTag/generateEmpty.xml    |    8 +
 .../generateTag/generateEmpty_after.xml       |    8 +
 .../testData/generateTag/generate_after.xml   |   13 +
 xml/tests/testData/generateTag/initParam.xml  |    9 +
 .../testData/generateTag/initParam_after.xml  |   12 +
 xml/tests/testData/generateTag/javaee_5.xsd   | 2117 +++++
 .../testData/generateTag/spring-beans_3.0.xsd | 1162 +++
 xml/tests/testData/generateTag/spring.xml     |    8 +
 .../testData/generateTag/springAfterBean.xml  |   11 +
 .../generateTag/springAfterBean_after.xml     |   11 +
 .../testData/generateTag/springAlias.xml      |    8 +
 .../generateTag/springAlias_after.xml         |    8 +
 .../testData/generateTag/springAtCaret.xml    |    9 +
 .../generateTag/springAtCaret_after.xml       |    9 +
 .../testData/generateTag/spring_after.xml     |    8 +
 .../testData/generateTag/web-app_2_3.dtd      | 1063 +++
 .../testData/generateTag/web-app_2_5.xsd      | 1290 +++
 .../generateactions/addColumn/after1.html     |   43 +
 .../generateactions/addColumn/after2.xhtml    |   41 +
 .../generateactions/addColumn/after3.jsp      |   74 +
 .../generateactions/addColumn/after4.jspx     |   74 +
 .../generateactions/addColumn/after5.html     |   79 +
 .../generateactions/addColumn/after6.html     |   11 +
 .../generateactions/addColumn/after7.html     |  966 ++
 .../generateactions/addColumn/after8.xml      |   41 +
 .../generateactions/addColumn/before1.html    |   41 +
 .../generateactions/addColumn/before2.xhtml   |   41 +
 .../generateactions/addColumn/before3.jsp     |   69 +
 .../generateactions/addColumn/before4.jspx    |   69 +
 .../generateactions/addColumn/before5.html    |   69 +
 .../generateactions/addColumn/before6.html    |    6 +
 .../generateactions/addColumn/before7.html    |  866 ++
 .../generateactions/addColumn/before8.xml     |   41 +
 xml/tests/testData/index/XMLSchema.xsd        | 2468 +++++
 xml/tests/testData/index/spring-beans-2.0.xsd | 1076 +++
 xml/tests/testData/index/spring-tool-2.0.xsd  |   62 +
 .../deprecatedTag/SwitchToHtml5QuickFix.html  |    8 +
 .../deprecatedTag/SwitchToHtml5QuickFix1.html |   10 +
 .../deprecatedTag/actions/after0.html         |   12 +
 .../deprecatedTag/actions/after1.html         |   12 +
 .../deprecatedTag/actions/after2.jspx         |   11 +
 .../deprecatedTag/actions/after3.jsp          |   33 +
 .../deprecatedTag/actions/before0.html        |   12 +
 .../deprecatedTag/actions/before1.html        |   12 +
 .../deprecatedTag/actions/before2.jspx        |   11 +
 .../deprecatedTag/actions/before3.jsp         |    2 +
 .../deprecatedTag/html_deptag5.xhtml          |    4 +
 .../deprecatedTag/html_deptag5.xml            |    9 +
 .../formInputWithoutLabel/actions/after1.html |   13 +
 .../actions/after2.xhtml                      |   15 +
 .../formInputWithoutLabel/actions/after3.jsp  |   11 +
 .../formInputWithoutLabel/actions/after4.jspx |   15 +
 .../formInputWithoutLabel/actions/after5.html |   11 +
 .../actions/after6.xhtml                      |   12 +
 .../formInputWithoutLabel/actions/after7.jsp  |    8 +
 .../actions/before1.html                      |   11 +
 .../actions/before2.xhtml                     |   13 +
 .../formInputWithoutLabel/actions/before3.jsp |    9 +
 .../actions/before4.jspx                      |   13 +
 .../actions/before5.html                      |   11 +
 .../actions/before6.xhtml                     |   13 +
 .../formInputWithoutLabel/actions/before7.jsp |    9 +
 .../formInputWithoutLabel/nowarnings.html     |   31 +
 .../formInputWithoutLabel/nowarnings.xml      |   10 +
 .../inspections/presentationalTag/after0.jspx |   11 +
 .../presentationalTag/before0.jspx            |   11 +
 .../wrongClosingTagName/after0.xhtml          |   10 +
 .../wrongClosingTagName/after1.xhtml          |   10 +
 .../wrongClosingTagName/after2.xhtml          |   10 +
 .../wrongClosingTagName/after3.xml            |    3 +
 .../wrongClosingTagName/before0.xhtml         |   10 +
 .../wrongClosingTagName/before1.xhtml         |   10 +
 .../wrongClosingTagName/before2.xhtml         |   10 +
 .../wrongClosingTagName/before3.xml           |    3 +
 .../testData/intentions/splitTag/after1.html  |   13 +
 .../testData/intentions/splitTag/after3.html  |   13 +
 .../testData/intentions/splitTag/after4.html  |    2 +
 .../testData/intentions/splitTag/before0.html |   13 +
 .../testData/intentions/splitTag/before1.html |   11 +
 .../testData/intentions/splitTag/before2.html |   11 +
 .../testData/intentions/splitTag/before3.html |   11 +
 .../testData/intentions/splitTag/before4.html |    2 +
 xml/tests/testData/mover/1.html               |    9 +
 xml/tests/testData/mover/1_afterDown.html     |    9 +
 xml/tests/testData/mover/1_afterUp.html       |    9 +
 xml/tests/testData/mover/tag.xml              |    5 +
 xml/tests/testData/mover/tag10.xml            |    3 +
 xml/tests/testData/mover/tag11.xml            |    6 +
 xml/tests/testData/mover/tag11_afterDown.xml  |    6 +
 xml/tests/testData/mover/tag11_afterUp.xml    |    6 +
 xml/tests/testData/mover/tag2.xml             |    5 +
 xml/tests/testData/mover/tag2_afterDown.xml   |    5 +
 xml/tests/testData/mover/tag2_afterUp.xml     |    5 +
 xml/tests/testData/mover/tag3.xml             |   10 +
 xml/tests/testData/mover/tag3_afterDown.xml   |   10 +
 xml/tests/testData/mover/tag3_afterUp.xml     |   10 +
 xml/tests/testData/mover/tag4.xml             |    7 +
 xml/tests/testData/mover/tag4_afterUp.xml     |    7 +
 xml/tests/testData/mover/tag5.xml             |   11 +
 xml/tests/testData/mover/tag5_afterUp.xml     |   11 +
 xml/tests/testData/mover/tag6.xml             |   11 +
 xml/tests/testData/mover/tag6_afterDown.xml   |   11 +
 xml/tests/testData/mover/tag6_afterUp.xml     |   11 +
 xml/tests/testData/mover/tag7.xml             |   11 +
 xml/tests/testData/mover/tag7_afterDown.xml   |   11 +
 xml/tests/testData/mover/tag7_afterUp.xml     |   11 +
 xml/tests/testData/mover/tag8.xml             |   16 +
 xml/tests/testData/mover/tag8_afterDown.xml   |   16 +
 xml/tests/testData/mover/tag8_afterUp.xml     |   16 +
 xml/tests/testData/mover/tag9.xml             |   15 +
 xml/tests/testData/mover/tag9_afterDown.xml   |   15 +
 xml/tests/testData/mover/tag9_afterUp.xml     |   15 +
 xml/tests/testData/mover/tag_afterDown.xml    |    5 +
 xml/tests/testData/mover/tag_afterUp.xml      |    5 +
 .../testData/navigateactions/after1.html      |   41 +
 .../testData/navigateactions/after2.xhtml     |   41 +
 xml/tests/testData/navigateactions/after3.jsp |   69 +
 .../testData/navigateactions/after4.jspx      |   69 +
 .../testData/navigateactions/before1.html     |   41 +
 .../testData/navigateactions/before2.xhtml    |   41 +
 .../testData/navigateactions/before3.jsp      |   69 +
 .../testData/navigateactions/before4.jspx     |   69 +
 .../testData/navigateactions/before8.xml      |   41 +
 .../testData/performance/IndentUnindent.xml   | 3361 +++++++
 .../testData/performance/IndentUnindent2.xml  | 2870 ++++++
 xml/tests/testData/psi/events/1.txt           |    1 +
 xml/tests/testData/psi/events/2.txt           |    1 +
 xml/tests/testData/psi/events/3.txt           |    1 +
 xml/tests/testData/psi/events/4.txt           |    1 +
 xml/tests/testData/psi/events/5.txt           |    1 +
 xml/tests/testData/psi/events/BulkUpdate.txt  |    1 +
 .../testData/psi/events/DocumentChange1.txt   |    1 +
 .../testData/psi/events/DocumentChange2.txt   |    1 +
 .../testData/psi/events/DocumentChange3.txt   |    1 +
 xml/tests/testData/psi/events/TagRemove.txt   |    1 +
 .../psi/incrementalReparse41_after.xml        | 1594 ++++
 .../psi/incrementalReparse41_before.xml       | 1594 ++++
 .../psi/incrementalReparse42_after.xml        |   10 +
 .../psi/incrementalReparse42_before.xml       |   10 +
 .../psi/incrementalReparse43_after.xml        |  100 +
 .../psi/incrementalReparse43_before.xml       |   99 +
 .../psi/incrementalReparse46_after.xml        |   14 +
 .../psi/incrementalReparse46_before.xml       |   14 +
 .../psi/incrementalReparse47_after.xml        |   14 +
 .../psi/incrementalReparse47_before.xml       |   14 +
 xml/tests/testData/psi/manyErrors.xml         |  258 +
 xml/tests/testData/psi/pallada.xml            | 2424 +++++
 xml/tests/testData/psi/performance2.xml       | 7931 +++++++++++++++++
 xml/tests/testData/psi/test1.xml              |  145 +
 xml/tests/testData/psi/testAttlist1.txt       |   23 +
 xml/tests/testData/psi/testAttlist2.txt       |   26 +
 xml/tests/testData/psi/testAttlist3.txt       |   21 +
 xml/tests/testData/psi/testAttlist4.txt       |   20 +
 xml/tests/testData/psi/testAttributes1.txt    |   27 +
 xml/tests/testData/psi/testAttributes2.txt    |   30 +
 xml/tests/testData/psi/testAttributes3.txt    |   31 +
 xml/tests/testData/psi/testAttributes4.txt    |   31 +
 xml/tests/testData/psi/testAttributes5.txt    |   37 +
 xml/tests/testData/psi/testCdata1.txt         |   16 +
 xml/tests/testData/psi/testCdata2.txt         |   16 +
 xml/tests/testData/psi/testCharRef1.txt       |   13 +
 xml/tests/testData/psi/testCharRef2.txt       |   13 +
 xml/tests/testData/psi/testCharRef3.txt       |    9 +
 xml/tests/testData/psi/testCharRef4.txt       |    9 +
 xml/tests/testData/psi/testCharRef5.txt       |   17 +
 xml/tests/testData/psi/testCharacters1.txt    |   15 +
 xml/tests/testData/psi/testComment1.txt       |   11 +
 xml/tests/testData/psi/testComment2.txt       |   32 +
 xml/tests/testData/psi/testComment3.txt       |   15 +
 .../testData/psi/testConditionalSection1.txt  |   21 +
 .../testData/psi/testConditionalSection2.txt  |   33 +
 .../testData/psi/testConditionalSection3.txt  |   49 +
 xml/tests/testData/psi/testContent1.txt       |   15 +
 xml/tests/testData/psi/testDoctype1.txt       |   15 +
 xml/tests/testData/psi/testDoctype2.txt       |   17 +
 xml/tests/testData/psi/testDoctype3.txt       |   26 +
 xml/tests/testData/psi/testDoctype4.txt       |   23 +
 xml/tests/testData/psi/testDoctype5.txt       |   37 +
 xml/tests/testData/psi/testDoctype6.txt       |   26 +
 xml/tests/testData/psi/testDoctype7.txt       |   38 +
 xml/tests/testData/psi/testDtd1.txt           |   28 +
 xml/tests/testData/psi/testEditing1.txt       |   16 +
 xml/tests/testData/psi/testEditing2.txt       |   26 +
 xml/tests/testData/psi/testEditing3.txt       |   21 +
 xml/tests/testData/psi/testEditing4.txt       |   26 +
 xml/tests/testData/psi/testEditing5.txt       |   23 +
 xml/tests/testData/psi/testEditing6.txt       |   21 +
 xml/tests/testData/psi/testEditing7.txt       |   23 +
 xml/tests/testData/psi/testEditing8.txt       |   29 +
 xml/tests/testData/psi/testEditing9.txt       |   42 +
 xml/tests/testData/psi/testElementDecl1.txt   |   12 +
 xml/tests/testData/psi/testElementDecl2.txt   |   12 +
 .../testData/psi/testElementDeclaration.txt   |   61 +
 xml/tests/testData/psi/testElements1.txt      |   11 +
 xml/tests/testData/psi/testElements2.txt      |    8 +
 xml/tests/testData/psi/testElements3.txt      |   41 +
 xml/tests/testData/psi/testElements4.txt      |   43 +
 xml/tests/testData/psi/testElements5.txt      |   15 +
 xml/tests/testData/psi/testElements6.txt      |   31 +
 .../testData/psi/testEmptyCommentParsing.txt  |   10 +
 .../testData/psi/testEmptyElementsInDtd.txt   |   69 +
 xml/tests/testData/psi/testEntityDecl1.txt    |   16 +
 xml/tests/testData/psi/testEntityDecl2.txt    |   14 +
 xml/tests/testData/psi/testEntityDecl3.txt    |   16 +
 xml/tests/testData/psi/testEntityDecl4.txt    |   21 +
 .../testData/psi/testEntityDeclaration.txt    |   19 +
 .../testData/psi/testEntityDeclaration2.txt   |   12 +
 .../psi/testEntityInAttlistDeclaration.txt    |   13 +
 xml/tests/testData/psi/testEntityInAttr.txt   |   18 +
 .../testData/psi/testEntityInContent.txt      |   17 +
 xml/tests/testData/psi/testEntityRef1.txt     |   13 +
 xml/tests/testData/psi/testEntityRef3.txt     |   30 +
 xml/tests/testData/psi/testEntityRef4.txt     |   19 +
 xml/tests/testData/psi/testEntityRef5.txt     |   23 +
 xml/tests/testData/psi/testEntityRef6.txt     |    6 +
 xml/tests/testData/psi/testEntityRef7.txt     |   31 +
 xml/tests/testData/psi/testGtInTagContent.txt |   13 +
 .../psi/testManualEmptyAttributeParsing.txt   |   26 +
 xml/tests/testData/psi/testManyErrors.txt     | 3709 ++++++++
 xml/tests/testData/psi/testMultyRoots.txt     |   21 +
 .../psi/testMultyRootsWithErrorsBetween.txt   |   25 +
 xml/tests/testData/psi/testNewParsing1.txt    |   11 +
 xml/tests/testData/psi/testNewParsing10.txt   |   29 +
 xml/tests/testData/psi/testNewParsing11.txt   |   36 +
 xml/tests/testData/psi/testNewParsing12.txt   |   26 +
 xml/tests/testData/psi/testNewParsing13.txt   |   34 +
 xml/tests/testData/psi/testNewParsing14.txt   |   27 +
 xml/tests/testData/psi/testNewParsing15.txt   |   47 +
 xml/tests/testData/psi/testNewParsing16.txt   |   24 +
 xml/tests/testData/psi/testNewParsing17.txt   |  334 +
 xml/tests/testData/psi/testNewParsing18.txt   | 1372 +++
 xml/tests/testData/psi/testNewParsing19.txt   |   65 +
 xml/tests/testData/psi/testNewParsing2.txt    |   13 +
 xml/tests/testData/psi/testNewParsing20.txt   |   26 +
 xml/tests/testData/psi/testNewParsing3.txt    |   14 +
 xml/tests/testData/psi/testNewParsing4.txt    |   21 +
 xml/tests/testData/psi/testNewParsing5.txt    |   19 +
 xml/tests/testData/psi/testNewParsing6.txt    |   40 +
 xml/tests/testData/psi/testNewParsing7.txt    |   37 +
 xml/tests/testData/psi/testNewParsing8.txt    |   16 +
 xml/tests/testData/psi/testNewParsing9.txt    |   19 +
 xml/tests/testData/psi/testNotation1.txt      |   16 +
 xml/tests/testData/psi/testNotation2.txt      |   27 +
 .../psi/testProcessingInstruction1.txt        |   12 +
 .../psi/testProcessingInstruction2.txt        |   17 +
 .../psi/testProcessingInstruction3.txt        |   49 +
 xml/tests/testData/psi/testPrologInDtd.txt    |   40 +
 xml/tests/testData/psi/testSGMLDtd.txt        |  100 +
 xml/tests/testData/psi/testUnbalanced1.txt    |   17 +
 xml/tests/testData/psi/testUnbalanced2.txt    |   23 +
 xml/tests/testData/psi/testUnbalanced3.txt    |   18 +
 xml/tests/testData/psi/testUnbalanced4.txt    |   22 +
 xml/tests/testData/psi/testUnclosedTag.txt    |   12 +
 xml/tests/testData/psi/testUnclosedTag2.txt   |    9 +
 xml/tests/testData/psi/testUnopenedTag1.txt   |   11 +
 xml/tests/testData/psi/testXmlDecl.txt        |   25 +
 xml/tests/testData/psi/testXmlDecl2.txt       |   30 +
 xml/tests/testData/psi/testXmlDecl3.txt       |   33 +
 xml/tests/testData/psi/testXmlDeclDtd.txt     |   52 +
 xml/tests/testData/psi/xi/include1.xml        |    9 +
 xml/tests/testData/psi/xi/testBasicXi.xml     |    5 +
 xml/tests/testData/psi/xi/testXpointerXi1.xml |    5 +
 xml/tests/testData/schemaPrefix/rename.xml    |   17 +
 xml/tests/testData/schemaPrefix/rename1.xml   |   17 +
 .../testData/schemaPrefix/rename1_after.xml   |   17 +
 xml/tests/testData/schemaPrefix/rename2.xml   |   17 +
 .../testData/schemaPrefix/rename2_after.xml   |   17 +
 .../schemaPrefix/renameFromClosingTag.xml     |   17 +
 .../renameFromClosingTag_after.xml            |   17 +
 .../testData/schemaPrefix/rename_after.xml    |   17 +
 xml/tests/testData/schemaPrefix/usages.xml    |   18 +
 xml/tests/testData/schemaPrefix/usages1.xml   |   18 +
 .../testData/smartCompletion/Servlet.xml      |   10 +
 xml/tests/testData/smartCompletion/test.xsd   |   13 +
 .../smartCompletion/testCompletion.xml        |    3 +
 .../smartCompletion/testCompletion3.xml       |    5 +
 .../smartCompletion/testCompletionNext.xml    |    4 +
 .../testData/smartCompletion/web-app_2_3.dtd  | 1063 +++
 .../testData/smartEnter/IDEADEV_29628.xml     |    1 +
 .../smartEnter/IDEADEV_29628_after.xml        |    1 +
 .../testData/smartEnter/IDEADEV_32164.jsp     |    1 +
 .../testData/smartEnter/IDEADEV_32164_2.jsp   |    5 +
 .../smartEnter/IDEADEV_32164_2_after.jsp      |    5 +
 .../smartEnter/IDEADEV_32164_after.jsp        |    1 +
 .../testData/smartEnter/OpenAttribute.xml     |    1 +
 .../smartEnter/OpenAttribute_after.xml        |    1 +
 .../testData/smartEnter/SmartFinish1.xml      |    4 +
 .../smartEnter/SmartFinish1_after.xml         |    4 +
 .../testData/smartEnter/SmartFinish2.xml      |    4 +
 .../smartEnter/SmartFinish2_after.xml         |    6 +
 .../testData/smartEnter/SmartFinish3.xml      |    4 +
 .../smartEnter/SmartFinish3_after.xml         |    6 +
 xml/tests/testData/smartEnter/Tag.jsp         |    3 +
 xml/tests/testData/smartEnter/Tag.xml         |    1 +
 xml/tests/testData/smartEnter/Tag_after.jsp   |    3 +
 xml/tests/testData/smartEnter/Tag_after.xml   |    1 +
 .../testData/smartEnter/WrongAttribute.xml    |    1 +
 .../smartEnter/WrongAttribute_after.xml       |    1 +
 xml/tests/testData/unusedNs/moved.xml         |    4 +
 xml/tests/testData/unusedNs/trg/move-def.xsd  |    9 +
 xml/tests/testData/unusedNs/web-app_2_5.xsd   | 1290 +++
 xml/tests/testData/unusedNs/wsdd.dtd          |   53 +
 .../testData/unusedNs/wsdd_provider_java.xsd  |    1 +
 xml/tests/xml-tests.iml                       |   23 +
 367 files changed, 49992 insertions(+), 25 deletions(-)
 create mode 100644 xml/tests/src/com/intellij/codeInsight/SearchingInXmlTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlBuilderTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlDtdTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlEventsTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlInsightTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlParsingTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlPerformanceTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlReparseTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlSchemaTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlTagTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlTagWriteTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlTestUtil.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlTextTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlWrongClosingTagNameInspectionTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/XmlXIncludeTest.groovy
 create mode 100644 xml/tests/src/com/intellij/codeInsight/completion/XmlSmartEnterTest.java
 create mode 100644 xml/tests/src/com/intellij/codeInsight/editorActions/moveUpDown/XmlMoverTest.java
 create mode 100644 xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestBase.java
 create mode 100644 xml/tests/src/com/intellij/psi/formatter/XmlFormatterTestCase.java
 create mode 100644 xml/tests/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjectionTest.java
 create mode 100644 xml/tests/src/com/intellij/xml/XmlConstraintsTest.java
 create mode 100644 xml/tests/src/com/intellij/xml/XmlNamespacesTest.java
 create mode 100644 xml/tests/src/com/intellij/xml/XmlSchemaPrefixTest.java
 create mode 100644 xml/tests/src/com/intellij/xml/XmlSmartCompletionTest.java
 create mode 100644 xml/tests/src/com/intellij/xml/actions/GenerateXmlTagTest.java
 create mode 100644 xml/tests/src/com/intellij/xml/actions/SplitTagActionTest.java
 create mode 100644 xml/tests/src/com/intellij/xml/index/XmlSchemaIndexTest.java
 create mode 100644 xml/tests/testData/commentInjection/broken_syntax.html
 create mode 100644 xml/tests/testData/commentInjection/broken_syntax.xhtml
 create mode 100644 xml/tests/testData/commentInjection/broken_syntax2.html
 create mode 100644 xml/tests/testData/commentInjection/broken_syntax2.xhtml
 create mode 100644 xml/tests/testData/commentInjection/complete.html
 create mode 100644 xml/tests/testData/commentInjection/complete.xhtml
 create mode 100644 xml/tests/testData/commentInjection/complete_after.html
 create mode 100644 xml/tests/testData/commentInjection/complete_after.xhtml
 create mode 100644 xml/tests/testData/commentInjection/injected1.html
 create mode 100644 xml/tests/testData/commentInjection/injected1.xhtml
 create mode 100644 xml/tests/testData/commentInjection/injected2.html
 create mode 100644 xml/tests/testData/commentInjectionFormatting/formatting1.html
 create mode 100644 xml/tests/testData/commentInjectionFormatting/formatting1_after.html
 create mode 100644 xml/tests/testData/commentInjectionFormatting/formatting2.html
 create mode 100644 xml/tests/testData/commentInjectionFormatting/formatting2_after.html
 create mode 100644 xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1.xhtml
 create mode 100644 xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1_after.xhtml
 create mode 100644 xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2.xhtml
 create mode 100644 xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2_after.xhtml
 create mode 100644 xml/tests/testData/constraints/test.xml
 create mode 100644 xml/tests/testData/constraints/test.xsd
 create mode 100644 xml/tests/testData/constraints/testCompletion.xml
 create mode 100644 xml/tests/testData/constraints/testDtd.xml
 create mode 100644 xml/tests/testData/constraints/testIncomplete.xml
 create mode 100644 xml/tests/testData/generateTag/generate.xml
 create mode 100644 xml/tests/testData/generateTag/generateDTD.xml
 create mode 100644 xml/tests/testData/generateTag/generateDTDComplex.xml
 create mode 100644 xml/tests/testData/generateTag/generateDTDComplex_after.xml
 create mode 100644 xml/tests/testData/generateTag/generateDTD_after.xml
 create mode 100644 xml/tests/testData/generateTag/generateEmpty.xml
 create mode 100644 xml/tests/testData/generateTag/generateEmpty_after.xml
 create mode 100644 xml/tests/testData/generateTag/generate_after.xml
 create mode 100644 xml/tests/testData/generateTag/initParam.xml
 create mode 100644 xml/tests/testData/generateTag/initParam_after.xml
 create mode 100644 xml/tests/testData/generateTag/javaee_5.xsd
 create mode 100644 xml/tests/testData/generateTag/spring-beans_3.0.xsd
 create mode 100644 xml/tests/testData/generateTag/spring.xml
 create mode 100644 xml/tests/testData/generateTag/springAfterBean.xml
 create mode 100644 xml/tests/testData/generateTag/springAfterBean_after.xml
 create mode 100644 xml/tests/testData/generateTag/springAlias.xml
 create mode 100644 xml/tests/testData/generateTag/springAlias_after.xml
 create mode 100644 xml/tests/testData/generateTag/springAtCaret.xml
 create mode 100644 xml/tests/testData/generateTag/springAtCaret_after.xml
 create mode 100644 xml/tests/testData/generateTag/spring_after.xml
 create mode 100644 xml/tests/testData/generateTag/web-app_2_3.dtd
 create mode 100644 xml/tests/testData/generateTag/web-app_2_5.xsd
 create mode 100644 xml/tests/testData/generateactions/addColumn/after1.html
 create mode 100644 xml/tests/testData/generateactions/addColumn/after2.xhtml
 create mode 100644 xml/tests/testData/generateactions/addColumn/after3.jsp
 create mode 100644 xml/tests/testData/generateactions/addColumn/after4.jspx
 create mode 100644 xml/tests/testData/generateactions/addColumn/after5.html
 create mode 100644 xml/tests/testData/generateactions/addColumn/after6.html
 create mode 100644 xml/tests/testData/generateactions/addColumn/after7.html
 create mode 100644 xml/tests/testData/generateactions/addColumn/after8.xml
 create mode 100644 xml/tests/testData/generateactions/addColumn/before1.html
 create mode 100644 xml/tests/testData/generateactions/addColumn/before2.xhtml
 create mode 100644 xml/tests/testData/generateactions/addColumn/before3.jsp
 create mode 100644 xml/tests/testData/generateactions/addColumn/before4.jspx
 create mode 100644 xml/tests/testData/generateactions/addColumn/before5.html
 create mode 100644 xml/tests/testData/generateactions/addColumn/before6.html
 create mode 100644 xml/tests/testData/generateactions/addColumn/before7.html
 create mode 100644 xml/tests/testData/generateactions/addColumn/before8.xml
 create mode 100644 xml/tests/testData/index/XMLSchema.xsd
 create mode 100644 xml/tests/testData/index/spring-beans-2.0.xsd
 create mode 100644 xml/tests/testData/index/spring-tool-2.0.xsd
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix.html
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix1.html
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/after0.html
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/after1.html
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/after2.jspx
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/after3.jsp
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/before0.html
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/before1.html
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/before2.jspx
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/before3.jsp
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/html_deptag5.xhtml
 create mode 100644 xml/tests/testData/inspections/deprecatedTag/html_deptag5.xml
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after1.html
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after2.xhtml
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after3.jsp
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after4.jspx
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after5.html
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after6.xhtml
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after7.jsp
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before1.html
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before2.xhtml
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before3.jsp
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before4.jspx
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before5.html
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before6.xhtml
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before7.jsp
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.html
 create mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.xml
 create mode 100644 xml/tests/testData/inspections/presentationalTag/after0.jspx
 create mode 100644 xml/tests/testData/inspections/presentationalTag/before0.jspx
 create mode 100644 xml/tests/testData/inspections/wrongClosingTagName/after0.xhtml
 create mode 100644 xml/tests/testData/inspections/wrongClosingTagName/after1.xhtml
 create mode 100644 xml/tests/testData/inspections/wrongClosingTagName/after2.xhtml
 create mode 100644 xml/tests/testData/inspections/wrongClosingTagName/after3.xml
 create mode 100644 xml/tests/testData/inspections/wrongClosingTagName/before0.xhtml
 create mode 100644 xml/tests/testData/inspections/wrongClosingTagName/before1.xhtml
 create mode 100644 xml/tests/testData/inspections/wrongClosingTagName/before2.xhtml
 create mode 100644 xml/tests/testData/inspections/wrongClosingTagName/before3.xml
 create mode 100644 xml/tests/testData/intentions/splitTag/after1.html
 create mode 100644 xml/tests/testData/intentions/splitTag/after3.html
 create mode 100644 xml/tests/testData/intentions/splitTag/after4.html
 create mode 100644 xml/tests/testData/intentions/splitTag/before0.html
 create mode 100644 xml/tests/testData/intentions/splitTag/before1.html
 create mode 100644 xml/tests/testData/intentions/splitTag/before2.html
 create mode 100644 xml/tests/testData/intentions/splitTag/before3.html
 create mode 100644 xml/tests/testData/intentions/splitTag/before4.html
 create mode 100644 xml/tests/testData/mover/1.html
 create mode 100644 xml/tests/testData/mover/1_afterDown.html
 create mode 100644 xml/tests/testData/mover/1_afterUp.html
 create mode 100644 xml/tests/testData/mover/tag.xml
 create mode 100644 xml/tests/testData/mover/tag10.xml
 create mode 100644 xml/tests/testData/mover/tag11.xml
 create mode 100644 xml/tests/testData/mover/tag11_afterDown.xml
 create mode 100644 xml/tests/testData/mover/tag11_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag2.xml
 create mode 100644 xml/tests/testData/mover/tag2_afterDown.xml
 create mode 100644 xml/tests/testData/mover/tag2_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag3.xml
 create mode 100644 xml/tests/testData/mover/tag3_afterDown.xml
 create mode 100644 xml/tests/testData/mover/tag3_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag4.xml
 create mode 100644 xml/tests/testData/mover/tag4_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag5.xml
 create mode 100644 xml/tests/testData/mover/tag5_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag6.xml
 create mode 100644 xml/tests/testData/mover/tag6_afterDown.xml
 create mode 100644 xml/tests/testData/mover/tag6_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag7.xml
 create mode 100644 xml/tests/testData/mover/tag7_afterDown.xml
 create mode 100644 xml/tests/testData/mover/tag7_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag8.xml
 create mode 100644 xml/tests/testData/mover/tag8_afterDown.xml
 create mode 100644 xml/tests/testData/mover/tag8_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag9.xml
 create mode 100644 xml/tests/testData/mover/tag9_afterDown.xml
 create mode 100644 xml/tests/testData/mover/tag9_afterUp.xml
 create mode 100644 xml/tests/testData/mover/tag_afterDown.xml
 create mode 100644 xml/tests/testData/mover/tag_afterUp.xml
 create mode 100644 xml/tests/testData/navigateactions/after1.html
 create mode 100644 xml/tests/testData/navigateactions/after2.xhtml
 create mode 100644 xml/tests/testData/navigateactions/after3.jsp
 create mode 100644 xml/tests/testData/navigateactions/after4.jspx
 create mode 100644 xml/tests/testData/navigateactions/before1.html
 create mode 100644 xml/tests/testData/navigateactions/before2.xhtml
 create mode 100644 xml/tests/testData/navigateactions/before3.jsp
 create mode 100644 xml/tests/testData/navigateactions/before4.jspx
 create mode 100644 xml/tests/testData/navigateactions/before8.xml
 create mode 100644 xml/tests/testData/performance/IndentUnindent.xml
 create mode 100644 xml/tests/testData/performance/IndentUnindent2.xml
 create mode 100644 xml/tests/testData/psi/events/1.txt
 create mode 100644 xml/tests/testData/psi/events/2.txt
 create mode 100644 xml/tests/testData/psi/events/3.txt
 create mode 100644 xml/tests/testData/psi/events/4.txt
 create mode 100644 xml/tests/testData/psi/events/5.txt
 create mode 100644 xml/tests/testData/psi/events/BulkUpdate.txt
 create mode 100644 xml/tests/testData/psi/events/DocumentChange1.txt
 create mode 100644 xml/tests/testData/psi/events/DocumentChange2.txt
 create mode 100644 xml/tests/testData/psi/events/DocumentChange3.txt
 create mode 100644 xml/tests/testData/psi/events/TagRemove.txt
 create mode 100644 xml/tests/testData/psi/incrementalReparse41_after.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse41_before.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse42_after.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse42_before.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse43_after.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse43_before.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse46_after.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse46_before.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse47_after.xml
 create mode 100644 xml/tests/testData/psi/incrementalReparse47_before.xml
 create mode 100644 xml/tests/testData/psi/manyErrors.xml
 create mode 100644 xml/tests/testData/psi/pallada.xml
 create mode 100644 xml/tests/testData/psi/performance2.xml
 create mode 100644 xml/tests/testData/psi/test1.xml
 create mode 100644 xml/tests/testData/psi/testAttlist1.txt
 create mode 100644 xml/tests/testData/psi/testAttlist2.txt
 create mode 100644 xml/tests/testData/psi/testAttlist3.txt
 create mode 100644 xml/tests/testData/psi/testAttlist4.txt
 create mode 100644 xml/tests/testData/psi/testAttributes1.txt
 create mode 100644 xml/tests/testData/psi/testAttributes2.txt
 create mode 100644 xml/tests/testData/psi/testAttributes3.txt
 create mode 100644 xml/tests/testData/psi/testAttributes4.txt
 create mode 100644 xml/tests/testData/psi/testAttributes5.txt
 create mode 100644 xml/tests/testData/psi/testCdata1.txt
 create mode 100644 xml/tests/testData/psi/testCdata2.txt
 create mode 100644 xml/tests/testData/psi/testCharRef1.txt
 create mode 100644 xml/tests/testData/psi/testCharRef2.txt
 create mode 100644 xml/tests/testData/psi/testCharRef3.txt
 create mode 100644 xml/tests/testData/psi/testCharRef4.txt
 create mode 100644 xml/tests/testData/psi/testCharRef5.txt
 create mode 100644 xml/tests/testData/psi/testCharacters1.txt
 create mode 100644 xml/tests/testData/psi/testComment1.txt
 create mode 100644 xml/tests/testData/psi/testComment2.txt
 create mode 100644 xml/tests/testData/psi/testComment3.txt
 create mode 100644 xml/tests/testData/psi/testConditionalSection1.txt
 create mode 100644 xml/tests/testData/psi/testConditionalSection2.txt
 create mode 100644 xml/tests/testData/psi/testConditionalSection3.txt
 create mode 100644 xml/tests/testData/psi/testContent1.txt
 create mode 100644 xml/tests/testData/psi/testDoctype1.txt
 create mode 100644 xml/tests/testData/psi/testDoctype2.txt
 create mode 100644 xml/tests/testData/psi/testDoctype3.txt
 create mode 100644 xml/tests/testData/psi/testDoctype4.txt
 create mode 100644 xml/tests/testData/psi/testDoctype5.txt
 create mode 100644 xml/tests/testData/psi/testDoctype6.txt
 create mode 100644 xml/tests/testData/psi/testDoctype7.txt
 create mode 100644 xml/tests/testData/psi/testDtd1.txt
 create mode 100644 xml/tests/testData/psi/testEditing1.txt
 create mode 100644 xml/tests/testData/psi/testEditing2.txt
 create mode 100644 xml/tests/testData/psi/testEditing3.txt
 create mode 100644 xml/tests/testData/psi/testEditing4.txt
 create mode 100644 xml/tests/testData/psi/testEditing5.txt
 create mode 100644 xml/tests/testData/psi/testEditing6.txt
 create mode 100644 xml/tests/testData/psi/testEditing7.txt
 create mode 100644 xml/tests/testData/psi/testEditing8.txt
 create mode 100644 xml/tests/testData/psi/testEditing9.txt
 create mode 100644 xml/tests/testData/psi/testElementDecl1.txt
 create mode 100644 xml/tests/testData/psi/testElementDecl2.txt
 create mode 100644 xml/tests/testData/psi/testElementDeclaration.txt
 create mode 100644 xml/tests/testData/psi/testElements1.txt
 create mode 100644 xml/tests/testData/psi/testElements2.txt
 create mode 100644 xml/tests/testData/psi/testElements3.txt
 create mode 100644 xml/tests/testData/psi/testElements4.txt
 create mode 100644 xml/tests/testData/psi/testElements5.txt
 create mode 100644 xml/tests/testData/psi/testElements6.txt
 create mode 100644 xml/tests/testData/psi/testEmptyCommentParsing.txt
 create mode 100644 xml/tests/testData/psi/testEmptyElementsInDtd.txt
 create mode 100644 xml/tests/testData/psi/testEntityDecl1.txt
 create mode 100644 xml/tests/testData/psi/testEntityDecl2.txt
 create mode 100644 xml/tests/testData/psi/testEntityDecl3.txt
 create mode 100644 xml/tests/testData/psi/testEntityDecl4.txt
 create mode 100644 xml/tests/testData/psi/testEntityDeclaration.txt
 create mode 100644 xml/tests/testData/psi/testEntityDeclaration2.txt
 create mode 100644 xml/tests/testData/psi/testEntityInAttlistDeclaration.txt
 create mode 100644 xml/tests/testData/psi/testEntityInAttr.txt
 create mode 100644 xml/tests/testData/psi/testEntityInContent.txt
 create mode 100644 xml/tests/testData/psi/testEntityRef1.txt
 create mode 100644 xml/tests/testData/psi/testEntityRef3.txt
 create mode 100644 xml/tests/testData/psi/testEntityRef4.txt
 create mode 100644 xml/tests/testData/psi/testEntityRef5.txt
 create mode 100644 xml/tests/testData/psi/testEntityRef6.txt
 create mode 100644 xml/tests/testData/psi/testEntityRef7.txt
 create mode 100644 xml/tests/testData/psi/testGtInTagContent.txt
 create mode 100644 xml/tests/testData/psi/testManualEmptyAttributeParsing.txt
 create mode 100644 xml/tests/testData/psi/testManyErrors.txt
 create mode 100644 xml/tests/testData/psi/testMultyRoots.txt
 create mode 100644 xml/tests/testData/psi/testMultyRootsWithErrorsBetween.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing1.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing10.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing11.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing12.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing13.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing14.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing15.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing16.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing17.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing18.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing19.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing2.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing20.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing3.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing4.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing5.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing6.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing7.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing8.txt
 create mode 100644 xml/tests/testData/psi/testNewParsing9.txt
 create mode 100644 xml/tests/testData/psi/testNotation1.txt
 create mode 100644 xml/tests/testData/psi/testNotation2.txt
 create mode 100644 xml/tests/testData/psi/testProcessingInstruction1.txt
 create mode 100644 xml/tests/testData/psi/testProcessingInstruction2.txt
 create mode 100644 xml/tests/testData/psi/testProcessingInstruction3.txt
 create mode 100644 xml/tests/testData/psi/testPrologInDtd.txt
 create mode 100644 xml/tests/testData/psi/testSGMLDtd.txt
 create mode 100644 xml/tests/testData/psi/testUnbalanced1.txt
 create mode 100644 xml/tests/testData/psi/testUnbalanced2.txt
 create mode 100644 xml/tests/testData/psi/testUnbalanced3.txt
 create mode 100644 xml/tests/testData/psi/testUnbalanced4.txt
 create mode 100644 xml/tests/testData/psi/testUnclosedTag.txt
 create mode 100644 xml/tests/testData/psi/testUnclosedTag2.txt
 create mode 100644 xml/tests/testData/psi/testUnopenedTag1.txt
 create mode 100644 xml/tests/testData/psi/testXmlDecl.txt
 create mode 100644 xml/tests/testData/psi/testXmlDecl2.txt
 create mode 100644 xml/tests/testData/psi/testXmlDecl3.txt
 create mode 100644 xml/tests/testData/psi/testXmlDeclDtd.txt
 create mode 100644 xml/tests/testData/psi/xi/include1.xml
 create mode 100644 xml/tests/testData/psi/xi/testBasicXi.xml
 create mode 100644 xml/tests/testData/psi/xi/testXpointerXi1.xml
 create mode 100644 xml/tests/testData/schemaPrefix/rename.xml
 create mode 100644 xml/tests/testData/schemaPrefix/rename1.xml
 create mode 100644 xml/tests/testData/schemaPrefix/rename1_after.xml
 create mode 100644 xml/tests/testData/schemaPrefix/rename2.xml
 create mode 100644 xml/tests/testData/schemaPrefix/rename2_after.xml
 create mode 100644 xml/tests/testData/schemaPrefix/renameFromClosingTag.xml
 create mode 100644 xml/tests/testData/schemaPrefix/renameFromClosingTag_after.xml
 create mode 100644 xml/tests/testData/schemaPrefix/rename_after.xml
 create mode 100644 xml/tests/testData/schemaPrefix/usages.xml
 create mode 100644 xml/tests/testData/schemaPrefix/usages1.xml
 create mode 100644 xml/tests/testData/smartCompletion/Servlet.xml
 create mode 100644 xml/tests/testData/smartCompletion/test.xsd
 create mode 100644 xml/tests/testData/smartCompletion/testCompletion.xml
 create mode 100644 xml/tests/testData/smartCompletion/testCompletion3.xml
 create mode 100644 xml/tests/testData/smartCompletion/testCompletionNext.xml
 create mode 100644 xml/tests/testData/smartCompletion/web-app_2_3.dtd
 create mode 100644 xml/tests/testData/smartEnter/IDEADEV_29628.xml
 create mode 100644 xml/tests/testData/smartEnter/IDEADEV_29628_after.xml
 create mode 100644 xml/tests/testData/smartEnter/IDEADEV_32164.jsp
 create mode 100644 xml/tests/testData/smartEnter/IDEADEV_32164_2.jsp
 create mode 100644 xml/tests/testData/smartEnter/IDEADEV_32164_2_after.jsp
 create mode 100644 xml/tests/testData/smartEnter/IDEADEV_32164_after.jsp
 create mode 100644 xml/tests/testData/smartEnter/OpenAttribute.xml
 create mode 100644 xml/tests/testData/smartEnter/OpenAttribute_after.xml
 create mode 100644 xml/tests/testData/smartEnter/SmartFinish1.xml
 create mode 100644 xml/tests/testData/smartEnter/SmartFinish1_after.xml
 create mode 100644 xml/tests/testData/smartEnter/SmartFinish2.xml
 create mode 100644 xml/tests/testData/smartEnter/SmartFinish2_after.xml
 create mode 100644 xml/tests/testData/smartEnter/SmartFinish3.xml
 create mode 100644 xml/tests/testData/smartEnter/SmartFinish3_after.xml
 create mode 100644 xml/tests/testData/smartEnter/Tag.jsp
 create mode 100644 xml/tests/testData/smartEnter/Tag.xml
 create mode 100644 xml/tests/testData/smartEnter/Tag_after.jsp
 create mode 100644 xml/tests/testData/smartEnter/Tag_after.xml
 create mode 100644 xml/tests/testData/smartEnter/WrongAttribute.xml
 create mode 100644 xml/tests/testData/smartEnter/WrongAttribute_after.xml
 create mode 100644 xml/tests/testData/unusedNs/moved.xml
 create mode 100644 xml/tests/testData/unusedNs/trg/move-def.xsd
 create mode 100644 xml/tests/testData/unusedNs/web-app_2_5.xsd
 create mode 100644 xml/tests/testData/unusedNs/wsdd.dtd
 create mode 100644 xml/tests/testData/unusedNs/wsdd_provider_java.xsd
 create mode 100644 xml/tests/xml-tests.iml

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>
+

From 573418645b973d9fc89f0e8b51d4660d14f9980e Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Fri, 1 Jun 2012 16:11:48 +0400
Subject: [PATCH 077/239] Inspections

---
 .../designer/designSurface/DesignerEditorPanel.java       | 8 ++++++++
 .../designer/designSurface/tools/SelectionTool.java       | 1 +
 .../designer/designSurface/tools/ToolProvider.java        | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
index 6f9520fbb573..93b235c2f877 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
@@ -227,6 +227,9 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
         if (getActiveTool() instanceof CreationTool && !(tool instanceof CreationTool)) {
           PaletteManager.getInstance(getProject()).clearActiveItem();
         }
+        if (!(tool instanceof SelectionTool)) {
+          hideInspections();
+        }
         super.setActiveTool(tool);
       }
 
@@ -255,6 +258,11 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
         myInplaceEditingLayer.startEditing(inplaceContext);
       }
 
+      @Override
+      public void hideInspections() {
+        myQuickFixManager.hideHint();
+      }
+
       @Override
       public void showError(@NonNls String message, Throwable e) {
         DesignerEditorPanel.this.showError(message, e);
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java
index 077c881ebca9..07b4583f667f 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/SelectionTool.java
@@ -116,6 +116,7 @@ public class SelectionTool extends InputTool {
       refreshCursor();
 
       if (myTracker != null) {
+        myToolProvider.hideInspections();
         myTracker.setToolProvider(myToolProvider);
         myTracker.setArea(myArea);
         myTracker.activate();
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java
index a1827e4f8a74..c145c59a8c07 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/tools/ToolProvider.java
@@ -136,4 +136,6 @@ public abstract class ToolProvider {
   public abstract void execute(List<EditOperation> operations, String command);
 
   public abstract void startInplaceEditing(@Nullable InplaceContext inplaceContext);
+
+  public abstract void hideInspections();
 }
\ No newline at end of file

From ea8dbf564440588ef57b66ef241ef40db1eba056 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 1 Jun 2012 16:42:54 +0400
Subject: [PATCH 078/239] save project after it was opened (otherwise directory
 index could not be initialized)

---
 java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
index 31c8b4da9b64..d4f8324e454b 100644
--- a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
+++ b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java
@@ -142,7 +142,6 @@ public class NewProjectUtil {
 
       if (projectBuilder != null) {
         projectBuilder.commit(newProject, null, ModulesProvider.EMPTY_MODULES_PROVIDER);
-        newProject.save();
       }
 
       final boolean need2OpenProjectStructure = projectBuilder == null || projectBuilder.isOpenProjectSettingsAfter();
@@ -185,6 +184,7 @@ public class NewProjectUtil {
         
         projectManager.openProject(newProject);
       }
+      newProject.save();
     }
     finally {
       if (projectBuilder != null) {

From 8cf79cb570772d55b71fd9e1ff53d223e0177545 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 1 Jun 2012 13:04:20 +0400
Subject: [PATCH 079/239] notnull

---
 .../src/com/intellij/psi/PsiClassType.java    |  2 +-
 .../impl/source/PsiImmediateClassType.java    | 53 ++++++++++---------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/PsiClassType.java b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java
index 7c80c1112479..649f355502ca 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiClassType.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java
@@ -44,7 +44,7 @@ public abstract class PsiClassType extends PsiType {
   protected PsiClassType(LanguageLevel languageLevel) {
     this(languageLevel, PsiAnnotation.EMPTY_ARRAY);
   }
-  protected PsiClassType(LanguageLevel languageLevel, PsiAnnotation[] annotations) {
+  protected PsiClassType(LanguageLevel languageLevel, @NotNull PsiAnnotation[] annotations) {
     super(annotations);
     myLanguageLevel = languageLevel;
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java
index 0df5a110b042..f2436d2270ee 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImmediateClassType.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.psi.impl.source;
 
-import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -30,7 +29,6 @@ import java.util.List;
  *  @author dsl
  */
 public class PsiImmediateClassType extends PsiClassType {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.PsiImmediateClassType");
   private final PsiClass myClass;
   private final PsiSubstitutor mySubstitutor;
   private final PsiManager myManager;
@@ -75,20 +73,19 @@ public class PsiImmediateClassType extends PsiClassType {
     }
   };
 
-  public PsiImmediateClassType(PsiClass aClass, PsiSubstitutor substitutor) {
+  public PsiImmediateClassType(@NotNull PsiClass aClass, @NotNull PsiSubstitutor substitutor) {
     this (aClass, substitutor, null);
   }
 
-  public PsiImmediateClassType(final PsiClass aClass, final PsiSubstitutor substitutor, final LanguageLevel languageLevel) {
+  public PsiImmediateClassType(@NotNull PsiClass aClass, @NotNull PsiSubstitutor substitutor, final LanguageLevel languageLevel) {
     this(aClass, substitutor,languageLevel, PsiAnnotation.EMPTY_ARRAY);
   }
 
-  public PsiImmediateClassType(PsiClass aClass, PsiSubstitutor substitutor, LanguageLevel languageLevel, PsiAnnotation[] annotations) {
+  public PsiImmediateClassType(@NotNull PsiClass aClass, @NotNull PsiSubstitutor substitutor, LanguageLevel languageLevel, @NotNull PsiAnnotation[] annotations) {
     super(languageLevel,annotations);
     myClass = aClass;
     myManager = aClass.getManager();
     mySubstitutor = substitutor;
-    LOG.assertTrue(mySubstitutor != null);
   }
 
   @Override
@@ -134,7 +131,7 @@ public class PsiImmediateClassType extends PsiClassType {
   public String getPresentableText() {
     if (myPresentableText == null) {
       final StringBuilder buffer = new StringBuilder();
-      buildText(myClass, buffer, false, false);
+      buildText(myClass, mySubstitutor, buffer, false, false);
       myPresentableText = buffer.toString();
     }
     return myPresentableText;
@@ -144,7 +141,7 @@ public class PsiImmediateClassType extends PsiClassType {
   public String getCanonicalText() {
     if (myCanonicalText == null) {
       final StringBuilder buffer = new StringBuilder();
-      buildText(myClass, buffer, true, false);
+      buildText(myClass, mySubstitutor, buffer, true, false);
       myCanonicalText = buffer.toString();
     }
     return myCanonicalText;
@@ -154,30 +151,36 @@ public class PsiImmediateClassType extends PsiClassType {
   public String getInternalCanonicalText() {
     if (myInternalCanonicalText == null) {
       final StringBuilder buffer = new StringBuilder();
-      buildText(myClass, buffer, true, true);
+      buildText(myClass, mySubstitutor, buffer, true, true);
       myInternalCanonicalText = buffer.toString();
     }
     return myInternalCanonicalText;
   }
 
-  private void buildText(PsiClass aClass, StringBuilder buffer, boolean canonical, boolean internal) {
-    PsiSubstitutor substitutor = mySubstitutor;
+  private void buildText(@NotNull PsiClass aClass,
+                         @NotNull PsiSubstitutor substitutor,
+                         @NotNull StringBuilder buffer,
+                         boolean canonical,
+                         boolean internal) {
     if (aClass instanceof PsiAnonymousClass) {
       ClassResolveResult baseResolveResult = ((PsiAnonymousClass) aClass).getBaseClassType().resolveGenerics();
-      aClass = baseResolveResult.getElement();
-      substitutor = baseResolveResult.getSubstitutor();
-      if (aClass == null) return;
+      PsiClass baseClass = baseResolveResult.getElement();
+      PsiSubstitutor baseSub = baseResolveResult.getSubstitutor();
+      if (baseClass != null) {
+        buildText(baseClass, baseSub, buffer, canonical, internal);
+      }
+      return;
     }
-    PsiClass parentClass = null;
+    PsiClass enclosingClass = null;
     if (!aClass.hasModifierProperty(PsiModifier.STATIC)) {
       final PsiElement parent = aClass.getParent();
       if (parent instanceof PsiClass && !(parent instanceof PsiAnonymousClass)) {
-        parentClass = (PsiClass)parent;
+        enclosingClass = (PsiClass)parent;
       }
     }
     buffer.append(getAnnotationsTextPrefix());
-    if (parentClass != null) {
-      buildText(parentClass, buffer, canonical, false);
+    if (enclosingClass != null) {
+      buildText(enclosingClass, substitutor, buffer, canonical, false);
       buffer.append('.');
       buffer.append(aClass.getName());
     }
@@ -188,11 +191,11 @@ public class PsiImmediateClassType extends PsiClassType {
       }
       else {
         final String qualifiedName = aClass.getQualifiedName();
-        if (qualifiedName != null) {
-          name = qualifiedName;
+        if (qualifiedName == null) {
+          name = aClass.getName();
         }
         else {
-          name = aClass.getName();
+          name = qualifiedName;
         }
       }
       buffer.append(name);
@@ -210,10 +213,7 @@ public class PsiImmediateClassType extends PsiClassType {
           pineBuffer = null;
           break;
         }
-        if (!canonical) {
-          pineBuffer.append(substitutionResult.getPresentableText());
-        }
-        else {
+        if (canonical) {
           if (internal) {
             pineBuffer.append(substitutionResult.getInternalCanonicalText());
           }
@@ -221,6 +221,9 @@ public class PsiImmediateClassType extends PsiClassType {
             pineBuffer.append(substitutionResult.getCanonicalText());
           }
         }
+        else {
+          pineBuffer.append(substitutionResult.getPresentableText());
+        }
       }
       if (pineBuffer != null) {
         buffer.append(pineBuffer);

From 6b1d4488a109077ca706498d9f60457a822af9d3 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 1 Jun 2012 13:04:39 +0400
Subject: [PATCH 080/239] performance and notNull

---
 .../debugger/extensions/DisposerDebugger.java |  7 ++--
 .../com/intellij/openapi/util/Disposer.java   |  4 +-
 .../openapi/util/objectTree/ObjectNode.java   | 30 +++++++-------
 .../openapi/util/objectTree/ObjectTree.java   | 39 +++++++++++--------
 .../util/objectTree/ObjectTreeAction.java     |  6 ++-
 .../util/objectTree/ObjectTreeListener.java   |  6 ++-
 6 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java
index d5ab63556c81..11a54b8f4580 100644
--- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java
+++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java
@@ -45,7 +45,6 @@ import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder;
 import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.update.MergingUpdateQueue;
-import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -254,13 +253,13 @@ public class DisposerDebugger implements UiDebuggerExtension, Disposable  {
       return value.getValue().getModification() > myModificationToFilter;
     }
 
-    public void objectRegistered(Object node) {
+    public void objectRegistered(@NotNull Object node) {
       queueUpdate();
     }
 
 
 
-    public void objectExecuted(Object node) {
+    public void objectExecuted(@NotNull Object node) {
       queueUpdate();
     }
 
@@ -354,7 +353,7 @@ public class DisposerDebugger implements UiDebuggerExtension, Disposable  {
       }
       else {
         final ObjectTree<Disposable> tree = Disposer.getTree();
-        final THashSet<Disposable> root = tree.getRootObjects();
+        final Set<Disposable> root = tree.getRootObjects();
         ArrayList<DisposerNode> children = new ArrayList<DisposerNode>(root.size());
         for (Disposable each : root) {
           children.add(new DisposerNode(myTree, tree.getNode(each)));
diff --git a/platform/util/src/com/intellij/openapi/util/Disposer.java b/platform/util/src/com/intellij/openapi/util/Disposer.java
index 7005e1fc3e3a..bb999e5a2d1f 100644
--- a/platform/util/src/com/intellij/openapi/util/Disposer.java
+++ b/platform/util/src/com/intellij/openapi/util/Disposer.java
@@ -43,12 +43,12 @@ public class Disposer {
 
   private static final ObjectTreeAction<Disposable> ourDisposeAction = new ObjectTreeAction<Disposable>() {
     @Override
-    public void execute(final Disposable each) {
+    public void execute(@NotNull final Disposable each) {
       each.dispose();
     }
 
     @Override
-    public void beforeTreeExecution(final Disposable parent) {
+    public void beforeTreeExecution(@NotNull final Disposable parent) {
       if (parent instanceof Disposable.Parent) {
         ((Disposable.Parent)parent).beforeTreeDispose();
       }
diff --git a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
index 85b23350415a..a204068c1683 100644
--- a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
+++ b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.util.Disposer;
 import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
 import java.util.Collection;
@@ -35,13 +36,13 @@ public final class ObjectNode<T> {
   private ObjectNode<T> myParent;
   private final T myObject;
 
-  private LinkedHashSet<ObjectNode<T>> myChildren;
+  LinkedHashSet<ObjectNode<T>> myChildren;
   private final Throwable myTrace;
 
   private final long myOwnModification;
   private long myChildModification;
 
-  public ObjectNode(ObjectTree<T> tree, ObjectNode<T> parentNode, T object, long modification) {
+  public ObjectNode(@NotNull ObjectTree<T> tree, ObjectNode<T> parentNode, @NotNull T object, long modification) {
     myTree = tree;
     myParent = parentNode;
     myObject = object;
@@ -50,6 +51,7 @@ public final class ObjectNode<T> {
     myOwnModification = modification;
   }
 
+  @NotNull
   private ObjectNode<T>[] getChildrenArray() {
     synchronized (myTree.treeLock) {
       if (myChildren == null || myChildren.isEmpty()) return EMPTY_ARRAY;
@@ -57,7 +59,7 @@ public final class ObjectNode<T> {
     }
   }
 
-  public void addChild(ObjectNode<T> child) {
+  public void addChild(@NotNull ObjectNode<T> child) {
     synchronized (myTree.treeLock) {
       ensureChildArray();
       child.setParent(this);
@@ -68,7 +70,7 @@ public final class ObjectNode<T> {
     }
   }
 
-  public void removeChild(ObjectNode<T> child) {
+  public void removeChild(@NotNull ObjectNode<T> child) {
     synchronized (myTree.treeLock) {
       assert myChildren != null: "No children to remove child: " + this + ' ' + child;
       if (myChildren.remove(child)) {
@@ -80,15 +82,14 @@ public final class ObjectNode<T> {
   }
 
   private void setParent(ObjectNode<T> parent) {
-    synchronized (myTree.treeLock) {
-      myParent = parent;
-    }
+    myParent = parent;
   }
 
   public ObjectNode<T> getParent() {
     return myParent;
   }
 
+  @NotNull
   public Collection<ObjectNode<T>> getChildren() {
     synchronized (myTree.treeLock) {
       if (myChildren == null) return Collections.emptyList();
@@ -102,9 +103,10 @@ public final class ObjectNode<T> {
     }
   }
   
-  boolean execute(final boolean disposeTree, final ObjectTreeAction<T> action) {
-    ObjectTree.executeActionWithRecursiveGuard(this, new ObjectTreeAction<ObjectNode<T>>() {
-      public void execute(ObjectNode<T> each) {
+  boolean execute(final boolean disposeTree, @NotNull final ObjectTreeAction<T> action) {
+    ObjectTree.executeActionWithRecursiveGuard(this, myTree.getNodesInExecution(), new ObjectTreeAction<ObjectNode<T>>() {
+      @Override
+      public void execute(@NotNull ObjectNode<T> each) {
         action.beforeTreeExecution(myObject);
 
         ObjectNode<T>[] childrenArray = getChildrenArray();
@@ -144,14 +146,16 @@ public final class ObjectNode<T> {
         }
       }
 
-      public void beforeTreeExecution(ObjectNode<T> parent) {
+      @Override
+      public void beforeTreeExecution(@NotNull ObjectNode<T> parent) {
 
       }
-    }, myTree.getNodesInExecution());
+    });
 
     return true;
   }
 
+  @NotNull
   public T getObject() {
     return myObject;
   }
@@ -166,7 +170,7 @@ public final class ObjectNode<T> {
   }
 
   @TestOnly
-  void assertNoReferencesKept(T aDisposable) {
+  void assertNoReferencesKept(@NotNull T aDisposable) {
     assert getObject() != aDisposable;
     if (myChildren != null) {
       for (ObjectNode<T> node: myChildren) {
diff --git a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTree.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTree.java
index 4f6734447c02..eecbaa790527 100644
--- a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTree.java
+++ b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTree.java
@@ -26,9 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 public final class ObjectTree<T> {
@@ -62,7 +60,7 @@ public final class ObjectTree<T> {
     return myExecutedNodes;
   }
 
-  public final void register(T parent, T child) {
+  public final void register(@NotNull T parent, @NotNull T child) {
     synchronized (treeLock) {
       final ObjectNode<T> childNode = getOrCreateNodeFor(child);
       checkValid(childNode, child);
@@ -83,7 +81,7 @@ public final class ObjectTree<T> {
     }
   }
 
-  private void checkValid(ObjectNode<T> childNode, T child) {
+  private void checkValid(ObjectNode<T> childNode, @NotNull T child) {
     boolean childIsInTree = childNode != null && childNode.getParent() != null;
     if (!childIsInTree) return;
 
@@ -96,6 +94,7 @@ public final class ObjectTree<T> {
     }
   }
 
+  @NotNull
   private ObjectNode<T> getOrCreateNodeFor(@NotNull T parentObject) {
     final ObjectNode<T> parentNode = getNode(parentObject);
 
@@ -127,7 +126,9 @@ public final class ObjectTree<T> {
     }
   }
 
-  static <T> void executeActionWithRecursiveGuard(@NotNull T object, @NotNull final ObjectTreeAction<T> action, List<T> recursiveGuard) {
+  static <T> void executeActionWithRecursiveGuard(@NotNull T object,
+                                                  @NotNull List<T> recursiveGuard,
+                                                  @NotNull final ObjectTreeAction<T> action) {
     synchronized (recursiveGuard) {
       if (ArrayUtil.indexOf(recursiveGuard, object, Equality.IDENTITY) != -1) return;
       recursiveGuard.add(object);
@@ -146,7 +147,7 @@ public final class ObjectTree<T> {
   }
 
   private void executeUnregistered(@NotNull final T object, @NotNull final ObjectTreeAction<T> action) {
-    executeActionWithRecursiveGuard(object, action, myExecutedUnregisteredNodes);
+    executeActionWithRecursiveGuard(object, myExecutedUnregisteredNodes, action);
   }
 
   public final void executeChildAndReplace(@NotNull T toExecute, @NotNull T toReplace, boolean disposeTree, @NotNull ObjectTreeAction<T> action) {
@@ -169,7 +170,7 @@ public final class ObjectTree<T> {
   }
 
   @TestOnly
-  public void assertNoReferenceKeptInTree(T disposable) {
+  public void assertNoReferenceKeptInTree(@NotNull T disposable) {
     Collection<ObjectNode<T>> nodes = myObject2NodeMap.values();
     for (ObjectNode<T> node : nodes) {
       node.assertNoReferencesKept(disposable);
@@ -229,25 +230,26 @@ public final class ObjectTree<T> {
     myObject2NodeMap.clear();
   }
 
-  public THashSet<T> getRootObjects() {
+  @NotNull
+  public Set<T> getRootObjects() {
     return myRootObjects;
   }
 
-  public void addListener(ObjectTreeListener listener) {
+  public void addListener(@NotNull ObjectTreeListener listener) {
     myListeners.add(listener);
   }
 
-  public void removeListener(ObjectTreeListener listener) {
+  public void removeListener(@NotNull ObjectTreeListener listener) {
     myListeners.remove(listener);
   }
 
-  void fireRegistered(Object object) {
+  void fireRegistered(@NotNull Object object) {
     for (ObjectTreeListener each : myListeners) {
       each.objectRegistered(object);
     }
   }
 
-  void fireExecuted(Object object) {
+  void fireExecuted(@NotNull Object object) {
     for (ObjectTreeListener each : myListeners) {
       each.objectExecuted(object);
     }
@@ -262,10 +264,13 @@ public final class ObjectTree<T> {
     synchronized (treeLock) {
       ObjectNode<T> parentNode = getNode(parentDisposable);
       if (parentNode == null) return null;
-      for (ObjectNode<T> node : parentNode.getChildren()) {
-        T nodeObject = node.getObject();
-        if (nodeObject.equals(object)) {
-          return (D)nodeObject;
+      LinkedHashSet<ObjectNode<T>> children = parentNode.myChildren;
+      if (children != null) {
+        for (ObjectNode<T> node : children) {
+          T nodeObject = node.getObject();
+          if (nodeObject.equals(object)) {
+            return (D)nodeObject;
+          }
         }
       }
       return null;
diff --git a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeAction.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeAction.java
index ae4341e03a27..2989d94c1780 100644
--- a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeAction.java
+++ b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeAction.java
@@ -15,10 +15,12 @@
  */
 package com.intellij.openapi.util.objectTree;
 
+import org.jetbrains.annotations.NotNull;
+
 public interface ObjectTreeAction<T> {
 
-  void execute(T each);
+  void execute(@NotNull T each);
 
-  void beforeTreeExecution(T parent);
+  void beforeTreeExecution(@NotNull T parent);
 
 }
diff --git a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeListener.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeListener.java
index 57096a6ec253..0d472b866b9a 100644
--- a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeListener.java
+++ b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectTreeListener.java
@@ -15,9 +15,11 @@
  */
 package com.intellij.openapi.util.objectTree;
 
+import org.jetbrains.annotations.NotNull;
+
 public interface ObjectTreeListener {
 
-  void objectRegistered(Object node);
-  void objectExecuted(Object node);
+  void objectRegistered(@NotNull Object node);
+  void objectExecuted(@NotNull Object node);
 
 }
\ No newline at end of file

From 3f157aa927d5820291d9a58eb00c6cad430a42a1 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 1 Jun 2012 14:47:33 +0400
Subject: [PATCH 081/239] test diagnostics

---
 .../codeInsight/template/impl/TemplateListPanel.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
index 4bb7cc1ca04a..6209296da403 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
@@ -25,6 +25,7 @@ import com.intellij.ide.dnd.*;
 import com.intellij.ide.dnd.aware.DnDAwareTree;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SchemesManager;
@@ -184,16 +185,22 @@ public class TemplateListPanel extends JPanel implements Disposable {
     reset();
   }
 
+  private final boolean isTest = ApplicationManager.getApplication().isUnitTestMode();
   public boolean isModified() {
     TemplateSettings templateSettings = TemplateSettings.getInstance();
     if (templateSettings.getDefaultShortcutChar() != getDefaultShortcutChar()) {
+      if (isTest) System.err.println("LiveTemplatesConfig: templateSettings.getDefaultShortcutChar()="+templateSettings.getDefaultShortcutChar()+"; getDefaultShortcutChar()="+getDefaultShortcutChar());
       return true;
     }
 
     List<TemplateGroup> originalGroups = templateSettings.getTemplateGroups();
     List<TemplateGroup> newGroups = getTemplateGroups();
 
-    return !checkAreEqual(collectTemplates(originalGroups), collectTemplates(newGroups));
+    if (checkAreEqual(collectTemplates(originalGroups), collectTemplates(newGroups))) return false;
+    if (isTest) {
+      System.err.println("LiveTemplatesConfig: originalGroups="+originalGroups+"; collectTemplates(originalGroups)="+collectTemplates(originalGroups)+";\n newGroups="+newGroups+"; collectTemplates(newGroups)="+collectTemplates(newGroups));
+    }
+    return true;
   }
 
   public void editTemplate(TemplateImpl template) {

From 0bbd7b73751608074897238f87d7d71210762ece Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 1 Jun 2012 16:34:43 +0400
Subject: [PATCH 082/239] cleanup

---
 .../codeInsight/daemon/ImportHelperTest.java  | 21 +++++++++----------
 .../daemon/LightAdvHighlightingJdk7Test.java  |  4 ++--
 .../LightAdvHighlightingPerformanceTest.java  |  3 +--
 .../daemon/LightAdvHighlightingTest.java      |  6 ++----
 .../daemon/UnusedSymbolLocalTest.java         |  8 +++----
 .../codeInsight/slice/SliceTreeTest.java      |  2 +-
 .../daemon/DaemonAnalyzerTestCase.java        | 13 +++++++-----
 .../daemon/LightDaemonAnalyzerTestCase.java   |  5 +++++
 8 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
index ae1fa551150a..3e3321f99511 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java
@@ -7,7 +7,6 @@ import com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFix;
 import com.intellij.codeInsight.daemon.impl.quickfix.ImportClassFixBase;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.unusedImport.UnusedImportLocalInspection;
-import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.command.WriteCommandAction;
@@ -54,7 +53,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
   public void testImportsInsertedAlphabetically() throws Throwable {
     @NonNls String text = "class I {}";
     final PsiJavaFile file = (PsiJavaFile)configureByText(StdFileTypes.JAVA, text);
-    assertEmpty(filter(doHighlighting(), HighlightSeverity.ERROR));
+    assertEmpty(highlightErrors());
     CommandProcessor.getInstance().executeCommand(
       getProject(), new Runnable() {
       @Override
@@ -109,7 +108,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
                           "class I {{ max(0, 0); Map.class.hashCode(); min(0,0); Component.class.hashCode(); int i = CENTER; }}";
 
     final PsiJavaFile file = (PsiJavaFile)configureByText(StdFileTypes.JAVA, text);
-    assertEmpty(filter(doHighlighting(), HighlightSeverity.ERROR));
+    assertEmpty(highlightErrors());
     CommandProcessor.getInstance().executeCommand(
       getProject(), new Runnable() {
         @Override
@@ -178,7 +177,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
   @WrapInCommand
   public void testReimportConflictingClasses() throws Exception {
     configureByFile(BASE_PATH+"/x/Usage.java", BASE_PATH);
-    assertEmpty(filter(doHighlighting(), HighlightSeverity.ERROR));
+    assertEmpty(highlightErrors());
 
     CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject()).clone();
     settings.CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND = 2;
@@ -204,7 +203,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
   @WrapInCommand
   public void testConflictingClassesFromCurrentPackage() throws Throwable {
     final PsiFile file = configureByText(StdFileTypes.JAVA, "package java.util; class X{ Date d;}");
-    assertEmpty(filter(doHighlighting(), HighlightSeverity.ERROR));
+    assertEmpty(highlightErrors());
 
     new WriteCommandAction.Simple(getProject()) {
       @Override
@@ -229,7 +228,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
       type(" ");
       backspace();
       
-      assertOneElement(filter(doHighlighting(), HighlightSeverity.ERROR));
+      assertOneElement(highlightErrors());
 
       int offset = myEditor.getCaretModel().getOffset();
       PsiReference ref = myFile.findReferenceAt(offset - 1);
@@ -244,7 +243,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
       assertEquals(ImportClassFixBase.Result.CLASS_AUTO_IMPORTED, result);
       UIUtil.dispatchAllInvocationEvents();
 
-      assertEmpty(filter(doHighlighting(), HighlightSeverity.ERROR));
+      assertEmpty(highlightErrors());
     }
     finally {
       CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY = old;
@@ -261,7 +260,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
       type(" ");
       backspace();
       
-      assertEquals(2, filter(doHighlighting(), HighlightSeverity.ERROR).size());
+      assertEquals(2, highlightErrors().size());
       UIUtil.dispatchAllInvocationEvents();
 
       int offset = myEditor.getCaretModel().getOffset();
@@ -272,7 +271,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
       assertEquals(ImportClassFixBase.Result.CLASS_AUTO_IMPORTED, result);
       UIUtil.dispatchAllInvocationEvents();
 
-      assertEmpty(filter(doHighlighting(), HighlightSeverity.ERROR));
+      assertEmpty(highlightErrors());
     }
     finally {
       CodeInsightSettings.getInstance().ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY = old;
@@ -363,7 +362,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
      DaemonCodeAnalyzerSettings.getInstance().setImportHintEnabled(true);
 
      try {
-       List<HighlightInfo> errs = filter(doHighlighting(), HighlightSeverity.ERROR);
+       List<HighlightInfo> errs = highlightErrors();
 
        assertEquals(1, errs.size());
 
@@ -389,7 +388,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase {
      DaemonCodeAnalyzerSettings.getInstance().setImportHintEnabled(true);
 
      try {
-       List<HighlightInfo> errs = filter(doHighlighting(), HighlightSeverity.ERROR);
+       List<HighlightInfo> errs = highlightErrors();
        assertEquals(1, errs.size());
 
        assertEmpty(((PsiJavaFile)getFile()).getImportList().getAllImportStatements());
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
index 2bac9bb26aba..aa839c1bae79 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
@@ -138,13 +138,13 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
     enableInspectionTool(deadCodeInspection);
 
     doTest(true, false);
-    List<HighlightInfo> infos = DaemonAnalyzerTestCase.filter(doHighlighting(), HighlightSeverity.WARNING);
+    List<HighlightInfo> infos = doHighlighting(HighlightSeverity.WARNING);
     assertEquals(2, infos.size()); // unused class and unused method
 
     try {
       point.registerExtension(extension);
 
-      infos = DaemonAnalyzerTestCase.filter(doHighlighting(), HighlightSeverity.WARNING);
+      infos = doHighlighting(HighlightSeverity.WARNING);
       HighlightInfo info = assertOneElement(infos);
       assertEquals("Class 'WithMain' is never used", info.description);
     }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java
index 45277b05641e..a331e33c9cc6 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java
@@ -19,7 +19,6 @@ import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.intention.IntentionManager;
 import com.intellij.concurrency.JobSchedulerImpl;
 import com.intellij.lang.LanguageAnnotators;
-import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.lang.injection.MultiHostInjector;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ex.PathManagerEx;
@@ -107,7 +106,7 @@ public class LightAdvHighlightingPerformanceTest extends LightDaemonAnalyzerTest
       }
     }).cpuBound().usesAllCPUCores().assertTiming();
 
-    return DaemonAnalyzerTestCase.filter(infos, HighlightSeverity.ERROR);
+    return highlightErrors();
   }
 
   public void testAThinlet() throws Exception {
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
index 509b1cd13a31..9deb8c636bc5 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
@@ -54,8 +54,6 @@ import org.jetbrains.annotations.NotNull;
 import java.io.IOException;
 import java.util.List;
 
-import static com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase.filter;
-
 /**
  * This class is for "lightweight" tests only, i.e. those which can run inside default light project set up
  * For "heavyweight" tests use AdvHighlightingTest
@@ -275,7 +273,7 @@ public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase {
       }
     });
 
-    List<HighlightInfo> infos = filter(doHighlighting(), HighlightSeverity.WARNING);
+    List<HighlightInfo> infos = doHighlighting(HighlightSeverity.WARNING);
     assertEmpty(infos);
   }
 
@@ -327,7 +325,7 @@ public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase {
 
   public void testSOEForTypeOfHugeBinaryExpression() throws IOException {
     configureFromFileText("a.java", "class A { String s = \"\"; }");
-    assertEmpty(filter(doHighlighting(), HighlightSeverity.ERROR));
+    assertEmpty(highlightErrors());
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
 
     final StringBuilder sb = new StringBuilder("\"-\"");
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedSymbolLocalTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedSymbolLocalTest.java
index 69536714cab2..ca2c03bdfdb1 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedSymbolLocalTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedSymbolLocalTest.java
@@ -3,13 +3,11 @@ package com.intellij.codeInsight.daemon;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection;
-import com.intellij.idea.Bombed;
+import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
 import com.intellij.psi.PsiDocumentManager;
-import com.intellij.lang.annotation.HighlightSeverity;
 
-import java.util.Calendar;
 import java.util.Collection;
 
 public class UnusedSymbolLocalTest extends DaemonAnalyzerTestCase {
@@ -29,7 +27,7 @@ public class UnusedSymbolLocalTest extends DaemonAnalyzerTestCase {
   public void testChangeInsideCodeBlock() throws Exception {
     doTest();
     final Document document = myEditor.getDocument();
-    Collection<HighlightInfo> collection = filter(doHighlighting(), HighlightSeverity.WARNING);
+    Collection<HighlightInfo> collection = doHighlighting(HighlightSeverity.WARNING);
     assertEquals(0, collection.size());
 
     final int offset = myEditor.getCaretModel().getOffset();
@@ -42,7 +40,7 @@ public class UnusedSymbolLocalTest extends DaemonAnalyzerTestCase {
 
     PsiDocumentManager.getInstance(getProject()).commitDocument(document);
 
-    Collection<HighlightInfo> infos = filter(doHighlighting(), HighlightSeverity.WARNING);
+    Collection<HighlightInfo> infos = doHighlighting(HighlightSeverity.WARNING);
     assertEquals(1, infos.size());
   }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java
index 03553b1dfc5e..624ec7fd314d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java
@@ -27,7 +27,7 @@ public class SliceTreeTest extends LightDaemonAnalyzerTestCase {
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
     PsiElement element = new SliceHandler(true).getExpressionAtCaret(getEditor(), getFile());
     assertNotNull(element);
-    Collection<HighlightInfo> errors = DaemonAnalyzerTestCase.filter(doHighlighting(), HighlightSeverity.ERROR);
+    Collection<HighlightInfo> errors = highlightErrors();
     assertEmpty(errors);
 
     SliceAnalysisParams params = new SliceAnalysisParams();
diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
index da4aa999a634..09373f9122b1 100644
--- a/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
@@ -57,8 +57,6 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileFilter;
-import com.intellij.openapi.vfs.impl.VirtualFilePointerManagerImpl;
-import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
 import com.intellij.profile.codeInspection.InspectionProfileManager;
 import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
 import com.intellij.psi.*;
@@ -197,7 +195,7 @@ public abstract class DaemonAnalyzerTestCase extends CodeInsightTestCase {
     ((StartupManagerImpl)StartupManager.getInstance(getProject())).checkCleared();
     ((DaemonCodeAnalyzerImpl)DaemonCodeAnalyzer.getInstance(getProject())).cleanupAfterTest(!LightPlatformTestCase.isLight(getProject()));
     super.tearDown();
-    ((VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance()).assertPointersDisposed();
+    //((VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance()).assertPointersDisposed();
   }
 
   protected void enableInspectionTool(InspectionProfileEntry tool){
@@ -333,8 +331,13 @@ public abstract class DaemonAnalyzerTestCase extends CodeInsightTestCase {
   }
 
   @NotNull
-  protected Collection<HighlightInfo> highlightErrors() {
-    return filter(doHighlighting(), HighlightSeverity.ERROR);
+  protected List<HighlightInfo> highlightErrors() {
+    return doHighlighting(HighlightSeverity.ERROR);
+  }
+
+  @NotNull
+  protected List<HighlightInfo> doHighlighting(@NotNull HighlightSeverity minSeverity) {
+    return filter(doHighlighting(), minSeverity);
   }
 
   @NotNull
diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
index 8438576d3790..97c12f670b20 100644
--- a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
@@ -121,6 +121,11 @@ public abstract class LightDaemonAnalyzerTestCase extends LightCodeInsightTestCa
     };
   }
 
+  @NotNull
+  protected List<HighlightInfo> highlightErrors() {
+    return doHighlighting(HighlightSeverity.ERROR);
+  }
+
   @NotNull
   protected List<HighlightInfo> doHighlighting() {
     PsiDocumentManager.getInstance(getProject()).commitAllDocuments();

From 96e202fd3e655ce9e4c09501b33eb4047577be40 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 1 Jun 2012 16:39:52 +0400
Subject: [PATCH 083/239] remove highlights early: IDEA-81125

---
 .../daemon/impl/analysis/HighlightUtil.java   | 236 +++++++++---------
 .../daemon/impl/DefaultHighlightVisitor.java  |   6 +-
 .../daemon/impl/GeneralHighlightingPass.java  |  47 +++-
 .../daemon/impl/UpdateHighlightersUtil.java   |   2 +-
 4 files changed, 169 insertions(+), 122 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 46797889641c..dc00abd0ea0c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -71,12 +71,12 @@ import static com.intellij.codeInsight.daemon.JavaHighlightingFilter.suppressed;
  */
 public class HighlightUtil {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.analysis.HighlightUtil");
-  private static final Map<String, Set<String>> ourInterfaceIncompatibleModifiers;
-  private static final Map<String, Set<String>> ourMethodIncompatibleModifiers;
-  private static final Map<String, Set<String>> ourFieldIncompatibleModifiers;
-  private static final Map<String, Set<String>> ourClassIncompatibleModifiers;
-  private static final Map<String, Set<String>> ourClassInitializerIncompatibleModifiers;
-  private static final Set<String> ourConstructorNotAllowedModifiers;
+  @NotNull private static final Map<String, Set<String>> ourInterfaceIncompatibleModifiers;
+  @NotNull private static final Map<String, Set<String>> ourMethodIncompatibleModifiers;
+  @NotNull private static final Map<String, Set<String>> ourFieldIncompatibleModifiers;
+  @NotNull private static final Map<String, Set<String>> ourClassIncompatibleModifiers;
+  @NotNull private static final Map<String, Set<String>> ourClassInitializerIncompatibleModifiers;
+  @NotNull private static final Set<String> ourConstructorNotAllowedModifiers;
 
   @NonNls public static final String SERIAL_VERSION_UID_FIELD_NAME = "serialVersionUID";
   @NonNls private static final String SERIAL_PERSISTENT_FIELDS_FIELD_NAME = "serialPersistentFields";
@@ -218,8 +218,8 @@ public class HighlightUtil {
 
   @Nullable
   public static String getIncompatibleModifier(String modifier,
-                                               PsiModifierList modifierList,
-                                               Map<String, Set<String>> incompatibleModifiersHash) {
+                                               @Nullable PsiModifierList modifierList,
+                                               @NotNull Map<String, Set<String>> incompatibleModifiersHash) {
     if (modifierList == null) return null;
     // modifier is always incompatible with itself
     PsiElement[] modifiers = modifierList.getChildren();
@@ -244,9 +244,9 @@ public class HighlightUtil {
   /**
    * make element protected/package local/public suggestion
    */
-  static void registerAccessQuickFixAction(PsiMember refElement,
-                                           PsiJavaCodeReferenceElement place,
-                                           HighlightInfo errorResult,
+  static void registerAccessQuickFixAction(@NotNull PsiMember refElement,
+                                           @NotNull PsiJavaCodeReferenceElement place,
+                                           @NotNull HighlightInfo errorResult,
                                            final PsiElement fileResolveScope) {
     PsiClass accessObjectClass = null;
     PsiElement qualifier = place.getQualifier();
@@ -300,7 +300,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static PsiClass getPackageLocalClassInTheMiddle(PsiJavaCodeReferenceElement place) {
+  private static PsiClass getPackageLocalClassInTheMiddle(@NotNull PsiJavaCodeReferenceElement place) {
     if (place instanceof PsiReferenceExpression) {
       // check for package local classes in the middle
       PsiReferenceExpression expression = (PsiReferenceExpression)place;
@@ -325,7 +325,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkInstanceOfApplicable(PsiInstanceOfExpression expression) {
+  static HighlightInfo checkInstanceOfApplicable(@NotNull PsiInstanceOfExpression expression) {
     PsiExpression operand = expression.getOperand();
     PsiTypeElement typeElement = expression.getCheckType();
     if (typeElement == null) return null;
@@ -343,7 +343,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkInconvertibleTypeCast(PsiTypeCastExpression expression) {
+  static HighlightInfo checkInconvertibleTypeCast(@NotNull PsiTypeCastExpression expression) {
     PsiTypeElement castTypeElement = expression.getCastType();
     if (castTypeElement == null) return null;
     PsiType castType = castTypeElement.getType();
@@ -363,7 +363,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  static HighlightInfo checkVariableExpected(PsiExpression expression) {
+  static HighlightInfo checkVariableExpected(@NotNull PsiExpression expression) {
     PsiExpression lValue;
     if (expression instanceof PsiAssignmentExpression) {
       PsiAssignmentExpression assignment = (PsiAssignmentExpression)expression;
@@ -387,7 +387,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkAssignmentOperatorApplicable(PsiAssignmentExpression assignment) {
+  static HighlightInfo checkAssignmentOperatorApplicable(@NotNull PsiAssignmentExpression assignment) {
     PsiJavaToken operationSign = assignment.getOperationSign();
     IElementType eqOpSign = operationSign.getTokenType();
     IElementType opSign = TypeConversionUtil.convertEQtoOperation(eqOpSign);
@@ -412,7 +412,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkAssignmentCompatibleTypes(PsiAssignmentExpression assignment) {
+  static HighlightInfo checkAssignmentCompatibleTypes(@NotNull PsiAssignmentExpression assignment) {
     if (!"=".equals(assignment.getOperationSign().getText())) return null;
     PsiExpression lExpr = assignment.getLExpression();
     PsiExpression rExpr = assignment.getRExpression();
@@ -437,7 +437,7 @@ public class HighlightUtil {
     return highlightInfo;
   }
 
-  private static boolean isCastIntentionApplicable(PsiExpression expression, PsiType toType) {
+  private static boolean isCastIntentionApplicable(@NotNull PsiExpression expression, @Nullable PsiType toType) {
     while (expression instanceof PsiTypeCastExpression || expression instanceof PsiParenthesizedExpression) {
       if (expression instanceof PsiTypeCastExpression) {
         expression = ((PsiTypeCastExpression)expression).getOperand();
@@ -453,7 +453,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkVariableInitializerType(PsiVariable variable) {
+  static HighlightInfo checkVariableInitializerType(@NotNull PsiVariable variable) {
     PsiExpression initializer = variable.getInitializer();
     // array initializer checked in checkArrayInitializerApplicable
     if (initializer == null || initializer instanceof PsiArrayInitializerExpression) return null;
@@ -469,13 +469,13 @@ public class HighlightUtil {
   }
 
   @Nullable
-  static HighlightInfo checkAssignability(PsiType lType, @Nullable PsiType rType, PsiExpression expression, PsiElement elementToHighlight) {
+  static HighlightInfo checkAssignability(PsiType lType, @Nullable PsiType rType, PsiExpression expression, @NotNull PsiElement elementToHighlight) {
     TextRange textRange = elementToHighlight.getTextRange();
     return checkAssignability(lType, rType, expression, textRange);
   }
 
   @Nullable
-  public static HighlightInfo checkAssignability(@Nullable PsiType lType, @Nullable PsiType rType, @Nullable PsiExpression expression, TextRange textRange) {
+  public static HighlightInfo checkAssignability(@Nullable PsiType lType, @Nullable PsiType rType, @Nullable PsiExpression expression, @NotNull TextRange textRange) {
     if (lType == rType) return null;
     if (expression == null) {
       if (rType == null || lType == null || TypeConversionUtil.isAssignable(lType, rType)) return null;
@@ -500,7 +500,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkReturnStatementType(PsiReturnStatement statement) {
+  static HighlightInfo checkReturnStatementType(@NotNull PsiReturnStatement statement) {
     if (suppressed(Kind.RETURN_STATEMENT, statement)) return null;
 
     PsiMethod method = null;
@@ -569,18 +569,20 @@ public class HighlightUtil {
     return errorResult;
   }
 
-  public static String getUnhandledExceptionsDescriptor(final Collection<PsiClassType> unhandled) {
+  public static String getUnhandledExceptionsDescriptor(@NotNull final Collection<PsiClassType> unhandled) {
     return getUnhandledExceptionsDescriptor(unhandled, null);
   }
 
-  private static String getUnhandledExceptionsDescriptor(final Collection<PsiClassType> unhandled, final String source) {
+  private static String getUnhandledExceptionsDescriptor(@NotNull final Collection<PsiClassType> unhandled, @Nullable final String source) {
     final String exceptions = formatTypes(unhandled);
     return source != null ? JavaErrorMessages.message("unhandled.close.exceptions", exceptions, unhandled.size(), source)
                           : JavaErrorMessages.message("unhandled.exceptions", exceptions, unhandled.size());
   }
 
-  private static String formatTypes(Collection<PsiClassType> unhandled) {
+  @NotNull
+  private static String formatTypes(@NotNull Collection<PsiClassType> unhandled) {
     return StringUtil.join(unhandled, new Function<PsiClassType, String>() {
+      @NotNull
       @Override
       public String fun(PsiClassType type) {
         return formatType(type);
@@ -589,7 +591,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  static HighlightInfo checkVariableAlreadyDefined(PsiVariable variable) {
+  static HighlightInfo checkVariableAlreadyDefined(@NotNull PsiVariable variable) {
     if (variable instanceof ExternallyDefinedPsiElement) return null;
     PsiIdentifier identifier = variable.getNameIdentifier();
     assert identifier != null : variable;
@@ -682,7 +684,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkUnhandledExceptions(final PsiElement element, TextRange fixRange) {
+  public static HighlightInfo checkUnhandledExceptions(@NotNull final PsiElement element, @Nullable TextRange fixRange) {
     final List<PsiClassType> unhandledExceptions = ExceptionUtil.getUnhandledExceptions(element);
     if (unhandledExceptions.isEmpty()) return null;
 
@@ -697,7 +699,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkUnhandledCloserExceptions(final PsiResourceVariable resource) {
+  public static HighlightInfo checkUnhandledCloserExceptions(@NotNull final PsiResourceVariable resource) {
     final List<PsiClassType> unhandled = ExceptionUtil.getUnhandledCloserExceptions(resource, null);
     if (unhandled.isEmpty()) return null;
 
@@ -710,9 +712,9 @@ public class HighlightUtil {
     return highlight;
   }
 
-  private static void registerUnhandledExceptionFixes(final PsiElement element,
+  private static void registerUnhandledExceptionFixes(@NotNull final PsiElement element,
                                                       final HighlightInfo errorResult,
-                                                      final List<PsiClassType> unhandled) {
+                                                      @NotNull final List<PsiClassType> unhandled) {
     QuickFixAction.registerQuickFixAction(errorResult, new AddExceptionToCatchFix());
     QuickFixAction.registerQuickFixAction(errorResult, new AddExceptionToThrowsFix(element));
     QuickFixAction.registerQuickFixAction(errorResult, new SurroundWithTryCatchFix(element));
@@ -734,7 +736,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkBreakOutsideLoop(PsiBreakStatement statement) {
+  static HighlightInfo checkBreakOutsideLoop(@NotNull PsiBreakStatement statement) {
     if (statement.getLabelIdentifier() == null) {
       if (new PsiMatcherImpl(statement).ancestor(EnclosingLoopOrSwitchMatcherExpression.INSTANCE).getElement() == null) {
         return HighlightInfo
@@ -749,7 +751,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkContinueOutsideLoop(PsiContinueStatement statement) {
+  static HighlightInfo checkContinueOutsideLoop(@NotNull PsiContinueStatement statement) {
     if (statement.getLabelIdentifier() == null) {
       if (new PsiMatcherImpl(statement).ancestor(EnclosingLoopMatcherExpression.INSTANCE).getElement() == null) {
         return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, statement, JavaErrorMessages.message("continue.outside.loop"));
@@ -769,7 +771,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkIllegalModifierCombination(PsiKeyword keyword, PsiModifierList modifierList) {
+  static HighlightInfo checkIllegalModifierCombination(@NotNull PsiKeyword keyword, @NotNull PsiModifierList modifierList) {
     @PsiModifier.ModifierConstant String modifier = keyword.getText();
     String incompatible = getIncompatibleModifier(modifier, modifierList);
 
@@ -785,7 +787,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static Map<String, Set<String>> getIncompatibleModifierMap(PsiModifierList modifierList) {
+  private static Map<String, Set<String>> getIncompatibleModifierMap(@NotNull PsiModifierList modifierList) {
     PsiElement parent = modifierList.getParent();
     if (parent == null || PsiUtilCore.hasErrorElementChild(parent)) return null;
     return parent instanceof PsiClass
@@ -798,7 +800,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static String getIncompatibleModifier(String modifier, PsiModifierList modifierList) {
+  public static String getIncompatibleModifier(String modifier, @NotNull PsiModifierList modifierList) {
     PsiElement parent = modifierList.getParent();
     if (parent == null || PsiUtilCore.hasErrorElementChild(parent)) return null;
     final Map<String, Set<String>> incompatibleModifierMap = getIncompatibleModifierMap(modifierList);
@@ -808,7 +810,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkNotAllowedModifier(PsiKeyword keyword, PsiModifierList modifierList) {
+  public static HighlightInfo checkNotAllowedModifier(@NotNull PsiKeyword keyword, @NotNull PsiModifierList modifierList) {
     PsiElement modifierOwner = modifierList.getParent();
     if (modifierOwner == null) return null;
     if (PsiUtilCore.hasErrorElementChild(modifierOwner)) return null;
@@ -885,7 +887,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkLiteralExpressionParsingError(final PsiLiteralExpression expression) {
+  public static HighlightInfo checkLiteralExpressionParsingError(@NotNull final PsiLiteralExpression expression) {
     final Object value = expression.getValue();
     final PsiElement literal = expression.getFirstChild();
     assert literal instanceof PsiJavaToken : literal;
@@ -1057,7 +1059,7 @@ public class HighlightUtil {
   }
 
   // true if floating point literal consists of zeros only
-  public static boolean isFPZero(final String text) {
+  public static boolean isFPZero(@NotNull final String text) {
     for (int i = 0; i < text.length(); i++) {
       final char c = text.charAt(i);
       if (Character.isDigit(c) && c != '0') return false;
@@ -1092,7 +1094,7 @@ public class HighlightUtil {
 
 
   @NotNull
-  static Set<PsiClassType> collectUnhandledExceptions(final PsiTryStatement statement) {
+  static Set<PsiClassType> collectUnhandledExceptions(@NotNull final PsiTryStatement statement) {
     final Set<PsiClassType> thrownTypes = Sets.newHashSet();
 
     final PsiCodeBlock tryBlock = statement.getTryBlock();
@@ -1109,7 +1111,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  static Collection<HighlightInfo> checkExceptionThrownInTry(final PsiParameter parameter, final Set<PsiClassType> thrownTypes) {
+  static Collection<HighlightInfo> checkExceptionThrownInTry(@NotNull final PsiParameter parameter, @NotNull final Set<PsiClassType> thrownTypes) {
     final PsiElement declarationScope = parameter.getDeclarationScope();
     if (!(declarationScope instanceof PsiCatchSection)) return null;
 
@@ -1125,9 +1127,9 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static Collection<HighlightInfo> checkSimpleCatchParameter(final PsiParameter parameter,
-                                                                     final Collection<PsiClassType> thrownTypes,
-                                                                     final PsiClassType caughtType) {
+  private static Collection<HighlightInfo> checkSimpleCatchParameter(@NotNull final PsiParameter parameter,
+                                                                     @NotNull final Collection<PsiClassType> thrownTypes,
+                                                                     @NotNull final PsiClassType caughtType) {
     if (ExceptionUtil.isUncheckedExceptionOrSuperclass(caughtType)) return null;
 
     for (PsiClassType exceptionType : thrownTypes) {
@@ -1141,8 +1143,8 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static Collection<HighlightInfo> checkMultiCatchParameter(final PsiParameter parameter,
-                                                                    final Collection<PsiClassType> thrownTypes) {
+  private static Collection<HighlightInfo> checkMultiCatchParameter(@NotNull final PsiParameter parameter,
+                                                                    @NotNull final Collection<PsiClassType> thrownTypes) {
     final List<PsiTypeElement> typeElements = PsiUtil.getParameterTypeElements(parameter);
     final Collection<HighlightInfo> highlights = Lists.newArrayListWithCapacity(typeElements.size());
 
@@ -1170,8 +1172,8 @@ public class HighlightUtil {
 
 
   @Nullable
-  static Collection<HighlightInfo> checkWithImprovedCatchAnalysis(final PsiParameter parameter,
-                                                                  final Collection<PsiClassType> thrownInTryStatement) {
+  static Collection<HighlightInfo> checkWithImprovedCatchAnalysis(@NotNull final PsiParameter parameter,
+                                                                  @NotNull final Collection<PsiClassType> thrownInTryStatement) {
     final PsiElement scope = parameter.getDeclarationScope();
     if (!(scope instanceof PsiCatchSection)) return null;
 
@@ -1194,7 +1196,7 @@ public class HighlightUtil {
       // collect exceptions which are caught by this type
       Collection<PsiClassType> caught = ContainerUtil.findAll(thrownTypes, new Condition<PsiClassType>() {
         @Override
-        public boolean value(PsiClassType type) {
+        public boolean value(@NotNull PsiClassType type) {
           return catchType.isAssignableFrom(type);
         }
       });
@@ -1233,7 +1235,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static HighlightInfo checkNotAStatement(PsiStatement statement) {
+  static HighlightInfo checkNotAStatement(@NotNull PsiStatement statement) {
     if (!PsiUtil.isStatement(statement) && !PsiUtilCore.hasErrorElementChild(statement)) {
       return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, statement, JavaErrorMessages.message("not.a.statement"));
     }
@@ -1242,7 +1244,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkSwitchSelectorType(PsiSwitchStatement statement) {
+  public static HighlightInfo checkSwitchSelectorType(@NotNull PsiSwitchStatement statement) {
     final PsiExpression expression = statement.getExpression();
     HighlightInfo errorResult = null;
     if (expression != null && expression.getType() != null) {
@@ -1267,7 +1269,7 @@ public class HighlightUtil {
     return errorResult;
   }
 
-  public static boolean isValidTypeForSwitchSelector(PsiType type, final boolean languageLevel7OrHigher) {
+  public static boolean isValidTypeForSwitchSelector(@NotNull PsiType type, final boolean languageLevel7OrHigher) {
     if (TypeConversionUtil.getTypeRank(type) <= TypeConversionUtil.INT_RANK) return true;
     if (type instanceof PsiClassType) {
       PsiClass psiClass = ((PsiClassType)type).resolve();
@@ -1283,7 +1285,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  static HighlightInfo checkPolyadicOperatorApplicable(PsiPolyadicExpression expression) {
+  static HighlightInfo checkPolyadicOperatorApplicable(@NotNull PsiPolyadicExpression expression) {
     PsiExpression[] operands = expression.getOperands();
 
     PsiType lType = operands[0].getType();
@@ -1306,7 +1308,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkUnaryOperatorApplicable(PsiJavaToken token, PsiExpression expression) {
+  static HighlightInfo checkUnaryOperatorApplicable(@Nullable PsiJavaToken token, @Nullable PsiExpression expression) {
     if (token != null && expression != null && !TypeConversionUtil.isUnaryOperatorApplicable(token, expression)) {
       PsiType type = expression.getType();
       if (type == null) return null;
@@ -1323,8 +1325,8 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkThisOrSuperExpressionInIllegalContext(PsiExpression expr,
-                                                                         @Nullable PsiJavaCodeReferenceElement qualifier) {
+  static HighlightInfo checkThisOrSuperExpressionInIllegalContext(@NotNull PsiExpression expr,
+                                                                  @Nullable PsiJavaCodeReferenceElement qualifier) {
     if (expr instanceof PsiSuperExpression) {
       final PsiElement parent = expr.getParent();
       if (!(parent instanceof PsiReferenceExpression)) {
@@ -1363,9 +1365,9 @@ public class HighlightUtil {
     return null;
   }
 
-  private static boolean resolvesToImmediateSuperInterface(PsiExpression expr,
+  private static boolean resolvesToImmediateSuperInterface(@NotNull PsiExpression expr,
                                                            @Nullable PsiJavaCodeReferenceElement qualifier,
-                                                           PsiClass aClass) {
+                                                           @NotNull PsiClass aClass) {
     if (!(expr instanceof PsiSuperExpression) || qualifier == null || !PsiUtil.isLanguageLevel8OrHigher(expr)) return false;
     final PsiType superType = expr.getType();
     if (!(superType instanceof PsiClassType)) return false;
@@ -1373,13 +1375,13 @@ public class HighlightUtil {
     return superClass != null && aClass.equals(superClass);
   }
 
-  static String buildProblemWithStaticDescription(PsiElement refElement) {
+  static String buildProblemWithStaticDescription(@NotNull PsiElement refElement) {
     String type = LanguageFindUsages.INSTANCE.forLanguage(JavaLanguage.INSTANCE).getType(refElement);
     String name = HighlightMessageUtil.getSymbolName(refElement, PsiSubstitutor.EMPTY);
     return JavaErrorMessages.message("non.static.symbol.referenced.from.static.context", type, name);
   }
 
-  static void registerStaticProblemQuickFixAction(@NotNull PsiElement refElement, HighlightInfo errorResult, PsiJavaCodeReferenceElement place) {
+  static void registerStaticProblemQuickFixAction(@NotNull PsiElement refElement, HighlightInfo errorResult, @NotNull PsiJavaCodeReferenceElement place) {
     if (refElement instanceof PsiModifierListOwner) {
       QuickFixAction.registerQuickFixAction(errorResult, QUICK_FIX_FACTORY.createModifierListFix((PsiModifierListOwner)refElement, PsiModifier.STATIC, true, false));
     }
@@ -1393,7 +1395,7 @@ public class HighlightUtil {
     }
   }
 
-  private static boolean isInstanceReference(PsiJavaCodeReferenceElement place) {
+  private static boolean isInstanceReference(@NotNull PsiJavaCodeReferenceElement place) {
     PsiElement qualifier = place.getQualifier();
     if (qualifier == null) return true;
     if (!(qualifier instanceof PsiJavaCodeReferenceElement)) return false;
@@ -1404,11 +1406,13 @@ public class HighlightUtil {
     return qname == null || !Character.isLowerCase(qname.charAt(0));
   }
 
-  static String buildProblemWithAccessDescription(final PsiJavaCodeReferenceElement reference, final JavaResolveResult result) {
+  static String buildProblemWithAccessDescription(@NotNull final PsiJavaCodeReferenceElement reference, @NotNull final JavaResolveResult result) {
     return buildProblemWithAccessDescription(reference, result, result.getElement());
   }
 
-  static String buildProblemWithAccessDescription(final PsiJavaCodeReferenceElement reference, final JavaResolveResult result, final PsiElement resolved) {
+  static String buildProblemWithAccessDescription(@NotNull final PsiJavaCodeReferenceElement reference,
+                                                  @NotNull final JavaResolveResult result,
+                                                  @NotNull final PsiElement resolved) {
     assert resolved instanceof PsiModifierListOwner : resolved;
     PsiModifierListOwner refElement = (PsiModifierListOwner)resolved;
     String symbolName = HighlightMessageUtil.getSymbolName(refElement, result.getSubstitutor());
@@ -1459,7 +1463,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkCatchParameterIsThrowable(final PsiParameter parameter) {
+  public static HighlightInfo checkCatchParameterIsThrowable(@NotNull final PsiParameter parameter) {
     if (parameter.getDeclarationScope() instanceof PsiCatchSection) {
       final PsiType type = parameter.getType();
       return checkMustBeThrowable(type, parameter, true);
@@ -1509,7 +1513,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static PsiType getArrayInitializerType(final PsiArrayInitializerExpression element) {
+  private static PsiType getArrayInitializerType(@NotNull final PsiArrayInitializerExpression element) {
     final PsiType typeCheckResult = sameType(element.getInitializers());
     if (typeCheckResult != null) {
       return typeCheckResult.createArrayType();
@@ -1518,7 +1522,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static PsiType sameType(PsiExpression[] expressions) {
+  public static PsiType sameType(@NotNull PsiExpression[] expressions) {
     PsiType type = null;
     for (PsiExpression expression : expressions) {
       final PsiType currentType;
@@ -1539,7 +1543,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static HighlightInfo checkArrayInitializerCompatibleTypes(PsiExpression initializer, final PsiType componentType) {
+  private static HighlightInfo checkArrayInitializerCompatibleTypes(@NotNull PsiExpression initializer, final PsiType componentType) {
     PsiType initializerType = initializer.getType();
     if (initializerType == null) {
       return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, initializer,
@@ -1550,7 +1554,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkExpressionRequired(PsiReferenceExpression expression, JavaResolveResult resultForIncompleteCode) {
+  public static HighlightInfo checkExpressionRequired(@NotNull PsiReferenceExpression expression, @NotNull JavaResolveResult resultForIncompleteCode) {
     if (expression.getNextSibling() instanceof PsiErrorElement) return null;
     PsiElement resolved = resultForIncompleteCode.getElement();
     if (resolved == null) return null;
@@ -1563,7 +1567,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkArrayInitializerApplicable(PsiArrayInitializerExpression expression) {
+  public static HighlightInfo checkArrayInitializerApplicable(@NotNull PsiArrayInitializerExpression expression) {
     /*
     JLS 10.6 Array Initializers
     An array initializer may be specified in a declaration, or as part of an array creation expression
@@ -1585,7 +1589,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkCaseStatement(PsiSwitchLabelStatement statement) {
+  public static HighlightInfo checkCaseStatement(@NotNull PsiSwitchLabelStatement statement) {
     PsiSwitchStatement switchStatement = statement.getEnclosingSwitchStatement();
     if (switchStatement == null) {
       return HighlightInfo
@@ -1670,7 +1674,7 @@ public class HighlightUtil {
    * see JLS 8.3.2.3
    */
   @Nullable
-  public static HighlightInfo checkIllegalForwardReferenceToField(PsiReferenceExpression expression, PsiField referencedField) {
+  public static HighlightInfo checkIllegalForwardReferenceToField(@NotNull PsiReferenceExpression expression, @NotNull PsiField referencedField) {
     PsiClass containingClass = referencedField.getContainingClass();
     if (containingClass == null) return null;
     if (expression.getContainingFile() != referencedField.getContainingFile()) return null;
@@ -1696,7 +1700,7 @@ public class HighlightUtil {
    * @return field that has initializer with this element as subexpression or null if not found
    */
   @Nullable
-  static PsiField findEnclosingFieldInitializer(PsiElement element) {
+  static PsiField findEnclosingFieldInitializer(@Nullable PsiElement element) {
     while (element != null) {
       PsiElement parent = element.getParent();
       if (parent instanceof PsiField) {
@@ -1711,7 +1715,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static PsiClassInitializer findParentClassInitializer(PsiElement element) {
+  private static PsiClassInitializer findParentClassInitializer(@Nullable PsiElement element) {
     while (element != null) {
       if (element instanceof PsiClassInitializer) return (PsiClassInitializer)element;
       if (element instanceof PsiClass || element instanceof PsiMethod) return null;
@@ -1722,7 +1726,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkIllegalType(PsiTypeElement typeElement) {
+  public static HighlightInfo checkIllegalType(@Nullable PsiTypeElement typeElement) {
     if (typeElement == null || typeElement.getParent() instanceof PsiTypeElement) return null;
 
     if (PsiUtil.isInsideJavadocComment(typeElement)) return null;
@@ -1742,7 +1746,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkIllegalVoidType(PsiKeyword type) {
+  public static HighlightInfo checkIllegalVoidType(@NotNull PsiKeyword type) {
     if (!PsiKeyword.VOID.equals(type.getText())) return null;
 
     PsiElement parent = type.getParent();
@@ -1768,7 +1772,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkMemberReferencedBeforeConstructorCalled(PsiElement expression, PsiElement resolved) {
+  public static HighlightInfo checkMemberReferencedBeforeConstructorCalled(@NotNull PsiElement expression, PsiElement resolved) {
     PsiClass referencedClass;
     @NonNls String resolvedName;
     PsiType type;
@@ -1871,7 +1875,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static HighlightInfo checkReferenceToOurInstanceInsideThisOrSuper(final PsiElement expression,
+  private static HighlightInfo checkReferenceToOurInstanceInsideThisOrSuper(@NotNull final PsiElement expression,
                                                                             final PsiClass referencedClass,
                                                                             final String resolvedName) {
     if (PsiTreeUtil.getParentOfType(expression, PsiReferenceParameterList.class) != null) return null;
@@ -1918,13 +1922,13 @@ public class HighlightUtil {
     return null;
   }
 
-  private static HighlightInfo createMemberReferencedError(@NonNls final String resolvedName, TextRange textRange) {
+  private static HighlightInfo createMemberReferencedError(@NonNls final String resolvedName, @NotNull TextRange textRange) {
     String description = JavaErrorMessages.message("member.referenced.before.constructor.called", resolvedName);
     return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, textRange, description);
   }
 
   @Nullable
-  public static HighlightInfo checkImplicitThisReferenceBeforeSuper(PsiClass aClass) {
+  public static HighlightInfo checkImplicitThisReferenceBeforeSuper(@NotNull PsiClass aClass) {
     if (aClass instanceof PsiAnonymousClass) return null;
     PsiClass superClass = aClass.getSuperClass();
     if (superClass == null || !PsiUtil.isInnerClass(superClass)) return null;
@@ -1946,7 +1950,7 @@ public class HighlightUtil {
     return null;
   }
 
-  private static boolean isSuperCalledInConstructor(final PsiMethod constructor) {
+  private static boolean isSuperCalledInConstructor(@NotNull final PsiMethod constructor) {
     final PsiCodeBlock body = constructor.getBody();
     if (body == null) return false;
     final PsiStatement[] statements = body.getStatements();
@@ -1963,23 +1967,23 @@ public class HighlightUtil {
   }
 
   @Nullable
-  private static String getMethodExpressionName(PsiElement element) {
+  private static String getMethodExpressionName(@NotNull PsiElement element) {
     if (!(element instanceof PsiMethodCallExpression)) return null;
     PsiReferenceExpression methodExpression = ((PsiMethodCallExpression)element).getMethodExpression();
     return methodExpression.getReferenceName();
   }
 
-  public static boolean isSuperOrThisMethodCall(PsiElement element) {
+  public static boolean isSuperOrThisMethodCall(@NotNull PsiElement element) {
     String name = getMethodExpressionName(element);
     return PsiKeyword.SUPER.equals(name) || PsiKeyword.THIS.equals(name);
   }
 
-  public static boolean isSuperMethodCall(PsiElement element) {
+  public static boolean isSuperMethodCall(@NotNull PsiElement element) {
     String name = getMethodExpressionName(element);
     return PsiKeyword.SUPER.equals(name);
   }
 
-  private static boolean thisOrSuperReference(PsiExpression qualifierExpression, PsiClass aClass) {
+  private static boolean thisOrSuperReference(@Nullable PsiExpression qualifierExpression, PsiClass aClass) {
     if (qualifierExpression == null) return true;
     PsiJavaCodeReferenceElement qualifier;
     if (qualifierExpression instanceof PsiThisExpression) {
@@ -1998,7 +2002,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkLabelWithoutStatement(PsiLabeledStatement statement) {
+  public static HighlightInfo checkLabelWithoutStatement(@NotNull PsiLabeledStatement statement) {
     if (statement.getStatement() == null) {
       return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, statement, JavaErrorMessages.message("label.without.statement"));
     }
@@ -2007,7 +2011,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkLabelAlreadyInUse(PsiLabeledStatement statement) {
+  public static HighlightInfo checkLabelAlreadyInUse(@NotNull PsiLabeledStatement statement) {
     PsiIdentifier identifier = statement.getLabelIdentifier();
     String text = identifier.getText();
     PsiElement element = statement;
@@ -2025,7 +2029,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkUnclosedComment(PsiComment comment) {
+  public static HighlightInfo checkUnclosedComment(@NotNull PsiComment comment) {
     if (!(comment instanceof PsiDocComment) && !(comment.getTokenType() == JavaTokenType.C_STYLE_COMMENT)) return null;
     if (!comment.getText().endsWith("*/")) {
       int start = comment.getTextRange().getEndOffset() - 1;
@@ -2037,7 +2041,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static Collection<HighlightInfo> checkCatchTypeIsDisjoint(final PsiParameter parameter) {
+  static Collection<HighlightInfo> checkCatchTypeIsDisjoint(@NotNull final PsiParameter parameter) {
     if (!(parameter.getType() instanceof PsiDisjunctionType)) return null;
 
     final Collection<HighlightInfo> result = Lists.newArrayList();
@@ -2065,7 +2069,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  static Collection<HighlightInfo> checkExceptionAlreadyCaught(final PsiParameter parameter) {
+  static Collection<HighlightInfo> checkExceptionAlreadyCaught(@NotNull final PsiParameter parameter) {
     final PsiElement scope = parameter.getDeclarationScope();
     if (!(scope instanceof PsiCatchSection)) return null;
 
@@ -2109,7 +2113,7 @@ public class HighlightUtil {
     return result.size() > 0 ? result : null;
   }
 
-  private static boolean checkMultipleTypes(final PsiClass catchClass, final List<PsiType> upperCatchTypes) {
+  private static boolean checkMultipleTypes(final PsiClass catchClass, @NotNull final List<PsiType> upperCatchTypes) {
     for (int i = upperCatchTypes.size() - 1; i >= 0; i--) {
       if (checkSingleType(catchClass, upperCatchTypes.get(i))) return true;
     }
@@ -2123,7 +2127,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkTernaryOperatorConditionIsBoolean(PsiExpression expression, PsiType type) {
+  public static HighlightInfo checkTernaryOperatorConditionIsBoolean(@NotNull PsiExpression expression, PsiType type) {
     if (expression.getParent() instanceof PsiConditionalExpression &&
         ((PsiConditionalExpression)expression.getParent()).getCondition() == expression && !TypeConversionUtil.isBooleanType(type)) {
       return createIncompatibleTypeHighlightInfo(PsiType.BOOLEAN, type, expression.getTextRange());
@@ -2133,7 +2137,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkStatementPrependedWithCaseInsideSwitch(PsiStatement statement) {
+  public static HighlightInfo checkStatementPrependedWithCaseInsideSwitch(@NotNull PsiStatement statement) {
     if (!(statement instanceof PsiSwitchLabelStatement) && statement.getParent() instanceof PsiCodeBlock &&
         statement.getParent().getParent() instanceof PsiSwitchStatement &&
         ((PsiCodeBlock)statement.getParent()).getStatements().length != 0 &&
@@ -2146,7 +2150,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkAssertOperatorTypes(PsiExpression expression, PsiType type) {
+  public static HighlightInfo checkAssertOperatorTypes(@NotNull PsiExpression expression, @Nullable PsiType type) {
     if (type == null) return null;
     if (!(expression.getParent() instanceof PsiAssertStatement)) {
       return null;
@@ -2165,7 +2169,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkSynchronizedExpressionType(PsiExpression expression, PsiType type) {
+  public static HighlightInfo checkSynchronizedExpressionType(@NotNull PsiExpression expression, @Nullable PsiType type) {
     if (type == null) return null;
     if (expression.getParent() instanceof PsiSynchronizedStatement) {
       PsiSynchronizedStatement synchronizedStatement = (PsiSynchronizedStatement)expression.getParent();
@@ -2180,7 +2184,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkConditionalExpressionBranchTypesMatch(final PsiExpression expression, PsiType type) {
+  public static HighlightInfo checkConditionalExpressionBranchTypesMatch(@NotNull final PsiExpression expression, PsiType type) {
     PsiElement parent = expression.getParent();
     if (!(parent instanceof PsiConditionalExpression)) {
       return null;
@@ -2201,7 +2205,7 @@ public class HighlightUtil {
     return null;
   }
 
-  private static HighlightInfo createIncompatibleTypeHighlightInfo(final PsiType lType, final PsiType rType, final TextRange textRange) {
+  private static HighlightInfo createIncompatibleTypeHighlightInfo(final PsiType lType, final PsiType rType, @NotNull final TextRange textRange) {
     PsiType lType1 = lType;
     PsiType rType1 = rType;
     PsiTypeParameter[] lTypeParams = PsiTypeParameter.EMPTY_ARRAY;
@@ -2264,8 +2268,8 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkSingleImportClassConflict(PsiImportStatement statement,
-                                                             Map<String, Pair<PsiImportStaticReferenceElement, PsiClass>> importedClasses) {
+  public static HighlightInfo checkSingleImportClassConflict(@NotNull PsiImportStatement statement,
+                                                             @NotNull Map<String, Pair<PsiImportStaticReferenceElement, PsiClass>> importedClasses) {
     if (statement.isOnDemand()) return null;
     PsiElement element = statement.resolve();
     if (element instanceof PsiClass) {
@@ -2288,14 +2292,14 @@ public class HighlightUtil {
     return "<font color=red><b>" + getFQName(type, true) + "</b></font>";
   }
 
-  private static String getFQName(PsiType type, boolean longName) {
+  private static String getFQName(@Nullable PsiType type, boolean longName) {
     if (type == null) return "";
     return XmlStringUtil.escapeString(longName ? type.getInternalCanonicalText() : type.getPresentableText());
   }
 
 
   @Nullable
-  public static HighlightInfo checkMustBeThrowable(PsiType type, PsiElement context, boolean addCastIntention) {
+  static HighlightInfo checkMustBeThrowable(@Nullable PsiType type, @NotNull PsiElement context, boolean addCastIntention) {
     if (type == null) return null;
     PsiElementFactory factory = JavaPsiFacade.getInstance(context.getProject()).getElementFactory();
     PsiClassType throwable = factory.createTypeByFQClassName("java.lang.Throwable", context.getResolveScope());
@@ -2313,7 +2317,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  private static HighlightInfo checkMustBeThrowable(PsiClass aClass, PsiElement context) {
+  private static HighlightInfo checkMustBeThrowable(@Nullable PsiClass aClass, @NotNull PsiElement context) {
     if (aClass == null) return null;
     PsiClassType type = JavaPsiFacade.getInstance(aClass.getProject()).getElementFactory().createType(aClass);
     return checkMustBeThrowable(type, context, false);
@@ -2321,7 +2325,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkLabelDefined(PsiIdentifier labelIdentifier, PsiStatement exitedStatement) {
+  static HighlightInfo checkLabelDefined(@Nullable PsiIdentifier labelIdentifier, @Nullable PsiStatement exitedStatement) {
     if (labelIdentifier == null) return null;
     String label = labelIdentifier.getText();
     if (label == null) return null;
@@ -2334,7 +2338,7 @@ public class HighlightUtil {
 
 
   @Nullable
-  public static HighlightInfo checkReference(final PsiJavaCodeReferenceElement ref, final JavaResolveResult result) {
+  static HighlightInfo checkReference(@NotNull final PsiJavaCodeReferenceElement ref, @NotNull final JavaResolveResult result) {
     if (suppressed(Kind.REFERENCE, ref)) return null;
 
     final PsiElement refName = ref.getReferenceNameElement();
@@ -2414,21 +2418,23 @@ public class HighlightUtil {
       if (Comparing.strEqual(((PsiClass)resolved).getQualifiedName(), ((PsiClass)resolved).getName())) {
         final PsiElement parent = ref.getParent();
         if (parent instanceof PsiImportStaticReferenceElement || parent instanceof PsiImportStatementBase) {
-          return HighlightInfo.createHighlightInfo(HighlightInfoType.WRONG_REF, refName, JavaErrorMessages.message("cannot.resolve.symbol", refName.getText()));
+          return HighlightInfo.createHighlightInfo(HighlightInfoType.WRONG_REF, refName,
+                                                                 JavaErrorMessages.message("cannot.resolve.symbol", refName.getText()));
         }
       }
     }
     return highlightInfo;
   }
 
-  private static String format(PsiElement element) {
+  @NotNull
+  private static String format(@NotNull PsiElement element) {
     if (element instanceof PsiClass) return formatClass((PsiClass)element);
     if (element instanceof PsiMethod) return formatMethod((PsiMethod)element);
     if (element instanceof PsiField) return formatField((PsiField)element);
     return ElementDescriptionUtil.getElementDescription(element, HighlightUsagesDescriptionLocation.INSTANCE);
   }
 
-  private static boolean isInsidePackageStatement(PsiElement element) {
+  private static boolean isInsidePackageStatement(@Nullable PsiElement element) {
     while (element != null) {
       if (element instanceof PsiPackageStatement) return true;
       if (!(element instanceof PsiIdentifier) && !(element instanceof PsiJavaCodeReferenceElement)) return false;
@@ -2438,9 +2444,9 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkElementInReferenceList(PsiJavaCodeReferenceElement ref,
-                                                          PsiReferenceList referenceList,
-                                                          JavaResolveResult resolveResult) {
+  static HighlightInfo checkElementInReferenceList(@NotNull PsiJavaCodeReferenceElement ref,
+                                                   @NotNull PsiReferenceList referenceList,
+                                                   @NotNull JavaResolveResult resolveResult) {
     PsiElement resolved = resolveResult.getElement();
     HighlightInfo highlightInfo = null;
     PsiElement refGrandParent = referenceList.getParent();
@@ -2474,13 +2480,13 @@ public class HighlightUtil {
   }
 
 
-  public static boolean isSerializable(PsiClass aClass) {
+  public static boolean isSerializable(@NotNull PsiClass aClass) {
     PsiManager manager = aClass.getManager();
     PsiClass serializableClass = JavaPsiFacade.getInstance(manager.getProject()).findClass("java.io.Serializable", aClass.getResolveScope());
     return serializableClass != null && aClass.isInheritor(serializableClass, true);
   }
 
-  public static boolean isSerializationImplicitlyUsedField(PsiField field) {
+  public static boolean isSerializationImplicitlyUsedField(@NotNull PsiField field) {
     final String name = field.getName();
     if (!SERIAL_VERSION_UID_FIELD_NAME.equals(name) && !SERIAL_PERSISTENT_FIELDS_FIELD_NAME.equals(name)) return false;
     if (!field.hasModifierProperty(PsiModifier.STATIC)) return false;
@@ -2489,7 +2495,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkClassReferenceAfterQualifier(final PsiReferenceExpression expression, final PsiElement resolved) {
+  public static HighlightInfo checkClassReferenceAfterQualifier(@NotNull final PsiReferenceExpression expression, final PsiElement resolved) {
     if (!(resolved instanceof PsiClass)) return null;
     final PsiExpression qualifier = expression.getQualifierExpression();
     if (qualifier == null) return null;
@@ -2512,7 +2518,7 @@ public class HighlightUtil {
   }
 
   @Nullable
-  static HighlightInfo checkAnnotationMethodParameters(PsiParameterList list) {
+  static HighlightInfo checkAnnotationMethodParameters(@NotNull PsiParameterList list) {
     if (list.getParent() instanceof PsiAnnotationMethod && list.getParametersCount() > 0) {
       final String message = JavaErrorMessages.message("annotation.interface.members.may.not.have.parameters");
       return HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, list, message);
@@ -2582,17 +2588,17 @@ public class HighlightUtil {
   }
 
   @Nullable
-  public static HighlightInfo checkDiamondFeature(final PsiTypeElement typeElement) {
+  public static HighlightInfo checkDiamondFeature(@NotNull final PsiTypeElement typeElement) {
     return typeElement.getType() instanceof PsiDiamondType ? checkFeature(typeElement.getParent(), Feature.DIAMOND_TYPES) : null;
   }
 
   @Nullable
-  public static HighlightInfo checkMultiCatchFeature(final PsiParameter parameter) {
+  public static HighlightInfo checkMultiCatchFeature(@NotNull final PsiParameter parameter) {
     return parameter.getType() instanceof PsiDisjunctionType ? checkFeature(parameter, Feature.MULTI_CATCH) : null;
   }
 
   @Nullable
-  public static HighlightInfo checkTryWithResourcesFeature(final PsiResourceVariable resourceVariable) {
+  public static HighlightInfo checkTryWithResourcesFeature(@NotNull final PsiResourceVariable resourceVariable) {
     return checkFeature(resourceVariable.getParent(), Feature.TRY_WITH_RESOURCES);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightVisitor.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightVisitor.java
index 3d527a50f1ea..aa2f2c83ebc6 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightVisitor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightVisitor.java
@@ -171,11 +171,11 @@ public class DefaultHighlightVisitor implements HighlightVisitor, DumbAware {
     TextRange range = element.getTextRange();
     String errorDescription = element.getErrorDescription();
     if (!range.isEmpty()) {
-      final HighlightInfo highlightInfo = HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, range, errorDescription);
+      final HighlightInfo info = HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, range, errorDescription);
       for(ErrorQuickFixProvider provider: Extensions.getExtensions(ErrorQuickFixProvider.EP_NAME)) {
-        provider.registerErrorQuickFix(element, highlightInfo);
+        provider.registerErrorQuickFix(element, info);
       }
-      return highlightInfo;
+      return info;
     }
     int offset = range.getStartOffset();
     PsiFile containingFile = element.getContainingFile();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
index 5b449a89a6b5..d327dba2249e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/GeneralHighlightingPass.java
@@ -40,6 +40,7 @@ import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.editor.ex.MarkupModelEx;
+import com.intellij.openapi.editor.ex.RangeHighlighterEx;
 import com.intellij.openapi.editor.impl.DocumentMarkupModel;
 import com.intellij.openapi.editor.markup.MarkupModel;
 import com.intellij.openapi.editor.markup.TextAttributes;
@@ -72,6 +73,7 @@ import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.*;
 import java.util.List;
@@ -593,16 +595,17 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
     final Runnable action = new Runnable() {
       @Override
       public void run() {
-        //noinspection unchecked
         boolean failed = false;
+        //noinspection unchecked
         for (List<PsiElement> elements : new List[]{elements1, elements2}) {
           int nextLimit = chunkSize;
           for (int i = 0; i < elements.size(); i++) {
             PsiElement element = elements.get(i);
             progress.checkCanceled();
 
+            PsiElement parent = element.getParent();
             if (element != myFile && !skipParentsSet.isEmpty() && element.getFirstChild() != null && skipParentsSet.contains(element)) {
-              skipParentsSet.add(element.getParent());
+              skipParentsSet.add(parent);
               continue;
             }
 
@@ -637,6 +640,7 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
               nextLimit = i + chunkSize;
             }
 
+            TextRange elementRange = element.getTextRange();
             //noinspection ForLoopReplaceableByForEach
             for (int j = 0; j < holder.size(); j++) {
               final HighlightInfo info = holder.get(j);
@@ -646,12 +650,19 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
               boolean isError = info.getSeverity() == HighlightSeverity.ERROR;
               if (isError) {
                 if (!forceHighlightParents) {
-                  skipParentsSet.add(element.getParent());
+                  skipParentsSet.add(parent);
                 }
                 myErrorFound = true;
               }
+              // if this highlight info range is exactly the same as the element range we are visiting
+              // that means we can clear this highlight as soon as visitors won't produce any highlights during visiting the same range next time.
+              info.bijective = elementRange.equalsToRange(info.startOffset, info.endOffset);
+
               myTransferToEDTQueue.offer(info);
             }
+            if (parent == null || !Comparing.equal(elementRange, parent.getTextRange())) {
+              killAbandonedHighlightsUnder(elementRange, holder, progress);
+            }
           }
           advanceProgress(elements.size() - (nextLimit-chunkSize));
           if (elements == elements1) after1.run();
@@ -662,6 +673,36 @@ public class GeneralHighlightingPass extends ProgressableTextEditorHighlightingP
     analyzeByVisitors(progress, visitors, holder, 0, action);
   }
 
+  private void killAbandonedHighlightsUnder(@NotNull final TextRange range,
+                                            @NotNull final HighlightInfoHolder holder,
+                                            @NotNull final ProgressIndicator progress) {
+    DaemonCodeAnalyzerImpl.processHighlights(getDocument(), myProject, null, range.getStartOffset(), range.getEndOffset(), new Processor<HighlightInfo>() {
+      @Override
+      public boolean process(final HighlightInfo existing) {
+        if (existing.bijective &&
+            existing.group == Pass.UPDATE_ALL &&
+            range.equalsToRange(existing.getActualStartOffset(), existing.getActualEndOffset())) {
+          for (int j = 0; j < holder.size(); j++) {
+            HighlightInfo created = holder.get(j);
+            if (existing.equalsByActualOffset(created)) return true;
+          }
+          // seems that highlight info "existing" is going to disappear
+          // remove it earlier
+          SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+              RangeHighlighterEx highlighter = existing.highlighter;
+              if (!progress.isCanceled() && highlighter != null) {
+                highlighter.dispose();
+              }
+            }
+          });
+        }
+        return true;
+      }
+    });
+  }
+
   private void analyzeByVisitors(@NotNull final ProgressIndicator progress,
                                  @NotNull final HighlightVisitor[] visitors,
                                  @NotNull final HighlightInfoHolder holder,
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
index 5a6ab0b26e38..811cf46a6d88 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/UpdateHighlightersUtil.java
@@ -650,7 +650,7 @@ public class UpdateHighlightersUtil {
         info.highlighter.dispose();
       }
     }
-    
+
     assertMarkupConsistent(markup, project);
 
     if (!toRemove.isEmpty()) {

From 1f365821677ea9300c705a72a0f8f2a5baaa8e3e Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Fri, 1 Jun 2012 16:52:57 +0400
Subject: [PATCH 084/239] fix missing icons

---
 platform/util/src/com/intellij/openapi/util/IconLoader.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java
index 81b2322e3153..142f678f6866 100644
--- a/platform/util/src/com/intellij/openapi/util/IconLoader.java
+++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java
@@ -157,6 +157,7 @@ public final class IconLoader {
 
   @Nullable
   public static Icon findIcon(final String path, final ClassLoader aClassLoader) {
+    if (path.startsWith("AllIcons.")) return getReflectiveIcon(path);
     if (!path.startsWith("/")) return null;
 
     final URL url = aClassLoader.getResource(path.substring(1));

From f2bde69eb560aed59036bc22291a537380ba96c0 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Fri, 1 Jun 2012 17:26:41 +0400
Subject: [PATCH 085/239] IDEA-86695 Git cherry-pick correctly get the instance
 of GitCheckinEnvironment

AbstractVcs#getCheckinEnvironment returns a proxy instance.
We can query directly for the Service.
---
 .../src/git4idea/history/browser/GitCherryPicker.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
index c391836019fb..1ea1dff3f174 100644
--- a/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
+++ b/plugins/git4idea/src/git4idea/history/browser/GitCherryPicker.java
@@ -18,6 +18,7 @@ package git4idea.history.browser;
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.application.ModalityState;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
@@ -496,10 +497,9 @@ public class GitCherryPicker {
       public void execute(Collection<Change> changes, String commitMessage) {
         final Collection<Document> committingDocs = markCommittingDocs();
         try {
-          CheckinEnvironment ce = myPlatformFacade.getVcs(myProject).getCheckinEnvironment();
-          LOG.assertTrue(ce != null && ce instanceof GitCheckinEnvironment, "Invalid CheckinEnvironment: " + ce);
+          GitCheckinEnvironment ce = ServiceManager.getService(myProject, GitCheckinEnvironment.class);
           try {
-            ((GitCheckinEnvironment)ce).reset();
+            ce.reset();
             List<VcsException> exceptions = ce.commit(myChanges, myCommitMessage);
             VcsDirtyScopeManager.getInstance(myProject).filePathsDirty(ChangesUtil.getPaths(myChanges), null);
             if (exceptions != null && !exceptions.isEmpty()) {

From b030e81827e58a54d471856441455e6d9e5c2db6 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 1 Jun 2012 15:33:45 +0200
Subject: [PATCH 086/239] PyCharm's skeletons are stored under 'system' and
 need to be indexed; the check for 'config' or 'system' was only needed for
 performance reasons. Since files under 'system' are normally not of an
 indexable file type anyway, remove check for 'system' and check for 'logs'
 instead (which does contain files that may be indexed). [r=jeka]

---
 .../src/com/intellij/util/indexing/FileBasedIndexImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
index b804aa97bef2..cdcfd879d66e 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
@@ -117,7 +117,7 @@ public class FileBasedIndexImpl extends FileBasedIndex {
   private static final int ALREADY_PROCESSED = 0x04;
 
   @Nullable private final String myConfigPath;
-  @Nullable private final String mySystemPath;
+  @Nullable private final String myLogPath;
   private final boolean myIsUnitTestMode;
   @Nullable private ScheduledFuture<?> myFlushingFuture;
   private volatile int myLocalModCount;
@@ -144,7 +144,7 @@ public class FileBasedIndexImpl extends FileBasedIndex {
     myFileTypeManager = fileTypeManager;
     myIsUnitTestMode = ApplicationManager.getApplication().isUnitTestMode();
     myConfigPath = calcConfigPath(PathManager.getConfigPath());
-    mySystemPath = calcConfigPath(PathManager.getSystemPath());
+    myLogPath = calcConfigPath(PathManager.getLogPath());
 
     final MessageBusConnection connection = bus.connect();
     connection.subscribe(PsiDocumentTransactionListener.TOPIC, new PsiDocumentTransactionListener() {
@@ -2117,7 +2117,7 @@ public class FileBasedIndexImpl extends FileBasedIndex {
   private boolean isUnderConfigOrSystem(@NotNull VirtualFile file) {
     final String filePath = file.getPath();
     return myConfigPath != null && FileUtil.startsWith(filePath, myConfigPath) ||
-           mySystemPath != null && FileUtil.startsWith(filePath, mySystemPath);
+           myLogPath != null && FileUtil.startsWith(filePath, myLogPath);
   }
 
   private static boolean isMock(final VirtualFile file) {

From e424871025e89c874848881c08556884b8409f43 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Fri, 1 Jun 2012 17:57:21 +0400
Subject: [PATCH 087/239] IDEA-73251 Reimplemented with code folding

---
 .../JavaCodeFoldingOptionsProvider.java       |   1 +
 .../impl/RecursiveCallLineMarkerProvider.java |  94 -------------
 .../impl/JavaCodeFoldingSettingsImpl.java     |  11 ++
 .../RecursiveMethodCallFoldingBuilder.java    | 126 ++++++++++++++++++
 .../folding/JavaCodeFoldingSettings.java      |   3 +
 .../src/messages/ApplicationBundle.properties |   1 +
 resources/src/META-INF/IdeaPlugin.xml         |   2 +-
 7 files changed, 143 insertions(+), 95 deletions(-)
 delete mode 100644 java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
 create mode 100644 java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java

diff --git a/java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java b/java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java
index e33b90bab9aa..a0316253221b 100644
--- a/java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java
+++ b/java/java-impl/src/com/intellij/application/options/editor/JavaCodeFoldingOptionsProvider.java
@@ -36,5 +36,6 @@ public class JavaCodeFoldingOptionsProvider extends BeanConfigurable<JavaCodeFol
     checkBox("COLLAPSE_I18N_MESSAGES", ApplicationBundle.message("checkbox.collapse.i18n.messages"));
     checkBox("COLLAPSE_SUPPRESS_WARNINGS", ApplicationBundle.message("checkbox.collapse.suppress.warnings"));
     checkBox("COLLAPSE_END_OF_LINE_COMMENTS", ApplicationBundle.message("checkbox.collapse.end.of.line.comments"));
+    checkBox("COLLAPSE_RECURSIVE_METHOD_CALLS", ApplicationBundle.message("checkbox.collapse.recursive.method.calls"));
   }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
deleted file mode 100644
index ce5130a9aff9..000000000000
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.codeInsight.daemon.impl;
-
-import com.intellij.codeHighlighting.Pass;
-import com.intellij.codeInsight.daemon.LineMarkerInfo;
-import com.intellij.codeInsight.daemon.LineMarkerProvider;
-import com.intellij.icons.AllIcons;
-import com.intellij.openapi.editor.markup.GutterIconRenderer;
-import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.*;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.FunctionUtil;
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author Danila Ponomarenko
- */
-public class RecursiveCallLineMarkerProvider implements LineMarkerProvider, DumbAware {
-  private static final Icon RECURSIVE_METHOD_ICON = AllIcons.Gutter.RecursiveMethod;
-
-  @Override
-  public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
-    return null;    //do nothing
-  }
-
-  @Override
-  public void collectSlowLineMarkers(@NotNull List<PsiElement> elements, @NotNull Collection<LineMarkerInfo> result) {
-    final Set<PsiStatement> statements = new HashSet<PsiStatement>();
-
-    for (PsiElement element : elements) {
-      if (element instanceof PsiMethodCallExpression) {
-        final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)element;
-        final PsiStatement statement = PsiTreeUtil.getParentOfType(methodCall, PsiStatement.class, true, PsiMethod.class);
-        if (!statements.contains(statement) && isRecursiveMethodCall(methodCall)) {
-          statements.add(statement);
-          result.add(new RecursiveMethodCallMarkerInfo(methodCall));
-        }
-      }
-    }
-  }
-
-  private static boolean isRecursiveMethodCall(@NotNull PsiMethodCallExpression methodCall) {
-    final PsiMethod referencedMethod = methodCall.resolveMethod();
-
-    if (referencedMethod == null || !referencedMethod.isValid() || !methodCall.isValid()) {
-      return false;
-    }
-
-    final PsiFile methodCallFile = methodCall.getContainingFile();
-    final PsiFile methodFile = referencedMethod.getContainingFile();
-
-    if (methodCallFile == null || methodFile == null || !methodCallFile.equals(methodFile)) {
-      return false;
-    }
-
-    final TextRange rmRange = referencedMethod.getTextRange();
-    final int mcOffset = methodCall.getTextRange().getStartOffset();
-    return rmRange != null && rmRange.contains(mcOffset);
-  }
-
-  private static class RecursiveMethodCallMarkerInfo extends LineMarkerInfo<PsiMethodCallExpression> {
-    private RecursiveMethodCallMarkerInfo(@NotNull PsiMethodCallExpression methodCall) {
-      super(methodCall,
-            methodCall.getTextRange(),
-            RECURSIVE_METHOD_ICON,
-            Pass.UPDATE_OVERRIDEN_MARKERS,
-            FunctionUtil.<PsiMethodCallExpression, String>constant("Recursive method call"),
-            null,
-            GutterIconRenderer.Alignment.RIGHT
-      );
-    }
-  }
-}
diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java
index 918d1f365626..6801385d880f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaCodeFoldingSettingsImpl.java
@@ -165,6 +165,16 @@ public class JavaCodeFoldingSettingsImpl extends JavaCodeFoldingSettings impleme
     COLLAPSE_END_OF_LINE_COMMENTS = value;
   }
 
+  @Override
+  public boolean isCollapseRecursiveMethodCalls() {
+    return COLLAPSE_RECURSIVE_METHOD_CALLS;
+  }
+
+  @Override
+  public void setCollapseRecursiveMethodCalls(boolean value) {
+    COLLAPSE_RECURSIVE_METHOD_CALLS = value;
+  }
+
   @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_ACCESSORS = false;
   @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_INNER_CLASSES = false;
   @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_ANONYMOUS_CLASSES = false;
@@ -174,6 +184,7 @@ public class JavaCodeFoldingSettingsImpl extends JavaCodeFoldingSettings impleme
   @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_I18N_MESSAGES = true;
   @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_SUPPRESS_WARNINGS = true;
   @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_END_OF_LINE_COMMENTS = false;
+  @SuppressWarnings({"WeakerAccess"}) public boolean COLLAPSE_RECURSIVE_METHOD_CALLS = true;
 
   @Override
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
new file mode 100644
index 000000000000..b846f2ee6ecd
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.folding.impl;
+
+import com.intellij.codeInsight.folding.JavaCodeFoldingSettings;
+import com.intellij.lang.ASTNode;
+import com.intellij.lang.folding.FoldingBuilderEx;
+import com.intellij.lang.folding.FoldingDescriptor;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.*;
+import com.intellij.psi.impl.source.SourceTreeToPsiMap;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public class RecursiveMethodCallFoldingBuilder extends FoldingBuilderEx {
+
+  @NotNull
+  @Override
+  public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement root, @NotNull Document document, boolean quick) {
+    if (!(root instanceof PsiJavaFile) || quick || !JavaCodeFoldingSettings.getInstance().isCollapseRecursiveMethodCalls()) {
+      return FoldingDescriptor.EMPTY;
+    }
+    final List<FoldingDescriptor> result = new ArrayList<FoldingDescriptor>();
+    root.accept(new JavaRecursiveElementWalkingVisitor() {
+
+      @Override
+      public void visitMethodCallExpression(PsiMethodCallExpression expression) {
+        if (isRecursiveMethodCall(expression)) {
+          result.add(new FoldingDescriptor(expression, expression.getTextRange()));
+        }
+        else {
+          super.visitMethodCallExpression(expression);
+        }
+      }
+    });
+
+    Collections.sort(result, new Comparator<FoldingDescriptor>() {
+      @Override
+      public int compare(FoldingDescriptor o1, FoldingDescriptor o2) {
+        return o2.getRange().getStartOffset() - o1.getRange().getStartOffset();
+      }
+    });
+
+    return result.toArray(new FoldingDescriptor[result.size()]);
+  }
+
+  @Override
+  public boolean isCollapsedByDefault(@NotNull ASTNode node) {
+    final PsiElement element = SourceTreeToPsiMap.treeElementToPsi(node);
+    JavaCodeFoldingSettings settings = JavaCodeFoldingSettings.getInstance();
+
+    if (element instanceof PsiMethodCallExpression) {
+      final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)element;
+      return isRecursiveMethodCall(methodCall) && settings.isCollapseRecursiveMethodCalls();
+    }
+    return false;
+  }
+
+  private static final char ANTICLOCKWISE_GAPPED_CIRCLE_ARROW = '\u27F2'; //⟲
+
+  @Override
+  public String getPlaceholderText(@NotNull ASTNode node) {
+    return getPlaceholderText(node.getPsi());
+  }
+
+  @NotNull
+  private static String getPlaceholderText(@NotNull PsiElement element) {
+    if (element instanceof PsiMethodCallExpression) {
+      final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)element;
+      return getPlaceholderText(methodCall);
+    }
+
+    return element.getText();
+  }
+
+  @NotNull
+  private static String getPlaceholderText(@NotNull PsiMethodCallExpression methodCall) {
+    return getQualifierText(methodCall) + ANTICLOCKWISE_GAPPED_CIRCLE_ARROW + methodCall.getArgumentList().getText();
+  }
+
+  @NotNull
+  private static String getQualifierText(@NotNull PsiMethodCallExpression methodCall) {
+    final PsiElement qualifier = methodCall.getMethodExpression().getQualifier();
+    return qualifier != null ? qualifier.getText() + "." : "";
+  }
+
+  private static boolean isRecursiveMethodCall(@NotNull PsiMethodCallExpression methodCall) {
+    final PsiMethod referencedMethod = methodCall.resolveMethod();
+
+    if (referencedMethod == null || !referencedMethod.isValid() || !methodCall.isValid()) {
+      return false;
+    }
+
+    final PsiFile methodCallFile = methodCall.getContainingFile();
+    final PsiFile methodFile = referencedMethod.getContainingFile();
+
+    if (methodCallFile == null || methodFile == null || !methodCallFile.equals(methodFile)) {
+      return false;
+    }
+
+    final TextRange rmRange = referencedMethod.getTextRange();
+    final int mcOffset = methodCall.getTextRange().getStartOffset();
+    return rmRange != null && rmRange.contains(mcOffset);
+  }
+}
diff --git a/java/openapi/src/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java b/java/openapi/src/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java
index 585ce02a81f6..f0325b5506f4 100644
--- a/java/openapi/src/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java
+++ b/java/openapi/src/com/intellij/codeInsight/folding/JavaCodeFoldingSettings.java
@@ -62,4 +62,7 @@ public abstract class JavaCodeFoldingSettings {
 
   public abstract boolean isCollapseEndOfLineComments();
   public abstract void setCollapseEndOfLineComments(boolean value);
+
+  public abstract boolean isCollapseRecursiveMethodCalls();
+  public abstract void setCollapseRecursiveMethodCalls(boolean value);
 }
diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
index c8f43e12f7c8..145f5ab1b536 100644
--- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties
+++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties
@@ -348,6 +348,7 @@ checkbox.collapse.method.bodies=Method bodies
 checkbox.collapse.javadoc.comments=Documentation comments
 checkbox.collapse.title.imports=Imports
 checkbox.collapse.file.header=File header
+checkbox.collapse.recursive.method.calls=<html>Recursive method calls<html>
 label.collapse.by.default=Collapse by default:
 checkbox.show.code.folding.outline=Show code folding outline
 group.tab.appearance=Tab Appearance
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index a2400794960f..6d54f6c7e979 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -749,6 +749,7 @@
     <lang.braceMatcher language="JAVA" implementationClass="com.intellij.codeInsight.highlighting.JavaBraceMatcher"/>
 
     <lang.foldingBuilder language="JAVA" implementationClass="com.intellij.codeInsight.folding.impl.JavaFoldingBuilder"/>
+    <lang.foldingBuilder language="JAVA" implementationClass="com.intellij.codeInsight.folding.impl.RecursiveMethodCallFoldingBuilder"/>
 
     <codeInsight.parameterInfo language="JAVA" implementationClass="com.intellij.codeInsight.hint.api.impls.MethodParameterInfoHandler"/>
     <codeInsight.parameterInfo language="JAVA" implementationClass="com.intellij.codeInsight.hint.api.impls.ReferenceParameterInfoHandler"/>
@@ -761,7 +762,6 @@
     <codeInsight.gotoSuper language="JAVA" implementationClass="com.intellij.codeInsight.navigation.JavaGotoSuperHandler"/>
     <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.JavaLineMarkerProvider"/>
     <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.IconLineMarkerProvider"/>
-    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.RecursiveCallLineMarkerProvider"/>
     <colorProvider implementation="com.intellij.codeInsight.daemon.impl.JavaColorProvider" />
 
     <annotator language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.JavaDocAnnotator"/>

From 790110afa3dbb698da390b280fca67afb31c26b0 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 1 Jun 2012 18:03:10 +0400
Subject: [PATCH 088/239] moving test data to the right place

---
 .../generateactions/addColumn/after1.html     |  43 -
 .../generateactions/addColumn/after2.xhtml    |  41 -
 .../generateactions/addColumn/after3.jsp      |  74 --
 .../generateactions/addColumn/after4.jspx     |  74 --
 .../generateactions/addColumn/after5.html     |  79 --
 .../generateactions/addColumn/after6.html     |  11 -
 .../generateactions/addColumn/after7.html     | 966 ------------------
 .../generateactions/addColumn/after8.xml      |  41 -
 .../generateactions/addColumn/before1.html    |  41 -
 .../generateactions/addColumn/before2.xhtml   |  41 -
 .../generateactions/addColumn/before3.jsp     |  69 --
 .../generateactions/addColumn/before4.jspx    |  69 --
 .../generateactions/addColumn/before5.html    |  69 --
 .../generateactions/addColumn/before6.html    |   6 -
 .../generateactions/addColumn/before7.html    | 866 ----------------
 .../generateactions/addColumn/before8.xml     |  41 -
 .../deprecatedTag/SwitchToHtml5QuickFix.html  |   8 -
 .../deprecatedTag/SwitchToHtml5QuickFix1.html |  10 -
 .../deprecatedTag/actions/after0.html         |  12 -
 .../deprecatedTag/actions/after1.html         |  12 -
 .../deprecatedTag/actions/after2.jspx         |  11 -
 .../deprecatedTag/actions/after3.jsp          |  33 -
 .../deprecatedTag/actions/before0.html        |  12 -
 .../deprecatedTag/actions/before1.html        |  12 -
 .../deprecatedTag/actions/before2.jspx        |  11 -
 .../deprecatedTag/actions/before3.jsp         |   2 -
 .../deprecatedTag/html_deptag5.xhtml          |   4 -
 .../deprecatedTag/html_deptag5.xml            |   9 -
 .../formInputWithoutLabel/actions/after1.html |  13 -
 .../actions/after2.xhtml                      |  15 -
 .../formInputWithoutLabel/actions/after3.jsp  |  11 -
 .../formInputWithoutLabel/actions/after4.jspx |  15 -
 .../formInputWithoutLabel/actions/after5.html |  11 -
 .../actions/after6.xhtml                      |  12 -
 .../formInputWithoutLabel/actions/after7.jsp  |   8 -
 .../actions/before1.html                      |  11 -
 .../actions/before2.xhtml                     |  13 -
 .../formInputWithoutLabel/actions/before3.jsp |   9 -
 .../actions/before4.jspx                      |  13 -
 .../actions/before5.html                      |  11 -
 .../actions/before6.xhtml                     |  13 -
 .../formInputWithoutLabel/actions/before7.jsp |   9 -
 .../formInputWithoutLabel/nowarnings.html     |  31 -
 .../formInputWithoutLabel/nowarnings.xml      |  10 -
 .../inspections/presentationalTag/after0.jspx |  11 -
 .../presentationalTag/before0.jspx            |  11 -
 .../testData/navigateactions/after1.html      |  41 -
 .../testData/navigateactions/after2.xhtml     |  41 -
 xml/tests/testData/navigateactions/after3.jsp |  69 --
 .../testData/navigateactions/after4.jspx      |  69 --
 .../testData/navigateactions/before1.html     |  41 -
 .../testData/navigateactions/before2.xhtml    |  41 -
 .../testData/navigateactions/before3.jsp      |  69 --
 .../testData/navigateactions/before4.jspx     |  69 --
 .../testData/navigateactions/before8.xml      |  41 -
 55 files changed, 3375 deletions(-)
 delete mode 100644 xml/tests/testData/generateactions/addColumn/after1.html
 delete mode 100644 xml/tests/testData/generateactions/addColumn/after2.xhtml
 delete mode 100644 xml/tests/testData/generateactions/addColumn/after3.jsp
 delete mode 100644 xml/tests/testData/generateactions/addColumn/after4.jspx
 delete mode 100644 xml/tests/testData/generateactions/addColumn/after5.html
 delete mode 100644 xml/tests/testData/generateactions/addColumn/after6.html
 delete mode 100644 xml/tests/testData/generateactions/addColumn/after7.html
 delete mode 100644 xml/tests/testData/generateactions/addColumn/after8.xml
 delete mode 100644 xml/tests/testData/generateactions/addColumn/before1.html
 delete mode 100644 xml/tests/testData/generateactions/addColumn/before2.xhtml
 delete mode 100644 xml/tests/testData/generateactions/addColumn/before3.jsp
 delete mode 100644 xml/tests/testData/generateactions/addColumn/before4.jspx
 delete mode 100644 xml/tests/testData/generateactions/addColumn/before5.html
 delete mode 100644 xml/tests/testData/generateactions/addColumn/before6.html
 delete mode 100644 xml/tests/testData/generateactions/addColumn/before7.html
 delete mode 100644 xml/tests/testData/generateactions/addColumn/before8.xml
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix.html
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix1.html
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/after0.html
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/after1.html
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/after2.jspx
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/after3.jsp
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/before0.html
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/before1.html
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/before2.jspx
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/actions/before3.jsp
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/html_deptag5.xhtml
 delete mode 100644 xml/tests/testData/inspections/deprecatedTag/html_deptag5.xml
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after1.html
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after2.xhtml
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after3.jsp
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after4.jspx
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after5.html
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after6.xhtml
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/after7.jsp
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before1.html
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before2.xhtml
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before3.jsp
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before4.jspx
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before5.html
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before6.xhtml
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/actions/before7.jsp
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.html
 delete mode 100644 xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.xml
 delete mode 100644 xml/tests/testData/inspections/presentationalTag/after0.jspx
 delete mode 100644 xml/tests/testData/inspections/presentationalTag/before0.jspx
 delete mode 100644 xml/tests/testData/navigateactions/after1.html
 delete mode 100644 xml/tests/testData/navigateactions/after2.xhtml
 delete mode 100644 xml/tests/testData/navigateactions/after3.jsp
 delete mode 100644 xml/tests/testData/navigateactions/after4.jspx
 delete mode 100644 xml/tests/testData/navigateactions/before1.html
 delete mode 100644 xml/tests/testData/navigateactions/before2.xhtml
 delete mode 100644 xml/tests/testData/navigateactions/before3.jsp
 delete mode 100644 xml/tests/testData/navigateactions/before4.jspx
 delete mode 100644 xml/tests/testData/navigateactions/before8.xml

diff --git a/xml/tests/testData/generateactions/addColumn/after1.html b/xml/tests/testData/generateactions/addColumn/after1.html
deleted file mode 100644
index d10a2a3e569e..000000000000
--- a/xml/tests/testData/generateactions/addColumn/after1.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- "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
deleted file mode 100644
index 41226bfed0bc..000000000000
--- a/xml/tests/testData/generateactions/addColumn/after2.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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
deleted file mode 100644
index 31cfd399289d..000000000000
--- a/xml/tests/testData/generateactions/addColumn/after3.jsp
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- "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
deleted file mode 100644
index f491cb9ec5c8..000000000000
--- a/xml/tests/testData/generateactions/addColumn/after4.jspx
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- "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
deleted file mode 100644
index 4f6644ba3152..000000000000
--- a/xml/tests/testData/generateactions/addColumn/after5.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- "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
deleted file mode 100644
index 1be42492521f..000000000000
--- a/xml/tests/testData/generateactions/addColumn/after6.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- "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
deleted file mode 100644
index 9e19d63ff403..000000000000
--- a/xml/tests/testData/generateactions/addColumn/after7.html
+++ /dev/null
@@ -1,966 +0,0 @@
-<!-- "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
deleted file mode 100644
index 1b4b1a7d970c..000000000000
--- a/xml/tests/testData/generateactions/addColumn/after8.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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
deleted file mode 100644
index 1b4b1a7d970c..000000000000
--- a/xml/tests/testData/generateactions/addColumn/before1.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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
deleted file mode 100644
index c2545b19f3d0..000000000000
--- a/xml/tests/testData/generateactions/addColumn/before2.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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
deleted file mode 100644
index f4e9cd48e072..000000000000
--- a/xml/tests/testData/generateactions/addColumn/before3.jsp
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- "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
deleted file mode 100644
index d5d6fe721c0a..000000000000
--- a/xml/tests/testData/generateactions/addColumn/before4.jspx
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- "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
deleted file mode 100644
index 02024f534af6..000000000000
--- a/xml/tests/testData/generateactions/addColumn/before5.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- "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
deleted file mode 100644
index f1826d6ae995..000000000000
--- a/xml/tests/testData/generateactions/addColumn/before6.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- "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
deleted file mode 100644
index 77015e0eb175..000000000000
--- a/xml/tests/testData/generateactions/addColumn/before7.html
+++ /dev/null
@@ -1,866 +0,0 @@
-<!-- "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
deleted file mode 100644
index 1b4b1a7d970c..000000000000
--- a/xml/tests/testData/generateactions/addColumn/before8.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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/inspections/deprecatedTag/SwitchToHtml5QuickFix.html b/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix.html
deleted file mode 100644
index 2e0b258453c3..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 53e33d7c45af..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/SwitchToHtml5QuickFix1.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!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
deleted file mode 100644
index defb3b1e92e7..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/actions/after0.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- "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
deleted file mode 100644
index d15db0d63370..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/actions/after1.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- "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
deleted file mode 100644
index 8ff510623bdf..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/actions/after2.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- "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
deleted file mode 100644
index b7c96f21c199..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/actions/after3.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%-- "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
deleted file mode 100644
index 53b4398905de..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/actions/before0.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- "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
deleted file mode 100644
index cf938ebc91c0..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/actions/before1.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- "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
deleted file mode 100644
index 97d8fa3cb089..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/actions/before2.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- "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
deleted file mode 100644
index 07025457537c..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/actions/before3.jsp
+++ /dev/null
@@ -1,2 +0,0 @@
-<%-- "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
deleted file mode 100644
index cd5efad49e1d..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/html_deptag5.xhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- ""  "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
deleted file mode 100644
index c70e99b6150e..000000000000
--- a/xml/tests/testData/inspections/deprecatedTag/html_deptag5.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- ""  "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
deleted file mode 100644
index f1724178b915..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after1.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- "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
deleted file mode 100644
index 0afb1c1d3ae0..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after2.xhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- "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
deleted file mode 100644
index 7c52117e7f77..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after3.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%-- "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
deleted file mode 100644
index a6096ed8dcbb..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after4.jspx
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- "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
deleted file mode 100644
index b3f7ec702d50..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after5.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- "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
deleted file mode 100644
index e3855349296a..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after6.xhtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- "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
deleted file mode 100644
index 43d7b132f708..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/after7.jsp
+++ /dev/null
@@ -1,8 +0,0 @@
-<%-- "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
deleted file mode 100644
index d8830f66f3bb..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before1.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- "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
deleted file mode 100644
index c92d27ebbc21..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before2.xhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- "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
deleted file mode 100644
index 2cd1904c67ac..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before3.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
-<%-- "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
deleted file mode 100644
index bbd1248ed341..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before4.jspx
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- "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
deleted file mode 100644
index 6e9f06ba5d24..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before5.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- "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
deleted file mode 100644
index 1d22e119bae1..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before6.xhtml
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- "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
deleted file mode 100644
index ee69cd20793f..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/actions/before7.jsp
+++ /dev/null
@@ -1,9 +0,0 @@
-<%-- "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
deleted file mode 100644
index 6ff7a893c657..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<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
deleted file mode 100644
index 99c4f4fe015a..000000000000
--- a/xml/tests/testData/inspections/formInputWithoutLabel/nowarnings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index e23e3b37dc50..000000000000
--- a/xml/tests/testData/inspections/presentationalTag/after0.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- "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
deleted file mode 100644
index 74bfbcd1d9c0..000000000000
--- a/xml/tests/testData/inspections/presentationalTag/before0.jspx
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- "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/navigateactions/after1.html b/xml/tests/testData/navigateactions/after1.html
deleted file mode 100644
index 4612f98f4949..000000000000
--- a/xml/tests/testData/navigateactions/after1.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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
deleted file mode 100644
index 6f8d2ed0937e..000000000000
--- a/xml/tests/testData/navigateactions/after2.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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
deleted file mode 100644
index b97ee9e2eb88..000000000000
--- a/xml/tests/testData/navigateactions/after3.jsp
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- "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
deleted file mode 100644
index 482c81f25f2c..000000000000
--- a/xml/tests/testData/navigateactions/after4.jspx
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- "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
deleted file mode 100644
index 1b4b1a7d970c..000000000000
--- a/xml/tests/testData/navigateactions/before1.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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
deleted file mode 100644
index 898bdf600227..000000000000
--- a/xml/tests/testData/navigateactions/before2.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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
deleted file mode 100644
index 3a6da5b9d3ec..000000000000
--- a/xml/tests/testData/navigateactions/before3.jsp
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- "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
deleted file mode 100644
index b97ee9e2eb88..000000000000
--- a/xml/tests/testData/navigateactions/before4.jspx
+++ /dev/null
@@ -1,69 +0,0 @@
-<!-- "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
deleted file mode 100644
index 1b4b1a7d970c..000000000000
--- a/xml/tests/testData/navigateactions/before8.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!-- "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

From 230eab745b16a5024ac1ab9b6919b3217834c38c Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 1 Jun 2012 18:12:23 +0400
Subject: [PATCH 089/239] moving test data to the right place

---
 xml/tests/testData/smartEnter/IDEADEV_32164.jsp         | 1 -
 xml/tests/testData/smartEnter/IDEADEV_32164_2.jsp       | 5 -----
 xml/tests/testData/smartEnter/IDEADEV_32164_2_after.jsp | 5 -----
 xml/tests/testData/smartEnter/IDEADEV_32164_after.jsp   | 1 -
 xml/tests/testData/smartEnter/Tag.jsp                   | 3 ---
 xml/tests/testData/smartEnter/Tag_after.jsp             | 3 ---
 6 files changed, 18 deletions(-)
 delete mode 100644 xml/tests/testData/smartEnter/IDEADEV_32164.jsp
 delete mode 100644 xml/tests/testData/smartEnter/IDEADEV_32164_2.jsp
 delete mode 100644 xml/tests/testData/smartEnter/IDEADEV_32164_2_after.jsp
 delete mode 100644 xml/tests/testData/smartEnter/IDEADEV_32164_after.jsp
 delete mode 100644 xml/tests/testData/smartEnter/Tag.jsp
 delete mode 100644 xml/tests/testData/smartEnter/Tag_after.jsp

diff --git a/xml/tests/testData/smartEnter/IDEADEV_32164.jsp b/xml/tests/testData/smartEnter/IDEADEV_32164.jsp
deleted file mode 100644
index 703f27ca8f45..000000000000
--- a/xml/tests/testData/smartEnter/IDEADEV_32164.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ 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
deleted file mode 100644
index 47f2727bf3ca..000000000000
--- a/xml/tests/testData/smartEnter/IDEADEV_32164_2.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ 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
deleted file mode 100644
index a3f189ccb222..000000000000
--- a/xml/tests/testData/smartEnter/IDEADEV_32164_2_after.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ 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
deleted file mode 100644
index 80e206e48fe4..000000000000
--- a/xml/tests/testData/smartEnter/IDEADEV_32164_after.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" %><caret>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/Tag.jsp b/xml/tests/testData/smartEnter/Tag.jsp
deleted file mode 100644
index 4ab0f2ce326f..000000000000
--- a/xml/tests/testData/smartEnter/Tag.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-<div class="aaa" <caret>
-</body>
\ No newline at end of file
diff --git a/xml/tests/testData/smartEnter/Tag_after.jsp b/xml/tests/testData/smartEnter/Tag_after.jsp
deleted file mode 100644
index 866f94775dc0..000000000000
--- a/xml/tests/testData/smartEnter/Tag_after.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<body>
-<div class="aaa"/><caret> 
-</body>
\ No newline at end of file

From 5c997304e3d5ded06e9504e40a0b408b728cec8b Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Fri, 1 Jun 2012 18:20:24 +0400
Subject: [PATCH 090/239] moving test data to the right place: CSS

---
 .../commentInjection/broken_syntax.html       | 14 -------
 .../commentInjection/broken_syntax.xhtml      | 15 -------
 .../commentInjection/broken_syntax2.html      | 14 -------
 .../commentInjection/broken_syntax2.xhtml     | 15 -------
 .../testData/commentInjection/complete.html   | 13 -------
 .../testData/commentInjection/complete.xhtml  | 15 -------
 .../commentInjection/complete_after.html      | 13 -------
 .../commentInjection/complete_after.xhtml     | 15 -------
 .../testData/commentInjection/injected1.html  | 14 -------
 .../testData/commentInjection/injected1.xhtml | 16 --------
 .../testData/commentInjection/injected2.html  | 22 -----------
 .../formatting1.html                          | 18 ---------
 .../formatting1_after.html                    | 18 ---------
 .../formatting2.html                          | 36 -----------------
 .../formatting2_after.html                    | 36 -----------------
 .../xhtmlFormatting1.xhtml                    | 21 ----------
 .../xhtmlFormatting1_after.xhtml              | 21 ----------
 .../xhtmlFormatting2.xhtml                    | 39 -------------------
 .../xhtmlFormatting2_after.xhtml              | 39 -------------------
 19 files changed, 394 deletions(-)
 delete mode 100644 xml/tests/testData/commentInjection/broken_syntax.html
 delete mode 100644 xml/tests/testData/commentInjection/broken_syntax.xhtml
 delete mode 100644 xml/tests/testData/commentInjection/broken_syntax2.html
 delete mode 100644 xml/tests/testData/commentInjection/broken_syntax2.xhtml
 delete mode 100644 xml/tests/testData/commentInjection/complete.html
 delete mode 100644 xml/tests/testData/commentInjection/complete.xhtml
 delete mode 100644 xml/tests/testData/commentInjection/complete_after.html
 delete mode 100644 xml/tests/testData/commentInjection/complete_after.xhtml
 delete mode 100644 xml/tests/testData/commentInjection/injected1.html
 delete mode 100644 xml/tests/testData/commentInjection/injected1.xhtml
 delete mode 100644 xml/tests/testData/commentInjection/injected2.html
 delete mode 100644 xml/tests/testData/commentInjectionFormatting/formatting1.html
 delete mode 100644 xml/tests/testData/commentInjectionFormatting/formatting1_after.html
 delete mode 100644 xml/tests/testData/commentInjectionFormatting/formatting2.html
 delete mode 100644 xml/tests/testData/commentInjectionFormatting/formatting2_after.html
 delete mode 100644 xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1.xhtml
 delete mode 100644 xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1_after.xhtml
 delete mode 100644 xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2.xhtml
 delete mode 100644 xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2_after.xhtml

diff --git a/xml/tests/testData/commentInjection/broken_syntax.html b/xml/tests/testData/commentInjection/broken_syntax.html
deleted file mode 100644
index d13549dda5ce..000000000000
--- a/xml/tests/testData/commentInjection/broken_syntax.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!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
deleted file mode 100644
index f37fe59ae6bb..000000000000
--- a/xml/tests/testData/commentInjection/broken_syntax.xhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
deleted file mode 100644
index b164bded4475..000000000000
--- a/xml/tests/testData/commentInjection/broken_syntax2.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!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
deleted file mode 100644
index 9154f2cd2e62..000000000000
--- a/xml/tests/testData/commentInjection/broken_syntax2.xhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
deleted file mode 100644
index 0b7c20cd1947..000000000000
--- a/xml/tests/testData/commentInjection/complete.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!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
deleted file mode 100644
index a570e87dbd37..000000000000
--- a/xml/tests/testData/commentInjection/complete.xhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
deleted file mode 100644
index e8ee0bfcb8bf..000000000000
--- a/xml/tests/testData/commentInjection/complete_after.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!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
deleted file mode 100644
index 5577d12d196b..000000000000
--- a/xml/tests/testData/commentInjection/complete_after.xhtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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
deleted file mode 100644
index c7281d9f69ff..000000000000
--- a/xml/tests/testData/commentInjection/injected1.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!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
deleted file mode 100644
index 78748c7ec712..000000000000
--- a/xml/tests/testData/commentInjection/injected1.xhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
deleted file mode 100644
index f43a71f11f7d..000000000000
--- a/xml/tests/testData/commentInjection/injected2.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!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
deleted file mode 100644
index ed2850eecec2..000000000000
--- a/xml/tests/testData/commentInjectionFormatting/formatting1.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!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
deleted file mode 100644
index 53c4a712ae18..000000000000
--- a/xml/tests/testData/commentInjectionFormatting/formatting1_after.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!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
deleted file mode 100644
index 5487ba9dff53..000000000000
--- a/xml/tests/testData/commentInjectionFormatting/formatting2.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!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
deleted file mode 100644
index d74a7b1fd0af..000000000000
--- a/xml/tests/testData/commentInjectionFormatting/formatting2_after.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!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
deleted file mode 100644
index 2b8603650a4f..000000000000
--- a/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1.xhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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
deleted file mode 100644
index 6d961243af5b..000000000000
--- a/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting1_after.xhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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
deleted file mode 100644
index 21b38f34a783..000000000000
--- a/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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
deleted file mode 100644
index d0d7ecb8e4d7..000000000000
--- a/xml/tests/testData/commentInjectionFormatting/xhtmlFormatting2_after.xhtml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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>

From 79b826b8040c1a98d6a4a1074847c59792ea8dc8 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Fri, 1 Jun 2012 15:28:23 +0400
Subject: [PATCH 091/239] faster search

---
 plugins/devkit/src/references/IconsReferencesContributor.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/devkit/src/references/IconsReferencesContributor.java b/plugins/devkit/src/references/IconsReferencesContributor.java
index 1ee44066816e..5e6930263046 100644
--- a/plugins/devkit/src/references/IconsReferencesContributor.java
+++ b/plugins/devkit/src/references/IconsReferencesContributor.java
@@ -194,6 +194,7 @@ public class IconsReferencesContributor extends PsiReferenceContributor implemen
         model.setStringToFind(path);
         model.setCaseSensitive(true);
         model.setFindAll(true);
+        model.setWholeWordsOnly(true);
         final List<UsageInfo> usages = FindInProjectUtil.findUsages(model, FindInProjectUtil.getPsiDirectory(model, project), project, false);
         if (!usages.isEmpty()) {
           for (UsageInfo usage : usages) {

From 3786c7f9d115c73787f817ecef5b81ab6cba5eb4 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Fri, 1 Jun 2012 19:24:53 +0400
Subject: [PATCH 092/239] Some 'icon' attribute has nothing to IDEA plugin's
 resources, like android manifests

---
 plugins/devkit/src/references/IconsReferencesContributor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/devkit/src/references/IconsReferencesContributor.java b/plugins/devkit/src/references/IconsReferencesContributor.java
index 5e6930263046..8b4ae248bc38 100644
--- a/plugins/devkit/src/references/IconsReferencesContributor.java
+++ b/plugins/devkit/src/references/IconsReferencesContributor.java
@@ -97,7 +97,7 @@ public class IconsReferencesContributor extends PsiReferenceContributor implemen
       @Override
       public PsiReference[] getReferencesByElement(@NotNull final PsiElement element, @NotNull ProcessingContext context) {
         return new PsiReference[] {
-          new PsiReferenceBase<PsiElement>(element, false) {
+          new PsiReferenceBase<PsiElement>(element, true) {
             @Override
             public PsiElement resolve() {
               String value = ((XmlAttributeValue)element).getValue();

From ed09a2e78b8c5cea446a8aceff89ac8bd8250195 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Fri, 1 Jun 2012 19:38:38 +0400
Subject: [PATCH 093/239] readaction missing

---
 .../src/references/IconsReferencesContributor.java     | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/devkit/src/references/IconsReferencesContributor.java b/plugins/devkit/src/references/IconsReferencesContributor.java
index 8b4ae248bc38..0ef0dcf01988 100644
--- a/plugins/devkit/src/references/IconsReferencesContributor.java
+++ b/plugins/devkit/src/references/IconsReferencesContributor.java
@@ -17,12 +17,14 @@ package org.jetbrains.idea.devkit.references;
 
 import com.intellij.find.FindModel;
 import com.intellij.find.impl.FindInProjectUtil;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.ProperTextRange;
 import com.intellij.openapi.util.io.FileUtil;
@@ -184,7 +186,13 @@ public class IconsReferencesContributor extends PsiReferenceContributor implemen
   public boolean execute(@NotNull ReferencesSearch.SearchParameters queryParameters, @NotNull Processor<PsiReference> consumer) {
     final PsiElement file = queryParameters.getElementToSearch();
     if (file instanceof PsiBinaryFile) {
-      final Module module = ModuleUtil.findModuleForPsiElement(file);
+      final Module module = ApplicationManager.getApplication().runReadAction(new Computable<Module>() {
+        @Override
+        public Module compute() {
+          return ModuleUtil.findModuleForPsiElement(file);
+        }
+      });
+
       final VirtualFile image = ((PsiBinaryFile)file).getVirtualFile();
       if (isImage(image) && isIconsModule(module)) {
         final Project project = file.getProject();

From 89e75ef0587738881cb8eb305f995d8c17cf509a Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Fri, 1 Jun 2012 20:21:34 +0400
Subject: [PATCH 094/239] IDEA-86914 Subversion: folder with subfolders rename
 works incorrectly (files status is incorrect after Commit invocation)

---
 .../idea/svn/SvnChangeProviderContext.java    |  3 +-
 .../idea/svn/SvnEntriesFileListener.java      | 35 +++++++++++++++----
 .../jetbrains/idea/svn/SvnScopeZipper.java    |  4 +--
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
index b05e93d46b2e..84af15cf5f38 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnChangeProviderContext.java
@@ -176,7 +176,8 @@ class SvnChangeProviderContext implements StatusReceiver {
     if (filePath.isDirectory() && status.isLocked()) {
       myChangelistBuilder.processLockedFolder(filePath.getVirtualFile());
     }
-    if (SvnVcs.svnStatusIs(status, SVNStatusType.STATUS_ADDED) && status.getCopyFromURL() != null) {
+    if ((SvnVcs.svnStatusIs(status, SVNStatusType.STATUS_ADDED) || SVNStatusType.STATUS_MODIFIED.equals(status.getNodeStatus())) &&
+        status.getCopyFromURL() != null) {
       addCopiedFile(filePath, status, status.getCopyFromURL());
     }
     else if (SvnVcs.svnStatusIs(status, SVNStatusType.STATUS_DELETED)) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnEntriesFileListener.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnEntriesFileListener.java
index ecc48df7336d..0f001dd3bdb5 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnEntriesFileListener.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnEntriesFileListener.java
@@ -17,8 +17,13 @@ package org.jetbrains.idea.svn;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vcs.*;
+import com.intellij.openapi.vcs.AbstractVcs;
+import com.intellij.openapi.vcs.FilePath;
+import com.intellij.openapi.vcs.FilePathImpl;
+import com.intellij.openapi.vcs.ProjectLevelVcsManager;
+import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
+import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileAdapter;
@@ -26,10 +31,7 @@ import com.intellij.openapi.vfs.VirtualFileEvent;
 
 import javax.swing.*;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 public class SvnEntriesFileListener extends VirtualFileAdapter {
   private final Project myProject;
@@ -79,8 +81,27 @@ public class SvnEntriesFileListener extends VirtualFileAdapter {
     if (isWcDbFile(file)) {
       LOG.debug("wc.db had changed");
       // all that we have now? or all?
-      final List<File> affectedPaths = myChangeListManager.getAffectedPaths();
-      myDirtyScopeManager.filePathsDirty(ObjectsConvertor.convert(affectedPaths, ObjectsConvertor.FILE_FILEPATH, ObjectsConvertor.NOT_NULL), null);
+      final List<LocalChangeList> listsCopy = myChangeListManager.getChangeListsCopy();
+      final Set<FilePath> affectedPaths = new HashSet<FilePath>();
+      for (LocalChangeList list : listsCopy) {
+        final Collection<Change> changes = list.getChanges();
+        for (Change change : changes) {
+          if (change.isMoved() || change.isRenamed()) {
+            final FilePath before = change.getBeforeRevision().getFile();
+            final FilePath after = change.getAfterRevision().getFile();
+            ((FilePathImpl) before).setIsDirectory(after.isDirectory());
+            affectedPaths.add(before);
+            affectedPaths.add(after);
+          } else {
+            if (change.getBeforeRevision() != null) {
+              affectedPaths.add(change.getBeforeRevision().getFile());
+            } else {
+              affectedPaths.add(change.getAfterRevision().getFile());
+            }
+          }
+        }
+      }
+      myDirtyScopeManager.filePathsDirty(affectedPaths, null);
       return;
     }
     if (isEntriesFile(file) && file.getParent() != null) {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java
index 6caf0ce7eda6..7b33613f0fa2 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java
@@ -45,9 +45,9 @@ public class SvnScopeZipper implements Runnable {
       if (file.isDirectory()) {
         final VirtualFile vFile = file.getVirtualFile();
         // todo take care about this 'not valid' - right now keeping things as they used to be
+        final MyDirNonRecursive me = createOrGet(file);
+        me.setInterestedInParent(true);
         if (vFile != null && vFile.isValid()) {
-          final MyDirNonRecursive me = createOrGet(file);
-          me.setInterestedInParent(true);
           for (VirtualFile child : vFile.getChildren()) {
             me.add(new FilePathImpl(child));
           }

From 8c46e308b3d8c80649ca61134c4ece5f429af43b Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Fri, 1 Jun 2012 20:41:08 +0400
Subject: [PATCH 095/239] Morphing

---
 .../designer/model/RadViewComponent.java      | 16 ++++
 .../designer/model/views-meta-model.xml       |  2 +
 .../designer/actions/DesignerActionPanel.java | 17 +++-
 .../designer/actions/MorphingAction.java      | 87 +++++++++++++++++++
 .../componentTree/ComponentTreeBuilder.java   |  8 +-
 .../componentTree/TreeEditableArea.java       | 13 ++-
 .../designSurface/DesignerEditorPanel.java    |  2 +-
 .../intellij/designer/model/MetaManager.java  | 27 +++++-
 .../intellij/designer/model/MetaModel.java    |  9 ++
 .../intellij/designer/model/RadComponent.java |  3 +
 10 files changed, 168 insertions(+), 16 deletions(-)
 create mode 100644 plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java

diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
index 1242352fdc87..5c6197721090 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
@@ -16,6 +16,7 @@
 package com.intellij.android.designer.model;
 
 import com.android.ide.common.rendering.api.ViewInfo;
+import com.intellij.designer.model.MetaModel;
 import com.intellij.designer.model.RadComponent;
 import com.intellij.designer.model.RadVisualComponent;
 import com.intellij.designer.propertyTable.Property;
@@ -250,4 +251,19 @@ public class RadViewComponent extends RadVisualComponent {
       child.copyTo(parent);
     }
   }
+
+  @Override
+  public void morphingTo(final MetaModel target) throws Exception {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        myTag.setName(target.getTag());
+      }
+    });
+
+    setMetaModel(target);
+
+    PropertyParser propertyParser = getRoot().getClientProperty(PropertyParser.KEY);
+    propertyParser.load(this);
+  }
 }
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
index 5c36a1947d6a..1a2b8cf867fc 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
@@ -108,6 +108,8 @@
     <palette title="Button" icon="/com/intellij/android/designer/icons/Button.png"
              tooltip="Represents a push-button widget."/>
 
+    <morphing to="RadioButton CheckBox ToggleButton"/>
+
     <properties
         inplace="text"
         important="onClick"
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/DesignerActionPanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/DesignerActionPanel.java
index 6397254c02ed..61aca5f5ab58 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/DesignerActionPanel.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/DesignerActionPanel.java
@@ -38,6 +38,7 @@ public class DesignerActionPanel implements DataProvider {
   private final DefaultActionGroup myStaticGroup = new DefaultActionGroup();
   private final DefaultActionGroup myDynamicGroup = new DefaultActionGroup();
   private final DefaultActionGroup myPopupGroup = new DefaultActionGroup();
+  private final DefaultActionGroup myDynamicPopupGroup = new DefaultActionGroup();
   private JComponent myToolbar;
   private final DesignerEditorPanel myDesigner;
   private final CommonEditActionsProvider myCommonEditActionsProvider;
@@ -84,6 +85,8 @@ public class DesignerActionPanel implements DataProvider {
     myPopupGroup.addSeparator();
     myPopupGroup.add(selectParent);
     myPopupGroup.add(selectAllAction);
+    myPopupGroup.addSeparator();
+    myPopupGroup.add(myDynamicPopupGroup);
 
     designer.getSurfaceArea().addSelectionListener(new ComponentSelectionListener() {
       @Override
@@ -144,10 +147,12 @@ public class DesignerActionPanel implements DataProvider {
   private void updateSelectionActions(List<RadComponent> selection) {
     boolean update = isVisible(myDynamicGroup);
 
-    for (AnAction action : myDynamicGroup.getChildActionsOrStubs()) {
-      action.unregisterCustomShortcutSet(myShortcuts);
+    if (myDynamicGroup.getChildrenCount() > 0) {
+      for (AnAction action : myDynamicGroup.getChildActionsOrStubs()) {
+        action.unregisterCustomShortcutSet(myShortcuts);
+      }
+      myDynamicGroup.removeAll();
     }
-    myDynamicGroup.removeAll();
 
     for (RadComponent parent : RadComponent.getParents(selection)) {
       parent.getLayout().addSelectionActions(myDesigner, myDynamicGroup, myShortcuts, selection);
@@ -162,7 +167,11 @@ public class DesignerActionPanel implements DataProvider {
     }
   }
 
-  public ActionGroup getPopupActions() {
+  public ActionGroup getPopupActions(EditableArea area) {
+    if (myDynamicPopupGroup.getChildrenCount() > 0) {
+      myDynamicPopupGroup.removeAll();
+    }
+    MorphingAction.fill(myDesigner, myDynamicPopupGroup, area);
     return myPopupGroup;
   }
 
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java
new file mode 100644
index 000000000000..8f1563edf79c
--- /dev/null
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.designer.actions;
+
+import com.intellij.designer.designSurface.DesignerEditorPanel;
+import com.intellij.designer.designSurface.EditableArea;
+import com.intellij.designer.model.MetaModel;
+import com.intellij.designer.model.RadComponent;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
+import com.intellij.util.ThrowableRunnable;
+
+import java.util.List;
+
+/**
+ * @author Alexander Lobas
+ */
+public class MorphingAction extends AnAction {
+  private final DesignerEditorPanel myDesigner;
+  private final List<RadComponent> myComponents;
+  private final MetaModel myTarget;
+
+  public MorphingAction(DesignerEditorPanel designer, List<RadComponent> components, MetaModel target) {
+    super(target.getTag(), null, target.getIcon());
+    myDesigner = designer;
+    myComponents = components;
+    myTarget = target;
+  }
+
+  @Override
+  public void actionPerformed(AnActionEvent e) {
+    myDesigner.getToolProvider().execute(new ThrowableRunnable<Exception>() {
+      @Override
+      public void run() throws Exception {
+        for (RadComponent component : myComponents) {
+          component.morphingTo(myTarget);
+        }
+      }
+    }, "Run Morphing action", true);
+  }
+
+  public static void fill(DesignerEditorPanel designer, DefaultActionGroup group, EditableArea area) {
+    List<RadComponent> selection = area.getSelection();
+    if (selection.isEmpty()) {
+      return;
+    }
+
+    MetaModel model = null;
+    for (RadComponent component : selection) {
+      if (model == null) {
+        model = component.getMetaModel();
+      }
+      else if (model != component.getMetaModel()) {
+        return;
+      }
+    }
+    if (model == null) {
+      return;
+    }
+
+    List<MetaModel> models = model.getMorphingModels();
+    if (models.isEmpty()) {
+      return;
+    }
+
+    DefaultActionGroup morphingGroup = new DefaultActionGroup("Morphing", true);
+    for (MetaModel morphingModel : models) {
+      morphingGroup.add(new MorphingAction(designer, selection, morphingModel));
+    }
+
+    group.add(morphingGroup);
+  }
+}
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java
index 05da1098f8d4..e457b0a661c1 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTreeBuilder.java
@@ -19,7 +19,6 @@ import com.intellij.designer.designSurface.ComponentSelectionListener;
 import com.intellij.designer.designSurface.DesignerEditorPanel;
 import com.intellij.designer.designSurface.EditableArea;
 import com.intellij.ide.util.treeView.AbstractTreeBuilder;
-import com.intellij.openapi.actionSystem.ActionGroup;
 
 import javax.swing.tree.DefaultTreeModel;
 
@@ -41,12 +40,7 @@ public final class ComponentTreeBuilder extends AbstractTreeBuilder implements C
     initRootNode();
 
     mySurfaceArea = designer.getSurfaceArea();
-    myTreeArea = new TreeEditableArea(tree, this) {
-      @Override
-      public ActionGroup getPopupActions() {
-        return mySurfaceArea.getPopupActions();
-      }
-    };
+    myTreeArea = new TreeEditableArea(tree, this, designer.getActionPanel());
     myGlassLayer = new TreeGlassLayer(tree, designer.getToolProvider(), myTreeArea);
     myExpandStateHandler = new ExpandStateHandler(tree, designer, this);
 
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
index 8a10fb1a0757..33335b817f39 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
@@ -15,10 +15,12 @@
  */
 package com.intellij.designer.componentTree;
 
+import com.intellij.designer.actions.DesignerActionPanel;
 import com.intellij.designer.designSurface.*;
 import com.intellij.designer.designSurface.tools.InputTool;
 import com.intellij.designer.model.RadComponent;
 import com.intellij.ide.util.treeView.AbstractTreeBuilder;
+import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.ActionPlaces;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
@@ -37,14 +39,16 @@ import java.util.List;
 /**
  * @author Alexander Lobas
  */
-public abstract class TreeEditableArea implements EditableArea, FeedbackTreeLayer, TreeSelectionListener {
+public final class TreeEditableArea implements EditableArea, FeedbackTreeLayer, TreeSelectionListener {
   private final EventListenerList myListenerList = new EventListenerList();
   private final ComponentTree myTree;
   private final AbstractTreeBuilder myTreeBuilder;
+  private final DesignerActionPanel myActionPanel;
 
-  public TreeEditableArea(ComponentTree tree, AbstractTreeBuilder treeBuilder) {
+  public TreeEditableArea(ComponentTree tree, AbstractTreeBuilder treeBuilder, DesignerActionPanel actionPanel) {
     myTree = tree;
     myTreeBuilder = treeBuilder;
+    myActionPanel = actionPanel;
     hookSelection();
   }
 
@@ -225,6 +229,11 @@ public abstract class TreeEditableArea implements EditableArea, FeedbackTreeLaye
     return this;
   }
 
+  @Override
+  public ActionGroup getPopupActions() {
+    return myActionPanel.getPopupActions(this);
+  }
+
   @Override
   public String getPopupPlace() {
     return ActionPlaces.GUI_DESIGNER_COMPONENT_TREE_POPUP;
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
index 93b235c2f877..0b498666fc4c 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/DesignerEditorPanel.java
@@ -192,7 +192,7 @@ public abstract class DesignerEditorPanel extends JPanel implements DataProvider
 
       @Override
       public ActionGroup getPopupActions() {
-        return myActionPanel.getPopupActions();
+        return myActionPanel.getPopupActions(this);
       }
 
       @Override
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaManager.java
index 4337bcf8161e..5a7666d275fc 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaManager.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaManager.java
@@ -64,13 +64,31 @@ public abstract class MetaManager {
       Element rootElement = document.getRootElement();
       ClassLoader classLoader = getClass().getClassLoader();
 
+      Map<MetaModel, List<String>> modelToMorphing = new HashMap<MetaModel, List<String>>();
+
       for (Object element : rootElement.getChildren(META)) {
-        loadModel(classLoader, (Element)element);
+        loadModel(classLoader, (Element)element, modelToMorphing);
       }
 
       for (Object element : rootElement.getChild(PALETTE).getChildren(GROUP)) {
         loadGroup(name, (Element)element);
       }
+
+      for (Map.Entry<MetaModel, List<String>> entry : modelToMorphing.entrySet()) {
+        MetaModel meta = entry.getKey();
+        List<MetaModel> morphingModels = new ArrayList<MetaModel>();
+
+        for (String tag : entry.getValue()) {
+          MetaModel morphingModel = myTag2Model.get(tag);
+          if (morphingModel != null) {
+            morphingModels.add(morphingModel);
+          }
+        }
+
+        if (!morphingModels.isEmpty()) {
+          meta.setMorphingModels(morphingModels);
+        }
+      }
     }
     catch (Throwable e) {
       LOG.error(e);
@@ -78,7 +96,7 @@ public abstract class MetaManager {
   }
 
   @SuppressWarnings("unchecked")
-  private void loadModel(ClassLoader classLoader, Element element) throws Exception {
+  private void loadModel(ClassLoader classLoader, Element element, Map<MetaModel, List<String>> modelToMorphing) throws Exception {
     String modelValue = element.getAttributeValue("model");
     Class<RadComponent> model = modelValue == null ? null : (Class<RadComponent>)classLoader.loadClass(modelValue);
     String target = element.getAttributeValue("class");
@@ -145,6 +163,11 @@ public abstract class MetaManager {
       }
     }
 
+    Element morphing = element.getChild("morphing");
+    if (morphing != null) {
+      modelToMorphing.put(meta, StringUtil.split(morphing.getAttribute("to").getValue(), " "));
+    }
+
     if (tag != null) {
       myTag2Model.put(tag, meta);
     }
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java
index ab019ead955c..81844aad55ef 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/MetaModel.java
@@ -45,6 +45,7 @@ public class MetaModel {
   private List<String> myImportantProperties = Collections.emptyList();
   private List<String> myExpertProperties = Collections.emptyList();
   private List<String> myDeprecatedProperties = Collections.emptyList();
+  private List<MetaModel> myMorphingModels = Collections.emptyList();
 
   public MetaModel(Class<RadComponent> model, String target, String tag) {
     myModel = model;
@@ -117,6 +118,14 @@ public class MetaModel {
     myPaletteItem.setMetaModel(this);
   }
 
+  public List<MetaModel> getMorphingModels() {
+    return myMorphingModels;
+  }
+
+  public void setMorphingModels(List<MetaModel> morphingModels) {
+    myMorphingModels = morphingModels;
+  }
+
   public List<String> getInplaceProperties() {
     return myInplaceProperties;
   }
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java
index ffd7f5ad3064..b935c5ffdc19 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java
@@ -260,6 +260,9 @@ public abstract class RadComponent {
   public void copyTo(Element parentElement) throws Exception {
   }
 
+  public void morphingTo(MetaModel target) throws Exception {
+  }
+
   //////////////////////////////////////////////////////////////////////////////////////////
   //
   // Utils

From ccb94d00027e42207e1e9c5fec3e5f8f7bdaf754 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 1 Jun 2012 19:10:21 +0200
Subject: [PATCH 096/239] PathInterner

---
 .../util/containers/PathInterner.java         | 184 ++++++++++++++++++
 .../util/containers/PathInternerTest.java     | 129 ++++++++++++
 2 files changed, 313 insertions(+)
 create mode 100644 platform/util/src/com/intellij/util/containers/PathInterner.java
 create mode 100644 platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java

diff --git a/platform/util/src/com/intellij/util/containers/PathInterner.java b/platform/util/src/com/intellij/util/containers/PathInterner.java
new file mode 100644
index 000000000000..01bfc235f1d6
--- /dev/null
+++ b/platform/util/src/com/intellij/util/containers/PathInterner.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.util.containers;
+
+import gnu.trove.THashMap;
+import gnu.trove.TObjectHashingStrategy;
+import gnu.trove.TObjectIntHashMap;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author peter
+ */
+public class PathInterner {
+  private static final TObjectHashingStrategy<SubstringWrapper[]> HASHING_STRATEGY = new TObjectHashingStrategy<SubstringWrapper[]>() {
+    @Override
+    public int computeHashCode(SubstringWrapper[] object) {
+      return Arrays.hashCode(object);
+    }
+
+    @Override
+    public boolean equals(SubstringWrapper[] o1, SubstringWrapper[] o2) {
+      return Arrays.equals(o1, o2);
+    }
+  };
+  private final OpenTHashSet<SubstringWrapper> myInternMap = new OpenTHashSet<SubstringWrapper>();
+
+  @Nullable
+  protected SubstringWrapper[] internParts(String path, boolean forAddition) {
+    int start = 0;
+    List<SubstringWrapper> key = new ArrayList<SubstringWrapper>();
+    SubstringWrapper flyweightKey = new SubstringWrapper();
+    while (start < path.length()) {
+      flyweightKey.findSubStringUntilNextSeparator(path, start);
+      SubstringWrapper interned = myInternMap.get(flyweightKey);
+      if (interned == null) {
+        if (!forAddition) {
+          return null;
+        }
+        myInternMap.add(interned = flyweightKey.createPersistentCopy());
+      }
+      key.add(interned);
+      start += flyweightKey.len;
+    }
+    return key.toArray(new SubstringWrapper[key.size()]);
+  }
+
+  private static String restorePath(SubstringWrapper[] seq) {
+    StringBuilder sb = new StringBuilder();
+    for (SubstringWrapper wrapper : seq) {
+      sb.append(wrapper.s);
+    }
+    return sb.toString();
+  }
+
+  private static class SubstringWrapper {
+    private String s;
+    private int start;
+    private int len;
+    private int hc;
+
+    void findSubStringUntilNextSeparator(String s, int start) {
+      this.s = s;
+      this.start = start;
+      hc = 0;
+
+      while (start < s.length() && isSeparator(s.charAt(start))) {
+        hc = hc * 31 + s.charAt(start);
+        start++;
+      }
+      while (start < s.length() && !isSeparator(s.charAt(start))) {
+        hc = hc * 31 + s.charAt(start);
+        start++;
+      }
+      this.len = start - this.start;
+    }
+
+    private static boolean isSeparator(char c) {
+      return c == '/' || c == '\\' || c == '.' || c == ' ' || c == '_' || c == '$';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (!(o instanceof SubstringWrapper)) return false;
+
+      SubstringWrapper wrapper = (SubstringWrapper)o;
+
+      if (hc != wrapper.hc) return false;
+      if (len != wrapper.len) return false;
+      if (s == wrapper.s && start == wrapper.start) return true;
+
+      for (int i = 0; i < len; i++) {
+        if (s.charAt(i + start) != wrapper.s.charAt(i + wrapper.start)) {
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return hc;
+    }
+
+    SubstringWrapper createPersistentCopy() {
+      SubstringWrapper wrapper = new SubstringWrapper();
+      wrapper.s = new String(s.substring(start, start + len));
+      wrapper.start = 0;
+      wrapper.len = len;
+      wrapper.hc = hc;
+      return wrapper;
+    }
+  }
+
+  public static class PathEnumerator {
+    private final TObjectIntHashMap<SubstringWrapper[]> mySeqToIdx = new TObjectIntHashMap<SubstringWrapper[]>(
+      PathInterner.HASHING_STRATEGY);
+    private final List<SubstringWrapper[]> myIdxToSeq = new ArrayList<SubstringWrapper[]>();
+    private final PathInterner myInterner = new PathInterner();
+
+    public PathEnumerator() {
+      myIdxToSeq.add(null);
+    }
+
+    public int addPath(String path) {
+      PathInterner.SubstringWrapper[] seq = myInterner.internParts(path, true);
+      if (!mySeqToIdx.containsKey(seq)) {
+        mySeqToIdx.put(seq, myIdxToSeq.size());
+        myIdxToSeq.add(seq);
+      }
+      return mySeqToIdx.get(seq);
+    }
+
+    public String retrievePath(int idx) {
+      try {
+        return PathInterner.restorePath(myIdxToSeq.get(idx));
+      }
+      catch (IndexOutOfBoundsException e) {
+        throw new IllegalArgumentException();
+      }
+    }
+
+    public boolean containsPath(String path) {
+      PathInterner.SubstringWrapper[] key = myInterner.internParts(path, false);
+      return key != null && mySeqToIdx.containsKey(key);
+    }
+  }
+
+  public static class PathMap<T> {
+    private final THashMap<SubstringWrapper[], T> myMap = new THashMap<SubstringWrapper[], T>(PathInterner.HASHING_STRATEGY);
+    private final PathInterner myInterner = new PathInterner();
+
+    @Nullable
+    public T get(@NotNull String path) {
+      PathInterner.SubstringWrapper[] seq = myInterner.internParts(path, false);
+      return seq == null ? null : myMap.get(seq);
+    }
+
+    public void put(@NotNull String path, @NotNull T value) {
+      myMap.put(myInterner.internParts(path, true), value);
+    }
+
+  }
+
+}
diff --git a/platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java b/platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java
new file mode 100644
index 000000000000..a63576753801
--- /dev/null
+++ b/platform/util/testSrc/com/intellij/util/containers/PathInternerTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.util.containers;
+
+import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.util.Processor;
+import gnu.trove.THashSet;
+import junit.framework.TestCase;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * @author peter
+ */
+public class PathInternerTest extends TestCase {
+  PathInterner.PathEnumerator interner = new PathInterner.PathEnumerator();
+
+  public void testAddTwice() {
+    assertEquals(interner.addPath("/foo/bar"), interner.addPath("/foo/bar"));
+  }
+
+  public void testAddDifferent() {
+    assertNotSame(interner.addPath("/foo/bar"), interner.addPath("/foo/foo"));
+  }
+
+  public void testRetrieve() {
+    int idx = interner.addPath("/foo/bar");
+    int idx2 = interner.addPath("/foo/foo");
+    int idx3 = interner.addPath("/foo");
+    assertEquals("/foo/bar", interner.retrievePath(idx));
+    assertEquals("/foo/foo", interner.retrievePath(idx2));
+    assertEquals("/foo", interner.retrievePath(idx3));
+  }
+
+  public void testRetrieveNotExistingFails() {
+    try {
+      interner.retrievePath(239);
+    }
+    catch (IllegalArgumentException e) {
+      return;
+    }
+    fail();
+  }
+
+  public void testContains() {
+    String path = "/home/peter/work/idea/community/out/production/vcs-impl/com/intellij/openapi/vcs/changes/committed/CommittedChangesViewManager$1.class";
+    interner.addPath(path);
+    assertTrue(interner.containsPath(path));
+    assertFalse(interner.containsPath("/foo/foo"));
+  }
+
+  @SuppressWarnings("IOResourceOpenedButNotSafelyClosed")
+  public static void main(String[] args) throws InterruptedException, IOException {
+    final HashSet<String> hs = new HashSet<String>();
+    FileUtil.processFilesRecursively(new File(PathManager.getHomePath()), new Processor<File>() {
+      @Override
+      public boolean process(File file) {
+        hs.add(file.getPath());
+        return true;
+      }
+    });
+    THashSet<String> thm = new THashSet<String>();
+    PathInterner.PathEnumerator interner = new PathInterner.PathEnumerator();
+    for (String s : hs) {
+      thm.add(s);
+      if (!thm.contains(s)) {
+        throw new AssertionError();
+      }
+      interner.addPath(s);
+      if (!interner.containsPath(s)) {
+        throw new AssertionError(s);
+      }
+    }
+    System.out.println("Map collected, press when ready");
+
+    BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
+    reader.readLine();
+
+    System.out.println("Filling THashSet...");
+    long start = System.currentTimeMillis();
+    checkTrove(hs, thm);
+    System.out.println("done " + (System.currentTimeMillis() - start));
+
+    System.out.println("Filling PathInterner...");
+    start = System.currentTimeMillis();
+    checkInterner(hs, interner);
+    System.out.println("done " + (System.currentTimeMillis() - start));
+    hs.clear();
+    System.out.println("press when ready");
+
+    reader.readLine();
+
+    System.out.println("interner.hashCode() = " + interner.hashCode());
+    System.out.println("thm.hashCode() = " + thm.hashCode());
+  }
+
+  private static void checkInterner(HashSet<String> hs, PathInterner.PathEnumerator interner) {
+    for (String s : hs) {
+      if (!interner.containsPath(s)) {
+        throw new AssertionError(new String(s));
+      }
+    }
+  }
+
+  private static void checkTrove(HashSet<String> hs, THashSet<String> thm) {
+    for (String s : hs) {
+      if (!thm.contains(new String(s))) {
+        throw new AssertionError();
+      }
+    }
+  }
+}

From 193aa725396744d0fb77c8380795b129bae9f7a5 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Fri, 1 Jun 2012 19:12:10 +0200
Subject: [PATCH 097/239] small lookups should have non even height too

---
 .../src/com/intellij/codeInsight/lookup/impl/LookupImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index f86768899ceb..45903bca721d 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -1360,7 +1360,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
           int listWidth = Math.min(scrollBarWidth + maxCellWidth, UISettings.getInstance().MAX_LOOKUP_WIDTH2);
           int adWidth = myAdComponent.getAdComponent().getPreferredSize().width;
           int panelHeight = mainPanel.getPreferredSize().height;
-          if (myList.getModel().getSize() > myList.getVisibleRowCount() && myList.getVisibleRowCount() > 5) {
+          if (myList.getModel().getSize() > myList.getVisibleRowCount() && myList.getVisibleRowCount() >= 5) {
             panelHeight -= myList.getFixedCellHeight() / 2;
           }
           return new Dimension(Math.max(listWidth, adWidth), Math.min(panelHeight, myMaximumHeight));

From 1c7fb498811eaefe88e3cf47acd3e4e4f625d3db Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 1 Jun 2012 21:08:32 +0400
Subject: [PATCH 098/239] testng: find top level class with methods to run
 (IDEA-86930)

---
 .../TestNGInClassConfigurationProducer.java   | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGInClassConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGInClassConfigurationProducer.java
index 567de86fe594..95e927b9855f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGInClassConfigurationProducer.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGInClassConfigurationProducer.java
@@ -55,13 +55,15 @@ public class TestNGInClassConfigurationProducer extends TestNGConfigurationProdu
     PsiClass psiClass = null;
     PsiElement element = location.getPsiElement();
     while (element != null) {
-      if (element instanceof PsiClass) {
+      if (element instanceof PsiClass && isTestNGClass(psiClass)) {
         psiClass = (PsiClass)element;
         break;
       }
       else if (element instanceof PsiMember) {
         psiClass = ((PsiMember)element).getContainingClass();
-        break;
+        if (isTestNGClass(psiClass)) {
+          break;
+        }
       }
       else if (element instanceof PsiClassOwner) {
         final PsiClass[] classes = ((PsiClassOwner)element).getClasses();
@@ -72,7 +74,7 @@ public class TestNGInClassConfigurationProducer extends TestNGConfigurationProdu
       }
       element = element.getParent();
     }
-    if (psiClass == null || !PsiClassUtil.isRunnableClass(psiClass, true, false) || !TestNGUtil.hasTest(psiClass)) return null;
+    if (!isTestNGClass(psiClass)) return null;
 
     myPsiElement = psiClass;
     final Project project = location.getProject();
@@ -82,10 +84,13 @@ public class TestNGInClassConfigurationProducer extends TestNGConfigurationProdu
     final Module originalModule = configuration.getConfigurationModule().getModule();
     configuration.setClassConfiguration(psiClass);
 
-    final PsiMethod method = PsiTreeUtil.getParentOfType(location.getPsiElement(), PsiMethod.class, false);
-    if (method != null && TestNGUtil.hasTest(method)) {
-      configuration.setMethodConfiguration(PsiLocation.fromPsiElement(project, method));
-      myPsiElement = method;
+    PsiMethod method = PsiTreeUtil.getParentOfType(location.getPsiElement(), PsiMethod.class, false);
+    while (method != null) {
+      if (TestNGUtil.hasTest(method)) {
+        configuration.setMethodConfiguration(PsiLocation.fromPsiElement(project, method));
+        myPsiElement = method;
+      }
+      method = PsiTreeUtil.getParentOfType(method, PsiMethod.class);
     }
 
     configuration.restoreOriginalModule(originalModule);
@@ -94,6 +99,10 @@ public class TestNGInClassConfigurationProducer extends TestNGConfigurationProdu
     return settings;
   }
 
+  private static boolean isTestNGClass(PsiClass psiClass) {
+    return psiClass != null && PsiClassUtil.isRunnableClass(psiClass, true, false) && TestNGUtil.hasTest(psiClass);
+  }
+
   public int compareTo(Object o) {
     return PREFERED;
   }

From b839853c4a8225a56d92b7793a10b6f0d231a74c Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 1 Jun 2012 21:37:45 +0400
Subject: [PATCH 099/239] restore safe delete preview: once view was closed all
 preview from reruns were treated as already canceled

---
 .../src/com/intellij/usages/impl/UsageViewManagerImpl.java       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
index 403812d40399..aec20676de48 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
@@ -75,6 +75,7 @@ public class UsageViewManagerImpl extends UsageViewManager {
   @Override
   @NotNull
   public UsageView createUsageView(@NotNull UsageTarget[] targets, @NotNull Usage[] usages, @NotNull UsageViewPresentation presentation, Factory<UsageSearcher> usageSearcherFactory) {
+    mySearchHasBeenCancelled = false;
     UsageViewImpl usageView = new UsageViewImpl(myProject, presentation, targets, usageSearcherFactory);
     appendUsages(usages, usageView);
     usageView.setSearchInProgress(false);

From 472d16982d0e704f2a1f4904346b7d4401905058 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 1 Jun 2012 21:39:06 +0400
Subject: [PATCH 100/239] commented tests for use interface where possible
 refactoring

---
 .../covariantReturnTypes/after/Main.java      | 16 ++++++++++++
 .../covariantReturnTypes/before/Main.java     | 16 ++++++++++++
 .../turnRefsToSuper/listArgs/after/Main.java  | 14 +++++++++++
 .../turnRefsToSuper/listArgs/before/Main.java | 14 +++++++++++
 .../turnRefsToSuper/newExpr/after/Main.java   | 25 +++++++++++++++++++
 .../turnRefsToSuper/newExpr/before/Main.java  | 25 +++++++++++++++++++
 .../staticCallArguments/after/Main.java       | 11 ++++++++
 .../staticCallArguments/before/Main.java      | 11 ++++++++
 .../refactoring/TurnRefsToSuperTest.java      | 16 ++++++++++++
 9 files changed, 148 insertions(+)
 create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/after/Main.java
 create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/before/Main.java
 create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/after/Main.java
 create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/before/Main.java
 create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/after/Main.java
 create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/before/Main.java
 create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/after/Main.java
 create mode 100644 java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/before/Main.java

diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/after/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/after/Main.java
new file mode 100644
index 000000000000..87838bd4cdf2
--- /dev/null
+++ b/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/after/Main.java
@@ -0,0 +1,16 @@
+interface Int {
+    Int f();
+}
+class Impl implements Int {
+    void foo(){}
+    Impl f() {return this;}
+}
+
+class Usage {
+    void fk(Impl l, Impl ll){
+      l.f().foo();
+
+      final Impl f = ll.f();
+      f.foo();
+    }
+}
diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/before/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/before/Main.java
new file mode 100644
index 000000000000..87838bd4cdf2
--- /dev/null
+++ b/java/java-tests/testData/refactoring/turnRefsToSuper/covariantReturnTypes/before/Main.java
@@ -0,0 +1,16 @@
+interface Int {
+    Int f();
+}
+class Impl implements Int {
+    void foo(){}
+    Impl f() {return this;}
+}
+
+class Usage {
+    void fk(Impl l, Impl ll){
+      l.f().foo();
+
+      final Impl f = ll.f();
+      f.foo();
+    }
+}
diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/after/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/after/Main.java
new file mode 100644
index 000000000000..f5461e3ae76c
--- /dev/null
+++ b/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/after/Main.java
@@ -0,0 +1,14 @@
+import java.util.*;
+interface Int {}
+class Impl implements Int {
+    void foo(){}
+}
+
+class Usage {
+    void f(List<Impl> l){
+        for (Impl aImpl : l) {
+            aImpl.foo();
+        }
+        l.get(0).foo();
+    }
+}
diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/before/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/before/Main.java
new file mode 100644
index 000000000000..f5461e3ae76c
--- /dev/null
+++ b/java/java-tests/testData/refactoring/turnRefsToSuper/listArgs/before/Main.java
@@ -0,0 +1,14 @@
+import java.util.*;
+interface Int {}
+class Impl implements Int {
+    void foo(){}
+}
+
+class Usage {
+    void f(List<Impl> l){
+        for (Impl aImpl : l) {
+            aImpl.foo();
+        }
+        l.get(0).foo();
+    }
+}
diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/after/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/after/Main.java
new file mode 100644
index 000000000000..53f59ce1a836
--- /dev/null
+++ b/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/after/Main.java
@@ -0,0 +1,25 @@
+import java.util.*;
+
+interface Int {
+}
+
+class Impl implements Int {
+    void foo() {
+    }
+}
+
+class Usage {
+  void f() {
+      List<Impl> l = new ArrayList<Impl>();
+      l.get(0).foo();
+
+
+      List<Int> l1 = new ArrayList<Int>();
+      Int i = l1.get(0);
+
+
+      List<Impl> l2 = new ArrayList<Impl>();
+      Impl i2 = l2.get(0);
+      i2.foo();
+  }
+}
diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/before/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/before/Main.java
new file mode 100644
index 000000000000..50ae4b902da8
--- /dev/null
+++ b/java/java-tests/testData/refactoring/turnRefsToSuper/newExpr/before/Main.java
@@ -0,0 +1,25 @@
+import java.util.*;
+
+interface Int {
+}
+
+class Impl implements Int {
+    void foo() {
+    }
+}
+
+class Usage {
+  void f() {
+      List<Impl> l = new ArrayList<Impl>();
+      l.get(0).foo();
+
+
+      List<Impl> l1 = new ArrayList<Impl>();
+      Impl i = l1.get(0);
+
+
+      List<Impl> l2 = new ArrayList<Impl>();
+      Impl i2 = l2.get(0);
+      i2.foo();
+  }
+}
diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/after/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/after/Main.java
new file mode 100644
index 000000000000..65863080db14
--- /dev/null
+++ b/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/after/Main.java
@@ -0,0 +1,11 @@
+import java.util.*;
+interface Int {}
+class Impl implements Int {
+}
+
+class Usage {
+    void f(List<Int> l){}
+    void bar() {
+        f(Collections.<Int>emptyList());
+    }
+}
diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/before/Main.java b/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/before/Main.java
new file mode 100644
index 000000000000..bdbd11ba0c5f
--- /dev/null
+++ b/java/java-tests/testData/refactoring/turnRefsToSuper/staticCallArguments/before/Main.java
@@ -0,0 +1,11 @@
+import java.util.*;
+interface Int {}
+class Impl implements Int {
+}
+
+class Usage {
+    void f(List<Impl> l){}
+    void bar() {
+        f(Collections.<Impl>emptyList());
+    }
+}
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java
index 5c85acae04c8..ff9dae636d0b 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java
@@ -150,6 +150,22 @@ public class TurnRefsToSuperTest extends MultiFileTestCase {
     doTest("Clazz", "Intf", false);
   }
 
+  public void _testStaticCallArguments() throws Exception {
+    doTest("Impl", "Int", false);
+  }
+  
+  public void _testListArgs() throws Exception {
+    doTest("Impl", "Int", false);
+  }
+  
+  public void _testCovariantReturnTypes() throws Exception {
+    doTest("Impl", "Int", false);
+  }
+  
+  public void _testNewExpr() throws Exception {
+    doTest("Impl", "Int", false);
+  }
+
   private void doTest(@NonNls final String className, @NonNls final String superClassName, final boolean replaceInstanceOf) throws Exception {
     doTest(new PerformAction() {
       @Override

From 68851cbe316e1e448e3406f3196f4c5fda97a513 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Fri, 1 Jun 2012 21:40:40 +0400
Subject: [PATCH 101/239] even more places to reference AllIcons

---
 .../src/com/intellij/internal/UsedIconsListingAction.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java b/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java
index c24f3159b311..29b8702dc892 100644
--- a/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java
+++ b/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java
@@ -111,8 +111,11 @@ public class UsedIconsListingAction extends AnAction {
       MethodReferencesSearch.search(findIconMethod, false).forEach(consumer);
     }
 
-    final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
+    PsiClass javaeeIcons = JavaPsiFacade.getInstance(project).findClass("com.intellij.javaee.oss.JavaeeIcons", GlobalSearchScope.allScope(project));
+    MethodReferencesSearch.search(javaeeIcons.findMethodsByName("getIcon", false)[0], false).forEach(consumer);
 
+    final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
+    MethodReferencesSearch.search(findIconMethod, false).forEach(consumer);
 
     PsiClass allIcons =
       JavaPsiFacade.getInstance(project).findClass("com.intellij.icons.AllIcons", GlobalSearchScope.allScope(project));
@@ -168,7 +171,7 @@ public class UsedIconsListingAction extends AnAction {
       }
     }
 
-    if (false /*do replacements*/) {
+    if (true /*do replacements*/) {
       ArrayList<String> sorted = new ArrayList<String>(answer);
       Collections.sort(sorted);
 

From 95534a1d3c1d7829b418c3605ee084048e7900e0 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Fri, 1 Jun 2012 13:49:16 +0400
Subject: [PATCH 102/239] First take on method references

---
 .../psi/PsiMethodReferenceExpression.java     |  31 +++++
 .../lang/java/parser/ExpressionParser.java    |  82 +++++++++---
 .../psi/impl/source/tree/ElementType.java     |  40 +++---
 .../psi/impl/source/tree/JavaElementType.java |   3 +-
 .../PsiMethodReferenceExpressionImpl.java     | 111 +++++++++++++++++
 .../tree/java/PsiReferenceExpressionBase.java | 117 ++++++++++++++++++
 .../tree/java/PsiReferenceExpressionImpl.java |  82 ++----------
 .../advHighlighting7/MethodReferences.java    |  26 ++++
 .../parser-partial/expressions/MethodRef0.txt |  20 +++
 .../parser-partial/expressions/MethodRef1.txt |  27 ++++
 .../parser-partial/expressions/MethodRef2.txt |  16 +++
 .../parser-partial/expressions/MethodRef3.txt |  17 +++
 .../parser-partial/expressions/MethodRef4.txt |  11 ++
 .../parser-partial/expressions/MethodRef5.txt |  55 ++++++++
 .../expressions/PrimitiveFieldAccess.txt      |  11 ++
 .../daemon/LightAdvHighlightingJdk7Test.java  |   1 +
 .../parser/partial/ExpressionParserTest.java  |   8 ++
 17 files changed, 546 insertions(+), 112 deletions(-)
 create mode 100644 java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceExpression.java
 create mode 100644 java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
 create mode 100644 java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionBase.java
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MethodReferences.java
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/MethodRef0.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/MethodRef1.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/MethodRef2.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/MethodRef3.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/MethodRef4.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/MethodRef5.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/PrimitiveFieldAccess.txt

diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceExpression.java
new file mode 100644
index 000000000000..6d62805915b8
--- /dev/null
+++ b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceExpression.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi;
+
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Represents a method or constructor reference.
+ */
+public interface PsiMethodReferenceExpression extends PsiReferenceExpression {
+  /**
+   * Returns the type element used as the qualifier of the reference.
+   *
+   * @return the qualifier, or null if the reference is qualified by expression.
+   */
+  @Nullable
+  PsiTypeElement getQualifierType();
+}
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
index b65578b6df00..7e522b6a46b4 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
@@ -321,6 +321,7 @@ public class ExpressionParser {
 
   private enum BreakPoint {P1, P2, P3, P4}
 
+  // todo[r.sh] make 'this', 'super' and 'class' reference expressions
   @Nullable
   private PsiBuilder.Marker parsePrimary(final PsiBuilder builder, @Nullable final BreakPoint breakPoint, final int breakOffset) {
     PsiBuilder.Marker startMarker = builder.mark();
@@ -350,7 +351,7 @@ public class ExpressionParser {
           final int offset = builder.getCurrentOffset();
           startMarker.rollbackTo();
 
-          final PsiBuilder.Marker classObjAccess = parseClassObjectAccess(builder);
+          final PsiBuilder.Marker classObjAccess = parseClassAccessOrMethodReference(builder);
           if (classObjAccess == null || builder.getCurrentOffset() < offset) {
             copy.rollbackTo();
             return parsePrimary(builder, BreakPoint.P1, offset);
@@ -466,7 +467,7 @@ public class ExpressionParser {
           final PsiBuilder.Marker copy = startMarker.precede();
           startMarker.rollbackTo();
 
-          final PsiBuilder.Marker classObjAccess = parseClassObjectAccess(builder);
+          final PsiBuilder.Marker classObjAccess = parseClassAccessOrMethodReference(builder);
           if (classObjAccess == null || builder.getCurrentOffset() <= pos) {
             copy.rollbackTo();
             return parsePrimary(builder, BreakPoint.P4, -1);
@@ -498,6 +499,9 @@ public class ExpressionParser {
           expr = arrayAccess;
         }
       }
+      else if (tokenType == JavaTokenType.DOUBLE_COLON) {
+        return parseMethodReference(builder, startMarker);
+      }
       else {
         startMarker.drop();
         return expr;
@@ -515,6 +519,7 @@ public class ExpressionParser {
       literal.done(JavaElementType.LITERAL_EXPRESSION);
       return literal;
     }
+
     if (tokenType == JavaTokenType.LPARENTH) {
       final PsiBuilder.Marker parenth = builder.mark();
       builder.advanceLexer();
@@ -533,12 +538,25 @@ public class ExpressionParser {
       parenth.done(JavaElementType.PARENTH_EXPRESSION);
       return parenth;
     }
+
     if (tokenType == JavaTokenType.LBRACE) {
       return parseArrayInitializer(builder);
     }
 
+    if (ElementType.PRIMITIVE_TYPE_BIT_SET.contains(tokenType) || tokenType == JavaTokenType.IDENTIFIER) {
+      final boolean primitive = tokenType != JavaTokenType.IDENTIFIER;
+      final PsiBuilder.Marker mark = builder.mark();
+
+      final ReferenceParser.TypeInfo typeInfo = myReferenceParser.parseTypeInfo(builder, 0);
+      if (typeInfo != null && (primitive || !typeInfo.hasErrors && typeInfo.isParameterized)) {
+        final PsiBuilder.Marker result = continueClassAccessOrMethodReference(builder, mark, primitive);
+        if (result != null) return result;
+      }
+
+      mark.rollbackTo();
+    }
+
     PsiBuilder.Marker annotation = null;
-    final PsiBuilder.Marker beforeAnnotation = builder.mark();
     if (tokenType == JavaTokenType.AT) {
       annotation = myDeclarationParser.parseAnnotations(builder);
       tokenType = builder.getTokenType();
@@ -558,17 +576,13 @@ public class ExpressionParser {
 
       builder.advanceLexer();
       refExpr.done(JavaElementType.REFERENCE_EXPRESSION);
-      beforeAnnotation.drop();
       return refExpr;
     }
 
     if (annotation != null) {
-      beforeAnnotation.rollbackTo();
+      annotation.rollbackTo();
       tokenType = builder.getTokenType();
     }
-    else {
-      beforeAnnotation.drop();
-    }
 
     PsiBuilder.Marker expr = null;
     if (tokenType == JavaTokenType.LT) {
@@ -599,12 +613,10 @@ public class ExpressionParser {
                   : JavaElementType.SUPER_EXPRESSION);
       return expr;
     }
+
     if (tokenType == JavaTokenType.NEW_KEYWORD) {
       return parseNew(builder, null);
     }
-    if (ElementType.PRIMITIVE_TYPE_BIT_SET.contains(tokenType)) {
-      return parseClassObjectAccess(builder);
-    }
 
     return null;
   }
@@ -745,27 +757,47 @@ public class ExpressionParser {
   }
 
   @Nullable
-  private PsiBuilder.Marker parseClassObjectAccess(final PsiBuilder builder) {
+  private PsiBuilder.Marker parseClassAccessOrMethodReference(final PsiBuilder builder) {
     final PsiBuilder.Marker expr = builder.mark();
 
+    final boolean primitive = ElementType.PRIMITIVE_TYPE_BIT_SET.contains(builder.getTokenType());
     if (myReferenceParser.parseType(builder, 0) == null) {
       expr.drop();
       return null;
     }
 
-    if (builder.getTokenType() != JavaTokenType.DOT) {
-      expr.rollbackTo();
-      return null;
+    final PsiBuilder.Marker result = continueClassAccessOrMethodReference(builder, expr, primitive);
+    if (result == null) expr.rollbackTo();
+    return result;
+  }
+
+  @Nullable
+  private PsiBuilder.Marker continueClassAccessOrMethodReference(final PsiBuilder builder,
+                                                                 final PsiBuilder.Marker expr,
+                                                                 final boolean primitive) {
+    final IElementType tokenType = builder.getTokenType();
+    if (tokenType == JavaTokenType.DOT) {
+      return parseClassObjectAccess(builder, expr, primitive);
     }
-    PsiBuilder.Marker afterType = builder.mark();
+    else if (tokenType == JavaTokenType.DOUBLE_COLON) {
+      return parseMethodReference(builder, expr);
+    }
+
+    return null;
+  }
+
+  @Nullable
+  private static PsiBuilder.Marker parseClassObjectAccess(PsiBuilder builder, PsiBuilder.Marker expr, boolean primitive) {
+    final PsiBuilder.Marker mark = builder.mark();
     builder.advanceLexer();
 
     if (builder.getTokenType() == JavaTokenType.CLASS_KEYWORD) {
-      afterType.drop();
+      mark.drop();
       builder.advanceLexer();
     }
     else {
-      afterType.rollbackTo();
+      if (!primitive) return null;
+      mark.rollbackTo();
       builder.error(".class expected");
     }
 
@@ -773,6 +805,20 @@ public class ExpressionParser {
     return expr;
   }
 
+  @NotNull
+  private PsiBuilder.Marker parseMethodReference(final PsiBuilder builder, final PsiBuilder.Marker start) {
+    builder.advanceLexer();
+
+    myReferenceParser.parseReferenceParameterList(builder, false, false);
+
+    if (!expect(builder, JavaTokenType.IDENTIFIER) && !expect(builder, JavaTokenType.NEW_KEYWORD)) {
+      error(builder, JavaErrorMessages.message("expected.identifier"));
+    }
+
+    start.done(JavaElementType.METHOD_REF_EXPRESSION);
+    return start;
+  }
+
   @NotNull
   public PsiBuilder.Marker parseArgumentList(final PsiBuilder builder) {
     final PsiBuilder.Marker list = builder.mark();
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
index 48b07d17942c..a734707a2da1 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
@@ -29,13 +29,12 @@ public interface ElementType extends JavaTokenType, JavaDocTokenType, JavaElemen
 
   TokenSet KEYWORD_BIT_SET = TokenSet.create(
     ABSTRACT_KEYWORD, ASSERT_KEYWORD, BOOLEAN_KEYWORD, BREAK_KEYWORD, BYTE_KEYWORD, CASE_KEYWORD, CATCH_KEYWORD, CHAR_KEYWORD,
-    CLASS_KEYWORD,
-    CONST_KEYWORD, CONTINUE_KEYWORD, DEFAULT_KEYWORD, DO_KEYWORD, DOUBLE_KEYWORD, ELSE_KEYWORD, ENUM_KEYWORD, EXTENDS_KEYWORD,
-    FINAL_KEYWORD,
-    FINALLY_KEYWORD, FLOAT_KEYWORD, FOR_KEYWORD, GOTO_KEYWORD, IF_KEYWORD, IMPLEMENTS_KEYWORD, IMPORT_KEYWORD, INSTANCEOF_KEYWORD,
-    INT_KEYWORD, INTERFACE_KEYWORD, LONG_KEYWORD, NATIVE_KEYWORD, NEW_KEYWORD, PACKAGE_KEYWORD, PRIVATE_KEYWORD, PROTECTED_KEYWORD,
-    PUBLIC_KEYWORD, RETURN_KEYWORD, SHORT_KEYWORD, SUPER_KEYWORD, STATIC_KEYWORD, STRICTFP_KEYWORD, SWITCH_KEYWORD, SYNCHRONIZED_KEYWORD,
-    THIS_KEYWORD, THROW_KEYWORD, THROWS_KEYWORD, TRANSIENT_KEYWORD, TRY_KEYWORD, VOID_KEYWORD, VOLATILE_KEYWORD, WHILE_KEYWORD);
+    CLASS_KEYWORD, CONST_KEYWORD, CONTINUE_KEYWORD, DEFAULT_KEYWORD, DO_KEYWORD, DOUBLE_KEYWORD, ELSE_KEYWORD, ENUM_KEYWORD,
+    EXTENDS_KEYWORD, FINAL_KEYWORD, FINALLY_KEYWORD, FLOAT_KEYWORD, FOR_KEYWORD, GOTO_KEYWORD, IF_KEYWORD, IMPLEMENTS_KEYWORD,
+    IMPORT_KEYWORD, INSTANCEOF_KEYWORD, INT_KEYWORD, INTERFACE_KEYWORD, LONG_KEYWORD, NATIVE_KEYWORD, NEW_KEYWORD, PACKAGE_KEYWORD,
+    PRIVATE_KEYWORD, PROTECTED_KEYWORD, PUBLIC_KEYWORD, RETURN_KEYWORD, SHORT_KEYWORD, SUPER_KEYWORD, STATIC_KEYWORD, STRICTFP_KEYWORD,
+    SWITCH_KEYWORD, SYNCHRONIZED_KEYWORD, THIS_KEYWORD, THROW_KEYWORD, THROWS_KEYWORD, TRANSIENT_KEYWORD, TRY_KEYWORD, VOID_KEYWORD,
+    VOLATILE_KEYWORD, WHILE_KEYWORD);
 
   TokenSet LITERAL_BIT_SET = TokenSet.create(TRUE_KEYWORD, FALSE_KEYWORD, NULL_KEYWORD);
 
@@ -45,33 +44,31 @@ public interface ElementType extends JavaTokenType, JavaDocTokenType, JavaElemen
     PLUSEQ, MINUSEQ, ASTERISKEQ, DIVEQ, ANDEQ, OREQ, XOREQ, PERCEQ, LTLTEQ, GTGTEQ, GTGTGTEQ);
 
   TokenSet MODIFIER_BIT_SET = TokenSet.create(
-    PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, STATIC_KEYWORD, ABSTRACT_KEYWORD, FINAL_KEYWORD, NATIVE_KEYWORD, SYNCHRONIZED_KEYWORD,
-    STRICTFP_KEYWORD, TRANSIENT_KEYWORD, VOLATILE_KEYWORD);
+    PUBLIC_KEYWORD, PROTECTED_KEYWORD, PRIVATE_KEYWORD, STATIC_KEYWORD, ABSTRACT_KEYWORD, FINAL_KEYWORD, NATIVE_KEYWORD,
+    SYNCHRONIZED_KEYWORD, STRICTFP_KEYWORD, TRANSIENT_KEYWORD, VOLATILE_KEYWORD);
 
   TokenSet PRIMITIVE_TYPE_BIT_SET = TokenSet.create(
     BOOLEAN_KEYWORD, BYTE_KEYWORD, SHORT_KEYWORD, INT_KEYWORD, LONG_KEYWORD, CHAR_KEYWORD, FLOAT_KEYWORD, DOUBLE_KEYWORD, VOID_KEYWORD);
 
   TokenSet EXPRESSION_BIT_SET = TokenSet.create(
     REFERENCE_EXPRESSION, LITERAL_EXPRESSION, THIS_EXPRESSION, SUPER_EXPRESSION, PARENTH_EXPRESSION, METHOD_CALL_EXPRESSION,
-    TYPE_CAST_EXPRESSION, PREFIX_EXPRESSION, POSTFIX_EXPRESSION, BINARY_EXPRESSION, POLYADIC_EXPRESSION, CONDITIONAL_EXPRESSION, ASSIGNMENT_EXPRESSION,
-    NEW_EXPRESSION, ARRAY_ACCESS_EXPRESSION, ARRAY_INITIALIZER_EXPRESSION, INSTANCE_OF_EXPRESSION, CLASS_OBJECT_ACCESS_EXPRESSION,
-    EMPTY_EXPRESSION);
+    TYPE_CAST_EXPRESSION, PREFIX_EXPRESSION, POSTFIX_EXPRESSION, BINARY_EXPRESSION, POLYADIC_EXPRESSION, CONDITIONAL_EXPRESSION,
+    ASSIGNMENT_EXPRESSION, NEW_EXPRESSION, ARRAY_ACCESS_EXPRESSION, ARRAY_INITIALIZER_EXPRESSION, INSTANCE_OF_EXPRESSION,
+    CLASS_OBJECT_ACCESS_EXPRESSION, METHOD_REF_EXPRESSION, EMPTY_EXPRESSION);
 
   TokenSet ANNOTATION_MEMBER_VALUE_BIT_SET = TokenSet.orSet(EXPRESSION_BIT_SET,
                                                             TokenSet.create(ANNOTATION, ANNOTATION_ARRAY_INITIALIZER));
 
   TokenSet ARRAY_DIMENSION_BIT_SET = TokenSet.create(
     REFERENCE_EXPRESSION, LITERAL_EXPRESSION, THIS_EXPRESSION, SUPER_EXPRESSION, PARENTH_EXPRESSION, METHOD_CALL_EXPRESSION,
-    TYPE_CAST_EXPRESSION, PREFIX_EXPRESSION, POSTFIX_EXPRESSION, BINARY_EXPRESSION, POLYADIC_EXPRESSION, CONDITIONAL_EXPRESSION, ASSIGNMENT_EXPRESSION,
-    NEW_EXPRESSION, ARRAY_ACCESS_EXPRESSION, INSTANCE_OF_EXPRESSION, CLASS_OBJECT_ACCESS_EXPRESSION, EMPTY_EXPRESSION);
+    TYPE_CAST_EXPRESSION, PREFIX_EXPRESSION, POSTFIX_EXPRESSION, BINARY_EXPRESSION, POLYADIC_EXPRESSION, CONDITIONAL_EXPRESSION,
+    ASSIGNMENT_EXPRESSION, NEW_EXPRESSION, ARRAY_ACCESS_EXPRESSION, INSTANCE_OF_EXPRESSION, CLASS_OBJECT_ACCESS_EXPRESSION,
+    EMPTY_EXPRESSION);
 
   TokenSet JAVA_STATEMENT_BIT_SET = TokenSet.create(
-    EMPTY_STATEMENT, BLOCK_STATEMENT, EXPRESSION_STATEMENT, EXPRESSION_LIST_STATEMENT,
-    DECLARATION_STATEMENT, IF_STATEMENT, WHILE_STATEMENT, FOR_STATEMENT, FOREACH_STATEMENT,
-    DO_WHILE_STATEMENT, SWITCH_STATEMENT, SWITCH_LABEL_STATEMENT, BREAK_STATEMENT,
-    CONTINUE_STATEMENT, RETURN_STATEMENT, THROW_STATEMENT, SYNCHRONIZED_STATEMENT,
-    TRY_STATEMENT, LABELED_STATEMENT, ASSERT_STATEMENT
-  );
+    EMPTY_STATEMENT, BLOCK_STATEMENT, EXPRESSION_STATEMENT, EXPRESSION_LIST_STATEMENT, DECLARATION_STATEMENT, IF_STATEMENT,
+    WHILE_STATEMENT, FOR_STATEMENT, FOREACH_STATEMENT, DO_WHILE_STATEMENT, SWITCH_STATEMENT, SWITCH_LABEL_STATEMENT, BREAK_STATEMENT,
+    CONTINUE_STATEMENT, RETURN_STATEMENT, THROW_STATEMENT, SYNCHRONIZED_STATEMENT, TRY_STATEMENT, LABELED_STATEMENT, ASSERT_STATEMENT);
 
   TokenSet TYPES_BIT_SET = TokenSet.create(TYPE);
   TokenSet IMPORT_STATEMENT_BIT_SET = TokenSet.create(IMPORT_STATEMENT);
@@ -79,7 +76,6 @@ public interface ElementType extends JavaTokenType, JavaDocTokenType, JavaElemen
   TokenSet IMPORT_STATEMENT_BASE_BIT_SET = TokenSet.create(IMPORT_STATEMENT, IMPORT_STATIC_STATEMENT);
   TokenSet CLASS_KEYWORD_BIT_SET = TokenSet.create(CLASS_KEYWORD, INTERFACE_KEYWORD, ENUM_KEYWORD);
   TokenSet MEMBER_BIT_SET = TokenSet.create(CLASS, FIELD, ENUM_CONSTANT, METHOD, ANNOTATION_METHOD);
-  TokenSet FULL_MEMBER_BIT_SET = TokenSet.orSet(MEMBER_BIT_SET,
-                                                TokenSet.create(CLASS_INITIALIZER));
+  TokenSet FULL_MEMBER_BIT_SET = TokenSet.orSet(MEMBER_BIT_SET, TokenSet.create(CLASS_INITIALIZER));
   TokenSet ANNOTATIONS = TokenSet.create(ANNOTATION);
 }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
index 69476e9ef24d..7f96a2d003dd 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,6 +104,7 @@ public interface JavaElementType {
   IElementType INSTANCE_OF_EXPRESSION = new JavaCompositeElementType("INSTANCE_OF_EXPRESSION", PsiInstanceOfExpressionImpl.class);
   IElementType CLASS_OBJECT_ACCESS_EXPRESSION = new JavaCompositeElementType("CLASS_OBJECT_ACCESS_EXPRESSION", PsiClassObjectAccessExpressionImpl.class);
   IElementType EMPTY_EXPRESSION = new JavaCompositeElementType("EMPTY_EXPRESSION", PsiEmptyExpressionImpl.class, true);
+  IElementType METHOD_REF_EXPRESSION = new JavaCompositeElementType("METHOD_REF_EXPRESSION", PsiMethodReferenceExpressionImpl.class);
   IElementType EXPRESSION_LIST = new JavaCompositeElementType("EXPRESSION_LIST", PsiExpressionListImpl.class, true);
   IElementType EMPTY_STATEMENT = new JavaCompositeElementType("EMPTY_STATEMENT", PsiEmptyStatementImpl.class);
   IElementType BLOCK_STATEMENT = new JavaCompositeElementType("BLOCK_STATEMENT", PsiBlockStatementImpl.class);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
new file mode 100644
index 000000000000..ad21de8a54f2
--- /dev/null
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi.impl.source.tree.java;
+
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.*;
+import com.intellij.psi.impl.source.tree.JavaElementType;
+import com.intellij.psi.scope.PsiScopeProcessor;
+import com.intellij.psi.util.PsiUtil;
+import org.jetbrains.annotations.NotNull;
+
+public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase implements PsiMethodReferenceExpression {
+  private static Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiMethodReferenceExpressionImpl");
+
+  public PsiMethodReferenceExpressionImpl() {
+    super(JavaElementType.METHOD_REF_EXPRESSION);
+  }
+
+  @Override
+  public PsiTypeElement getQualifierType() {
+    final PsiElement qualifier = getQualifier();
+    return qualifier instanceof PsiTypeElement ? (PsiTypeElement)qualifier : null;
+  }
+
+  @Override
+  public PsiExpression getQualifierExpression() {
+    final PsiElement qualifier = getQualifier();
+    return qualifier instanceof PsiExpression ? (PsiExpression)qualifier : null;
+  }
+
+  @Override
+  public PsiType getType() {
+    // todo[r.sh]: implement
+    return null;
+  }
+
+  @Override
+  public PsiElement getReferenceNameElement() {
+    final PsiElement element = getLastChild();
+    return element instanceof PsiIdentifier || PsiUtil.isJavaToken(element, JavaTokenType.NEW_KEYWORD) ? element : null;
+  }
+
+  @Override
+  public void processVariants(final PsiScopeProcessor processor) {
+    // todo[r.sh]: implement
+  }
+
+  @NotNull
+  @Override
+  public JavaResolveResult[] multiResolve(final boolean incompleteCode) {
+    // todo[r.sh]: implement
+    return JavaResolveResult.EMPTY_ARRAY;
+  }
+
+  @Override
+  public PsiElement getQualifier() {
+    final PsiElement element = getFirstChild();
+    return element instanceof PsiExpression || element instanceof PsiTypeElement ? element : null;
+  }
+
+  @Override
+  public TextRange getRangeInElement() {
+    final PsiElement element = getReferenceNameElement();
+    if (element != null) return new TextRange(element.getStartOffsetInParent(), element.getTextLength());
+    final PsiElement colons = findPsiChildByType(JavaTokenType.DOUBLE_COLON);
+    if (colons != null) return new TextRange(colons.getStartOffsetInParent(), colons.getTextLength());
+    LOG.error(getText());
+    return null;
+  }
+
+  @NotNull
+  @Override
+  public String getCanonicalText() {
+    return getText();
+  }
+
+  @Override
+  public boolean isReferenceTo(final PsiElement element) {
+    if (!(element instanceof PsiMethod)) return false;
+    final PsiMethod method = (PsiMethod)element;
+
+    final PsiElement nameElement = getReferenceNameElement();
+    if (nameElement instanceof PsiIdentifier) {
+      if (!nameElement.getText().equals(method.getName())) return false;
+    }
+    else if (PsiUtil.isJavaToken(nameElement, JavaTokenType.NEW_KEYWORD)) {
+      if (!method.isConstructor()) return false;
+    }
+
+    return element.getManager().areElementsEquivalent(element, resolve());
+  }
+
+  @Override
+  public String toString() {
+    return "PsiMethodReferenceExpression:" + getText();
+  }
+}
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionBase.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionBase.java
new file mode 100644
index 000000000000..df67a536d105
--- /dev/null
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionBase.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi.impl.source.tree.java;
+
+import com.intellij.psi.*;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public abstract class PsiReferenceExpressionBase extends ExpressionPsiElement implements PsiReferenceExpression {
+  public PsiReferenceExpressionBase(@NotNull final IElementType type) {
+    super(type);
+  }
+
+  @Override
+  public PsiElement bindToElementViaStaticImport(@NotNull final PsiClass qualifierClass) throws IncorrectOperationException {
+    throw new IncorrectOperationException();
+  }
+
+  @Override
+  public void setQualifierExpression(@Nullable PsiExpression newQualifier) throws IncorrectOperationException {
+    throw new IncorrectOperationException();
+  }
+
+  @Override
+  public PsiElement getElement() {
+    return this;
+  }
+
+  @Override
+  public PsiElement resolve() {
+    return advancedResolve(false).getElement();
+  }
+
+  @Override
+  public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {
+    throw new IncorrectOperationException();
+  }
+
+  @Override
+  public PsiElement bindToElement(@NotNull PsiElement element) throws IncorrectOperationException {
+    throw new IncorrectOperationException();
+  }
+
+  @Override
+  public boolean isReferenceTo(final PsiElement element) {
+    return element.getManager().areElementsEquivalent(element, resolve());
+  }
+
+  @NotNull
+  @Override
+  public Object[] getVariants() {
+    // this reference's variants are rather obtained with processVariants()
+    return ArrayUtil.EMPTY_OBJECT_ARRAY;
+  }
+
+  @Override
+  public boolean isSoft() {
+    return false;
+  }
+
+  @Override
+  public PsiReference getReference() {
+    return this;
+  }
+
+  @NotNull
+  @Override
+  public JavaResolveResult advancedResolve(boolean incompleteCode) {
+    final JavaResolveResult[] results = multiResolve(incompleteCode);
+    return results.length == 1 ? results[0] : JavaResolveResult.EMPTY;
+  }
+
+  @Override
+  public String getReferenceName() {
+    final PsiElement element = getReferenceNameElement();
+    return element != null ? element.getText() : null;
+  }
+
+  @Override
+  public PsiReferenceParameterList getParameterList() {
+    return PsiTreeUtil.getChildOfType(this, PsiReferenceParameterList.class);
+  }
+
+  @NotNull
+  @Override
+  public PsiType[] getTypeParameters() {
+    final PsiReferenceParameterList parameterList = getParameterList();
+    return parameterList != null ? parameterList.getTypeArguments() : PsiType.EMPTY_ARRAY;
+  }
+
+  @Override
+  public boolean isQualified() {
+    return getQualifier() != null;
+  }
+
+  @Override
+  public String getQualifiedName() {
+    return getCanonicalText();
+  }
+}
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
index 52472d402077..9974e27bfe30 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements PsiReferenceExpression, SourceJavaCodeReference {
+public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase implements PsiReferenceExpression, SourceJavaCodeReference {
   private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.java.PsiReferenceExpressionImpl");
 
   private volatile String myCachedQName = null;
@@ -108,7 +108,8 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     }
     else {
       PsiManagerEx manager = getManager();
-      PsiReferenceExpression classRef = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createReferenceExpression(qualifierClass);
+      PsiReferenceExpression classRef = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createReferenceExpression(
+        qualifierClass);
       final CharTable treeCharTab = SharedImplUtil.findCharTableByTree(this);
       LeafElement dot = Factory.createSingleLeafElement(JavaTokenType.DOT, ".", 0, 1, treeCharTab, manager);
       addInternal(dot, dot, SourceTreeToPsiMap.psiElementToTree(getParameterList()), Boolean.TRUE);
@@ -122,7 +123,8 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     final String qualifiedName  = qualifierClass.getQualifiedName();
     final List<PsiJavaCodeReferenceElement> refs = getImportsFromClass(importList, qualifiedName);
     if (refs.size() < JavaCodeStyleSettingsFacade.getInstance(qualifierClass.getProject()).getNamesCountToUseImportOnDemand()) {
-      importList.add(JavaPsiFacade.getInstance(qualifierClass.getProject()).getElementFactory().createImportStaticStatement(qualifierClass, staticName));
+      importList.add(JavaPsiFacade.getInstance(qualifierClass.getProject()).getElementFactory().createImportStaticStatement(qualifierClass,
+                                                                                                                            staticName));
     } else {
       for (PsiJavaCodeReferenceElement ref : refs) {
         final PsiImportStaticStatement importStatement = PsiTreeUtil.getParentOfType(ref, PsiImportStaticStatement.class);
@@ -130,7 +132,8 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
           importStatement.delete();
         }
       }
-      importList.add(JavaPsiFacade.getInstance(qualifierClass.getProject()).getElementFactory().createImportStaticStatement(qualifierClass, "*"));
+      importList.add(JavaPsiFacade.getInstance(qualifierClass.getProject()).getElementFactory().createImportStaticStatement(qualifierClass,
+                                                                                                                            "*"));
     }
   }
 
@@ -174,16 +177,6 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     return getQualifierExpression();
   }
 
-  @Override
-  public PsiReference getReference() {
-    return this;
-  }
-
-  @Override
-  public PsiElement resolve() {
-    return advancedResolve(false).getElement();
-  }
-
   @Override
   public void clearCaches() {
     myCachedQName = null;
@@ -316,18 +309,6 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     return getCachedTextSkipWhiteSpaceAndComments();
   }
 
-  @Override
-  public String getQualifiedName() {
-    return getCanonicalText();
-  }
-
-  @Override
-  public String getReferenceName() {
-    PsiElement element = getReferenceNameElement();
-    if (element == null) return null;
-    return element.getText();
-  }
-
   private final Function<PsiReferenceExpressionImpl, PsiType> ourTypeEvaluator = new TypeEvaluator();
 
   private static class TypeEvaluator implements NullableFunction<PsiReferenceExpressionImpl, PsiType> {
@@ -409,20 +390,7 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     // optimization: methodCallExpression should resolve to a method
     if (parentIsMethodCall != resolvingToMethod) return false;
 
-    return element.getManager().areElementsEquivalent(element, resolve());
-  }
-
-
-  @Override
-  @NotNull
-  public Object[] getVariants() {
-    //this reference's variants are rather obtained with processVariants()
-    return ArrayUtil.EMPTY_OBJECT_ARRAY;
-  }
-
-  @Override
-  public boolean isSoft() {
-    return false;
+    return super.isReferenceTo(element);
   }
 
   @Override
@@ -435,7 +403,7 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     filter.addFilter(new AndFilter(ElementClassFilter.METHOD, new NotFilter(new ConstructorFilter())));
     filter.addFilter(ElementClassFilter.VARIABLE);
 
-    FilterScopeProcessor proc = new FilterScopeProcessor(filter, processor) {
+    FilterScopeProcessor filterProcessor = new FilterScopeProcessor<CandidateInfo>(filter, processor) {
       private final Set<String> myVarNames = new THashSet<String>();
 
       @Override
@@ -454,7 +422,7 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
       }
 
     };
-    PsiScopesUtil.resolveAndWalk(proc, this, null, true);
+    PsiScopesUtil.resolveAndWalk(filterProcessor, this, null, true);
   }
 
   private static boolean seemsScrambled(PsiClass element) {
@@ -469,24 +437,11 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
            Character.isLowerCase(qualifiedName.charAt(0));
   }
 
-  @Override
-  @NotNull
-  public JavaResolveResult advancedResolve(boolean incompleteCode) {
-    final JavaResolveResult[] results = multiResolve(incompleteCode);
-    if (results.length == 1) return results[0];
-    return JavaResolveResult.EMPTY;
-  }
-
   @Override
   public PsiElement getReferenceNameElement() {
     return findChildByRoleAsPsiElement(ChildRole.REFERENCE_NAME);
   }
 
-  @Override
-  public PsiReferenceParameterList getParameterList() {
-    return (PsiReferenceParameterList)findChildByRoleAsPsiElement(ChildRole.REFERENCE_PARAMETER_LIST);
-  }
-
   @Override
   public int getTextOffset() {
     ASTNode refName = findChildByRole(ChildRole.REFERENCE_NAME);
@@ -684,20 +639,6 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     return new TextRange(nameChild.getStartOffsetInParent(), getTextLength());
   }
 
-  @Override
-  public PsiElement getElement() {
-    return this;
-  }
-
-  @Override
-  @NotNull
-  public PsiType[] getTypeParameters() {
-    final PsiReferenceParameterList parameterList = getParameterList();
-    if (parameterList == null) return PsiType.EMPTY_ARRAY;
-    return parameterList.getTypeArguments();
-  }
-
-
   @Override
   public String getClassNameText() {
     String cachedQName = myCachedQName;
@@ -744,4 +685,3 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     return whiteSpaceAndComments;
   }
 }
-
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MethodReferences.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MethodReferences.java
new file mode 100644
index 000000000000..150cf88144fe
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MethodReferences.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class C {
+  interface Simplest {
+    void m();
+  }
+  void simplest() { }
+
+  void test() {
+    <error descr="Incompatible types. Found: 'null', required: 'C.Simplest'">Simplest simplest = this::simplest;</error>
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/MethodRef0.txt b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef0.txt
new file mode 100644
index 000000000000..28d943ef1c0e
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef0.txt
@@ -0,0 +1,20 @@
+PsiJavaFile:MethodRef0.java
+  PsiMethodReferenceExpression:a.b.C::m
+    PsiReferenceExpression:a.b.C
+      PsiReferenceExpression:a.b
+        PsiReferenceExpression:a
+          PsiReferenceParameterList
+            <empty list>
+          PsiIdentifier:a('a')
+        PsiJavaToken:DOT('.')
+        PsiReferenceParameterList
+          <empty list>
+        PsiIdentifier:b('b')
+      PsiJavaToken:DOT('.')
+      PsiReferenceParameterList
+        <empty list>
+      PsiIdentifier:C('C')
+    PsiJavaToken:DOUBLE_COLON('::')
+    PsiReferenceParameterList
+      <empty list>
+    PsiIdentifier:m('m')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/MethodRef1.txt b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef1.txt
new file mode 100644
index 000000000000..16de47b23d45
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef1.txt
@@ -0,0 +1,27 @@
+PsiJavaFile:MethodRef1.java
+  PsiMethodReferenceExpression:a.b.C<T>::new
+    PsiTypeElement:a.b.C<T>
+      PsiJavaCodeReferenceElement:a.b.C<T>
+        PsiJavaCodeReferenceElement:a.b
+          PsiJavaCodeReferenceElement:a
+            PsiIdentifier:a('a')
+            PsiReferenceParameterList
+              <empty list>
+          PsiJavaToken:DOT('.')
+          PsiIdentifier:b('b')
+          PsiReferenceParameterList
+            <empty list>
+        PsiJavaToken:DOT('.')
+        PsiIdentifier:C('C')
+        PsiReferenceParameterList
+          PsiJavaToken:LT('<')
+          PsiTypeElement:T
+            PsiJavaCodeReferenceElement:T
+              PsiIdentifier:T('T')
+              PsiReferenceParameterList
+                <empty list>
+          PsiJavaToken:GT('>')
+    PsiJavaToken:DOUBLE_COLON('::')
+    PsiReferenceParameterList
+      <empty list>
+    PsiKeyword:new('new')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/MethodRef2.txt b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef2.txt
new file mode 100644
index 000000000000..3763aa5e3eba
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef2.txt
@@ -0,0 +1,16 @@
+PsiJavaFile:MethodRef2.java
+  PsiMethodReferenceExpression:C::<T>m
+    PsiReferenceExpression:C
+      PsiReferenceParameterList
+        <empty list>
+      PsiIdentifier:C('C')
+    PsiJavaToken:DOUBLE_COLON('::')
+    PsiReferenceParameterList
+      PsiJavaToken:LT('<')
+      PsiTypeElement:T
+        PsiJavaCodeReferenceElement:T
+          PsiIdentifier:T('T')
+          PsiReferenceParameterList
+            <empty list>
+      PsiJavaToken:GT('>')
+    PsiIdentifier:m('m')
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/MethodRef3.txt b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef3.txt
new file mode 100644
index 000000000000..f13cc341917b
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef3.txt
@@ -0,0 +1,17 @@
+PsiJavaFile:MethodRef3.java
+  PsiMethodReferenceExpression:a[i]::m
+    PsiArrayAccessExpression:a[i]
+      PsiReferenceExpression:a
+        PsiReferenceParameterList
+          <empty list>
+        PsiIdentifier:a('a')
+      PsiJavaToken:LBRACKET('[')
+      PsiReferenceExpression:i
+        PsiReferenceParameterList
+          <empty list>
+        PsiIdentifier:i('i')
+      PsiJavaToken:RBRACKET(']')
+    PsiJavaToken:DOUBLE_COLON('::')
+    PsiReferenceParameterList
+      <empty list>
+    PsiIdentifier:m('m')
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/MethodRef4.txt b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef4.txt
new file mode 100644
index 000000000000..31cf24bdb999
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef4.txt
@@ -0,0 +1,11 @@
+PsiJavaFile:MethodRef4.java
+  PsiMethodReferenceExpression:int[]::clone
+    PsiTypeElement:int[]
+      PsiTypeElement:int
+        PsiKeyword:int('int')
+      PsiJavaToken:LBRACKET('[')
+      PsiJavaToken:RBRACKET(']')
+    PsiJavaToken:DOUBLE_COLON('::')
+    PsiReferenceParameterList
+      <empty list>
+    PsiIdentifier:clone('clone')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/MethodRef5.txt b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef5.txt
new file mode 100644
index 000000000000..4a82070c8b37
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/MethodRef5.txt
@@ -0,0 +1,55 @@
+PsiJavaFile:MethodRef5.java
+  PsiMethodReferenceExpression:(f ? list.map(String::length) : Collections.emptyList())::iterator
+    PsiParenthesizedExpression:(f ? list.map(String::length) : Collections.emptyList())
+      PsiJavaToken:LPARENTH('(')
+      PsiConditionalExpression:f ? list.map(String::length) : Collections.emptyList()
+        PsiReferenceExpression:f
+          PsiReferenceParameterList
+            <empty list>
+          PsiIdentifier:f('f')
+        PsiWhiteSpace(' ')
+        PsiJavaToken:QUEST('?')
+        PsiWhiteSpace(' ')
+        PsiMethodCallExpression:list.map(String::length)
+          PsiReferenceExpression:list.map
+            PsiReferenceExpression:list
+              PsiReferenceParameterList
+                <empty list>
+              PsiIdentifier:list('list')
+            PsiJavaToken:DOT('.')
+            PsiReferenceParameterList
+              <empty list>
+            PsiIdentifier:map('map')
+          PsiExpressionList
+            PsiJavaToken:LPARENTH('(')
+            PsiMethodReferenceExpression:String::length
+              PsiReferenceExpression:String
+                PsiReferenceParameterList
+                  <empty list>
+                PsiIdentifier:String('String')
+              PsiJavaToken:DOUBLE_COLON('::')
+              PsiReferenceParameterList
+                <empty list>
+              PsiIdentifier:length('length')
+            PsiJavaToken:RPARENTH(')')
+        PsiWhiteSpace(' ')
+        PsiJavaToken:COLON(':')
+        PsiWhiteSpace(' ')
+        PsiMethodCallExpression:Collections.emptyList()
+          PsiReferenceExpression:Collections.emptyList
+            PsiReferenceExpression:Collections
+              PsiReferenceParameterList
+                <empty list>
+              PsiIdentifier:Collections('Collections')
+            PsiJavaToken:DOT('.')
+            PsiReferenceParameterList
+              <empty list>
+            PsiIdentifier:emptyList('emptyList')
+          PsiExpressionList
+            PsiJavaToken:LPARENTH('(')
+            PsiJavaToken:RPARENTH(')')
+      PsiJavaToken:RPARENTH(')')
+    PsiJavaToken:DOUBLE_COLON('::')
+    PsiReferenceParameterList
+      <empty list>
+    PsiIdentifier:iterator('iterator')
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/PrimitiveFieldAccess.txt b/java/java-tests/testData/psi/parser-partial/expressions/PrimitiveFieldAccess.txt
new file mode 100644
index 000000000000..13e35abdce09
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/PrimitiveFieldAccess.txt
@@ -0,0 +1,11 @@
+PsiJavaFile:PrimitiveFieldAccess.java
+  PsiReferenceExpression:int.x
+    PsiClassObjectAccessExpression:int
+      PsiTypeElement:int
+        PsiKeyword:int('int')
+      PsiErrorElement:.class expected
+        <empty list>
+    PsiJavaToken:DOT('.')
+    PsiReferenceParameterList
+      <empty list>
+    PsiIdentifier:x('x')
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
index aa839c1bae79..ac076e6a6c0f 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
@@ -184,4 +184,5 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   public void testIDEA84533() throws Exception { doTest(false, false); }
   public void testClassLiteral() throws Exception { doTest(false, false); }
   public void testExtensionMethods() throws Exception { doTest(false, false); }
+  public void testMethodReferences() throws Exception { doTest(false, false); }
 }
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
index f43e356abed7..838d0c4fcf2a 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
@@ -111,9 +111,17 @@ public class ExpressionParserTest extends JavaParsingTestCase {
   public void testQualifiedSuperMethodCall1() { doParserTest("d.super(0)"); }
   public void testSuperMethodCallTypeParameterList() { doParserTest("super()"); }
   public void testPrimitiveClassObjectAccess() { doParserTest("int.class"); }
+  public void testPrimitiveFieldAccess() { doParserTest("int.x"); }
   public void testChainedClassObjectAccess() { doParserTest("A.class.B.class"); }
   public void testChainedThisObjectAccess() { doParserTest("A.this.B.this"); }
 
+  public void testMethodRef0() { doParserTest("a.b.C::m"); }
+  public void testMethodRef1() { doParserTest("a.b.C<T>::new"); }
+  public void testMethodRef2() { doParserTest("C::<T>m"); }
+  public void testMethodRef3() { doParserTest("a[i]::m"); }
+  public void testMethodRef4() { doParserTest("int[]::clone"); }
+  public void testMethodRef5() { doParserTest("(f ? list.map(String::length) : Collections.emptyList())::iterator"); }
+
   private void doParserTest(@NonNls final String text) {
     doParserTest(text, new MyTestParser());
   }

From 975469ad73a567710edda878907a5ef07d13cd87 Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Fri, 1 Jun 2012 19:56:12 +0400
Subject: [PATCH 103/239] IDEA-78614 Ptoject-tree items are not launching by
 press Enter.

---
 .../com/intellij/openapi/fileEditor/OpenFileDescriptor.java    | 2 +-
 .../src/com/intellij/ui/AutoScrollToSourceHandler.java         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/fileEditor/OpenFileDescriptor.java b/platform/platform-api/src/com/intellij/openapi/fileEditor/OpenFileDescriptor.java
index 8a2837a5dc5d..b4b3d97e4f11 100644
--- a/platform/platform-api/src/com/intellij/openapi/fileEditor/OpenFileDescriptor.java
+++ b/platform/platform-api/src/com/intellij/openapi/fileEditor/OpenFileDescriptor.java
@@ -126,7 +126,7 @@ public class OpenFileDescriptor implements Navigatable {
     FileType type = FileTypeManager.getInstance().getKnownFileTypeOrAssociate(myFile,project);
     if (type == null || !myFile.isValid()) return false;
 
-    if (type instanceof INativeFileType && requestFocus) {
+    if (type instanceof INativeFileType) {
       return ((INativeFileType) type).openFileInAssociatedApplication(project, myFile);
     }
 
diff --git a/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java b/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java
index e5aba7b777e0..bdf0e1babd30 100644
--- a/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java
+++ b/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileTypes.FileTypes;
+import com.intellij.openapi.fileTypes.INativeFileType;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.vfs.PersistentFSConstants;
@@ -179,7 +180,7 @@ public abstract class AutoScrollToSourceHandler {
         if (vFile != null) {
           // Attempt to navigate to the virtual file with unknown file type will show a modal dialog
           // asking to register some file type for this file. This behaviour is undesirable when autoscrolling.
-          if (vFile.getFileType() == FileTypes.UNKNOWN) return;
+          if (vFile.getFileType() == FileTypes.UNKNOWN || vFile.getFileType() instanceof INativeFileType) return;
 
           //IDEA-84881 Don't autoscroll to very large files
           if (vFile.getLength() > PersistentFSConstants.getMaxIntellisenseFileSize()) return;

From 947850c13f175bcef8f190148205d98a391b9b3f Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Fri, 1 Jun 2012 21:20:39 +0400
Subject: [PATCH 104/239] bug with setting default titled border in internal
 mode

---
 .../com/intellij/uiDesigner/compiler/AsmCodeGenerator.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
index 004209e3930c..f4350afa07d1 100644
--- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
+++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
@@ -857,12 +857,12 @@ public class AsmCodeGenerator {
         }
         pushBorderProperties(container, generator, borderTitle, componentLocal);
 
-        if (Boolean.valueOf(System.getProperty("idea.is.internal")).booleanValue()) {
-          container.getDelegeeClientProperties().put(ourBorderFactoryClientProperty, StringDescriptor.create("com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"));
-        }
 
         Type borderFactoryType = ourBorderFactoryType;
         StringDescriptor borderFactoryValue = (StringDescriptor)container.getDelegeeClientProperties().get(ourBorderFactoryClientProperty);
+        if (borderFactoryValue == null && Boolean.valueOf(System.getProperty("idea.is.internal")).booleanValue()) {
+          container.getDelegeeClientProperties().put(ourBorderFactoryClientProperty, StringDescriptor.create("com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"));
+        }
         if (borderFactoryValue != null && borderFactoryValue.getValue().length() != 0) {
           borderFactoryType = typeFromClassName(borderFactoryValue.getValue());
         }

From fa9b543a71113695294127935f944d920b2b9d6d Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Fri, 1 Jun 2012 21:26:57 +0400
Subject: [PATCH 105/239] bug with setting default titled border in internal
 mode

---
 .../src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
index f4350afa07d1..b5526f0efab4 100644
--- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
+++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
@@ -861,7 +861,8 @@ public class AsmCodeGenerator {
         Type borderFactoryType = ourBorderFactoryType;
         StringDescriptor borderFactoryValue = (StringDescriptor)container.getDelegeeClientProperties().get(ourBorderFactoryClientProperty);
         if (borderFactoryValue == null && Boolean.valueOf(System.getProperty("idea.is.internal")).booleanValue()) {
-          container.getDelegeeClientProperties().put(ourBorderFactoryClientProperty, StringDescriptor.create("com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"));
+          borderFactoryValue = StringDescriptor.create("com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent");
+          container.getDelegeeClientProperties().put(ourBorderFactoryClientProperty, borderFactoryValue);
         }
         if (borderFactoryValue != null && borderFactoryValue.getValue().length() != 0) {
           borderFactoryType = typeFromClassName(borderFactoryValue.getValue());

From 6661308bac21e814be38813c1ab2dac4e8f52dd5 Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Fri, 1 Jun 2012 22:02:21 +0400
Subject: [PATCH 106/239] IDEA-82611 Settings: 3-level JavaScript settings may
 be flatted

---
 .../src/com/intellij/ui/components/JBTabbedPane.java          | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java b/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java
index ab87158535a9..6bf0688812a0 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java
@@ -4,14 +4,10 @@ import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
-import javax.swing.border.CompoundBorder;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
 import java.awt.event.HierarchyEvent;
 import java.awt.event.HierarchyListener;
-import java.util.Arrays;
 
 /**
  * @author evgeny.zakrevsky

From d790c05d5829e871ac98d6291316a1fdf300e33d Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Fri, 1 Jun 2012 23:04:00 +0400
Subject: [PATCH 107/239] IDEA-78605 Bookmarks list may be opened unlimited
 times

---
 .../intellij/ide/bookmarks/actions/BookmarksAction.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
index 3bdb5b8f8fe5..70875e35aa49 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
@@ -46,6 +46,8 @@ import java.util.List;
 
 public class BookmarksAction extends AnAction implements DumbAware, MasterDetailPopupBuilder.Delegate {
 
+  private JBPopup myPopup;
+
   @Override
   public void update(AnActionEvent e) {
     DataContext dataContext = e.getDataContext();
@@ -59,6 +61,7 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
     if (project == null) return;
 
+    if (myPopup != null && myPopup.isVisible()) return;
 
     final DefaultListModel model = buildModel(project);
 
@@ -72,13 +75,13 @@ public class BookmarksAction extends AnAction implements DumbAware, MasterDetail
     actions.add(new MoveBookmarkUpAction(project, list));
     actions.add(new MoveBookmarkDownAction(project, list));
 
-    final JBPopup popup = new MasterDetailPopupBuilder(project).
+    myPopup = new MasterDetailPopupBuilder(project).
       setActionsGroup(actions).
       setList(list).
       setDelegate(this).createMasterDetailPopup();
 
-    editDescriptionAction.setPopup(popup);
-    popup.showCenteredInCurrentWindow(project);
+    editDescriptionAction.setPopup(myPopup);
+    myPopup.showCenteredInCurrentWindow(project);
   }
 
   @Override

From 90b39d97067a43621de99604a7b8ab4a7a6fe1ff Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Fri, 1 Jun 2012 23:41:05 +0400
Subject: [PATCH 108/239] fix leak of direct byte buffers

---
 .../intellij/util/io/DirectBufferWrapper.java | 23 +++++++++++++++++++
 .../intellij/util/io/MappedBufferWrapper.java | 18 +--------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/DirectBufferWrapper.java b/platform/util/src/com/intellij/util/io/DirectBufferWrapper.java
index 00049a0619fa..329d2704239b 100644
--- a/platform/util/src/com/intellij/util/io/DirectBufferWrapper.java
+++ b/platform/util/src/com/intellij/util/io/DirectBufferWrapper.java
@@ -16,10 +16,15 @@
 package com.intellij.util.io;
 
 import com.intellij.openapi.diagnostic.Logger;
+import org.jetbrains.annotations.Nullable;
+import sun.misc.Cleaner;
+import sun.nio.ch.DirectBuffer;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 public abstract class DirectBufferWrapper extends ByteBufferWrapper {
   protected static final Logger LOG = Logger.getInstance("#com.intellij.util.io.DirectBufferWrapper");
@@ -49,6 +54,24 @@ public abstract class DirectBufferWrapper extends ByteBufferWrapper {
   @Override
   public void unmap() {
     if (isDirty()) flush();
+    if (myBuffer != null) disposeDirectBuffer((DirectBuffer)myBuffer);
     myBuffer = null;
   }
+
+ static boolean disposeDirectBuffer(final DirectBuffer buffer) {
+    return AccessController.doPrivileged(new PrivilegedAction<Object>() {
+      @Nullable
+      public Object run() {
+        try {
+          Cleaner cleaner = buffer.cleaner();
+          if (cleaner != null) cleaner.clean(); // Already cleaned otherwise
+          return null;
+        }
+        catch (Exception e) {
+          return buffer;
+        }
+      }
+    }) == null;
+  }
+
 }
diff --git a/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java b/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java
index 0f86ffa4d433..56ce86c62e7a 100644
--- a/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java
+++ b/platform/util/src/com/intellij/util/io/MappedBufferWrapper.java
@@ -16,16 +16,12 @@
 package com.intellij.util.io;
 
 import com.intellij.openapi.diagnostic.Logger;
-import org.jetbrains.annotations.Nullable;
-import sun.misc.Cleaner;
 import sun.nio.ch.DirectBuffer;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.MappedByteBuffer;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 
 /**
  * @author max
@@ -81,19 +77,7 @@ public abstract class MappedBufferWrapper extends ByteBufferWrapper {
       return false;
     }
 
-    return AccessController.doPrivileged(new PrivilegedAction<Object>() {
-      @Nullable
-      public Object run() {
-        try {
-          Cleaner cleaner = ((DirectBuffer)buffer).cleaner();
-          if (cleaner != null) cleaner.clean(); // Already cleaned otherwise
-          return null;
-        }
-        catch (Exception e) {
-          return buffer;
-        }
-      }
-    }) == null;
+    return DirectBufferWrapper.disposeDirectBuffer((DirectBuffer)buffer);
   }
 
   private static boolean tryForce(MappedByteBuffer buffer) {

From 8192883779801348cff7c1e413d496a00f6ef3ba Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Fri, 1 Jun 2012 22:35:44 +0200
Subject: [PATCH 109/239] IDEA-86900 (Intention "Make 'append' chain into
 'append' sequence" fails on 'delete' in the chain)

---
 .../IntentionPowerPak/src/META-INF/plugin.xml |   2 +-
 .../siyeh/IntentionPowerPackBundle.properties |   4 +-
 .../concatenation/AppendChainPredicate.java   |  56 ------
 .../siyeh/ipp/concatenation/AppendUtil.java   |  79 --------
 ...ppendChainIntoAppendSequenceIntention.java | 139 -------------
 ...akeCallChainIntoCallSequenceIntention.java | 184 ++++++++++++++++++
 .../MethodCallChainPredicate.java             |  96 +++++++++
 .../com/siyeh/ipp/psiutils/HighlightUtil.java |  40 ++++
 .../description.html                          |   6 -
 .../after.java.template                       |   0
 .../before.java.template                      |   0
 .../description.html                          |   5 +
 12 files changed, 328 insertions(+), 283 deletions(-)
 delete mode 100644 plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendChainPredicate.java
 delete mode 100644 plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendUtil.java
 delete mode 100644 plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeAppendChainIntoAppendSequenceIntention.java
 create mode 100644 plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java
 create mode 100644 plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MethodCallChainPredicate.java
 delete mode 100644 plugins/IntentionPowerPak/src/intentionDescriptions/MakeAppendChainIntoAppendSequenceIntention/description.html
 rename plugins/IntentionPowerPak/src/intentionDescriptions/{MakeAppendChainIntoAppendSequenceIntention => MakeCallChainIntoCallSequenceIntention}/after.java.template (100%)
 rename plugins/IntentionPowerPak/src/intentionDescriptions/{MakeAppendChainIntoAppendSequenceIntention => MakeCallChainIntoCallSequenceIntention}/before.java.template (100%)
 create mode 100644 plugins/IntentionPowerPak/src/intentionDescriptions/MakeCallChainIntoCallSequenceIntention/description.html

diff --git a/plugins/IntentionPowerPak/src/META-INF/plugin.xml b/plugins/IntentionPowerPak/src/META-INF/plugin.xml
index de6e67a064f7..d52b3c759254 100644
--- a/plugins/IntentionPowerPak/src/META-INF/plugin.xml
+++ b/plugins/IntentionPowerPak/src/META-INF/plugin.xml
@@ -370,7 +370,7 @@
       <categoryKey>intention.category.strings</categoryKey>
     </intentionAction>
     <intentionAction>
-      <className>com.siyeh.ipp.concatenation.MakeAppendChainIntoAppendSequenceIntention</className>
+      <className>com.siyeh.ipp.concatenation.MakeCallChainIntoCallSequenceIntention</className>
       <categoryKey>intention.category.other</categoryKey>
     </intentionAction>
     <intentionAction>
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.properties b/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.properties
index 41d59b6dc7a3..86fe12496982 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.properties
+++ b/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.properties
@@ -81,8 +81,8 @@ replace.if.with.conditional.intention.name=Replace 'if else' with '?:'
 replace.if.with.conditional.intention.family.name=Replace If Else with Conditional
 replace.equality.with.equals.intention.name=Replace '==' with '.equals()'
 replace.equality.with.equals.intention.family.name=Replace Equality with Equals
-make.append.chain.into.append.sequence.intention.name=Make '.append()' chain into '.append()' sequence
-make.append.chain.into.append.sequence.intention.family.name=Make Append Chain Into Append Sequence
+make.call.chain.into.call.sequence.intention.name=Make method call chain into method call sequence
+make.call.chain.into.call.sequence.intention.family.name=Make Call Chain Into Call Sequence
 detail.exceptions.intention.name=Detail exceptions
 detail.exceptions.intention.family.name=Detail Exceptions
 flip.conditional.intention.name=Flip '?:'
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendChainPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendChainPredicate.java
deleted file mode 100644
index 6b04e11b95fe..000000000000
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendChainPredicate.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2003-2011 Dave Griffith, Bas Leijdekkers
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.siyeh.ipp.concatenation;
-
-import com.intellij.psi.*;
-import com.siyeh.ipp.base.PsiElementPredicate;
-
-class AppendChainPredicate implements PsiElementPredicate {
-
-  public boolean satisfiedBy(PsiElement element) {
-    if (!AppendUtil.isAppendCall(element)) {
-      return false;
-    }
-    final PsiMethodCallExpression call = (PsiMethodCallExpression)element;
-    final PsiReferenceExpression methodExpression =
-      call.getMethodExpression();
-    final PsiExpression qualifier =
-      methodExpression.getQualifierExpression();
-    if (!(qualifier instanceof PsiMethodCallExpression)) {
-      return false;
-    }
-    final PsiMethodCallExpression qualifierCall =
-      (PsiMethodCallExpression)element;
-    if (!AppendUtil.isAppendCall(qualifierCall)) {
-      return false;
-    }
-    final PsiElement parent = element.getParent();
-    if (parent instanceof PsiExpressionStatement) {
-      return true;
-    }
-    final PsiElement grandParent = parent.getParent();
-    if (parent instanceof PsiLocalVariable &&
-        grandParent instanceof PsiDeclarationStatement) {
-      final PsiDeclarationStatement declarationStatement =
-        (PsiDeclarationStatement)grandParent;
-      if (declarationStatement.getDeclaredElements().length == 1) {
-        return true;
-      }
-    }
-    return parent instanceof PsiAssignmentExpression &&
-           grandParent instanceof PsiExpressionStatement;
-  }
-}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendUtil.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendUtil.java
deleted file mode 100644
index b877f42519ae..000000000000
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/AppendUtil.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2003-2011 Dave Griffith, Bas Leijdekkers
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.siyeh.ipp.concatenation;
-
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.*;
-import com.intellij.psi.search.GlobalSearchScope;
-import org.jetbrains.annotations.NonNls;
-
-class AppendUtil {
-
-  private AppendUtil() {
-  }
-
-  public static boolean isAppendCall(PsiElement element) {
-    if (!(element instanceof PsiMethodCallExpression)) {
-      return false;
-    }
-    final PsiMethodCallExpression methodCallExpression =
-      (PsiMethodCallExpression)element;
-    final PsiReferenceExpression methodExpression =
-      methodCallExpression.getMethodExpression();
-    @NonNls final String callName = methodExpression.getReferenceName();
-    if (!"append".equals(callName)) {
-      return false;
-    }
-    final PsiMethod method = methodCallExpression.resolveMethod();
-    final PsiClass containingClass;
-    if (method == null) {
-      // if the argument has no type because of invalid code
-      // this uses the qualifier as type, so the conversion too
-      // append sequence is still applicable
-      final PsiExpression qualifierExpression =
-        methodExpression.getQualifierExpression();
-      if (qualifierExpression == null) {
-        return false;
-      }
-      final PsiType type = qualifierExpression.getType();
-      if (!(type instanceof PsiClassType)) {
-        return false;
-      }
-      final PsiClassType classType = (PsiClassType)type;
-      containingClass = classType.resolve();
-    }
-    else {
-      containingClass = method.getContainingClass();
-    }
-    if (containingClass == null) {
-      return false;
-    }
-    final String name = containingClass.getQualifiedName();
-    if (CommonClassNames.JAVA_LANG_STRING_BUFFER.equals(name) ||
-        CommonClassNames.JAVA_LANG_STRING_BUILDER.equals(name)) {
-      return true;
-    }
-    final Project project = containingClass.getProject();
-    final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
-    final PsiClass appendableClass =
-      psiFacade.findClass("java.lang.Appendable",
-                          GlobalSearchScope.allScope(project));
-    if (appendableClass == null) {
-      return false;
-    }
-    return containingClass.isInheritor(appendableClass, true);
-  }
-}
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeAppendChainIntoAppendSequenceIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeAppendChainIntoAppendSequenceIntention.java
deleted file mode 100644
index fa76c78b3327..000000000000
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeAppendChainIntoAppendSequenceIntention.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright 2003-2011 Dave Griffith, Bas Leijdekkers
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.siyeh.ipp.concatenation;
-
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.*;
-import com.intellij.psi.codeStyle.CodeStyleManager;
-import com.intellij.util.IncorrectOperationException;
-import com.siyeh.ipp.base.Intention;
-import com.siyeh.ipp.base.PsiElementPredicate;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class MakeAppendChainIntoAppendSequenceIntention extends Intention {
-
-  @Override
-  @NotNull
-  protected PsiElementPredicate getElementPredicate() {
-    return new AppendChainPredicate();
-  }
-
-  @Override
-  public void processIntention(PsiElement element)
-    throws IncorrectOperationException {
-    final PsiExpression call = (PsiExpression)element;
-    final List<String> argumentsList = new ArrayList<String>();
-    PsiExpression currentCall = call;
-    while (AppendUtil.isAppendCall(currentCall)) {
-      final PsiMethodCallExpression methodCallExpression =
-        (PsiMethodCallExpression)currentCall;
-      final PsiExpressionList arguments =
-        methodCallExpression.getArgumentList();
-      final String argumentsText = arguments.getText();
-      argumentsList.add(argumentsText);
-      final PsiReferenceExpression methodExpression =
-        methodCallExpression.getMethodExpression();
-      currentCall = methodExpression.getQualifierExpression();
-      if (currentCall == null) {
-        return;
-      }
-    }
-    final String targetText;
-    final PsiStatement appendStatement;
-    @NonNls final String firstStatement;
-    final PsiElement parent = call.getParent();
-    if (parent instanceof PsiExpressionStatement) {
-      targetText = currentCall.getText();
-      appendStatement = (PsiStatement)parent;
-      firstStatement = null;
-    }
-    else {
-      final PsiElement grandParent = parent.getParent();
-      appendStatement = (PsiStatement)grandParent;
-      if (parent instanceof PsiAssignmentExpression &&
-          grandParent instanceof PsiExpressionStatement) {
-        final PsiAssignmentExpression assignment =
-          (PsiAssignmentExpression)parent;
-        final PsiExpression lhs = assignment.getLExpression();
-        targetText = lhs.getText();
-        final PsiJavaToken token = assignment.getOperationSign();
-        firstStatement = targetText + token.getText() +
-                         currentCall.getText() + ';';
-      }
-      else {
-        final PsiDeclarationStatement declaration =
-          (PsiDeclarationStatement)appendStatement;
-        final PsiVariable variable =
-          (PsiVariable)declaration.getDeclaredElements()[0];
-        targetText = variable.getName();
-        final PsiType variableType = variable.getType();
-        if (variable.hasModifierProperty(PsiModifier.FINAL)) {
-          firstStatement =
-            "final " + variableType.getPresentableText() +
-            ' ' + variable.getName() + '=' +
-            currentCall.getText() + ';';
-        }
-        else {
-          firstStatement = variableType.getPresentableText() +
-                           ' ' + variable.getName() + '=' +
-                           currentCall.getText() + ';';
-        }
-      }
-    }
-    final StringBuilder builder = new StringBuilder("{");
-    if (firstStatement != null) {
-      builder.append(firstStatement);
-    }
-    Collections.reverse(argumentsList);
-    for (String argument : argumentsList) {
-      builder.append(targetText);
-      builder.append(".append");
-      builder.append(argument);
-      builder.append(';');
-    }
-    builder.append('}');
-    final PsiManager manager = element.getManager();
-    final Project project = manager.getProject();
-    final PsiElementFactory factory =
-      JavaPsiFacade.getElementFactory(project);
-    final PsiElement appendStatementParent = appendStatement.getParent();
-    final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(manager.getProject());
-    final PsiCodeBlock codeBlock =
-      factory.createCodeBlockFromText(builder.toString(),
-                                      appendStatement);
-    if (appendStatementParent instanceof PsiLoopStatement ||
-        appendStatementParent instanceof PsiIfStatement) {
-      final PsiElement insertedStatement =
-        appendStatement.replace(codeBlock);
-      codeStyleManager.reformat(insertedStatement);
-    }
-    else {
-      final PsiStatement[] statements = codeBlock.getStatements();
-      for (PsiStatement statement : statements) {
-        final PsiElement insertedStatement =
-          appendStatementParent.addBefore(statement,
-                                          appendStatement);
-        codeStyleManager.reformat(insertedStatement);
-      }
-      appendStatement.delete();
-    }
-  }
-}
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java
new file mode 100644
index 000000000000..24fec03f6f81
--- /dev/null
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MakeCallChainIntoCallSequenceIntention.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ipp.concatenation;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.CodeStyleManager;
+import com.intellij.psi.codeStyle.CodeStyleSettings;
+import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import com.intellij.util.IncorrectOperationException;
+import com.siyeh.ipp.base.Intention;
+import com.siyeh.ipp.base.PsiElementPredicate;
+import com.siyeh.ipp.psiutils.HighlightUtil;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class MakeCallChainIntoCallSequenceIntention extends Intention {
+
+  @Override
+  @NotNull
+  protected PsiElementPredicate getElementPredicate() {
+    return new MethodCallChainPredicate();
+  }
+
+  @Override
+  public void processIntention(@NotNull PsiElement element) throws IncorrectOperationException {
+    final List<String> callTexts = new ArrayList<String>();
+    PsiExpression root = (PsiExpression)element;
+    while (root instanceof PsiMethodCallExpression) {
+      final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression) root;
+      final PsiExpressionList arguments = methodCallExpression.getArgumentList();
+      final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression();
+      callTexts.add(methodExpression.getReferenceName() + arguments.getText());
+      root = methodExpression.getQualifierExpression();
+      if (root == null) {
+        return;
+      }
+    }
+    final PsiType rootType = root.getType();
+    if (rootType == null) {
+      return;
+    }
+    final String targetText;
+    final PsiStatement appendStatement;
+    @NonNls final String firstStatement;
+    final String variableDeclaration;
+    final boolean showRenameTemplate;
+    final PsiElement parent = element.getParent();
+    if (parent instanceof PsiExpressionStatement) {
+      targetText = root.getText();
+      appendStatement = (PsiStatement)parent;
+      firstStatement = null;
+      variableDeclaration = null;
+      showRenameTemplate = false;
+    }
+    else {
+      final PsiElement grandParent = parent.getParent();
+      appendStatement = (PsiStatement)grandParent;
+      if (parent instanceof PsiAssignmentExpression && grandParent instanceof PsiExpressionStatement) {
+        final PsiAssignmentExpression assignment = (PsiAssignmentExpression)parent;
+        final PsiExpression lhs = assignment.getLExpression();
+        if (!(lhs instanceof PsiReferenceExpression)) {
+          return;
+        }
+        final PsiReferenceExpression expression = (PsiReferenceExpression)lhs;
+        final PsiElement target = expression.resolve();
+        if (!(target instanceof PsiVariable)) {
+          return;
+        }
+        final PsiVariable variable = (PsiVariable)target;
+        final PsiType variableType = variable.getType();
+        if (variableType.equals(rootType)) {
+          targetText = lhs.getText();
+          final PsiJavaToken token = assignment.getOperationSign();
+          firstStatement = targetText + token.getText() + root.getText() + ';';
+          showRenameTemplate = false;
+        } else {
+          targetText = "x";
+          showRenameTemplate = true;
+          final Project project = element.getProject();
+          final CodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(project);
+          if (codeStyleSettings.GENERATE_FINAL_LOCALS) {
+            firstStatement = "final " + rootType.getCanonicalText() + ' ' + targetText + '=' + root.getText() + ';';
+          } else {
+            firstStatement = rootType.getCanonicalText() + ' ' + targetText + '=' + root.getText() + ';';
+          }
+        }
+        variableDeclaration = null;
+      }
+      else {
+        final PsiDeclarationStatement declaration = (PsiDeclarationStatement)appendStatement;
+        final PsiVariable variable = (PsiVariable)declaration.getDeclaredElements()[0];
+        final PsiType variableType = variable.getType();
+        if (variableType.equals(rootType)) {
+          targetText = variable.getName();
+          if (variable.hasModifierProperty(PsiModifier.FINAL)) {
+            firstStatement = "final " + variableType.getCanonicalText() + ' ' + variable.getName() + '=' + root.getText() + ';';
+          }
+          else {
+            firstStatement = variableType.getCanonicalText() + ' ' + variable.getName() + '=' + root.getText() + ';';
+          }
+          variableDeclaration = null;
+          showRenameTemplate = false;
+        } else {
+          if (variable.hasModifierProperty(PsiModifier.FINAL)) {
+            variableDeclaration = "final " + variableType.getCanonicalText() + ' ' + variable.getName() + '=';
+          }
+          else {
+            variableDeclaration = variableType.getCanonicalText() + ' ' + variable.getName() + '=';
+          }
+          targetText = "x";
+          showRenameTemplate = true;
+          final Project project = element.getProject();
+          final CodeStyleSettings codeStyleSettings = CodeStyleSettingsManager.getSettings(project);
+          if (codeStyleSettings.GENERATE_FINAL_LOCALS) {
+            firstStatement = "final " + rootType.getCanonicalText() + " x=" + root.getText() + ';';
+          } else {
+            firstStatement = rootType.getCanonicalText() + " x=" + root.getText() + ';';
+          }
+        }
+      }
+    }
+    final StringBuilder builder = new StringBuilder("{\n");
+    if (firstStatement != null) {
+      builder.append(firstStatement);
+    }
+    Collections.reverse(callTexts);
+    for (int i = 0, size = callTexts.size(); i < size; i++) {
+      final String callText = callTexts.get(i);
+      if (i == size - 1 && variableDeclaration != null) {
+        builder.append(variableDeclaration);
+      }
+      builder.append(targetText).append('.').append(callText).append(";\n");
+    }
+    builder.append('}');
+    final PsiManager manager = element.getManager();
+    final Project project = manager.getProject();
+    final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project);
+    final PsiElement appendStatementParent = appendStatement.getParent();
+    final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(manager.getProject());
+    final PsiCodeBlock codeBlock = factory.createCodeBlockFromText(builder.toString(), appendStatement);
+    if (appendStatementParent instanceof PsiLoopStatement || appendStatementParent instanceof PsiIfStatement) {
+      final PsiElement insertedCodeBlock = appendStatement.replace(codeBlock);
+      final PsiCodeBlock reformattedCodeBlock = (PsiCodeBlock)codeStyleManager.reformat(insertedCodeBlock);
+      if (showRenameTemplate) {
+        final PsiStatement[] statements = reformattedCodeBlock.getStatements();
+        final PsiVariable variable = (PsiVariable)((PsiDeclarationStatement) statements[0]).getDeclaredElements()[0];
+        HighlightUtil.showRenameTemplate(appendStatementParent, variable);
+      }
+    }
+    else {
+      final PsiStatement[] statements = codeBlock.getStatements();
+      PsiVariable variable = null;
+      for (int i = 0, length = statements.length; i < length; i++) {
+        final PsiElement insertedStatement = appendStatementParent.addBefore(statements[i], appendStatement);
+        if (i == 0 && showRenameTemplate) {
+          variable = (PsiVariable)((PsiDeclarationStatement) insertedStatement).getDeclaredElements()[0];
+        }
+        codeStyleManager.reformat(insertedStatement);
+      }
+      appendStatement.delete();
+      if (variable != null) {
+        HighlightUtil.showRenameTemplate(appendStatementParent, variable);
+      }
+    }
+  }
+}
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MethodCallChainPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MethodCallChainPredicate.java
new file mode 100644
index 000000000000..57eb68d61e49
--- /dev/null
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/concatenation/MethodCallChainPredicate.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2003-2011 Dave Griffith, Bas Leijdekkers
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.siyeh.ipp.concatenation;
+
+import com.intellij.psi.*;
+import com.siyeh.ipp.base.PsiElementPredicate;
+import org.jetbrains.annotations.Nullable;
+
+class MethodCallChainPredicate implements PsiElementPredicate {
+
+  public boolean satisfiedBy(PsiElement element) {
+    if (!isCallChain(element)) {
+      return false;
+    }
+    final PsiElement parent = element.getParent();
+    if (parent instanceof PsiExpressionStatement) {
+      return true;
+    }
+    else if (parent instanceof PsiLocalVariable) {
+      final PsiElement grandParent = parent.getParent();
+      if (!(grandParent instanceof PsiDeclarationStatement)) {
+        return false;
+      }
+      final PsiDeclarationStatement declarationStatement = (PsiDeclarationStatement)grandParent;
+      return declarationStatement.getDeclaredElements().length == 1;
+    }
+    else if (parent instanceof PsiAssignmentExpression) {
+      final PsiElement grandParent = parent.getParent();
+      return grandParent instanceof PsiExpressionStatement;
+    }
+    return false;
+  }
+
+  private static boolean isCallChain(PsiElement element) {
+    PsiClass aClass1 = getQualifierExpressionType(element);
+    if (aClass1 == null) {
+      return false;
+    }
+    boolean first = true;
+    while (aClass1 != null) {
+      final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element;
+      final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression();
+      final PsiExpression qualifierExpression = methodExpression.getQualifierExpression();
+      PsiClass aClass2 = getQualifierExpressionType(qualifierExpression);
+      if (!first) {
+        if (aClass2 == null) {
+          return true;
+        }
+      } else {
+        first = false;
+      }
+      if (!aClass1.equals(aClass2)) {
+        return false;
+      }
+      aClass1 = aClass2;
+      element = qualifierExpression;
+    }
+    return true;
+  }
+
+  @Nullable
+  private static PsiClass getQualifierExpressionType(PsiElement element) {
+    if (!(element instanceof PsiMethodCallExpression)) {
+      return null;
+    }
+    final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element;
+    final PsiMethod method = methodCallExpression.resolveMethod();
+    if (method != null) {
+      return method.getContainingClass();
+    }
+    final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression();
+    final PsiExpression qualifierExpression = methodExpression.getQualifierExpression();
+    if (!(qualifierExpression instanceof PsiMethodCallExpression)) {
+      return null;
+    }
+    final PsiType type = qualifierExpression.getType();
+    if (!(type instanceof PsiClassType)) {
+      return null;
+    }
+    final PsiClassType classType = (PsiClassType)type;
+    return classType.resolve();
+  }
+}
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/HighlightUtil.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/HighlightUtil.java
index e03c5c876868..8260230f4d4c 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/HighlightUtil.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/psiutils/HighlightUtil.java
@@ -15,7 +15,14 @@
  */
 package com.siyeh.ipp.psiutils;
 
+import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.highlighting.HighlightManager;
+import com.intellij.codeInsight.template.Expression;
+import com.intellij.codeInsight.template.Template;
+import com.intellij.codeInsight.template.TemplateBuilderImpl;
+import com.intellij.codeInsight.template.TemplateManager;
+import com.intellij.codeInsight.template.impl.MacroCallNode;
+import com.intellij.codeInsight.template.macro.SuggestVariableNameMacro;
 import com.intellij.find.FindManager;
 import com.intellij.find.FindModel;
 import com.intellij.openapi.application.Application;
@@ -27,11 +34,16 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiNameIdentifierOwner;
+import com.intellij.psi.PsiReference;
 import com.intellij.psi.PsiWhiteSpace;
+import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.PsiUtilCore;
+import com.intellij.util.Query;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
@@ -118,4 +130,32 @@ public class HighlightUtil {
     }
     return builder;
   }
+
+  public static void showRenameTemplate(PsiElement context, PsiNameIdentifierOwner element) {
+    context = CodeInsightUtilBase.forcePsiPostprocessAndRestoreElement(context);
+    final Query<PsiReference> query = ReferencesSearch.search(element, element.getUseScope());
+    final Collection<PsiReference> references = query.findAll();
+    final Project project = context.getProject();
+    final FileEditorManager fileEditorManager =
+      FileEditorManager.getInstance(project);
+    final Editor editor = fileEditorManager.getSelectedTextEditor();
+    if (editor == null) {
+      return;
+    }
+    final TemplateBuilderImpl builder = new TemplateBuilderImpl(context);
+    final Expression macroCallNode = new MacroCallNode(
+      new SuggestVariableNameMacro());
+    final PsiElement identifier = element.getNameIdentifier();
+    builder.replaceElement(identifier, "PATTERN", macroCallNode, true);
+    for (PsiReference reference : references) {
+      builder.replaceElement(reference, "PATTERN", "PATTERN", false);
+    }
+    final Template template = builder.buildInlineTemplate();
+    final TextRange textRange = context.getTextRange();
+    final int startOffset = textRange.getStartOffset();
+    editor.getCaretModel().moveToOffset(startOffset);
+    final TemplateManager templateManager =
+      TemplateManager.getInstance(project);
+    templateManager.startTemplate(editor, template);
+  }
 }
\ No newline at end of file
diff --git a/plugins/IntentionPowerPak/src/intentionDescriptions/MakeAppendChainIntoAppendSequenceIntention/description.html b/plugins/IntentionPowerPak/src/intentionDescriptions/MakeAppendChainIntoAppendSequenceIntention/description.html
deleted file mode 100644
index 48cc44a99b41..000000000000
--- a/plugins/IntentionPowerPak/src/intentionDescriptions/MakeAppendChainIntoAppendSequenceIntention/description.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body>
-This intention replaces chains of <b>StringBuffer.append()</b> calls with
-the equivalent sequence of call statements.
-</body>
-</html>
diff --git a/plugins/IntentionPowerPak/src/intentionDescriptions/MakeAppendChainIntoAppendSequenceIntention/after.java.template b/plugins/IntentionPowerPak/src/intentionDescriptions/MakeCallChainIntoCallSequenceIntention/after.java.template
similarity index 100%
rename from plugins/IntentionPowerPak/src/intentionDescriptions/MakeAppendChainIntoAppendSequenceIntention/after.java.template
rename to plugins/IntentionPowerPak/src/intentionDescriptions/MakeCallChainIntoCallSequenceIntention/after.java.template
diff --git a/plugins/IntentionPowerPak/src/intentionDescriptions/MakeAppendChainIntoAppendSequenceIntention/before.java.template b/plugins/IntentionPowerPak/src/intentionDescriptions/MakeCallChainIntoCallSequenceIntention/before.java.template
similarity index 100%
rename from plugins/IntentionPowerPak/src/intentionDescriptions/MakeAppendChainIntoAppendSequenceIntention/before.java.template
rename to plugins/IntentionPowerPak/src/intentionDescriptions/MakeCallChainIntoCallSequenceIntention/before.java.template
diff --git a/plugins/IntentionPowerPak/src/intentionDescriptions/MakeCallChainIntoCallSequenceIntention/description.html b/plugins/IntentionPowerPak/src/intentionDescriptions/MakeCallChainIntoCallSequenceIntention/description.html
new file mode 100644
index 000000000000..7d6edba57bfd
--- /dev/null
+++ b/plugins/IntentionPowerPak/src/intentionDescriptions/MakeCallChainIntoCallSequenceIntention/description.html
@@ -0,0 +1,5 @@
+<html>
+<body>
+This intention replaces chains of method calls with the equivalent sequence of call statements.
+</body>
+</html>

From 6f74da07af73d084b058530d37680aef6acd106c Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sat, 2 Jun 2012 12:01:38 +0200
Subject: [PATCH 110/239] icons

---
 .../util/ui/RefreshFileSystemIcon.java        | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/util/ui/RefreshFileSystemIcon.java b/platform/platform-api/src/com/intellij/util/ui/RefreshFileSystemIcon.java
index dea652841547..2ef0eea61119 100644
--- a/platform/platform-api/src/com/intellij/util/ui/RefreshFileSystemIcon.java
+++ b/platform/platform-api/src/com/intellij/util/ui/RefreshFileSystemIcon.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.util.ui;
 
-import com.intellij.openapi.util.IconLoader;
+import com.intellij.icons.AllIcons;
 
 import javax.swing.*;
 import java.awt.*;
@@ -24,16 +24,26 @@ import java.awt.*;
  * @author Konstantin Bulenkov
  */
 public class RefreshFileSystemIcon extends AnimatedIcon {
-  private static final Icon[] ICONS = getIcons("/process/fs/step_", 18);
-
-  private static Icon[] getIcons(String path, int count) {
-    Icon[] icons = new Icon[count];
-    for (int i = 0; i < icons.length; i++) {
-      int index = i + 1;
-      icons[i] = IconLoader.getIcon(path + index + ".png");
-    }
-    return icons;
-  }
+  private static final Icon[] ICONS = {
+    AllIcons.Process.FS.Step_1,
+    AllIcons.Process.FS.Step_2,
+    AllIcons.Process.FS.Step_3,
+    AllIcons.Process.FS.Step_4,
+    AllIcons.Process.FS.Step_5,
+    AllIcons.Process.FS.Step_6,
+    AllIcons.Process.FS.Step_7,
+    AllIcons.Process.FS.Step_8,
+    AllIcons.Process.FS.Step_9,
+    AllIcons.Process.FS.Step_10,
+    AllIcons.Process.FS.Step_11,
+    AllIcons.Process.FS.Step_12,
+    AllIcons.Process.FS.Step_13,
+    AllIcons.Process.FS.Step_14,
+    AllIcons.Process.FS.Step_15,
+    AllIcons.Process.FS.Step_16,
+    AllIcons.Process.FS.Step_17,
+    AllIcons.Process.FS.Step_18
+  };
 
   public RefreshFileSystemIcon() {
     super("Refreshing filesystem", ICONS, EmptyIcon.ICON_16, 800);

From 62fba858dea33ec61bca258596038ab8e4958931 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sat, 2 Jun 2012 12:09:16 +0200
Subject: [PATCH 111/239] icons

---
 .../com/intellij/util/ui/AsyncProcessIcon.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java b/platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java
index 4d89b8fe863a..172955086af2 100644
--- a/platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java
+++ b/platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java
@@ -91,7 +91,20 @@ public class AsyncProcessIcon extends AnimatedIcon {
   }
 
   public static class Big extends AsyncProcessIcon {
-    private static final Icon[] BIG_ICONS = findIcons("/process/big/step_", null);
+    private static final Icon[] BIG_ICONS = {
+      AllIcons.Process.Big.Step_1,
+      AllIcons.Process.Big.Step_2,
+      AllIcons.Process.Big.Step_3,
+      AllIcons.Process.Big.Step_4,
+      AllIcons.Process.Big.Step_5,
+      AllIcons.Process.Big.Step_6,
+      AllIcons.Process.Big.Step_7,
+      AllIcons.Process.Big.Step_8,
+      AllIcons.Process.Big.Step_9,
+      AllIcons.Process.Big.Step_10,
+      AllIcons.Process.Big.Step_11,
+      AllIcons.Process.Big.Step_12
+    };
     private static final Icon BIG_PASSIVE_ICON = AllIcons.Process.Big.Step_passive;
 
     public Big(@NonNls final String name) {

From 107dcc9f6f87fe9c951562ddb8b39a0a014f447a Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sat, 2 Jun 2012 16:49:39 +0400
Subject: [PATCH 112/239] [merge] Display applied changes; allow applying both
 sides of a conflict.

OVERVIEW:
Don't hide highlighting markers on "apply", as it is done on "ignore".
Instead use a lighter highlighting: remove the background and paint a separator with a color of change type (red for conflict, green for insert, etc.).
Show, what has been changed, i.e. highlight both original side and the applied change in the base/result side.

For conflicting changes, on apply neither remove nor apply the second "variant" of the conflict. Instead propose to apply (or ignore) the second variant below the first one.
This fixes IDEA-36811 "Add ability to merge in lines from both left and right in three way merge".

DETAILS:
* Define Change#onApplied handled differently:
   - for the SimpleChange update highlighting & remove apply/ignore actions & update the ChangeList
   - for the ConflictChange additionally break the connection between left-to-base and right-to-base changes via the MergeConflict by nullifying the non-applied change in one case and defining its own MergeConflict for this non-applied change.
   - Update MergeConflict and MergeList to be aware of nullable changes in semi-applied MergeConflict.
* Make ChangeType and TextDiffType modifiable: each one can be applied.
   - TextDiffType returns different background for applied changes (no background actually).
   - ChangeType displays different line separator for applied changes.
* Manage ChangeList#myAppliedChanges collection of the changes which has been applied.
   Pass both myChanges (not applied yet) and myAppliedChanges in getLineBlocks(), but make LineBlocks be aware of not-sorted Changes collection.
* Make LineBlocks depend on TextDiffType rather than on TextDiffTypeEnum to get correct coloring attribute for applied changes.
* Some javadocs, cleanups and code style fixes.

KNOWN PROBLEMS:
* Applied deletion is not easy to find, because it occupies zero place in both original and resulting side.
* "Ignore" works differently from "apply" in that way that highlighting is completely removed for "ignore" (as it were): not sure if it should be fixed or that corresponds to the nature of "ignore" action name.
* Trapezium-dividers are the same for applied changes as for non-applied. Will be changed.
---
 .../diff/impl/incrementalMerge/Change.java    |  60 +++++++++-
 .../impl/incrementalMerge/ChangeCounter.java  |   8 +-
 .../ChangeHighlighterHolder.java              |   6 +-
 .../impl/incrementalMerge/ChangeList.java     |  29 ++++-
 .../impl/incrementalMerge/ChangeType.java     | 105 +++++++++++++-----
 .../impl/incrementalMerge/ConflictChange.java |  48 +++++++-
 .../impl/incrementalMerge/MergeConflict.java  |  69 ++++++++++--
 .../diff/impl/incrementalMerge/MergeList.java |  22 +++-
 .../impl/incrementalMerge/SimpleChange.java   |  30 ++++-
 .../impl/incrementalMerge/ui/MergePanel2.java |   7 ++
 .../diff/impl/splitter/DividerPolygon.java    |   6 +-
 .../diff/impl/splitter/LineBlocks.java        |  71 +++++-------
 .../openapi/diff/impl/util/TextDiffType.java  |  43 +++++--
 13 files changed, 392 insertions(+), 112 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/Change.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/Change.java
index 30dab2e70de0..55855a709167 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/Change.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/Change.java
@@ -25,8 +25,10 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.ReadonlyStatusHandler;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Comparator;
 
@@ -47,26 +49,64 @@ public abstract class Change {
 
   protected abstract void removeFromList();
 
+  /**
+   * Called when a change has been applied.
+   */
+  public abstract void onApplied();
+
+  /**
+   * Called when a change has been removed from the list.
+   */
   public abstract void onRemovedFromList();
 
   public abstract boolean isValid();
 
+  /**
+   * Apply the change, i.e. change the "Merge result" document and update range markers, highlighting, gutters, etc.
+   * @param source The source side of the change, which is being applied.
+   */
   private void apply(@NotNull FragmentSide original) {
     FragmentSide targetSide = original.otherSide();
     RangeMarker originalRangeMarker = getRangeMarker(original);
     RangeMarker rangeMarker = getRangeMarker(targetSide);
 
     if (originalRangeMarker != null && rangeMarker != null) {
-      apply(getProject(), originalRangeMarker, rangeMarker);
-      if (isValid()) {
-        removeFromList();
+      TextRange textRange = modifyDocument(getProject(), originalRangeMarker, rangeMarker);
+      if (textRange != null && isValid()) {
+        updateTargetRangeMarker(targetSide, textRange);
       }
+      onApplied();
     }
   }
 
-  private static void apply(@NotNull Project project, @NotNull RangeMarker original, @NotNull RangeMarker target) {
+  /**
+   * Updates the target marker of a change after the change has been applied
+   * to allow highlighting of the document modification which has been performed.
+   * @param targetFragmentSide The side to be changed.
+   * @param updatedTextRange   New text range to be applied to the side.
+   */
+  protected final void updateTargetRangeMarker(@NotNull FragmentSide targetFragmentSide, @NotNull TextRange updatedTextRange) {
+    ChangeSide targetSide = getChangeSide(targetFragmentSide);
+    DiffRangeMarker originalRange = targetSide.getRange();
+    DiffRangeMarker updatedRange = new DiffRangeMarker(originalRange.getDocument(), updatedTextRange, null);
+    changeSide(targetSide, updatedRange);
+  }
+
+  /**
+   * Substitutes the specified side of this change to a new side which contains the given range.
+   * @param sideToChange The side to be changed.
+   * @param newRange     New text range of the new side.
+   */
+  protected abstract void changeSide(ChangeSide sideToChange, DiffRangeMarker newRange);
+
+  /**
+   * Applies the text from the original marker to the target marker.
+   * @return the resulting TextRange from the target document, or null if the document if not writable.
+   */
+  @Nullable
+  private static TextRange modifyDocument(@NotNull Project project, @NotNull RangeMarker original, @NotNull RangeMarker target) {
     Document document = target.getDocument();
-    if (!ReadonlyStatusHandler.ensureDocumentWritable(project, document)) return;
+    if (!ReadonlyStatusHandler.ensureDocumentWritable(project, document)) { return null; }
     if (DocumentUtil.isEmpty(original)) {
       int offset = target.getStartOffset();
       document.deleteString(offset, target.getEndOffset());
@@ -78,6 +118,7 @@ public abstract class Change {
     } else {
       document.replaceString(startOffset, target.getEndOffset(), text);
     }
+    return new TextRange(startOffset, startOffset + text.length());
   }
 
   public void addMarkup(Editor[] editors) {
@@ -152,11 +193,18 @@ public abstract class Change {
   protected static class SimpleChangeSide extends ChangeSide {
     private final FragmentSide mySide;
     private final DiffRangeMarker myRange;
-    private final ChangeHighlighterHolder myHighlighterHolder = new ChangeHighlighterHolder();
+    private final ChangeHighlighterHolder myHighlighterHolder;
 
     public SimpleChangeSide(FragmentSide side, DiffRangeMarker rangeMarker) {
       mySide = side;
       myRange = rangeMarker;
+      myHighlighterHolder = new ChangeHighlighterHolder();
+    }
+
+    public SimpleChangeSide(ChangeSide originalSide, DiffRangeMarker newRange) {
+      mySide = ((SimpleChangeSide)originalSide).getFragmentSide();
+      myRange = newRange;
+      myHighlighterHolder = originalSide.getHighlighterHolder();
     }
 
     public FragmentSide getFragmentSide() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeCounter.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeCounter.java
index 24ecfef705dc..c4e0dbefcee7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeCounter.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeCounter.java
@@ -35,6 +35,11 @@ public class ChangeCounter implements ChangeList.Listener {
     updateCounters();
   }
 
+  @Override
+  public void onChangeApplied(ChangeList source) {
+    updateCounters();
+  }
+
   public void onChangeRemoved(ChangeList source) {
     updateCounters();
   }
@@ -60,8 +65,7 @@ public class ChangeCounter implements ChangeList.Listener {
 
   private void fireCountersChanged() {
     Listener[] listeners = myListeners.toArray(new Listener[myListeners.size()]);
-    for (int i = 0; i < listeners.length; i++) {
-      Listener listener = listeners[i];
+    for (Listener listener : listeners) {
       listener.onCountersChanged(this);
     }
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeHighlighterHolder.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeHighlighterHolder.java
index 137aac7cc6d6..3c445cc106c8 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeHighlighterHolder.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeHighlighterHolder.java
@@ -82,7 +82,7 @@ class ChangeHighlighterHolder {
 
   private void setHighlighter(ChangeSide changeSide, ChangeType type) {
     myMainHighlighter = type.addMarker(changeSide, this);
-    updateAction();
+    updateActions();
   }
 
   public Editor getEditor() {
@@ -112,10 +112,10 @@ class ChangeHighlighterHolder {
 
   public void setActions(AnAction[] action) {
     myActions = action;
-    updateAction();
+    updateActions();
   }
 
-  private void updateAction() {
+  private void updateActions() {
     removeActionHighlighters();
     if (myMainHighlighter != null && myActions != null && myActions.length > 0) {
       myActionHighlighters = new RangeHighlighter[myActions.length];
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java
index ded9f26b3cc1..078bba811638 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeList.java
@@ -33,12 +33,13 @@ import java.util.*;
 
 public class ChangeList {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.ChangeList");
-  private static final Comparator<Change> CHANGE_ORDER = new SimpleChange.ChangeOrder(FragmentSide.SIDE1);
+  public static final Comparator<Change> CHANGE_ORDER = new SimpleChange.ChangeOrder(FragmentSide.SIDE1);
 
   private final Project myProject;
   private final Document[] myDocuments = new Document[2];
   private final ArrayList<Listener> myListeners = new ArrayList<Listener>();
   private ArrayList<Change> myChanges;
+  private ArrayList<Change> myAppliedChanges;
 
   public ChangeList(Document base, Document version, Project project) {
     myDocuments[0] = base;
@@ -70,6 +71,7 @@ public class ChangeList {
       LOG.assertTrue(change.isValid());
     }
     myChanges = new ArrayList<Change>(changes);
+    myAppliedChanges = new ArrayList<Change>();
   }
 
   public Project getProject() { return myProject; }
@@ -187,15 +189,28 @@ public class ChangeList {
   }
 
   public LineBlocks getLineBlocks() {
-    return LineBlocks.fromChanges(myChanges);
+    ArrayList<Change> changes = new ArrayList<Change>(myChanges);
+    changes.addAll(myAppliedChanges);
+    return LineBlocks.fromChanges(changes);
   }
 
   public void remove(Change change) {
-    LOG.assertTrue(myChanges.remove(change), change);
+    if (change.getType().isApplied()) {
+      LOG.assertTrue(myAppliedChanges.remove(change), change);
+    }
+    else {
+      LOG.assertTrue(myChanges.remove(change), change);
+    }
     change.onRemovedFromList();
     fireOnChangeRemoved();
   }
 
+  public void apply(Change change) {
+    LOG.assertTrue(myChanges.remove(change), change);
+    myAppliedChanges.add(change);
+    fireOnChangeApplied();
+  }
+
   private void fireOnChangeRemoved() {
     Listener[] listeners = myListeners.toArray(new Listener[myListeners.size()]);
     for (Listener listener : listeners) {
@@ -203,7 +218,15 @@ public class ChangeList {
     }
   }
 
+  void fireOnChangeApplied() {
+    Listener[] listeners = myListeners.toArray(new Listener[myListeners.size()]);
+    for (Listener listener : listeners) {
+      listener.onChangeApplied(this);
+    }
+  }
+
   public interface Listener {
     void onChangeRemoved(ChangeList source);
+    void onChangeApplied(ChangeList source);
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
index 38382b003050..d53490ff22b3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ChangeType.java
@@ -17,17 +17,11 @@ package com.intellij.openapi.diff.impl.incrementalMerge;
 
 import com.intellij.openapi.diff.ex.DiffFragment;
 import com.intellij.openapi.diff.impl.highlighting.LineRenderer;
-import com.intellij.openapi.diff.impl.util.DocumentUtil;
 import com.intellij.openapi.diff.impl.util.TextDiffType;
-import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.editor.RangeMarker;
-import com.intellij.openapi.editor.markup.HighlighterLayer;
-import com.intellij.openapi.editor.markup.HighlighterTargetArea;
-import com.intellij.openapi.editor.markup.RangeHighlighter;
-import com.intellij.openapi.editor.markup.SeparatorPlacement;
-import com.intellij.openapi.project.Project;
+import com.intellij.openapi.editor.colors.EditorColorsScheme;
+import com.intellij.openapi.editor.markup.*;
 import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.vfs.ReadonlyStatusHandler;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -36,44 +30,94 @@ import java.awt.*;
 public class ChangeType {
 
   private static final int LAYER = HighlighterLayer.SELECTION - 1;
-  private static final ChangeType INSERT = new ChangeType(TextDiffType.INSERT);
-  private static final ChangeType DELETED = new ChangeType(TextDiffType.DELETED);
-  private static final ChangeType CHANGE = new ChangeType(TextDiffType.CHANGED);
-  static final ChangeType CONFLICT = new ChangeType(TextDiffType.CONFLICT);
+  private static final ChangeType INSERT = new ChangeType(TextDiffType.INSERT, false);
+  private static final ChangeType DELETED = new ChangeType(TextDiffType.DELETED, false);
+  private static final ChangeType CHANGE = new ChangeType(TextDiffType.CHANGED, false);
+  static final ChangeType CONFLICT = new ChangeType(TextDiffType.CONFLICT, false);
 
   private final TextDiffType myDiffType;
+  private final boolean myApplied;
 
-  private ChangeType(TextDiffType diffType) {
-    myDiffType = diffType;
+  private ChangeType(TextDiffType diffType, boolean applied) {
+    myApplied = applied;
+    if (applied) {
+      myDiffType = TextDiffType.deriveApplied(diffType);
+    }
+    else {
+      myDiffType = diffType;
+    }
   }
 
+  public boolean isApplied() {
+    return myApplied;
+  }
+
+  @NotNull
+  public static ChangeType deriveApplied(ChangeType type) {
+    return new ChangeType(type.myDiffType, true);
+  }
+
+  @Nullable
   public RangeHighlighter addMarker(ChangeSide changeSide, ChangeHighlighterHolder markup) {
     String text = changeSide.getText();
-    if (text != null && text.length() > 0) return addBlock(text, changeSide, markup, myDiffType);
-    else return addLine(markup, changeSide.getStartLine(), myDiffType, SeparatorPlacement.TOP);
+    if (text != null && text.length() > 0) {
+      return addBlock(text, changeSide, markup, myDiffType);
+    }
+    else {
+      return addLine(markup, changeSide.getStartLine(), myDiffType, SeparatorPlacement.TOP);
+    }
   }
 
+  @NotNull
   public TextDiffType getTypeKey() {
     return myDiffType;
   }
 
-  public TextDiffType getTextDiffType() { return getTypeKey(); }
+  @NotNull
+  public TextDiffType getTextDiffType() {
+    return getTypeKey();
+  }
+
+  @Nullable
+  private RangeHighlighter addBlock(String text, ChangeSide changeSide, ChangeHighlighterHolder markup, TextDiffType diffType) {
+    EditorColorsScheme colorScheme = markup.getEditor().getColorsScheme();
+    Color separatorColor = getSeparatorColor(diffType.getLegendColor(colorScheme));
+    LineSeparatorRenderer separatorRenderer = new LineSeparatorRenderer() {
+      @Override
+      public void drawLine(Graphics g, int x1, int x2, int y) {
+        Graphics2D g2 = (Graphics2D) g;
+        if (myApplied) {
+          UIUtil.drawBoldDottedLine(g2, x1, x2, y, g2.getBackground(), g2.getColor(), false);
+        }
+        else {
+          UIUtil.drawDottedLine(g2, x1, y, x2, y, g2.getBackground(), g2.getColor());
+        }
+      }
+    };
 
-  private static RangeHighlighter addBlock(String text, ChangeSide changeSide, ChangeHighlighterHolder markup, TextDiffType diffType) {
     int length = text.length();
     int start = changeSide.getStart();
     int end = start + length;
-    RangeHighlighter highlighter = markup.addRangeHighlighter(start, end, ChangeType.LAYER, diffType, HighlighterTargetArea.EXACT_RANGE);
-    highlighter.setLineSeparatorPlacement(SeparatorPlacement.TOP);
-    highlighter.setLineMarkerRenderer(LineRenderer.top());
-    highlighter.setLineSeparatorColor(Color.GRAY);
+    RangeHighlighter highlighter = markup.addRangeHighlighter(start, end, LAYER, diffType, HighlighterTargetArea.EXACT_RANGE);
+
+    if (highlighter != null) {
+      highlighter.setLineSeparatorPlacement(SeparatorPlacement.TOP);
+      highlighter.setLineSeparatorColor(separatorColor);
+      highlighter.setLineSeparatorRenderer(separatorRenderer);
+      highlighter.setLineMarkerRenderer(LineRenderer.top());
+    }
+
     if (text.charAt(length - 1) == '\n') {
       end--;
     }
+
     highlighter = markup.addRangeHighlighter(start, end, LAYER, TextDiffType.NONE, HighlighterTargetArea.EXACT_RANGE);
-    highlighter.setLineSeparatorPlacement(SeparatorPlacement.BOTTOM);
-    highlighter.setLineSeparatorColor(Color.GRAY);
-    highlighter.setLineMarkerRenderer(LineRenderer.bottom());
+    if (highlighter != null) {
+      highlighter.setLineSeparatorPlacement(SeparatorPlacement.BOTTOM);
+      highlighter.setLineSeparatorColor(separatorColor);
+      highlighter.setLineSeparatorRenderer(separatorRenderer);
+      highlighter.setLineMarkerRenderer(LineRenderer.bottom());
+    }
     return highlighter;
   }
 
@@ -103,4 +147,13 @@ public class ChangeType {
     return myDiffType.getDisplayName();
   }
 
+  @NotNull
+  public Color getSeparatorColor(@Nullable Color highlightColor) {
+    if (myApplied) {
+      return highlightColor == null ? Color.DARK_GRAY : highlightColor.darker();
+    }
+    return Color.GRAY;
+  }
+
+
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
index c6820c91dfbe..f43adc6c0fd1 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ConflictChange.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.openapi.diff.impl.incrementalMerge;
 
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.editor.ex.DocumentEx;
 import com.intellij.openapi.util.TextRange;
@@ -25,12 +27,24 @@ import com.intellij.openapi.util.TextRange;
  */
 class ConflictChange extends Change implements DiffRangeMarker.RangeInvalidListener {
 
+  private static final Logger LOG = Logger.getInstance(ConflictChange.class);
+
   private SimpleChangeSide myOriginalSide;
   private MergeConflict myConflict;
+  private final ChangeList myChangeList;
+  private ChangeType myType;
+  private boolean mySemiApplied;
 
-  public ConflictChange(MergeConflict conflict, FragmentSide mergeSide, TextRange range) {
+  public ConflictChange(MergeConflict conflict, FragmentSide mergeSide, TextRange range, ChangeList changeList) {
     myConflict = conflict;
+    myChangeList = changeList;
     myOriginalSide = new SimpleChangeSide(mergeSide, new DiffRangeMarker((DocumentEx)conflict.getOriginalDocument(mergeSide), range, this));
+    myType = ChangeType.CONFLICT;
+  }
+
+  @Override
+  protected void changeSide(ChangeSide sideToChange, DiffRangeMarker newRange) {
+    myConflict.setRange(newRange);
   }
 
   protected void removeFromList() {
@@ -51,13 +65,43 @@ class ConflictChange extends Change implements DiffRangeMarker.RangeInvalidListe
   }
 
   public ChangeType getType() {
-    return ChangeType.CONFLICT;
+    return myType;
   }
 
   public ChangeList getChangeList() {
     return myConflict.getMergeList().getChanges(myOriginalSide.getFragmentSide());
   }
 
+  @Override
+  public void onApplied() {
+    myType = ChangeType.deriveApplied(myType);
+    myChangeList.apply(this);
+
+    myOriginalSide.getHighlighterHolder().updateHighlighter(myOriginalSide, myType);
+    myOriginalSide.getHighlighterHolder().setActions(new AnAction[0]);
+
+    // display, what one side of the conflict was resolved to
+    myConflict.getHighlighterHolder().updateHighlighter(myConflict, myType);
+
+    // update the other variant of the conflict to point to the bottom
+    if (!mySemiApplied) {
+      ConflictChange otherChange = myConflict.getOtherChange(this);
+      LOG.assertTrue(otherChange != null, String.format("Other change is null. This change: %s Merge conflict: %s", this, myConflict));
+      otherChange.mySemiApplied = true;
+      otherChange.updateOtherSideOnConflictApply();
+      myConflict.removeOtherChange(this);
+    }
+  }
+
+  private void updateOtherSideOnConflictApply() {
+    int startOffset = myConflict.getRange().getEndOffset();
+    TextRange emptyRange = new TextRange(startOffset, startOffset);
+    myConflict = myConflict.deriveSideForNotAppliedChange(emptyRange, null, this);
+    myOriginalSide.getHighlighterHolder().updateHighlighter(myOriginalSide, myType);
+    myConflict.getHighlighterHolder().updateHighlighter(myConflict, myType);
+    myChangeList.fireOnChangeApplied();
+  }
+
   public void onRemovedFromList() {
     myOriginalSide.getRange().removeListener(this);
     myConflict = null;
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
index ca18b0183b18..728888c8167c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeConflict.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.ex.DocumentEx;
 import com.intellij.openapi.util.TextRange;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Represents a merge conflict, i.e. two {@link ConflictChange conflicting changes}, one from left, another from right.
@@ -27,16 +28,33 @@ import org.jetbrains.annotations.NotNull;
 class MergeConflict extends ChangeSide implements DiffRangeMarker.RangeInvalidListener {
 
   @NotNull private final MergeList myMergeList;
-  @NotNull private final DiffRangeMarker myCommonRange;
-  @NotNull private final ConflictChange myLeftChange;
-  @NotNull private final ConflictChange myRightChange;
-  @NotNull private final ChangeHighlighterHolder myCommonHighlighterHolder = new ChangeHighlighterHolder();
+  @NotNull private DiffRangeMarker myCommonRange;
+  @Nullable private ConflictChange myLeftChange;
+  @Nullable private ConflictChange myRightChange;
+  @NotNull private final ChangeHighlighterHolder myCommonHighlighterHolder;
 
   MergeConflict(TextRange commonRange, MergeList mergeList, TextRange leftMarker, TextRange rightMarker) {
     myCommonRange = new DiffRangeMarker((DocumentEx)mergeList.getBaseDocument(),commonRange, this);
     myMergeList = mergeList;
-    myLeftChange = new ConflictChange(this, FragmentSide.SIDE1, leftMarker);
-    myRightChange = new ConflictChange(this, FragmentSide.SIDE2, rightMarker);
+    myCommonHighlighterHolder = new ChangeHighlighterHolder();
+    myLeftChange = new ConflictChange(this, FragmentSide.SIDE1, leftMarker, mergeList.getLeftChangeList());
+    myRightChange = new ConflictChange(this, FragmentSide.SIDE2, rightMarker, mergeList.getRightChangeList());
+  }
+
+  private MergeConflict(TextRange commonRange, MergeList mergeList, ChangeHighlighterHolder highlighterHolder,
+                        ConflictChange leftChange, ConflictChange rightChange) {
+    myCommonRange = new DiffRangeMarker((DocumentEx)mergeList.getBaseDocument(),commonRange, this);
+    myMergeList = mergeList;
+    myCommonHighlighterHolder = highlighterHolder;
+    myLeftChange = leftChange;
+    myRightChange = rightChange;
+  }
+
+  public MergeConflict deriveSideForNotAppliedChange(TextRange baseRange, @Nullable ConflictChange originalChange, ConflictChange otherChange) {
+    ChangeHighlighterHolder highlighterHolder = new ChangeHighlighterHolder();
+    MergeConflict mergeConflict = new MergeConflict(baseRange, myMergeList, highlighterHolder, originalChange, otherChange);
+    highlighterHolder.highlight(mergeConflict, myCommonHighlighterHolder.getEditor(), ChangeType.CONFLICT);
+    return mergeConflict;
   }
 
   public ChangeHighlighterHolder getHighlighterHolder() {
@@ -47,16 +65,29 @@ class MergeConflict extends ChangeSide implements DiffRangeMarker.RangeInvalidLi
     return myCommonRange;
   }
 
-  @NotNull
+  @Nullable
   public ConflictChange getLeftChange() {
     return myLeftChange;
   }
 
-  @NotNull
+  @Nullable
   public ConflictChange getRightChange() {
     return myRightChange;
   }
 
+  @Nullable
+  ConflictChange getOtherChange(ConflictChange change) {
+    if (change == myLeftChange) {
+      return myRightChange;
+    }
+    else if (change == myRightChange) {
+      return myLeftChange;
+    }
+    else {
+      throw new IllegalStateException("Unexpected change: " + change);
+    }
+  }
+
   public void conflictRemoved() {
     removeHighlighters(myLeftChange);
     removeHighlighters(myRightChange);
@@ -65,8 +96,26 @@ class MergeConflict extends ChangeSide implements DiffRangeMarker.RangeInvalidLi
     myCommonRange.removeListener(this);
   }
 
-  private static void removeHighlighters(@NotNull ConflictChange change) {
-    change.getOriginalSide().getHighlighterHolder().removeHighlighters();
+  public void setRange(DiffRangeMarker range) {
+    myCommonRange = range;
+  }
+
+  public void removeOtherChange(ConflictChange change) {
+    if (change == myLeftChange) {
+      myRightChange = null;
+    }
+    else if (change == myRightChange) {
+      myLeftChange = null;
+    }
+    else {
+      throw new IllegalStateException("Unexpected change: " + change);
+    }
+  }
+
+  private static void removeHighlighters(@Nullable ConflictChange change) {
+    if (change != null) {
+      change.getOriginalSide().getHighlighterHolder().removeHighlighters();
+    }
   }
 
   public Document getOriginalDocument(FragmentSide mergeSide) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
index 95c7fd938aa7..979c76f7cb1e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
@@ -67,6 +67,16 @@ public class MergeList implements UserDataHolder {
     myBaseToRightChangeList = new ChangeList(base, right, project);
   }
 
+  @NotNull
+  public ChangeList getLeftChangeList() {
+    return myBaseToLeftChangeList;
+  }
+
+  @NotNull
+  public ChangeList getRightChangeList() {
+    return myBaseToRightChangeList;
+  }
+
   public static MergeList create(@NotNull Project project, @NotNull Document left, @NotNull Document base,
                                  @NotNull Document right) throws FilesTooBigForDiffException {
     MergeList mergeList = new MergeList(project, left, base, right);
@@ -109,6 +119,8 @@ public class MergeList implements UserDataHolder {
       }
       else {
         MergeConflict conflict = new MergeConflict(baseRange, mergeList, leftRange, rightRange);
+        assert conflict.getLeftChange() != null;
+        assert conflict.getRightChange() != null;
         leftChanges.add(conflict.getLeftChange());
         rightChanges.add(conflict.getRightChange());
       }
@@ -224,9 +236,13 @@ public class MergeList implements UserDataHolder {
     }
   }
 
-  public void removeChanges(@NotNull Change leftChange, @NotNull Change rightChange) {
-    myBaseToLeftChangeList.remove(leftChange);
-    myBaseToRightChangeList.remove(rightChange);
+  public void removeChanges(@Nullable Change leftChange, @Nullable Change rightChange) {
+    if (leftChange != null) {
+      myBaseToLeftChangeList.remove(leftChange);
+    }
+    if (rightChange != null) {
+      myBaseToRightChangeList.remove(rightChange);
+    }
   }
 
   public Document getBaseDocument() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/SimpleChange.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/SimpleChange.java
index e0736c3bb373..7432f1438975 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/SimpleChange.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/SimpleChange.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.diff.impl.incrementalMerge;
 
+import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.editor.ex.DocumentEx;
@@ -23,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 
 class SimpleChange extends Change implements DiffRangeMarker.RangeInvalidListener{
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.incrementalMerge.Change");
-  private final ChangeType myType;
+  private ChangeType myType;
   private final SimpleChangeSide[] mySides;
   private final ChangeList myChangeList;
 
@@ -38,6 +39,22 @@ class SimpleChange extends Change implements DiffRangeMarker.RangeInvalidListene
     return new SimpleChangeSide(side, new DiffRangeMarker((DocumentEx)changeList.getDocument(side), range1, this));
   }
 
+  /**
+   * Changes the given Side of a Change to a new text range.
+   * @param sideToChange Side to be changed.
+   * @param newRange     New change range.
+   */
+  @Override
+  protected void changeSide(ChangeSide sideToChange, DiffRangeMarker newRange) {
+    for (int i = 0; i < mySides.length; i++) {
+      SimpleChangeSide side = mySides[i];
+      if (side.equals(sideToChange)) {
+        mySides[i] = new SimpleChangeSide(sideToChange, newRange);
+        break;
+      }
+    }
+  }
+
   protected void removeFromList() {
     myChangeList.remove(this);
   }
@@ -54,6 +71,17 @@ class SimpleChange extends Change implements DiffRangeMarker.RangeInvalidListene
     return myChangeList;
   }
 
+  @Override
+  public void onApplied() {
+    myType = ChangeType.deriveApplied(myType);
+    for (SimpleChangeSide side : mySides) {
+      ChangeHighlighterHolder highlighterHolder = side.getHighlighterHolder();
+      highlighterHolder.setActions(new AnAction[0]);
+      highlighterHolder.updateHighlighter(side, myType);
+    }
+    myChangeList.apply(this);
+  }
+
   public void onRemovedFromList() {
     for (int i = 0; i < mySides.length; i++) {
       SimpleChangeSide side = mySides[i];
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
index 37bcf703b30e..03d95b5b698c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java
@@ -497,6 +497,13 @@ public class MergePanel2 implements DiffViewer {
   }
 
   private class DividersRepainter implements ChangeList.Listener {
+
+    @Override
+    public void onChangeApplied(ChangeList source) {
+      FragmentSide side = myMergeList.getSideOf(source);
+      myDividers[side.getIndex()].repaint();
+    }
+
     public void onChangeRemoved(ChangeList source) {
       FragmentSide side = myMergeList.getSideOf(source);
       myDividers[side.getIndex()].repaint();
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/splitter/DividerPolygon.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/splitter/DividerPolygon.java
index e5cf315e8e87..023ec4e9aaf2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/splitter/DividerPolygon.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/splitter/DividerPolygon.java
@@ -18,7 +18,6 @@ package com.intellij.openapi.diff.impl.splitter;
 import com.intellij.openapi.diff.impl.EditingSides;
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.diff.impl.util.TextDiffType;
-import com.intellij.openapi.diff.impl.util.TextDiffTypeEnum;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.util.Comparing;
@@ -99,10 +98,7 @@ public class DividerPolygon {
     ArrayList<DividerPolygon> polygons = new ArrayList<DividerPolygon>();
     for (int i = indices.getStart(); i < indices.getEnd(); i++) {
       Trapezium trapezium = lineBlocks.getTrapezium(i);
-      final TextDiffTypeEnum diffTypeEnum = lineBlocks.getType(i);
-      if (diffTypeEnum == null) continue;
-      TextDiffType type = TextDiffType.create(diffTypeEnum);
-      if (type == null) continue;
+      final TextDiffType type = lineBlocks.getType(i);
       Color color = type.getPolygonColor(editor1);
       polygons.add(createPolygon(transformations, trapezium, color, left));
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/splitter/LineBlocks.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/splitter/LineBlocks.java
index 728bd8c55c2f..3bb4c4f44104 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/splitter/LineBlocks.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/splitter/LineBlocks.java
@@ -20,21 +20,20 @@ import com.intellij.openapi.diff.impl.fragments.LineBlock;
 import com.intellij.openapi.diff.impl.fragments.LineFragment;
 import com.intellij.openapi.diff.impl.highlighting.FragmentSide;
 import com.intellij.openapi.diff.impl.incrementalMerge.Change;
-import com.intellij.openapi.diff.impl.util.TextDiffTypeEnum;
+import com.intellij.openapi.diff.impl.incrementalMerge.ChangeList;
+import com.intellij.openapi.diff.impl.util.TextDiffType;
 import com.intellij.util.containers.IntArrayList;
+import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
+import java.util.*;
 
 public class LineBlocks {
-  public static final LineBlocks EMPTY = new LineBlocks(SimpleIntervalProvider.EMPTY, new TextDiffTypeEnum[0]);
+  public static final LineBlocks EMPTY = new LineBlocks(SimpleIntervalProvider.EMPTY, new TextDiffType[0]);
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.splitter.LineBlocks");
   private final IntervalsProvider myIntervalsProvider;
-  private final TextDiffTypeEnum[] myTypes;
+  private final TextDiffType[] myTypes;
 
-  private LineBlocks(IntervalsProvider intervalsProvider, TextDiffTypeEnum[] types) {
+  private LineBlocks(IntervalsProvider intervalsProvider, TextDiffType[] types) {
     myIntervalsProvider = intervalsProvider;
     myTypes = types;
   }
@@ -52,11 +51,11 @@ public class LineBlocks {
   }
 
   public Trapezium getTrapezium(int index) {
-    return new Trapezium(getIntervals(FragmentSide.SIDE1)[index], 
+    return new Trapezium(getIntervals(FragmentSide.SIDE1)[index],
                          getIntervals(FragmentSide.SIDE2)[index]);
   }
 
-  public TextDiffTypeEnum getType(int index) {
+  public TextDiffType getType(int index) {
     return myTypes[index];
   }
 
@@ -68,8 +67,8 @@ public class LineBlocks {
     IntArrayList result = new IntArrayList(getIntervals(side).length);
     int previousBeginning = Integer.MIN_VALUE;
     Interval[] sideIntervals = getIntervals(side);
-    for (int i = 0; i < sideIntervals.length; i++) {
-      int start = sideIntervals[i].getStart();
+    for (Interval sideInterval : sideIntervals) {
+      int start = sideInterval.getStart();
       if (start != previousBeginning) result.add(start);
       previousBeginning = start;
     }
@@ -140,8 +139,7 @@ public class LineBlocks {
 
   public static LineBlocks fromLineFragments(ArrayList<LineFragment> lines) {
     ArrayList<LineBlock> filtered = new ArrayList<LineBlock>();
-    for (Iterator<LineFragment> iterator = lines.iterator(); iterator.hasNext();) {
-      LineFragment fragment = iterator.next();
+    for (LineFragment fragment : lines) {
       if (fragment.getType() != null) filtered.add(fragment);
     }
     return createLineBlocks(filtered.toArray(new LineBlock[filtered.size()]));
@@ -151,56 +149,45 @@ public class LineBlocks {
     Arrays.sort(blocks, LineBlock.COMPARATOR);
     Interval[] intervals1 = new Interval[blocks.length];
     Interval[] intervals2 = new Interval[blocks.length];
-    TextDiffTypeEnum[] types = new TextDiffTypeEnum[blocks.length];
+    TextDiffType[] types = new TextDiffType[blocks.length];
     for (int i = 0; i < blocks.length; i++) {
       LineBlock block = blocks[i];
       intervals1[i] = new Interval(block.getStartingLine1(), block.getModifiedLines1());
       intervals2[i] = new Interval(block.getStartingLine2(), block.getModifiedLines2());
-      types[i] = block.getType();
+      types[i] = TextDiffType.create(block.getType());
     }
     return create(intervals1, intervals2, types);
   }
 
-  private static LineBlocks create(Interval[] intervals1, Interval[] intervals2, TextDiffTypeEnum[] types) {
+  private static LineBlocks create(Interval[] intervals1, Interval[] intervals2, TextDiffType[] types) {
     return new LineBlocks(new SimpleIntervalProvider(intervals1, intervals2), types);
   }
 
-  public static LineBlocks fromChanges(ArrayList<Change> changes) {
+  @NotNull
+  public static LineBlocks fromChanges(@NotNull List<Change> changes) {
+    // changes may come mixed, need to sort them to get correct intervals
+    Collections.sort(changes, ChangeList.CHANGE_ORDER);
+
     ArrayList<Interval> intervals1 = new ArrayList<Interval>();
     ArrayList<Interval> intervals2 = new ArrayList<Interval>();
-    ArrayList<TextDiffTypeEnum> types = new ArrayList<TextDiffTypeEnum>();
-    //int prevEnd1 = 0;
-    //int prevEnd2 = 0;
-    for (Iterator<Change> iterator = changes.iterator(); iterator.hasNext();) {
-      Change change = iterator.next();
-      if (!change.isValid()) continue;
+    ArrayList<TextDiffType> types = new ArrayList<TextDiffType>();
+    for (Change change : changes) {
+      if (!change.isValid()) { continue; }
       int start1 = change.getChangeSide(FragmentSide.SIDE1).getStartLine();
-      int start2 = change.getChangeSide(FragmentSide.SIDE2).getStartLine();
-      //if (start1 != prevEnd1 || start2 != prevEnd2) {
-      //  intervals1.add(Interval.fromTo(prevEnd1, start1));
-      //  intervals2.add(Interval.fromTo(prevEnd2, start2));
-      //  types.add(null);
-      //}
       int end1 = change.getChangeSide(FragmentSide.SIDE1).getEndLine();
       intervals1.add(Interval.fromTo(start1, end1));
+
+      int start2 = change.getChangeSide(FragmentSide.SIDE2).getStartLine();
       int end2 = change.getChangeSide(FragmentSide.SIDE2).getEndLine();
       intervals2.add(Interval.fromTo(start2, end2));
-      types.add(change.getType().getTypeKey().getType());
-      //prevEnd1 = end1;
-      //prevEnd2 = end2;
-    }
-    //LOG.assertTrue(prevEnd1 < length1 && prevEnd2 < length2);
-    //if (prevEnd1 != length1 || prevEnd2 != length2) {
-    //  intervals1.add(Interval.fromTo(prevEnd1, length1));
-    //  intervals2.add(Interval.fromTo(prevEnd2, length2));
-    //  types.add(null);
-    //}
 
+      types.add(change.getType().getTypeKey());
+    }
     return create(intervals1.toArray(new Interval[intervals1.size()]),
-                  intervals2.toArray(new Interval[intervals2.size()]), types.toArray(new TextDiffTypeEnum[types.size()]));
+                  intervals2.toArray(new Interval[intervals2.size()]), types.toArray(new TextDiffType[types.size()]));
   }
 
-  public TextDiffTypeEnum[] getTypes() {
+  public TextDiffType[] getTypes() {
     return myTypes;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
index f713c7e5153d..5c7595d8ae60 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
@@ -38,17 +38,20 @@ public class TextDiffType implements DiffStatusBar.LegendTypeDescriptor {
 
   public static final TextDiffType NONE = new TextDiffType(TextDiffTypeEnum.NONE, DiffBundle.message("diff.type.none.name"), null);
 
-  private final TextDiffTypeEnum myType;
   public static final List<TextDiffType> DIFF_TYPES = Arrays.asList(DELETED, CHANGED, INSERT);
   public static final List<TextDiffType> MERGE_TYPES = Arrays.asList(DELETED, CHANGED, INSERT, CONFLICT);
-  private final TextAttributesKey myAttributesKey;
-  private final String myDisplayName;
+
   public static final Convertor<TextDiffType, TextAttributesKey> ATTRIBUTES_KEY = new Convertor<TextDiffType, TextAttributesKey>() {
     public TextAttributesKey convert(TextDiffType textDiffType) {
       return textDiffType.getAttributesKey();
     }
   };
 
+  private final TextDiffTypeEnum myType;
+  private final TextAttributesKey myAttributesKey;
+  private final String myDisplayName;
+  private final boolean myApplied;
+
   public static TextDiffType create(@NotNull final TextDiffTypeEnum type) {
     if (TextDiffTypeEnum.INSERT.equals(type)) {
       return INSERT;
@@ -59,15 +62,29 @@ public class TextDiffType implements DiffStatusBar.LegendTypeDescriptor {
     } else if (TextDiffTypeEnum.CONFLICT.equals(type)) {
       return CONFLICT;
     } else {
-      // NONE
       return NONE;
     }
   }
 
-  private TextDiffType(TextDiffTypeEnum type, String displayName, TextAttributesKey attrubutesKey) {
+  /**
+   * Creates a new TextDiffType based on the given one.
+   * @param source
+   * @return
+   */
+  @NotNull
+  public static TextDiffType deriveApplied(@NotNull TextDiffType source) {
+    return new TextDiffType(source.myType, source.myDisplayName, source.myAttributesKey, true);
+  }
+
+  private TextDiffType(TextDiffTypeEnum type, String displayName, TextAttributesKey attributesKey) {
+    this(type, displayName, attributesKey, false);
+  }
+
+  private TextDiffType(TextDiffTypeEnum type, String displayName, TextAttributesKey attributesKey, boolean applied) {
     myType = type;
-    myAttributesKey = attrubutesKey;
+    myAttributesKey = attributesKey;
     myDisplayName = displayName;
+    myApplied = applied;
   }
 
   public String getDisplayName() {
@@ -76,7 +93,7 @@ public class TextDiffType implements DiffStatusBar.LegendTypeDescriptor {
 
   @Nullable
   public Color getLegendColor(EditorColorsScheme colorScheme) {
-    TextAttributes attributes = getTextAttributes(colorScheme);
+    TextAttributes attributes = colorScheme.getAttributes(myAttributesKey);
     return attributes != null ? attributes.getBackgroundColor() : null;
   }
 
@@ -85,7 +102,15 @@ public class TextDiffType implements DiffStatusBar.LegendTypeDescriptor {
   }
 
   public TextAttributes getTextAttributes(EditorColorsScheme scheme) {
-    return scheme.getAttributes(myAttributesKey);
+    TextAttributes originalAttrs = scheme.getAttributes(myAttributesKey);
+    if (!myApplied) {
+      return originalAttrs;
+    }
+    else {
+      TextAttributes overridingAttributes = new TextAttributes();
+      overridingAttributes.setBackgroundColor(scheme.getDefaultBackground());
+      return TextAttributes.merge(originalAttrs, overridingAttributes);
+    }
   }
 
   @Nullable
@@ -104,7 +129,7 @@ public class TextDiffType implements DiffStatusBar.LegendTypeDescriptor {
   }
 
   public String toString(){
-    return myDisplayName;
+    return myApplied ? myDisplayName + "_applied" : myDisplayName;
   }
 
   public TextDiffTypeEnum getType() {

From 2b0ef7a83690cf2ee43d84403239bcfd306dca42 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Sat, 2 Jun 2012 17:06:38 +0200
Subject: [PATCH 113/239] correct URL of third-party plugin helpset
 (IDEA-86315)

---
 .../src/com/intellij/help/impl/HelpManagerImpl.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
index aecd14d966e1..6fd5521e2025 100644
--- a/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/help/impl/HelpManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,7 +85,11 @@ public class HelpManagerImpl extends HelpManager {
     for (IdeaPluginDescriptor pluginDescriptor : pluginDescriptors) {
       HelpSetPath[] sets = pluginDescriptor.getHelpSets();
       for (HelpSetPath hsPath : sets) {
-        String url = "jar:file:///" + pluginDescriptor.getPath().getAbsolutePath() + "/help/" + hsPath.getFile() + "!/" + hsPath.getPath();
+        String url = "jar:file:///" + pluginDescriptor.getPath().getAbsolutePath() + "/help/" + hsPath.getFile() + "!";
+        if (!hsPath.getPath().startsWith("/")) {
+          url += "/";
+        }
+        url += hsPath.getPath();
         HelpSet pluginHelpSet = loadHelpSet(url);
         if (pluginHelpSet != null) {
           mainHelpSet.add(pluginHelpSet);

From 35207aa7b44a8c9f2e5d4c3ac559b86c2fecb400 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sat, 2 Jun 2012 18:07:37 +0200
Subject: [PATCH 114/239] IDEA-86891 NavigationGutterIconRenderer: improve
 display of "emptyText"

---
 .../navigation/NavigationGutterIconRenderer.java  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/xml/dom-openapi/src/com/intellij/codeInsight/navigation/NavigationGutterIconRenderer.java b/xml/dom-openapi/src/com/intellij/codeInsight/navigation/NavigationGutterIconRenderer.java
index 07f949a8375d..b7f7271bd048 100644
--- a/xml/dom-openapi/src/com/intellij/codeInsight/navigation/NavigationGutterIconRenderer.java
+++ b/xml/dom-openapi/src/com/intellij/codeInsight/navigation/NavigationGutterIconRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,14 @@ import com.intellij.ide.util.PsiElementListCellRenderer;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.editor.markup.GutterIconRenderer;
+import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.SmartPsiElementPointer;
 import com.intellij.psi.util.PsiUtilCore;
+import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.util.NullableFunction;
 import com.intellij.util.PsiNavigateUtil;
@@ -106,9 +108,14 @@ public abstract class NavigationGutterIconRenderer extends GutterIconRenderer im
     if (list.isEmpty()) {
       if (myEmptyText != null) {
         if (event != null) {
-          final JComponent renderer = HintUtil.createErrorLabel(myEmptyText);
-          final JBPopup popup = JBPopupFactory.getInstance().createComponentPopupBuilder(renderer, renderer).createPopup();
-          popup.show(new RelativePoint(event));
+          final JComponent label = HintUtil.createErrorLabel(myEmptyText);
+          label.setBorder(IdeBorderFactory.createEmptyBorder(2, 7, 2, 7));
+          JBPopupFactory.getInstance().createBalloonBuilder(label)
+            .setPreferredPosition(Balloon.Position.above)
+            .setFadeoutTime(3000)
+            .setFillColor(HintUtil.ERROR_COLOR)
+            .createBalloon()
+            .show(new RelativePoint(event), Balloon.Position.above);
         }
       }
       return;

From 6f2a878c44612ce6fec91695578ac178321b8437 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Sat, 2 Jun 2012 18:20:44 +0200
Subject: [PATCH 115/239] store byte[] instead of String when possible

---
 .../util/containers/PathInterner.java         | 49 ++++++++++++++++---
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/platform/util/src/com/intellij/util/containers/PathInterner.java b/platform/util/src/com/intellij/util/containers/PathInterner.java
index 01bfc235f1d6..d9b4794f29c4 100644
--- a/platform/util/src/com/intellij/util/containers/PathInterner.java
+++ b/platform/util/src/com/intellij/util/containers/PathInterner.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.util.containers;
 
+import com.intellij.util.io.IOUtil;
 import gnu.trove.THashMap;
 import gnu.trove.TObjectHashingStrategy;
 import gnu.trove.TObjectIntHashMap;
@@ -45,6 +46,7 @@ public class PathInterner {
   @Nullable
   protected SubstringWrapper[] internParts(String path, boolean forAddition) {
     int start = 0;
+    boolean asBytes = forAddition && IOUtil.isAscii(path);
     List<SubstringWrapper> key = new ArrayList<SubstringWrapper>();
     SubstringWrapper flyweightKey = new SubstringWrapper();
     while (start < path.length()) {
@@ -54,7 +56,7 @@ public class PathInterner {
         if (!forAddition) {
           return null;
         }
-        myInternMap.add(interned = flyweightKey.createPersistentCopy());
+        myInternMap.add(interned = flyweightKey.createPersistentCopy(asBytes));
       }
       key.add(interned);
       start += flyweightKey.len;
@@ -65,19 +67,34 @@ public class PathInterner {
   private static String restorePath(SubstringWrapper[] seq) {
     StringBuilder sb = new StringBuilder();
     for (SubstringWrapper wrapper : seq) {
-      sb.append(wrapper.s);
+      wrapper.append(sb);
     }
     return sb.toString();
   }
 
   private static class SubstringWrapper {
-    private String s;
+    private Object encodedString;
     private int start;
     private int len;
     private int hc;
 
+    void append(StringBuilder sb) {
+      if (encodedString instanceof String) {
+        sb.append(encodedString);
+        return;
+      }
+
+      int oldLen = sb.length();
+      sb.setLength(oldLen + len);
+      byte[] bytes = (byte[]) encodedString;
+      //noinspection ForLoopReplaceableByForEach
+      for (int i = 0, len = bytes.length; i < len; i++) {
+        sb.setCharAt(oldLen + i, (char)bytes[i]);
+      }
+    }
+
     void findSubStringUntilNextSeparator(String s, int start) {
-      this.s = s;
+      encodedString = s;
       this.start = start;
       hc = 0;
 
@@ -96,6 +113,13 @@ public class PathInterner {
       return c == '/' || c == '\\' || c == '.' || c == ' ' || c == '_' || c == '$';
     }
 
+    char charAt(int i) {
+      if (encodedString instanceof String) {
+        return ((String)encodedString).charAt(start + i);
+      }
+      return (char)((byte[]) encodedString)[start + i];
+    }
+
     @Override
     public boolean equals(Object o) {
       if (this == o) return true;
@@ -105,10 +129,9 @@ public class PathInterner {
 
       if (hc != wrapper.hc) return false;
       if (len != wrapper.len) return false;
-      if (s == wrapper.s && start == wrapper.start) return true;
 
       for (int i = 0; i < len; i++) {
-        if (s.charAt(i + start) != wrapper.s.charAt(i + wrapper.start)) {
+        if (charAt(i) != wrapper.charAt(i)) {
           return false;
         }
       }
@@ -121,9 +144,19 @@ public class PathInterner {
       return hc;
     }
 
-    SubstringWrapper createPersistentCopy() {
+    SubstringWrapper createPersistentCopy(boolean asBytes) {
       SubstringWrapper wrapper = new SubstringWrapper();
-      wrapper.s = new String(s.substring(start, start + len));
+      String string = (String) encodedString;
+      String substring = string.substring(start, start + len);
+      if (asBytes) {
+        byte[] bytes = new byte[len];
+        for (int i = 0; i < len; i++) {
+          bytes[i] = (byte)string.charAt(i + start);
+        }
+        wrapper.encodedString = bytes;
+      } else {
+        wrapper.encodedString = new String(string.substring(start, start + len));
+      }
       wrapper.start = 0;
       wrapper.len = len;
       wrapper.hc = hc;

From 6ea5d29d6116a56d9b3940a015f98443bcf4dab3 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Sun, 3 Jun 2012 16:49:28 +0200
Subject: [PATCH 116/239] minor

---
 .../util/src/com/intellij/util/SmartFMap.java | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/platform/util/src/com/intellij/util/SmartFMap.java b/platform/util/src/com/intellij/util/SmartFMap.java
index 1a9e2a7dc880..766c7b6f3106 100644
--- a/platform/util/src/com/intellij/util/SmartFMap.java
+++ b/platform/util/src/com/intellij/util/SmartFMap.java
@@ -41,35 +41,41 @@ public class SmartFMap<K,V> implements Map<K,V> {
   }
 
   public SmartFMap<K, V> plus(@NotNull K key, V value) {
-    if (myMap instanceof Map) {
-      THashMap<K, V> newMap = new THashMap<K, V>((Map<K, V>)myMap);
+    return new SmartFMap<K, V>(doPlus(myMap, key, value, false));
+  }
+
+  private static Object doPlus(Object oldMap, Object key, Object value, boolean inPlace) {
+    if (oldMap instanceof Map) {
+      Map newMap = inPlace ? (Map)oldMap : new THashMap((Map)oldMap);
       newMap.put(key, value);
-      return new SmartFMap<K, V>(newMap);
+      return newMap;
     }
 
-    Object[] array = (Object[])myMap;
+    Object[] array = (Object[])oldMap;
     for (int i = 0; i < array.length; i += 2) {
       if (key.equals(array[i])) {
-        Object[] newArray = new Object[array.length];
-        System.arraycopy(array, 0, newArray, 0, array.length);
+        Object[] newArray = inPlace ? array : new Object[array.length];
+        if (!inPlace) {
+          System.arraycopy(array, 0, newArray, 0, array.length);
+        }
         newArray[i + 1] = value;
-        return new SmartFMap<K, V>(newArray);
+        return newArray;
       }
     }
     if (array.length == 2 * ARRAY_THRESHOLD) {
-      THashMap<K, V> map = new THashMap<K, V>();
+      THashMap map = new THashMap();
       for (int i = 0; i < array.length; i += 2) {
-        map.put((K)array[i], (V)array[i + 1]);
+        map.put(array[i], array[i + 1]);
       }
       map.put(key, value);
-      return new SmartFMap<K, V>(map);
+      return map;
     }
 
     Object[] newArray = new Object[array.length + 2];
     System.arraycopy(array, 0, newArray, 0, array.length);
     newArray[array.length] = key;
     newArray[array.length + 1] = value;
-    return new SmartFMap<K, V>(newArray);
+    return newArray;
   }
 
   public SmartFMap<K, V> minus(@NotNull K key) {
@@ -156,16 +162,21 @@ public class SmartFMap<K,V> implements Map<K,V> {
   @Override
   @Nullable
   public V get(Object key) {
+    return (V)doGet(myMap, key);
+  }
+
+  @Nullable
+  private static Object doGet(Object map, Object key) {
     if (key == null) {
       return null;
     }
-    if (myMap instanceof Map) {
-      return ((Map<K, V>)myMap).get(key);
+    if (map instanceof Map) {
+      return ((Map)map).get(key);
     }
-    Object[] array = (Object[])myMap;
+    Object[] array = (Object[])map;
     for (int i = 0; i < array.length; i += 2) {
       if (key.equals(array[i])) {
-        return (V)array[i + 1];
+        return array[i + 1];
       }
     }
     return null;

From 8ccfb294510335c63339767bf314e3b6be8e26b5 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Sun, 3 Jun 2012 17:01:34 +0200
Subject: [PATCH 117/239] don't prefer getClass over HashMap.get

---
 .../intellij/psi/util/proximity/KnownElementWeigher.java  | 1 +
 .../completion/normalSorting/DoNotPreferGetClass.java     | 8 ++++++++
 .../completion/NormalCompletionOrderingTest.groovy        | 3 +++
 .../codeInsight/completion/SmartTypeCompletionTest.java   | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/codeInsight/completion/normalSorting/DoNotPreferGetClass.java

diff --git a/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java b/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java
index 34668dfa4689..99f205579376 100644
--- a/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java
+++ b/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java
@@ -75,6 +75,7 @@ public class KnownElementWeigher extends ProximityWeigher {
     @NonNls final String qname = element.getQualifiedName();
     if (qname != null) {
       String pkg = StringUtil.getPackageName(qname);
+      if (qname.equals(CommonClassNames.JAVA_LANG_OBJECT)) return 5;
       if (pkg.equals("java.lang")) return 7;
       if (pkg.equals("java.util")) return 6;
 
diff --git a/java/java-tests/testData/codeInsight/completion/normalSorting/DoNotPreferGetClass.java b/java/java-tests/testData/codeInsight/completion/normalSorting/DoNotPreferGetClass.java
new file mode 100644
index 000000000000..3976c0152d34
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normalSorting/DoNotPreferGetClass.java
@@ -0,0 +1,8 @@
+import java.util.HashMap;
+
+class Util {
+  void foo(int reaction, boolean rezet) {
+    new HashMap().g<caret>x
+  }
+
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
index df62e225be87..8894e780230a 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy
@@ -329,5 +329,8 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase {
     checkPreferredItems 0, 'reaction', 'rezet', 'return'
   }
 
+  public void testDoNotPreferGetClass() {
+    checkPreferredItems 0, 'get', 'getClass'
+  }
 
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
index 95d367151870..297881d9ac91 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
@@ -795,7 +795,7 @@ public class SmartTypeCompletionTest extends LightFixtureCompletionTestCase {
   }
   public void testNoClassLiteral() throws Exception {
     doActionTest();
-    assertStringItems("Object.class", "getClass", "forName", "forName");
+    assertStringItems("Object.class", "forName", "forName", "getClass");
   }
 
   public void testClassLiteralInAnno2() throws Throwable {

From 2b26d0a7cc10485d01481b6aa93ec23f6072e57d Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 4 Jun 2012 01:21:11 +0400
Subject: [PATCH 118/239] do not write nonchanged data

---
 .../src/com/intellij/util/io/PagedFileStorage.java | 14 +++++++-------
 .../util/io/ReadWriteDirectBufferWrapper.java      |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index 8cd61fa5aac1..d949d0b75325 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -161,8 +161,8 @@ public class PagedFileStorage implements Forceable {
     return addr % myPageSize;
   }
   
-  ByteBuffer getByteBuffer(int address) {
-    return getBuffer(address / myPageSize);
+  ByteBuffer getByteBuffer(int address, boolean modify) {
+    return getBuffer(address / myPageSize, modify);
   }
 
   public final short getShort(int addr) {
@@ -405,9 +405,11 @@ public class PagedFileStorage implements Forceable {
 
   public void force() {
     long started = IOStatistics.DEBUG ? System.currentTimeMillis():0;
-    myStorageLockContext.myStorageLock.flushBuffersForOwner(myStorageIndex, myStorageLockContext);
+    if (isDirty) {
+      myStorageLockContext.myStorageLock.flushBuffersForOwner(myStorageIndex, myStorageLockContext);
+      isDirty = false;
+    }
 
-    isDirty = false;
     if (IOStatistics.DEBUG) {
       long finished = System.currentTimeMillis();
       if (finished - started > IOStatistics.MIN_IO_TIME_TO_REPORT) {
@@ -527,9 +529,7 @@ public class PagedFileStorage implements Forceable {
       }
       ++myMappingChangeCount;
       int min = Math.min((int)(owner.length() - off), owner.myPageSize);
-      ByteBufferWrapper wrapper = min != owner.myPageSize ?  // last, non aligned buffer allocate directly, it is much faster to unmap it during resize
-                                  ByteBufferWrapper.readWriteDirect(owner.myFile, off, min):
-                                  ByteBufferWrapper.readWrite(owner.myFile, off, min);
+      ByteBufferWrapper wrapper = ByteBufferWrapper.readWriteDirect(owner.myFile, off, min);
       IOException oome = null;
       while (true) {
         try {
diff --git a/platform/util/src/com/intellij/util/io/ReadWriteDirectBufferWrapper.java b/platform/util/src/com/intellij/util/io/ReadWriteDirectBufferWrapper.java
index ee26302ff2b5..98930829879c 100644
--- a/platform/util/src/com/intellij/util/io/ReadWriteDirectBufferWrapper.java
+++ b/platform/util/src/com/intellij/util/io/ReadWriteDirectBufferWrapper.java
@@ -23,7 +23,6 @@ import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
-// todo: find a way to determine a buffer was updated (perhaps in PagedFileStorage?)
 public class ReadWriteDirectBufferWrapper extends DirectBufferWrapper {
   @NonNls private static final String RW = "rw";
 
@@ -55,7 +54,7 @@ public class ReadWriteDirectBufferWrapper extends DirectBufferWrapper {
   @Override
   public void flush() {
     final ByteBuffer buffer = getCachedBuffer();
-    if (buffer == null) return;
+    if (buffer == null || !isDirty()) return;
 
     try {
       final RandomAccessFile file = new RandomAccessFile(myFile, RW);

From 527797ea27974d7e0ebf252c424473e3f964a7d0 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 4 Jun 2012 01:32:07 +0400
Subject: [PATCH 119/239] added highSelectivityKey optimization hint, index key
 with such attribute is written directly to disk, bypassing efforts on key
 reducing during indexing phase.

---
 .../java/stubs/index/JavaFieldNameIndex.java  |  5 ++++
 .../stubs/index/JavaFullClassNameIndex.java   |  5 ++++
 .../java/stubs/index/JavaMethodNameIndex.java |  5 ++++
 .../stubs/index/JavaShortClassNameIndex.java  |  4 +++
 .../indexing/FileBasedIndexExtension.java     |  4 +++
 .../intellij/psi/stubs/AbstractStubIndex.java |  7 ++++-
 .../psi/stubs/StubIndexExtension.java         |  2 ++
 .../intellij/psi/search/FilenameIndex.java    |  5 ++++
 .../com/intellij/psi/stubs/StubIndexImpl.java |  3 +-
 .../intellij/psi/stubs/StubUpdatingIndex.java |  6 +++-
 .../util/indexing/FileBasedIndexImpl.java     |  8 +++++-
 .../util/indexing/MapIndexStorage.java        | 28 +++++++++++++++++--
 .../SingleEntryFileBasedIndexExtension.java   |  5 ++++
 13 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java
index 54eb0edf6a05..463a69e8f213 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFieldNameIndex.java
@@ -46,4 +46,9 @@ public class JavaFieldNameIndex extends StringStubIndexExtension<PsiField> {
   public Collection<PsiField> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
     return super.get(s, project, new JavaSourceFilterScope(scope));
   }
+
+  @Override
+  public boolean isKeyHighlySelective() {
+    return true;
+  }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
index 40c75f3551b3..1b2bdd4088ad 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaFullClassNameIndex.java
@@ -46,4 +46,9 @@ public class JavaFullClassNameIndex extends IntStubIndexExtension<PsiClass> {
   public Collection<PsiClass> get(final Integer integer, final Project project, @NotNull final GlobalSearchScope scope) {
     return super.get(integer, project, new JavaSourceFilterScope(scope));
   }
+
+  @Override
+  public boolean isKeyHighlySelective() {
+    return true;
+  }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java
index a92856f2564c..fa8e2a0a91d2 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaMethodNameIndex.java
@@ -46,4 +46,9 @@ public class JavaMethodNameIndex extends StringStubIndexExtension<PsiMethod> {
   public Collection<PsiMethod> get(final String s, final Project project, @NotNull final GlobalSearchScope scope) {
     return super.get(s, project, new JavaSourceFilterScope(scope));
   }
+
+  @Override
+  public boolean isKeyHighlySelective() {
+    return true;
+  }
 }
\ No newline at end of file
diff --git a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java
index c2c49d71cdec..1e864f7054c7 100644
--- a/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java
+++ b/java/java-impl/src/com/intellij/psi/impl/java/stubs/index/JavaShortClassNameIndex.java
@@ -47,4 +47,8 @@ public class JavaShortClassNameIndex extends StringStubIndexExtension<PsiClass>
     return super.get(s, project, new JavaSourceFilterScope(scope));
   }
 
+  @Override
+  public boolean isKeyHighlySelective() {
+    return true;
+  }
 }
\ No newline at end of file
diff --git a/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java b/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java
index 51dc7cc449d0..7b14a3a728ad 100644
--- a/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java
+++ b/platform/indexing-api/src/com/intellij/util/indexing/FileBasedIndexExtension.java
@@ -70,4 +70,8 @@ public abstract class FileBasedIndexExtension<K, V> {
   public Collection<FileType> getFileTypesWithSizeLimitNotApplicable() {
     return Collections.emptyList();
   }
+
+  public boolean isKeyHighlySelective() {
+    return false;
+  }
 }
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java b/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java
index 4cc68a25392c..0d7d80de3299 100644
--- a/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java
+++ b/platform/lang-api/src/com/intellij/psi/stubs/AbstractStubIndex.java
@@ -33,5 +33,10 @@ public abstract class AbstractStubIndex<Key, Psi extends PsiElement> implements
     return StubIndex.getInstance().get(getKey(), key, project, scope);
   }
 
-  public int getCacheSize() { return 5; }
+  public int getCacheSize() { return 2 * 1024; }
+
+  @Override
+  public boolean isKeyHighlySelective() {
+    return false;
+  }
 }
diff --git a/platform/lang-api/src/com/intellij/psi/stubs/StubIndexExtension.java b/platform/lang-api/src/com/intellij/psi/stubs/StubIndexExtension.java
index 741cab3f5247..5e55f874c114 100644
--- a/platform/lang-api/src/com/intellij/psi/stubs/StubIndexExtension.java
+++ b/platform/lang-api/src/com/intellij/psi/stubs/StubIndexExtension.java
@@ -36,4 +36,6 @@ public interface StubIndexExtension<Key, Psi extends PsiElement> {
   KeyDescriptor<Key> getKeyDescriptor();
 
   int getCacheSize();
+
+  boolean isKeyHighlySelective();
 }
\ No newline at end of file
diff --git a/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java b/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java
index 387612fff350..424c5c75b004 100644
--- a/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java
+++ b/platform/lang-impl/src/com/intellij/psi/search/FilenameIndex.java
@@ -140,4 +140,9 @@ public class FilenameIndex extends ScalarIndexExtension<String> {
     }
     return files;
   }
+
+  @Override
+  public boolean isKeyHighlySelective() {
+    return true;
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
index 54a83823712b..3557a4e6dad8 100644
--- a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java
@@ -131,7 +131,8 @@ public class StubIndexImpl extends StubIndex implements ApplicationComponent, Pe
           IndexInfrastructure.getStorageFile(indexKey),
           extension.getKeyDescriptor(),
           new StubIdExternalizer(),
-          extension.getCacheSize()
+          extension.getCacheSize(),
+          extension.isKeyHighlySelective()
         );
         final MemoryIndexStorage<K, int[]> memStorage = new MemoryIndexStorage<K, int[]>(storage);
         myIndices.put(indexKey, new MyIndex<K>(memStorage));
diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
index 547f47a6f437..5c22c6a700f9 100644
--- a/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
+++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubUpdatingIndex.java
@@ -31,7 +31,6 @@ import com.intellij.util.indexing.*;
 import com.intellij.util.io.DataExternalizer;
 import com.intellij.util.io.IntInlineKeyDescriptor;
 import com.intellij.util.io.KeyDescriptor;
-import gnu.trove.TIntArrayList;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.DataInput;
@@ -102,6 +101,11 @@ public class StubUpdatingIndex extends CustomImplementationFileBasedIndexExtensi
     return 5; // no need to cache many serialized trees
   }
 
+  @Override
+  public boolean isKeyHighlySelective() {
+    return true;
+  }
+
   @NotNull
   @Override
   public DataIndexer<Integer, SerializedStubTree, FileContent> getIndexer() {
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
index cdcfd879d66e..bff212256402 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java
@@ -388,7 +388,13 @@ public class FileBasedIndexImpl extends FileBasedIndex {
 
     for (int attempt = 0; attempt < 2; attempt++) {
       try {
-        final MapIndexStorage<K, V> storage = new MapIndexStorage<K, V>(IndexInfrastructure.getStorageFile(name), extension.getKeyDescriptor(), extension.getValueExternalizer(), extension.getCacheSize());
+        final MapIndexStorage<K, V> storage = new MapIndexStorage<K, V>(
+          IndexInfrastructure.getStorageFile(name),
+          extension.getKeyDescriptor(),
+          extension.getValueExternalizer(),
+          extension.getCacheSize(),
+          extension.isKeyHighlySelective()
+        );
         final MemoryIndexStorage<K, V> memStorage = new MemoryIndexStorage<K, V>(storage);
         final UpdatableIndex<K, V, FileContent> index = createIndex(name, extension, memStorage);
         final InputFilter inputFilter = extension.getInputFilter();
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/MapIndexStorage.java b/platform/lang-impl/src/com/intellij/util/indexing/MapIndexStorage.java
index 9379f64369bf..326b3a9a5dc5 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/MapIndexStorage.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/MapIndexStorage.java
@@ -49,16 +49,27 @@ public final class MapIndexStorage<Key, Value> implements IndexStorage<Key, Valu
 
   private final Lock l = new ReentrantLock();
   private final DataExternalizer<Value> myDataExternalizer;
+  private boolean myHighKeySelectivity;
 
   public MapIndexStorage(@NotNull File storageFile,
                          @NotNull KeyDescriptor<Key> keyDescriptor,
                          @NotNull DataExternalizer<Value> valueExternalizer,
-                         final int cacheSize) throws IOException {
+                         final int cacheSize
+  ) throws IOException {
+    this(storageFile, keyDescriptor, valueExternalizer, cacheSize, false);
+  }
+
+  public MapIndexStorage(@NotNull File storageFile,
+                         @NotNull KeyDescriptor<Key> keyDescriptor,
+                         @NotNull DataExternalizer<Value> valueExternalizer,
+                         final int cacheSize,
+                         boolean highKeySelectivity) throws IOException {
 
     myStorageFile = storageFile;
     myKeyDescriptor = keyDescriptor;
     myCacheSize = cacheSize;
     myDataExternalizer = valueExternalizer;
+    myHighKeySelectivity = highKeySelectivity;
     initMapAndCache();
   }
 
@@ -230,7 +241,20 @@ public final class MapIndexStorage<Key, Value> implements IndexStorage<Key, Valu
   public void addValue(final Key key, final int inputId, final Value value) throws StorageException {
     try {
       myMap.markDirty();
-      read(key).addValue(inputId, value);
+      if (!myHighKeySelectivity) {
+        read(key).addValue(inputId, value);
+        return;
+      }
+
+      ChangeTrackingValueContainer<Value> cached = myCache.getIfCached(key);
+      if (cached != null) {
+        cached.addValue(inputId, value);
+        return;
+      }
+      // do not pollute the cache with highly selective data
+      ChangeTrackingValueContainer<Value> valueContainer = new ChangeTrackingValueContainer<Value>(null);
+      valueContainer.addValue(inputId, value);
+      myMap.put(key, valueContainer);
     }
     catch (IOException e) {
       throw new StorageException(e);
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/SingleEntryFileBasedIndexExtension.java b/platform/lang-impl/src/com/intellij/util/indexing/SingleEntryFileBasedIndexExtension.java
index ee704f718536..128d7d40d4fe 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/SingleEntryFileBasedIndexExtension.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/SingleEntryFileBasedIndexExtension.java
@@ -40,4 +40,9 @@ public abstract class SingleEntryFileBasedIndexExtension<V> extends FileBasedInd
   @NotNull
   @Override
   public abstract SingleEntryIndexer<V> getIndexer();
+
+  @Override
+  public boolean isKeyHighlySelective() {
+    return true;
+  }
 }

From 94e69692bc4f7c8db075010a87303caaa6c34214 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 4 Jun 2012 01:46:38 +0400
Subject: [PATCH 120/239] change from future was temporarily removed

---
 platform/util/src/com/intellij/util/io/PagedFileStorage.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index d949d0b75325..1d14f6e54295 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -161,8 +161,8 @@ public class PagedFileStorage implements Forceable {
     return addr % myPageSize;
   }
   
-  ByteBuffer getByteBuffer(int address, boolean modify) {
-    return getBuffer(address / myPageSize, modify);
+  ByteBuffer getByteBuffer(int address) {
+    return getBuffer(address / myPageSize);
   }
 
   public final short getShort(int addr) {

From 679ab258964cfc3d227524cbbf9b35ec3d4c5680 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sat, 2 Jun 2012 09:20:57 +0400
Subject: [PATCH 121/239] Method reverences language level highlighting

---
 .../daemon/impl/analysis/HighlightUtil.java            |  8 +++++++-
 .../daemon/impl/analysis/HighlightVisitorImpl.java     |  8 +++++++-
 .../src/com/intellij/psi/JavaElementVisitor.java       |  6 +++++-
 .../tree/java/PsiMethodReferenceExpressionImpl.java    | 10 ++++++++++
 .../src/messages/JavaErrorMessages.properties          |  1 +
 .../advHighlighting/UnsupportedFeatures.java           |  2 ++
 6 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index dc00abd0ea0c..9ed08267b807 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -2538,7 +2538,8 @@ public class HighlightUtil {
     TRY_WITH_RESOURCES(LanguageLevel.JDK_1_7, "feature.try.with.resources"),
     BIN_LITERALS(LanguageLevel.JDK_1_7, "feature.binary.literals"),
     UNDERSCORES(LanguageLevel.JDK_1_7, "feature.underscores.in.literals"),
-    EXTENSION_METHODS(LanguageLevel.JDK_1_8, "feature.extension.methods");
+    EXTENSION_METHODS(LanguageLevel.JDK_1_8, "feature.extension.methods"),
+    METHOD_REFERENCES(LanguageLevel.JDK_1_8, "feature.method.references");
 
     private final LanguageLevel level;
     private final String key;
@@ -2606,4 +2607,9 @@ public class HighlightUtil {
   public static HighlightInfo checkExtensionMethodsFeature(final PsiMethod method) {
     return checkFeature(method, Feature.EXTENSION_METHODS);
   }
+
+  @Nullable
+  public static HighlightInfo checkMethodReferencesFeature(final PsiMethodReferenceExpression expression) {
+    return checkFeature(expression, Feature.METHOD_REFERENCES);
+  }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
index 445f04be73e3..b857ebfe536a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
@@ -892,7 +892,13 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
     if (!myHolder.hasErrorResults()) myHolder.add(HighlightUtil.checkClassReferenceAfterQualifier(expression, resolved));
   }
 
-  @Override public void visitReferenceList(PsiReferenceList list) {
+  @Override
+  public void visitMethodReferenceExpression(PsiMethodReferenceExpression expression) {
+    myHolder.add(HighlightUtil.checkMethodReferencesFeature(expression));
+  }
+
+  @Override
+  public void visitReferenceList(PsiReferenceList list) {
     if (list.getFirstChild() == null) return;
     PsiElement parent = list.getParent();
     if (!(parent instanceof PsiTypeParameter)) {
diff --git a/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
index 7ece4a6065ae..ddd54ad680e5 100644
--- a/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
+++ b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -244,6 +244,10 @@ public abstract class JavaElementVisitor extends PsiElementVisitor {
    */
   public void visitReferenceExpression(PsiReferenceExpression expression) {}
 
+  public void visitMethodReferenceExpression(PsiMethodReferenceExpression expression) {
+    visitReferenceExpression(expression);
+  }
+
   public void visitReferenceList(PsiReferenceList list) {
     visitElement(list);
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
index ad21de8a54f2..8bdb19b1d74c 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
@@ -104,6 +104,16 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
     return element.getManager().areElementsEquivalent(element, resolve());
   }
 
+  @Override
+  public void accept(@NotNull final PsiElementVisitor visitor) {
+    if (visitor instanceof JavaElementVisitor) {
+      ((JavaElementVisitor)visitor).visitMethodReferenceExpression(this);
+    }
+    else {
+      visitor.visitElement(this);
+    }
+  }
+
   @Override
   public String toString() {
     return "PsiMethodReferenceExpression:" + getText();
diff --git a/java/java-psi-impl/src/messages/JavaErrorMessages.properties b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
index 51d626aaedbe..af50af742652 100644
--- a/java/java-psi-impl/src/messages/JavaErrorMessages.properties
+++ b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
@@ -353,4 +353,5 @@ feature.try.with.resources=Try-with-resources
 feature.binary.literals=Binary literals
 feature.underscores.in.literals=Underscores in literals
 feature.extension.methods=Extension methods
+feature.method.references=Method references
 insufficient.language.level={0} are not supported at this language level
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnsupportedFeatures.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnsupportedFeatures.java
index 0aa0409aa34d..d4ca889750a1 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnsupportedFeatures.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnsupportedFeatures.java
@@ -37,6 +37,8 @@ class UnsupportedFeatures {
     catch (<error descr="Multi-catches are not supported at this language level">FileNotFoundException | IOException e</error>) { e.printStackTrace(); }
 
     try <error descr="Try-with-resources are not supported at this language level">(Reader r = new FileReader("/dev/null"))</error> { }
+
+    I i = <error descr="Method references are not supported at this language level">UnsupportedFeatures::m</error>;
   }
 
   interface I {

From 1fa291a5b81566983b43c6f74e525e2a1d525c66 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sat, 2 Jun 2012 18:16:03 +0400
Subject: [PATCH 122/239] Cleanup

---
 .../psi/impl/source/tree/java/PsiReferenceExpressionImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
index 9974e27bfe30..550efd7929ca 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
@@ -309,7 +309,7 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
     return getCachedTextSkipWhiteSpaceAndComments();
   }
 
-  private final Function<PsiReferenceExpressionImpl, PsiType> ourTypeEvaluator = new TypeEvaluator();
+  private static final Function<PsiReferenceExpressionImpl, PsiType> TYPE_EVALUATOR = new TypeEvaluator();
 
   private static class TypeEvaluator implements NullableFunction<PsiReferenceExpressionImpl, PsiType> {
     @Override
@@ -365,7 +365,7 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
 
   @Override
   public PsiType getType() {
-    return JavaResolveCache.getInstance(getProject()).getType(this, ourTypeEvaluator);
+    return JavaResolveCache.getInstance(getProject()).getType(this, TYPE_EVALUATOR);
   }
 
   @Override

From f455ac56975c7a47bea7b24c6a0b87029b1e3499 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sun, 3 Jun 2012 11:40:47 +0400
Subject: [PATCH 123/239] Prevent CCEs

---
 .../src/com/intellij/psi/util/TypeConversionUtil.java            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
index 0d4157481cc5..39d9e684ca08 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
@@ -202,6 +202,7 @@ public class TypeConversionUtil {
 
     if (isAssignable(fromType, toType)) return true;
 
+    if (!(fromType instanceof PsiClassType) || !(toType instanceof PsiClassType)) return false;
     PsiClassType fromClassType = (PsiClassType)fromType;
     PsiClassType toClassType = (PsiClassType)toType;
 

From a55a6dd51b703f7c1ff9af3b1564274d2773a349 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sun, 3 Jun 2012 12:19:00 +0400
Subject: [PATCH 124/239] Simplify type check; remove stupid assertion

---
 .../impl/analysis/GenericsHighlightUtil.java       | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
index 1626942bd07b..d09db2c778af 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
@@ -657,20 +657,8 @@ public class GenericsHighlightUtil {
       return false;
     }
 
-    if (rType instanceof PsiDisjunctionType || lType instanceof PsiDisjunctionType) {
-      return false;
-    }
+    if (!(lType instanceof PsiClassType) || !(rType instanceof PsiClassType)) return false;
 
-    if (lType instanceof PsiCapturedWildcardType || rType instanceof PsiCapturedWildcardType) {
-      return false;
-    }
-
-    if (lType instanceof PsiWildcardType || rType instanceof PsiWildcardType) return false;
-
-    boolean isValidType = lType instanceof PsiClassType && rType instanceof PsiClassType;
-    if (!isValidType) {
-      LOG.error("Invalid types: rType =" + rType + ", lType=" + lType);
-    }
     PsiClassType.ClassResolveResult lResolveResult = ((PsiClassType)lType).resolveGenerics();
     PsiClassType.ClassResolveResult rResolveResult = ((PsiClassType)rType).resolveGenerics();
     PsiClass lClass = lResolveResult.getElement();

From bd86a3e9bd86f24ec9f85ded3c7ddb7748c8b5e5 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sun, 3 Jun 2012 13:16:24 +0400
Subject: [PATCH 125/239] Introduce method reference type; mute type check for
 it

---
 .../daemon/impl/analysis/HighlightUtil.java   |  6 +-
 .../intellij/psi/PsiMethodReferenceType.java  | 73 +++++++++++++++++
 .../src/com/intellij/psi/PsiTypeVisitor.java  |  6 +-
 .../intellij/psi/util/TypeConversionUtil.java |  4 +
 .../PsiMethodReferenceExpressionImpl.java     |  3 +-
 .../tree/java/ReplaceExpressionUtil.java      |  3 +-
 .../advHighlighting7/MethodReferences.java    |  4 +-
 .../daemon/LightAdvHighlightingJdk7Test.java  | 79 +++++--------------
 .../daemon/LightDaemonAnalyzerTestCase.java   | 11 ++-
 .../testFramework/LightPlatformTestCase.java  | 25 +++---
 10 files changed, 138 insertions(+), 76 deletions(-)
 create mode 100644 java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 9ed08267b807..8112653b44a9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -2610,6 +2610,10 @@ public class HighlightUtil {
 
   @Nullable
   public static HighlightInfo checkMethodReferencesFeature(final PsiMethodReferenceExpression expression) {
-    return checkFeature(expression, Feature.METHOD_REFERENCES);
+    final HighlightInfo info = checkFeature(expression, Feature.METHOD_REFERENCES);
+    if (info != null) return info;
+    // todo[r.sh] stub; remove after implementing support in TypeConversionUtil
+    final String message = "Method references type check is not yet implemented";
+    return HighlightInfo.createHighlightInfo(HighlightInfoType.WEAK_WARNING, expression, message);
   }
 }
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java
new file mode 100644
index 000000000000..306ea4edd58c
--- /dev/null
+++ b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi;
+
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A type which represents a function denoted by a method reference.
+ */
+public class PsiMethodReferenceType extends PsiType {
+  private final PsiMethodReferenceExpression myReference;
+
+  public PsiMethodReferenceType(@NotNull final PsiMethodReferenceExpression reference) {
+    super(PsiAnnotation.EMPTY_ARRAY);
+    myReference = reference;
+  }
+
+  @Override
+  public String getPresentableText() {
+    return "<method reference>";
+  }
+
+  @Override
+  public String getCanonicalText() {
+    return getPresentableText();
+  }
+
+  @Override
+  public String getInternalCanonicalText() {
+    return getPresentableText();
+  }
+
+  @Override
+  public boolean isValid() {
+    return myReference.isValid();
+  }
+
+  @Override
+  public boolean equalsToText(@NonNls final String text) {
+    return false;
+  }
+
+  @Override
+  public <A> A accept(@NotNull final PsiTypeVisitor<A> visitor) {
+    return visitor.visitMethodReferenceType(this);
+  }
+
+  @Override
+  public GlobalSearchScope getResolveScope() {
+    return null;
+  }
+
+  @NotNull
+  @Override
+  public PsiType[] getSuperTypes() {
+    return PsiType.EMPTY_ARRAY;
+  }
+}
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
index f0e9afd057f2..4f925f6d7fb4 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,4 +56,8 @@ public class PsiTypeVisitor<A> {
   public A visitDiamondType(PsiDiamondType diamondType) {
     return visitType(diamondType);
   }
+
+  public A visitMethodReferenceType(PsiMethodReferenceType methodReferenceType) {
+    return visitType(methodReferenceType);
+  }
 }
diff --git a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
index 39d9e684ca08..621eba1ef44d 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
@@ -637,10 +637,14 @@ public class TypeConversionUtil {
 
   public static boolean isAssignable(@NotNull PsiType left, @NotNull PsiType right, boolean allowUncheckedConversion) {
     if (left == right || left.equals(right)) return true;
+
     if (isNullType(right)) {
       return !(left instanceof PsiPrimitiveType) || isNullType(left);
     }
 
+    // todo[r.sh] implement
+    if (right instanceof PsiMethodReferenceType && left instanceof PsiClassType) return true;
+
     if (left instanceof PsiIntersectionType) {
       PsiType[] conjuncts = ((PsiIntersectionType)left).getConjuncts();
       for (PsiType conjunct : conjuncts) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
index 8bdb19b1d74c..0458abf01ab5 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
@@ -44,8 +44,7 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
 
   @Override
   public PsiType getType() {
-    // todo[r.sh]: implement
-    return null;
+    return new PsiMethodReferenceType(this);
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
index 0f89e33705df..2ce7b12f1303 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -157,6 +157,7 @@ public class ReplaceExpressionUtil {
              i == JavaElementType.ARRAY_ACCESS_EXPRESSION ||
              i == JavaElementType.ARRAY_INITIALIZER_EXPRESSION ||
              i == JavaElementType.JAVA_CODE_REFERENCE ||
+             i == JavaElementType.METHOD_REF_EXPRESSION ||
              i == JavaElementType.EMPTY_EXPRESSION) {
       return 14;
     }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MethodReferences.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MethodReferences.java
index 150cf88144fe..da593cca9961 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MethodReferences.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/MethodReferences.java
@@ -19,8 +19,10 @@ class C {
     void m();
   }
   void simplest() { }
+  void use(Simplest s) { }
 
   void test() {
-    <error descr="Incompatible types. Found: 'null', required: 'C.Simplest'">Simplest simplest = this::simplest;</error>
+    Simplest simplest = <weak_warning descr="Method references type check is not yet implemented">this::simplest</weak_warning>;
+    use(<weak_warning descr="Method references type check is not yet implemented">this::simplest</weak_warning>);
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
index ac076e6a6c0f..171650d299bd 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.daemon;
 
 import com.intellij.ExtensionPoints;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.codeInspection.LocalInspectionTool;
 import com.intellij.codeInspection.compiler.JavacQuirksInspection;
 import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection;
@@ -43,10 +44,16 @@ import java.util.List;
 public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   @NonNls static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/advHighlighting7";
 
-  private void doTest(boolean checkWarnings, boolean checkInfos) throws Exception {
+  private void doTest(boolean checkWarnings, boolean checkInfos, InspectionProfileEntry... tools) throws Exception {
+    for (InspectionProfileEntry tool : tools) { enableInspectionTool(tool); }
     doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, checkInfos);
   }
 
+  private void doTest(boolean checkWarnings, boolean checkWeakWarnings, boolean checkInfos, InspectionProfileEntry... tools) throws Exception {
+    for (InspectionProfileEntry tool : tools) { enableInspectionTool(tool); }
+    doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, checkWeakWarnings, checkInfos);
+  }
+
   @Override
   protected LocalInspectionTool[] configureLocalInspectionTools() {
     return new LocalInspectionTool[]{
@@ -92,46 +99,14 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   public void testDynamicallyAddIgnoredAnnotations() throws Exception {
     ExtensionPoint<EntryPoint> point = Extensions.getRootArea().getExtensionPoint(ExtensionPoints.DEAD_CODE_TOOL);
     EntryPoint extension = new EntryPoint() {
-      @NotNull
-      @Override
-      public String getDisplayName() {
-        return "duh";
-      }
-
-      @Override
-      public boolean isEntryPoint(RefElement refElement, PsiElement psiElement) {
-        return false;
-      }
-
-      @Override
-      public boolean isEntryPoint(PsiElement psiElement) {
-        return false;
-      }
-
-      @Override
-      public boolean isSelected() {
-        return false;
-      }
-
-      @Override
-      public void setSelected(boolean selected) {
-
-      }
-
-      @Override
-      public void readExternal(Element element) {
-
-      }
-
-      @Override
-      public void writeExternal(Element element) {
-
-      }
-
-      @Override
-      public String[] getIgnoreAnnotations() {
-        return new String[]{"MyAnno"};
-      }
+      @NotNull @Override public String getDisplayName() { return "duh"; }
+      @Override public boolean isEntryPoint(RefElement refElement, PsiElement psiElement) { return false; }
+      @Override public boolean isEntryPoint(PsiElement psiElement) { return false; }
+      @Override public boolean isSelected() { return false; }
+      @Override public void setSelected(boolean selected) { }
+      @Override public void readExternal(Element element) { }
+      @Override public void writeExternal(Element element) { }
+      @Override public String[] getIgnoreAnnotations() { return new String[]{"MyAnno"}; }
     };
 
     UnusedDeclarationInspection deadCodeInspection = new UnusedDeclarationInspection();
@@ -156,33 +131,19 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   public void testNumericLiterals() throws Exception { doTest(false, false); }
   public void testMultiCatch() throws Exception { doTest(false, false); }
   public void testTryWithResources() throws Exception { doTest(false, false); }
-
-  public void testTryWithResourcesWarn() throws Exception {
-    enableInspectionTool(new DefUseInspection());
-    doTest(true, false);
-  }
-
+  public void testTryWithResourcesWarn() throws Exception { doTest(true, false, new DefUseInspection()); }
   public void testSafeVarargsApplicability() throws Exception { doTest(true, false); }
   public void testUncheckedGenericsArrayCreation() throws Exception { doTest(true, false); }
   public void testPreciseRethrow() throws Exception { doTest(false, false); }
   public void testImprovedCatchAnalysis() throws Exception { doTest(true, false); }
   public void testJavacQuirks() throws Exception { doTest(true, false); }
   public void testPolymorphicTypeCast() throws Exception { doTest(true, false); }
-
-  public void testErasureClashConfusion() throws Exception {
-    enableInspectionTool(new UnusedDeclarationInspection());
-    doTest(true, false);
-  }
-
-  public void testUnused() throws Exception {
-    enableInspectionTool(new UnusedDeclarationInspection());
-    doTest(true, false);
-  }
-
+  public void testErasureClashConfusion() throws Exception { doTest(true, false, new UnusedDeclarationInspection()); }
+  public void testUnused() throws Exception { doTest(true, false, new UnusedDeclarationInspection()); }
   public void testSuperBound() throws Exception { doTest(false, false); }
   public void testExtendsBound() throws Exception { doTest(false, false); }
   public void testIDEA84533() throws Exception { doTest(false, false); }
   public void testClassLiteral() throws Exception { doTest(false, false); }
   public void testExtensionMethods() throws Exception { doTest(false, false); }
-  public void testMethodReferences() throws Exception { doTest(false, false); }
+  public void testMethodReferences() throws Exception { doTest(false, true, false); }
 }
diff --git a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
index 97c12f670b20..357134d2a19d 100644
--- a/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
@@ -79,10 +79,19 @@ public abstract class LightDaemonAnalyzerTestCase extends LightCodeInsightTestCa
     doTestConfiguredFile(checkWarnings, checkInfos, filePath);
   }
 
+  protected void doTest(@NonNls String filePath, boolean checkWarnings, boolean checkWeakWarnings, boolean checkInfos) throws Exception {
+    configureByFile(filePath);
+    doTestConfiguredFile(checkWarnings, checkWeakWarnings, checkInfos, filePath);
+  }
+
   protected void doTestConfiguredFile(boolean checkWarnings, boolean checkInfos, @Nullable String filePath) {
+    doTestConfiguredFile(checkWarnings, false, checkInfos, filePath);
+  }
+
+  protected void doTestConfiguredFile(boolean checkWarnings, boolean checkWeakWarnings, boolean checkInfos, @Nullable String filePath) {
     getJavaFacade().setAssertOnFileLoadingFilter(VirtualFileFilter.NONE);
 
-    ExpectedHighlightingData data = new ExpectedHighlightingData(getEditor().getDocument(), checkWarnings, checkInfos);
+    ExpectedHighlightingData data = new ExpectedHighlightingData(getEditor().getDocument(), checkWarnings, checkWeakWarnings, checkInfos);
     checkHighlighting(data, composeLocalPath(filePath));
   }
 
diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
index 83d230c03b29..5bca645a118c 100644
--- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
@@ -22,12 +22,10 @@ import com.intellij.codeInsight.daemon.HighlightDisplayKey;
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.codeInsight.hint.HintManagerImpl;
 import com.intellij.codeInsight.lookup.LookupManager;
+import com.intellij.codeInspection.GlobalInspectionTool;
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.codeInspection.LocalInspectionTool;
-import com.intellij.codeInspection.ex.InspectionProfileImpl;
-import com.intellij.codeInspection.ex.InspectionTool;
-import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
-import com.intellij.codeInspection.ex.ToolsImpl;
+import com.intellij.codeInspection.ex.*;
 import com.intellij.ide.highlighter.ProjectFileType;
 import com.intellij.ide.startup.StartupManagerEx;
 import com.intellij.ide.startup.impl.StartupManagerImpl;
@@ -423,12 +421,19 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
     }
   }
 
-  protected void enableInspectionTool(LocalInspectionTool tool){
-    enableInspectionTool(new LocalInspectionToolWrapper(tool));
-  }
-
-  protected void enableInspectionTool(InspectionTool tool){
-    enableInspectionTool(myAvailableInspectionTools, tool);
+  protected void enableInspectionTool(@NotNull InspectionProfileEntry tool) {
+    if (tool instanceof InspectionTool) {
+      enableInspectionTool(myAvailableInspectionTools, (InspectionTool)tool);
+    }
+    else if (tool instanceof LocalInspectionTool) {
+      enableInspectionTool(myAvailableInspectionTools, new LocalInspectionToolWrapper((LocalInspectionTool)tool));
+    }
+    else if (tool instanceof GlobalInspectionTool) {
+      enableInspectionTool(myAvailableInspectionTools, new GlobalInspectionToolWrapper((GlobalInspectionTool)tool));
+    }
+    else {
+      throw new IllegalArgumentException("Unexpected inspection type: " + tool);
+    }
   }
 
   private static void enableInspectionTool(final Map<String, InspectionTool> availableLocalTools, InspectionTool wrapper) {

From bf3b222335792ab306f64da762daee860f841112 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sun, 3 Jun 2012 13:31:11 +0400
Subject: [PATCH 126/239] Keyword completion in method references; cleanup

---
 .../completion/Java18CompletionData.java      | 56 +++++++++++--------
 .../completion/JavaCompletionData.java        | 32 +++++++----
 .../completion/keywords/newInMethodRefs.java  | 23 ++++++++
 .../keywords/newInMethodRefs_after.java       | 23 ++++++++
 .../completion/KeywordCompletionTest.java     |  1 +
 5 files changed, 100 insertions(+), 35 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/completion/keywords/newInMethodRefs.java
 create mode 100644 java/java-tests/testData/codeInsight/completion/keywords/newInMethodRefs_after.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/Java18CompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/Java18CompletionData.java
index d627fc535b0b..a113ec229635 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/Java18CompletionData.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/Java18CompletionData.java
@@ -15,32 +15,42 @@
  */
 package com.intellij.codeInsight.completion;
 
-import com.intellij.psi.PsiKeyword;
-import com.intellij.psi.PsiMethod;
-import com.intellij.psi.PsiParameterList;
-import com.intellij.psi.filters.AndFilter;
-import com.intellij.psi.filters.ClassFilter;
-import com.intellij.psi.filters.ElementFilter;
-import com.intellij.psi.filters.TextFilter;
-import com.intellij.psi.filters.classes.InterfaceFilter;
-import com.intellij.psi.filters.position.LeftNeighbour;
-import com.intellij.psi.filters.position.ParentElementFilter;
+import com.intellij.codeInsight.TailType;
+import com.intellij.patterns.PsiElementPattern;
+import com.intellij.psi.*;
+import com.intellij.psi.util.PsiTreeUtil;
+
+import static com.intellij.patterns.PsiJavaPatterns.psiClass;
+import static com.intellij.patterns.PsiJavaPatterns.psiElement;
 
 public class Java18CompletionData extends Java15CompletionData {
-  @Override
-  protected void initVariantsInMethodScope() {
-    super.initVariantsInMethodScope();
+  private static final PsiElementPattern<PsiElement, ?> AFTER_PARENTH_IN_EXT_METHOD = psiElement()
+    .afterLeaf(psiElement(JavaTokenType.RPARENTH).withParent(PsiParameterList.class))
+    .withSuperParent(3, psiClass().isInterface().nonAnnotationType());
 
-    {
-      // in extension method
-      ElementFilter position = new AndFilter(
-        new LeftNeighbour(new AndFilter(
-          new TextFilter(")"),
-          new ParentElementFilter(new ClassFilter(PsiParameterList.class)))),
-        new ParentElementFilter(new InterfaceFilter(), 3));
-      CompletionVariant variant = new CompletionVariant(PsiMethod.class, position);
-      variant.addCompletion(PsiKeyword.DEFAULT);
-      registerVariant(variant);
+  private static final PsiElementPattern<PsiElement, ?> AFTER_DOUBLE_COLON = psiElement()
+    .afterLeaf(psiElement(JavaTokenType.DOUBLE_COLON));
+
+  @Override
+  public void fillCompletions(final CompletionParameters parameters, final CompletionResultSet result) {
+    final PsiElement position = parameters.getPosition();
+
+    if (!inComment(position)) {
+      if (AFTER_PARENTH_IN_EXT_METHOD.accepts(position)) {
+        result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.DEFAULT), TailType.SPACE));
+        return;
+      }
+
+      if (AFTER_DOUBLE_COLON.accepts(position)) {
+        result.addElement(new OverrideableSpace(createKeyword(position, PsiKeyword.NEW), TailType.SEMICOLON));
+        return;
+      }
     }
+
+    super.fillCompletions(parameters, result);
+  }
+
+  private static boolean inComment(final PsiElement position) {
+    return PsiTreeUtil.getParentOfType(position, PsiComment.class, false) != null;
   }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
index 40ee3e7c8b89..c73f1185b753 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
@@ -22,7 +22,9 @@ import com.intellij.codeInsight.completion.util.ParenthesesInsertHandler;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupItem;
 import com.intellij.codeInsight.lookup.TailTypeDecorator;
-import com.intellij.patterns.*;
+import com.intellij.patterns.ElementPattern;
+import com.intellij.patterns.PsiElementPattern;
+import com.intellij.patterns.PsiJavaElementPattern;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
 import com.intellij.psi.filters.*;
@@ -44,10 +46,11 @@ import org.jetbrains.annotations.NonNls;
 import static com.intellij.patterns.PsiJavaPatterns.*;
 import static com.intellij.patterns.StandardPatterns.not;
 
-public class JavaCompletionData extends JavaAwareCompletionData{
+public class JavaCompletionData extends JavaAwareCompletionData {
+  private static final @NonNls String[] BLOCK_FINALIZERS = {"{", "}", ";", ":", "else"};
 
-  private static final @NonNls String[] ourBlockFinalizers = {"{", "}", ";", ":", "else"};
   private static final PsiElementPattern<PsiElement,?> AFTER_DOT = psiElement().afterLeaf(".");
+
   public static final LeftNeighbour INSTANCEOF_PLACE = new LeftNeighbour(new OrFilter(
       new ReferenceOnFilter(new ClassFilter(PsiVariable.class)),
       new TextFilter(PsiKeyword.THIS),
@@ -57,16 +60,19 @@ public class JavaCompletionData extends JavaAwareCompletionData{
           new ParentElementFilter(new ClassFilter(PsiExpression.class)),
           new ClassFilter(PsiExpression.class))))),
       new AndFilter(new TextFilter("]"), new ParentElementFilter(new ClassFilter(PsiArrayAccessExpression.class)))));
+
   public static final PsiJavaElementPattern.Capture<PsiElement> VARIABLE_AFTER_FINAL =
-    PsiJavaPatterns.psiElement().afterLeaf(PsiKeyword.FINAL).inside(PsiDeclarationStatement.class);
+    psiElement().afterLeaf(PsiKeyword.FINAL).inside(PsiDeclarationStatement.class);
+
   public static final LeftNeighbour AFTER_TRY_BLOCK = new LeftNeighbour(new AndFilter(
     new TextFilter("}"),
     new ParentElementFilter(new AndFilter(
       new LeftNeighbour(new TextFilter(PsiKeyword.TRY)),
       new ParentElementFilter(new ClassFilter(PsiTryStatement.class)))
     )));
+
   public static final PsiJavaElementPattern.Capture<PsiElement> INSIDE_PARAMETER_LIST =
-    PsiJavaPatterns.psiElement().withParent(
+    psiElement().withParent(
       psiElement(PsiJavaCodeReferenceElement.class).insideStarting(
         psiElement().withTreeParent(
           psiElement(PsiParameterList.class).andNot(psiElement(PsiAnnotationParameterList.class)))));
@@ -86,7 +92,7 @@ public class JavaCompletionData extends JavaAwareCompletionData{
       new LeftNeighbour(
           new OrFilter(
               new AndFilter (
-                  new TextFilter(ourBlockFinalizers),
+                  new TextFilter(BLOCK_FINALIZERS),
                   new NotFilter (
                     new SuperParentFilter(new ClassFilter(PsiAnnotation.class))
                   )
@@ -109,7 +115,8 @@ public class JavaCompletionData extends JavaAwareCompletionData{
     START_OF_CODE_FRAGMENT
   );
 
-  static final ElementPattern<PsiElement> START_SWITCH = psiElement().afterLeaf(psiElement().withText("{").withParents(PsiCodeBlock.class, PsiSwitchStatement.class));
+  static final ElementPattern<PsiElement> START_SWITCH =
+    psiElement().afterLeaf(psiElement().withText("{").withParents(PsiCodeBlock.class, PsiSwitchStatement.class));
 
   private static final ElementPattern<PsiElement> SUPER_OR_THIS_PATTERN =
     and(JavaSmartCompletionContributor.INSIDE_EXPRESSION,
@@ -117,7 +124,6 @@ public class JavaCompletionData extends JavaAwareCompletionData{
         not(psiElement().afterLeaf(psiElement().withText(".").afterLeaf(PsiKeyword.THIS, PsiKeyword.SUPER))),
         not(START_SWITCH));
 
-
   public static final AndFilter CLASS_START = new AndFilter(
     new OrFilter(
       END_OF_BLOCK,
@@ -135,14 +141,16 @@ public class JavaCompletionData extends JavaAwareCompletionData{
     PsiKeyword.CHAR, PsiKeyword.BYTE
   };
 
-  final static ElementFilter CLASS_BODY = new OrFilter(
+  private static final ElementFilter CLASS_BODY = new OrFilter(
     new AfterElementFilter(new TextFilter("{")),
     new ScopeFilter(new ClassFilter(JspClassLevelDeclarationStatement.class)));
+
   public static final ElementPattern<PsiElement> START_FOR =
     psiElement().afterLeaf(psiElement().withText("(").afterLeaf("for")).withParents(PsiJavaCodeReferenceElement.class,
                                                                                     PsiExpressionStatement.class, PsiForStatement.class);
   private static final PsiJavaElementPattern.Capture<PsiElement> CLASS_REFERENCE =
     psiElement().withParent(psiReferenceExpression().referencing(psiClass()));
+
   public static final ElementPattern<PsiElement> EXPR_KEYWORDS = and(
     psiElement().withParent(psiElement(PsiReferenceExpression.class).withParent(
       not(
@@ -312,7 +320,7 @@ public class JavaCompletionData extends JavaAwareCompletionData{
     }
   }
 
-  protected void initVariantsInMethodScope() {
+  private void initVariantsInMethodScope() {
 // Completion for classes in method throws section
 // position
     {
@@ -653,7 +661,7 @@ public class JavaCompletionData extends JavaAwareCompletionData{
     return false;
   }
 
-  private static LookupElement createKeyword(PsiElement position, String keyword) {
+  protected static LookupElement createKeyword(PsiElement position, String keyword) {
     return BasicExpressionCompletionContributor.createKeywordLookupItem(position, keyword);
   }
 
@@ -694,7 +702,7 @@ public class JavaCompletionData extends JavaAwareCompletionData{
     return false;
   }
 
-  private static class OverrideableSpace extends TailTypeDecorator<LookupElement> {
+  protected static class OverrideableSpace extends TailTypeDecorator<LookupElement> {
     private final TailType myTail;
 
     public OverrideableSpace(LookupElement keyword, TailType tail) {
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/newInMethodRefs.java b/java/java-tests/testData/codeInsight/completion/keywords/newInMethodRefs.java
new file mode 100644
index 000000000000..1f42d81b2a69
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/newInMethodRefs.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Foo {
+  interface I { Object m(); }
+
+  void test() {
+    I i = Foo::n<caret>
+  }
+}
diff --git a/java/java-tests/testData/codeInsight/completion/keywords/newInMethodRefs_after.java b/java/java-tests/testData/codeInsight/completion/keywords/newInMethodRefs_after.java
new file mode 100644
index 000000000000..dfc740a4ea3d
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/keywords/newInMethodRefs_after.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Foo {
+  interface I { Object m(); }
+
+  void test() {
+    I i = Foo::new;<caret>
+  }
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java
index a8d77fc098e2..7e407253dab0 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java
@@ -89,6 +89,7 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
   public void testDefaultInExtMethod() throws Exception { doTest(false); }
   public void testNullInMethodCall() throws Exception { doTest(false); }
   public void testNullInMethodCall2() throws Exception { doTest(false); }
+  public void testNewInMethodRefs() throws Exception { doTest(false); }
 
   public void testTryInExpression() throws Exception {
     configureByFile(BASE_PATH + "/" + getTestName(true) + ".java");

From 53584d036fd809c1f2158c0dba9cddae7d0fc9d2 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 11:07:31 +0200
Subject: [PATCH 127/239] correctly refresh vfs in vcs tests

---
 .../testFramework/AbstractVcsTestCase.java         |  9 +++++++++
 .../org/zmlx/hg4idea/test/HgDiffProviderTest.java  |  4 ++--
 .../org/zmlx/hg4idea/test/HgHistoryTest.java       |  3 +--
 .../testSrc/org/zmlx/hg4idea/test/HgTest.java      |  4 +---
 .../org/jetbrains/idea/svn/SvnDeleteTest.java      |  3 +--
 .../org/jetbrains/idea/svn/SvnRenameTest.java      | 14 ++++++++------
 .../org/jetbrains/idea/svn16/SvnDeleteTest.java    |  3 +--
 .../org/jetbrains/idea/svn16/SvnRenameTest.java    | 14 ++++++++------
 8 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/platform/testFramework/src/com/intellij/testFramework/AbstractVcsTestCase.java b/platform/testFramework/src/com/intellij/testFramework/AbstractVcsTestCase.java
index c5327820ff8f..15103cb5d6d8 100644
--- a/platform/testFramework/src/com/intellij/testFramework/AbstractVcsTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/AbstractVcsTestCase.java
@@ -88,6 +88,15 @@ public abstract class AbstractVcsTestCase {
     return result;
   }
 
+  protected static void refreshVfs() {
+    UsefulTestCase.edt(new Runnable() {
+      @Override
+      public void run() {
+        LocalFileSystem.getInstance().refresh(false);
+      }
+    });
+  }
+
   protected void initProject(final File clientRoot, String testName) throws Exception {
     String name = getClass().getName() + "." + testName;
     final TestFixtureBuilder<IdeaProjectTestFixture> testFixtureBuilder = IdeaTestFixtureFactory.getFixtureFactory().createFixtureBuilder(name);
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDiffProviderTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDiffProviderTest.java
index ce6d34e65cc7..587d2d4d15b1 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDiffProviderTest.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgDiffProviderTest.java
@@ -41,7 +41,7 @@ public class HgDiffProviderTest extends HgSingleUserTest {
     runHgOnProjectRepo("rename", AFILE, BFILE);
     //don't commit 
     
-    LocalFileSystem.getInstance().refresh(false);
+    refreshVfs();
     ChangeListManager.getInstance(myProject).ensureUpToDate(false);
     
     HgDiffProvider diffProvider = new HgDiffProvider(myProject);
@@ -67,7 +67,7 @@ public class HgDiffProviderTest extends HgSingleUserTest {
 
     
     
-    LocalFileSystem.getInstance().refresh(false);
+    refreshVfs();
     //ChangeListManager.getInstance(myProject).ensureUpToDate(false);
     
     HgDiffProvider diffProvider = new HgDiffProvider(myProject);
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgHistoryTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgHistoryTest.java
index 341a4caa7573..e170ab695b7d 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgHistoryTest.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgHistoryTest.java
@@ -4,7 +4,6 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.history.VcsFileRevision;
 import com.intellij.openapi.vcs.history.VcsHistorySession;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.vcsUtil.VcsUtil;
 import org.testng.annotations.Test;
 import org.zmlx.hg4idea.HgVcs;
@@ -98,7 +97,7 @@ public class HgHistoryTest extends HgSingleUserTest {
     runHgOnProjectRepo("rename", AFILE, BFILE);
     //don't commit 
 
-    LocalFileSystem.getInstance().refresh(false);
+    refreshVfs();
     ChangeListManager.getInstance(myProject).ensureUpToDate(false);
     
     final VcsHistorySession session = getHistorySession(BFILE);
diff --git a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java
index e9e903ddc874..07b1bfb14974 100644
--- a/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java
+++ b/plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgTest.java
@@ -18,10 +18,8 @@ import com.intellij.openapi.vcs.AbstractVcsHelper;
 import com.intellij.openapi.vcs.VcsConfiguration;
 import com.intellij.openapi.vcs.VcsShowConfirmationOption;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.AbstractVcsTestCase;
-import com.intellij.testFramework.TestClientRunner;
 import com.intellij.ui.GuiUtils;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsUtil;
@@ -176,7 +174,7 @@ public abstract class HgTest extends AbstractVcsTestCase {
   protected VirtualFile makeFile(File file) throws IOException {
     file.createNewFile();
     VcsDirtyScopeManager.getInstance(myProject).fileDirty(myWorkingCopyDir);
-    LocalFileSystem.getInstance().refresh(false);
+    refreshVfs();
     return VcsUtil.getVirtualFile(file);
   }
 
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnDeleteTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnDeleteTest.java
index 76766634ab4d..04ece0e25b7d 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnDeleteTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnDeleteTest.java
@@ -6,7 +6,6 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.idea.svn.integrate.AlienDirtyScope;
 import org.junit.Assert;
@@ -34,7 +33,7 @@ public class SvnDeleteTest extends SvnTestCase {
     deleteFileInCommand(dir);
     verify(runSvn("status"), "D child", "D child" + File.separatorChar + "a.txt");
 
-    LocalFileSystem.getInstance().refresh(false);
+    refreshVfs();
 
     final AlienDirtyScope dirtyScope = new AlienDirtyScope();
     dirtyScope.addDir(new FilePathImpl(myWorkingCopyDir));
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java
index b88b79e333b1..83b0379d99e3 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnRenameTest.java
@@ -9,7 +9,6 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.rollback.RollbackProgressListener;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NonNls;
 import org.junit.Assert;
@@ -17,7 +16,10 @@ import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author yole
@@ -81,7 +83,7 @@ public class SvnRenameTest extends SvnTestCase {
     final ProcessOutput result = runSvn("status");
     verify(result, "D child", "D child" + File.separatorChar + "grandChild", "D child" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt", "D child" + File.separatorChar + "a.txt", "A + childnew");
 
-    LocalFileSystem.getInstance().refresh(false);   // wait for end of refresh operations initiated from SvnFileSystemListener
+    refreshVfs();   // wait for end of refresh operations initiated from SvnFileSystemListener
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
     changeListManager.ensureUpToDate(false);
     List<Change> changes = new ArrayList<Change>(changeListManager.getDefaultChangeList().getChanges());
@@ -163,7 +165,7 @@ public class SvnRenameTest extends SvnTestCase {
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
 
     moveFileInCommand(grandChild, myWorkingCopyDir);
-    LocalFileSystem.getInstance().refresh(false);   // wait for end of refresh operations initiated from SvnFileSystemListener
+    refreshVfs();   // wait for end of refresh operations initiated from SvnFileSystemListener
     changeListManager.ensureUpToDate(false);
     final List<Change> changes = new ArrayList<Change>(changeListManager.getDefaultChangeList().getChanges());
     Assert.assertEquals(listToString(changes), 2, changes.size());
@@ -199,7 +201,7 @@ public class SvnRenameTest extends SvnTestCase {
     Assert.assertTrue(new File(newChildPath, "u.txt").exists());
     Assert.assertFalse(new File(childPath, "u.txt").exists());
 
-    LocalFileSystem.getInstance().refresh(false);
+    refreshVfs();
     changeListManager.ensureUpToDate(false);
     final List<Change> changes = new ArrayList<Change>();
     changes.add(ChangeListManager.getInstance(myProject).getChange(myWorkingCopyDir.findChild("newchild").findChild("a.txt")));
@@ -235,7 +237,7 @@ public class SvnRenameTest extends SvnTestCase {
                  "D child", "D child" + File.separatorChar + "a.txt", "D child" + File.separatorChar + "grandChild", "D child" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt", "D + newchild" + File.separatorChar + "a.txt");
 
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
-    LocalFileSystem.getInstance().refresh(false);   // wait for end of refresh operations initiated from SvnFileSystemListener
+    refreshVfs();   // wait for end of refresh operations initiated from SvnFileSystemListener
     changeListManager.ensureUpToDate(false);
     final List<Change> changes = new ArrayList<Change>(changeListManager.getDefaultChangeList().getChanges());
     final List<VcsException> list = SvnVcs.getInstance(myProject).getCheckinEnvironment().commit(changes, "test");
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnDeleteTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnDeleteTest.java
index 53922a7e1664..2f05fe2163b0 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnDeleteTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnDeleteTest.java
@@ -6,7 +6,6 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.LocalChangeList;
 import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.idea.svn.integrate.AlienDirtyScope;
 import org.junit.Assert;
@@ -34,7 +33,7 @@ public class SvnDeleteTest extends SvnTestCase {
     deleteFileInCommand(dir);
     verify(runSvn("status"), "D child", "D child" + File.separatorChar + "a.txt");
 
-    LocalFileSystem.getInstance().refresh(false);
+    refreshVfs();
 
     final AlienDirtyScope dirtyScope = new AlienDirtyScope();
     dirtyScope.addDir(new FilePathImpl(myWorkingCopyDir));
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRenameTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRenameTest.java
index 8958a248e79e..52addeb4bb65 100644
--- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRenameTest.java
+++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnRenameTest.java
@@ -9,7 +9,6 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.rollback.RollbackProgressListener;
-import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.idea.svn.SvnVcs;
@@ -18,7 +17,10 @@ import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * @author yole
@@ -82,7 +84,7 @@ public class SvnRenameTest extends SvnTestCase {
     final ProcessOutput result = runSvn("status");
     verify(result, "D child", "D child" + File.separatorChar + "grandChild", "D child" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt", "D child" + File.separatorChar + "a.txt", "A + childnew");
 
-    LocalFileSystem.getInstance().refresh(false);   // wait for end of refresh operations initiated from SvnFileSystemListener
+    refreshVfs();   // wait for end of refresh operations initiated from SvnFileSystemListener
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
     changeListManager.ensureUpToDate(false);
     List<Change> changes = new ArrayList<Change>(changeListManager.getDefaultChangeList().getChanges());
@@ -159,7 +161,7 @@ public class SvnRenameTest extends SvnTestCase {
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
 
     moveFileInCommand(grandChild, myWorkingCopyDir);
-    LocalFileSystem.getInstance().refresh(false);   // wait for end of refresh operations initiated from SvnFileSystemListener
+    refreshVfs();   // wait for end of refresh operations initiated from SvnFileSystemListener
     changeListManager.ensureUpToDate(false);
     final List<Change> changes = new ArrayList<Change>(changeListManager.getDefaultChangeList().getChanges());
     Assert.assertEquals(listToString(changes), 2, changes.size());
@@ -195,7 +197,7 @@ public class SvnRenameTest extends SvnTestCase {
     Assert.assertTrue(new File(newChildPath, "u.txt").exists());
     Assert.assertFalse(new File(childPath, "u.txt").exists());
 
-    LocalFileSystem.getInstance().refresh(false);
+    refreshVfs();
     changeListManager.ensureUpToDate(false);
     final List<Change> changes = new ArrayList<Change>();
     changes.add(ChangeListManager.getInstance(myProject).getChange(myWorkingCopyDir.findChild("newchild").findChild("a.txt")));
@@ -231,7 +233,7 @@ public class SvnRenameTest extends SvnTestCase {
                  "D child", "D child" + File.separatorChar + "a.txt", "D child" + File.separatorChar + "grandChild", "D child" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt", "D + newchild" + File.separatorChar + "a.txt");
 
     final ChangeListManager changeListManager = ChangeListManager.getInstance(myProject);
-    LocalFileSystem.getInstance().refresh(false);   // wait for end of refresh operations initiated from SvnFileSystemListener
+    refreshVfs();   // wait for end of refresh operations initiated from SvnFileSystemListener
     changeListManager.ensureUpToDate(false);
     final List<Change> changes = new ArrayList<Change>(changeListManager.getDefaultChangeList().getChanges());
     final List<VcsException> list = SvnVcs.getInstance(myProject).getCheckinEnvironment().commit(changes, "test");

From 1206e85070cc8391cb66be406e115fe6924b550f Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 1 Jun 2012 17:47:21 +0400
Subject: [PATCH 128/239] cleanup

---
 platform/util/src/com/intellij/util/io/StringRef.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/StringRef.java b/platform/util/src/com/intellij/util/io/StringRef.java
index fc60df5bb9e1..2e4679cd4ad1 100644
--- a/platform/util/src/com/intellij/util/io/StringRef.java
+++ b/platform/util/src/com/intellij/util/io/StringRef.java
@@ -43,9 +43,10 @@ public class StringRef {
   }
 
   public String getString() {
+    String name = this.name;
     if (name == null) {
       try {
-        name = store.valueOf(id);
+        this.name = name = store.valueOf(id);
       }
       catch (IOException e) {
         store.markCorrupted();
@@ -58,7 +59,7 @@ public class StringRef {
   public void writeTo(DataOutput out, PersistentStringEnumerator store) throws IOException {
     int nameId = getId(store);
     out.writeByte(nameId & 0xFF);
-    DataInputOutputUtil.writeINT(out, (nameId >> 8));
+    DataInputOutputUtil.writeINT(out, nameId >> 8);
   }
 
   public int getId(PersistentStringEnumerator store) {

From 0316e264fcc7411ef68ad6aaa3e7c70ac4c13f04 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 4 Jun 2012 13:02:43 +0400
Subject: [PATCH 129/239] optimization: getName()

---
 .../psi/impl/source/PsiClassImpl.java         | 56 ++++++++++++-------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
index 6835a032c9e7..7dd47c5e4fdd 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
@@ -55,9 +55,9 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
 
   private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
 
-  private PsiMethod myValuesMethod = null;
-  private PsiMethod myValueOfMethod = null;
-  private volatile String myCachedForLongName = null;
+  private volatile PsiMethod myValuesMethod;
+  private volatile PsiMethod myValueOfMethod;
+  private volatile String myCachedName;
   @NonNls private static final String VALUES_METHOD = "values";
   @NonNls private static final String VALUE_OF_METHOD = "valueOf";
 
@@ -81,7 +81,9 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
 
   private void dropCaches() {
     myInnersCache.dropCaches();
-    myCachedForLongName = null;
+    myCachedName = null;
+    myValueOfMethod = null;
+    myValuesMethod = null;
   }
 
   @Override
@@ -147,13 +149,18 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
 
   @Override
   public String getName() {
+    String name = myCachedName;
+    if (name != null) return name;
     final PsiClassStub stub = getStub();
-    if (stub != null) {
-      return stub.getName();
+    if (stub == null) {
+      PsiIdentifier identifier = getNameIdentifier();
+      name = identifier == null ? null : identifier.getText();
     }
-
-    PsiIdentifier identifier = getNameIdentifier();
-    return identifier != null ? identifier.getText() : null;
+    else {
+      name = stub.getName();
+    }
+    myCachedName = name;
+    return name;
   }
 
   @Override
@@ -470,24 +477,16 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
       String name = getName();
       if (name != null) {
         try {
-          if (myValuesMethod == null || myValueOfMethod == null || !name.equals(myCachedForLongName)) {
-            myCachedForLongName = name;
-            PsiElementFactory elementFactory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
-            final PsiMethod valuesMethod = elementFactory.createMethodFromText("public static " + name + "[] values() {}", this);
-            myValuesMethod = new LightMethod(getManager(), valuesMethod, this);
-            final PsiMethod valueOfMethod = elementFactory.createMethodFromText("public static " + name + " valueOf(String name) throws IllegalArgumentException {}", this);
-            myValueOfMethod = new LightMethod(getManager(), valueOfMethod, this);
-          }
           final NameHint nameHint = processor.getHint(NameHint.KEY);
           final ElementClassHint classHint = processor.getHint(ElementClassHint.KEY);
           if (nameHint == null || VALUES_METHOD.equals(nameHint.getName(state))) {
             if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.METHOD)) {
-              if (!processor.execute(myValuesMethod, ResolveState.initial())) return false;
+              if (!processor.execute(getValuesMethod(), ResolveState.initial())) return false;
             }
           }
           if (nameHint == null || VALUE_OF_METHOD.equals(nameHint.getName(state))) {
             if (classHint == null || classHint.shouldProcess(ElementClassHint.DeclarationKind.METHOD)) {
-              if (!processor.execute(myValueOfMethod, ResolveState.initial())) return false;
+              if (!processor.execute(getValueOfMethod(), ResolveState.initial())) return false;
             }
           }
         }
@@ -687,6 +686,23 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
 
   @Nullable
   public PsiMethod getValuesMethod() {
-    return myValuesMethod;
+    PsiMethod method = myValuesMethod;
+    if (method == null && isEnum() && getName() != null) {
+      PsiElementFactory elementFactory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
+      final PsiMethod valuesMethod = elementFactory.createMethodFromText("public static " + getName() + "[] values() {}", this);
+      myValuesMethod = method = new LightMethod(getManager(), valuesMethod, this);
+    }
+    return method;
+  }
+
+  @Nullable
+  public PsiMethod getValueOfMethod() {
+    PsiMethod method = myValueOfMethod;
+    if (method == null && isEnum() && getName() != null) {
+      PsiElementFactory elementFactory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
+      final PsiMethod valuesMethod = elementFactory.createMethodFromText("public static " + getName() + " valueOf(String name) throws IllegalArgumentException {}", this);
+      myValueOfMethod = method = new LightMethod(getManager(), valuesMethod, this);
+    }
+    return method;
   }
 }

From faf7fc72894fd2f739a652a273c1c63d9f534698 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 4 Jun 2012 13:03:07 +0400
Subject: [PATCH 130/239] IDEA-86896 Magic constant doesn't understand bit flag
 constants

---
 .../MagicConstantInspection.java              | 31 +++++++++----------
 .../inspection/magic/simple/src/X.java        | 12 +++++++
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java
index 8fb41e8a9a47..0d5f66a5964a 100644
--- a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java
@@ -196,10 +196,9 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
 
   private static void attachJdkAnnotations(Sdk jdk) {
     LocalFileSystem lfs = LocalFileSystem.getInstance();
-    VirtualFile root = null;
-    if (root == null) { // community idea under idea
-      root = lfs.findFileByPath(FileUtil.toSystemIndependentName(PathManager.getHomePath()) + "/java/jdkAnnotations");
-    }
+    // community idea under idea
+    VirtualFile root = lfs.findFileByPath(FileUtil.toSystemIndependentName(PathManager.getHomePath()) + "/java/jdkAnnotations");
+
     if (root == null) {  // idea under idea
       root = lfs.findFileByPath(FileUtil.toSystemIndependentName(PathManager.getHomePath()) + "/community/java/jdkAnnotations");
     }
@@ -252,7 +251,7 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
     final PsiAnnotationMemberValue[] values;
     final boolean canBeOred;
 
-    private AllowedValues(PsiAnnotationMemberValue[] values, boolean canBeOred) {
+    private AllowedValues(@NotNull PsiAnnotationMemberValue[] values, boolean canBeOred) {
       this.values = values;
       this.canBeOred = canBeOred;
     }
@@ -304,8 +303,8 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
   }
 
   private static AllowedValues getAllowedValuesFromMagic(@NotNull PsiModifierListOwner element,
-                                                         @NotNull PsiType type, PsiAnnotation magic) {
-    if (magic == null) return null;
+                                                         @NotNull PsiType type,
+                                                         @NotNull PsiAnnotation magic) {
     PsiAnnotationMemberValue[] allowedValues;
     final boolean canBeOred;
     if (TypeConversionUtil.getTypeRank(type) <= TypeConversionUtil.LONG_RANK) {
@@ -345,7 +344,7 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
     return new AllowedValues(values, ored);
   }
 
-  private static PsiAnnotationMemberValue[] readFromClass(@NonNls String attributeName, @NotNull PsiAnnotation magic, PsiType type) {
+  private static PsiAnnotationMemberValue[] readFromClass(@NonNls @NotNull String attributeName, @NotNull PsiAnnotation magic, @NotNull PsiType type) {
     PsiAnnotationMemberValue fromClassAttr = magic.findAttributeValue(attributeName);
     PsiType fromClassType = fromClassAttr instanceof PsiClassObjectAccessExpression ? ((PsiClassObjectAccessExpression)fromClassAttr).getOperand().getType() : null;
     PsiClass fromClass = fromClassType instanceof PsiClassType ? ((PsiClassType)fromClassType).resolve() : null;
@@ -386,7 +385,6 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
       if (values != null) return values;
     }
 
-
     return parseBeanInfo(element);
   }
 
@@ -467,12 +465,12 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
     return new AllowedValues(array, false);
   }
 
-  private static PsiType getType(PsiModifierListOwner element) {
+  private static PsiType getType(@NotNull PsiModifierListOwner element) {
     return element instanceof PsiVariable ? ((PsiVariable)element).getType() : element instanceof PsiMethod ? ((PsiMethod)element).getReturnType() : null;
   }
 
   private static void checkMagicParameterArgument(@NotNull PsiParameter parameter,
-                                                  PsiExpression argument,
+                                                  @NotNull PsiExpression argument,
                                                   @NotNull AllowedValues allowedValues,
                                                   @NotNull ProblemsHolder holder) {
     final PsiManager manager = PsiManager.getInstance(holder.getProject());
@@ -482,7 +480,7 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
     }
   }
 
-  private static void registerProblem(PsiExpression argument, AllowedValues allowedValues, ProblemsHolder holder) {
+  private static void registerProblem(@NotNull PsiExpression argument, @NotNull AllowedValues allowedValues, @NotNull ProblemsHolder holder) {
     String values = StringUtil.join(allowedValues.values,
                                     new Function<PsiAnnotationMemberValue, String>() {
                                       @Override
@@ -509,7 +507,6 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
     return processValuesFlownTo(argument, scope, new Processor<PsiExpression>() {
       @Override
       public boolean process(PsiExpression expression) {
-        if (false & !PsiTreeUtil.isAncestor(scope, expression, false)) return true;
         return isGoodExpression(expression, allowedValues, scope, manager);
       }
     });
@@ -538,7 +535,7 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
       if (same(expression, mOne, manager)) return true;
       if (expression instanceof PsiPolyadicExpression) {
         IElementType tokenType = ((PsiPolyadicExpression)expression).getOperationTokenType();
-        if (JavaTokenType.OR.equals(tokenType) || JavaTokenType.AND.equals(tokenType)) {
+        if (JavaTokenType.OR.equals(tokenType) || JavaTokenType.AND.equals(tokenType) || JavaTokenType.PLUS.equals(tokenType)) {
           for (PsiExpression operand : ((PsiPolyadicExpression)expression).getOperands()) {
             if (!isAllowed(scope, operand, allowedValues, manager)) return false;
           }
@@ -568,8 +565,8 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
     return PsiType.NULL.equals(expression.getType());
   }
 
-  private static Key<Map<String, PsiExpression>> LITERAL_EXPRESSION_CACHE = Key.create("LITERAL_EXPRESSION_CACHE");
-  private static PsiExpression getLiteralExpression(PsiExpression context, PsiManager manager, @NotNull String text) {
+  private static final Key<Map<String, PsiExpression>> LITERAL_EXPRESSION_CACHE = Key.create("LITERAL_EXPRESSION_CACHE");
+  private static PsiExpression getLiteralExpression(@NotNull PsiExpression context, @NotNull PsiManager manager, @NotNull String text) {
     Map<String, PsiExpression> cache = LITERAL_EXPRESSION_CACHE.get(manager);
     if (cache == null) {
       cache = new ConcurrentSoftValueHashMap<String, PsiExpression>();
@@ -605,7 +602,7 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool {
   }
 
   private static boolean processValuesFlownTo(@NotNull final PsiExpression argument,
-                                              PsiElement scope,
+                                              @NotNull PsiElement scope,
                                               @NotNull final Processor<PsiExpression> processor) {
     SliceAnalysisParams params = new SliceAnalysisParams();
     params.dataFlowToThis = true;
diff --git a/java/java-tests/testData/inspection/magic/simple/src/X.java b/java/java-tests/testData/inspection/magic/simple/src/X.java
index 84c3ea63651f..9fcf81269ee7 100644
--- a/java/java-tests/testData/inspection/magic/simple/src/X.java
+++ b/java/java-tests/testData/inspection/magic/simple/src/X.java
@@ -244,4 +244,16 @@ public class X {
       super.f(x);
     }
   }
+
+  void plusSupportedInFlags(@MagicConstant(flags ={Const.X, Const.Y, Const.Z}) int x) {
+    ////////////// GOOD
+    plusSupportedInFlags(Const.X + Const.Y);
+    plusSupportedInFlags(Const.Z + Const.X + Const.Y);
+    plusSupportedInFlags(Const.Z + (Const.X + Const.Y));
+
+    int ix = Const.X + Const.Y;
+    plusSupportedInFlags(ix);
+    plusSupportedInFlags(0);
+    plusSupportedInFlags(-1);
+  }
 }

From 43b14bcad0237d3cdbfd21ebec19a2de256fd50f Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 4 Jun 2012 13:23:59 +0400
Subject: [PATCH 131/239] virtual file pointers refactored for update speed

---
 .../util/descriptors/impl/ConfigFileImpl.java |  10 +-
 .../intellij/testFramework/IdeaTestCase.java  |   6 +
 .../pointers/VirtualFilePointerManager.java   |   4 +-
 .../impl/VirtualFilePointerContainerImpl.java |  66 ++-
 .../vfs/impl/VirtualFilePointerEx.java        |  27 -
 .../daemon/impl/DaemonCodeAnalyzerImpl.java   |   2 +-
 .../daemon/impl/DaemonProgressIndicator.java  |  18 +-
 .../editor/impl/EditorFactoryImpl.java        |  26 +-
 .../openapi/editor/impl/EditorImpl.java       |  14 +-
 .../openapi/vfs/impl/FilePointerPartNode.java | 246 +++++++++
 .../vfs/impl/VirtualFilePointerImpl.java      | 173 ++----
 .../impl/VirtualFilePointerManagerImpl.java   | 510 +++++++++---------
 .../src/META-INF/PlatformExtensions.xml       |   2 +
 .../src/componentSets/Platform.xml            |   5 -
 .../{ => impl}/VirtualFilePointerTest.java    | 202 ++++---
 .../openapi/roots/impl/ContentEntryImpl.java  |  55 +-
 .../openapi/roots/impl/RootModelImpl.java     |  31 +-
 .../roots/impl/libraries/LibraryImpl.java     |  85 ++-
 .../testFramework/LightPlatformTestCase.java  |  23 +-
 .../openapi/util/TraceableDisposable.java     |  74 +++
 20 files changed, 887 insertions(+), 692 deletions(-)
 delete mode 100644 platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerEx.java
 create mode 100644 platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java
 rename platform/platform-tests/testSrc/com/intellij/openapi/vfs/{ => impl}/VirtualFilePointerTest.java (76%)
 create mode 100644 platform/util/src/com/intellij/openapi/util/TraceableDisposable.java

diff --git a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileImpl.java b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileImpl.java
index 36d2ba4e529b..45edd4a46677 100644
--- a/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileImpl.java
+++ b/java/idea-ui/src/com/intellij/util/descriptors/impl/ConfigFileImpl.java
@@ -15,13 +15,16 @@ import com.intellij.util.descriptors.ConfigFileMetaData;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.lang.ref.Reference;
+import java.lang.ref.SoftReference;
+
 /**
  * @author nik
  */
 public class ConfigFileImpl implements ConfigFile {
   @NotNull private ConfigFileInfo myInfo;
   private final VirtualFilePointer myFilePointer;
-  private volatile PsiFile myPsiFile;
+  private volatile Reference<PsiFile> myPsiFile;
   private final ConfigFileContainerImpl myContainer;
   private final Project myProject;
   private long myModificationCount;
@@ -68,7 +71,8 @@ public class ConfigFileImpl implements ConfigFile {
   @Override
   @Nullable
   public PsiFile getPsiFile() {
-    PsiFile psiFile = myPsiFile;
+    Reference<PsiFile> ref = myPsiFile;
+    PsiFile psiFile = ref == null ? null : ref.get();
 
     if (psiFile != null && psiFile.isValid()) {
       return psiFile;
@@ -79,7 +83,7 @@ public class ConfigFileImpl implements ConfigFile {
 
     psiFile = PsiManager.getInstance(myProject).findFile(virtualFile);
 
-    myPsiFile = psiFile;
+    myPsiFile = new SoftReference<PsiFile>(psiFile);
 
     return psiFile;
   }
diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
index abdb236f010b..ba9226c1e76a 100644
--- a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
+++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java
@@ -19,6 +19,8 @@ import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.module.StdModuleTypes;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
+import com.intellij.openapi.vfs.impl.VirtualFilePointerManagerImpl;
+import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.impl.JavaPsiFacadeEx;
 
@@ -35,12 +37,16 @@ public abstract class IdeaTestCase extends PlatformTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     myJavaFacade = JavaPsiFacadeEx.getInstanceEx(myProject);
+    VirtualFilePointerManagerImpl filePointerManager = (VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance();
+    filePointerManager.storePointers();
   }
 
   @Override
   protected void tearDown() throws Exception {
     myJavaFacade = null;
     super.tearDown();
+    VirtualFilePointerManagerImpl filePointerManager = (VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance();
+    filePointerManager.assertPointersAreDisposed();
   }
 
   public final JavaPsiFacadeEx getJavaFacade() {
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointerManager.java b/platform/core-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointerManager.java
index 5b6dcc6b3b1d..8d057b5b1343 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointerManager.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/pointers/VirtualFilePointerManager.java
@@ -16,7 +16,7 @@
 package com.intellij.openapi.vfs.pointers;
 
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.util.ModificationTracker;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable;
 
 public abstract class VirtualFilePointerManager implements Disposable, ModificationTracker {
   public static VirtualFilePointerManager getInstance() {
-    return ApplicationManager.getApplication().getComponent(VirtualFilePointerManager.class);
+    return ServiceManager.getService(VirtualFilePointerManager.class);
   }
 
   @NotNull
diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
index 3a32389f8f78..364d4d2fd252 100644
--- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
+++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java
@@ -16,9 +16,11 @@
 package com.intellij.openapi.vfs.impl;
 
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.InvalidDataException;
 import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.TraceableDisposable;
 import com.intellij.openapi.util.Trinity;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -41,7 +43,7 @@ import java.util.List;
 /**
  *  @author dsl
  */
-public class VirtualFilePointerContainerImpl implements VirtualFilePointerContainer, Disposable {
+public class VirtualFilePointerContainerImpl extends TraceableDisposable implements VirtualFilePointerContainer, Disposable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.pointers.VirtualFilePointerContainer");
   @NotNull private final List<VirtualFilePointer> myList = ContainerUtilRt.createEmptyCOWList();
   private final List<VirtualFilePointer> myReadOnlyList = Collections.unmodifiableList(myList);
@@ -54,10 +56,12 @@ public class VirtualFilePointerContainerImpl implements VirtualFilePointerContai
   private long myTimeStampOfCachedThings = -1;
   @NonNls private static final String URL_ATTR = "url";
   private boolean myDisposed;
+  private static final boolean TRACE_CREATION = LOG.isDebugEnabled() || ApplicationManager.getApplication().isUnitTestMode();
 
-  public VirtualFilePointerContainerImpl(@NotNull VirtualFilePointerManager manager, @NotNull Disposable parent, @Nullable VirtualFilePointerListener listener) {
+  public VirtualFilePointerContainerImpl(@NotNull VirtualFilePointerManager manager, @NotNull Disposable parentDisposable, @Nullable VirtualFilePointerListener listener) {
+    super(TRACE_CREATION ? new Throwable("parent = '" + parentDisposable + "' (" + parentDisposable.getClass() + "); listener="+listener) : null);
     myVirtualFilePointerManager = manager;
-    myParent = parent;
+    myParent = parentDisposable;
     myListener = listener;
   }
 
@@ -173,43 +177,46 @@ public class VirtualFilePointerContainerImpl implements VirtualFilePointerContai
   }
 
   private static final Trinity<String[], VirtualFile[], VirtualFile[]> EMPTY = Trinity.create(ArrayUtil.EMPTY_STRING_ARRAY, VirtualFile.EMPTY_ARRAY, VirtualFile.EMPTY_ARRAY);
+
   @NotNull
   private Trinity<String[], VirtualFile[], VirtualFile[]> cacheThings() {
-    myTimeStampOfCachedThings = myVirtualFilePointerManager.getModificationCount();
+    Trinity<String[], VirtualFile[], VirtualFile[]> result;
     if (myList.isEmpty()) {
       myCachedDirectories = VirtualFile.EMPTY_ARRAY;
       myCachedFiles = VirtualFile.EMPTY_ARRAY;
       myCachedUrls = ArrayUtil.EMPTY_STRING_ARRAY;
-      return EMPTY;
+      result = EMPTY;
     }
-    VirtualFilePointer[] vf = myList.toArray(new VirtualFilePointer[myList.size()]);
-    List<VirtualFile> cachedFiles = new ArrayList<VirtualFile>(vf.length);
-    List<String> cachedUrls = new ArrayList<String>(vf.length);
-    List<VirtualFile> cachedDirectories = new ArrayList<VirtualFile>(vf.length/3);
+    else {
+      VirtualFilePointer[] vf = myList.toArray(new VirtualFilePointer[myList.size()]);
+      List<VirtualFile> cachedFiles = new ArrayList<VirtualFile>(vf.length);
+      List<String> cachedUrls = new ArrayList<String>(vf.length);
+      List<VirtualFile> cachedDirectories = new ArrayList<VirtualFile>(vf.length / 3);
 
-    for (VirtualFilePointer v : vf) {
-      Pair<VirtualFile, String> pair = v instanceof VirtualFilePointerEx
-                                       ? ((VirtualFilePointerEx)v).update()
-                                       : Pair.create(v.getFile(), v.getUrl());
-      if (pair == null) continue;
-      VirtualFile file = pair.first;
-      String url = pair.second;
-      if (url == null) url = file.getUrl();
-      cachedUrls.add(url);
-      if (file != null) {
-        cachedFiles.add(file);
-        if (file.isDirectory()) {
-          cachedDirectories.add(file);
+      for (VirtualFilePointer v : vf) {
+        Pair<VirtualFile, String> pair = Pair.create(v.getFile(), v.getUrl());
+        if (pair == null) continue;
+        VirtualFile file = pair.first;
+        String url = pair.second;
+        if (url == null) url = file.getUrl();
+        cachedUrls.add(url);
+        if (file != null) {
+          cachedFiles.add(file);
+          if (file.isDirectory()) {
+            cachedDirectories.add(file);
+          }
         }
       }
+      VirtualFile[] directories = VfsUtilCore.toVirtualFileArray(cachedDirectories);
+      myCachedDirectories = directories;
+      VirtualFile[] filesArray;
+      myCachedFiles = filesArray = VfsUtilCore.toVirtualFileArray(cachedFiles);
+      String[] urlsArray;
+      myCachedUrls = urlsArray = ArrayUtil.toStringArray(cachedUrls);
+      result = Trinity.create(urlsArray, filesArray, directories);
     }
-    VirtualFile[] directories = VfsUtilCore.toVirtualFileArray(cachedDirectories);
-    myCachedDirectories = directories;
-    VirtualFile[] filesArray;
-    myCachedFiles = filesArray = VfsUtilCore.toVirtualFileArray(cachedFiles);
-    String[] urlsArray;
-    myCachedUrls = urlsArray = ArrayUtil.toStringArray(cachedUrls);
-    return Trinity.create(urlsArray, filesArray, directories);
+    myTimeStampOfCachedThings = myVirtualFilePointerManager.getModificationCount();
+    return result;
   }
 
   @Override
@@ -314,5 +321,6 @@ public class VirtualFilePointerContainerImpl implements VirtualFilePointerContai
   public void dispose() {
     assert !myDisposed;
     myDisposed = true;
+    kill(null);
   }
 }
diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerEx.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerEx.java
deleted file mode 100644
index 7804615a218f..000000000000
--- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerEx.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.openapi.vfs.impl;
-
-import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
-
-/**
- * @author yole
- */
-public interface VirtualFilePointerEx extends VirtualFilePointer {
-  Pair<VirtualFile, String> update();
-}
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
index 97ecca5aee4a..eab96739beee 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
@@ -141,6 +141,7 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx
     };
     Disposer.register(project, myPassExecutorService);
     Disposer.register(project, myFileStatusMap);
+    DaemonProgressIndicator.setDebug(LOG.isDebugEnabled());
   }
 
   static boolean hasErrors(@NotNull Project project, @NotNull Document document) {
@@ -217,7 +218,6 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx
     assert array.length != 0: "Highlighting is disabled for the file "+file;
 
     final DaemonProgressIndicator progress = createUpdateProgress();
-    progress.setDebug(LOG.isDebugEnabled());
     myPassExecutorService.submitPasses(Collections.singletonMap((FileEditor)textEditor, array), progress, Job.DEFAULT_PRIORITY);
     try {
       while (progress.isRunning()) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java
index bcf3d8053066..e499c2402aeb 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonProgressIndicator.java
@@ -17,7 +17,7 @@
 package com.intellij.codeInsight.daemon.impl;
 
 import com.intellij.openapi.progress.util.ProgressIndicatorBase;
-import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.TraceableDisposable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
@@ -25,7 +25,8 @@ import org.jetbrains.annotations.TestOnly;
  * @author cdr
  */
 public class DaemonProgressIndicator extends ProgressIndicatorBase {
-  private boolean debug;
+  private static boolean debug;
+  private final TraceableDisposable myTraceableDisposable = new TraceableDisposable(debug ? new Throwable() : null);
 
   @Override
   public synchronized void stop() {
@@ -44,16 +45,12 @@ public class DaemonProgressIndicator extends ProgressIndicatorBase {
 
   @Override
   public void cancel() {
-    if (debug) {
-      putUserData(KILL_TRACE, new Throwable("Daemon Progress Canceled"));
-    }
+    myTraceableDisposable.kill("Daemon Progress Canceled");
     super.cancel();
   }
 
   public void cancel(@NotNull Throwable cause) {
-    if (debug) {
-      putUserData(KILL_TRACE, new Throwable("Daemon Progress Canceled Because of", cause));
-    }
+    myTraceableDisposable.kill("Daemon Progress Canceled because of "+cause);
     super.cancel();
   }
 
@@ -78,8 +75,7 @@ public class DaemonProgressIndicator extends ProgressIndicatorBase {
   }
 
   @TestOnly
-  public void setDebug(boolean debug) {
-    this.debug = debug;
+  public static void setDebug(boolean debug) {
+    DaemonProgressIndicator.debug = debug;
   }
-  private static final Key<Throwable> KILL_TRACE = Key.create("KILL_TRACE");
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFactoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFactoryImpl.java
index 0332cc8fdaaa..d7dfb0e07060 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFactoryImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorFactoryImpl.java
@@ -34,15 +34,12 @@ import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.project.ProjectManagerAdapter;
-import com.intellij.openapi.util.Key;
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.EventDispatcher;
 import com.intellij.util.SmartList;
 import com.intellij.util.text.CharArrayCharSequence;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -53,7 +50,6 @@ public class EditorFactoryImpl extends EditorFactory {
   private final EditorEventMulticasterImpl myEditorEventMulticaster = new EditorEventMulticasterImpl();
   private final EventDispatcher<EditorFactoryListener> myEditorFactoryEventDispatcher = EventDispatcher.create(EditorFactoryListener.class);
   private final List<Editor> myEditors = new ArrayList<Editor>();
-  private static final Key<String> EDITOR_CREATOR = new Key<String>("Editor creator");
 
   public EditorFactoryImpl(ProjectManager projectManager) {
     projectManager.addProjectManagerListener(new ProjectManagerAdapter() {
@@ -94,7 +90,7 @@ public class EditorFactoryImpl extends EditorFactory {
       final Editor editor = myEditors.get(i);
       if (editor.getProject() == project || editor.getProject() == null) {
         try {
-          LOG.error(notReleasedError(editor));
+          throwNotReleasedError(editor);
         }
         finally {
           releaseEditor(editor);
@@ -104,21 +100,16 @@ public class EditorFactoryImpl extends EditorFactory {
   }
 
   @NonNls
-  public static String notReleasedError(@NotNull Editor editor) {
-    final String creator = getCreator(editor);
-    if (creator == null) {
-      return "Editor of " + editor.getClass() +
-                " and the following text hasn't been released:\n" + editor.getDocument().getText();
+  public static void throwNotReleasedError(@NotNull Editor editor) {
+    if (editor instanceof EditorImpl) {
+      ((EditorImpl)editor).throwDisposalError("Editor of " + editor.getClass() + " hasn't been released:");
     }
     else {
-      return "Editor of " + editor.getClass() + " hasn't been released:\n" + creator;
+      throw new RuntimeException("Editor of " + editor.getClass() +
+                                 " and the following text hasn't been released:\n" + editor.getDocument().getText());
     }
   }
 
-  @Nullable
-  static String getCreator(@NotNull Editor editor) {
-    return editor.getUserData(EDITOR_CREATOR);
-  }
 
   @Override
   public void disposeComponent() {
@@ -195,12 +186,8 @@ public class EditorFactoryImpl extends EditorFactory {
 
     if (LOG.isDebugEnabled()) {
       LOG.debug("number of Editor's:" + myEditors.size());
-      //Thread.dumpStack();
     }
 
-    String text = StringUtil.getThrowableText(new RuntimeException("Editor created"));
-    editor.putUserData(EDITOR_CREATOR, text);
-
     return editor;
   }
 
@@ -210,7 +197,6 @@ public class EditorFactoryImpl extends EditorFactory {
       ((EditorImpl)editor).release();
     }
     finally {
-      editor.putUserData(EDITOR_CREATOR, null);
       myEditors.remove(editor);
       myEditorFactoryEventDispatcher.getMulticaster().editorReleased(new EditorFactoryEvent(this, editor));
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index f0f642d3f586..22fc30b13e4e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -67,6 +67,7 @@ import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.util.TraceableDisposable;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.IdeGlassPane;
 import com.intellij.ui.GuiUtils;
@@ -142,6 +143,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   @NotNull private final JScrollPane myScrollPane;
   @NotNull private final EditorComponentImpl myEditorComponent;
   @NotNull private final EditorGutterComponentImpl myGutterComponent;
+  private final TraceableDisposable myTraceableDisposable = new TraceableDisposable(new Throwable());
 
   static {
     ComplementaryFontsRegistry.getFontAbleToDisplay(' ', 0,0, UIManager.getFont("Label.font").getFamily()); // load costly font info
@@ -268,8 +270,6 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   @Nullable private MouseEvent myInitialMouseEvent;
   private boolean myIgnoreMouseEventsConsecutiveToInitial;
 
-  @Nullable private String myReleasedAt = null;
-
   private EditorDropHandler myDropHandler;
 
   private char[] myPrefixText;
@@ -666,15 +666,15 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     );
   }
 
+  public void throwDisposalError(String msg) {
+    myTraceableDisposable.throwDisposalError(msg);
+  }
   public void release() {
     assertIsDispatchThread();
     if (isReleased) {
-      LOG.error("Double release of editor:\n" +
-                EditorFactoryImpl.getCreator(this) + "\n" +
-                "First released at:  =====\n" + myReleasedAt + "\n======");
+      throwDisposalError("Double release of editor:");
     }
-
-    myReleasedAt = StringUtil.getThrowableText(new Throwable());
+    myTraceableDisposable.kill(null);
 
     isReleased = true;
     myDocument.removeDocumentListener(myHighlighter);
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java
new file mode 100644
index 000000000000..6a0951fb2707
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/FilePointerPartNode.java
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.vfs.impl;
+
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.util.Disposer;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.util.ArrayUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.TestOnly;
+
+import java.util.List;
+
+// all file pointers we store in the tree with nodes corresponding to the file structure on disk
+class FilePointerPartNode {
+  private static final FilePointerPartNode[] EMPTY_ARRAY = new FilePointerPartNode[0];
+  @NotNull private String part; // common prefix of all file pointers beneath
+  @NotNull private FilePointerPartNode[] children;
+  private FilePointerPartNode parent;
+  VirtualFilePointerImpl leaf;  // file pointer for this exact path (e.g. concatenation of all "part" fields down from the root)
+  // in case there is file pointer exists for this part, its info is saved here
+  volatile Pair<VirtualFile, String> myFileAndUrl; // must not be both null
+  private volatile long myLastUpdated = -1;
+  volatile int useCount;
+
+  private int pointersUnder = 1;   // number of alive pointers in this node plus all nodes beneath
+  private static volatile boolean DEBUG = ApplicationManager.getApplication().isUnitTestMode();
+
+  FilePointerPartNode(@NotNull String part, FilePointerPartNode parent, Pair<VirtualFile,String> fileAndUrl) {
+    this.part = part;
+    this.parent = parent;
+    children = EMPTY_ARRAY;
+    myFileAndUrl = fileAndUrl;
+  }
+
+  @Override
+  public String toString() {
+    return part + (children.length == 0 ? "" : " -> "+children.length);
+  }
+
+  boolean getPointersUnder(@NotNull String path, int start, @NotNull List<FilePointerPartNode> out) {
+    checkStructure();
+    if (pointersUnder == 0) return false;
+    // invariant: upper nodes are matched
+    int index = indexOfFirstDifferentChar(path, start);
+    if (index - start == part.length() // part matched entirely, check children
+       || index == path.length() // query matched entirely, add all children to matches
+    ) {
+      if (index == path.length() && leaf != null) {
+        out.add(this);
+      }
+
+      for (FilePointerPartNode child : children) {
+        child.getPointersUnder(path, index, out);
+      }
+    }
+    // else there is no match
+    return false;
+  }
+
+  void checkStructure() {
+    if (!DEBUG) return;
+    int childSum = 0;
+    for (FilePointerPartNode child : children) {
+      childSum += child.pointersUnder;
+      child.checkStructure();
+      assert child.parent == this;
+    }
+    if (leaf != null) childSum++;
+    assert (useCount == 0) == (leaf == null) : useCount + " - " +leaf;
+    assert pointersUnder == childSum : "expected: "+pointersUnder+"; actual: "+childSum;
+  }
+
+  @NotNull
+  FilePointerPartNode findPointerOrCreate(@NotNull String path, int start, @NotNull Pair<VirtualFile, String> fileAndUrl) {
+    // invariant: upper nodes are matched
+    int index = indexOfFirstDifferentChar(path, start);
+    if (index == path.length() // query matched entirely
+      && index - start == part.length()
+      )  {
+      if (leaf == null) pointersUnder++;
+      return this;
+    }
+    if (index - start == part.length() // part matched entirely, check children
+      ) {
+      for (FilePointerPartNode child : children) {
+        // find the right child (its part should start with ours)
+        int i = child.indexOfFirstDifferentChar(path, index);
+        if (i != index && (i > index+1 || path.charAt(index) != '/')) {
+          FilePointerPartNode node = child.findPointerOrCreate(path, index, fileAndUrl);
+          if (node.leaf == null) pointersUnder++; // the new node's been created
+          return node;
+        }
+      }
+      // cannot insert to children, create child node manually
+      String pathRest = path.substring(index);
+      FilePointerPartNode newNode = new FilePointerPartNode(pathRest, this, fileAndUrl);
+      children = ArrayUtil.append(children, newNode);
+      pointersUnder++;
+      return newNode;
+    }
+    // else there is no match
+    // split
+    // try to make "/" start the splitted part
+    if (index > start && index != path.length() && path.charAt(index-1)== '/') index--;
+    String pathRest = path.substring(index);
+    FilePointerPartNode newNode = pathRest.isEmpty() ? this : new FilePointerPartNode(pathRest, this, fileAndUrl);
+    String commonPredecessor = StringUtil.first(part, index - start, false);
+    FilePointerPartNode splittedAway = new FilePointerPartNode(part.substring(index - start), this, null);
+    splittedAway.children = children;
+    for (FilePointerPartNode child : children) {
+      child.parent = splittedAway;
+    }
+    splittedAway.pointersUnder = pointersUnder;
+    splittedAway.useCount = useCount;
+    splittedAway.associate(leaf, myFileAndUrl);
+    associate(null, null);
+    useCount = 0;
+    part = commonPredecessor;
+    children = newNode == this ? new FilePointerPartNode[]{splittedAway} : new FilePointerPartNode[]{splittedAway, newNode};
+    pointersUnder++;
+    return newNode;
+  }
+
+  // return true if the root node must be deleted also
+  boolean remove() {
+    assert leaf != null : toString();
+    associate(null, null);
+    useCount = 0;
+    myLastUpdated = -1;
+    FilePointerPartNode node;
+    for (node = this; node.parent != null; node = node.parent) {
+      node.pointersUnder--;
+    }
+    if (--node.pointersUnder == 0) {
+      node.children = EMPTY_ARRAY; // clear root node, especially in tests
+      return true;
+    }
+    return false;
+  }
+
+  private int indexOfFirstDifferentChar(@NotNull String path, int start) {
+    return indexOfFirstDifferentChar(path, start, part, 0, !SystemInfo.isFileSystemCaseSensitive);
+  }
+
+  @NotNull
+  // returns pair.second != null always
+  Pair<VirtualFile, String> update() {
+    VirtualFileManager fileManager = VirtualFileManager.getInstance();
+
+    long lastUpdated = myLastUpdated;
+    Pair<VirtualFile, String> fileAndUrl = myFileAndUrl;
+    long fsModCount = fileManager.getModificationCount();
+    if (lastUpdated == fsModCount) return fileAndUrl;
+    VirtualFile file = fileAndUrl.first;
+    String url = fileAndUrl.second;
+
+    if (url == null) {
+      url = file.getUrl();
+      if (!file.isValid()) file = null;
+    }
+    boolean fileIsValid = file != null && file.isValid();
+    if (file != null && !fileIsValid) {
+      file = null;
+    }
+    if (file == null) {
+      file = fileManager.findFileByUrl(url);
+      fileIsValid = file != null && file.isValid();
+    }
+    if (file != null) {
+      if (fileIsValid) {
+        url = file.getUrl(); // refresh url, it can differ
+      }
+      else {
+        file = null; // can't find, try next time
+      }
+    }
+    assert url != null;
+    Pair<VirtualFile, String> result = Pair.create(file, url);
+    myFileAndUrl = result;
+    myLastUpdated = fsModCount;
+    return result;
+  }
+
+  private static int indexOfFirstDifferentChar(@NotNull String s1, int start1, @NotNull String s2, int start2, boolean ignoreCase) {
+    int len1 = s1.length();
+    int len2 = s2.length();
+    while (start1 < len1 && start2 < len2) {
+      char c1 = s1.charAt(start1);
+      char c2 = s2.charAt(start2);
+      if (ignoreCase ? !StringUtil.charsEqualIgnoreCase(c1, c2) : c1 != c2) {
+        return start1;
+      }
+      start1++;
+      start2++;
+    }
+    return start1;
+  }
+
+  void associate(VirtualFilePointerImpl pointer, Pair<VirtualFile, String> fileAndUrl) {
+    if (pointer != null) {
+      pointer.myNode = this;
+    }
+    leaf = pointer;
+    myFileAndUrl = fileAndUrl;
+    myLastUpdated = -1;
+  }
+
+  int incrementUsageCount(int delta) {
+    return useCount+=delta;
+  }
+
+  int getPointersUnder() {
+    return pointersUnder;
+  }
+
+  @TestOnly
+  public static void pushDebug(boolean newDebug, @NotNull Disposable disposable) {
+    final boolean oldDebug = DEBUG;
+    DEBUG = newDebug;
+    Disposer.register(disposable, new Disposable() {
+      @Override
+      public void dispose() {
+        DEBUG = oldDebug;
+      }
+    });
+  }
+}
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
index 11c437acb76a..ec63024221e4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerImpl.java
@@ -16,57 +16,35 @@
 package com.intellij.openapi.vfs.impl;
 
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
-import com.intellij.openapi.util.UserDataHolderBase;
+import com.intellij.openapi.util.TraceableDisposable;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerListener;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
 import com.intellij.util.PathUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-public class VirtualFilePointerImpl extends UserDataHolderBase implements VirtualFilePointerEx, Disposable {
+class VirtualFilePointerImpl extends TraceableDisposable implements VirtualFilePointer {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.VirtualFilePointerImpl");
 
-  private volatile Pair<VirtualFile, String> myFileAndUrl; // must not be both null
-  private final VirtualFileManager myVirtualFileManager;
   private final VirtualFilePointerListener myListener;
-  private volatile boolean disposed = false;
-  volatile int useCount;
-  private volatile long myLastUpdated = -1;
+  private static final boolean TRACE_CREATION = LOG.isDebugEnabled() || ApplicationManager.getApplication().isUnitTestMode();
 
-  private static final Key<Throwable> CREATE_TRACE = Key.create("CREATION_TRACE");
-  private static final Key<Throwable> KILL_TRACE = Key.create("KILL_TRACE");
-  private static final boolean TRACE_CREATION = /*true || */LOG.isDebugEnabled();
+  volatile FilePointerPartNode myNode; // null means disposed
 
-  VirtualFilePointerImpl(VirtualFile file,
-                         @NotNull String url,
-                         @NotNull VirtualFileManager virtualFileManager,
-                         VirtualFilePointerListener listener,
-                         @NotNull Disposable parentDisposable) {
-    myFileAndUrl = Pair.create(file, url);
-    myVirtualFileManager = virtualFileManager;
+  VirtualFilePointerImpl(VirtualFilePointerListener listener, @NotNull Disposable parentDisposable, Pair<VirtualFile, String> fileAndUrl) {
+    super(TRACE_CREATION ? new Throwable("parent = '" + parentDisposable + "' (" + parentDisposable.getClass() + "); URL="+fileAndUrl) : null);
     myListener = listener;
-    useCount = 0;
-    if (TRACE_CREATION) {
-      putUserData(CREATE_TRACE, new Throwable("parent = '"+parentDisposable+"' ("+parentDisposable.getClass()+")"));
-    }
   }
 
   @Override
   @NotNull
   public String getFileName() {
-    Pair<VirtualFile, String> result = update();
-    if (result == null) {
-      checkDisposed();
-      return "";
-    }
+    checkDisposed();
+    Pair<VirtualFile, String> result = myNode.update();
     VirtualFile file = result.first;
     if (file != null) {
       return file.getName();
@@ -78,28 +56,22 @@ public class VirtualFilePointerImpl extends UserDataHolderBase implements Virtua
 
   @Override
   public VirtualFile getFile() {
-    Pair<VirtualFile, String> result = update();
-    if (result == null) {
-      checkDisposed();
-      return null;
-    }
+    checkDisposed();
+    Pair<VirtualFile, String> result = myNode.update();
     return result.first;
   }
 
   @Override
   @NotNull
   public String getUrl() {
-    return getUrlFromPair(update());
-  }
-
-  private String getUrlNoUpdate() {
-    return getUrlFromPair(myFileAndUrl);
+    if (isDisposed()) return "";
+    Pair<VirtualFile, String> update = myNode.update();
+    return update.second;
   }
 
   @NotNull
-  private static String getUrlFromPair(Pair<VirtualFile, String> fileAndUrl) {
-    String url = fileAndUrl.second;
-    return url != null ? url : fileAndUrl.first.getUrl();
+  String getUrlNoUpdate() {
+    return isDisposed() ? "" : myNode.myFileAndUrl.second;
   }
 
   @Override
@@ -110,121 +82,40 @@ public class VirtualFilePointerImpl extends UserDataHolderBase implements Virtua
   }
 
   private void checkDisposed() {
-    if (disposed) {
-      throw new MyException("Already disposed: URL=" + toString(), getUserData(CREATE_TRACE), getUserData(KILL_TRACE));
+    if (isDisposed()) {
+      throwDisposalError("Already disposed: URL=" + getUrlNoUpdate());
     }
   }
 
-  public void throwNotDisposedError(String msg) throws RuntimeException {
-    throw new MyException(msg + ": URL=" + toString(), getUserData(CREATE_TRACE), null);
-  }
-
-  public int incrementUsageCount() {
-    return ++useCount;
-  }
-
-  private static class MyException extends RuntimeException {
-    private final Throwable e1;
-    private final Throwable e2;
-
-    private MyException(String message, Throwable e1, Throwable e2) {
-      super(message);
-      this.e1 = e1;
-      this.e2 = e2;
-    }
-
-    @Override
-    public void printStackTrace(PrintStream s) {
-      //noinspection IOResourceOpenedButNotSafelyClosed
-      PrintWriter writer = new PrintWriter(s);
-      printStackTrace(writer);
-      writer.flush();
-    }
-
-    @Override
-    public void printStackTrace(PrintWriter s) {
-      super.printStackTrace(s);
-      if (e1 != null) {
-        s.println("--------------Creation trace: ");
-        e1.printStackTrace(s);
-      }
-      if (e2 != null) {
-        s.println("--------------Kill trace: ");
-        e2.printStackTrace(s);
-      }
-    }
-  }
 
   @Override
   public boolean isValid() {
-    Pair<VirtualFile, String> result = update();
+    Pair<VirtualFile, String> result = isDisposed() ? null : myNode.update();
     return result != null && result.first != null;
   }
 
-  @Nullable
-  public Pair<VirtualFile, String> update() {
-    if (disposed) return null;
-
-    long lastUpdated = myLastUpdated;
-    Pair<VirtualFile, String> fileAndUrl = myFileAndUrl;
-    VirtualFile file = fileAndUrl.first;
-    String url = fileAndUrl.second;
-    long fsModCount = myVirtualFileManager.getModificationCount();
-    if (lastUpdated == fsModCount) return fileAndUrl;
-
-    // 1. reset invalid file, restore URL if needed
-    if (file != null && !file.isValid()) {
-      if (url == null) {
-        url = file.getUrl();
-      }
-      file = null;
-    }
-
-    // 2. restore file, reset URL if it differs
-    if (file == null) {
-      LOG.assertTrue(url != null, "Both file & URL are null");
-      file = myVirtualFileManager.findFileByUrl(url);
-      if (file != null && url.equals(file.getUrl())) {
-        url = null;
-      }
-    }
-
-    // 3. reset invalid file, restore URL if needed
-    if (file != null && !file.exists()) {
-      if (url == null) {
-        url = file.getUrl();
-      }
-      file = null;
-    }
-
-    Pair<VirtualFile, String> result = Pair.create(file, url);
-    myFileAndUrl = result;
-    myLastUpdated = fsModCount;
-    return result;
-  }
-
   @Override
   public String toString() {
     return getUrlNoUpdate();
   }
 
-  @Override
   public void dispose() {
-    if (disposed) {
-      throw new MyException("Punching the dead horse: URL=" + toString(), getUserData(CREATE_TRACE), getUserData(KILL_TRACE));
-    }
-    if (--useCount == 0) {
-      if (TRACE_CREATION) {
-        putUserData(KILL_TRACE, new Throwable());
+    checkDisposed();
+    if (myNode.incrementUsageCount(-1) == 0) {
+      kill(null);
+      VirtualFilePointerManager pointerManager = VirtualFilePointerManager.getInstance();
+      if (pointerManager instanceof VirtualFilePointerManagerImpl) {
+        ((VirtualFilePointerManagerImpl)pointerManager).removeNode(myNode, myListener); // remove from the tree
       }
-      disposed = true;
-
-      final Pair<VirtualFile, String> pair = myFileAndUrl;
-      ((VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance()).clearPointerCaches(pair.first, pair.second, myListener);
+      myNode = null;
     }
   }
 
   public boolean isDisposed() {
-    return disposed;
+    return myNode == null;
+  }
+
+  VirtualFilePointerListener getListener() {
+    return myListener;
   }
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java
index ba404ba1eac1..bbdb217f8967 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerManagerImpl.java
@@ -17,14 +17,9 @@ package com.intellij.openapi.vfs.impl;
 
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.components.ApplicationComponent;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.ModificationTracker;
-import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.util.objectTree.ObjectNode;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
 import com.intellij.openapi.vfs.ex.VirtualFileManagerEx;
@@ -32,21 +27,24 @@ import com.intellij.openapi.vfs.ex.temp.TempFileSystem;
 import com.intellij.openapi.vfs.newvfs.BulkFileListener;
 import com.intellij.openapi.vfs.newvfs.events.*;
 import com.intellij.openapi.vfs.pointers.*;
+import com.intellij.util.Function;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.MessageBus;
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
 import gnu.trove.TObjectHashingStrategy;
+import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
 import java.util.*;
 
-public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager implements ApplicationComponent, ModificationTracker {
+public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager implements ModificationTracker, BulkFileListener {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.VirtualFilePointerManagerImpl");
   private long myVfsModificationCounter;
   // guarded by this
-  private final Map<VirtualFilePointerListener, TreeMap<String, VirtualFilePointerImpl>> myUrlToPointerMaps = new LinkedHashMap<VirtualFilePointerListener, TreeMap<String, VirtualFilePointerImpl>>();
+  private final Map<VirtualFilePointerListener, FilePointerPartNode> myPointers = new LinkedHashMap<VirtualFilePointerListener, FilePointerPartNode>();
 
   // compare by identity because VirtualFilePointerContainer has too smart equals
   // guarded by myContainers
@@ -68,100 +66,57 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
   VirtualFilePointerManagerImpl(@NotNull VirtualFileManagerEx virtualFileManagerEx, @NotNull MessageBus bus) {
     myVirtualFileManager = virtualFileManagerEx;
     myBus = bus;
-    bus.connect().subscribe(VirtualFileManager.VFS_CHANGES, new VFSEventsProcessor());
+    bus.connect().subscribe(VirtualFileManager.VFS_CHANGES, this);
   }
 
-  synchronized void clearPointerCaches(@Nullable VirtualFile file, @Nullable String url, VirtualFilePointerListener listener) {
-    if (file != null) {
-      removeFromMap(file.getUrl(), listener);
-    }
-    if (url != null && (file == null || URL_COMPARATOR.compare(url, file.getUrl()) != 0)) {
-      removeFromMap(url, listener);
-    }
-  }
 
   @Override
   public long getModificationCount() {
     return myVfsModificationCounter;
   }
 
-  private void removeFromMap(String url, VirtualFilePointerListener listener) {
-    TreeMap<String, VirtualFilePointerImpl> urlToPointer = myUrlToPointerMaps.get(listener);
-    assert urlToPointer != null : url;
-    urlToPointer.remove(VfsUtil.urlToPath(url));
-    if (urlToPointer.isEmpty()) {
-      myUrlToPointerMaps.remove(listener);
-    }
-  }
-
-  private class EventDescriptor {
+  private static class EventDescriptor {
     @NotNull private final VirtualFilePointerListener myListener;
-    private final VirtualFilePointer[] myPointers;
+    @NotNull private final VirtualFilePointer[] myPointers;
 
-    private EventDescriptor(@NotNull VirtualFilePointerListener listener, @NotNull List<VirtualFilePointer> pointers) {
+    private EventDescriptor(@NotNull VirtualFilePointerListener listener, @NotNull VirtualFilePointer[] pointers) {
       myListener = listener;
-      synchronized (VirtualFilePointerManagerImpl.this) {
-        Collection<VirtualFilePointerImpl> set = myUrlToPointerMaps.get(listener).values();
-        ArrayList<VirtualFilePointer> result = new ArrayList<VirtualFilePointer>(pointers);
-        result.retainAll(set);
-        myPointers = result.isEmpty() ? VirtualFilePointer.EMPTY_ARRAY  : result.toArray(new VirtualFilePointer[result.size()]);
-      }
+      myPointers = pointers;
     }
 
-    public void fireBefore() {
+    private void fireBefore() {
       if (myPointers.length != 0) {
         myListener.beforeValidityChanged(myPointers);
       }
     }
 
-    public void fireAfter() {
+    private void fireAfter() {
       if (myPointers.length != 0) {
         myListener.validityChanged(myPointers);
       }
     }
   }
 
-  private void addPointersUnder(@NotNull String path, boolean allowSameFSOptimization, @NotNull List<VirtualFilePointer> pointers) {
-    final boolean urlFromJarFS = allowSameFSOptimization && path.indexOf(JarFileSystem.JAR_SEPARATOR) > 0;
-    for (TreeMap<String, VirtualFilePointerImpl> urlToPointer : myUrlToPointerMaps.values()) {
-      for (String pointerUrl : urlToPointer.keySet()) {
-        final boolean pointerFromJarFS = allowSameFSOptimization && pointerUrl.indexOf(JarFileSystem.JAR_SEPARATOR) > 0;
-        if (urlFromJarFS != pointerFromJarFS) {
-          continue; // optimization: consider pointers from the same FS as the url specified
+  @NotNull
+  private static VirtualFilePointer[] toPointers(@NotNull List<FilePointerPartNode> pointers) {
+    if (pointers.isEmpty()) return VirtualFilePointer.EMPTY_ARRAY;
+    List<VirtualFilePointer> list = ContainerUtil
+      .mapNotNull(pointers, new Function<FilePointerPartNode, VirtualFilePointer>() {
+        @Override
+        public VirtualFilePointer fun(FilePointerPartNode pair) {
+          return pair.leaf;
         }
-        if (startsWith(path, pointerUrl)) {
-          VirtualFilePointer pointer = urlToPointer.get(pointerUrl);
-          if (pointer != null) {
-            pointers.add(pointer);
-          }
-        }
-      }
+      });
+
+    return list.toArray(new VirtualFilePointer[list.size()]);
+  }
+
+  private void addPointersUnder(@NotNull String path, @NotNull List<FilePointerPartNode> out) {
+    for (FilePointerPartNode root : myPointers.values()) {
+      root.getPointersUnder(path, 0, out);
     }
   }
 
-  private static boolean startsWith(@NotNull final String url, @NotNull final String pointerUrl) {
-    String urlSuffix = substringAfterJarSeparator(url);
-    String pointerPrefix = substringBeforeJarSeparator(pointerUrl);
-    if (!urlSuffix.isEmpty()) {
-      return Comparing.equal(substringBeforeJarSeparator(url), pointerPrefix, SystemInfo.isFileSystemCaseSensitive) &&
-             StringUtil.startsWith(urlSuffix, substringAfterJarSeparator(pointerUrl));
-    }
-
-    return FileUtil.startsWith(pointerPrefix, substringBeforeJarSeparator(url));
-  }
-
-  private static String substringBeforeJarSeparator(@NotNull String url) {
-    int separatorIndex = url.indexOf(JarFileSystem.JAR_SEPARATOR);
-    if (separatorIndex < 0) return url;
-    return url.substring(0, separatorIndex);
-  }
-
-  private static String substringAfterJarSeparator(@NotNull String url) {
-    int separatorIndex = url.indexOf(JarFileSystem.JAR_SEPARATOR);
-    if (separatorIndex < 0) return "";
-    return url.substring(separatorIndex + JarFileSystem.JAR_SEPARATOR.length());
-  }
-
   @Override
   @NotNull
   public synchronized VirtualFilePointer create(@NotNull String url, @NotNull Disposable parent, @Nullable VirtualFilePointerListener listener) {
@@ -171,11 +126,14 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
   @Override
   @NotNull
   public synchronized VirtualFilePointer create(@NotNull VirtualFile file, @NotNull Disposable parent, @Nullable VirtualFilePointerListener listener) {
-    return create(file, file.getUrl(), parent,listener);
+    return create(file, file.getUrl(), parent, listener);
   }
 
   @NotNull
-  private VirtualFilePointer create(@Nullable VirtualFile file, @NotNull String url, @NotNull final Disposable parentDisposable, @Nullable VirtualFilePointerListener listener) {
+  private VirtualFilePointer create(@Nullable VirtualFile file,
+                                    @NotNull String url,
+                                    @NotNull final Disposable parentDisposable,
+                                    @Nullable VirtualFilePointerListener listener) {
     String protocol;
     VirtualFileSystem fileSystem;
     if (file == null) {
@@ -187,7 +145,7 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
       fileSystem = file.getFileSystem();
     }
     if (fileSystem == TempFileSystem.getInstance()) {
-      // for tests, recreate always since
+      // for tests, recreate always
       VirtualFile found = fileSystem == null ? null : file != null ? file : VirtualFileManager.getInstance().findFileByUrl(url);
       return new IdentityVirtualFilePointer(found, url);
     }
@@ -209,22 +167,15 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
       // url has come from VirtualFile.getUrl() and is good enough
     }
 
-    VirtualFilePointerImpl pointer = getOrCreate(file, url, parentDisposable, listener, path);
+    VirtualFilePointerImpl pointer = getOrCreate(parentDisposable, listener, path, Pair.create(file, url));
 
-    int newCount = pointer.incrementUsageCount();
-
-    if (newCount == 1) {
-      Disposer.register(parentDisposable, pointer);
-    }
-    else {
-      //already registered
-      register(parentDisposable, pointer);
-    }
+    register(parentDisposable, pointer);
 
     return pointer;
   }
 
   private final Map<String, IdentityVirtualFilePointer> myUrlToIdentity = new THashMap<String, IdentityVirtualFilePointer>();
+  @NotNull
   private IdentityVirtualFilePointer getOrCreateIdentity(@NotNull String url, VirtualFile found) {
     IdentityVirtualFilePointer pointer = myUrlToIdentity.get(url);
     if (pointer == null) {
@@ -267,25 +218,41 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
     return path;
   }
 
-  @Nullable
-  private synchronized VirtualFilePointerImpl getOrCreate(VirtualFile file, @NotNull String url, @NotNull Disposable parentDisposable, @Nullable VirtualFilePointerListener listener, String path) {
-    TreeMap<String, VirtualFilePointerImpl> urlToPointer = myUrlToPointerMaps.get(listener);
-    if (urlToPointer == null) {
-      urlToPointer = new TreeMap<String, VirtualFilePointerImpl>(URL_COMPARATOR);
-      myUrlToPointerMaps.put(listener, urlToPointer);
+  @NotNull
+  private VirtualFilePointerImpl getOrCreate(@NotNull Disposable parentDisposable,
+                                             @Nullable VirtualFilePointerListener listener,
+                                             @NotNull String path,
+                                             @NotNull Pair<VirtualFile, String> fileAndUrl) {
+    FilePointerPartNode root = myPointers.get(listener);
+    FilePointerPartNode node;
+    if (root == null) {
+      root = new FilePointerPartNode(path, null, fileAndUrl);
+      myPointers.put(listener, root);
+      node = root;
+    }
+    else {
+      node = root.findPointerOrCreate(path, 0, fileAndUrl);
     }
-    VirtualFilePointerImpl pointer = urlToPointer.get(path);
 
-    if (pointer == null) {
-      pointer = new VirtualFilePointerImpl(file, url, myVirtualFileManager, listener, parentDisposable);
-      urlToPointer.put(path, pointer);
+    VirtualFilePointerImpl pointer;
+    if (node.leaf == null) {
+      pointer = new VirtualFilePointerImpl(listener, parentDisposable, fileAndUrl);
+      node.associate(pointer, fileAndUrl);
     }
+    else {
+      pointer = node.leaf;
+    }
+    pointer.myNode.incrementUsageCount(1);
+
+    root.checkStructure();
     return pointer;
   }
 
   @NotNull
   private static String stripTrailingPathSeparator(@NotNull String path, @NotNull String protocol) {
-    while (path.endsWith("/") && !(protocol.equals(JarFileSystem.PROTOCOL) && path.endsWith(JarFileSystem.JAR_SEPARATOR))) {
+    while (!path.isEmpty() &&
+           path.charAt(path.length() - 1) == '/' &&
+           !(protocol.equals(JarFileSystem.PROTOCOL) && path.endsWith(JarFileSystem.JAR_SEPARATOR))) {
       path = StringUtil.trimEnd(path, "/");
     }
     return path;
@@ -293,49 +260,76 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
 
   @Override
   @NotNull
-  public synchronized VirtualFilePointer duplicate(@NotNull VirtualFilePointer pointer, @NotNull Disposable parent,
+  public synchronized VirtualFilePointer duplicate(@NotNull VirtualFilePointer pointer,
+                                                   @NotNull Disposable parent,
                                                    @Nullable VirtualFilePointerListener listener) {
     VirtualFile file = pointer.getFile();
     return file == null ? create(pointer.getUrl(), parent, listener) : create(file, parent, listener);
   }
 
-  @Override
-  public void initComponent() {
-  }
-
-  @Override
-  public void disposeComponent() {
-    Disposer.dispose(this);
-    assertPointersDisposed();
-  }
-
-  public synchronized void assertPointersDisposed() {
-    for (Map.Entry<VirtualFilePointerListener, TreeMap<String, VirtualFilePointerImpl>> entry : myUrlToPointerMaps.entrySet()) {
-      VirtualFilePointerListener listener = entry.getKey();
-      TreeMap<String, VirtualFilePointerImpl> map = entry.getValue();
-      for (VirtualFilePointerImpl pointer : map.values()) {
-        //myUrlToPointerMaps.clear();
-        pointer.throwNotDisposedError("Not disposed pointer: listener="+listener);
+  private synchronized void assertAllPointersDisposed() {
+    for (Map.Entry<VirtualFilePointerListener, FilePointerPartNode> entry : myPointers.entrySet()) {
+      FilePointerPartNode root = entry.getValue();
+      ArrayList<FilePointerPartNode> left = new ArrayList<FilePointerPartNode>();
+      root.getPointersUnder("", 0, left);
+      if (!left.isEmpty()) {
+        VirtualFilePointerImpl p = left.get(0).leaf;
+        try {
+          p.throwDisposalError("Not disposed pointer: "+p.getUrlNoUpdate());
+        }
+        finally {
+          for (FilePointerPartNode pair : left) {
+            VirtualFilePointerImpl pointer = pair.leaf;
+            pointer.dispose();
+          }
+        }
       }
     }
 
     synchronized (myContainers) {
       if (!myContainers.isEmpty()) {
         VirtualFilePointerContainerImpl container = myContainers.iterator().next();
-        //myContainers.clear();
-        throw new RuntimeException("Not disposed container " + container);
+        container.throwDisposalError("Not disposed container");
       }
     }
   }
 
+  private final Set<VirtualFilePointerImpl> myStoredPointers = new THashSet<VirtualFilePointerImpl>(TObjectHashingStrategy.IDENTITY);
+  @TestOnly
+  public void storePointers() {
+    //assert myStoredPointers.isEmpty() : myStoredPointers;
+    myStoredPointers.clear();
+    addAllPointers(myStoredPointers);
+  }
+  @TestOnly
+  public void assertPointersAreDisposed() {
+    List<VirtualFilePointerImpl> pointers = new ArrayList<VirtualFilePointerImpl>();
+    addAllPointers(pointers);
+    try {
+      for (VirtualFilePointerImpl pointer : pointers) {
+        if (!myStoredPointers.contains(pointer)) {
+          pointer.throwDisposalError("Virtual pointer hasn't been disposed: "+pointer.getUrlNoUpdate());
+        }
+      }
+    }
+    finally {
+      myStoredPointers.clear();
+    }
+  }
+
+  private void addAllPointers(Collection<VirtualFilePointerImpl> pointers) {
+    List<FilePointerPartNode> out = new ArrayList<FilePointerPartNode>();
+    for (FilePointerPartNode root : myPointers.values()) {
+      root.getPointersUnder("", 0, out);
+    }
+    for (FilePointerPartNode node : out) {
+      pointers.add(node.leaf);
+    }
+  }
+
   @Override
   public void dispose() {
-  }
-
-  @Override
-  @NotNull
-  public String getComponentName() {
-    return "SmartVirtualPointerManager";
+    assertAllPointersDisposed();
   }
 
   private void incModificationCounter() {
@@ -372,6 +366,7 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
         }
       }
 
+      @NonNls
       @NotNull
       public String toString() {
         return "Disposing container " + virtualFilePointerContainer;
@@ -380,118 +375,147 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
     return virtualFilePointerContainer;
   }
 
-  private class VFSEventsProcessor implements BulkFileListener {
-    @Nullable private List<EventDescriptor> myEvents = null;
-    @Nullable private List<String> myUrlsToUpdate = null;
-    @Nullable private List<VirtualFilePointer> myPointersToUpdate = null;
+  @Nullable private List<EventDescriptor> myEvents = null;
+  @Nullable private List<FilePointerPartNode> myPointersToUpdateUrl = null;
+  @Nullable private List<FilePointerPartNode> myPointersToFire = null;
 
-    @Override
-    public void before(@NotNull final List<? extends VFileEvent> events) {
-      //ApplicationManager.getApplication().assertWriteAccessAllowed();
-      List<VirtualFilePointer> toFireEvents = new ArrayList<VirtualFilePointer>();
-      List<String> toUpdateUrl = new ArrayList<String>();
+  @Override
+  public void before(@NotNull final List<? extends VFileEvent> events) {
+    List<FilePointerPartNode> toFireEvents = new ArrayList<FilePointerPartNode>();
+    List<FilePointerPartNode> toUpdateUrl = new ArrayList<FilePointerPartNode>();
+    VirtualFilePointer[] toFirePointers;
 
-      synchronized (VirtualFilePointerManagerImpl.this) {
-        incModificationCounter();
-        for (VFileEvent event : events) {
-          if (event instanceof VFileDeleteEvent) {
-            final VFileDeleteEvent deleteEvent = (VFileDeleteEvent)event;
-            String url = deleteEvent.getFile().getPath();
-            addPointersUnder(url, true, toFireEvents);
-          }
-          else if (event instanceof VFileCreateEvent) {
-            final VFileCreateEvent createEvent = (VFileCreateEvent)event;
-            String url = createEvent.getPath();
-            addPointersUnder(url, false, toFireEvents);
-          }
-          else if (event instanceof VFileCopyEvent) {
-            final VFileCopyEvent copyEvent = (VFileCopyEvent)event;
-            String url = copyEvent.getNewParent().getPath() + "/" + copyEvent.getFile().getName();
-            addPointersUnder(url, false, toFireEvents);
-          }
-          else if (event instanceof VFileMoveEvent) {
-            final VFileMoveEvent moveEvent = (VFileMoveEvent)event;
-            List<VirtualFilePointer> pointers = new ArrayList<VirtualFilePointer>();
-            addPointersUnder(moveEvent.getFile().getPath(), false, pointers);
-            for (VirtualFilePointer pointer : pointers) {
-              VirtualFile file = pointer.getFile();
-              if (file != null) {
-                toUpdateUrl.add(file.getPath());
-              }
+    synchronized (this) {
+      incModificationCounter();
+      for (VFileEvent event : events) {
+        if (event instanceof VFileDeleteEvent) {
+          final VFileDeleteEvent deleteEvent = (VFileDeleteEvent)event;
+          String path = deleteEvent.getFile().getPath();
+          addPointersUnder(path, toFireEvents);
+        }
+        else if (event instanceof VFileCreateEvent) {
+          final VFileCreateEvent createEvent = (VFileCreateEvent)event;
+          String url = createEvent.getPath();
+          addPointersUnder(url, toFireEvents);
+        }
+        else if (event instanceof VFileCopyEvent) {
+          final VFileCopyEvent copyEvent = (VFileCopyEvent)event;
+          String url = copyEvent.getNewParent().getPath() + "/" + copyEvent.getFile().getName();
+          addPointersUnder(url, toFireEvents);
+        }
+        else if (event instanceof VFileMoveEvent) {
+          final VFileMoveEvent moveEvent = (VFileMoveEvent)event;
+          List<FilePointerPartNode> nodes = new ArrayList<FilePointerPartNode>();
+          addPointersUnder(moveEvent.getFile().getPath(), nodes);
+          for (FilePointerPartNode pair : nodes) {
+            VirtualFile file = pair.leaf.getFile();
+            if (file != null) {
+              toUpdateUrl.add(pair);
             }
           }
-          else if (event instanceof VFilePropertyChangeEvent) {
-            final VFilePropertyChangeEvent change = (VFilePropertyChangeEvent)event;
-            if (VirtualFile.PROP_NAME.equals(change.getPropertyName())) {
-              List<VirtualFilePointer> pointers = new ArrayList<VirtualFilePointer>();
-              addPointersUnder(change.getFile().getPath(), false, pointers);
-              for (VirtualFilePointer pointer : pointers) {
-                VirtualFile file = pointer.getFile();
-                if (file != null) {
-                  toUpdateUrl.add(file.getPath());
-                }
+        }
+        else if (event instanceof VFilePropertyChangeEvent) {
+          final VFilePropertyChangeEvent change = (VFilePropertyChangeEvent)event;
+          if (VirtualFile.PROP_NAME.equals(change.getPropertyName())) {
+            List<FilePointerPartNode> nodes = new ArrayList<FilePointerPartNode>();
+            addPointersUnder(change.getFile().getPath(), nodes);
+            for (FilePointerPartNode pair : nodes) {
+              VirtualFile file = pair.leaf.getFile();
+              if (file != null) {
+                toUpdateUrl.add(pair);
               }
             }
           }
         }
+      }
 
-        myEvents = new ArrayList<EventDescriptor>();
-        for (VirtualFilePointerListener listener : myUrlToPointerMaps.keySet()) {
-          if (listener == null) continue;
-          EventDescriptor event = new EventDescriptor(listener, toFireEvents);
+      myEvents = new ArrayList<EventDescriptor>();
+      toFirePointers = toPointers(toFireEvents);
+      for (final VirtualFilePointerListener listener : myPointers.keySet()) {
+        if (listener == null) continue;
+        List<VirtualFilePointer> filtered = ContainerUtil.filter(toFirePointers, new Condition<VirtualFilePointer>() {
+          @Override
+          public boolean value(VirtualFilePointer pointer) {
+            return ((VirtualFilePointerImpl)pointer).getListener() == listener;
+          }
+        });
+        if (!filtered.isEmpty()) {
+          EventDescriptor event = new EventDescriptor(listener, filtered.toArray(new VirtualFilePointer[filtered.size()]));
           myEvents.add(event);
         }
       }
-
-      for (EventDescriptor event : myEvents) {
-        event.fireBefore();
-      }
-
-      if (!toFireEvents.isEmpty()) {
-        VirtualFilePointer[] arr = toFireEvents.toArray(new VirtualFilePointer[toFireEvents.size()]);
-        myBus.syncPublisher(VirtualFilePointerListener.TOPIC).beforeValidityChanged(arr);
-      }
-
-      myPointersToUpdate = toFireEvents;
-      myUrlsToUpdate = toUpdateUrl;
     }
 
-    @Override
-    public void after(@NotNull final List<? extends VFileEvent> events) {
-      //ApplicationManager.getApplication().assertWriteAccessAllowed();
-      incModificationCounter();
+    for (EventDescriptor descriptor : myEvents) {
+      descriptor.fireBefore();
+    }
 
-      if (myUrlsToUpdate == null) {
-        return;
-      }
-      for (String url : myUrlsToUpdate) {
-        synchronized (VirtualFilePointerManagerImpl.this) {
-          for (TreeMap<String, VirtualFilePointerImpl> urlToPointer : myUrlToPointerMaps.values()) {
-            VirtualFilePointerImpl pointer = urlToPointer.remove(url);
-            if (pointer != null) {
-              String path = VfsUtil.urlToPath(pointer.getUrl());
-              urlToPointer.put(path, pointer);
-            }
+    if (!toFireEvents.isEmpty()) {
+      myBus.syncPublisher(VirtualFilePointerListener.TOPIC).beforeValidityChanged(toFirePointers);
+    }
+
+    myPointersToFire = toFireEvents;
+    myPointersToUpdateUrl = toUpdateUrl;
+  }
+
+  @Override
+  public void after(@NotNull final List<? extends VFileEvent> events) {
+    incModificationCounter();
+
+    for (FilePointerPartNode node : myPointersToUpdateUrl) {
+      synchronized (this) {
+        VirtualFilePointerImpl pointer = node.leaf;
+        String urlBefore = pointer.getUrlNoUpdate();
+        Pair<VirtualFile,String> after = node.update();
+        String urlAfter = after.second;
+        if (URL_COMPARATOR.compare(urlBefore, urlAfter) != 0) {
+          // url has changed, reinsert
+          FilePointerPartNode root = myPointers.get(pointer.getListener());
+          int useCount = node.useCount;
+          node.remove();
+          FilePointerPartNode newNode = root.findPointerOrCreate(VfsUtilCore.urlToPath(urlAfter), 0, after);
+          VirtualFilePointerImpl existingPointer = newNode.leaf;
+          if (existingPointer != null) {
+            // can happen when e.g. file renamed to the existing file
+            // merge two pointers
+            pointer.myNode = newNode;
           }
+          else {
+            newNode.associate(pointer, after);
+          }
+          newNode.incrementUsageCount(useCount);
         }
       }
+    }
 
-      for (VirtualFilePointer pointer : myPointersToUpdate) {
-        ((VirtualFilePointerImpl)pointer).update();
-      }
+    VirtualFilePointer[] pointersToFireArray = toPointers(myPointersToFire);
+    for (VirtualFilePointer pointer : pointersToFireArray) {
+      ((VirtualFilePointerImpl)pointer).myNode.update();
+    }
 
-      for (EventDescriptor event : myEvents) {
-        event.fireAfter();
-      }
+    for (EventDescriptor event : myEvents) {
+      event.fireAfter();
+    }
 
-      if (!myPointersToUpdate.isEmpty()) {
-        VirtualFilePointer[] arr = myPointersToUpdate.toArray(new VirtualFilePointer[myPointersToUpdate.size()]);
-        myBus.syncPublisher(VirtualFilePointerListener.TOPIC).validityChanged(arr);
-      }
+    if (pointersToFireArray.length != 0) {
+      myBus.syncPublisher(VirtualFilePointerListener.TOPIC).validityChanged(pointersToFireArray);
+    }
 
-      myUrlsToUpdate = null;
-      myEvents = null;
-      myPointersToUpdate = null;
+    myPointersToUpdateUrl = null;
+    myEvents = null;
+    myPointersToFire = null;
+    for (FilePointerPartNode root : myPointers.values()) {
+      root.checkStructure();
+    }
+  }
+
+  void removeNode(@NotNull FilePointerPartNode node, VirtualFilePointerListener listener) {
+    boolean rootNodeEmpty = node.remove();
+    if (rootNodeEmpty) {
+      myPointers.remove(listener);
+    }
+    else {
+      myPointers.get(listener).checkStructure();
     }
   }
 
@@ -505,17 +529,21 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
 
     @Override
     public void dispose() {
-      myPointer.useCount -= disposeCount-1;
-      LOG.assertTrue(myPointer.useCount > 0);
+      if (disposeCount != 1) {
+        int after = myPointer.myNode.incrementUsageCount(-disposeCount+1);
+        LOG.assertTrue(after > 0, after);
+      }
       myPointer.dispose();
     }
 
+    @NonNls
     @NotNull
     @Override
     public String toString() {
       return "D:" + myPointer.toString();
     }
 
+    @SuppressWarnings("EqualsWhichDoesntCheckParameterClass")
     @Override
     public boolean equals(Object o) {
       DelegatingDisposable that = (DelegatingDisposable)o;
@@ -529,51 +557,15 @@ public class VirtualFilePointerManagerImpl extends VirtualFilePointerManager imp
   }
 
   @TestOnly
-  public int countPointers() {
-    int result = 0;
-    for (TreeMap<String, VirtualFilePointerImpl> map : myUrlToPointerMaps.values()) {
-      result += map.values().size();
+  int numberOfPointers() {
+    int number = 0;
+    for (FilePointerPartNode root : myPointers.values()) {
+      number = root.getPointersUnder();
     }
-    return result;
+    return number;
   }
-
   @TestOnly
-  public int countDupContainers() {
-    Map<VirtualFilePointerContainer,Integer> c = new THashMap<VirtualFilePointerContainer,Integer>();
-    for (VirtualFilePointerContainerImpl container : myContainers) {
-      Integer count = c.get(container);
-      if (count == null) count = 0;
-      count++;
-      c.put(container, count);
-    }
-    int i = 0;
-    for (Integer count : c.values()) {
-      if (count > 1) {
-        i++;
-      }
-    }
-    return i;
+  int numberOfListeners() {
+    return myPointers.keySet().size();
   }
-  
-  @TestOnly
-  public static int countMaxRefCount() {
-    int result = 0;
-    for (Disposable disposable : Disposer.getTree().getRootObjects()) {
-      result = calcMaxRefCount(disposable, result);
-    }
-    return result;
-  }
-
-  private static int calcMaxRefCount(@NotNull Disposable disposable, int result) {
-    if (disposable instanceof DelegatingDisposable) {
-      result = Math.max(((DelegatingDisposable)disposable).disposeCount, result);
-    }
-
-    for (ObjectNode<Disposable> node : Disposer.getTree().getNode(disposable).getChildren()) {
-      result = calcMaxRefCount(node.getObject(), result);
-    }
-    return result;
-  }
-
-  
 }
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index b9a32b2443c2..dc9af1bf026d 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -13,6 +13,8 @@
 
   <applicationService serviceInterface="com.intellij.openapi.vfs.tracker.VirtualFileTracker"
                       serviceImplementation="com.intellij.openapi.vfs.tracker.VirtualFileTrackerImpl"/>
+  <applicationService serviceInterface="com.intellij.openapi.vfs.pointers.VirtualFilePointerManager"
+                      serviceImplementation="com.intellij.openapi.vfs.impl.VirtualFilePointerManagerImpl"/>
 
   <applicationService serviceInterface="com.intellij.concurrency.JobScheduler"
                       serviceImplementation="com.intellij.concurrency.JobSchedulerImpl"/>
diff --git a/platform/platform-resources/src/componentSets/Platform.xml b/platform/platform-resources/src/componentSets/Platform.xml
index e57330874c2d..4ebba7a15ca3 100644
--- a/platform/platform-resources/src/componentSets/Platform.xml
+++ b/platform/platform-resources/src/componentSets/Platform.xml
@@ -25,11 +25,6 @@
       <implementation-class>com.intellij.openapi.vfs.newvfs.persistent.PersistentFS</implementation-class>
     </component>
 
-    <component>
-      <interface-class>com.intellij.openapi.vfs.pointers.VirtualFilePointerManager</interface-class>
-      <implementation-class>com.intellij.openapi.vfs.impl.VirtualFilePointerManagerImpl</implementation-class>
-    </component>
-
     <component>
       <interface-class>com.intellij.openapi.vfs.LocalFileSystem</interface-class>
       <implementation-class>com.intellij.openapi.vfs.impl.local.LocalFileSystemImpl</implementation-class>
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VirtualFilePointerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
similarity index 76%
rename from platform/platform-tests/testSrc/com/intellij/openapi/vfs/VirtualFilePointerTest.java
rename to platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
index fd28150311a2..29bd793693db 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VirtualFilePointerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/impl/VirtualFilePointerTest.java
@@ -13,16 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.openapi.vfs;
+package com.intellij.openapi.vfs.impl;
 
 import com.intellij.concurrency.JobUtil;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ex.PathManagerEx;
 import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vfs.impl.VirtualFilePointerImpl;
+import com.intellij.openapi.vfs.*;
+import com.intellij.openapi.vfs.newvfs.events.VFileCreateEvent;
+import com.intellij.openapi.vfs.newvfs.events.VFileEvent;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerListener;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
@@ -40,17 +43,40 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 /**
  *  @author dsl
  */
 public class VirtualFilePointerTest extends PlatformLangTestCase {
-  private VirtualFilePointerManager myVirtualFilePointerManager;
+  private VirtualFilePointerManagerImpl myVirtualFilePointerManager;
+  private int numberOfPointersBefore;
+  private final Disposable disposable = Disposer.newDisposable();
+  private int numberOfListenersBefore;
 
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    myVirtualFilePointerManager = VirtualFilePointerManager.getInstance();
+    myVirtualFilePointerManager = (VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance();
+    numberOfPointersBefore = myVirtualFilePointerManager.numberOfPointers();
+    numberOfListenersBefore = myVirtualFilePointerManager.numberOfListeners();
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    Disposer.dispose(disposable);
+    try {
+      assertEquals(numberOfPointersBefore, myVirtualFilePointerManager.numberOfPointers()); // check there is no leak
+      assertEquals(numberOfListenersBefore, myVirtualFilePointerManager.numberOfListeners()); // check there is no leak
+    }
+    finally {
+      super.tearDown();
+    }
+  }
+
+  @Override
+  protected boolean isRunInWriteAction() {
+    return false;
   }
 
   private static class LoggingListener implements VirtualFilePointerListener {
@@ -92,20 +118,9 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     final LoggingListener fileToDeleteListener = new LoggingListener();
     final VirtualFilePointer fileToDeletePointer = createPointerByFile(fileToDelete, fileToDeleteListener);
     assertTrue(fileToDeletePointer.isValid());
-    ApplicationManager.getApplication().runWriteAction(new Runnable() {
-      @Override
-      public void run() {
-        final VirtualFile virtualFile = getVirtualFile(fileToDelete);
-        try {
-          virtualFile.delete(null);
-        } catch (IOException e) {
-          fail();
-        }
-      }
-    });
+    delete(getVirtualFile(fileToDelete));
     assertFalse(fileToDeletePointer.isValid());
     assertEquals("[before:true, after:false]", fileToDeleteListener.getLog().toString());
-    myFilesToDelete.add(tempDirectory);
   }
 
   public void testCreate() throws Exception {
@@ -115,19 +130,6 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     final VirtualFilePointer fileToCreatePointer = createPointerByFile(fileToCreate, fileToCreateListener);
     assertFalse(fileToCreatePointer.isValid());
     fileToCreate.createNewFile();
-    final Runnable postRunnable = new Runnable() {
-      @Override
-      public void run() {
-        assertTrue(fileToCreatePointer.isValid());
-        assertEquals("[before:false, after:true]", fileToCreateListener.getLog().toString());
-        try {
-          String expectedUrl = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, fileToCreate.getCanonicalPath().replace(File.separatorChar, '/'));
-          assertEquals(expectedUrl.toUpperCase(), fileToCreatePointer.getUrl().toUpperCase());
-        } catch (IOException e) {
-          fail();
-        }
-      }
-    };
     ApplicationManager.getApplication().runWriteAction(new Runnable() {
       @Override
       public void run() {
@@ -136,9 +138,16 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
         virtualFile.refresh(false, true);
       }
     });
-    postRunnable.run();
-    myFilesToDelete.add(fileToCreate);
-    myFilesToDelete.add(tempDirectory);
+    assertTrue(fileToCreatePointer.isValid());
+    assertEquals("[before:false, after:true]", fileToCreateListener.getLog().toString());
+    try {
+      String expectedUrl = VirtualFileManager
+        .constructUrl(LocalFileSystem.PROTOCOL, fileToCreate.getCanonicalPath().replace(File.separatorChar, '/'));
+      assertEquals(expectedUrl.toUpperCase(), fileToCreatePointer.getUrl().toUpperCase());
+    }
+    catch (IOException e) {
+      fail();
+    }
   }
 
   public void testMove() throws Exception {
@@ -160,17 +169,14 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
         assertTrue(target.isValid());
         try {
           virtualFile.move(null, target);
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
           fail();
         }
       }
     });
     assertTrue(fileToMovePointer.isValid());
     assertEquals("[]", fileToMoveListener.getLog().toString());
-    final File fileAfterMove = new File(moveTarget, fileToMove.getName());
-    myFilesToDelete.add(fileAfterMove);
-    myFilesToDelete.add(moveTarget);
-    myFilesToDelete.add(tempDirectory);
   }
 
   public void testCreate1() throws Exception {
@@ -202,8 +208,6 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
       }
     });
     postRunnable.run();
-    myFilesToDelete.add(fileToCreate);
-    myFilesToDelete.add(tempDirectory);
   }
 
   public void testMultipleNotifications() throws Exception {
@@ -224,8 +228,6 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
       }
     });
     assertEquals("[before:false:false, after:true:true]", listener.getLog().toString());
-    myFilesToDelete.add(file_f1);
-    myFilesToDelete.add(file_f2);
   }
 
   public void testJars() throws Exception {
@@ -233,7 +235,7 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     final File jarParent = new File(tempDir, "jarParent");
     jarParent.mkdir();
     final File jar = new File(jarParent, "x.jar");
-    final File originalJar = new File(PathManagerEx.getTestDataPath() + "/psi/generics22/collect-2.2.jar".replace('/', File.separatorChar));
+    final File originalJar = new File(PathManagerEx.getTestDataPath() + "/psi/generics22/collect-2.2.jar");
     FileUtil.copy(originalJar, jar);
 
     LocalFileSystem.getInstance().refreshAndFindFileByIoFile(jar); // Make sure we receive events when jar changes
@@ -252,9 +254,8 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     };
     final VirtualFilePointer jarParentPointer = createPointerByFile(jarParent, listener);
     final String pathInJar = jar.getPath().replace(File.separatorChar, '/') + JarFileSystem.JAR_SEPARATOR;
-    final String jarUrl = VirtualFileManager.constructUrl(JarFileSystem.PROTOCOL,
-                                                          pathInJar);
-    final VirtualFilePointer jarPointer = myVirtualFilePointerManager.create(jarUrl, myProject, listener);
+    final String jarUrl = VirtualFileManager.constructUrl(JarFileSystem.PROTOCOL, pathInJar);
+    final VirtualFilePointer jarPointer = myVirtualFilePointerManager.create(jarUrl, disposable, listener);
     pointersToWatch[0] = jarParentPointer;
     pointersToWatch[1] = jarPointer;
     assertTrue(jarParentPointer.isValid());
@@ -295,7 +296,7 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     final File jarParent = new File(tempDir, "jarParent");
     jarParent.mkdir();
     final File jar = new File(jarParent, "x.jar");
-    final File originalJar = new File(PathManagerEx.getTestDataPath() + "/psi/generics22/collect-2.2.jar".replace('/', File.separatorChar));
+    final File originalJar = new File(PathManagerEx.getTestDataPath() + "/psi/generics22/collect-2.2.jar");
     FileUtil.copy(originalJar, jar);
 
     LocalFileSystem.getInstance().refreshAndFindFileByIoFile(jar); // Make sure we receive events when jar changes
@@ -313,14 +314,14 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
       }
     };
     final String pathInJar = jar.getPath().replace(File.separatorChar, '/') + JarFileSystem.JAR_SEPARATOR;
-    final String jarUrl = VirtualFileManager.constructUrl(JarFileSystem.PROTOCOL,
-                                                          pathInJar);
-    final VirtualFilePointer jarPointer = myVirtualFilePointerManager.create(jarUrl, myProject, listener);
+    final String jarUrl = VirtualFileManager.constructUrl(JarFileSystem.PROTOCOL, pathInJar);
+    final VirtualFilePointer jarPointer = myVirtualFilePointerManager.create(jarUrl, disposable, listener);
     pointersToWatch[0] = jarPointer;
     assertTrue(jarPointer.isValid());
 
     jar.delete();
     refreshVFS();
+    refreshVFS();
 
     verifyPointersInCorrectState(pointersToWatch);
     assertFalse(jarPointer.isValid());
@@ -362,22 +363,11 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
   }
 
   private VirtualFilePointer createPointerByFile(final File file, final VirtualFilePointerListener fileListener) throws IOException {
-    final VirtualFile[] vFile = new VirtualFile[1];
     final String url = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, file.getCanonicalPath().replace(File.separatorChar, '/'));
-    ApplicationManager.getApplication().runWriteAction(new Runnable() {
-      @Override
-      public void run() {
-        vFile[0] = VirtualFileManager.getInstance().refreshAndFindFileByUrl(url);
-      }
-    });
-    final VirtualFilePointer fileToDeletePointer;
-    if (vFile[0] == null) {
-      fileToDeletePointer = myVirtualFilePointerManager.create(url, myProject, fileListener);
-    }
-    else {
-      fileToDeletePointer = myVirtualFilePointerManager.create(vFile[0], myProject, fileListener);
-    }
-    return fileToDeletePointer;
+    final VirtualFile vFile = refreshAndFind(url);
+    return vFile == null
+           ? myVirtualFilePointerManager.create(url, disposable, fileListener)
+           : myVirtualFilePointerManager.create(vFile, disposable, fileListener);
   }
 
   public void testFilePointerUpdate() throws Exception {
@@ -403,8 +393,8 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     assertFalse(pointer.isValid());
   }
 
-  public void testContainerDeletePerformance() throws Exception {
-    PlatformTestUtil.startPerformanceTest("VF Pointer create/delete",3000, new ThrowableRunnable() {
+  public void testContainerCreateDeletePerformance() throws Exception {
+    PlatformTestUtil.startPerformanceTest("VF container create/delete",200, new ThrowableRunnable() {
       @Override
       public void run() throws Exception {
         Disposable parent = Disposer.newDisposable();
@@ -431,17 +421,12 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     boolean created = file.createNewFile();
     assertTrue(created);
 
-    final VirtualFile[] vFile = new VirtualFile[1];
+
     final String url = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, file.getCanonicalPath().replace(File.separatorChar, '/'));
-    ApplicationManager.getApplication().runWriteAction(new Runnable() {
-      @Override
-      public void run() {
-        vFile[0] = VirtualFileManager.getInstance().refreshAndFindFileByUrl(url);
-      }
-    });
+    final VirtualFile vFile = refreshAndFind(url);
 
     Disposable disposable = Disposer.newDisposable();
-    final VirtualFilePointer pointer = myVirtualFilePointerManager.create(vFile[0], disposable, new VirtualFilePointerListener() {
+    final VirtualFilePointer pointer = myVirtualFilePointerManager.create(vFile, disposable, new VirtualFilePointerListener() {
       @Override
       public void beforeValidityChanged(@NotNull VirtualFilePointer[] pointers) {
       }
@@ -458,7 +443,16 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     assertFalse(pointer.isValid());
   }
 
-  public void testThreads() throws IOException, InterruptedException {
+  private static VirtualFile refreshAndFind(@NotNull final String url) {
+    return ApplicationManager.getApplication().runWriteAction(new Computable<VirtualFile>() {
+      @Override
+      public VirtualFile compute() {
+        return VirtualFileManager.getInstance().refreshAndFindFileByUrl(url);
+      }
+    });
+  }
+
+  public void testThreadsPerformance() throws IOException, InterruptedException {
     final File ioTempDir = createTempDirectory();
     final File ioPtrBase = new File(ioTempDir, "parent");
     final File ioPtr = new File(ioPtrBase, "f1");
@@ -479,15 +473,16 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     VirtualFileAdapter listener = new VirtualFileAdapter() {
       @Override
       public void fileCreated(VirtualFileEvent event) {
-        doit(pointer);
+        stressRead(pointer);
       }
 
       @Override
       public void fileDeleted(VirtualFileEvent event) {
-        doit(pointer);
+        stressRead(pointer);
       }
     };
-    VirtualFileManager.getInstance().addVirtualFileListener(listener, getTestRootDisposable());
+    Disposable disposable = Disposer.newDisposable();
+    VirtualFileManager.getInstance().addVirtualFileListener(listener, disposable);
     int N = Timings.adjustAccordingToMySpeed(1000, false);
     System.out.println("N = " + N);
     for (int i=0;i< N;i++) {
@@ -511,13 +506,14 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
       assertTrue(ioPtrBase.mkdirs());
       assertTrue(ioPtr.createNewFile());
 
-      doit(pointer);
+      stressRead(pointer);
       doVfsRefresh();
     }
+
+    Disposer.dispose(disposable); // unregister listener early
   }
 
-  private static void doit(final VirtualFilePointer pointer) {
-    if (((VirtualFilePointerImpl)pointer).isDisposed()) return;
+  private static void stressRead(@NotNull final VirtualFilePointer pointer) {
     boolean b = JobUtil.invokeConcurrentlyUnderProgress(Collections.nCopies(10, null), null, false, new Processor<Object>() {
       @Override
       public boolean process(Object o) {
@@ -537,8 +533,46 @@ public class VirtualFilePointerTest extends PlatformLangTestCase {
     assertTrue(b);
   }
 
-  @Override
-  protected boolean isRunInWriteAction() {
-    return false;
+  public void testManyPointersUpdatePerformance() throws IOException {
+    FilePointerPartNode.pushDebug(false, disposable);
+    LoggingListener listener = new LoggingListener();
+    final List<VFileEvent> events = new ArrayList<VFileEvent>();
+    final File ioTempDir = createTempDirectory();
+    final VirtualFile temp = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(ioTempDir);
+    for (int i=0; i<100000; i++) {
+      myVirtualFilePointerManager.create(VfsUtilCore.pathToUrl("/a/b/c/d/" + i), disposable, listener);
+      events.add(new VFileCreateEvent(this, temp, "xxx" + i, false, true));
+    }
+    PlatformTestUtil.startPerformanceTest("vfp update", 10000, new ThrowableRunnable() {
+      @Override
+      public void run() throws Throwable {
+        for (int i=0; i<100; i++) {
+          // simulate VFS refresh events since launching the actual refresh is too slow
+          myVirtualFilePointerManager.before(events);
+          myVirtualFilePointerManager.after(events);
+        }
+      }
+    }).assertTiming();
+  }
+
+  public void testTwoPointersBecomeOneAfterFileRenamedUnderTheOtherName() throws IOException {
+    final File tempDir = createTempDirectory();
+    final File f1 = new File(tempDir, "f1");
+    boolean created = f1.createNewFile();
+    assertTrue(created);
+
+    final String url1 = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, f1.getCanonicalPath().replace(File.separatorChar, '/'));
+    final VirtualFile vFile1 = refreshAndFind(url1);
+
+    VirtualFilePointer pointer1 = myVirtualFilePointerManager.create(url1, disposable, null);
+    assertTrue(pointer1.isValid());
+    String url2 = VirtualFileManager.constructUrl(LocalFileSystem.PROTOCOL, tempDir.getCanonicalPath().replace(File.separatorChar, '/')+"/f2");
+    VirtualFilePointer pointer2 = myVirtualFilePointerManager.create(url2, disposable, null);
+    assertFalse(pointer2.isValid());
+
+    rename(vFile1, "f2");
+
+    assertTrue(pointer1.isValid());
+    assertTrue(pointer2.isValid());
   }
 }
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java
index 144bf1d5742c..0c14f36da6a0 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ContentEntryImpl.java
@@ -43,9 +43,9 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.SimpleContentEntryImpl");
   @NotNull private final VirtualFilePointer myRoot;
   @NonNls public static final String ELEMENT_NAME = "content";
-  private final LinkedHashSet<SourceFolder> mySourceFolders = new LinkedHashSet<SourceFolder>();
-  private final TreeSet<ExcludeFolder> myExcludeFolders = new TreeSet<ExcludeFolder>(ContentFolderComparator.INSTANCE);
-  private final TreeSet<ExcludedOutputFolder> myExcludedOutputFolders = new TreeSet<ExcludedOutputFolder>(ContentFolderComparator.INSTANCE);
+  private final Set<SourceFolder> mySourceFolders = new LinkedHashSet<SourceFolder>();
+  private final Set<ExcludeFolder> myExcludeFolders = new TreeSet<ExcludeFolder>(ContentFolderComparator.INSTANCE);
+  private final Set<ExcludedOutputFolder> myExcludedOutputFolders = new TreeSet<ExcludedOutputFolder>(ContentFolderComparator.INSTANCE);
   @NonNls public static final String URL_ATTRIBUTE = "url";
 
   ContentEntryImpl(@NotNull VirtualFile file, @NotNull RootModelImpl m) {
@@ -72,16 +72,15 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
   }
 
   private void initSourceFolders(@NotNull Element e) throws InvalidDataException {
-    mySourceFolders.clear();
     for (Object child : e.getChildren(SourceFolderImpl.ELEMENT_NAME)) {
-      mySourceFolders.add(new SourceFolderImpl((Element)child, this));
+      addSourceFolder(new SourceFolderImpl((Element)child, this));
     }
   }
 
   private void initExcludeFolders(@NotNull Element e) throws InvalidDataException {
-    myExcludeFolders.clear();
     for (Object child : e.getChildren(ExcludeFolderImpl.ELEMENT_NAME)) {
-      myExcludeFolders.add(new ExcludeFolderImpl((Element)child, this));
+      ExcludeFolderImpl excludeFolder = new ExcludeFolderImpl((Element)child, this);
+      addExcludeFolder(excludeFolder);
     }
   }
 
@@ -178,6 +177,7 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
 
   private SourceFolder addSourceFolder(SourceFolderImpl f) {
     mySourceFolders.add(f);
+    Disposer.register(this, f); //rewire source folder dispose parent from rootmodel to this content root
     return f;
   }
 
@@ -185,13 +185,21 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
   public void removeSourceFolder(@NotNull SourceFolder sourceFolder) {
     assert !isDisposed();
     assertCanRemoveFrom(sourceFolder, mySourceFolders);
+    doRemove(sourceFolder);
+  }
+
+  private void doRemove(SourceFolder sourceFolder) {
     mySourceFolders.remove(sourceFolder);
+    Disposer.dispose((Disposable)sourceFolder);
   }
 
   @Override
   public void clearSourceFolders() {
     assert !isDisposed();
     getRootModel().assertWritable();
+    for (SourceFolder folder : mySourceFolders) {
+      Disposer.dispose((Disposable)folder);
+    }
     mySourceFolders.clear();
   }
 
@@ -223,16 +231,21 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
     assert !isDisposed();
     assertCanRemoveFrom(excludeFolder, myExcludeFolders);
     myExcludeFolders.remove(excludeFolder);
+    Disposer.dispose((Disposable)excludeFolder);
   }
 
   @Override
   public void clearExcludeFolders() {
     assert !isDisposed();
     getRootModel().assertWritable();
+    for (ExcludeFolder excludeFolder : myExcludeFolders) {
+      Disposer.dispose((Disposable)excludeFolder);
+    }
     myExcludeFolders.clear();
   }
 
   private ExcludeFolder addExcludeFolder(ExcludeFolder f) {
+    Disposer.register(this, (Disposable)f);
     myExcludeFolders.add(f);
     return f;
   }
@@ -263,14 +276,14 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
     for (final SourceFolder sourceFolder : mySourceFolders) {
       if (sourceFolder instanceof ClonableContentFolder) {
         ContentFolder folder = ((ClonableContentFolder)sourceFolder).cloneFolder(cloned);
-        cloned.mySourceFolders.add((SourceFolder)folder);
+        cloned.addSourceFolder((SourceFolderImpl)folder);
       }
     }
 
     for (final ExcludeFolder excludeFolder : myExcludeFolders) {
       if (excludeFolder instanceof ClonableContentFolder) {
         ContentFolder folder = ((ClonableContentFolder)excludeFolder).cloneFolder(cloned);
-        cloned.myExcludeFolders.add((ExcludeFolder)folder);
+        cloned.addExcludeFolder((ExcludeFolder)folder);
       }
     }
 
@@ -284,18 +297,6 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
     return cloned;
   }
 
-  @Override
-  public void dispose() {
-    super.dispose();
-    for (final Object mySourceFolder : mySourceFolders) {
-      ContentFolder contentFolder = (ContentFolder)mySourceFolder;
-      Disposer.dispose((Disposable)contentFolder);
-    }
-    for (final ExcludeFolder excludeFolder : myExcludeFolders) {
-      Disposer.dispose((Disposable)excludeFolder);
-    }
-  }
-
   public void writeExternal(@NotNull Element element) throws WriteExternalException {
     assert !isDisposed();
     LOG.assertTrue(ELEMENT_NAME.equals(element.getName()));
@@ -317,18 +318,6 @@ public class ContentEntryImpl extends RootModelComponentBase implements ContentE
     }
   }
 
-  //private static final class ContentFolderComparator implements Comparator<ContentFolder> {
-  //  public static final ContentFolderComparator INSTANCE = new ContentFolderComparator();
-  //
-  //  public int compare(ContentFolder o1, ContentFolder o2) {
-  //    if (o1 instanceof ContentFolderBaseImpl && o2 instanceof ContentFolderBaseImpl) {
-  //      ((ContentFolderBaseImpl)o1).compareTo((ContentFolderBaseImpl)o2);
-  //    }
-  //    int i = o1.getUrl().compareTo(o2.getUrl());
-  //    if (i != 0) return i;
-  //    return System.identityHashCode(o1) - System.identityHashCode(o2);
-  //  }
-  //}
   private static final class ContentFolderComparator implements Comparator<ContentFolder> {
     public static final ContentFolderComparator INSTANCE = new ContentFolderComparator();
 
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
index 7f567119f720..14b0ba6ecb79 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/RootModelImpl.java
@@ -80,16 +80,8 @@ public class RootModelImpl implements ModifiableRootModel {
 
   @NonNls private static final String ROOT_ELEMENT = "root";
   private final ProjectRootManagerImpl myProjectRootManager;
-  // have to register all child disposables using this fake object since all clients call just ModifiableModel.dispose()
-  private final List<Disposable> myModelComponents = Collections.synchronizedList(new ArrayList<Disposable>());
-  private final Disposable myDisposable = new Disposable() {
-    @Override
-    public void dispose() {
-      for (Disposable component : myModelComponents) {
-        Disposer.dispose(component);
-      }
-    }
-  };
+  // have to register all child disposables using this fake object since all clients just call ModifiableModel.dispose()
+  private final Disposable myDisposable = Disposer.newDisposable();
 
   RootModelImpl(@NotNull ModuleRootManagerImpl moduleRootManager, ProjectRootManagerImpl projectRootManager, VirtualFilePointerManager filePointerManager) {
     myModuleRootManager = moduleRootManager;
@@ -205,7 +197,8 @@ public class RootModelImpl implements ModifiableRootModel {
     final Set<ContentEntry> thatContent = rootModel.myContent;
     for (ContentEntry contentEntry : thatContent) {
       if (contentEntry instanceof ClonableContentEntry) {
-        myContent.add(((ClonableContentEntry)contentEntry).cloneEntry(this));
+        ContentEntry cloned = ((ClonableContentEntry)contentEntry).cloneEntry(this);
+        myContent.add(cloned);
       }
     }
 
@@ -393,14 +386,14 @@ public class RootModelImpl implements ModifiableRootModel {
   }
 
   @Override
-  public void removeContentEntry(ContentEntry entry) {
+  public void removeContentEntry(@NotNull ContentEntry entry) {
     assertWritable();
     LOG.assertTrue(myContent.contains(entry));
     myContent.remove(entry);
   }
 
   @Override
-  public void addOrderEntry(OrderEntry entry) {
+  public void addOrderEntry(@NotNull OrderEntry entry) {
     assertWritable();
     LOG.assertTrue(!myOrderEntries.contains(entry));
     myOrderEntries.add(entry);
@@ -408,7 +401,7 @@ public class RootModelImpl implements ModifiableRootModel {
 
   @NotNull
   @Override
-  public LibraryOrderEntry addLibraryEntry(Library library) {
+  public LibraryOrderEntry addLibraryEntry(@NotNull Library library) {
     assertWritable();
     final LibraryOrderEntry libraryOrderEntry = new LibraryOrderEntryImpl(library, this, myProjectRootManager);
     assert libraryOrderEntry.isValid();
@@ -458,7 +451,7 @@ public class RootModelImpl implements ModifiableRootModel {
   }
 
   @Override
-  public void removeOrderEntry(OrderEntry entry) {
+  public void removeOrderEntry(@NotNull OrderEntry entry) {
     assertWritable();
     removeOrderEntryInternal(entry);
   }
@@ -530,7 +523,8 @@ public class RootModelImpl implements ModifiableRootModel {
     if (areContentEntriesChanged()) {
       getSourceModel().myContent.clear();
       for (ContentEntry contentEntry : myContent) {
-        getSourceModel().myContent.add(((ClonableContentEntry)contentEntry).cloneEntry(getSourceModel()));
+        ContentEntry cloned = ((ClonableContentEntry)contentEntry).cloneEntry(getSourceModel());
+        getSourceModel().myContent.add(cloned);
       }
     }
 
@@ -655,7 +649,7 @@ public class RootModelImpl implements ModifiableRootModel {
   }
 
   @Override
-  public void setInvalidSdk(String jdkName, String jdkType) {
+  public void setInvalidSdk(@NotNull String jdkName, String jdkType) {
     assertWritable();
     replaceEntryOfType(JdkOrderEntry.class, new ModuleJdkOrderEntryImpl(jdkName, jdkType, this, myProjectRootManager));
   }
@@ -901,7 +895,6 @@ public class RootModelImpl implements ModifiableRootModel {
     myExtensions.clear();
     myWritable = false;
     myDisposed = true;
-    myModelComponents.clear();
   }
 
   @Override
@@ -1129,6 +1122,6 @@ public class RootModelImpl implements ModifiableRootModel {
   }
 
   void registerOnDispose(@NotNull Disposable disposable) {
-    myModelComponents.add(disposable);
+    Disposer.register(myDisposable, disposable);
   }
 }
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java
index 0b5d61152b59..e950f6497706 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java
@@ -28,11 +28,10 @@ import com.intellij.openapi.roots.RootProvider;
 import com.intellij.openapi.roots.impl.RootModelImpl;
 import com.intellij.openapi.roots.impl.RootProviderBaseImpl;
 import com.intellij.openapi.roots.libraries.*;
-import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.InvalidDataException;
-import com.intellij.openapi.util.WriteExternalException;
-import com.intellij.openapi.vfs.*;
+import com.intellij.openapi.util.*;
+import com.intellij.openapi.vfs.StandardFileSystems;
+import com.intellij.openapi.vfs.VfsUtilCore;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointer;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerContainer;
 import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
@@ -53,7 +52,7 @@ import java.util.*;
 /**
  * @author dsl
  */
-public class LibraryImpl implements LibraryEx.ModifiableModelEx, LibraryEx {
+public class LibraryImpl extends TraceableDisposable implements LibraryEx.ModifiableModelEx, LibraryEx {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.impl.impl.LibraryImpl");
   @NonNls public static final String LIBRARY_NAME_ATTR = "name";
   @NonNls public static final String LIBRARY_TYPE_ATTR = "type";
@@ -73,32 +72,51 @@ public class LibraryImpl implements LibraryEx.ModifiableModelEx, LibraryEx {
   private final ModifiableRootModel myRootModel;
   private boolean myDisposed;
   private final Disposable myPointersDisposable = Disposer.newDisposable();
-  private final JarDirectoryWatcher myRootsWatcher = JarDirectoryWatcherFactory.getInstance().createWatcher(myJarDirectories,
-                                                                                                            myRootProvider);
+  private final JarDirectoryWatcher myRootsWatcher = JarDirectoryWatcherFactory.getInstance().createWatcher(myJarDirectories, myRootProvider);
 
   LibraryImpl(LibraryTable table, Element element, ModifiableRootModel rootModel) throws InvalidDataException {
-    myLibraryTable = table;
-    myRootModel = rootModel;
-    mySource = null;
-    readName(element);
+    this(table, rootModel, null, element.getAttributeValue(LIBRARY_NAME_ATTR),
+         (PersistentLibraryKind<?>)LibraryKind.findById(element.getAttributeValue(LIBRARY_TYPE_ATTR)));
     readProperties(element);
     myJarDirectories.readExternal(element);
-    //init roots depends on my hashcode, hashcode depends on jardirectories and name
-    myRoots = initRoots();
     readRoots(element);
     myRootsWatcher.updateWatchedRoots();
   }
 
   LibraryImpl(String name, @Nullable final PersistentLibraryKind<?> kind, LibraryTable table, ModifiableRootModel rootModel) {
-    myName = name;
-    myLibraryTable = table;
-    myRootModel = rootModel;
-    myKind = kind;
+    this(table, rootModel, null, name, kind);
     if (kind != null) {
       myProperties = kind.createDefaultProperties();
     }
+  }
+
+  private LibraryImpl(@NotNull LibraryImpl from, LibraryImpl newSource, ModifiableRootModel rootModel) {
+    this(from.myLibraryTable, rootModel, newSource, from.myName, from.myKind);
+    assert !from.isDisposed();
+    if (from.myKind != null && from.myProperties != null) {
+      myProperties = myKind.createDefaultProperties();
+      //noinspection unchecked
+      myProperties.loadState(from.myProperties.getState());
+    }
+    for (OrderRootType rootType : getAllRootTypes()) {
+      final VirtualFilePointerContainer thisContainer = myRoots.get(rootType);
+      final VirtualFilePointerContainer thatContainer = from.myRoots.get(rootType);
+      thisContainer.addAll(thatContainer);
+    }
+    myJarDirectories.copyFrom(from.myJarDirectories);
+  }
+
+  // primary
+  private LibraryImpl(LibraryTable table, ModifiableRootModel rootModel, LibraryImpl newSource, String name, @Nullable final PersistentLibraryKind<?> kind) {
+    super(new Throwable());
+    myLibraryTable = table;
+    myRootModel = rootModel;
+    mySource = newSource;
+    myKind = kind;
+    myName = name;
+    //init roots depends on my myKind
     myRoots = initRoots();
-    mySource = null;
+    Disposer.register(this, myRootsWatcher);
   }
 
   private Set<OrderRootType> getAllRootTypes() {
@@ -110,32 +128,13 @@ public class LibraryImpl implements LibraryEx.ModifiableModelEx, LibraryEx {
     return rootTypes;
   }
 
-  private LibraryImpl(LibraryImpl from, LibraryImpl newSource, ModifiableRootModel rootModel) {
-    assert !from.isDisposed();
-    myRootModel = rootModel;
-    myName = from.myName;
-    myKind = from.myKind;
-    if (from.myKind != null && from.myProperties != null) {
-      myProperties = myKind.createDefaultProperties();
-      //noinspection unchecked
-      myProperties.loadState(from.myProperties.getState());
-    }
-    myRoots = initRoots();
-    mySource = newSource;
-    myLibraryTable = from.myLibraryTable;
-    for (OrderRootType rootType : getAllRootTypes()) {
-      final VirtualFilePointerContainer thisContainer = myRoots.get(rootType);
-      final VirtualFilePointerContainer thatContainer = from.myRoots.get(rootType);
-      thisContainer.addAll(thatContainer);
-    }
-    myJarDirectories.copyFrom(from.myJarDirectories);
-  }
-
   @Override
   public void dispose() {
-    assert !isDisposed();
-    Disposer.dispose(myRootsWatcher);
+    if (isDisposed()) {
+      throwDisposalError("Already disposed:");
+    }
     myDisposed = true;
+    kill(null);
   }
 
   @Override
@@ -221,7 +220,7 @@ public class LibraryImpl implements LibraryEx.ModifiableModelEx, LibraryEx {
         invalidPaths.add(pointer.getUrl());
       }
     }
-    return invalidPaths != null ? invalidPaths : Collections.<String>emptyList();
+    return invalidPaths == null ? Collections.<String>emptyList() : invalidPaths;
   }
 
   @Override
diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
index 5bca645a118c..4d768aeb94ca 100644
--- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
@@ -68,13 +68,12 @@ import com.intellij.openapi.util.EmptyRunnable;
 import com.intellij.openapi.util.ShutDownTracker;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtilCore;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.*;
 import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.openapi.vfs.encoding.EncodingManagerImpl;
+import com.intellij.openapi.vfs.impl.VirtualFilePointerManagerImpl;
 import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS;
+import com.intellij.openapi.vfs.pointers.VirtualFilePointerManager;
 import com.intellij.profile.codeInspection.InspectionProfileManager;
 import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
 import com.intellij.psi.*;
@@ -289,6 +288,8 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
         startupManager.startCacheUpdate();
       }
     }.execute().throwException();
+    // project creation may make a lot of pointers, do not regard them as leak
+    ((VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance()).storePointers();
   }
 
   protected static Module createMainModule(final ModuleType moduleType) {
@@ -319,6 +320,9 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
 
     myThreadTracker = new ThreadTracker();
     DocumentImpl.CHECK_DOCUMENT_CONSISTENCY = !isPerformanceTest();
+    ModuleRootManager.getInstance(ourModule).orderEntries().getAllLibrariesAndSdkClassesRoots();
+    VirtualFilePointerManagerImpl filePointerManager = (VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance();
+    filePointerManager.storePointers();
   }
 
   public static void doSetup(final LightProjectDescriptor descriptor,
@@ -453,6 +457,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
   protected void tearDown() throws Exception {
     CodeStyleSettingsManager.getInstance(getProject()).dropTemporarySettings();
     checkForSettingsDamage();
+    VirtualFilePointerManagerImpl filePointerManager = (VirtualFilePointerManagerImpl)VirtualFilePointerManager.getInstance();
     doTearDown(getProject(), ourApplication, true);
 
     try {
@@ -461,6 +466,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
     finally {
       myThreadTracker.checkLeak();
       ((InjectedLanguageManagerImpl)InjectedLanguageManager.getInstance(getProject())).checkInjectorsAreDisposed();
+      filePointerManager.assertPointersAreDisposed();
     }
   }
 
@@ -549,18 +555,19 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
     CompositeException result = new CompositeException();
     final Editor[] allEditors = EditorFactory.getInstance().getAllEditors();
     if (allEditors.length > 0) {
-      String fail = null;
       for (Editor editor : allEditors) {
-        fail = EditorFactoryImpl.notReleasedError(editor);
         try {
-          EditorFactory.getInstance().releaseEditor(editor);
+          EditorFactoryImpl.throwNotReleasedError(editor);
         }
         catch (Throwable e) {
           result.add(e);
         }
+        finally {
+          EditorFactory.getInstance().releaseEditor(editor);
+        }
       }
       try {
-        fail("Unreleased editors: " + allEditors.length + "\n"+fail);
+        fail("Unreleased editors: " + allEditors.length);
       }
       catch (Throwable e) {
         result.add(e);
diff --git a/platform/util/src/com/intellij/openapi/util/TraceableDisposable.java b/platform/util/src/com/intellij/openapi/util/TraceableDisposable.java
new file mode 100644
index 000000000000..d62ff60d8802
--- /dev/null
+++ b/platform/util/src/com/intellij/openapi/util/TraceableDisposable.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.util;
+
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+/**
+ * Traces creation and disposal by storing corresponding stacktraces.
+ * In constructor it saves creation stacktrace
+ * In kill() it saves disposal stacktrace
+ */
+public class TraceableDisposable {
+  private final Throwable CREATE_TRACE;
+  private Throwable KILL_TRACE;
+
+  public TraceableDisposable(@Nullable("null means do not trace") Throwable creation) {
+    CREATE_TRACE = creation;
+  }
+
+  public void kill(@Nullable String msg) {
+    if (CREATE_TRACE != null) {
+      KILL_TRACE = new Throwable();
+    }
+  }
+
+  public void throwDisposalError(@NonNls String msg) throws RuntimeException {
+    throw new DisposalException(msg);
+  }
+
+  private class DisposalException extends RuntimeException {
+    private DisposalException(String message) {
+      super(message);
+    }
+
+    @Override
+    public void printStackTrace(PrintStream s) {
+      //noinspection IOResourceOpenedButNotSafelyClosed
+      PrintWriter writer = new PrintWriter(s);
+      printStackTrace(writer);
+      writer.flush();
+    }
+
+    @SuppressWarnings("HardCodedStringLiteral")
+    @Override
+    public void printStackTrace(PrintWriter s) {
+      super.printStackTrace(s);
+      if (CREATE_TRACE != null) {
+        s.println("--------------Creation trace: ");
+        CREATE_TRACE.printStackTrace(s);
+      }
+      if (KILL_TRACE != null) {
+        s.println("--------------Kill trace: ");
+        KILL_TRACE.printStackTrace(s);
+      }
+    }
+  }
+}

From f475831273ae140221de9ab6ce911e7f2b3e0d55 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Mon, 4 Jun 2012 14:10:10 +0400
Subject: [PATCH 132/239] IDEA-86908 Subversion: background processes (file
 changed on server conflicts, incoming chnages collection) don't work for
 project with not-default structure

---
 .../src/org/jetbrains/idea/svn/SvnUtil.java        | 14 ++++++++++++++
 .../svn/history/SvnCommittedChangesProvider.java   |  8 ++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
index 296b61a24b1f..711ad0635817 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
@@ -147,6 +147,20 @@ public class SvnUtil {
     }
   }
 
+  public static String getExactLocation(final SvnVcs vcs, File path, ProgressIndicator progress) {
+    try {
+      SVNWCClient wcClient = vcs.createWCClient();
+      SVNInfo info = wcClient.doInfo(path, SVNRevision.UNDEFINED);
+      if (info != null && info.getURL() != null) {
+        return info.getURL().toString();
+      }
+    }
+    catch (SVNException e) {
+      //
+    }
+    return null;
+  }
+
   public static String[] getLocationsForModule(final SvnVcs vcs, File path, ProgressIndicator progress) {
     LocationsCrawler crawler = new LocationsCrawler(vcs);
     crawlWCRoots(vcs.getProject(), path, crawler, progress);
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java
index f1165d66d5e2..67f14777452e 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnCommittedChangesProvider.java
@@ -34,7 +34,6 @@ import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
 import com.intellij.openapi.vcs.versionBrowser.ChangesBrowserSettingsEditor;
 import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.AsynchConsumer;
 import com.intellij.util.Consumer;
@@ -112,11 +111,8 @@ public class SvnCommittedChangesProvider implements CachingCommittedChangesProvi
   @Nullable
   public RepositoryLocation getLocationFor(final FilePath root) {
     final ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator();
-    String[] urls = SvnUtil.getLocationsForModule(myVcs, root.getIOFile(), progress);
-    if (urls.length == 1) {
-      return new SvnRepositoryLocation(urls [0]);
-    }
-    return null;
+    final String url = SvnUtil.getExactLocation(myVcs, root.getIOFile(), progress);
+    return url == null ? null : new SvnRepositoryLocation(url);
   }
 
   public RepositoryLocation getLocationFor(final FilePath root, final String repositoryPath) {

From 7c06e00c320345aad5abf963fb051003c3603192 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Mon, 4 Jun 2012 14:14:22 +0400
Subject: [PATCH 133/239] IDEA-86973 Add '...' to the end of 'Enable Version
 Control Integration' action

---
 .../platform-resources-en/src/messages/VcsBundle.properties     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties
index 931c2770b753..8cbe3c5ef24e 100644
--- a/platform/platform-resources-en/src/messages/VcsBundle.properties
+++ b/platform/platform-resources-en/src/messages/VcsBundle.properties
@@ -525,7 +525,7 @@ highlight.annotation.after.not.selected.text=Show after...
 highlight.annotation.after.selected.text=Show after ({0})
 highlight.annotation.before.description=Highlights revisions before or equal to selected
 highlight.annotation.after.description=Highlights revisions after or equal to selected
-action.enable.version.control.integration.text=_Enable Version Control Integration
+action.enable.version.control.integration.text=_Enable Version Control Integration...
 dialog.enable.version.control.integration.title=Enable Version Control Integration
 dialog.enable.version.control.integration.select.vcs.label.text=Please select version control system\nto make your <Project Root> be under:
 dialog.enable.version.control.integration.hint.text=Version Control configuration is available at: 'Settings | Version Control'

From 639e90a5d91c977f3fcf0e6fed8e7795608e99c0 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Fri, 1 Jun 2012 19:57:20 +0400
Subject: [PATCH 134/239] CollectionFactory: factory methods added. Got rid of
 Guava dependency

---
 .../psi/impl/light/LightModifierList.java     |   2 +-
 .../NaturalLanguageTextSelectioner.java       |   4 +-
 .../impl/UpdateFoldRegionsOperation.java      |   8 +-
 .../template/impl/ListTemplatesHandler.java   |   2 +-
 .../console/ConsoleFoldingSettings.java       |   2 +-
 .../impl/id/PlatformIdTableBuilding.java      |   2 +-
 .../com/intellij/notification/EventLog.java   |   2 +-
 .../wm/impl/ToolWindowManagerImpl.java        |   2 +-
 .../testFramework/LightPlatformTestCase.java  |   2 +-
 .../util/containers/CollectionFactory.java    | 141 ++++++++++++------
 .../lang/completion/GroovyCompletionUtil.java |   2 +-
 .../completion/weighers/GrKindWeigher.java    |   2 +-
 .../groovy/lang/psi/util/GdkMethodUtil.java   |   2 +-
 .../groovy/mvc/MvcModuleStructureUtil.java    |   4 +-
 .../convertToJava/StubGenerator.java          |   2 +-
 .../plugins/groovy/spock/SpockTest.groovy     |   2 +-
 .../maven/compiler/MavenResourceCompiler.java |   2 +-
 .../idea/maven/dom/MavenDomUtil.java          |   2 +-
 .../maven/execution/MavenResumeAction.java    |   2 +-
 .../idea/maven/project/MavenProject.java      |   2 +-
 .../AddToCompositeCollectionInvocation.java   |   2 +-
 21 files changed, 124 insertions(+), 67 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java
index 7f274a4ea7d7..e3ff814bad09 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java
@@ -40,7 +40,7 @@ public class LightModifierList extends LightElement implements PsiModifierList {
 
   public LightModifierList(PsiManager manager, final Language language, String... modifiers) {
     super(manager, language);
-    myModifiers = CollectionFactory.newTroveSet(modifiers);
+    myModifiers = CollectionFactory.troveSet(modifiers);
   }
 
   public void addModifier(String modifier) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java
index 9243eb22685d..3e9ec968c08b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/wordSelection/NaturalLanguageTextSelectioner.java
@@ -31,8 +31,8 @@ import java.util.List;
 import java.util.Set;
 
 public class NaturalLanguageTextSelectioner extends ExtendWordSelectionHandlerBase {
-  private static final Set<Character> NATURAL = CollectionFactory.newTroveSet('(', ')', '.', ',', ':', ';', '!', '?', '$', '@', '%', '\"', '\'');
-  private static final Set<Character> SENTENCE_END = CollectionFactory.newTroveSet('.', '!', '?');
+  private static final Set<Character> NATURAL = CollectionFactory.troveSet('(', ')', '.', ',', ':', ';', '!', '?', '$', '@', '%', '\"', '\'');
+  private static final Set<Character> SENTENCE_END = CollectionFactory.troveSet('.', '!', '?');
 
   public boolean canSelect(PsiElement e) {
     return e instanceof PsiPlainText || e instanceof PsiComment;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
index a88aca1d01c9..7250bd6314b4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/UpdateFoldRegionsOperation.java
@@ -36,7 +36,7 @@ import java.util.List;
 import java.util.Map;
 
 import static com.intellij.util.containers.CollectionFactory.arrayList;
-import static com.intellij.util.containers.CollectionFactory.newTroveMap;
+import static com.intellij.util.containers.CollectionFactory.troveMap;
 
 /**
  * @author cdr
@@ -70,12 +70,12 @@ class UpdateFoldRegionsOperation implements Runnable {
   public void run() {
     EditorFoldingInfo info = EditorFoldingInfo.get(myEditor);
     FoldingModelEx foldingModel = (FoldingModelEx)myEditor.getFoldingModel();
-    Map<TextRange,Boolean> rangeToExpandStatusMap = newTroveMap();
+    Map<TextRange,Boolean> rangeToExpandStatusMap = troveMap();
 
     removeInvalidRegions(info, foldingModel, rangeToExpandStatusMap);
 
-    Map<FoldRegion, Boolean> shouldExpand = newTroveMap();
-    Map<FoldingGroup, Boolean> groupExpand = newTroveMap();
+    Map<FoldRegion, Boolean> shouldExpand = troveMap();
+    Map<FoldingGroup, Boolean> groupExpand = troveMap();
     List<FoldRegion> newRegions = addNewRegions(info, foldingModel, rangeToExpandStatusMap, shouldExpand, groupExpand);
 
     applyExpandStatus(newRegions, shouldExpand, groupExpand);
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
index 7841f165e3a3..bd01e4e1f4fa 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java
@@ -96,7 +96,7 @@ public class ListTemplatesHandler implements CodeInsightActionHandler {
         if (description == null) {
           return super.getAllLookupStrings();
         }
-        return CollectionFactory.newSet(getLookupString(), description);
+        return CollectionFactory.hashSet(getLookupString(), description);
       }
     };
   }
diff --git a/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
index 828b6f574c28..b0665954529f 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
@@ -70,7 +70,7 @@ public class ConsoleFoldingSettings implements PersistentStateComponent<ConsoleF
   }
 
   private void writeDiff(List<String> added, List<String> removed, boolean negated) {
-    Set<String> baseline = CollectionFactory.newTroveSet();
+    Set<String> baseline = CollectionFactory.troveSet();
     for (CustomizableConsoleFoldingBean regexp : CustomizableConsoleFoldingBean.EP_NAME.getExtensions()) {
       if (regexp.negate == negated) {
         baseline.add(regexp.substring);
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
index c190dbb7fa82..2faaf0a649e4 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
@@ -126,7 +126,7 @@ public abstract class PlatformIdTableBuilding {
     @NotNull
     @Override
     public Map<TodoIndexEntry, Integer> map(FileContent inputData) {
-      Map<TodoIndexEntry, Integer> result = CollectionFactory.newTroveMap();
+      Map<TodoIndexEntry, Integer> result = CollectionFactory.troveMap();
       for (DataIndexer<TodoIndexEntry, Integer, FileContent> indexer : indexers) {
         for (Map.Entry<TodoIndexEntry, Integer> entry : indexer.map(inputData).entrySet()) {
           TodoIndexEntry key = entry.getKey();
diff --git a/platform/platform-impl/src/com/intellij/notification/EventLog.java b/platform/platform-impl/src/com/intellij/notification/EventLog.java
index 99f50ee18360..a0233b7afbee 100644
--- a/platform/platform-impl/src/com/intellij/notification/EventLog.java
+++ b/platform/platform-impl/src/com/intellij/notification/EventLog.java
@@ -73,7 +73,7 @@ public class EventLog implements Notifications {
   private static final String A_CLOSING = "</a>";
   private static final Pattern TAG_PATTERN = Pattern.compile("<[^>]*>");
   private static final Pattern A_PATTERN = Pattern.compile("<a ([^>]* )?href=[\"\']([^>]*)[\"\'][^>]*>");
-  private static final Set<String> NEW_LINES = CollectionFactory.newSet("<br>", "</br>", "<br/>", "<p>", "</p>", "<p/>");
+  private static final Set<String> NEW_LINES = CollectionFactory.hashSet("<br>", "</br>", "<br/>", "<p>", "</p>", "<p/>");
 
   public EventLog() {
     ApplicationManager.getApplication().getMessageBus().connect().subscribe(Notifications.TOPIC, this);
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
index 8a75838fcdaf..43a23655bba6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowManagerImpl.java
@@ -93,7 +93,7 @@ public final class ToolWindowManagerImpl extends ToolWindowManagerEx implements
   private final HashMap<String, FloatingDecorator> myId2FloatingDecorator;
   private final HashMap<String, StripeButton> myId2StripeButton;
   private final HashMap<String, FocusWatcher> myId2FocusWatcher;
-  private final Set<String> myDumbAwareIds = Collections.synchronizedSet(CollectionFactory.<String>newTroveSet());
+  private final Set<String> myDumbAwareIds = Collections.synchronizedSet(CollectionFactory.<String>troveSet());
 
   private final EditorComponentFocusWatcher myEditorComponentFocusWatcher;
   private final MyToolWindowPropertyChangeListener myToolWindowPropertyChangeListener;
diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
index 4d768aeb94ca..8154d996b0e6 100644
--- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
@@ -793,7 +793,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da
 
       final String[] myUrls = mySdk.getRootProvider().getUrls(OrderRootType.CLASSES);
       final String[] newUrls = newSdk.getRootProvider().getUrls(OrderRootType.CLASSES);
-      return CollectionFactory.newSet(myUrls).equals(CollectionFactory.newSet(newUrls));
+      return CollectionFactory.hashSet(myUrls).equals(CollectionFactory.hashSet(newUrls));
     }
 
   }
diff --git a/platform/util/src/com/intellij/util/containers/CollectionFactory.java b/platform/util/src/com/intellij/util/containers/CollectionFactory.java
index 9028cff937f4..897a40b98810 100644
--- a/platform/util/src/com/intellij/util/containers/CollectionFactory.java
+++ b/platform/util/src/com/intellij/util/containers/CollectionFactory.java
@@ -15,16 +15,11 @@
  */
 package com.intellij.util.containers;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
 import gnu.trove.THashMap;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
-import java.util.HashMap;
-import java.util.Stack;
 
 /**
  * @author peter
@@ -33,34 +28,118 @@ public class CollectionFactory {
   private CollectionFactory() {
   }
 
-  public static <T> Set<T> newSet(T... elements) {
-    return new HashSet<T>(Arrays.asList(elements));
+  @NotNull
+  public static <T> Set<T> hashSet() {
+    return new HashSet<T>();
   }
 
-  public static <T> Set<T> newTroveSet(T... elements) {
-    return newTroveSet(Arrays.asList(elements));
+  @NotNull
+  public static <T> Set<T> hashSet(@NotNull Collection<T> elements) {
+    return new HashSet<T>(elements);
   }
 
-  public static <T> Set<T> newTroveSet(Collection<T> elements) {
+  @NotNull
+  public static <T> Set<T> hashSet(@NotNull T... elements) {
+    return hashSet(Arrays.asList(elements));
+  }
+
+  public static <T> LinkedHashSet<T> linkedHashSet() {
+    return new LinkedHashSet<T>();
+  }
+
+  @NotNull
+  public static <T> Set<T> troveSet(@NotNull T... elements) {
+    return troveSet(Arrays.asList(elements));
+  }
+
+  @NotNull
+  public static <T> Set<T> troveSet(@NotNull Collection<T> elements) {
     return new THashSet<T>(elements);
   }
 
-  public static <T> T[] ar(T... elements) {
-    return elements;
+  @NotNull
+  public static <T> TreeSet<T> treeSet() {
+    return new TreeSet<T>();
   }
 
-  public static <T,V> THashMap<T, V> newTroveMap() {
-    return new THashMap<T,V>();
+  @NotNull
+  public static <T> TreeSet<T> treeSet(@NotNull Collection<T> elements) {
+    return new TreeSet<T>(elements);
   }
 
+  @NotNull
+  public static <T> TreeSet<T> treeSet(@NotNull T... elements) {
+    return treeSet(Arrays.asList(elements));
+  }
+
+  @NotNull
+  public static <T> TreeSet<T> treeSet(@NotNull Comparator<? super T> comparator) {
+    return new TreeSet<T>(comparator);
+  }
+
+  @NotNull
+  public static <T> Set<T> unmodifiableHashSet(@NotNull T... elements) {
+    return unmodifiableHashSet(Arrays.asList(elements));
+  }
+
+  @NotNull
+  public static <T> Set<T> unmodifiableHashSet(@NotNull Collection<T> elements) {
+    return Collections.unmodifiableSet(hashSet(elements));
+  }
+
+  @NotNull
+  public static <T, V> HashMap<T, V> hashMap() {
+    return new HashMap<T, V>();
+  }
+
+  @NotNull
+  public static <T, V> TreeMap<T, V> treeMap() {
+    return new TreeMap<T, V>();
+  }
+
+  @NotNull
+  public static <T, V> THashMap<T, V> troveMap() {
+    return new THashMap<T, V>();
+  }
+
+  public static <T, V> LinkedHashMap<T, V> linkedHashMap() {
+    return new LinkedHashMap<T, V>();
+  }
+
+  @NotNull
+  public static <T, V> Map<T, V> hashMap(@NotNull final List<T> keys, @NotNull final List<V> values) {
+    if (keys.size() != values.size()) {
+      throw new IllegalArgumentException(keys + " should have same length as " + values);
+    }
+
+    final HashMap<T, V> map = new HashMap<T, V>();
+    for (int i = 0; i < keys.size(); ++i) {
+      map.put(keys.get(i), values.get(i));
+    }
+    return map;
+  }
+
+  @NotNull
   public static <T> ArrayList<T> arrayList() {
-    return Lists.newArrayList();
+    return new ArrayList<T>();
   }
 
+  @NotNull
+  public static <T> ArrayList<T> arrayList(int initialCapacity) {
+    return new ArrayList<T>(initialCapacity);
+  }
+
+  @NotNull
+  public static <T> ArrayList<T> arrayList(Collection<T> elements) {
+    return new ArrayList<T>(elements);
+  }
+
+  @NotNull
   public static <T> ArrayList<T> arrayList(T... elements) {
-    return new ArrayList<T>(Arrays.asList(elements));
+    return arrayList(Arrays.asList(elements));
   }
 
+  @NotNull
   public static <T> List<T> arrayList(@NotNull final T[] elements, final int start, final int end) {
     if (start < 0 || start > end || end > elements.length) throw new IllegalArgumentException("start:" + start + " end:" + end + " length:" + elements.length);
 
@@ -80,35 +159,13 @@ public class CollectionFactory {
     };
   }
 
+  @NotNull
   public static <T> Stack<T> stack() {
     return new Stack<T>();
   }
 
-  public static <T> Set<T> hashSet() {
-    return Sets.newHashSet();
-  }
-
-  public static <T, V> Map<T, V> hashMap() {
-    return Maps.newHashMap();
-  }
-
-  public static <T, V> Map<T, V> hashMap(@NotNull final List<T> keys, @NotNull final List<V> values) {
-    if (keys.size() != values.size()) {
-      throw new IllegalArgumentException(keys + " should have some length as " + values);
-    }
-
-    final HashMap<T,V> map = Maps.newHashMap();
-    for (int i = 0; i < keys.size(); ++i) {
-      map.put(keys.get(i), values.get(i));
-    }
-    return map;
-  }
-
-  public static <T, V> LinkedHashMap<T, V> linkedMap() {
-    return Maps.newLinkedHashMap();
-  }
-
-  public static <T> LinkedHashSet<T> linkedHashSet() {
-    return Sets.newLinkedHashSet();
+  @NotNull
+  public static <T> T[] ar(@NotNull T... elements) {
+    return elements;
   }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
index 007f387c176a..fb0bfef5c72e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
@@ -448,7 +448,7 @@ public class GroovyCompletionUtil {
     return TailType.insertChar(editor, offset, ')');
   }
 
-  public static final Set<String> OPERATOR_METHOD_NAMES = CollectionFactory.newSet(
+  public static final Set<String> OPERATOR_METHOD_NAMES = CollectionFactory.hashSet(
     "plus", "minus", "multiply", "power", "div", "mod", "or", "and", "xor", "next", "previous", "getAt", "putAt", "leftShift", "rightShift",
     "isCase", "bitwiseNegate", "negative", "positive", "call"
   );
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
index 442255bd8359..dd469ca38610 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrKindWeigher.java
@@ -41,7 +41,7 @@ import java.util.Set;
  */
 public class GrKindWeigher extends CompletionWeigher {
   private static final Set<String> TRASH_CLASSES = new HashSet<String>(10);
-  private static final Set<String> PRIORITY_KEYWORDS = CollectionFactory.newSet(
+  private static final Set<String> PRIORITY_KEYWORDS = CollectionFactory.hashSet(
     PsiKeyword.RETURN, PsiKeyword.INSTANCEOF, "in",
     PsiKeyword.PRIVATE, PsiKeyword.PROTECTED, PsiKeyword.PUBLIC, PsiKeyword.STATIC, "def",
     PsiKeyword.TRUE,  PsiKeyword.FALSE, PsiKeyword.NULL);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java
index 6ec188bf83e5..360fdb2c63cd 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java
@@ -44,7 +44,7 @@ public class GdkMethodUtil {
 
   private static final Logger LOG = Logger.getInstance(GdkMethodUtil.class);
 
-  public static final Set<String> COLLECTION_METHOD_NAMES = CollectionFactory.newSet(
+  public static final Set<String> COLLECTION_METHOD_NAMES = CollectionFactory.hashSet(
     "each", "eachWithIndex", "any", "every", "reverseEach", "collect", "collectAll", "find", "findAll", "retainAll", "removeAll", "split",
     "groupBy", "groupEntriesBy", "findLastIndexOf", "findIndexValues", "findIndexOf"
   );
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
index 2f9bd16b5223..f8992644e1e5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureUtil.java
@@ -331,8 +331,8 @@ public class MvcModuleStructureUtil {
   }
 
   private static void removeInvalidSourceRoots(List<Consumer<ModifiableRootModel>> actions, MvcProjectStructure structure) {
-    final Set<SourceFolder> toRemove = CollectionFactory.newTroveSet();
-    final Set<ContentEntry> toRemoveContent = CollectionFactory.newTroveSet();
+    final Set<SourceFolder> toRemove = CollectionFactory.troveSet();
+    final Set<ContentEntry> toRemoveContent = CollectionFactory.troveSet();
     for (ContentEntry entry : ModuleRootManager.getInstance(structure.myModule).getContentEntries()) {
       final VirtualFile file = entry.getFile();
       if (file == null || !structure.isValidContentRoot(file)) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
index 3eaeda43530f..8bb3a4e6d155 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java
@@ -167,7 +167,7 @@ public class StubGenerator implements ClassItemGenerator {
       return Collections.emptySet();
     }
 
-    final Set<String> result = CollectionFactory.newTroveSet(ArrayUtil.EMPTY_STRING_ARRAY);
+    final Set<String> result = CollectionFactory.troveSet(ArrayUtil.EMPTY_STRING_ARRAY);
     for (PsiClassType type : chainedConstructor.getThrowsList().getReferencedTypes()) {
       StringBuilder builder = new StringBuilder();
       writeType(builder, substitutor.substitute(type), constructor, classNameProvider);
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy
index c0709e8e3860..16756d18eed4 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/spock/SpockTest.groovy
@@ -190,7 +190,7 @@ class FooSpec extends spock.lang.Specification {
 
     assertNotNull(lookupElements);
 
-    Set<String> missedVariants = CollectionFactory.newSet(expectedVariants);
+    Set<String> missedVariants = CollectionFactory.hashSet(expectedVariants);
 
     for (LookupElement lookupElement : lookupElements) {
       missedVariants.remove(lookupElement.getLookupString());
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
index 02f08aa522ab..5aeb6f81c74f 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/compiler/MavenResourceCompiler.java
@@ -59,7 +59,7 @@ import java.util.regex.Pattern;
 public class MavenResourceCompiler implements ClassPostProcessingCompiler {
   private static final Key<List<String>> FILES_TO_DELETE_KEY = Key.create(MavenResourceCompiler.class.getSimpleName() + ".FILES_TO_DELETE");
 
-  private static final Set<String> DEFAULT_NON_FILTERED_EXTENSIONS = CollectionFactory.newSet("jpg", "jpeg", "gif", "bmp", "png");
+  private static final Set<String> DEFAULT_NON_FILTERED_EXTENSIONS = CollectionFactory.hashSet("jpg", "jpeg", "gif", "bmp", "png");
 
   private Map<String, Set<String>> myOutputItemsCache = new THashMap<String, Set<String>>();
 
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
index a25bd7878b26..b1906ff44f2b 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
@@ -58,7 +58,7 @@ import java.util.regex.Pattern;
 public class MavenDomUtil {
 
   // see http://maven.apache.org/settings.html
-  private static final Set<String> SUBTAGS_IN_SETTINGS_FILE = CollectionFactory.newSet("localRepository", "interactiveMode",
+  private static final Set<String> SUBTAGS_IN_SETTINGS_FILE = CollectionFactory.hashSet("localRepository", "interactiveMode",
                                                                                        "usePluginRegistry", "offline", "pluginGroups",
                                                                                        "servers", "mirrors", "proxies", "profiles",
                                                                                        "activeProfiles");
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java
index 43885c5a6ecc..1c728d3a4d17 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java
@@ -51,7 +51,7 @@ public class MavenResumeAction extends AnAction {
 
   private static final Logger LOG = Logger.getInstance(MavenResumeAction.class);
 
-  private static final Set<String> PARAMS_DISABLING_RESUME = CollectionFactory.newSet("-rf", "-resume-from", "-pl", "-projects", "-am",
+  private static final Set<String> PARAMS_DISABLING_RESUME = CollectionFactory.hashSet("-rf", "-resume-from", "-pl", "-projects", "-am",
                                                                                       "-also-make", "-amd", "-also-make-dependents");
 
   public static final int STATE_INITIAL = 0;
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
index b49f872d8fcd..92e24a4e976e 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
@@ -617,7 +617,7 @@ public class MavenProject {
 
   @NotNull
   public Set<String> getSupportedPackagings() {
-    Set<String> result = CollectionFactory.newSet(MavenConstants.TYPE_POM,
+    Set<String> result = CollectionFactory.hashSet(MavenConstants.TYPE_POM,
                                                   MavenConstants.TYPE_JAR,
                                                   "ejb", "ejb-client", "war", "ear", "bundle", "maven-plugin");
     for (MavenImporter each : getSuitableImporters()) {
diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java b/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java
index 85793f8269a1..f0e5e67fae0b 100644
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/AddToCompositeCollectionInvocation.java
@@ -37,7 +37,7 @@ class AddToCompositeCollectionInvocation implements Invocation {
   }
 
   public Object invoke(final DomInvocationHandler<?> handler, final Object[] args) throws Throwable {
-    Set<XmlTag> set = CollectionFactory.newTroveSet();
+    Set<XmlTag> set = CollectionFactory.troveSet();
     for (final CollectionChildDescriptionImpl qname : myQnames) {
       set.addAll(qname.getTagsGetter().fun(handler));
     }

From 1c06d7099c905a7ecb5f0bcaad8fe8051f0b8ab7 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Fri, 1 Jun 2012 20:34:40 +0400
Subject: [PATCH 135/239] CollectionFactory: java.util only

---
 .../src/com/intellij/util/containers/CollectionFactory.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/util/src/com/intellij/util/containers/CollectionFactory.java b/platform/util/src/com/intellij/util/containers/CollectionFactory.java
index 897a40b98810..11f0326cc6fd 100644
--- a/platform/util/src/com/intellij/util/containers/CollectionFactory.java
+++ b/platform/util/src/com/intellij/util/containers/CollectionFactory.java
@@ -20,6 +20,8 @@ import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
+import java.util.Stack;
+import java.util.HashSet;
 
 /**
  * @author peter

From aa66aee347be97752ef5e1fc8d7c5b4262015650 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Fri, 1 Jun 2012 21:16:51 +0400
Subject: [PATCH 136/239] unnecessary sor removed

---
 .../folding/impl/RecursiveMethodCallFoldingBuilder.java    | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
index b846f2ee6ecd..a333490c0fad 100644
--- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
@@ -55,13 +55,6 @@ public class RecursiveMethodCallFoldingBuilder extends FoldingBuilderEx {
       }
     });
 
-    Collections.sort(result, new Comparator<FoldingDescriptor>() {
-      @Override
-      public int compare(FoldingDescriptor o1, FoldingDescriptor o2) {
-        return o2.getRange().getStartOffset() - o1.getRange().getStartOffset();
-      }
-    });
-
     return result.toArray(new FoldingDescriptor[result.size()]);
   }
 

From 040877b66bbafbdef091e36b6377342e8206dd98 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Fri, 25 May 2012 14:38:56 +0200
Subject: [PATCH 137/239] AppCode: xcode templates reworked

---
 .../fileTypes/impl/NativeFileIconProvider.java   |  9 +++++++--
 .../com/intellij/openapi/util/io/FileUtil.java   | 16 ++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/NativeFileIconProvider.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/NativeFileIconProvider.java
index 2793909588ed..cbb83407d81c 100644
--- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/NativeFileIconProvider.java
+++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/NativeFileIconProvider.java
@@ -80,10 +80,10 @@ public class NativeFileIconProvider implements FileIconProvider {
           assert SwingComponentHolder.ourFileChooser != null || !ApplicationManager.getApplication().isReadAccessAllowed();
 
           if (SystemInfo.isMac && virtualFile.isDirectory() && (flags & Iconable.ICON_FLAG_OPEN) == Iconable.ICON_FLAG_OPEN) {
-            icon = Foundation.isPackageAtPath(f) ? SwingComponentHolder.ourFileChooser.getIcon(f) : DIR_OPEN_ICON;
+            icon = Foundation.isPackageAtPath(f) ? getNativeIcon(f) : DIR_OPEN_ICON;
           }
           else {
-            icon = SwingComponentHolder.ourFileChooser.getIcon(f);
+            icon = getNativeIcon(f);
           }
         }
         catch (Exception e) {      // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4854174
@@ -104,6 +104,11 @@ public class NativeFileIconProvider implements FileIconProvider {
     });
   }
 
+  @Nullable
+  public static Icon getNativeIcon(@Nullable File file) {
+    return file == null ? null : SwingComponentHolder.ourFileChooser.getIcon(file);
+  }
+
   private static Ext getExtension(final VirtualFile file, final int flags) {
     if (file.isDirectory()) {
       if (file.getExtension() == null) {
diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
index 05e7d2fa2c36..f47ea423c48e 100644
--- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java
@@ -48,10 +48,26 @@ public class FileUtil extends FileUtilRt {
 
   @NonNls public static final String ASYNC_DELETE_EXTENSION = ".__del__";
 
+  public static final int REGEX_PATTERN_FLAGS = SystemInfo.isFileSystemCaseSensitive ? 0 : Pattern.CASE_INSENSITIVE;
+
   @SuppressWarnings({"unchecked"})
   public static final TObjectHashingStrategy<String> PATH_HASHING_STRATEGY =
     SystemInfo.isFileSystemCaseSensitive ? TObjectHashingStrategy.CANONICAL : CaseInsensitiveStringHashingStrategy.INSTANCE;
 
+  @SuppressWarnings({"unchecked"})
+  public static final TObjectHashingStrategy<File> FILE_HASHING_STRATEGY =
+    SystemInfo.isFileSystemCaseSensitive ? TObjectHashingStrategy.CANONICAL : new TObjectHashingStrategy<File>() {
+      @Override
+      public int computeHashCode(File object) {
+        return fileHashCode(object);
+      }
+
+      @Override
+      public boolean equals(File o1, File o2) {
+        return filesEqual(o1, o2);
+      }
+    };
+
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.util.io.FileUtil");
 
   // do not use channels to copy files larger than 5 Mb because of possible MapFailed error

From 78b97e9eaf3b796316b15afbec2bb2388ba1abc9 Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Mon, 4 Jun 2012 14:38:12 +0400
Subject: [PATCH 138/239] bug with setting default titled border in internal
 mode

---
 .../src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
index b5526f0efab4..1c5ce1debadc 100644
--- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
+++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
@@ -860,7 +860,7 @@ public class AsmCodeGenerator {
 
         Type borderFactoryType = ourBorderFactoryType;
         StringDescriptor borderFactoryValue = (StringDescriptor)container.getDelegeeClientProperties().get(ourBorderFactoryClientProperty);
-        if (borderFactoryValue == null && Boolean.valueOf(System.getProperty("idea.is.internal")).booleanValue()) {
+        if (borderFactoryValue == null && borderTitle != null && Boolean.valueOf(System.getProperty("idea.is.internal")).booleanValue()) {
           borderFactoryValue = StringDescriptor.create("com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent");
           container.getDelegeeClientProperties().put(ourBorderFactoryClientProperty, borderFactoryValue);
         }

From 4df280152eb1af66d420bc8e3c4e7efd8bd6dfb4 Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Mon, 4 Jun 2012 14:38:52 +0400
Subject: [PATCH 139/239] commit dialog. summary panel. vertical indents
 reduced.

---
 .../intellij/openapi/vcs/changes/ui/CommitLegendPanel.form    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitLegendPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitLegendPanel.form
index d3128787f259..e6e87fd95f7d 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitLegendPanel.form
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitLegendPanel.form
@@ -77,8 +77,8 @@
               </component>
             </children>
           </grid>
-          <grid id="1c31e" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="10" left="0" bottom="10" right="0"/>
+          <grid id="1c31e" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="3">
+            <margin top="5" left="0" bottom="5" right="0"/>
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
             </constraints>

From 47992a3ef343df974fe1e872e60a0729b02007b3 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 4 Jun 2012 13:27:32 +0400
Subject: [PATCH 140/239] notnull

---
 .../intellij/openapi/roots/impl/libraries/LibraryTableBase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java
index 1e67ae55dca6..6ef5b0ef7520 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryTableBase.java
@@ -144,7 +144,7 @@ public abstract class LibraryTableBase implements PersistentStateComponent<Eleme
     return DependencyScope.COMPILE;
   }
 
-  public void fireLibraryRenamed(LibraryImpl library) {
+  public void fireLibraryRenamed(@NotNull LibraryImpl library) {
     myDispatcher.getMulticaster().afterLibraryRenamed(library);
   }
 

From 2395ed7e088447d3f3ed371da3caafe60ffb3715 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 4 Jun 2012 13:29:03 +0400
Subject: [PATCH 141/239] cleanup

---
 .../testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java b/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java
index ea3b243b8132..09f913884a1a 100644
--- a/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/PsiDocumentManagerImplTest.java
@@ -167,7 +167,7 @@ public class PsiDocumentManagerImplTest extends PlatformTestCase {
     assertEquals(0, getPsiDocumentManager().getUncommittedDocuments().length);
   }
 
-  public void testDocumentFromAlienProjectDoesNotEndsUpInMyUncommittedList() throws Exception {
+  public void testDocumentFromAlienProjectDoesNotEndUpInMyUncommittedList() throws Exception {
     PsiFile file = getPsiManager().findFile(createFile());
 
     final Document document = getPsiDocumentManager().getDocument(file);

From 84d77c47cc2aae72a64e32dc226eecc6eeb18d65 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 4 Jun 2012 14:58:15 +0400
Subject: [PATCH 142/239] notnull

---
 .../intellij/codeHighlighting/TextEditorHighlightingPass.java | 4 ++--
 .../com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java | 2 +-
 .../intellij/codeInsight/daemon/impl/ExternalToolPass.java    | 2 +-
 .../codeInsight/daemon/impl/IdentifierHighlighterPass.java    | 3 ++-
 .../src/com/intellij/codeInsight/daemon/impl/IndentsPass.java | 2 +-
 .../codeInsight/daemon/impl/InjectedCodeFoldingPass.java      | 2 +-
 .../intellij/codeInsight/daemon/impl/PassExecutorService.java | 2 +-
 .../daemon/impl/ProgressableTextEditorHighlightingPass.java   | 4 ++--
 .../intellij/codeInsight/daemon/impl/ShowAutoImportPass.java  | 2 +-
 .../intellij/codeInsight/daemon/impl/ShowIntentionsPass.java  | 2 +-
 .../intellij/codeInsight/daemon/impl/SlowLineMarkersPass.java | 2 +-
 .../framework/detection/impl/FrameworkDetectionManager.java   | 2 +-
 .../changeSignature/ChangeSignaturePassFactory.java           | 2 +-
 .../src/com/intellij/codeHighlighting/HighlightingPass.java   | 3 ++-
 .../com/intellij/testAssistant/TestDataHighlightingPass.java  | 2 +-
 .../codeInspection/local/GroovyPostHighlightingPass.java      | 2 +-
 .../src/com/intellij/uiDesigner/FormHighlightingPass.java     | 3 ++-
 .../designer/inspection/DesignerHighlightingPass.java         | 3 ++-
 .../impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java  | 2 +-
 19 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
index fcda8e15f6b2..7c7a123b3d5d 100644
--- a/platform/lang-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
+++ b/platform/lang-impl/src/com/intellij/codeHighlighting/TextEditorHighlightingPass.java
@@ -56,7 +56,7 @@ public abstract class TextEditorHighlightingPass implements HighlightingPass {
   }
 
   @Override
-  public final void collectInformation(ProgressIndicator progress) {
+  public final void collectInformation(@NotNull ProgressIndicator progress) {
     if (!isValid()) return; //Document has changed.
     myDumb = DumbService.getInstance(myProject).isDumb();
     doCollectInformation(progress);
@@ -103,7 +103,7 @@ public abstract class TextEditorHighlightingPass implements HighlightingPass {
     doApplyInformationToEditor();
   }
 
-  public abstract void doCollectInformation(ProgressIndicator progress);
+  public abstract void doCollectInformation(@NotNull ProgressIndicator progress);
   public abstract void doApplyInformationToEditor();
 
   public final int getId() {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java
index fb45fc8a99ca..444f8828fb4b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CodeFoldingPass.java
@@ -41,7 +41,7 @@ class CodeFoldingPass extends TextEditorHighlightingPass implements DumbAware {
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
     final boolean firstTime = isFirstTime(myFile, myEditor, THE_FIRST_TIME);
     Runnable runnable = CodeFoldingManager.getInstance(myProject).updateFoldRegionsAsync(myEditor, firstTime);
     synchronized (this) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPass.java
index d4e0af3d53bb..d27979e12eb9 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPass.java
@@ -80,7 +80,7 @@ public class ExternalToolPass extends TextEditorHighlightingPass {
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
     myDocumentChanged = false;
 
     final FileViewProvider viewProvider = myFile.getViewProvider();
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
index ed30584fb855..2012c5c95773 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IdentifierHighlighterPass.java
@@ -42,6 +42,7 @@ import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -71,7 +72,7 @@ public class IdentifierHighlighterPass extends TextEditorHighlightingPass {
   }
 
   @Override
-  public void doCollectInformation(final ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull final ProgressIndicator progress) {
     if (!CodeInsightSettings.getInstance().HIGHLIGHT_IDENTIFIER_UNDER_CARET) {
       return;
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java
index 5ecaffe59ff1..9f1627f4134e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/IndentsPass.java
@@ -204,7 +204,7 @@ public class IndentsPass extends TextEditorHighlightingPass implements DumbAware
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
     final Long stamp = myEditor.getUserData(LAST_TIME_INDENTS_BUILT);
     if (stamp != null && stamp.longValue() == nowStamp()) return;
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedCodeFoldingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedCodeFoldingPass.java
index 5656cd52ece6..10128243f6ad 100755
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedCodeFoldingPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/InjectedCodeFoldingPass.java
@@ -40,7 +40,7 @@ class InjectedCodeFoldingPass extends TextEditorHighlightingPass implements Dumb
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
     boolean firstTime = CodeFoldingPass.isFirstTime(myFile, myEditor, THE_FIRST_TIME_KEY);
     Runnable runnable = FoldingUpdate.updateInjectedFoldRegions(myEditor, myFile, firstTime);
     synchronized (this) {
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
index 92ff1f1579f8..8a27bba247ab 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/PassExecutorService.java
@@ -125,7 +125,7 @@ public abstract class PassExecutorService implements Disposable {
           // run all passes in sequence
           textEditorHighlightingPass = new TextEditorHighlightingPass(myProject, document, true) {
             @Override
-            public void doCollectInformation(ProgressIndicator progress) {
+            public void doCollectInformation(@NotNull ProgressIndicator progress) {
               pass.collectInformation(progress);
             }
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ProgressableTextEditorHighlightingPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ProgressableTextEditorHighlightingPass.java
index 9bc2df392651..dcb582d517bd 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ProgressableTextEditorHighlightingPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ProgressableTextEditorHighlightingPass.java
@@ -53,7 +53,7 @@ public abstract class ProgressableTextEditorHighlightingPass extends TextEditorH
   }
 
   @Override
-  public final void doCollectInformation(final ProgressIndicator progress) {
+  public final void doCollectInformation(@NotNull final ProgressIndicator progress) {
     myFinished = false;
     collectInformationWithProgress(progress);
     repaintTrafficIcon();
@@ -130,7 +130,7 @@ public abstract class ProgressableTextEditorHighlightingPass extends TextEditorH
     }
 
     @Override
-    public void doCollectInformation(final ProgressIndicator progress) {
+    public void doCollectInformation(@NotNull final ProgressIndicator progress) {
     }
 
     @Override
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java
index 821887e40166..7b1b03ed7228 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowAutoImportPass.java
@@ -62,7 +62,7 @@ public class ShowAutoImportPass extends TextEditorHighlightingPass {
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowIntentionsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowIntentionsPass.java
index e90c7b8589b5..f593f86153e8 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowIntentionsPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ShowIntentionsPass.java
@@ -120,7 +120,7 @@ public class ShowIntentionsPass extends TextEditorHighlightingPass {
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
     if (!ApplicationManager.getApplication().isUnitTestMode() && !myEditor.getContentComponent().hasFocus()) return;
     TemplateState state = TemplateManagerImpl.getTemplateState(myEditor);
     if (state != null && !state.isFinished()) return;
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SlowLineMarkersPass.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SlowLineMarkersPass.java
index e2951c895e7f..e4cb967c8a2e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SlowLineMarkersPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/SlowLineMarkersPass.java
@@ -53,7 +53,7 @@ public class SlowLineMarkersPass extends TextEditorHighlightingPass implements L
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
     final FileViewProvider viewProvider = myFile.getViewProvider();
     final Set<Language> relevantLanguages = viewProvider.getLanguages();
     List<LineMarkerInfo> markers = new SmartList<LineMarkerInfo>();
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java
index b4d34918eed4..753f20e571b0 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java
@@ -302,7 +302,7 @@ public class FrameworkDetectionManager extends AbstractProjectComponent implemen
     }
 
     @Override
-    public void doCollectInformation(ProgressIndicator progress) {
+    public void doCollectInformation(@NotNull ProgressIndicator progress) {
       ensureIndexIsUpToDate(myDetectors);
     }
 
diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignaturePassFactory.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignaturePassFactory.java
index 069fa045c2bc..4d0b995831e5 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignaturePassFactory.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignaturePassFactory.java
@@ -74,7 +74,7 @@ public class ChangeSignaturePassFactory extends AbstractProjectComponent impleme
     }
 
     @Override
-    public void doCollectInformation(ProgressIndicator progress) {
+    public void doCollectInformation(@NotNull ProgressIndicator progress) {
       myRange = null;
       final ChangeSignatureGestureDetector detector = ChangeSignatureGestureDetector.getInstance(myProject);
       final ChangeInfo changeInfo = detector.getInitialChangeInfo(myFile);
diff --git a/platform/platform-api/src/com/intellij/codeHighlighting/HighlightingPass.java b/platform/platform-api/src/com/intellij/codeHighlighting/HighlightingPass.java
index 9ad648783ee6..447d4f414b04 100644
--- a/platform/platform-api/src/com/intellij/codeHighlighting/HighlightingPass.java
+++ b/platform/platform-api/src/com/intellij/codeHighlighting/HighlightingPass.java
@@ -16,6 +16,7 @@
 package com.intellij.codeHighlighting;
 
 import com.intellij.openapi.progress.ProgressIndicator;
+import org.jetbrains.annotations.NotNull;
 
 public interface HighlightingPass {
   HighlightingPass[] EMPTY_ARRAY = new HighlightingPass[0];
@@ -27,7 +28,7 @@ public interface HighlightingPass {
    * @param progress to check for highlighting process is cancelled. Pass is to check progress.isCanceled() as often as possible and
    * throw {@link com.intellij.openapi.progress.ProcessCanceledException} if <code>true</code> is returned.
    */
-  void collectInformation(ProgressIndicator progress);
+  void collectInformation(@NotNull ProgressIndicator progress);
 
   /**
    * Called to apply information collected by {@linkplain #collectInformation(com.intellij.openapi.progress.ProgressIndicator)} to the editor.
diff --git a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java
index 04e4a6978641..e3d1fc96ddb3 100644
--- a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java
+++ b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java
@@ -47,7 +47,7 @@ public class TestDataHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
   }
 
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/local/GroovyPostHighlightingPass.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/local/GroovyPostHighlightingPass.java
index 899389f03bf9..57b5ddc97398 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/local/GroovyPostHighlightingPass.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/local/GroovyPostHighlightingPass.java
@@ -84,7 +84,7 @@ public class GroovyPostHighlightingPass extends TextEditorHighlightingPass {
     myEditor = editor;
   }
 
-  public void doCollectInformation(final ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull final ProgressIndicator progress) {
     final InspectionProfile profile = InspectionProjectProfileManager.getInstance(myProject).getInspectionProfile();
     final boolean deadCodeEnabled = profile.isToolEnabled(HighlightDisplayKey.find(GroovyUnusedDeclarationInspection.SHORT_NAME), myFile);
     ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myProject).getFileIndex();
diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/FormHighlightingPass.java b/plugins/ui-designer/src/com/intellij/uiDesigner/FormHighlightingPass.java
index e3b7c898a49b..dae49482b998 100644
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/FormHighlightingPass.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/FormHighlightingPass.java
@@ -20,6 +20,7 @@ import com.intellij.codeHighlighting.HighlightingPass;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.uiDesigner.designSurface.GuiEditor;
 import com.intellij.uiDesigner.propertyInspector.UIDesignerToolWindowManager;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author yole
@@ -31,7 +32,7 @@ public class FormHighlightingPass implements HighlightingPass {
     myEditor = editor;
   }
 
-  public void collectInformation(ProgressIndicator progress) {
+  public void collectInformation(@NotNull ProgressIndicator progress) {
     ErrorAnalyzer.analyzeErrors(myEditor, myEditor.getRootContainer(), progress);
   }
 
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/DesignerHighlightingPass.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/DesignerHighlightingPass.java
index f74c9db181ae..20ef0504d9e8 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/DesignerHighlightingPass.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/DesignerHighlightingPass.java
@@ -19,6 +19,7 @@ import com.intellij.codeHighlighting.HighlightingPass;
 import com.intellij.designer.DesignerToolWindowManager;
 import com.intellij.designer.designSurface.DesignerEditorPanel;
 import com.intellij.openapi.progress.ProgressIndicator;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Alexander Lobas
@@ -31,7 +32,7 @@ public final class DesignerHighlightingPass implements HighlightingPass {
   }
 
   @Override
-  public void collectInformation(ProgressIndicator progress) {
+  public void collectInformation(@NotNull ProgressIndicator progress) {
     myDesigner.loadInspections(progress);
   }
 
diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
index 9e3aedfa4525..6e7bc131bedd 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/tagTreeHighlighting/XmlTagTreeHighlightingPass.java
@@ -74,7 +74,7 @@ public class XmlTagTreeHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Override
-  public void doCollectInformation(ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull ProgressIndicator progress) {
     if (ApplicationManager.getApplication().isUnitTestMode()) {
       return;
     }

From 197d45e76a7767a331f51de403b97bf0400d294b Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 4 Jun 2012 16:19:12 +0400
Subject: [PATCH 143/239] IDEA-86978 'IDEA' in a tooltip for 'Update Project'

---
 plugins/git4idea/src/git4idea/i18n/GitBundle.properties    | 4 ++--
 .../src/git4idea/update/GitUpdateOptionsPanel.form         | 5 ++---
 .../src/git4idea/update/GitUpdateOptionsPanel.java         | 7 +++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
index 1935443d9ea0..5173c3c4f9ea 100644
--- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
+++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties
@@ -453,9 +453,9 @@ update.options.no.commit=No &Commit
 update.options.save.before.update=Clean working tree before update
 update.options.save.keep.tooltip=Leave changes on working tree
 update.options.save.keep=Do &Not Clean
-update.options.save.shelve.tooltip=Use IDEA Shelve (the files will be restored when update finishes)
+update.options.save.shelve.tooltip=Use {0}''s Shelve to save changes (the files will be restored after update)
 update.options.save.shelve=Using She&lve
-update.options.save.stash.tooltip=Use 'git stash' to save changes (the files will be restored when update finishes)
+update.options.save.stash.tooltip=Use Git Stash to save changes (the files will be restored after update)
 update.options.save.stash=Using S&tash
 update.options.type.default.tooltip=Use branch default update strategy for all updated Git VCS roots
 update.options.type.default=Branch &Default
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
index db27637ca0c1..bf767f9084c2 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
@@ -70,13 +70,12 @@
               <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.stash.tooltip"/>
             </properties>
           </component>
-          <component id="d7fb3" class="javax.swing.JRadioButton" binding="myShelveRadioButton" default-binding="true">
+          <component id="d7fb3" class="javax.swing.JRadioButton" binding="myShelveRadioButton" custom-create="true" default-binding="true">
             <constraints>
               <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.shelve"/>
-              <toolTipText resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.shelve.tooltip"/>
+              <selected value="false"/>
             </properties>
           </component>
         </children>
diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java
index 91d2e58744b3..ec03decba3e0 100644
--- a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java
@@ -15,8 +15,10 @@
  */
 package git4idea.update;
 
+import com.intellij.openapi.application.ApplicationNamesInfo;
 import git4idea.config.GitVcsSettings;
 import git4idea.config.UpdateMethod;
+import git4idea.i18n.GitBundle;
 
 import javax.swing.*;
 
@@ -93,4 +95,9 @@ public class GitUpdateOptionsPanel {
     UpdatePolicyUtils.updatePolicyItem(settings.updateChangesPolicy(), myStashRadioButton, myShelveRadioButton);
   }
 
+  private void createUIComponents() {
+    myShelveRadioButton = new JRadioButton(GitBundle.message("update.options.save.shelve"));
+    myShelveRadioButton.setToolTipText(GitBundle.message("update.options.save.shelve.tooltip",
+                                                         ApplicationNamesInfo.getInstance().getFullProductName()));
+  }
 }

From 2dd21e1213340be2cdf1de72965ce957ddc85cca Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 4 Jun 2012 16:21:59 +0400
Subject: [PATCH 144/239] [merge] Fix LineBlocksTest: TextDiffTypeEnum can be
 null.

---
 .../src/com/intellij/openapi/diff/impl/util/TextDiffType.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
index 5c7595d8ae60..1d24fc30a1e7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/TextDiffType.java
@@ -52,7 +52,7 @@ public class TextDiffType implements DiffStatusBar.LegendTypeDescriptor {
   private final String myDisplayName;
   private final boolean myApplied;
 
-  public static TextDiffType create(@NotNull final TextDiffTypeEnum type) {
+  public static TextDiffType create(@Nullable final TextDiffTypeEnum type) {
     if (TextDiffTypeEnum.INSERT.equals(type)) {
       return INSERT;
     } else if (TextDiffTypeEnum.CHANGED.equals(type)) {

From c2eb2a85143dd881f40f0ded81649afd55280be7 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 4 Jun 2012 13:10:49 +0400
Subject: [PATCH 145/239] Untangle Java-based parsers

---
 .../impl/source/tree/JavaTreeGenerator.java   |  6 +-
 .../lang/java/parser/DeclarationParser.java   | 61 ++++++++-----------
 .../lang/java/parser/ExpressionParser.java    | 42 ++++++-------
 .../intellij/lang/java/parser/FileParser.java | 22 +++----
 .../intellij/lang/java/parser/JavaParser.java | 61 +++++++++++++++++++
 .../lang/java/parser/JavaParserUtil.java      |  1 -
 .../lang/java/parser/JavaParsers.java         | 27 --------
 .../lang/java/parser/JavadocParser.java       |  4 +-
 .../lang/java/parser/ReferenceParser.java     | 26 ++++----
 .../lang/java/parser/StatementParser.java     | 61 ++++++++-----------
 .../psi/impl/PsiElementFactoryImpl.java       |  4 +-
 .../psi/impl/PsiJavaParserFacadeImpl.java     | 30 ++++-----
 .../psi/impl/compiled/ClsParsingUtil.java     |  6 +-
 .../psi/impl/source/JavaFileElementType.java  |  4 +-
 .../psi/impl/source/tree/JavaElementType.java | 14 ++---
 .../parser/partial/AnnotationParserTest.java  |  6 +-
 .../parser/partial/DeclarationParserTest.java |  4 +-
 .../parser/partial/ExpressionParserTest.java  |  4 +-
 .../java/parser/partial/FileParserTest.java   |  6 +-
 .../parser/partial/ReferenceParserTest.java   | 11 ++--
 .../parser/partial/StatementParserTest.java   |  6 +-
 21 files changed, 201 insertions(+), 205 deletions(-)
 create mode 100644 java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java
 delete mode 100644 java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParsers.java

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java
index 27db22071b7f..9c1ffb51a55a 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaTreeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ package com.intellij.psi.impl.source.tree;
 import com.intellij.lang.ASTFactory;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.PsiBuilder;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParserUtil;
-import com.intellij.lang.java.parser.JavaParsers;
 import com.intellij.lexer.JavaLexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.diagnostic.Logger;
@@ -49,7 +49,7 @@ public class JavaTreeGenerator implements TreeGenerator {
   private static final JavaParserUtil.ParserWrapper MOD_LIST = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parseModifierList(builder);
+      JavaParser.INSTANCE.getDeclarationParser().parseModifierList(builder);
     }
   };
 
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
index 7fa765687740..6004f0836481 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
@@ -34,15 +34,12 @@ import static com.intellij.lang.PsiBuilderUtil.nextTokenType;
 import static com.intellij.lang.java.parser.JavaParserUtil.*;
 
 public class DeclarationParser {
-  private final ExpressionParser myExpressionParser;
-  private final StatementParser myStatementParser;
-  private final ReferenceParser myReferenceParser;
-
   public enum Context {
     FILE, CLASS, CODE_BLOCK, ANNOTATION_INTERFACE
   }
 
-  private static final TokenSet AFTER_END_DECLARATION_SET = TokenSet.create(JavaElementType.FIELD, JavaElementType.METHOD);
+  private static final TokenSet AFTER_END_DECLARATION_SET = TokenSet.create(
+    JavaElementType.FIELD, JavaElementType.METHOD);
   private static final TokenSet BEFORE_LBRACE_ELEMENTS_SET = TokenSet.create(
     JavaTokenType.IDENTIFIER, JavaTokenType.COMMA, JavaTokenType.EXTENDS_KEYWORD, JavaTokenType.IMPLEMENTS_KEYWORD);
   private static final TokenSet APPEND_TO_METHOD_SET = TokenSet.create(
@@ -51,22 +48,10 @@ public class DeclarationParser {
   private static final String WHITESPACES = "\n\r \t";
   private static final String LINE_ENDS = "\n\r";
 
-  public DeclarationParser() {
-    myReferenceParser = new ReferenceParser(this);
-    myExpressionParser = new ExpressionParser(this, myReferenceParser);
-    myStatementParser = new StatementParser(this, myExpressionParser, myReferenceParser);
-  }
+  private final JavaParser myParser;
 
-  public ReferenceParser getReferenceParser() {
-    return myReferenceParser;
-  }
-
-  public ExpressionParser getExpressionParser() {
-    return myExpressionParser;
-  }
-
-  public StatementParser getStatementParser() {
-    return myStatementParser;
+  public DeclarationParser(@NotNull final JavaParser javaParser) {
+    myParser = javaParser;
   }
 
   public void parseClassBodyWithBraces(final PsiBuilder builder, final boolean isAnnotation, final boolean isEnum) {
@@ -96,9 +81,10 @@ public class DeclarationParser {
       return null;
     }
 
-    myReferenceParser.parseTypeParameters(builder);
-    myReferenceParser.parseReferenceList(builder, JavaTokenType.EXTENDS_KEYWORD, JavaElementType.EXTENDS_LIST, JavaTokenType.COMMA);
-    myReferenceParser.parseReferenceList(builder, JavaTokenType.IMPLEMENTS_KEYWORD, JavaElementType.IMPLEMENTS_LIST, JavaTokenType.COMMA);
+    final ReferenceParser refParser = myParser.getReferenceParser();
+    refParser.parseTypeParameters(builder);
+    refParser.parseReferenceList(builder, JavaTokenType.EXTENDS_KEYWORD, JavaElementType.EXTENDS_LIST, JavaTokenType.COMMA);
+    refParser.parseReferenceList(builder, JavaTokenType.IMPLEMENTS_KEYWORD, JavaElementType.IMPLEMENTS_LIST, JavaTokenType.COMMA);
 
     if (builder.getTokenType() != JavaTokenType.LBRACE) {
       final PsiBuilder.Marker error = builder.mark();
@@ -173,7 +159,7 @@ public class DeclarationParser {
 
     if (expect(builder, JavaTokenType.IDENTIFIER)) {
       if (builder.getTokenType() == JavaTokenType.LPARENTH) {
-        myExpressionParser.parseArgumentList(builder);
+        myParser.getExpressionParser().parseArgumentList(builder);
       }
       else {
         emptyElement(builder, JavaElementType.EXPRESSION_LIST);
@@ -225,7 +211,7 @@ public class DeclarationParser {
       }
 
       // adding a reference, not simple tokens allows "Browse ..." to work well
-      final PsiBuilder.Marker ref = myReferenceParser.parseJavaCodeReference(builder, true, true, false, false, false);
+      final PsiBuilder.Marker ref = myParser.getReferenceParser().parseJavaCodeReference(builder, true, true, false, false, false);
       if (ref == null) {
         builder.advanceLexer();
       }
@@ -281,7 +267,7 @@ public class DeclarationParser {
 
     PsiBuilder.Marker typeParams = null;
     if (builder.getTokenType() == JavaTokenType.LT) {
-      typeParams = myReferenceParser.parseTypeParameters(builder);
+      typeParams = myParser.getReferenceParser().parseTypeParameters(builder);
     }
 
     if (context == Context.FILE) {
@@ -322,7 +308,7 @@ public class DeclarationParser {
         return modList;
       }
 
-      final PsiBuilder.Marker codeBlock = myStatementParser.parseCodeBlock(builder);
+      final PsiBuilder.Marker codeBlock = myParser.getStatementParser().parseCodeBlock(builder);
       assert codeBlock != null : builder.getOriginalText();
 
       if (typeParams != null) {
@@ -377,7 +363,7 @@ public class DeclarationParser {
 
   @NotNull
   private PsiBuilder.Marker parseTypeNotNull(final PsiBuilder builder) {
-    final PsiBuilder.Marker type = myReferenceParser.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD);
+    final PsiBuilder.Marker type = myParser.getReferenceParser().parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD);
     assert type != null : builder.getOriginalText();
     return type;
   }
@@ -432,7 +418,8 @@ public class DeclarationParser {
       }
     }
 
-    myReferenceParser.parseReferenceList(builder, JavaTokenType.THROWS_KEYWORD, JavaElementType.THROWS_LIST, JavaTokenType.COMMA);
+    myParser.getReferenceParser()
+      .parseReferenceList(builder, JavaTokenType.THROWS_KEYWORD, JavaElementType.THROWS_LIST, JavaTokenType.COMMA);
 
     final boolean hasDefault = expect(builder, JavaTokenType.DEFAULT_KEYWORD);
     if (hasDefault && anno) {
@@ -461,7 +448,7 @@ public class DeclarationParser {
       error(builder, JavaErrorMessages.message("expected.lbrace"));
     }
     if (!expect(builder, JavaTokenType.SEMICOLON) && builder.getTokenType() == JavaTokenType.LBRACE) {
-      myStatementParser.parseCodeBlock(builder);
+      myParser.getStatementParser().parseCodeBlock(builder);
     }
 
     done(declaration, anno ? JavaElementType.ANNOTATION_METHOD : JavaElementType.METHOD);
@@ -558,12 +545,14 @@ public class DeclarationParser {
       }
 
       // adding a reference, not simple tokens allows "Browse .." to work well
-      final PsiBuilder.Marker ref = myReferenceParser.parseJavaCodeReference(builder, true, true, false, false, false);
+      final PsiBuilder.Marker ref = myParser.getReferenceParser().parseJavaCodeReference(builder, true, true, false, false, false);
       if (ref == null && builder.getTokenType() != null) {
         builder.advanceLexer();
       }
     }
 
+    // todo: false positive
+    //noinspection ConstantConditions
     if (invalidElements != null) {
       invalidElements.error(errorMessage);
     }
@@ -594,7 +583,7 @@ public class DeclarationParser {
     int flags = ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD;
     if (ellipsis) flags |= ReferenceParser.ELLIPSIS;
     if (disjunctiveType) flags |= ReferenceParser.DISJUNCTIONS;
-    final ReferenceParser.TypeInfo typeInfo = myReferenceParser.parseTypeInfo(builder, flags);
+    final ReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(builder, flags);
 
     if (typeInfo == null) {
       if (modListInfo.second) {
@@ -621,7 +610,7 @@ public class DeclarationParser {
     }
 
     if (expectOrError(builder, JavaTokenType.EQ, "expected.eq")) {
-      if (myExpressionParser.parse(builder) == null) {
+      if (myParser.getExpressionParser().parse(builder) == null) {
         error(builder, JavaErrorMessages.message("expected.expression"));
       }
     }
@@ -659,7 +648,7 @@ public class DeclarationParser {
       }
 
       if (expect(builder, JavaTokenType.EQ)) {
-        final PsiBuilder.Marker expr = myExpressionParser.parse(builder);
+        final PsiBuilder.Marker expr = myParser.getExpressionParser().parse(builder);
         if (expr != null) {
           shouldRollback = false;
         }
@@ -756,7 +745,7 @@ public class DeclarationParser {
     final PsiBuilder.Marker anno = builder.mark();
     builder.advanceLexer();
 
-    final PsiBuilder.Marker classRef = myReferenceParser.parseJavaCodeReference(builder, true, false, false, false, false);
+    final PsiBuilder.Marker classRef = myParser.getReferenceParser().parseJavaCodeReference(builder, true, false, false, false, false);
     if (classRef == null) {
       error(builder, JavaErrorMessages.message("expected.class.reference"));
     }
@@ -860,7 +849,7 @@ public class DeclarationParser {
       result = parseAnnotationArrayInitializer(builder);
     }
     else {
-      result = myExpressionParser.parseConditional(builder);
+      result = myParser.getExpressionParser().parseConditional(builder);
     }
 
     if (result == null) {
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
index 7e522b6a46b4..1f535f70b8e8 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
@@ -30,11 +30,7 @@ import org.jetbrains.annotations.Nullable;
 import static com.intellij.lang.PsiBuilderUtil.expect;
 import static com.intellij.lang.java.parser.JavaParserUtil.*;
 
-
 public class ExpressionParser {
-  private final DeclarationParser myDeclarationParser;
-  private final ReferenceParser myReferenceParser;
-
   private enum ExprType {
     CONDITIONAL_OR, CONDITIONAL_AND, OR, XOR, AND, EQUALITY, RELATIONAL, SHIFT, ADDITIVE, MULTIPLICATIVE, UNARY, TYPE
   }
@@ -64,13 +60,10 @@ public class ExpressionParser {
     JavaTokenType.IDENTIFIER, TokenType.BAD_CHARACTER, JavaTokenType.COMMA, JavaTokenType.INTEGER_LITERAL, JavaTokenType.STRING_LITERAL);
   private static final TokenSet THIS_OR_SUPER = TokenSet.create(JavaTokenType.THIS_KEYWORD, JavaTokenType.SUPER_KEYWORD);
 
-  public ExpressionParser(DeclarationParser declarationParser, ReferenceParser referenceParser) {
-    myDeclarationParser = declarationParser;
-    myReferenceParser = referenceParser;
-  }
+  private final JavaParser myParser;
 
-  public ExpressionParser() {
-    this(new DeclarationParser(), new ReferenceParser());
+  public ExpressionParser(@NotNull final JavaParser javaParser) {
+    myParser = javaParser;
   }
 
   @Nullable
@@ -171,7 +164,7 @@ public class ExpressionParser {
         return parseUnary(builder);
 
       case TYPE:
-        return myReferenceParser.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD);
+        return myParser.getReferenceParser().parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD);
 
       default:
         assert false : "Unexpected type: " + type;
@@ -270,13 +263,14 @@ public class ExpressionParser {
       final PsiBuilder.Marker typeCast = builder.mark();
       builder.advanceLexer();
 
-      final ReferenceParser.TypeInfo typeInfo = myReferenceParser.parseTypeInfo(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD);
+      final ReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(builder,
+                                                                                            ReferenceParser.EAT_LAST_DOT |
+                                                                                            ReferenceParser.WILDCARD);
 
-      if (typeInfo == null || builder.getTokenType() != JavaTokenType.RPARENTH) {
+      if (typeInfo == null || !expect(builder, JavaTokenType.RPARENTH)) {
         typeCast.rollbackTo();
         return parsePostfix(builder);
       }
-      builder.advanceLexer();
 
       if (PREF_ARITHMETIC_OPS.contains(builder.getTokenType())) {
         if (!typeInfo.isPrimitive) {
@@ -375,7 +369,7 @@ public class ExpressionParser {
           final int offset = builder.getCurrentOffset();
           startMarker.rollbackTo();
 
-          final PsiBuilder.Marker ref = myReferenceParser.parseJavaCodeReference(builder, false, true, false, false, false);
+          final PsiBuilder.Marker ref = myParser.getReferenceParser().parseJavaCodeReference(builder, false, true, false, false, false);
           if (ref == null || builder.getTokenType() != JavaTokenType.DOT || builder.getCurrentOffset() != dotOffset) {
             copy.rollbackTo();
             return parsePrimary(builder, BreakPoint.P2, offset);
@@ -402,7 +396,7 @@ public class ExpressionParser {
         else {
           dotPos.drop();
           final PsiBuilder.Marker refExpr = expr.precede();
-          myReferenceParser.parseReferenceParameterList(builder, false, false);
+          myParser.getReferenceParser().parseReferenceParameterList(builder, false, false);
 
           if (!expectOrError(builder, JavaTokenType.IDENTIFIER, "expected.identifier")) {
             refExpr.done(JavaElementType.REFERENCE_EXPRESSION);
@@ -547,7 +541,7 @@ public class ExpressionParser {
       final boolean primitive = tokenType != JavaTokenType.IDENTIFIER;
       final PsiBuilder.Marker mark = builder.mark();
 
-      final ReferenceParser.TypeInfo typeInfo = myReferenceParser.parseTypeInfo(builder, 0);
+      final ReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(builder, 0);
       if (typeInfo != null && (primitive || !typeInfo.hasErrors && typeInfo.isParameterized)) {
         final PsiBuilder.Marker result = continueClassAccessOrMethodReference(builder, mark, primitive);
         if (result != null) return result;
@@ -558,7 +552,7 @@ public class ExpressionParser {
 
     PsiBuilder.Marker annotation = null;
     if (tokenType == JavaTokenType.AT) {
-      annotation = myDeclarationParser.parseAnnotations(builder);
+      annotation = myParser.getDeclarationParser().parseAnnotations(builder);
       tokenType = builder.getTokenType();
     }
 
@@ -588,7 +582,7 @@ public class ExpressionParser {
     if (tokenType == JavaTokenType.LT) {
       expr = builder.mark();
 
-      if (!myReferenceParser.parseReferenceParameterList(builder, false, false)) {
+      if (!myParser.getReferenceParser().parseReferenceParameterList(builder, false, false)) {
         expr.rollbackTo();
         return null;
       }
@@ -682,14 +676,14 @@ public class ExpressionParser {
     final PsiBuilder.Marker newExpr = (start != null ? start.precede() : builder.mark());
     builder.advanceLexer();
 
-    myReferenceParser.parseReferenceParameterList(builder, false, true);
+    myParser.getReferenceParser().parseReferenceParameterList(builder, false, true);
 
     final PsiBuilder.Marker refOrType;
     final boolean parseAnnotations = areTypeAnnotationsSupported(builder) && builder.getTokenType() == JavaTokenType.AT;
 
     final IElementType tokenType = builder.getTokenType();
     if (tokenType == JavaTokenType.IDENTIFIER || parseAnnotations) {
-      refOrType = myReferenceParser.parseJavaCodeReference(builder, true, true, parseAnnotations, true, true);
+      refOrType = myParser.getReferenceParser().parseJavaCodeReference(builder, true, true, parseAnnotations, true, true);
       if (refOrType == null) {
         error(builder, JavaErrorMessages.message("expected.identifier"));
         newExpr.done(JavaElementType.NEW_EXPRESSION);
@@ -710,7 +704,7 @@ public class ExpressionParser {
       parseArgumentList(builder);
       if (builder.getTokenType() == JavaTokenType.LBRACE) {
         final PsiBuilder.Marker classElement = refOrType.precede();
-        myDeclarationParser.parseClassBodyWithBraces(builder, false, false);
+        myParser.getDeclarationParser().parseClassBodyWithBraces(builder, false, false);
         classElement.done(JavaElementType.ANONYMOUS_CLASS);
       }
     }
@@ -761,7 +755,7 @@ public class ExpressionParser {
     final PsiBuilder.Marker expr = builder.mark();
 
     final boolean primitive = ElementType.PRIMITIVE_TYPE_BIT_SET.contains(builder.getTokenType());
-    if (myReferenceParser.parseType(builder, 0) == null) {
+    if (myParser.getReferenceParser().parseType(builder, 0) == null) {
       expr.drop();
       return null;
     }
@@ -809,7 +803,7 @@ public class ExpressionParser {
   private PsiBuilder.Marker parseMethodReference(final PsiBuilder builder, final PsiBuilder.Marker start) {
     builder.advanceLexer();
 
-    myReferenceParser.parseReferenceParameterList(builder, false, false);
+    myParser.getReferenceParser().parseReferenceParameterList(builder, false, false);
 
     if (!expect(builder, JavaTokenType.IDENTIFIER) && !expect(builder, JavaTokenType.NEW_KEYWORD)) {
       error(builder, JavaErrorMessages.message("expected.identifier"));
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java
index 8c43711e19c5..72e9725eaf1b 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/FileParser.java
@@ -30,23 +30,15 @@ import org.jetbrains.annotations.Nullable;
 import static com.intellij.lang.PsiBuilderUtil.expect;
 import static com.intellij.lang.java.parser.JavaParserUtil.*;
 
-
 public class FileParser {
-  public static final FileParser INSTANCE = new FileParser();
-  private final ReferenceParser myReferenceParser;
-  private final DeclarationParser myDeclarationParser;
-
   private static final TokenSet IMPORT_LIST_STOPPER_SET = TokenSet.orSet(
     ElementType.MODIFIER_BIT_SET,
     TokenSet.create(JavaTokenType.CLASS_KEYWORD, JavaTokenType.INTERFACE_KEYWORD, JavaTokenType.ENUM_KEYWORD, JavaTokenType.AT));
 
-  private FileParser() {
-    this(JavaParsers.DECLARATION_PARSER, JavaParsers.REFERENCE_PARSER);
-  }
+  private final JavaParser myParser;
 
-  protected FileParser(DeclarationParser declarationParser, ReferenceParser referenceParser) {
-    myDeclarationParser = declarationParser;
-    myReferenceParser = referenceParser;
+  public FileParser(@NotNull final JavaParser javaParser) {
+    myParser = javaParser;
   }
 
   public void parse(final PsiBuilder builder) {
@@ -113,7 +105,7 @@ public class FileParser {
 
   @Nullable
   protected PsiBuilder.Marker parseInitial(PsiBuilder builder) {
-    return myDeclarationParser.parse(builder, DeclarationParser.Context.FILE);
+    return myParser.getDeclarationParser().parse(builder, DeclarationParser.Context.FILE);
   }
 
   @Nullable
@@ -122,7 +114,7 @@ public class FileParser {
 
     if (!expect(builder, JavaTokenType.PACKAGE_KEYWORD)) {
       final PsiBuilder.Marker modList = builder.mark();
-      myDeclarationParser.parseAnnotations(builder);
+      myParser.getDeclarationParser().parseAnnotations(builder);
       done(modList, JavaElementType.MODIFIER_LIST);
       if (!expect(builder, JavaTokenType.PACKAGE_KEYWORD)) {
         statement.rollbackTo();
@@ -130,7 +122,7 @@ public class FileParser {
       }
     }
 
-    final PsiBuilder.Marker ref = myReferenceParser.parseJavaCodeReference(builder, true, false, false, false, false);
+    final PsiBuilder.Marker ref = myParser.getReferenceParser().parseJavaCodeReference(builder, true, false, false, false, false);
     if (ref == null) {
       statement.rollbackTo();
       return null;
@@ -186,7 +178,7 @@ public class FileParser {
     final boolean isStatic = expect(builder, JavaTokenType.STATIC_KEYWORD);
     final IElementType type = isStatic ? JavaElementType.IMPORT_STATIC_STATEMENT : JavaElementType.IMPORT_STATEMENT;
 
-    final boolean isOk = myReferenceParser.parseImportCodeReference(builder, isStatic);
+    final boolean isOk = myParser.getReferenceParser().parseImportCodeReference(builder, isStatic);
     if (isOk) {
       semicolon(builder);
     }
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java
new file mode 100644
index 000000000000..3201899e4b49
--- /dev/null
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParser.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.lang.java.parser;
+
+import org.jetbrains.annotations.NotNull;
+
+public class JavaParser {
+  public static final JavaParser INSTANCE = new JavaParser();
+
+  private final FileParser myFileParser;
+  private final DeclarationParser myDeclarationParser;
+  private final StatementParser myStatementParser;
+  private final ExpressionParser myExpressionParser;
+  private final ReferenceParser myReferenceParser;
+
+  public JavaParser() {
+    myFileParser = new FileParser(this);
+    myDeclarationParser = new DeclarationParser(this);
+    myStatementParser = new StatementParser(this);
+    myExpressionParser = new ExpressionParser(this);
+    myReferenceParser = new ReferenceParser(this);
+  }
+
+  @NotNull
+  public FileParser getFileParser() {
+    return myFileParser;
+  }
+
+  @NotNull
+  public DeclarationParser getDeclarationParser() {
+    return myDeclarationParser;
+  }
+
+  @NotNull
+  public StatementParser getStatementParser() {
+    return myStatementParser;
+  }
+
+  @NotNull
+  public ExpressionParser getExpressionParser() {
+    return myExpressionParser;
+  }
+
+  @NotNull
+  public ReferenceParser getReferenceParser() {
+    return myReferenceParser;
+  }
+}
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
index f540b0749b3b..95a1f8b335d8 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java
@@ -43,7 +43,6 @@ import org.jetbrains.annotations.PropertyKey;
 
 import java.util.List;
 
-
 public class JavaParserUtil {
   private static final Key<LanguageLevel> LANG_LEVEL_KEY = Key.create("JavaParserUtil.LanguageLevel");
   private static final Key<Boolean> DEEP_PARSE_BLOCKS_IN_STATEMENTS = Key.create("JavaParserUtil.ParserExtender");
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParsers.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParsers.java
deleted file mode 100644
index 9729dba3758f..000000000000
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParsers.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.lang.java.parser;
-
-/**
- * @author Dmitry Avdeev
- *         Date: 11/19/11
- */
-public class JavaParsers {
-  public static final DeclarationParser DECLARATION_PARSER = new DeclarationParser();
-  public static final ExpressionParser EXPRESSION_PARSER = new ExpressionParser();
-  public static final ReferenceParser REFERENCE_PARSER = new ReferenceParser();
-  public static final StatementParser STATEMENT_PARSER = new StatementParser();
-}
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java
index 78abd7fd19e5..39addc29cb03 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavadocParser.java
@@ -51,12 +51,12 @@ public class JavadocParser {
   private JavadocParser() { }
 
   public static void parseJavadocReference(@NotNull final PsiBuilder builder) {
-    JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, true, true, false, false, false);
+    JavaParser.INSTANCE.getReferenceParser().parseJavaCodeReference(builder, true, true, false, false, false);
     swallowTokens(builder);
   }
 
   public static void parseJavadocType(@NotNull final PsiBuilder builder) {
-    JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS | ReferenceParser.WILDCARD);
+    JavaParser.INSTANCE.getReferenceParser().parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS | ReferenceParser.WILDCARD);
     swallowTokens(builder);
   }
 
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
index 50ac1744e5b2..3b9058ee6134 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
@@ -30,10 +30,7 @@ import static com.intellij.lang.PsiBuilderUtil.nextTokenType;
 import static com.intellij.lang.java.parser.JavaParserUtil.*;
 import static com.intellij.util.BitUtil.isSet;
 
-
 public class ReferenceParser {
-  private final DeclarationParser myDeclarationParser;
-
   public static final int EAT_LAST_DOT = 0x01;
   public static final int ELLIPSIS = 0x02;
   public static final int WILDCARD = 0x04;
@@ -51,12 +48,10 @@ public class ReferenceParser {
 
   private static final TokenSet WILDCARD_KEYWORD_SET = TokenSet.create(JavaTokenType.EXTENDS_KEYWORD, JavaTokenType.SUPER_KEYWORD);
 
-  public ReferenceParser(DeclarationParser declarationParser) {
-    myDeclarationParser = declarationParser;
-  }
+  private final JavaParser myParser;
 
-  public ReferenceParser() {
-    this(new DeclarationParser());
+  public ReferenceParser(@NotNull final JavaParser javaParser) {
+    myParser = javaParser;
   }
 
   @Nullable
@@ -67,7 +62,8 @@ public class ReferenceParser {
 
   @Nullable
   public TypeInfo parseTypeInfo(final PsiBuilder builder, final int flags) {
-    final TypeInfo typeInfo = parseTypeInfo(builder, isSet(flags, EAT_LAST_DOT), isSet(flags, WILDCARD), false, isSet(flags, DIAMONDS), isSet(flags, ELLIPSIS));
+    final TypeInfo typeInfo = parseTypeInfo(builder, isSet(flags, EAT_LAST_DOT), isSet(flags, WILDCARD), false, isSet(flags, DIAMONDS),
+                                            isSet(flags, ELLIPSIS));
 
     if (typeInfo != null && isSet(flags, DISJUNCTIONS) && builder.getTokenType() == JavaTokenType.OR) {
       typeInfo.marker = typeInfo.marker.precede();
@@ -87,8 +83,8 @@ public class ReferenceParser {
   }
 
   @Nullable
-  private TypeInfo parseTypeInfo(final PsiBuilder builder,
-                                 final boolean eatLastDot, final boolean wildcard, final boolean badWildcard, final boolean diamonds, final boolean ellipsis) {
+  private TypeInfo parseTypeInfo(final PsiBuilder builder, final boolean eatLastDot, final boolean wildcard, final boolean badWildcard,
+                                 final boolean diamonds, final boolean ellipsis) {
     if (builder.getTokenType() == null) return null;
 
     final TypeInfo typeInfo = new TypeInfo();
@@ -96,7 +92,7 @@ public class ReferenceParser {
     final boolean annotationsSupported = areTypeAnnotationsSupported(builder);
     PsiBuilder.Marker type = builder.mark();
     if (annotationsSupported) {
-      myDeclarationParser.parseAnnotations(builder);
+      myParser.getDeclarationParser().parseAnnotations(builder);
     }
 
     final IElementType tokenType = builder.getTokenType();
@@ -125,7 +121,7 @@ public class ReferenceParser {
     while (true) {
       type.done(JavaElementType.TYPE);
       if (annotationsSupported) {
-        myDeclarationParser.parseAnnotations(builder);
+        myParser.getDeclarationParser().parseAnnotations(builder);
       }
 
       final PsiBuilder.Marker bracket = builder.mark();
@@ -193,7 +189,7 @@ public class ReferenceParser {
     PsiBuilder.Marker refElement = builder.mark();
 
     if (annotations) {
-      myDeclarationParser.parseAnnotations(builder);
+      myParser.getDeclarationParser().parseAnnotations(builder);
     }
 
     if (!expect(builder, JavaTokenType.IDENTIFIER)) {
@@ -344,7 +340,7 @@ public class ReferenceParser {
   public PsiBuilder.Marker parseTypeParameter(final PsiBuilder builder) {
     final PsiBuilder.Marker param = builder.mark();
 
-    myDeclarationParser.parseAnnotations(builder);
+    myParser.getDeclarationParser().parseAnnotations(builder);
 
     final boolean wild = expect(builder, JavaTokenType.QUEST);
     if (!wild && !expect(builder, JavaTokenType.IDENTIFIER)) {
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java
index 95161be3feed..c97c875c0796 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java
@@ -32,28 +32,19 @@ import java.util.List;
 import static com.intellij.lang.PsiBuilderUtil.*;
 import static com.intellij.lang.java.parser.JavaParserUtil.*;
 
-
 public class StatementParser {
-  private final ExpressionParser myExpressionParser;
-  private final DeclarationParser myDeclarationParser;
-  private final ReferenceParser myReferenceParser;
-
-  public StatementParser(DeclarationParser declarationParser, ExpressionParser expressionParser, ReferenceParser referenceParser) {
-    myDeclarationParser = declarationParser;
-    myExpressionParser = expressionParser;
-    myReferenceParser = referenceParser;
-  }
-
-  public StatementParser() {
-    this(new DeclarationParser(), new ExpressionParser(), new ReferenceParser());
-  }
-
   private enum BraceMode {
     TILL_FIRST, TILL_LAST
   }
 
   private static final TokenSet TRY_CLOSERS_SET = TokenSet.create(JavaTokenType.CATCH_KEYWORD, JavaTokenType.FINALLY_KEYWORD);
 
+  private final JavaParser myParser;
+
+  public StatementParser(@NotNull final JavaParser javaParser) {
+    myParser = javaParser;
+  }
+
   @Nullable
   public PsiBuilder.Marker parseCodeBlock(final PsiBuilder builder) {
     return parseCodeBlock(builder, false);
@@ -236,15 +227,15 @@ public class StatementParser {
     }
     else if (tokenType == JavaTokenType.IDENTIFIER || tokenType == JavaTokenType.AT) {
       final PsiBuilder.Marker refPos = builder.mark();
-      myDeclarationParser.parseAnnotations(builder);
+      myParser.getDeclarationParser().parseAnnotations(builder);
       skipQualifiedName(builder);
       final IElementType suspectedLT = builder.getTokenType();
       refPos.rollbackTo();
       if (suspectedLT == JavaTokenType.LT) {
         final PsiBuilder.Marker declStatement = builder.mark();
-        final PsiBuilder.Marker decl = myDeclarationParser.parse(builder, DeclarationParser.Context.CODE_BLOCK);
+        final PsiBuilder.Marker decl = myParser.getDeclarationParser().parse(builder, DeclarationParser.Context.CODE_BLOCK);
         if (decl == null) {
-          PsiBuilder.Marker marker = myReferenceParser.parseType(builder, 0);
+          PsiBuilder.Marker marker = myParser.getReferenceParser().parseType(builder, 0);
           error(builder, JavaErrorMessages.message("expected.identifier"));
           if (marker == null) builder.advanceLexer();
         }
@@ -254,7 +245,7 @@ public class StatementParser {
     }
 
     final PsiBuilder.Marker pos = builder.mark();
-    final PsiBuilder.Marker expr = myExpressionParser.parse(builder);
+    final PsiBuilder.Marker expr = myParser.getExpressionParser().parse(builder);
 
     if (expr != null) {
       int count = 1;
@@ -263,7 +254,7 @@ public class StatementParser {
       while (builder.getTokenType() == JavaTokenType.COMMA) {
         final PsiBuilder.Marker commaPos = builder.mark();
         builder.advanceLexer();
-        final PsiBuilder.Marker expr1 = myExpressionParser.parse(builder);
+        final PsiBuilder.Marker expr1 = myParser.getExpressionParser().parse(builder);
         if (expr1 == null) {
           commaPos.rollbackTo();
           break;
@@ -290,7 +281,7 @@ public class StatementParser {
       pos.drop();
     }
 
-    final PsiBuilder.Marker decl = myDeclarationParser.parse(builder, DeclarationParser.Context.CODE_BLOCK);
+    final PsiBuilder.Marker decl = myParser.getDeclarationParser().parse(builder, DeclarationParser.Context.CODE_BLOCK);
     if (decl != null) {
       final PsiBuilder.Marker statement = decl.precede();
       done(statement, JavaElementType.DECLARATION_STATEMENT);
@@ -307,7 +298,7 @@ public class StatementParser {
 
     if (expr != null) {
       final PsiBuilder.Marker statement = builder.mark();
-      myExpressionParser.parse(builder);
+      myParser.getExpressionParser().parse(builder);
       semicolon(builder);
       done(statement, JavaElementType.EXPRESSION_STATEMENT);
       return statement;
@@ -385,7 +376,7 @@ public class StatementParser {
     }
 
     final PsiBuilder.Marker afterParenth = builder.mark();
-    final PsiBuilder.Marker param = myDeclarationParser.parseParameter(builder, false, false);
+    final PsiBuilder.Marker param = myParser.getDeclarationParser().parseParameter(builder, false, false);
     if (param == null || exprType(param) != JavaElementType.PARAMETER || builder.getTokenType() != JavaTokenType.COLON) {
       afterParenth.rollbackTo();
       return parseForLoopFromInitialization(builder, statement);
@@ -407,7 +398,7 @@ public class StatementParser {
       }
     }
     else {
-      myExpressionParser.parse(builder);
+      myParser.getExpressionParser().parse(builder);
       if (!expect(builder, JavaTokenType.SEMICOLON)) {
         error(builder, JavaErrorMessages.message("expected.semicolon"));
         if (!expect(builder, JavaTokenType.RPARENTH)) {
@@ -435,7 +426,7 @@ public class StatementParser {
   }
 
   private void parseExpressionOrExpressionList(final PsiBuilder builder) {
-    final PsiBuilder.Marker expr = myExpressionParser.parse(builder);
+    final PsiBuilder.Marker expr = myParser.getExpressionParser().parse(builder);
     if (expr == null) return;
 
     final PsiBuilder.Marker expressionStatement;
@@ -449,7 +440,7 @@ public class StatementParser {
 
       do {
         builder.advanceLexer();
-        final PsiBuilder.Marker nextExpression = myExpressionParser.parse(builder);
+        final PsiBuilder.Marker nextExpression = myParser.getExpressionParser().parse(builder);
         if (nextExpression == null) {
           error(builder, JavaErrorMessages.message("expected.expression"));
         }
@@ -465,7 +456,7 @@ public class StatementParser {
   private PsiBuilder.Marker parseForEachFromColon(PsiBuilder builder, PsiBuilder.Marker statement) {
     builder.advanceLexer();
 
-    final PsiBuilder.Marker expr = myExpressionParser.parse(builder);
+    final PsiBuilder.Marker expr = myParser.getExpressionParser().parse(builder);
     if (expr == null) {
       error(builder, JavaErrorMessages.message("expected.expression"));
     }
@@ -536,7 +527,7 @@ public class StatementParser {
     builder.advanceLexer();
 
     if (isCase) {
-      final PsiBuilder.Marker expr = myExpressionParser.parse(builder);
+      final PsiBuilder.Marker expr = myParser.getExpressionParser().parse(builder);
       if (expr == null) {
         statement.rollbackTo();
         return null;
@@ -574,7 +565,7 @@ public class StatementParser {
     final PsiBuilder.Marker statement = builder.mark();
     builder.advanceLexer();
 
-    myExpressionParser.parse(builder);
+    myParser.getExpressionParser().parse(builder);
 
     semicolon(builder);
     done(statement, JavaElementType.RETURN_STATEMENT);
@@ -586,7 +577,7 @@ public class StatementParser {
     final PsiBuilder.Marker statement = builder.mark();
     builder.advanceLexer();
 
-    final PsiBuilder.Marker expr = myExpressionParser.parse(builder);
+    final PsiBuilder.Marker expr = myParser.getExpressionParser().parse(builder);
     if (expr == null) {
       error(builder, JavaErrorMessages.message("expected.expression"));
       done(statement, JavaElementType.THROW_STATEMENT);
@@ -624,7 +615,7 @@ public class StatementParser {
 
     final boolean hasResourceList = builder.getTokenType() == JavaTokenType.LPARENTH;
     if (hasResourceList) {
-      myDeclarationParser.parseResourceList(builder);
+      myParser.getDeclarationParser().parseResourceList(builder);
     }
 
     final PsiBuilder.Marker tryBlock = parseCodeBlock(builder, true);
@@ -666,7 +657,7 @@ public class StatementParser {
       return false;
     }
 
-    final PsiBuilder.Marker param = myDeclarationParser.parseParameter(builder, false, true);
+    final PsiBuilder.Marker param = myParser.getDeclarationParser().parseParameter(builder, false, true);
     if (param == null) {
       error(builder, JavaErrorMessages.message("expected.parameter"));
     }
@@ -693,7 +684,7 @@ public class StatementParser {
     final PsiBuilder.Marker statement = builder.mark();
     builder.advanceLexer();
 
-    final PsiBuilder.Marker expr = myExpressionParser.parse(builder);
+    final PsiBuilder.Marker expr = myParser.getExpressionParser().parse(builder);
     if (expr == null) {
       error(builder, JavaErrorMessages.message("expected.boolean.expression"));
       done(statement, JavaElementType.ASSERT_STATEMENT);
@@ -701,7 +692,7 @@ public class StatementParser {
     }
 
     if (expect(builder, JavaTokenType.COLON)) {
-      final PsiBuilder.Marker expr2 = myExpressionParser.parse(builder);
+      final PsiBuilder.Marker expr2 = myParser.getExpressionParser().parse(builder);
       if (expr2 == null) {
         error(builder, JavaErrorMessages.message("expected.expression"));
         done(statement, JavaElementType.ASSERT_STATEMENT);
@@ -729,7 +720,7 @@ public class StatementParser {
     }
 
     final PsiBuilder.Marker beforeExpr = builder.mark();
-    final PsiBuilder.Marker expr = myExpressionParser.parse(builder);
+    final PsiBuilder.Marker expr = myParser.getExpressionParser().parse(builder);
     if (expr == null || builder.getTokenType() == JavaTokenType.SEMICOLON) {
       beforeExpr.rollbackTo();
       error(builder, JavaErrorMessages.message("expected.expression"));
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java
index 5c876fb79274..3e1b6d9472c7 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java
@@ -16,8 +16,8 @@
 package com.intellij.psi.impl;
 
 import com.intellij.lang.*;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParserUtil;
-import com.intellij.lang.java.parser.JavaParsers;
 import com.intellij.lexer.JavaLexer;
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.diagnostic.Logger;
@@ -721,7 +721,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
   private static final JavaParserUtil.ParserWrapper CATCH_SECTION = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.STATEMENT_PARSER.parseCatchBlock(builder);
+      JavaParser.INSTANCE.getStatementParser().parseCatchBlock(builder);
     }
   };
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java
index c1b21ff5290b..99107f54c2cd 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiJavaParserFacadeImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,92 +53,92 @@ public class PsiJavaParserFacadeImpl implements PsiJavaParserFacade {
   private static final JavaParserUtil.ParserWrapper ANNOTATION = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parseAnnotation(builder);
+      JavaParser.INSTANCE.getDeclarationParser().parseAnnotation(builder);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper PARAMETER = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parseParameter(builder, true, false);
+      JavaParser.INSTANCE.getDeclarationParser().parseParameter(builder, true, false);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper RESOURCE = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parseResource(builder);
+      JavaParser.INSTANCE.getDeclarationParser().parseResource(builder);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper TYPE = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS |
-                                         ReferenceParser.WILDCARD | ReferenceParser.DISJUNCTIONS);
+      JavaParser.INSTANCE.getReferenceParser().parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS |
+                                                                  ReferenceParser.WILDCARD | ReferenceParser.DISJUNCTIONS);
     }
   };
 
   public static final JavaParserUtil.ParserWrapper REFERENCE = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, false, true, false, false, false);
+      JavaParser.INSTANCE.getReferenceParser().parseJavaCodeReference(builder, false, true, false, false, false);
     }
   };
 
   public static final JavaParserUtil.ParserWrapper DIAMOND_REF = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, false, true, false, false, true);
+      JavaParser.INSTANCE.getReferenceParser().parseJavaCodeReference(builder, false, true, false, false, true);
     }
   };
 
   public static final JavaParserUtil.ParserWrapper STATIC_IMPORT_REF = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.REFERENCE_PARSER.parseImportCodeReference(builder, true);
+      JavaParser.INSTANCE.getReferenceParser().parseImportCodeReference(builder, true);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper TYPE_PARAMETER = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.REFERENCE_PARSER.parseTypeParameter(builder);
+      JavaParser.INSTANCE.getReferenceParser().parseTypeParameter(builder);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper DECLARATION = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parse(builder, DeclarationParser.Context.CLASS);
+      JavaParser.INSTANCE.getDeclarationParser().parse(builder, DeclarationParser.Context.CLASS);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper CODE_BLOCK = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true);
+      JavaParser.INSTANCE.getStatementParser().parseCodeBlockDeep(builder, true);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper STATEMENT = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.STATEMENT_PARSER.parseStatement(builder);
+      JavaParser.INSTANCE.getStatementParser().parseStatement(builder);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper EXPRESSION = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.EXPRESSION_PARSER.parse(builder);
+      JavaParser.INSTANCE.getExpressionParser().parse(builder);
     }
   };
 
   private static final JavaParserUtil.ParserWrapper ENUM_CONSTANT = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parseEnumConstant(builder);
+      JavaParser.INSTANCE.getDeclarationParser().parseEnumConstant(builder);
     }
   };
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java
index 06d73a71bc16..2d2eb2cc5b2a 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsParsingUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package com.intellij.psi.impl.compiled;
 
 import com.intellij.lang.PsiBuilder;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParserUtil;
-import com.intellij.lang.java.parser.JavaParsers;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.*;
@@ -40,7 +40,7 @@ public class ClsParsingUtil {
   private static final JavaParserUtil.ParserWrapper ANNOTATION_VALUE = new JavaParserUtil.ParserWrapper() {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parseAnnotationValue(builder);
+      JavaParser.INSTANCE.getDeclarationParser().parseAnnotationValue(builder);
     }
   };
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
index 97cc4bed2543..f1075285c64e 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
@@ -19,7 +19,7 @@ import com.intellij.lang.ASTNode;
 import com.intellij.lang.LighterASTNode;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.java.JavaLanguage;
-import com.intellij.lang.java.parser.FileParser;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParserUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.java.LanguageLevel;
@@ -80,7 +80,7 @@ public class JavaFileElementType extends ILightStubFileElementType<PsiJavaFileSt
 
   private void doParse(final PsiBuilder builder) {
     final PsiBuilder.Marker root = builder.mark();
-    FileParser.INSTANCE.parse(builder);
+    JavaParser.INSTANCE.getFileParser().parse(builder);
     root.done(this);
   }
 
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
index 7f96a2d003dd..83d4271a06c6 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
@@ -153,14 +153,14 @@ public interface JavaElementType {
     @Override
     public ASTNode parseContents(final ASTNode chameleon) {
       final PsiBuilder builder = JavaParserUtil.createBuilder(chameleon);
-      JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true);
+      JavaParser.INSTANCE.getStatementParser().parseCodeBlockDeep(builder, true);
       return builder.getTreeBuilt().getFirstChildNode();
     }
 
     @Override
     public FlyweightCapableTreeStructure<LighterASTNode> parseContents(final LighterLazyParseableNode chameleon) {
       final PsiBuilder builder = JavaParserUtil.createBuilder(chameleon);
-      JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true);
+      JavaParser.INSTANCE.getStatementParser().parseCodeBlockDeep(builder, true);
       return builder.getLightTree();
     }
 
@@ -193,7 +193,7 @@ public interface JavaElementType {
     private final JavaParserUtil.ParserWrapper myParser = new JavaParserUtil.ParserWrapper() {
       @Override
       public void parse(final PsiBuilder builder) {
-        JavaParsers.STATEMENT_PARSER.parseStatements(builder);
+        JavaParser.INSTANCE.getStatementParser().parseStatements(builder);
       }
     };
 
@@ -208,7 +208,7 @@ public interface JavaElementType {
     private final JavaParserUtil.ParserWrapper myParser = new JavaParserUtil.ParserWrapper() {
       @Override
       public void parse(final PsiBuilder builder) {
-        JavaParsers.EXPRESSION_PARSER.parse(builder);
+        JavaParser.INSTANCE.getExpressionParser().parse(builder);
       }
     };
 
@@ -223,7 +223,7 @@ public interface JavaElementType {
     private final JavaParserUtil.ParserWrapper myParser = new JavaParserUtil.ParserWrapper() {
       @Override
       public void parse(final PsiBuilder builder) {
-        JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, false, true, false, false, false);
+        JavaParser.INSTANCE.getReferenceParser().parseJavaCodeReference(builder, false, true, false, false, false);
       }
     };
 
@@ -238,8 +238,8 @@ public interface JavaElementType {
     private final JavaParserUtil.ParserWrapper myParser = new JavaParserUtil.ParserWrapper() {
       @Override
       public void parse(final PsiBuilder builder) {
-        JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS |
-                                           ReferenceParser.WILDCARD | ReferenceParser.DISJUNCTIONS);
+        JavaParser.INSTANCE.getReferenceParser().parseType(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.ELLIPSIS |
+                                                                    ReferenceParser.WILDCARD | ReferenceParser.DISJUNCTIONS);
       }
     };
 
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java
index 68b94739a2a2..c6db3569f299 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/AnnotationParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package com.intellij.lang.java.parser.partial;
 
 import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.java.parser.JavaParsers;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParsingTestCase;
 
 
@@ -45,7 +45,7 @@ public class AnnotationParserTest extends JavaParsingTestCase {
   private static class MyTestParser1 implements TestParser {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parseAnnotations(builder);
+      JavaParser.INSTANCE.getDeclarationParser().parseAnnotations(builder);
     }
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
index f9c7f5db6571..7523c73712dd 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/DeclarationParserTest.java
@@ -16,7 +16,7 @@
 package com.intellij.lang.java.parser.partial;
 
 import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.java.parser.JavaParsers;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParsingTestCase;
 import com.intellij.pom.java.LanguageLevel;
 
@@ -121,7 +121,7 @@ public class DeclarationParserTest extends JavaParsingTestCase {
 
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.DECLARATION_PARSER.parseClassBodyWithBraces(builder, myAnnotation, myAnEnum);
+      JavaParser.INSTANCE.getDeclarationParser().parseClassBodyWithBraces(builder, myAnnotation, myAnEnum);
     }
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
index 838d0c4fcf2a..551f8b715c3c 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
@@ -16,7 +16,7 @@
 package com.intellij.lang.java.parser.partial;
 
 import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.java.parser.JavaParsers;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParsingTestCase;
 import org.jetbrains.annotations.NonNls;
 
@@ -128,7 +128,7 @@ public class ExpressionParserTest extends JavaParsingTestCase {
   private static class MyTestParser implements TestParser {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.EXPRESSION_PARSER.parse(builder);
+      JavaParser.INSTANCE.getExpressionParser().parse(builder);
     }
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/FileParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/FileParserTest.java
index 4311106f2d69..52766f5d2c8e 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/FileParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/FileParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package com.intellij.lang.java.parser.partial;
 
 import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.java.parser.FileParser;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParsingTestCase;
 
 
@@ -65,7 +65,7 @@ public class FileParserTest extends JavaParsingTestCase {
   private static class MyTestParser implements TestParser {
     @Override
     public void parse(final PsiBuilder builder) {
-      FileParser.INSTANCE.parse(builder);
+      JavaParser.INSTANCE.getFileParser().parse(builder);
     }
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java
index 2d20e0801213..5fde8f2d290f 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ReferenceParserTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package com.intellij.lang.java.parser.partial;
 
 import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.java.parser.JavaParsers;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParsingTestCase;
 import com.intellij.lang.java.parser.ReferenceParser;
 import com.intellij.pom.java.LanguageLevel;
@@ -68,7 +68,7 @@ public class ReferenceParserTest extends JavaParsingTestCase {
 
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.REFERENCE_PARSER.parseJavaCodeReference(builder, myIncomplete, false, false, false, false);
+      JavaParser.INSTANCE.getReferenceParser().parseJavaCodeReference(builder, myIncomplete, false, false, false, false);
     }
   }
 
@@ -78,7 +78,8 @@ public class ReferenceParserTest extends JavaParsingTestCase {
   private static class MyTestParser2 implements TestParser {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.REFERENCE_PARSER.parseType(builder, ReferenceParser.ELLIPSIS | ReferenceParser.DIAMONDS | ReferenceParser.DISJUNCTIONS);
+      JavaParser.INSTANCE.getReferenceParser()
+        .parseType(builder, ReferenceParser.ELLIPSIS | ReferenceParser.DIAMONDS | ReferenceParser.DISJUNCTIONS);
     }
   }
 
@@ -88,7 +89,7 @@ public class ReferenceParserTest extends JavaParsingTestCase {
   private static class MyTestParser3 implements TestParser {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.REFERENCE_PARSER.parseTypeParameters(builder);
+      JavaParser.INSTANCE.getReferenceParser().parseTypeParameters(builder);
     }
   }
 }
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java
index 714e7c1ad456..e322261fba38 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/StatementParserTest.java
@@ -16,7 +16,7 @@
 package com.intellij.lang.java.parser.partial;
 
 import com.intellij.lang.PsiBuilder;
-import com.intellij.lang.java.parser.JavaParsers;
+import com.intellij.lang.java.parser.JavaParser;
 import com.intellij.lang.java.parser.JavaParsingTestCase;
 
 public class StatementParserTest extends JavaParsingTestCase {
@@ -154,7 +154,7 @@ public class StatementParserTest extends JavaParsingTestCase {
   private static class MyBlockTestParser implements TestParser {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.STATEMENT_PARSER.parseCodeBlockDeep(builder, true);
+      JavaParser.INSTANCE.getStatementParser().parseCodeBlockDeep(builder, true);
     }
   }
 
@@ -164,7 +164,7 @@ public class StatementParserTest extends JavaParsingTestCase {
   private static class MyStatementsTestParser implements TestParser {
     @Override
     public void parse(final PsiBuilder builder) {
-      JavaParsers.STATEMENT_PARSER.parseStatements(builder);
+      JavaParser.INSTANCE.getStatementParser().parseStatements(builder);
     }
   }
 }

From 21d38b566d1270dc5905365f3851f6a18394bf44 Mon Sep 17 00:00:00 2001
From: Alexander Kirillin <angus@jetbrains.com>
Date: Mon, 4 Jun 2012 16:52:08 +0400
Subject: [PATCH 146/239] non-prefix matching in goto... actions

---
 .../ide/util/gotoByName/ChooseByNameBase.java | 146 +++++++++++++-----
 .../ContributorsBasedGotoByModel.java         |  16 +-
 .../DefaultChooseByNameItemProvider.java      |  10 ++
 .../src/misc/registry.properties              |   3 +
 4 files changed, 135 insertions(+), 40 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index ea9aa3d7102c..0b746ecfd268 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -62,7 +62,6 @@ import com.intellij.ui.popup.PopupUpdateProcessor;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usages.*;
 import com.intellij.util.Alarm;
-import com.intellij.util.PlatformUtils;
 import com.intellij.util.Processor;
 import com.intellij.util.diff.Diff;
 import com.intellij.util.diff.FilesTooBigForDiffException;
@@ -182,6 +181,7 @@ public abstract class ChooseByNameBase {
     myInitialText = initialText;
     myProvider = provider;
     myInitialIndex = initialIndex;
+    mySearchInAnyPlace = Registry.is("ide.goto.middle.matching");
   }
 
   public boolean isPreselectInitialText() {
@@ -197,7 +197,7 @@ public abstract class ChooseByNameBase {
   }
 
   public boolean isSearchInAnyPlace() {
-    return PlatformUtils.isCidr() || mySearchInAnyPlace;
+    return mySearchInAnyPlace;
   }
 
   public void setSearchInAnyPlace(boolean searchInAnyPlace) {
@@ -394,23 +394,26 @@ public abstract class ChooseByNameBase {
     final DefaultActionGroup group = new DefaultActionGroup();
     group.add(new ShowFindUsagesAction(){
       @Override
-      public PsiElement[] getElements() {
-        if (myListModel == null) return PsiElement.EMPTY_ARRAY;
+      public PsiElement[][] getElements() {
+        if (myListModel == null) return new PsiElement[][] {PsiElement.EMPTY_ARRAY, PsiElement.EMPTY_ARRAY};
         final Object[] objects = myListModel.toArray();
-        final List<PsiElement> psiElements = new ArrayList<PsiElement>(objects.length);
+        final List<PsiElement> prefixMatchElements = new ArrayList<PsiElement>(objects.length);
+        final List<PsiElement> nonPrefixMatchElements = new ArrayList<PsiElement>(objects.length);
+        List<PsiElement> curElements = prefixMatchElements;
         for (Object object : objects) {
           if (object instanceof PsiElement) {
-            psiElements.add((PsiElement)object);
+            curElements.add((PsiElement)object);
           }
           else if (object instanceof DataProvider) {
             final PsiElement psi = LangDataKeys.PSI_ELEMENT.getData((DataProvider)object);
             if (psi != null) {
-              psiElements.add(psi);
+              curElements.add(psi);
             }
           }
-          
+          else if (object == NON_PREFIX_SEPARATOR)
+            curElements = nonPrefixMatchElements;
         }
-        return PsiUtilCore.toPsiElementArray(psiElements);
+        return new PsiElement[][]{PsiUtilCore.toPsiElementArray(prefixMatchElements), PsiUtilCore.toPsiElementArray(nonPrefixMatchElements)};
       }
     });
     final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, group, true);
@@ -581,6 +584,15 @@ public abstract class ChooseByNameBase {
             }
             break;
         }
+
+        if (myList.getSelectedValue() == NON_PREFIX_SEPARATOR) {
+          if (keyCode == KeyEvent.VK_UP || keyCode == KeyEvent.VK_PAGE_UP) {
+            ListScrollingUtil.moveUp(myList, e.getModifiersEx());
+          }
+          else {
+            ListScrollingUtil.moveDown(myList, e.getModifiersEx());
+          }
+        }
       }
     });
 
@@ -604,13 +616,18 @@ public abstract class ChooseByNameBase {
         }
 
         if (e.getClickCount() == 2) {
-          if (myList.getSelectedValue() == EXTRA_ELEM) {
-            myMaximumListSizeLimit += MAXIMUM_LIST_SIZE_LIMIT;
-            rebuildList(myList.getSelectedIndex(), REBUILD_DELAY, null, ModalityState.current(), e);
-            e.consume();
-          }
-          else {
-            doClose(true);
+          int selectedIndex = myList.getSelectedIndex();
+          Rectangle selectedCellBounds = myList.getCellBounds(selectedIndex, selectedIndex);
+
+          if (selectedCellBounds.contains(e.getPoint())) { // Otherwise it was reselected in the selection listener
+            if (myList.getSelectedValue() == EXTRA_ELEM) {
+              myMaximumListSizeLimit += MAXIMUM_LIST_SIZE_LIMIT;
+              rebuildList(selectedIndex, REBUILD_DELAY, null, ModalityState.current(), e);
+              e.consume();
+            }
+            else {
+              doClose(true);
+            }
           }
         }
       }
@@ -619,10 +636,18 @@ public abstract class ChooseByNameBase {
     myList.setFont(editorFont);
 
     myList.addListSelectionListener(new ListSelectionListener() {
+      private int myPreviousSelectionIndex = 0;
+
       @Override
       public void valueChanged(ListSelectionEvent e) {
-        choosenElementMightChange();
-        updateDocumentation();
+        if (myList.getSelectedValue() != NON_PREFIX_SEPARATOR) {
+          myPreviousSelectionIndex = myList.getSelectedIndex();
+          choosenElementMightChange();
+          updateDocumentation();
+        }
+        else {
+          myList.setSelectedIndex(myPreviousSelectionIndex);
+        }
       }
     });
 
@@ -1020,7 +1045,7 @@ public abstract class ChooseByNameBase {
     final String statContext = statisticsContext();
     for (int i = 0; i < count; i++) {
       final Object modelElement = myListModel.getElementAt(i);
-      String text = EXTRA_ELEM.equals(modelElement) ? null : myModel.getFullName(modelElement);
+      String text = EXTRA_ELEM.equals(modelElement) || NON_PREFIX_SEPARATOR.equals(modelElement) ? null : myModel.getFullName(modelElement);
       if (text != null) {
         String shortName = myModel.getElementName(modelElement);
         int match = shortName != null && matcher instanceof MinusculeMatcher
@@ -1034,6 +1059,10 @@ public abstract class ChooseByNameBase {
       }
     }
 
+    if (bestPosition < count - 1 && myListModel.getElementAt(bestPosition) == NON_PREFIX_SEPARATOR) {
+      bestPosition ++;
+    }
+
     return bestPosition;
   }
 
@@ -1171,6 +1200,7 @@ public abstract class ChooseByNameBase {
     if (myListIsUpToDate) {
       List<Object> values = new ArrayList<Object>(Arrays.asList(myList.getSelectedValues()));
       values.remove(EXTRA_ELEM);
+      values.remove(NON_PREFIX_SEPARATOR);
       return values;
     }
 
@@ -1368,6 +1398,7 @@ public abstract class ChooseByNameBase {
   }
 
   private static final String EXTRA_ELEM = "...";
+  static final String NON_PREFIX_SEPARATOR = "non-prefix matches:";
 
   private class CalcElementsThread implements Runnable {
     private final String myPattern;
@@ -1545,20 +1576,25 @@ public abstract class ChooseByNameBase {
       cancelListUpdater();
 
       final UsageViewPresentation presentation = new UsageViewPresentation();
-      final String pattern = myFindUsagesTitle + " \'" + myTextField.getText().trim() + "\'";
-      presentation.setCodeUsagesString(pattern);
-      presentation.setTabName(pattern);
-      presentation.setTabText(pattern);
-      presentation.setTargetsNodeText("Unsorted " + StringUtil.toLowerCase(pattern.toLowerCase()));
-      final PsiElement[] elements = getElements();
-      final Set<PsiElement> els = new LinkedHashSet<PsiElement>();
-      Collections.addAll(els, elements);
+      final String prefixPattern = myFindUsagesTitle + " \'" + myTextField.getText().trim() + "\'";
+      final String nonPrefixPattern = myFindUsagesTitle + " \'*" + myTextField.getText().trim() + "*\'";
+      presentation.setCodeUsagesString(prefixPattern);
+      presentation.setDynamicUsagesString(nonPrefixPattern);
+      presentation.setTabName(prefixPattern);
+      presentation.setTabText(prefixPattern);
+      presentation.setTargetsNodeText("Unsorted " + StringUtil.toLowerCase(prefixPattern.toLowerCase()));
+      final PsiElement[][] elements = getElements();
+      final Set<PsiElement> prefixEls = new LinkedHashSet<PsiElement>();
+      final Set<PsiElement> nonPrefixEls = new LinkedHashSet<PsiElement>();
+      Collections.addAll(prefixEls, elements[0]);
+      Collections.addAll(nonPrefixEls, elements[1]);
       if (myListModel.contains(EXTRA_ELEM)) { //start searching for the rest
         final String text = myTextField.getText();
         final boolean checkboxState = myCheckBox.isSelected();
-        final LinkedHashSet<Object> elementsArray = new LinkedHashSet<Object>();
+        final LinkedHashSet<Object> prefixMatchElementsArray = new LinkedHashSet<Object>();
+        final LinkedHashSet<Object> nonPrefixMatchElementsArray = new LinkedHashSet<Object>();
         hideHint();
-        ProgressManager.getInstance().run(new Task.Modal(myProject, pattern, true){
+        ProgressManager.getInstance().run(new Task.Modal(myProject, prefixPattern, true){
           private ChooseByNameBase.CalcElementsThread myCalcElementsThread;
           @Override
           public void run(@NotNull ProgressIndicator indicator) {
@@ -1574,25 +1610,44 @@ public abstract class ChooseByNameBase {
                   }
                 };
 
-                myCalcElementsThread.addElementsByPattern(text, elementsArray, new Computable<Boolean>() {
+                boolean anyPlace = isSearchInAnyPlace();
+                setSearchInAnyPlace(false);
+                myCalcElementsThread.addElementsByPattern(text, prefixMatchElementsArray, new Computable<Boolean>() {
                   @Override
                   @NotNull
                   public Boolean compute() {
                     return false;
                   }
                 });
+                setSearchInAnyPlace(anyPlace);
+
+                if (anyPlace) {
+                  myCalcElementsThread.addElementsByPattern(text, nonPrefixMatchElementsArray, new Computable<Boolean>() {
+                    @Override
+                    @NotNull
+                    public Boolean compute() {
+                      return false;
+                    }
+                  });
+                  nonPrefixMatchElementsArray.removeAll(prefixMatchElementsArray);
+                }
               }
             });
           }
 
           @Override
           public void onSuccess() {
-            for (Object o : elementsArray) {
+            for (Object o : prefixMatchElementsArray) {
               if (o instanceof PsiElement) {
-                els.add((PsiElement)o);
+                prefixEls.add((PsiElement)o);
               }
             }
-            showUsageView(els, presentation);
+            for (Object o : nonPrefixMatchElementsArray) {
+              if (o instanceof PsiElement) {
+                nonPrefixEls.add((PsiElement)o);
+              }
+            }
+            showUsageView(prefixEls, nonPrefixEls, presentation);
           }
 
           @Override
@@ -1604,21 +1659,34 @@ public abstract class ChooseByNameBase {
         });
       } else {
         hideHint();
-        showUsageView(els, presentation);
+        showUsageView(prefixEls, nonPrefixEls, presentation);
       }
     }
 
-    private void showUsageView(@NotNull Set<PsiElement> elements,
+    private void showUsageView(@NotNull Set<PsiElement> prefixMatchElements,
+                               @NotNull Set<PsiElement> nonPrefixMatchElements,
                                @NotNull UsageViewPresentation presentation) {
       final List<PsiElement> targets = new ArrayList<PsiElement>();
       final List<Usage> usages = new ArrayList<Usage>();
-      for (PsiElement element : elements) {
+      for (PsiElement element : prefixMatchElements) {
         if (element.getTextRange() != null) {
           usages.add(new UsageInfo2UsageAdapter(new UsageInfo(element)));
         } else {
           targets.add(element);
         }
       }
+      for (PsiElement element : nonPrefixMatchElements) {
+        if (element.getTextRange() != null) {
+          usages.add(new UsageInfo2UsageAdapter(new UsageInfo(element) {
+            @Override
+            public boolean isDynamicUsage() {
+              return true;
+            }
+          }));
+        } else {
+          targets.add(element);
+        }
+      }
       UsageViewManager
         .getInstance(myProject).showUsages(targets.isEmpty() ? UsageTarget.EMPTY_ARRAY
                                                              : PsiElement2UsageTargetAdapter.convert(PsiUtilCore.toPsiElementArray(targets)),
@@ -1631,10 +1699,10 @@ public abstract class ChooseByNameBase {
         e.getPresentation().setVisible(false);
         return;
       }
-      final PsiElement[] elements = getElements();
-      e.getPresentation().setEnabled(elements != null && elements.length > 0);
+      final PsiElement[][] elements = getElements();
+      e.getPresentation().setEnabled(elements != null && elements[0].length + elements[1].length > 0);
     }
 
-    public abstract PsiElement[] getElements();
+    public abstract PsiElement[][] getElements();
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
index b02c3272bc89..f7bcd30ee03c 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
@@ -32,9 +32,12 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ConcurrentHashSet;
 import com.intellij.util.containers.ContainerUtil;
+import com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
+import java.awt.*;
 import java.util.*;
+import java.util.List;
 
 /**
  * Contributor-based goto model
@@ -51,7 +54,18 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModel
   }
 
   public ListCellRenderer getListCellRenderer() {
-    return new NavigationItemListCellRenderer();
+    return new NavigationItemListCellRenderer() {
+      @Override
+      public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+        Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+
+        if (value == ChooseByNameBase.NON_PREFIX_SEPARATOR) {
+          component.setFont(component.getFont().deriveFont(Font.BOLD, component.getFont().getSize() - 2));
+        }
+
+        return component;
+      }
+    };
   }
 
   public String[] getNames(final boolean checkBoxState) {
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
index 23bc20e3721d..6eb398d26782 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java
@@ -80,6 +80,7 @@ public class DefaultChooseByNameItemProvider implements ChooseByNameItemProvider
         }
       });
       sortNamesList(namePattern, additionalNamesList);
+      namesList.add(ChooseByNameBase.NON_PREFIX_SEPARATOR);
       namesList.addAll(additionalNamesList);
     }
 
@@ -88,11 +89,16 @@ public class DefaultChooseByNameItemProvider implements ChooseByNameItemProvider
     }
 
     List<Object> sameNameElements = new SmartList<Object>();
+    boolean previousElemSeparator = false;
 
     for (String name : namesList) {
       if (cancelled.compute()) {
         throw new ProcessCanceledException();
       }
+      if (name == ChooseByNameBase.NON_PREFIX_SEPARATOR) {
+        previousElemSeparator = true;
+        continue;
+      }
       final Object[] elements = base.getModel().getElementsByName(name, everywhere, namePattern);
       if (elements.length > 1) {
         sameNameElements.clear();
@@ -103,11 +109,15 @@ public class DefaultChooseByNameItemProvider implements ChooseByNameItemProvider
         }
         sortByProximity(base, sameNameElements);
         for (Object element : sameNameElements) {
+          if (previousElemSeparator && !consumer.process(ChooseByNameBase.NON_PREFIX_SEPARATOR)) return;
           if (!consumer.process(element)) return;
+          previousElemSeparator = false;
         }
       }
       else if (elements.length == 1 && matchesQualifier(elements[0], qualifierPattern, base)) {
+        if (previousElemSeparator && !consumer.process(ChooseByNameBase.NON_PREFIX_SEPARATOR)) return;
         if (!consumer.process(elements[0])) return;
+        previousElemSeparator = false;
       }
     }
   }
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index 3b2ec5dbe19b..c3adfb7970d6 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -198,6 +198,9 @@ documentation.component.editor.font=false
 ide.completion.middle.matching=false
 ide.completion.middle.matching.description=Suggest items in completion that contain the entered string somewhere in the middle
 
+ide.goto.middle.matching=false
+ide.goto.middle.matching.description=Suggest items in goto actions that contain the entered string somewhere in the middle
+
 show.all.classes.on.first.completion=false
 ide.enable.toolwindow.stack=false
 

From a3fde695dddf1d2699a66ae15c2406b3700a695e Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 13:40:43 +0200
Subject: [PATCH 147/239] self-contained AddImpotActionTest

---
 .../quickFix/addImport/after1.java            |  8 ---
 .../quickFix/addImport/before1.java           |  6 --
 .../intention/AddImportActionTest.groovy      | 72 +++++++++++++++++++
 .../intention/AddImportActionTest.java        | 38 ----------
 4 files changed, 72 insertions(+), 52 deletions(-)
 delete mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/after1.java
 delete mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/before1.java
 create mode 100644 java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
 delete mode 100644 java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.java

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/after1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/after1.java
deleted file mode 100644
index 1eaaa5649726..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/after1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-import java.util.Map;
-
-// "Import Class" "true"
-public class Foo {
-    void foo() {
-        Ma<caret>p<> l;
-    }
-}
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/before1.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/before1.java
deleted file mode 100644
index a307e2447fc9..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/addImport/before1.java
+++ /dev/null
@@ -1,6 +0,0 @@
-// "Import Class" "true"
-public class Foo {
-    void foo() {
-        Ma<caret>p<> l;
-    }
-}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
new file mode 100644
index 000000000000..5a4faaa582b7
--- /dev/null
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.intention;
+
+
+import com.intellij.pom.java.LanguageLevel
+import com.intellij.testFramework.IdeaTestUtil
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
+
+public class AddImportActionTest extends LightCodeInsightFixtureTestCase {
+
+  public void testMap15() {
+    IdeaTestUtil.setModuleLanguageLevel(myModule, LanguageLevel.JDK_1_5)
+    myFixture.configureByText 'a.java', '''
+public class Foo {
+    void foo() {
+        Ma<caret>p<> l;
+    }
+}
+'''
+    myFixture.launchAction(myFixture.findSingleIntention("Import Class"))
+    myFixture.checkResult '''import java.util.Map;
+
+public class Foo {
+    void foo() {
+        Ma<caret>p<> l;
+    }
+}
+'''
+  }
+
+  @Override
+  protected void tearDown() {
+    IdeaTestUtil.setModuleLanguageLevel(myModule, LanguageLevel.HIGHEST)
+    super.tearDown()
+  }
+
+  public void testMapLatestLanguageLevel() {
+    IdeaTestUtil.setModuleLanguageLevel(myModule, LanguageLevel.HIGHEST)
+    myFixture.configureByText 'a.java', '''
+public class Foo {
+    void foo() {
+        Ma<caret>p<> l;
+    }
+}
+'''
+    myFixture.launchAction(myFixture.findSingleIntention("Import Class"))
+    myFixture.checkResult '''import java.util.Map;
+
+public class Foo {
+    void foo() {
+        Ma<caret>p<> l;
+    }
+}
+'''
+  }
+
+
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.java
deleted file mode 100644
index bf3df435a68b..000000000000
--- a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.codeInsight.intention;
-
-import com.intellij.codeInsight.daemon.LightIntentionActionTestCase;
-import com.intellij.openapi.roots.LanguageLevelProjectExtension;
-import com.intellij.pom.java.LanguageLevel;
-
-public class AddImportActionTest extends LightIntentionActionTestCase {
-
-  public void test() throws Exception {
-    final LanguageLevelProjectExtension extension = LanguageLevelProjectExtension.getInstance(getProject());
-
-    extension.setLanguageLevel(LanguageLevel.JDK_1_5);
-    doAllTests();
-
-    extension.setLanguageLevel(LanguageLevel.HIGHEST);
-    doAllTests();
-  }
-
-  @Override
-  protected String getBasePath() {
-    return "/codeInsight/daemonCodeAnalyzer/quickFix/addImport";
-  }
-}

From 29b9096afacd74345d13ffc7dad60ffb5346cb60 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 14:42:37 +0200
Subject: [PATCH 148/239] minor

---
 .../util/src/com/intellij/util/containers/PathInterner.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/util/src/com/intellij/util/containers/PathInterner.java b/platform/util/src/com/intellij/util/containers/PathInterner.java
index d9b4794f29c4..1ab566b79fef 100644
--- a/platform/util/src/com/intellij/util/containers/PathInterner.java
+++ b/platform/util/src/com/intellij/util/containers/PathInterner.java
@@ -188,10 +188,14 @@ public class PathInterner {
         return PathInterner.restorePath(myIdxToSeq.get(idx));
       }
       catch (IndexOutOfBoundsException e) {
-        throw new IllegalArgumentException();
+        throw new IllegalArgumentException("Illegal index: " + idx);
       }
     }
 
+    public int getExistingPathIndex(String path) {
+      PathInterner.SubstringWrapper[] key = myInterner.internParts(path, false);
+      return key != null && mySeqToIdx.containsKey(key) ? mySeqToIdx.get(key) : 0;
+    }
     public boolean containsPath(String path) {
       PathInterner.SubstringWrapper[] key = myInterner.internParts(path, false);
       return key != null && mySeqToIdx.containsKey(key);

From 68a3521b345d099f8245237fcfb6d9c1bb42d66c Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 14:58:00 +0200
Subject: [PATCH 149/239] IDEA-86911 Import StringValue class not offered
 [java]

---
 .../daemon/impl/analysis/HighlightUtil.java   |  1 +
 .../intention/AddImportActionTest.groovy      | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 8112653b44a9..ae6c0ba206e0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -2398,6 +2398,7 @@ public class HighlightUtil {
             QuickFixAction.registerQuickFixAction(info, new RenameWrongRefFix((PsiReferenceExpression)ref));
           }
         }
+        UnresolvedReferenceQuickFixProvider.registerReferenceFixes(ref, new QuickFixActionRegistrarImpl(info));
         return info;
       }
 
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
index 5a4faaa582b7..d6f957324660 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/intention/AddImportActionTest.groovy
@@ -31,7 +31,7 @@ public class Foo {
     }
 }
 '''
-    myFixture.launchAction(myFixture.findSingleIntention("Import Class"))
+    importClass()
     myFixture.checkResult '''import java.util.Map;
 
 public class Foo {
@@ -57,7 +57,7 @@ public class Foo {
     }
 }
 '''
-    myFixture.launchAction(myFixture.findSingleIntention("Import Class"))
+    importClass()
     myFixture.checkResult '''import java.util.Map;
 
 public class Foo {
@@ -68,5 +68,25 @@ public class Foo {
 '''
   }
 
+  public void testStringValue() {
+    myFixture.addClass 'package java.lang; class StringValue {}'
+    myFixture.addClass 'package foo; public class StringValue {}'
+    myFixture.configureByText 'a.java', '''
+public class Foo {
+    String<caret>Value sv;
+}
+'''
+    importClass()
+    myFixture.checkResult '''import foo.*;
 
+public class Foo {
+    String<caret>Value sv;
+}
+'''
+
+  }
+
+  private def importClass() {
+    myFixture.launchAction(myFixture.findSingleIntention("Import Class"))
+  }
 }

From e431afdef15abb7771b80db14c718d5a2f13bc57 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Mon, 4 Jun 2012 17:18:00 +0400
Subject: [PATCH 150/239] logging

---
 .../util/continuation/ModalityIgnorantBackgroundableTask.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/vcs-impl/src/com/intellij/util/continuation/ModalityIgnorantBackgroundableTask.java b/platform/vcs-impl/src/com/intellij/util/continuation/ModalityIgnorantBackgroundableTask.java
index aa0997ff947e..e57336abb8c9 100644
--- a/platform/vcs-impl/src/com/intellij/util/continuation/ModalityIgnorantBackgroundableTask.java
+++ b/platform/vcs-impl/src/com/intellij/util/continuation/ModalityIgnorantBackgroundableTask.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.util.continuation;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.PerformInBackgroundOption;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
@@ -32,6 +33,7 @@ import javax.swing.*;
  * Time: 12:14 PM
  */
 public abstract class ModalityIgnorantBackgroundableTask extends Task.Backgroundable {
+  private final static Logger LOG = Logger.getInstance("#com.intellij.util.continuation.ModalityIgnorantBackgroundableTask");
   private Consumer<Task.Backgroundable> myRunner;
   private int myCnt;
 
@@ -87,6 +89,7 @@ public abstract class ModalityIgnorantBackgroundableTask extends Task.Background
         }
       });
     } catch (final Exception e) {
+      LOG.info(e);
       SwingUtilities.invokeLater(new Runnable() {
         @Override
         public void run() {

From efa84b4d3af4d5f0d721c88cc36b08c9f83a0958 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 15:07:41 +0400
Subject: [PATCH 151/239] i18n

---
 .../groovy/refactoring/GroovyRefactoringBundle.properties       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.properties b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.properties
index 9f2aac09e770..4640da8ee706 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.properties
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.properties
@@ -169,4 +169,4 @@ rename.implicit.closure.parameter.to=Rename implicit closure parameter to\:
 implicit.closure.parameter=Implicit closure parameter
 selected.expression.should.not.be.lvalue=Selected expression should not be left hand side of assignment
 column.name.use.any.var=Use any var
-rename.groovy.method=Rename Groovy method
+rename.groovy.method=Rename groovy method

From 5905401eabfa123223331e933325400a688406ca Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Fri, 1 Jun 2012 15:24:27 +0400
Subject: [PATCH 152/239] more descriptive toString()

---
 .../groovy/lang/psi/controlFlow/NegatingGotoInstruction.java    | 2 +-
 .../groovy/lang/psi/controlFlow/impl/ConditionInstruction.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/NegatingGotoInstruction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/NegatingGotoInstruction.java
index 488987c2d739..8aa5955ee609 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/NegatingGotoInstruction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/NegatingGotoInstruction.java
@@ -39,6 +39,6 @@ public class NegatingGotoInstruction extends InstructionImpl {
 
   @Override
   protected String getElementPresentation() {
-    return " Negating goto instruction, condition=" + myCondition.num();
+    return " Negating goto instruction, condition=" + myCondition.num() + getElement();
   }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ConditionInstruction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ConditionInstruction.java
index 5e6ea5dbbc2f..9b32fd97c15d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ConditionInstruction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ConditionInstruction.java
@@ -35,7 +35,7 @@ public class ConditionInstruction extends InstructionImpl implements Instruction
 
   @Override
   protected String getElementPresentation() {
-    return "Condition";
+    return "Condition" + getElement();
   }
 
   void addDependent(ConditionInstruction i) {

From d41471cadee075e3a7bbf6d75569912884b8df5d Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Mon, 4 Jun 2012 16:58:47 +0400
Subject: [PATCH 153/239] type inference

---
 .../lang/psi/controlFlow/GotoInstruction.java |  44 ++++
 .../lang/psi/controlFlow/Instruction.java     |   5 +-
 .../controlFlow/NegatingGotoInstruction.java  |  15 +-
 .../controlFlow/PositiveGotoInstruction.java  |  30 +++
 .../impl/ConditionInstruction.java            |   2 +-
 .../controlFlow/impl/ControlFlowBuilder.java  | 229 ++++++++++++------
 .../psi/controlFlow/impl/InstructionImpl.java |  17 +-
 .../groovy/lang/psi/dataFlow/DFAType.java     |   8 +-
 .../lang/psi/impl/TypeInferenceHelper.java    |   8 +-
 .../lang/resolve/TypeInferenceTest.groovy     |   9 +
 .../testdata/groovy/controlFlow/grvy1497.test |  24 +-
 .../testdata/groovy/controlFlow/if1.test      |  16 +-
 .../groovy/controlFlow/ifInstanceofElse.test  |  38 +--
 .../testdata/groovy/controlFlow/nested.test   |  16 +-
 .../testdata/groovy/controlFlow/return.test   |  16 +-
 .../testdata/groovy/controlFlow/try1.test     |  32 ++-
 .../testdata/groovy/controlFlow/try10.test    |  16 +-
 .../testdata/groovy/controlFlow/try5.test     |  32 ++-
 .../testdata/groovy/controlFlow/try6.test     |  26 +-
 .../testdata/groovy/controlFlow/while1.test   |  12 +-
 .../testdata/groovy/controlFlow/while2.test   |  12 +-
 .../groovy/controlFlow/whileNonConstant.test  |  14 +-
 22 files changed, 378 insertions(+), 243 deletions(-)
 create mode 100644 plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/GotoInstruction.java
 create mode 100644 plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/PositiveGotoInstruction.java

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/GotoInstruction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/GotoInstruction.java
new file mode 100644
index 000000000000..7a566976feee
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/GotoInstruction.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.lang.psi.controlFlow;
+
+import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl.ConditionInstruction;
+import org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl.InstructionImpl;
+
+/**
+ * @author Max Medvedev
+ */
+public abstract class GotoInstruction extends InstructionImpl {
+  @NotNull private final ConditionInstruction myCondition;
+
+  public GotoInstruction(@Nullable PsiElement element, int num, @NotNull ConditionInstruction condition) {
+    super(element, num);
+    myCondition = condition;
+  }
+
+  @NotNull
+  public ConditionInstruction getCondition() {
+    return myCondition;
+  }
+
+  @Override
+  protected String getElementPresentation() {
+    return " Positive goto instruction, condition=" + myCondition.num() + getElement();
+  }
+}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/Instruction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/Instruction.java
index 83d18548353a..26383bd4a164 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/Instruction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/Instruction.java
@@ -16,6 +16,7 @@
 package org.jetbrains.plugins.groovy.lang.psi.controlFlow;
 
 import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -30,8 +31,8 @@ public interface Instruction {
 
   int num();
 
-  @Nullable
-  NegatingGotoInstruction getNegatingGotoInstruction();
+  @NotNull
+  Iterable<? extends NegatingGotoInstruction> getNegatingGotoInstruction();
 
   @Nullable
   PsiElement getElement();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/NegatingGotoInstruction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/NegatingGotoInstruction.java
index 8aa5955ee609..de949ae5e294 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/NegatingGotoInstruction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/NegatingGotoInstruction.java
@@ -19,26 +19,17 @@ import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl.ConditionInstruction;
-import org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl.InstructionImpl;
 
 /**
  * @author Max Medvedev
  */
-public class NegatingGotoInstruction extends InstructionImpl {
-  @NotNull private final ConditionInstruction myCondition;
-
+public class NegatingGotoInstruction extends GotoInstruction {
   public NegatingGotoInstruction(@Nullable PsiElement element, int num, @NotNull ConditionInstruction condition) {
-    super(element, num);
-    myCondition = condition;
-  }
-
-  @NotNull
-  public ConditionInstruction getCondition() {
-    return myCondition;
+    super(element, num, condition);
   }
 
   @Override
   protected String getElementPresentation() {
-    return " Negating goto instruction, condition=" + myCondition.num() + getElement();
+    return " Negating goto instruction, condition=" + getCondition().num() + getElement();
   }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/PositiveGotoInstruction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/PositiveGotoInstruction.java
new file mode 100644
index 000000000000..d0d0c8140980
--- /dev/null
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/PositiveGotoInstruction.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jetbrains.plugins.groovy.lang.psi.controlFlow;
+
+import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl.ConditionInstruction;
+
+/**
+ * @author Max Medvedev
+ */
+public class PositiveGotoInstruction extends GotoInstruction {
+  public PositiveGotoInstruction(@Nullable PsiElement element, int num, @NotNull ConditionInstruction condition) {
+    super(element, num, condition);
+  }
+}
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ConditionInstruction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ConditionInstruction.java
index 9b32fd97c15d..4dfdf506d20a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ConditionInstruction.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ConditionInstruction.java
@@ -35,7 +35,7 @@ public class ConditionInstruction extends InstructionImpl implements Instruction
 
   @Override
   protected String getElementPresentation() {
-    return "Condition" + getElement();
+    return "Condition " + getElement();
   }
 
   void addDependent(ConditionInstruction i) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
index 5724e15ccae4..65818f5b0f27 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
@@ -88,11 +88,6 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
   private Deque<ConditionInstruction> myConditions;
 
 
-  /**
-   * stack of negating instructions
-   */
-  private Deque<NegatingGotoInstruction> myNegatingStack;
-
   /**
    * count of finally blocks surrounding current statement
    */
@@ -159,7 +154,6 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
     myProcessingStack = new ArrayDeque<InstructionImpl>();
     myCaughtExceptionInfos = new ArrayDeque<ExceptionInfo>();
     myConditions = new ArrayDeque<ConditionInstruction>();
-    myNegatingStack = new ArrayDeque<NegatingGotoInstruction>();
 
     myFinallyCount = 0;
     myPending = new ArrayList<Pair<InstructionImpl, GroovyPsiElement>>();
@@ -222,7 +216,6 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
 
   private <T extends InstructionImpl> T addNode(T instruction) {
     myInstructions.add(instruction);
-    instruction.setNegating(myNegatingStack.peek());
     if (myHead != null) {
       addEdge(myHead, instruction);
     }
@@ -239,6 +232,10 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
   private static void addEdge(InstructionImpl begin, InstructionImpl end) {
     begin.addSuccessor(end);
     end.addPredecessor(begin);
+
+    if (!(begin instanceof ReadWriteVariableInstruction || begin instanceof MixinTypeInstruction)) {
+      end.addNegationsFrom(begin);
+    }
   }
 
   public void visitClosure(GrClosableBlock closure) {
@@ -398,30 +395,76 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
   @Override
   public void visitUnaryExpression(GrUnaryExpression expression) {
     final GrExpression operand = expression.getOperand();
-    if (operand != null) {
-      ConditionInstruction cond = null;
-      if (expression.getOperationTokenType() == mLNOT) {
-        cond = new ConditionInstruction(expression, myInstructionNumber++);
-        addNodeAndCheckPending(cond);
-        registerCondition(cond);
-      }
+    if (operand == null) return;
+
+    if (expression.getOperationTokenType() != mLNOT) {
       operand.accept(this);
       visitCall(expression);
+      return;
+    }
 
-      if (cond != null) {
-        myConditions.removeFirstOccurrence(cond);
-        myNegatingStack.push(addNodeAndCheckPending(new NegatingGotoInstruction(expression, myInstructionNumber++, cond)));
+    ConditionInstruction cond = new ConditionInstruction(expression, myInstructionNumber++);
+    addNodeAndCheckPending(cond);
+    registerCondition(cond);
+
+    operand.accept(this);
+    visitCall(expression);
+
+    myConditions.removeFirstOccurrence(cond);
+
+    List<GotoInstruction> negations = collectAndRemoveAllPendingNegations(expression);
+
+    addPendingEdge(expression, addNodeAndCheckPending(new PositiveGotoInstruction(expression, myInstructionNumber++, cond)));
+
+    myHead = reduceAllNegationsIntoInstruction(expression, negations);
+  }
+
+  @Nullable
+  private InstructionImpl reduceAllNegationsIntoInstruction(GroovyPsiElement currentScope, List<? extends GotoInstruction> negations) {
+    if (negations.size() > 1) {
+      InstructionImpl instruction = addNode(new InstructionImpl(currentScope, myInstructionNumber++));
+      for (GotoInstruction negation : negations) {
+        addEdge(negation, instruction);
+      }
+      return instruction;
+    }
+    else if (negations.size() == 1) {
+      return negations.get(0);
+    }
+    return null;
+  }
+
+  private List<GotoInstruction> collectAndRemoveAllPendingNegations(GroovyPsiElement currentScope) {
+    List<GotoInstruction> negations = new ArrayList<GotoInstruction>();
+    for (Iterator<Pair<InstructionImpl, GroovyPsiElement>> iterator = myPending.iterator(); iterator.hasNext(); ) {
+      Pair<InstructionImpl, GroovyPsiElement> pair = iterator.next();
+      InstructionImpl instruction = pair.first;
+      GroovyPsiElement scope = pair.second;
+
+      if (!PsiTreeUtil.isAncestor(scope, currentScope, true) && instruction instanceof GotoInstruction) {
+        negations.add((GotoInstruction)instruction);
+        iterator.remove();
       }
     }
+    return negations;
   }
 
   @Override
   public void visitInstanceofExpression(GrInstanceOfExpression expression) {
     expression.getOperand().accept(this);
-    final ConditionInstruction cond = myConditions.peek();
-    if (cond != null) {
-      addNode(new InstanceOfInstruction(myInstructionNumber++, expression, cond));
-    }
+
+    ConditionInstruction cond = new ConditionInstruction(expression, myInstructionNumber++);
+    addNodeAndCheckPending(cond);
+    registerCondition(cond);
+
+    addNode(new InstanceOfInstruction(myInstructionNumber++, expression, cond));
+    NegatingGotoInstruction negation = new NegatingGotoInstruction(expression, myInstructionNumber++, cond);
+    addNode(negation);
+    addPendingEdge(expression, negation);
+
+    myHead = cond;
+    InstanceOfInstruction instruction = addNode(new InstanceOfInstruction(myInstructionNumber++, expression, cond));
+    myConditions.removeFirstOccurrence(cond);
   }
 
   public void visitReferenceExpression(GrReferenceExpression refExpr) {
@@ -478,41 +521,48 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
     final GrExpression right = expression.getRightOperand();
     final IElementType opType = expression.getOperationTokenType();
 
-    final ConditionInstruction cond;
-    if (opType == mLOR || opType == mLAND) {
-      cond = addNodeAndCheckPending(new ConditionInstruction(expression, myInstructionNumber++));
-      registerCondition(cond);
-    }
-    else {
-      cond = null;
+    if (opType != mLOR && opType != mLAND) {
+      left.accept(this);
+      if (right != null) {
+        right.accept(this);
+      }
+      visitCall(expression);
+      return;
     }
+
+    ConditionInstruction condition = new ConditionInstruction(expression, myInstructionNumber++);
+    addNodeAndCheckPending(condition);
+    registerCondition(condition);
+
     left.accept(this);
 
-    if (cond != null) {
-      myConditions.removeFirstOccurrence(cond);
-    }
+    if (right == null) return;
 
-    NegatingGotoInstruction first = null;
-    if (right != null) {
-      if (cond != null) {
-        final InstructionImpl head = myHead;
-        if (opType == mLAND) {
-          first = addNodeAndCheckPending(new NegatingGotoInstruction(expression, myInstructionNumber++, cond));
-        }
-        addPendingEdge(expression, myHead);
-        myHead = head;
-        if (opType == mLOR) {
-          myNegatingStack.push(addNodeAndCheckPending(new NegatingGotoInstruction(expression, myInstructionNumber++, cond)));
-        }
-      }
-
-      right.accept(this);
-    }
+    final List<GotoInstruction> negations = collectAndRemoveAllPendingNegations(expression);
 
     visitCall(expression);
-    if (first != null) {
-      myNegatingStack.push(first);
+
+    if (opType == mLAND) {
+      for (GotoInstruction negation : negations) {
+        addPendingEdge(expression, negation);
+      }
+      if (negations.isEmpty()) {
+        InstructionImpl head = myHead;
+        NegatingGotoInstruction negation = addNode(new NegatingGotoInstruction(expression, myInstructionNumber++, condition));
+        addPendingEdge(expression, negation);
+        myHead = head;
+      }
     }
+    else /*if (opType == mLOR)*/ {
+      addNodeAndCheckPending(new InstructionImpl(expression, myInstructionNumber++)); //collect all pending edges from left argument
+      addPendingEdge(expression, myHead);
+
+      myHead = reduceAllNegationsIntoInstruction(expression, negations);
+      //addNode(new NegatingGotoInstruction(expression, myInstructionNumber++, condition));
+    }
+    myConditions.removeFirstOccurrence(condition);
+
+    right.accept(this);
   }
 
   /**
@@ -539,8 +589,6 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
   public void visitIfStatement(GrIfStatement ifStatement) {
     InstructionImpl ifInstruction = startNode(ifStatement);
 
-    final InstructionImpl head = myHead;
-
     final GrCondition condition = ifStatement.getCondition();
     final GrStatement thenBranch = ifStatement.getThenBranch();
     final GrStatement elseBranch = ifStatement.getElseBranch();
@@ -549,29 +597,13 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
     InstructionImpl thenEnd = null;
     InstructionImpl elseEnd = null;
 
-    List<NegatingGotoInstruction> pendingNegations = new ArrayList<NegatingGotoInstruction>();
-    ConditionInstruction conditionStart = null;
     if (condition != null) {
-      final List<Pair<InstructionImpl, GroovyPsiElement>> oldPending = myPending;
-      myPending = new ArrayList<Pair<InstructionImpl, GroovyPsiElement>>();
-
-      conditionStart = addNodeAndCheckPending(new ConditionInstruction(condition, myInstructionNumber++));
-      registerCondition(conditionStart);
       condition.accept(this);
       conditionEnd = myHead;
-
-      List<Pair<InstructionImpl, GroovyPsiElement>> pendingFromCondition = myPending;
-      myPending = oldPending;
-      for (Pair<InstructionImpl, GroovyPsiElement> pair : pendingFromCondition) {
-        if (pair.first instanceof NegatingGotoInstruction) {
-          pendingNegations.add((NegatingGotoInstruction)pair.first);
-        }
-        else {
-          addPendingEdge(pair.second, pair.first);
-        }
-      }
     }
 
+    List<GotoInstruction> negations = collectAndRemoveAllPendingNegations(ifStatement);
+
     if (thenBranch != null) {
       thenBranch.accept(this);
       handlePossibleReturn(thenBranch);
@@ -579,30 +611,29 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
       interruptFlow();
     }
 
-    if (condition != null) {
+    myHead = reduceAllNegationsIntoInstruction(ifStatement, negations);
+    if (negations.isEmpty() && conditionEnd != null) {
       myHead = conditionEnd;
-      myNegatingStack.push(addNode(new NegatingGotoInstruction(condition, myInstructionNumber++, conditionStart)));
-    }
-    else {
-      myHead = head;
-    }
-
-    for (NegatingGotoInstruction negation : pendingNegations) {
-      assert condition != null;
-      addPendingEdge(condition, negation);
     }
     if (elseBranch != null) {
       elseBranch.accept(this);
       handlePossibleReturn(elseBranch);
       elseEnd = myHead;
+      interruptFlow();
     }
 
     if (thenBranch != null || elseBranch != null) {
       final InstructionImpl end = new IfEndInstruction(ifStatement, myInstructionNumber++);
       addNode(end);
       if (thenEnd != null) addEdge(thenEnd, end);
-      if (elseEnd != null) addEdge(elseEnd, end);
+      if (elseEnd != null) {
+        addEdge(elseEnd, end);
+      }
+      else {
+        addEdge(conditionEnd != null ? conditionEnd : ifInstruction, end);
+      }
     }
+
     finishNode(ifInstruction);
   }
 
@@ -750,6 +781,44 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
     finishNode(instruction);
   }
 
+  @Override
+  public void visitConditionalExpression(GrConditionalExpression expression) {
+    GrExpression condition = expression.getCondition();
+    GrExpression thenBranch = expression.getThenBranch();
+    GrExpression elseBranch = expression.getElseBranch();
+
+    condition.accept(this);
+    List<GotoInstruction> negations = collectAndRemoveAllPendingNegations(expression);
+
+    if (thenBranch != null) {
+      thenBranch.accept(this);
+      handlePossibleReturn(thenBranch);
+      addPendingEdge(expression, myHead);
+    }
+
+    if (elseBranch != null) {
+      myHead = reduceAllNegationsIntoInstruction(expression, negations);
+      elseBranch.accept(this);
+      handlePossibleReturn(elseBranch);
+    }
+  }
+
+  @Override
+  public void visitElvisExpression(GrElvisExpression expression) {
+    GrExpression condition = expression.getCondition();
+    GrExpression elseBranch = expression.getElseBranch();
+
+    condition.accept(this);
+    List<GotoInstruction> negations = collectAndRemoveAllPendingNegations(expression);
+    addPendingEdge(expression, myHead);
+
+    if (elseBranch != null) {
+      myHead = reduceAllNegationsIntoInstruction(expression, negations);
+      elseBranch.accept(this);
+      handlePossibleReturn(elseBranch);
+    }
+  }
+
   private static boolean containsAllCases(GrSwitchStatement statement) {
     final GrCaseSection[] sections = statement.getCaseSections();
     for (GrCaseSection section : sections) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/InstructionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/InstructionImpl.java
index e81218b67a98..57334ee8d734 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/InstructionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/InstructionImpl.java
@@ -16,6 +16,7 @@
 package org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl;
 
 import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.CallEnvironment;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.CallInstruction;
@@ -31,10 +32,10 @@ import java.util.LinkedHashSet;
 public class InstructionImpl implements Instruction {
   private final LinkedHashSet<InstructionImpl> myPredecessors = new LinkedHashSet<InstructionImpl>();
   private final LinkedHashSet<InstructionImpl> mySuccessors = new LinkedHashSet<InstructionImpl>();
+  private final LinkedHashSet<NegatingGotoInstruction> myNegations = new LinkedHashSet<NegatingGotoInstruction>();
 
   PsiElement myPsiElement;
   private final int myNumber;
-  private NegatingGotoInstruction myNegating;
 
   @Nullable
   public PsiElement getElement() {
@@ -93,9 +94,10 @@ public class InstructionImpl implements Instruction {
     return myNumber;
   }
 
+  @NotNull
   @Override
-  public NegatingGotoInstruction getNegatingGotoInstruction() {
-    return myNegating;
+  public Iterable<? extends NegatingGotoInstruction> getNegatingGotoInstruction() {
+    return myNegations;
   }
 
   public void addSuccessor(InstructionImpl instruction) {
@@ -106,7 +108,12 @@ public class InstructionImpl implements Instruction {
     myPredecessors.add(instruction);
   }
 
-  void setNegating(NegatingGotoInstruction negating) {
-    myNegating = negating;
+  void addNegationsFrom(Instruction instruction) {
+    for (NegatingGotoInstruction negation : instruction.getNegatingGotoInstruction()) {
+      myNegations.add(negation);
+    }
+    if (instruction instanceof NegatingGotoInstruction) {
+      myNegations.add((NegatingGotoInstruction)instruction);
+    }
   }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java
index eebf8bf17ad5..6f041bead9b2 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/dataFlow/DFAType.java
@@ -19,7 +19,9 @@ import com.intellij.psi.PsiIntersectionType;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.util.TypeConversionUtil;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.lang.psi.controlFlow.Instruction;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.NegatingGotoInstruction;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl.ConditionInstruction;
 import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
@@ -92,15 +94,15 @@ public class DFAType {
     return true;
   }
 
-  public DFAType negate(NegatingGotoInstruction negating) {
+  public DFAType negate(@NotNull Instruction instruction) {
     final DFAType type = new DFAType(primary);
 
     for (Mixin mixin : mixins) {
       type.mixins.add(mixin);
     }
 
-    for (; negating != null; negating = negating.getNegatingGotoInstruction()) {
-      final Set<ConditionInstruction> conditionsToNegate = negating.getCondition().getDependentConditions();
+    for (NegatingGotoInstruction negation: instruction.getNegatingGotoInstruction()) {
+      final Set<ConditionInstruction> conditionsToNegate = negation.getCondition().getDependentConditions();
 
       for (ListIterator<Mixin> iterator = type.mixins.listIterator(); iterator.hasNext(); ) {
         Mixin mixin = iterator.next();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/TypeInferenceHelper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/TypeInferenceHelper.java
index e0ccf7386a24..45d40b89406b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/TypeInferenceHelper.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/TypeInferenceHelper.java
@@ -34,7 +34,10 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.*;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
-import org.jetbrains.plugins.groovy.lang.psi.controlFlow.*;
+import org.jetbrains.plugins.groovy.lang.psi.controlFlow.InstanceOfInstruction;
+import org.jetbrains.plugins.groovy.lang.psi.controlFlow.Instruction;
+import org.jetbrains.plugins.groovy.lang.psi.controlFlow.MixinTypeInstruction;
+import org.jetbrains.plugins.groovy.lang.psi.controlFlow.ReadWriteVariableInstruction;
 import org.jetbrains.plugins.groovy.lang.psi.controlFlow.impl.ArgumentInstruction;
 import org.jetbrains.plugins.groovy.lang.psi.dataFlow.DFAEngine;
 import org.jetbrains.plugins.groovy.lang.psi.dataFlow.DFAType;
@@ -150,9 +153,8 @@ public class TypeInferenceHelper {
     for (int defIndex : varDefs.toArray()) {
       DFAType defType = getDefinitionType(flow[defIndex], flow, scope);
 
-      final NegatingGotoInstruction negating = instruction.getNegatingGotoInstruction();
       if (defType != null) {
-        defType = defType.negate(negating);
+        defType = defType.negate(instruction);
       }
 
       if (defType != null) {
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy
index 7eb620851311..b293ce2b4fea 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy
@@ -528,6 +528,15 @@ def foo(def oo) {
 ''', null)
   }
 
+  void testInstanceOfInferring6() {
+    doTest('''\
+def foo(bar) {
+  if (!(bar instanceof String) && bar instanceof Runnable) {
+    ba<caret>r
+  }
+}''', 'java.lang.Runnable')
+  }
+
   private void doTest(String text, String type) {
     def file = myFixture.configureByText('_.groovy', text)
     def ref = file.findReferenceAt(myFixture.editor.caretModel.offset) as GrReferenceExpression
diff --git a/plugins/groovy/testdata/groovy/controlFlow/grvy1497.test b/plugins/groovy/testdata/groovy/controlFlow/grvy1497.test
index fdd11cd0a264..acc55ec03c94 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/grvy1497.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/grvy1497.test
@@ -5,16 +5,14 @@ println blah
 -----
 0(1) element: null
 1(2) WRITE blah
-2(3) element: IF statement
-3(4,6) Condition
-4(5) READ blah
-5(7) WRITE blah
-6(7)  Negating goto instruction, condition=3
-7(8) element: IF statement
-8(9) READ blah
-9(10) WRITE blah
-10(11) READ println
-11(12) READ blah
-12(13) ARGUMENT element: Reference expression
-13(14) element: Call expression MAYBE_RETURN
-14() element: null
\ No newline at end of file
+2(3,5) element: IF statement
+3(4) READ blah
+4(5) WRITE blah
+5(6) element: IF statement
+6(7) READ blah
+7(8) WRITE blah
+8(9) READ println
+9(10) READ blah
+10(11) ARGUMENT element: Reference expression
+11(12) element: Call expression MAYBE_RETURN
+12() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/if1.test b/plugins/groovy/testdata/groovy/controlFlow/if1.test
index f5a6183cee3a..6432efeca933 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/if1.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/if1.test
@@ -5,12 +5,10 @@ if (true) {
   a = 2
 -----
 0(1) element: null
-1(2) element: IF statement
-2(3,5) Condition
-3(4) WRITE a
-4(8) element: Assignment expression MAYBE_RETURN
-5(6)  Negating goto instruction, condition=2
-6(7) WRITE a
-7(8) element: Assignment expression MAYBE_RETURN
-8(9) element: IF statement
-9() element: null
\ No newline at end of file
+1(2,4) element: IF statement
+2(3) WRITE a
+3(6) element: Assignment expression MAYBE_RETURN
+4(5) WRITE a
+5(6) element: Assignment expression MAYBE_RETURN
+6(7) element: IF statement
+7() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/ifInstanceofElse.test b/plugins/groovy/testdata/groovy/controlFlow/ifInstanceofElse.test
index 8a29021c09b1..767599b66614 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/ifInstanceofElse.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/ifInstanceofElse.test
@@ -4,23 +4,25 @@ else b = 3
 -----
 0(1) element: null
 1(2) element: IF statement
-2(3) Condition
-3(4) READ o
-4(5,7) instanceof: o instanceof String
-5(6) WRITE b
-6(20) element: Assignment expression MAYBE_RETURN
-7(8)  Negating goto instruction, condition=2
-8(9) element: IF statement
-9(10) Condition
-10(11) Condition
+2(3) READ o
+3(4,6) Condition Instanceof expression
+4(5) instanceof: o instanceof String
+5(9)  Negating goto instruction, condition=3Instanceof expression
+6(7) instanceof: o instanceof String
+7(8) WRITE b
+8(22) element: Assignment expression MAYBE_RETURN
+9(10) element: IF statement
+10(11) Condition Unary expression
 11(12) READ o
-12(13) instanceof: o instanceof Integer
-13(14,16)  Negating goto instruction, condition=10
-14(15) WRITE b
-15(19) element: Assignment expression MAYBE_RETURN
-16(17)  Negating goto instruction, condition=9
+12(13,15) Condition Instanceof expression
+13(14) instanceof: o instanceof Integer
+14(17)  Negating goto instruction, condition=12Instanceof expression
+15(16) instanceof: o instanceof Integer
+16(19)  Positive goto instruction, condition=10Unary expression
 17(18) WRITE b
-18(19) element: Assignment expression MAYBE_RETURN
-19(20) element: IF statement
-20(21) element: IF statement
-21() element: null
\ No newline at end of file
+18(21) element: Assignment expression MAYBE_RETURN
+19(20) WRITE b
+20(21) element: Assignment expression MAYBE_RETURN
+21(22) element: IF statement
+22(23) element: IF statement
+23() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/nested.test b/plugins/groovy/testdata/groovy/controlFlow/nested.test
index f49ad96807b0..83c08bb98285 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/nested.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/nested.test
@@ -9,16 +9,14 @@ for (e in [1,2,3,4]) {
 0(1) element: null
 1(2) element: Labeled statement
 2(3) WRITE e
-3(4,15) element: For statement
+3(4,13) element: For statement
 4(5) element: Block statement
 5(6) WRITE ee
 6(7,3) element: For statement
 7(8) element: Block statement
-8(9) element: IF statement
-9(1,10) Condition
-10(11)  Negating goto instruction, condition=9
-11(12) element: IF statement
-12(13) READ print
-13(14) READ e
-14(6) READ ee
-15() element: null
\ No newline at end of file
+8(1,9) element: IF statement
+9(10) element: IF statement
+10(11) READ print
+11(12) READ e
+12(6) READ ee
+13() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/return.test b/plugins/groovy/testdata/groovy/controlFlow/return.test
index e720cd515a65..6809d545a74e 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/return.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/return.test
@@ -1,12 +1,10 @@
 if (true) return a else return b
 -----
 0(1) element: null
-1(2) element: IF statement
-2(3,5) Condition
-3(4) READ a
-4(9) element: RETURN statement
-5(6)  Negating goto instruction, condition=2
-6(7) READ b
-7(9) element: RETURN statement
-8(9) element: IF statement
-9() element: null
\ No newline at end of file
+1(2,4,6) element: IF statement
+2(3) READ a
+3(7) element: RETURN statement
+4(5) READ b
+5(7) element: RETURN statement
+6(7) element: IF statement
+7() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/try1.test b/plugins/groovy/testdata/groovy/controlFlow/try1.test
index 42b3e0bacf11..f284f4e9150e 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/try1.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/try1.test
@@ -8,20 +8,18 @@ print e
 0(1) element: null
 1(2) element: Open block
 2(3) element: IF statement
-3(4) Condition
-4(5,6) READ c
-5(9) element: RETURN statement
-6(7)  Negating goto instruction, condition=3
-7(11) element: IF statement
-8(13) element: Finally clause
-9(8,10)  CALL 8
-10(19) AFTER CALL 9
-11(8,12)  CALL 8
-12(15) AFTER CALL 11
-13(14) READ e
-14(10,12)  RETURN
-15(16) READ print
-16(17) READ e
-17(18) ARGUMENT element: Reference expression
-18(19) element: Call expression MAYBE_RETURN
-19() element: null
\ No newline at end of file
+3(4,5) READ c
+4(7) element: RETURN statement
+5(9) element: IF statement
+6(11) element: Finally clause
+7(6,8)  CALL 6
+8(17) AFTER CALL 7
+9(6,10)  CALL 6
+10(13) AFTER CALL 9
+11(12) READ e
+12(8,10)  RETURN
+13(14) READ print
+14(15) READ e
+15(16) ARGUMENT element: Reference expression
+16(17) element: Call expression MAYBE_RETURN
+17() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/try10.test b/plugins/groovy/testdata/groovy/controlFlow/try10.test
index 215c5c8d8a72..0123a89ab4d5 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/try10.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/try10.test
@@ -10,15 +10,13 @@ cde
 1(3) element: Open block
 2(5) element: Finally clause
 3(2,4)  CALL 2
-4(13) AFTER CALL 3
+4(11) AFTER CALL 3
 5(6) element: For statement
 6(7) element: Block statement
 7(8) element: IF statement
-8(9) Condition
-9(10,12) READ abc
-10(11)  Negating goto instruction, condition=8
-11(5) element: IF statement
-12(4)  RETURN
-13(14) READ cde
-14(15) element: Reference expression MAYBE_RETURN
-15() element: null
\ No newline at end of file
+8(9,10) READ abc
+9(5) element: IF statement
+10(4)  RETURN
+11(12) READ cde
+12(13) element: Reference expression MAYBE_RETURN
+13() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/try5.test b/plugins/groovy/testdata/groovy/controlFlow/try5.test
index d3ec3937c95e..a6a14ee5a77b 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/try5.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/try5.test
@@ -12,20 +12,18 @@ fScript.previewTask(taskName)
 -----
 0(1) element: null
 1(2) element: IF statement
-2(3) Condition
-3(4,6) READ ddd
-4(5) READ fXRec
-5(18) element: RETURN statement
-6(7)  Negating goto instruction, condition=2
-7(8) element: IF statement
-8(9) WRITE fScript
-9(11) element: Open block
-10(13) element: Finally clause
-11(10,12)  CALL 10
-12(14) AFTER CALL 11
-13(12)  RETURN
-14(15) READ fScript
-15(16) READ taskName
-16(17) ARGUMENT element: Reference expression
-17(18) element: Method call MAYBE_RETURN
-18() element: null
\ No newline at end of file
+2(3,5) READ ddd
+3(4) READ fXRec
+4(16) element: RETURN statement
+5(6) element: IF statement
+6(7) WRITE fScript
+7(9) element: Open block
+8(11) element: Finally clause
+9(8,10)  CALL 8
+10(12) AFTER CALL 9
+11(10)  RETURN
+12(13) READ fScript
+13(14) READ taskName
+14(15) ARGUMENT element: Reference expression
+15(16) element: Method call MAYBE_RETURN
+16() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/try6.test b/plugins/groovy/testdata/groovy/controlFlow/try6.test
index 94bcb21c160c..173eaa6bc614 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/try6.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/try6.test
@@ -10,17 +10,15 @@ return url
 -----
 0(1) element: null
 1(2) element: IF statement
-2(3) Condition
-3(4,11) READ url
-4(5) element: Open block
-5(13) WRITE url
-6(7) element: Catch clause
-7(8) WRITE e
-8(9) READ e
-9(10) ARGUMENT element: Reference expression
-10(15) THROW. element: THROW statement
-11(12)  Negating goto instruction, condition=2
-12(13) element: IF statement
-13(14) READ url
-14(15) element: RETURN statement
-15() element: null
\ No newline at end of file
+2(3,10) READ url
+3(4) element: Open block
+4(11) WRITE url
+5(6) element: Catch clause
+6(7) WRITE e
+7(8) READ e
+8(9) ARGUMENT element: Reference expression
+9(13) THROW. element: THROW statement
+10(11) element: IF statement
+11(12) READ url
+12(13) element: RETURN statement
+13() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/while1.test b/plugins/groovy/testdata/groovy/controlFlow/while1.test
index 32691ed75860..cd7c29f2b9da 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/while1.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/while1.test
@@ -8,10 +8,8 @@ while (true) {
 1(2) WRITE i
 2(3) element: WHILE statement
 3(4) element: IF statement
-4(5) Condition
-5(6,10) READ i
-6(7)  Negating goto instruction, condition=4
-7(8) element: IF statement
-8(9) READ i
-9(2) WRITE i
-10() element: null
\ No newline at end of file
+4(5,8) READ i
+5(6) element: IF statement
+6(7) READ i
+7(2) WRITE i
+8() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/while2.test b/plugins/groovy/testdata/groovy/controlFlow/while2.test
index 1e98fb09882c..15605553beb5 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/while2.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/while2.test
@@ -8,10 +8,8 @@ while (true) {
 1(2) WRITE i
 2(3) element: WHILE statement
 3(4) element: IF statement
-4(5) Condition
-5(2,6) READ i
-6(7)  Negating goto instruction, condition=4
-7(8) element: IF statement
-8(9) READ i
-9(2) WRITE j
-10() element: null
\ No newline at end of file
+4(2,5) READ i
+5(6) element: IF statement
+6(7) READ i
+7(2) WRITE j
+8() element: null
\ No newline at end of file
diff --git a/plugins/groovy/testdata/groovy/controlFlow/whileNonConstant.test b/plugins/groovy/testdata/groovy/controlFlow/whileNonConstant.test
index 9ece4b7bdeea..043e4f397ac6 100644
--- a/plugins/groovy/testdata/groovy/controlFlow/whileNonConstant.test
+++ b/plugins/groovy/testdata/groovy/controlFlow/whileNonConstant.test
@@ -7,12 +7,10 @@ while (condition()) {
 0(1) element: null
 1(2) WRITE i
 2(3) element: WHILE statement
-3(4,11) READ condition
+3(4,9) READ condition
 4(5) element: IF statement
-5(6) Condition
-6(7,11) READ i
-7(8)  Negating goto instruction, condition=5
-8(9) element: IF statement
-9(10) READ i
-10(2) WRITE i
-11() element: null
\ No newline at end of file
+5(6,9) READ i
+6(7) element: IF statement
+7(8) READ i
+8(2) WRITE i
+9() element: null
\ No newline at end of file

From 94bb1ce80d6097568b539bc29ce0a5a898213a5d Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Mon, 4 Jun 2012 17:22:18 +0400
Subject: [PATCH 154/239] IDEA-86996 more correct equivalence checking for
 groovy psi

---
 .../utils/EquivalenceChecker.java             | 86 +++++++++----------
 1 file changed, 40 insertions(+), 46 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/utils/EquivalenceChecker.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/utils/EquivalenceChecker.java
index 147916966b7f..22985a39e48e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/utils/EquivalenceChecker.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/utils/EquivalenceChecker.java
@@ -212,9 +212,6 @@ public class EquivalenceChecker {
     }
     final String name1 = var1.getName();
     final String name2 = var2.getName();
-    if (name1 == null) {
-      return name2 == null;
-    }
     return name1.equals(name2);
   }
 
@@ -264,9 +261,6 @@ public class EquivalenceChecker {
     }
     final String name1 = parameter1.getName();
     final String name2 = parameter2.getName();
-    if (name1 == null) {
-      return name2 == null;
-    }
     return name1.equals(name2);
   }
 
@@ -506,6 +500,17 @@ public class EquivalenceChecker {
         return false;
       }
     }
+
+    GrParameter[] parameters1 = closableBlock1.getParameters();
+    GrParameter[] parameters2 = closableBlock2.getParameters();
+    return parametersAreEquivalent(parameters1, parameters2);
+  }
+
+  private static boolean parametersAreEquivalent(GrParameter[] parameters1, GrParameter[] parameters2) {
+    if (parameters1.length != parameters2.length) return false;
+    for (int i = 0; i < parameters1.length; i++) {
+      if (!parametersAreEquivalent(parameters1[i], parameters2[i])) return false;
+    }
     return true;
   }
 
@@ -540,9 +545,8 @@ public class EquivalenceChecker {
 
   private static boolean indexExpressionsAreEquivalent(GrIndexProperty expression1,
                                                        GrIndexProperty expression2) {
-    final GrExpression operand1 = expression1.getInvokedExpression();
-    final GrExpression operand2 = expression2.getInvokedExpression();
-    return expressionsAreEquivalent(operand1, operand2);
+    return expressionsAreEquivalent(expression1.getInvokedExpression(), expression2.getInvokedExpression()) &&
+           argumentListsAreEquivalent(expression1.getArgumentList(), expression2.getArgumentList());
   }
 
   private static boolean typecastExpressionsAreEquivalent(GrTypeCastExpression expression1,
@@ -578,27 +582,33 @@ public class EquivalenceChecker {
     if (!expressionsAreEquivalent(methodExpression1, methodExpression2)) {
       return false;
     }
-    final GrArgumentList argumentList1 = methodExp1.getArgumentList();
-    if (argumentList1 == null) {
+    final GrClosableBlock[] closures1 = methodExp1.getClosureArguments();
+    final GrClosableBlock[] closures2 = methodExp2.getClosureArguments();
+    if (!expressionListsAreEquivalent(closures1, closures2)) {
       return false;
     }
-    final GrArgumentList argumentList2 = methodExp2.getArgumentList();
-    if (argumentList2 == null) {
+
+    return argumentListsAreEquivalent(methodExp1.getArgumentList(), methodExp2.getArgumentList());
+  }
+
+  private static boolean argumentListsAreEquivalent(GrArgumentList list1, GrArgumentList list2) {
+    if (list1 == null && list2 == null) {
+      return true;
+    }
+    if (list1 == null || list2 == null) {
       return false;
     }
-    final GrExpression[] args1 = argumentList1.getExpressionArguments();
-    final GrExpression[] args2 = argumentList2.getExpressionArguments();
+    final GrExpression[] args1 = list1.getExpressionArguments();
+    final GrExpression[] args2 = list2.getExpressionArguments();
     if (!expressionListsAreEquivalent(args1, args2)) {
       return false;
     }
-    final GrNamedArgument[] namedArgs1 = argumentList1.getNamedArguments();
-    final GrNamedArgument[] namedArgs2 = argumentList2.getNamedArguments();
+    final GrNamedArgument[] namedArgs1 = list1.getNamedArguments();
+    final GrNamedArgument[] namedArgs2 = list2.getNamedArguments();
     if (!namedArgumentListsAreEquivalent(namedArgs1, namedArgs2)) {
       return false;
     }
-    final GrClosableBlock[] closures1 = methodExp1.getClosureArguments();
-    final GrClosableBlock[] closures2 = methodExp2.getClosureArguments();
-    return expressionListsAreEquivalent(closures1, closures2);
+    return true;
   }
 
   private static boolean namedArgumentListsAreEquivalent(GrNamedArgument[] namedArgs1, GrNamedArgument[] namedArgs2) {
@@ -642,31 +652,19 @@ public class EquivalenceChecker {
 
   private static boolean newExpressionsAreEquivalent(@NotNull GrNewExpression newExp1,
                                                      @NotNull GrNewExpression newExp2) {
-    final PsiMethod constructor1 =
-        newExp1.resolveMethod();
-    final PsiMethod constructor2 =
-        newExp2.resolveMethod();
+    final PsiMethod constructor1 = newExp1.resolveMethod();
+    final PsiMethod constructor2 = newExp2.resolveMethod();
     if (constructor1 == null || constructor2 == null || constructor1.equals(constructor2)) {
       return false;
     }
-    final GrArgumentList argumentList1 = newExp1.getArgumentList();
-    if (argumentList1 == null) {
-      return false;
-    }
-    final GrExpression[] args1 = argumentList1.getExpressionArguments();
-    final GrArgumentList argumentList2 = newExp2.getArgumentList();
-    if (argumentList2 == null) {
-      return false;
-    }
-    final GrExpression[] args2 = argumentList2.getExpressionArguments();
-    return expressionListsAreEquivalent(args1, args2);
+    return argumentListsAreEquivalent(newExp1.getArgumentList(), newExp2.getArgumentList());
   }
 
   private static boolean prefixExpressionsAreEquivalent(@NotNull GrUnaryExpression prefixExp1,
                                                         @NotNull GrUnaryExpression prefixExp2) {
     final IElementType sign1 = prefixExp1.getOperationTokenType();
     final IElementType sign2 = prefixExp2.getOperationTokenType();
-    if (!sign1.equals(sign2)) {
+    if (sign1 != sign2) {
       return false;
     }
     final GrExpression operand1 = prefixExp1.getOperand();
@@ -678,7 +676,7 @@ public class EquivalenceChecker {
                                                          @NotNull GrUnaryExpression postfixExp2) {
     final IElementType sign1 = postfixExp1.getOperationTokenType();
     final IElementType sign2 = postfixExp2.getOperationTokenType();
-    if (!sign1.equals(sign2)) {
+    if (sign1 != sign2) {
       return false;
     }
     final GrExpression operand1 = postfixExp1.getOperand();
@@ -690,7 +688,7 @@ public class EquivalenceChecker {
                                                         @NotNull GrBinaryExpression binaryExp2) {
     final IElementType sign1 = binaryExp1.getOperationTokenType();
     final IElementType sign2 = binaryExp2.getOperationTokenType();
-    if (!sign1.equals(sign2)) {
+    if (sign1 != sign2) {
       return false;
     }
     final GrExpression lhs1 = binaryExp1.getLeftOperand();
@@ -721,7 +719,7 @@ public class EquivalenceChecker {
                                                             @NotNull GrAssignmentExpression assignExp2) {
     final IElementType sign1 = assignExp1.getOperationToken();
     final IElementType sign2 = assignExp2.getOperationToken();
-    if (!sign1.equals(sign2)) {
+    if (sign1 != sign2) {
       return false;
     }
     final GrExpression lhs1 = assignExp1.getLValue();
@@ -740,13 +738,9 @@ public class EquivalenceChecker {
     final GrExpression thenExpression2 = condExp2.getThenBranch();
     final GrExpression elseExpression1 = condExp1.getElseBranch();
     final GrExpression elseExpression2 = condExp2.getElseBranch();
-    return expressionsAreEquivalent(condition1, condition2)
-        &&
-        expressionsAreEquivalent(thenExpression1,
-            thenExpression2)
-        &&
-        expressionsAreEquivalent(elseExpression1,
-            elseExpression2);
+    return expressionsAreEquivalent(condition1, condition2) &&
+           expressionsAreEquivalent(thenExpression1, thenExpression2) &&
+           expressionsAreEquivalent(elseExpression1, elseExpression2);
   }
 
   private static boolean elvisExpressionsAreEquivalent(@NotNull GrElvisExpression condExp1,

From 630facb9fd487eb013241461daf20d55cae16c32 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Mon, 4 Jun 2012 17:30:18 +0400
Subject: [PATCH 155/239] EA-36416 - PIEAE: LeafPsiElement.invalid

---
 .../groovy/lang/completion/weighers/GrWithWeigher.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrWithWeigher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrWithWeigher.java
index 7160d6c676e0..4625e123a102 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrWithWeigher.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/weighers/GrWithWeigher.java
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionWeigher;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.plugins.groovy.lang.psi.GroovyFileBase;
+import org.jetbrains.plugins.groovy.GroovyFileType;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression;
@@ -36,7 +36,7 @@ public class GrWithWeigher extends CompletionWeigher {
   @Override
   public Comparable weigh(@NotNull LookupElement element, @NotNull CompletionLocation location) {
     final PsiElement position = location.getCompletionParameters().getPosition();
-    if (!(position.getContainingFile() instanceof GroovyFileBase)) return null;
+    if (!(position.getLanguage() != GroovyFileType.GROOVY_LANGUAGE)) return null;
 
     if (!(position.getParent() instanceof GrReferenceExpression)) return null;
 

From 24f7471a3a977da3cf2eae5b6b39c37633e27f13 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Mon, 4 Jun 2012 17:42:57 +0400
Subject: [PATCH 156/239] IDEA-86854 GitLog should not be available with all
 projects closed or should work - IAE at
 com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier.showOverVersionControlView

---
 plugins/git4idea/src/git4idea/GitVcs.java     |  6 ++++--
 .../history/browser/LowLevelAccessImpl.java   |  3 ++-
 .../history/wholeTree/BigTableTableModel.java |  4 +++-
 .../SelectRepositoryAndShowLogAction.java     | 14 ++++++++++----
 .../src/git4idea/repo/GitRepositoryImpl.java  | 19 ++++++++++++-------
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java
index 320d9bc71709..b78c401436de 100644
--- a/plugins/git4idea/src/git4idea/GitVcs.java
+++ b/plugins/git4idea/src/git4idea/GitVcs.java
@@ -419,9 +419,11 @@ public class GitVcs extends AbstractVcs<CommittedChangeList> {
     final String executable = myAppSettings.getPathToGit();
     try {
       myVersion = GitVersion.identifyVersion(executable);
-      if (!myVersion.isSupported() && !myProject.isDefault()) {
+      if (! myVersion.isSupported()) {
         String message = GitBundle.message("vcs.unsupported.version", myVersion, GitVersion.MIN);
-        showMessage(message, ConsoleViewContentType.SYSTEM_OUTPUT.getAttributes());
+        if (! myProject.isDefault()) {
+          showMessage(message, ConsoleViewContentType.SYSTEM_OUTPUT.getAttributes());
+        }
         VcsBalloonProblemNotifier.showOverVersionControlView(myProject, message, MessageType.ERROR);
       }
     } catch (Exception e) {
diff --git a/plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java b/plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java
index 45e11a63095a..f774ff6a8bd0 100644
--- a/plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java
+++ b/plugins/git4idea/src/git4idea/history/browser/LowLevelAccessImpl.java
@@ -104,13 +104,14 @@ public class LowLevelAccessImpl implements LowLevelAccess {
   // uses cached version
   public CachedRefs getRefs() throws VcsException {
     final CachedRefs refs = new CachedRefs();
-    GitRepository repository = GitUtil.getRepositoryManager(myProject).getRepositoryForRoot(myRoot);
+    GitRepository repository = myProject == null || myProject.isDefault() ? null : GitUtil.getRepositoryManager(myProject).getRepositoryForRoot(myRoot);
     if (repository == null) {
       final File child = new File(myRoot.getPath(), GitUtil.DOT_GIT);
       if (! child.exists()) {
         throw new VcsException("No git repository in " + myRoot.getPath());
       }
       repository = GitRepositoryImpl.getLightInstance(myRoot, myProject, myProject);
+      repository.update(GitRepository.TrackedTopic.BRANCHES);
       repository.getBranches();
     }
     GitBranchesCollection branches = repository.getBranches();
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/BigTableTableModel.java b/plugins/git4idea/src/git4idea/history/wholeTree/BigTableTableModel.java
index 49d53fda73ae..77725162a697 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/BigTableTableModel.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/BigTableTableModel.java
@@ -444,7 +444,9 @@ public class BigTableTableModel extends AbstractTableModel {
   }
   
   public int getLastForRoot(final VirtualFile root) {
-    return myRepoIdxMap.get(root).last();
+    final TreeSet<Integer> integers = myRepoIdxMap.get(root);
+    if (integers.isEmpty()) return -1;
+    return integers.last();
   }
 
   @Override
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java
index f597644cf9cc..d2f7d96a22b2 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java
@@ -71,7 +71,10 @@ public class SelectRepositoryAndShowLogAction extends AnAction {
 
   @Override
   public void actionPerformed(AnActionEvent e) {
-    final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
+    Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
+    project = project == null ? ProjectManager.getInstance().getDefaultProject() : project;
+    final Project finalProject = project;
+
     final FileChooserDescriptor descriptor = new FileChooserDescriptor(false, true, false, true, false, true);
     final VirtualFile[] virtualFiles = FileChooser.chooseFiles(descriptor, project, null);
     if (virtualFiles.length == 0) return;
@@ -106,13 +109,12 @@ public class SelectRepositoryAndShowLogAction extends AnAction {
       }
 
       final ToolWindow window = ToolWindowManager.getInstance(project).getToolWindow(ChangesViewContentManager.TOOLWINDOW_ID);
-      final Project finalProject = project;
 
       final Runnable showContent = new Runnable() {
         @Override
         public void run() {
           ContentManager cm = window.getContentManager();
-          if (checkForProjectScope(cm, project, correctRoots)) return;
+          if (checkForProjectScope(cm, finalProject, correctRoots)) return;
 
           int cnt = 0;
           Content[] contents = cm.getContents();
@@ -123,7 +125,7 @@ public class SelectRepositoryAndShowLogAction extends AnAction {
               List<VirtualFile> roots = ((MyContentComponent)component).getRoots();
               if (Comparing.equal(roots, correctRoots)) {
                 cm.setSelectedContent(content);
-                alreadyOpened(project);
+                alreadyOpened(finalProject);
                 return;
               }
             }
@@ -252,6 +254,10 @@ public class SelectRepositoryAndShowLogAction extends AnAction {
       GitVcs vcs = GitVcs.getInstance(myProject);
       if (vcs == null) { return; }
       myVersion = vcs.getVersion();
+      if (myVersion.isNull()) {
+        vcs.checkVersion();
+        myVersion = vcs.getVersion();
+      }
     }
   }
 
diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java b/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java
index 6c3d521b9fa1..7dc2e815286e 100644
--- a/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java
+++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java
@@ -61,7 +61,8 @@ public class GitRepositoryImpl implements GitRepository, Disposable {
    * If you need to have an instance of GitRepository for a repository outside the project, use
    * {@link #getLightInstance(com.intellij.openapi.vfs.VirtualFile, com.intellij.openapi.project.Project, com.intellij.openapi.Disposable)}.
    */
-  private GitRepositoryImpl(@NotNull VirtualFile rootDir, @NotNull Project project, @NotNull Disposable parentDisposable) {
+  private GitRepositoryImpl(@NotNull VirtualFile rootDir, @NotNull Project project, @NotNull Disposable parentDisposable,
+                            final boolean light) {
     myRootDir = rootDir;
     myProject = project;
     Disposer.register(parentDisposable, this);
@@ -71,12 +72,16 @@ public class GitRepositoryImpl implements GitRepository, Disposable {
 
     myReader = new GitRepositoryReader(VfsUtil.virtualToIoFile(myGitDir));
 
-    myUntrackedFilesHolder = new GitUntrackedFilesHolder(this);
-    Disposer.register(this, myUntrackedFilesHolder);
-
     myMessageBus = project.getMessageBus();
     myNotifier = new QueueProcessor<Object>(new NotificationConsumer(myProject, myMessageBus), myProject.getDisposed());
-    update(TrackedTopic.ALL);
+    if (! light) {
+      myUntrackedFilesHolder = new GitUntrackedFilesHolder(this);
+      Disposer.register(this, myUntrackedFilesHolder);
+
+      update(TrackedTopic.ALL);
+    } else {
+      myUntrackedFilesHolder = null;
+    }
   }
 
   /**
@@ -86,7 +91,7 @@ public class GitRepositoryImpl implements GitRepository, Disposable {
    */
   @NotNull
   public static GitRepository getLightInstance(@NotNull VirtualFile root, @NotNull Project project, @NotNull Disposable parentDisposable) {
-    return new GitRepositoryImpl(root, project, parentDisposable);
+    return new GitRepositoryImpl(root, project, parentDisposable, true);
   }
 
   /**
@@ -94,7 +99,7 @@ public class GitRepositoryImpl implements GitRepository, Disposable {
    * This is used for repositories registered in project, and should be optained via {@link GitRepositoryManager}.
    */
   public static GitRepository getFullInstance(@NotNull VirtualFile root, @NotNull Project project, @NotNull Disposable parentDisposable) {
-    GitRepositoryImpl repository = new GitRepositoryImpl(root, project, parentDisposable);
+    GitRepositoryImpl repository = new GitRepositoryImpl(root, project, parentDisposable, false);
     repository.myUntrackedFilesHolder.setupVfsListener(project);
     repository.setupUpdater();
     return repository;

From 8e071ae8970ea93855d572bed116956d94b6b251 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Mon, 4 Jun 2012 17:59:10 +0400
Subject: [PATCH 157/239] IDEA-86997 Cannot open settings dialog

---
 .../src/com/intellij/openapi/vcs/VcsAbstractSetting.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsAbstractSetting.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsAbstractSetting.java
index 0ccccffd95b9..83cd3b12a8b3 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsAbstractSetting.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/VcsAbstractSetting.java
@@ -15,10 +15,10 @@
  */
 package com.intellij.openapi.vcs;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 
 
 public class VcsAbstractSetting {
@@ -34,7 +34,9 @@ public class VcsAbstractSetting {
   }
 
   public void addApplicableVcs(AbstractVcs vcs) {
-    myApplicable.add(vcs);
+    if (vcs != null) {
+      myApplicable.add(vcs);
+    }
   }
 
   public boolean isApplicableTo(Collection<AbstractVcs> vcs) {

From f42648e7ee1df044fe66cf146500f92bef033700 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Mon, 4 Jun 2012 18:05:29 +0400
Subject: [PATCH 158/239] IDEA-86987 Groovy: NPE at
 GroovyRefactoringUtil$1.compare()

---
 .../plugins/groovy/refactoring/GroovyRefactoringUtil.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java
index a1efd9f420b4..28c87997e3b2 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringUtil.java
@@ -135,7 +135,7 @@ public abstract class GroovyRefactoringUtil {
     ArrayList<PsiElement> occurrences = new ArrayList<PsiElement>();
     Comparator<PsiElement> comparator = new Comparator<PsiElement>() {
       public int compare(PsiElement element1, PsiElement element2) {
-        if (element1.equals(element2)) return 0;
+        if (element1 != null && element1.equals(element2)) return 0;
 
         if (element1 instanceof GrParameter &&
             element2 instanceof GrParameter) {

From 48270054be020372f0537dd801dc3dc6cad9a0b8 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 4 Jun 2012 18:11:42 +0400
Subject: [PATCH 159/239] on OOME clean data buffer and throw
 CorruptedException (WI-11507)

---
 .../com/intellij/util/io/PersistentHashMapValueStorage.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
index 0d0c2751291d..f4915144ad3a 100644
--- a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
+++ b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java
@@ -186,6 +186,9 @@ public class PersistentHashMapValueStorage {
           throw new PersistentEnumeratorBase.CorruptedException(myFile);
         }
       }
+    } catch (OutOfMemoryError error) {
+      result = null;
+      throw new PersistentEnumeratorBase.CorruptedException(myFile);
     }
     finally {
       if (readerHandle != null) {

From d837340f54638bb2b68bce0361061ab7a3357fee Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 4 Jun 2012 18:12:51 +0400
Subject: [PATCH 160/239] track dirty status for btree structures

---
 .../com/intellij/util/io/IntToIntBtree.java   | 16 ++++++++---
 .../intellij/util/io/PagedFileStorage.java    | 28 ++++++++++++++-----
 .../util/io/PersistentBTreeEnumerator.java    | 11 ++++++--
 .../util/io/PersistentEnumeratorBase.java     |  4 +--
 4 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/IntToIntBtree.java b/platform/util/src/com/intellij/util/io/IntToIntBtree.java
index 32de16aba15f..555c5ba6585c 100644
--- a/platform/util/src/com/intellij/util/io/IntToIntBtree.java
+++ b/platform/util/src/com/intellij/util/io/IntToIntBtree.java
@@ -182,10 +182,11 @@ class IntToIntBtree {
     int index = myAccessNodeView.locate(key, true);
 
     if (index < 0) {
+      ++count;
       myAccessNodeView.insert(key, value);
     } else {
-      ++count;
       myAccessNodeView.setAddressAt(index, value);
+      if (!myAccessNodeView.myIsDirty) myAccessNodeView.markDirty();
     }
   }
 
@@ -243,6 +244,7 @@ class IntToIntBtree {
     protected int myAddressInBuffer;
     protected ByteBuffer myBuffer;
     protected boolean myHasFullPagesAlongPath;
+    protected boolean myIsDirty;
 
     public BtreePage(IntToIntBtree btree) {
       this.btree = btree;
@@ -259,7 +261,8 @@ class IntToIntBtree {
     protected void syncWithStore() {
       PagedFileStorage pagedFileStorage = btree.storage.getPagedFileStorage();
       myAddressInBuffer = pagedFileStorage.getOffsetInPage(address);
-      myBuffer = pagedFileStorage.getByteBuffer(address);
+      myBuffer = pagedFileStorage.getByteBuffer(address, false);
+      myIsDirty = false; // we will mark dirty on child count change, attrs change or existing key put
       doInitFlags(myBuffer.getInt(myAddressInBuffer));
     }
 
@@ -272,6 +275,12 @@ class IntToIntBtree {
       if (flag) b |= mask;
       else b &= ~mask;
       myBuffer.put(myAddressInBuffer, b);
+      if (!myIsDirty) markDirty();
+    }
+
+    void markDirty() {
+      btree.storage.getPagedFileStorage().getByteBuffer(address, true);
+      myIsDirty = true;
     }
 
     protected final short getChildrenCount() {
@@ -281,6 +290,7 @@ class IntToIntBtree {
     protected final void setChildrenCount(short value) {
       myChildrenCount = value;
       myBuffer.putShort(myAddressInBuffer + 1, value);
+      if (!myIsDirty) markDirty();
     }
 
     protected final void setNextPage(int nextPage) {
@@ -686,7 +696,6 @@ class IntToIntBtree {
         btree.root.setAddressAt(0, -address);
         btree.root.setAddressAt(1, -newIndexNode.address);
 
-
         if (doSanityCheck) {
           btree.root.dump("New root");
           dump("First child");
@@ -952,7 +961,6 @@ class IntToIntBtree {
           hashSetState(index, HASH_FULL);
           setAddressAt(index, newValueId);
           setChildrenCount((short)(recordCount + 1));
-
           return;
         }
       }
diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index 1d14f6e54295..0539b85804ca 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -73,10 +73,13 @@ public class PagedFileStorage implements Forceable {
   private final StorageLockContext myStorageLockContext;
   private int myLastPage = UNKNOWN_PAGE;
   private int myLastPage2 = UNKNOWN_PAGE;
+  private int myLastPage3 = UNKNOWN_PAGE;
   private ByteBufferWrapper myLastBuffer;
   private ByteBufferWrapper myLastBuffer2;
+  private ByteBufferWrapper myLastBuffer3;
   private int myLastChangeCount;
   private int myLastChangeCount2;
+  private int myLastChangeCount3;
   private int myStorageIndex;
 
   private static final int MAX_PAGES_COUNT = 0xFFFF;
@@ -160,9 +163,9 @@ public class PagedFileStorage implements Forceable {
   int getOffsetInPage(int addr) {
     return addr % myPageSize;
   }
-  
-  ByteBuffer getByteBuffer(int address) {
-    return getBuffer(address / myPageSize);
+
+  ByteBuffer getByteBuffer(int address, boolean modify) {
+    return getBuffer(address / myPageSize, modify);
   }
 
   public final short getShort(int addr) {
@@ -294,8 +297,10 @@ public class PagedFileStorage implements Forceable {
 
     myLastPage = UNKNOWN_PAGE;
     myLastPage2 = UNKNOWN_PAGE;
+    myLastPage3 = UNKNOWN_PAGE;
     myLastBuffer = null;
     myLastBuffer2 = null;
+    myLastBuffer3 = null;
   }
 
   public void resize(int newSize) throws IOException {
@@ -364,14 +369,18 @@ public class PagedFileStorage implements Forceable {
         if (modify) myLastBuffer.markDirty();
         return buf;
       }
-    }
-
-    if (myLastPage2 == page) {
+    } else if (myLastPage2 == page) {
       ByteBuffer buf = myLastBuffer2.getCachedBuffer();
       if (buf != null && myLastChangeCount2 == myStorageLockContext.myStorageLock.myMappingChangeCount) {
         if (modify) myLastBuffer2.markDirty();
         return buf;
       }
+    } else if (myLastPage3 == page) {
+      ByteBuffer buf = myLastBuffer3.getCachedBuffer();
+      if (buf != null && myLastChangeCount3 == myStorageLockContext.myStorageLock.myMappingChangeCount) {
+        if (modify) myLastBuffer3.markDirty();
+        return buf;
+      }
     }
 
     try {
@@ -385,9 +394,14 @@ public class PagedFileStorage implements Forceable {
       ByteBuffer buf = byteBufferWrapper.getBuffer();
 
       if (myLastPage != page) {
+        myLastPage3 = myLastPage2;
+        myLastBuffer3 = myLastBuffer2;
+        myLastChangeCount3 = myLastChangeCount2;
+
         myLastPage2 = myLastPage;
         myLastBuffer2 = myLastBuffer;
         myLastChangeCount2 = myLastChangeCount;
+
         myLastBuffer = byteBufferWrapper;
         myLastPage = page;
       } else {
@@ -443,7 +457,7 @@ public class PagedFileStorage implements Forceable {
       myDefaultStorageLockContext = new StorageLockContext(this);
 
       mySizeLimit = UPPER_LIMIT;
-      myMap = new LinkedHashMap<Integer, ByteBufferWrapper>(10) {
+      myMap = new LinkedHashMap<Integer, ByteBufferWrapper>(10, 0.75f) {
         @Override
         protected boolean removeEldestEntry(Map.Entry<Integer, ByteBufferWrapper> eldest) {
           return mySize > mySizeLimit;
diff --git a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
index 7e57f9af80a8..bd4b389a0667 100644
--- a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
+++ b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java
@@ -132,7 +132,7 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
     assert offset + 4 < PAGE_SIZE;
 
     if (toDisk) {
-      myStorage.putInt(offset, value);
+      if (myFirstPageStart == -1 || myStorage.getInt(offset) != value) myStorage.putInt(offset, value);
     } else {
       value = myStorage.getInt(offset);
     }
@@ -255,7 +255,8 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
   }
 
   private final int[] myResultBuf = new int[1];
-  
+
+  private int myExistingKeysEnumerated;
   protected int enumerateImpl(final Data value, final boolean onlyCheckForExisting, boolean saveNewValue) throws IOException {
     try {
       lockStorage();
@@ -280,7 +281,10 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
             if (IntToIntBtree.doSanityCheck) IntToIntBtree.myAssert(myDataDescriptor.getHashCode(candidate) == valueHC);
 
             if (myDataDescriptor.isEqual(value, candidate)) {
-              if (!saveNewValue) return indexNodeValueAddress;
+              if (!saveNewValue) {
+                ++myExistingKeysEnumerated;
+                return indexNodeValueAddress;
+              }
               existingData = candidate;
             }
 
@@ -320,6 +324,7 @@ public class PersistentBTreeEnumerator<Data> extends PersistentEnumeratorBase<Da
                             myFile +
                             ", values " +
                             valuesCount +
+                            ", existing keys enumerated:"+ myExistingKeysEnumerated +
                             ", storage size:" +
                             myStorage.length());
           btree.dumpStatistics();
diff --git a/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java b/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
index 0bf80964eabc..88e0b48ad938 100644
--- a/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
+++ b/platform/util/src/com/intellij/util/io/PersistentEnumeratorBase.java
@@ -297,7 +297,7 @@ abstract class PersistentEnumeratorBase<Data> implements Forceable, Closeable {
   protected void putMetaData(long data) throws IOException {
     lockStorage();
     try {
-      myStorage.putLong(META_DATA_OFFSET, data);
+      if (myStorage.length() < META_DATA_OFFSET + 8 || getMetaData() != data) myStorage.putLong(META_DATA_OFFSET, data);
     }
     finally {
       unlockStorage();
@@ -317,7 +317,7 @@ abstract class PersistentEnumeratorBase<Data> implements Forceable, Closeable {
   protected void putMetaData2(long data) throws IOException {
     lockStorage();
     try {
-      myStorage.putLong(META_DATA_OFFSET + 8, data);
+      if (myStorage.length() < META_DATA_OFFSET + 16 || getMetaData2() != data) myStorage.putLong(META_DATA_OFFSET + 8, data);
     }
     finally {
       unlockStorage();

From 6bbbb5031fd420cf3e55bc56569a14aa0b20e5c6 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 4 Jun 2012 13:58:05 +0400
Subject: [PATCH 161/239] try given class name when $->. replaced not found
 (IDEA-86943)

---
 .../src/com/intellij/execution/JavaExecutionUtil.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
index 85a5b51e1337..52a705e3841f 100644
--- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
+++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java
@@ -138,8 +138,9 @@ public class JavaExecutionUtil {
     final PsiManager psiManager = PsiManager.getInstance(project);
     final String shortName = StringUtil.getShortName(mainClassName);
     final String packageName = StringUtil.getPackageName(mainClassName);
-    return JavaPsiFacade.getInstance(psiManager.getProject())
-      .findClass(StringUtil.getQualifiedName(packageName, shortName.replace('$', '.')), scope);
+    final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(psiManager.getProject());
+    final PsiClass psiClass = psiFacade.findClass(StringUtil.getQualifiedName(packageName, shortName.replace('$', '.')), scope);
+    return psiClass == null ? psiFacade.findClass(mainClassName, scope) : psiClass;
   }
 
 

From 201978075df236adf422f931b8af92aada44cb0a Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 4 Jun 2012 16:30:13 +0400
Subject: [PATCH 162/239] introduce constant: create subclass when it is not
 possible to place the constant inside the class (IDEA-86965)

---
 .../BaseExpressionToFieldHandler.java         | 41 ++++++++++++-------
 .../InplaceIntroduceConstantPopup.java        | 17 +++++---
 .../IntroduceConstantDialog.java              | 11 ++++-
 .../FromEnumConstantInitializer.java          |  6 +++
 .../FromEnumConstantInitializer_after.java    | 10 +++++
 .../refactoring/IntroduceConstantTest.java    |  6 +++
 6 files changed, 70 insertions(+), 21 deletions(-)
 create mode 100644 java/java-tests/testData/refactoring/introduceConstant/FromEnumConstantInitializer.java
 create mode 100644 java/java-tests/testData/refactoring/introduceConstant/FromEnumConstantInitializer_after.java

diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
index 6b9d7c583910..5655de0f4262 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
@@ -704,7 +704,7 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
         initializer = IntroduceVariableBase.replaceExplicitWithDiamondWhenApplicable(initializer, myType);
         
         final PsiMethod enclosingConstructor = getEnclosingConstructor(myParentClass, myAnchorElement);
-        final PsiClass destClass = mySettings.getDestinationClass() == null ? myParentClass : mySettings.getDestinationClass();
+        PsiClass destClass = mySettings.getDestinationClass() == null ? myParentClass : mySettings.getDestinationClass();
 
         if (!CommonRefactoringUtil.checkReadOnlyStatus(myProject, destClass.getContainingFile())) return;
 
@@ -716,7 +716,29 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
                                      myParentClass);
 
         setModifiers(myField, mySettings);
-        myField = appendField(initializer, initializerPlace, destClass, myParentClass, myAnchorElement, myField);
+        PsiElement finalAnchorElement = null;
+        if (destClass == myParentClass) {
+          for (finalAnchorElement = myAnchorElement;
+               finalAnchorElement != null && finalAnchorElement.getParent() != destClass;
+               finalAnchorElement = finalAnchorElement.getParent()) {
+          }
+        }
+        PsiMember anchorMember = finalAnchorElement instanceof PsiMember ? (PsiMember)finalAnchorElement : null;
+
+        if (anchorMember instanceof PsiEnumConstant && destClass == anchorMember.getContainingClass()) {
+          String constantsClassName = "Constants";
+
+          int i = 1;
+          while (destClass.findInnerClassByName(constantsClassName, true) != null) {
+            constantsClassName += constantsClassName + i++;
+          }
+
+          PsiClass psiClass = JavaPsiFacade.getElementFactory(myProject).createClass(constantsClassName);
+          PsiUtil.setModifierProperty(psiClass, PsiModifier.PRIVATE, true);
+          destClass = (PsiClass)destClass.add(psiClass);
+          anchorMember = null;
+        }
+        myField = appendField(initializer, initializerPlace, destClass, myParentClass, myField, anchorMember);
         if (!mySettings.isIntroduceEnumConstant()) {
           VisibilityUtil.fixVisibility(myOccurrences, myField, mySettings.getFieldVisibility());
         }
@@ -823,18 +845,9 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
     static PsiField appendField(final PsiExpression initializer,
                                 InitializationPlace initializerPlace, final PsiClass destClass,
                                 final PsiClass parentClass,
-                                final PsiElement anchorElement,
-                                final PsiField psiField) {
-      PsiElement finalAnchorElement = null;
-      if (destClass == parentClass) {
-        for (finalAnchorElement = anchorElement;
-             finalAnchorElement != null && finalAnchorElement.getParent() != destClass;
-             finalAnchorElement = finalAnchorElement.getParent()) {
-
-        }
-      }
-      PsiMember anchorMember = finalAnchorElement instanceof PsiMember ? (PsiMember)finalAnchorElement : null;
-
+                                final PsiField psiField,
+                                final PsiMember anchorMember) {
+      
       if ((anchorMember instanceof PsiField) &&
           anchorMember.hasModifierProperty(PsiModifier.STATIC) == psiField.hasModifierProperty(PsiModifier.STATIC)) {
         return (PsiField)destClass.addBefore(psiField, anchorMember);
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
index 62423a0438d9..447594a67388 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/InplaceIntroduceConstantPopup.java
@@ -72,7 +72,6 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField
 
     gc.gridy = 2;
     myWholePanel.add(createLeftPanel(), gc);
-
   }
 
   @Nullable
@@ -103,7 +102,8 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField
 
   private JPanel createLeftPanel() {
     final JPanel left = new JPanel(new GridBagLayout());
-    myMoveToAnotherClassCb = new JCheckBox("Move to another class", JavaRefactoringSettings.getInstance().INTRODUCE_CONSTANT_MOVE_TO_ANOTHER_CLASS);
+    myMoveToAnotherClassCb =
+      new JCheckBox("Move to another class", JavaRefactoringSettings.getInstance().INTRODUCE_CONSTANT_MOVE_TO_ANOTHER_CLASS);
     myMoveToAnotherClassCb.setMnemonic('m');
     myMoveToAnotherClassCb.setFocusable(false);
     left.add(myMoveToAnotherClassCb,
@@ -141,9 +141,15 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField
         if (visibility != null) {
           PsiUtil.setModifierProperty(field, visibility, true);
         }
+        final PsiElement anchorElementIfAll = getAnchorElementIfAll();
+        PsiElement finalAnchorElement;
+        for (finalAnchorElement = anchorElementIfAll;
+             finalAnchorElement != null && finalAnchorElement.getParent() != myParentClass;
+             finalAnchorElement = finalAnchorElement.getParent()) {
+        }
+        PsiMember anchorMember = finalAnchorElement instanceof PsiMember ? (PsiMember)finalAnchorElement : null;
         field = BaseExpressionToFieldHandler.ConvertToFieldRunnable
-          .appendField(myExpr, BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION, myParentClass, myParentClass,
-                       getAnchorElementIfAll(), field);
+          .appendField(myExpr, BaseExpressionToFieldHandler.InitializationPlace.IN_FIELD_DECLARATION, myParentClass, myParentClass, field, anchorMember);
         myFieldRangeStart = myEditor.getDocument().createRangeMarker(field.getTextRange());
         return field;
       }
@@ -228,7 +234,8 @@ public class InplaceIntroduceConstantPopup extends AbstractInplaceIntroduceField
       protected void run(Result result) throws Throwable {
         if (getLocalVariable() != null) {
           final LocalToFieldHandler.IntroduceFieldRunnable fieldRunnable =
-            new LocalToFieldHandler.IntroduceFieldRunnable(false, (PsiLocalVariable)getLocalVariable(), myParentClass, settings, true, myOccurrences);
+            new LocalToFieldHandler.IntroduceFieldRunnable(false, (PsiLocalVariable)getLocalVariable(), myParentClass, settings, true,
+                                                           myOccurrences);
           fieldRunnable.run();
         }
         else {
diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
index 5a847e91cb92..37b8336dbe5b 100644
--- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java
@@ -37,6 +37,7 @@ import com.intellij.psi.codeStyle.SuggestedNameInfo;
 import com.intellij.psi.codeStyle.VariableKind;
 import com.intellij.psi.impl.source.resolve.JavaResolveUtil;
 import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.RefactoringBundle;
@@ -129,7 +130,7 @@ class IntroduceConstantDialog extends DialogWrapper {
     init();
 
     myVPanel.setVisibility(JavaRefactoringSettings.getInstance().INTRODUCE_CONSTANT_VISIBILITY);
-    myIntroduceEnumConstantCb.setEnabled(EnumConstantsUtil.isSuitableForEnumConstant(getSelectedType(), myTargetClass));
+    myIntroduceEnumConstantCb.setEnabled(isSuitableForEnumConstant());
     updateVisibilityPanel();
     updateButtons();
   }
@@ -324,7 +325,13 @@ class IntroduceConstantDialog extends DialogWrapper {
     final String targetClassName = getTargetClassName();
     myTargetClass = JavaPsiFacade.getInstance(myProject).findClass(targetClassName, GlobalSearchScope.projectScope(myProject));
     updateVisibilityPanel();
-    myIntroduceEnumConstantCb.setEnabled(EnumConstantsUtil.isSuitableForEnumConstant(getSelectedType(), myTargetClass));
+    myIntroduceEnumConstantCb.setEnabled(isSuitableForEnumConstant());
+  }
+
+  private boolean isSuitableForEnumConstant() {
+    return EnumConstantsUtil.isSuitableForEnumConstant(getSelectedType(), myTargetClass) && PsiTreeUtil
+                                                                                              .getParentOfType(myInitializerExpression,
+                                                                                                               PsiEnumConstant.class) == null;
   }
 
   private void enableEnumDependant(boolean enable) {
diff --git a/java/java-tests/testData/refactoring/introduceConstant/FromEnumConstantInitializer.java b/java/java-tests/testData/refactoring/introduceConstant/FromEnumConstantInitializer.java
new file mode 100644
index 000000000000..9337b61dae68
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceConstant/FromEnumConstantInitializer.java
@@ -0,0 +1,6 @@
+enum TestEnum {
+  ONE("te<caret>stString");
+
+  TestEnum(String str) {
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/introduceConstant/FromEnumConstantInitializer_after.java b/java/java-tests/testData/refactoring/introduceConstant/FromEnumConstantInitializer_after.java
new file mode 100644
index 000000000000..3e64bada75e6
--- /dev/null
+++ b/java/java-tests/testData/refactoring/introduceConstant/FromEnumConstantInitializer_after.java
@@ -0,0 +1,10 @@
+enum TestEnum {
+  ONE(Constants.xxx);
+
+  TestEnum(String str) {
+  }
+
+    private class Constants {
+        public static final String xxx = "testString";
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java
index 5c12322b3599..8e338b425f3d 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java
@@ -34,6 +34,12 @@ public class IntroduceConstantTest extends LightCodeInsightTestCase {
     checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
   }
 
+  public void testFromEnumConstantInitializer() throws Exception {
+    configureByFile(BASE_PATH + getTestName(false) + ".java");
+    new MockIntroduceConstantHandler(null).invoke(getProject(), getEditor(), getFile(), null);
+    checkResultByFile(BASE_PATH + getTestName(false) + "_after.java");
+  }
+
   public void testEnumConstant() throws Exception {
     doTest(true);    
   }

From 862ce1a8fbad487bfd2b6d7af064e20e84654cfa Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Mon, 4 Jun 2012 18:08:01 +0400
Subject: [PATCH 163/239] moving XmlHighlightingTest to community

---
 .../daemon/XmlHighlightingTest.java           | 2041 +++++++++++++++++
 xml/tests/xml-tests.iml                       |    4 +
 2 files changed, 2045 insertions(+)
 create mode 100644 xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java

diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
new file mode 100644
index 000000000000..0413a9c23e57
--- /dev/null
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
@@ -0,0 +1,2041 @@
+package com.intellij.codeInsight.daemon;
+
+import com.intellij.application.options.XmlSettings;
+import com.intellij.codeInsight.completion.CodeCompletionHandlerBase;
+import com.intellij.codeInsight.completion.CompletionType;
+import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.daemon.impl.analysis.XmlHighlightVisitor;
+import com.intellij.codeInsight.daemon.impl.analysis.XmlUnboundNsPrefixInspection;
+import com.intellij.codeInsight.lookup.LookupManager;
+import com.intellij.codeInspection.LocalInspectionTool;
+import com.intellij.codeInspection.htmlInspections.HtmlUnknownTagInspection;
+import com.intellij.codeInspection.htmlInspections.RequiredAttributesInspection;
+import com.intellij.codeInspection.htmlInspections.XmlWrongRootElementInspection;
+import com.intellij.ide.DataManager;
+import com.intellij.ide.highlighter.HighlighterFactory;
+import com.intellij.ide.highlighter.XmlHighlighterFactory;
+import com.intellij.javaee.ExternalResourceManagerEx;
+import com.intellij.javaee.ExternalResourceManagerImpl;
+import com.intellij.javaee.UriUtil;
+import com.intellij.lang.annotation.HighlightSeverity;
+import com.intellij.lang.ant.dom.AntResolveInspection;
+import com.intellij.openapi.actionSystem.ActionManager;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.IdeActions;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorFactory;
+import com.intellij.openapi.editor.EditorModificationUtil;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
+import com.intellij.openapi.editor.highlighter.EditorHighlighter;
+import com.intellij.openapi.editor.highlighter.HighlighterIterator;
+import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.pom.Navigatable;
+import com.intellij.psi.*;
+import com.intellij.psi.impl.include.FileIncludeManager;
+import com.intellij.psi.search.PsiElementProcessor;
+import com.intellij.psi.xml.*;
+import com.intellij.util.Processor;
+import com.intellij.util.containers.ContainerUtil;
+import com.intellij.xml.XmlBundle;
+import com.intellij.xml.util.*;
+import gnu.trove.THashSet;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
+import java.util.*;
+
+@SuppressWarnings({"HardCodedStringLiteral"})
+public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
+  private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/xml/";
+
+  private boolean myTestJustJaxpValidation;
+  @NonNls private static final String CREATE_NAMESPACE_DECLARATION_INTENTION_NAME = "Create Namespace Declaration";
+  private boolean old;
+  private String myOldDoctype;
+
+  private void doTest() throws Exception {
+    doTest(false);
+  }
+  private void doTest(boolean checkWarnings) throws Exception {
+    doTest(getFullRelativeTestName(), checkWarnings, false);
+  }
+
+  private String getFullRelativeTestName() {
+    return getFullRelativeTestName(".xml");
+  }
+
+  private String getFullRelativeTestName(String ext) {
+    return BASE_PATH + getTestName(false) + ext;
+  }
+
+  @NotNull
+  @Override
+  protected List<HighlightInfo> doHighlighting() {
+    if(myTestJustJaxpValidation) {
+      XmlHighlightVisitor.setDoJaxpTesting(true);
+    }
+
+    final List<HighlightInfo> highlightInfos = super.doHighlighting();
+    if(myTestJustJaxpValidation) {
+      XmlHighlightVisitor.setDoJaxpTesting(false);
+    }
+
+    return highlightInfos;
+  }
+
+  @Override
+  protected boolean forceExternalValidation() {
+    return myTestJustJaxpValidation;
+  }
+
+  public void testclosedTag1() throws Exception { doTest(); }
+  public void testClosedTag2() throws Exception { doTest(); }
+  public void testwrongRootTag1() throws Exception { doTest(); }
+  public void testrootTag1() throws Exception { doTest(); }
+  public void testManyRootTags() throws Exception { doTest(); }
+  public void testCommentBeforeProlog() throws Exception { doTest(); }
+  public void testCommentBeforeProlog_2() throws Exception { doTest(); }
+  //public void testNoRootTag() throws Exception { doTest(); }
+
+  public void testduplicateAttribute() throws Exception { doTest(); }
+
+  public void testduplicateAttribute2() throws Exception {
+    configureByFiles(null, BASE_PATH + getTestName(false) + ".xml", BASE_PATH + getTestName(false) + ".xsd");
+
+    final String url = "http://www.foo.org/schema";
+    final String url2 = "http://www.bar.org/foo";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, getTestName(false) + ".xsd", getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily(url2, getTestName(false) + ".xsd", getTestRootDisposable());
+    try {
+      final Collection<HighlightInfo> infoCollection = doDoTest(true, false, true);
+      final TextRange startTagNameRange = XmlTagUtil.getStartTagNameElement(((XmlFile)myFile).getDocument().getRootTag()).getTextRange();
+
+      HighlightInfo infoAtTagName = null;
+
+      for(HighlightInfo info:infoCollection) {
+        if (info.startOffset == startTagNameRange.getStartOffset() && info.endOffset == startTagNameRange.getEndOffset()) {
+          if (info.description.equals("Attribute \"foo\" bound to namespace \"http://www.w3.org/2000/xmlns/\" was already specified for element \"root\".")) {
+            infoAtTagName = info;
+            break;
+          }
+        }
+      }
+
+      assertNotNull( infoAtTagName );
+    }
+    finally {
+    }
+  }
+
+  // TODO: external validator should not be launched due to error detected after general highlighting pass!
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testDuplicateIdAttribute() throws Exception { doTest(); }
+  public void testDuplicateIdAttribute2() throws Exception {
+    doTest();
+  }
+  public void testDuplicateNameAttribute() throws Exception {
+    doSchemaTestWithManyFilesFromSeparateDir(
+      new String[][] {
+        {"http://www.springframework.org/schema/beans/spring-beans-2.5.xsd", "spring-beans-2.5.xsd"},
+      },
+      null
+    );
+  }
+
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testInvalidIdRefAttribute() throws Exception { doTest(); }
+  public void testEntityRefWithNoDtd() throws Exception { doTest(); }
+  public void testNoSpaceBeforeAttrAndNoCdataEnd() throws Exception { doTest(); }
+
+  // TODO: external validator should not be lauched due to error detected after general highlighting pass!
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testEntityRefWithEmptyDtd() throws Exception { doTest(); }
+  public void testEmptyNSRef() throws Exception { doTest(); }
+
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testDoctypeWithoutSchema() throws Exception {
+    final String baseName = BASE_PATH + getTestName(false);
+
+    configureByFiles(null, getVirtualFile(baseName + ".xml"), getVirtualFile(baseName + ".ent"));
+    doDoTest(true,false);
+    myFile.accept(new XmlRecursiveElementVisitor() {
+      @Override
+      public void visitXmlAttributeValue(XmlAttributeValue value) {
+        final PsiElement[] children = value.getChildren();
+        for (PsiElement child : children) {
+          if (child instanceof XmlEntityRef) {
+            PsiElement psiElement = child.getReferences()[0].resolve();
+            assertNotNull(psiElement);
+            assertEquals(getTestName(false) + ".ent", psiElement.getContainingFile().getVirtualFile().getName());
+            assertTrue(((Navigatable)psiElement).canNavigate());
+          }
+        }
+      }
+    });
+  }
+
+  public void testNavigateToDeclDefinedWithEntity() throws Exception {
+    final String baseName = BASE_PATH + getTestName(false);
+
+    configureByFiles(null, getVirtualFile(baseName + ".xml"), getVirtualFile(baseName + ".dtd"), getVirtualFile(baseName + ".ent"));
+    doDoTest(true,false);
+    final List<PsiReference> refs = new ArrayList<PsiReference>();
+    myFile.accept(new XmlRecursiveElementVisitor() {
+      @Override
+      public void visitXmlAttribute(final XmlAttribute attribute) {
+        refs.add(attribute.getReference());
+      }
+
+      @Override
+      public void visitXmlTag(final XmlTag tag) {
+        refs.add(tag.getReference());
+        super.visitXmlTag(tag);
+      }
+    });
+
+    assertEquals(2, refs.size());
+
+    for(PsiReference ref:refs) {
+      final PsiElement element = ref.resolve();
+      // In order to navigate to entity defined things we need correctly setup navigation element among other things
+      assertTrue(element instanceof PsiNamedElement);
+      assertSame(element.getNavigationElement(), element);
+      assertTrue(!element.isPhysical());
+
+      final PsiElement original = element.getOriginalElement();
+      // TODO: fix XmlAttlistDecl to return proper original element
+      if (original != element && !(element instanceof XmlAttlistDecl)) {
+        assertNotNull(original);
+        assertTrue(original.isPhysical());
+      }
+    }
+  }
+
+  public void testDoctypeWithoutSchema2() throws Exception {
+    final String baseName = BASE_PATH + "DoctypeWithoutSchema";
+
+    configureByFiles(null, getVirtualFile(baseName + ".xml"), getVirtualFile(baseName + ".ent"));
+    doDoTest(true, false);
+  }
+
+  public void testComplexSchemaValidation8() throws IOException {
+    final String testName = getTestName(false);
+    String location = testName +".xsd";
+    String location2 = testName +"_2.xsd";
+    String url = "http://drools.org/rules";
+    String url2 = "http://drools.org/semantics/groovy";
+
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily(url2, location2, getTestRootDisposable());
+    final String basePath = BASE_PATH + testName;
+    configureByFiles(null, getVirtualFile(basePath + ".xml"), getVirtualFile(basePath + ".xsd"), getVirtualFile(basePath + "_2.xsd"));
+    doDoTest(true,false);
+
+  }
+
+  public void testComplexSchemaValidation9() throws IOException {
+    final String basePath = BASE_PATH + getTestName(false);
+
+    configureByFiles(null, getVirtualFile(basePath + ".xml" ), getVirtualFile(basePath + ".xsd" ));
+    doDoTest(true,false);
+  }
+
+  public void testComplexSchemaValidation10() throws IOException {
+    final String testName = getTestName(false);
+
+    final String basePath = BASE_PATH + testName;
+    configureByFiles(null, getVirtualFile(basePath + ".xsd" ), getVirtualFile(basePath + "_2.xsd" ));
+    doDoTest(true,false);
+
+    final List<PsiReference> refs = new ArrayList<PsiReference>(2);
+
+    myFile.acceptChildren(new XmlRecursiveElementVisitor() {
+
+      @Override public void visitXmlTag(XmlTag tag) {
+        super.visitXmlTag(tag);
+
+        addRefsInPresent(tag, "base", refs);
+        if ("group".equals(tag.getLocalName())) {
+          addRefsInPresent(tag, "ref", refs);
+        }
+      }
+    });
+
+    assertEquals(2, refs.size());
+    PsiElement psiElement = refs.get(0).resolve();
+    assertNotNull(psiElement);
+    assertEquals(getTestName(false) + "_2.xsd",psiElement.getContainingFile().getName());
+
+    psiElement = refs.get(1).resolve();
+    assertNotNull(psiElement);
+    assertEquals(getTestName(false) + "_2.xsd",psiElement.getContainingFile().getName());
+  }
+
+  private static void addRefsInPresent(final XmlTag tag, final String name, final List<PsiReference> refs) {
+    if (tag.getAttributeValue(name) != null) {
+      ContainerUtil.addAll(refs, tag.getAttribute(name, null).getValueElement().getReferences());
+    }
+  }
+
+  public void testComplexSchemaValidation11() throws Exception {
+    final String testName = getTestName(false);
+    doTestWithLocations(
+      new String[][] {
+        {"http://www.springframework.org/schema/beans",testName + ".xsd"},
+        {"http://www.springframework.org/schema/util",testName + "_2.xsd"}
+      },
+      "xml"
+    );
+  }
+
+  private void doTestWithLocations(@Nullable String[][] resources, String ext) throws Exception {
+    try {
+      doConfigureWithLocations(resources, ext);
+      doDoTest(true,false);
+    } finally {
+      unregisterResources(resources);
+    }
+  }
+
+  private static void unregisterResources(final String[][] resources) {
+    if (resources == null) return;
+  }
+
+  private void doConfigureWithLocations(final String[][] resources, final String ext) throws Exception {
+
+    String[] testNames = new String[(resources != null? resources.length:0) + 1];
+    testNames[0] = BASE_PATH + getTestName(false) + "." + ext;
+
+    if (resources != null) {
+      int curResource = 0;
+      for(String[] resource:resources) {
+        ExternalResourceManagerImpl
+            .registerResourceTemporarily(resource[0], getTestDataPath() + BASE_PATH + resource[1], getTestRootDisposable());
+        testNames[++curResource] = BASE_PATH + resource[1];
+      }
+    }
+
+    configureByFiles(
+      null,
+      testNames
+    );
+  }
+
+  public void testComplexSchemaValidation12() throws Exception {
+    final String basePath = BASE_PATH + getTestName(false);
+    configureByFile(
+      basePath + ".xsd",
+      null
+    );
+    doDoTest(true,false);
+  }
+
+  public void testInvalidIdRefInXsl() throws Exception {
+    doTest(getFullRelativeTestName(), false, false);
+  }
+
+  public void testXercesMessageOnPI() throws Exception {
+    try {
+      myTestJustJaxpValidation = true;
+      doTest();
+    } finally {
+      myTestJustJaxpValidation = false;
+    }
+  }
+  public void testXercesMessageOnDtd() throws Exception { doTest(); }
+  public void testXercesMessagesBinding5() throws Exception {
+    try {
+      myTestJustJaxpValidation = true;
+      doTest();
+    } finally {
+      myTestJustJaxpValidation = false;
+    }
+  }
+
+  public void testXercesCachingProblem() throws Exception {
+    final String[][] resources = {{"http://www.test.com/test", getTestName(false) + ".dtd"}};
+    doConfigureWithLocations(resources, "xml");
+
+    try {
+      doDoTest(true,true);
+      ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        public void run() {
+          myEditor.getDocument().insertString(myEditor.getDocument().getCharsSequence().toString().indexOf("?>") + 2, "\n");
+        }
+      });
+
+      doDoTest(true,true);
+    }
+    finally {
+      unregisterResources(resources);
+    }
+  }
+
+  public void testComplexSchemaValidation13() throws Exception {
+    doTestWithLocations(new String[][] { {"urn:test", getTestName(false) + "_2.xsd"} }, "xsd");
+  }
+
+  public void testComplexSchemaValidation14() throws Exception {
+    doTestWithLocations(new String[][] { {"parent", getTestName(false) + ".xsd"} }, "xml");
+  }
+
+  public void testComplexSchemaValidation14_2() throws Exception {
+    doTest(getFullRelativeTestName(".xsd"), true, false);
+  }
+
+  public void testComplexSchemaValidation15() throws Exception {
+    doTestWithLocations(
+      new String[][] {
+        {"http://www.linkedin.com/lispring", getTestName(false) + ".xsd"},
+        {"http://www.springframework.org/schema/beans", getTestName(false) + "_2.xsd"}
+      },
+      "xml"
+    );
+  }
+
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testComplexSchemaValidation16() throws Exception {
+    doTestWithLocations(
+      new String[][] {
+        {"http://www.inversoft.com/schemas/savant-2.0/project", getTestName(false) + ".xsd"},
+        {"http://www.inversoft.com/schemas/savant-2.0/base", getTestName(false) + "_2.xsd"}
+      },
+      "xml"
+    );
+  }
+
+  public void testComplexSchemaValidation17() throws Exception {
+    doTestWithLocations(
+      new String[][] {
+        {"urn:test", getTestName(false) + ".xsd"}
+      },
+      "xml"
+    );
+  }
+
+  public void testSchemaReferencesValidation() throws Exception {
+    doTest(getFullRelativeTestName(".xsd"), false, false);
+  }
+
+  public void testXhtmlSchemaHighlighting() throws Exception {
+    disableHtmlSupport();
+    try {
+      configureByFiles(null, getVirtualFile(BASE_PATH + "xhtml1-transitional.xsd"), getVirtualFile(BASE_PATH + "xhtml-special.ent"),
+                       getVirtualFile(BASE_PATH + "xhtml-symbol.ent"), getVirtualFile(BASE_PATH + "xhtml-lat1.ent"));
+      doDoTest(true,false);
+    }
+    finally {
+      enableHtmlSupport();
+    }
+  }
+
+  public void testSchemaValidation() throws Exception {
+    doTest();
+  }
+
+  public void testSchemaValidation2() throws Exception {
+    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false)+".xml"), getVirtualFile(BASE_PATH + getTestName(false)+".xsd"));
+    doDoTest(true,false);
+
+    final XmlTag rootTag = ((XmlFile)myFile).getDocument().getRootTag();
+    final XmlAttributeValue valueElement = rootTag.getAttribute("noNamespaceSchemaLocation", XmlUtil.XML_SCHEMA_INSTANCE_URI).getValueElement();
+    final PsiReference[] references = valueElement.getReferences();
+
+    final String expectedFileName = getTestName(false) + ".xsd";
+
+    assertEquals(1,references.length);
+    final PsiElement schema = references[0].resolve();
+    assertNotNull(schema);
+
+    assertEquals(expectedFileName,schema.getContainingFile().getName());
+
+    final PsiReference referenceAt = myFile.findReferenceAt(myEditor.getCaretModel().getOffset());
+    assertNotNull(referenceAt);
+    final PsiElement psiElement = referenceAt.resolve();
+    assertTrue(psiElement instanceof XmlTag &&
+               "complexType".equals(((XmlTag)psiElement).getLocalName()) &&
+               "Y".equals(((XmlTag)psiElement).getAttributeValue("name"))
+               );
+
+    assertEquals(expectedFileName,psiElement.getContainingFile().getName());
+  }
+
+  public void testSchemaValidation3() throws Exception {
+    String location = getTestName(false)+".xsd";
+    String location2 = getTestName(false)+"_2.xsd";
+    String url = "parent";
+    String url2 = "child";
+
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily(url2, location2, getTestRootDisposable());
+
+    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false) + ".xml"), getVirtualFile(BASE_PATH + location),
+                     getVirtualFile(BASE_PATH + location2));
+    doDoTest(true,false);
+
+  }
+
+  public void testSchemaValidation4() throws Exception {
+    String schemaLocation = getTestName(false)+".xsd";
+
+    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false)+".xml"), getVirtualFile(BASE_PATH + schemaLocation));
+
+    ExternalResourceManagerImpl.registerResourceTemporarily(schemaLocation, schemaLocation, getTestRootDisposable());
+    doDoTest(true, false);
+  }
+
+  public void testSchemaValidation5() throws Exception {
+    String schemaLocation = getTestName(false)+".xsd";
+
+    configureByFile(BASE_PATH + schemaLocation);
+    doDoTest(true,false);
+    final List<PsiReference> myTypeOrElementRefs = new ArrayList<PsiReference>(1);
+    final List<XmlTag> myTypesAndElementDecls = new ArrayList<XmlTag>(1);
+
+    myFile.accept(new XmlRecursiveElementVisitor() {
+      @Override public void visitXmlAttributeValue(XmlAttributeValue value) {
+        final PsiElement parent = value.getParent();
+        if (!(parent instanceof XmlAttribute)) return;
+        final String name = ((XmlAttribute)parent).getName();
+        if ("type".equals(name) || "base".equals(name) || "ref".equals(name)) {
+          myTypeOrElementRefs.add(value.getReferences()[0]);
+        }
+      }
+
+      @Override public void visitXmlTag(XmlTag tag) {
+        super.visitXmlTag(tag);
+        final String localName = tag.getLocalName();
+        if ("complexType".equals(localName) || "simpleType".equals(localName) || "element".equals(localName)) {
+          if (tag.getAttributeValue("name") != null) myTypesAndElementDecls.add(tag);
+        }
+      }
+    });
+
+    assertEquals(9,myTypesAndElementDecls.size());
+    assertEquals(5,myTypeOrElementRefs.size());
+    for(XmlTag t:myTypesAndElementDecls) {
+      final XmlAttribute attribute = t.getAttribute("name", null);
+      final XmlAttributeValue valueElement = attribute.getValueElement();
+      final PsiReference nameReference = valueElement.getReferences()[0];
+      ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        public void run() {
+          nameReference.handleElementRename("zzz");
+        }
+      });
+    }
+
+    for(PsiReference ref:myTypeOrElementRefs)  {
+      assertNull(ref.resolve());
+    }
+  }
+
+  public void testExternalValidatorOnValidXmlWithNamespacesNotSetup() throws Exception {
+    final ExternalResourceManagerEx instanceEx = ExternalResourceManagerEx.getInstanceEx();
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        instanceEx.addIgnoredResource("http://xml.apache.org/axis/wsdd2/");
+        instanceEx.addIgnoredResource("http://xml.apache.org/axis/wsdd2/providers/java");
+        instanceEx.addIgnoredResource("http://soapinterop.org/xsd2");
+      }
+    });
+
+    doTest(getFullRelativeTestName(".xml"), true, false);
+  }
+
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testExternalValidatorOnValidXmlWithNamespacesNotSetup2() throws Exception {
+    final ExternalResourceManagerEx instanceEx = ExternalResourceManagerEx.getInstanceEx();
+    try {
+      ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        public void run() {
+          instanceEx.addIgnoredResource("");
+        }
+      });
+
+      doTest(getFullRelativeTestName(".xml"), true, false);
+    } finally {
+      ApplicationManager.getApplication().runWriteAction(new Runnable() {
+        public void run() {
+          instanceEx.removeIgnoredResource("");
+        }
+      });
+    }
+  }
+
+  public void testXercesMessagesBinding() throws Exception {
+    doTest(getFullRelativeTestName(".xml"), true, false);
+  }
+
+  public void testXercesMessagesBinding3() throws Exception {
+    doTest(getFullRelativeTestName(".xml"), true, false);
+  }
+
+  public void testXercesMessagesBinding4() throws Exception {
+    String url = "antlib:org.apache.maven.artifact.ant";
+
+    enableInspectionTool(new AntResolveInspection());
+    doTestWithLocations(new String[][] { {url, getTestName(false) + ".xsd"} }, "xml");
+  }
+
+  public void testWrongRegExpInSchema() throws Exception {
+    doTest(getFullRelativeTestName(".xsd"), true, false);
+    doTest(getFullRelativeTestName("2.xsd"), true, false);
+  }
+
+  public void testXercesMessagesBinding2() throws Exception {
+    final String url = getTestName(false) + ".xsd";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, url, getTestRootDisposable());
+
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(getFullRelativeTestName(".xml")),
+        getVirtualFile(getFullRelativeTestName(".xsd"))
+      },
+      true,
+      false
+    );
+
+    final String url2 = getTestName(false) + "_2.xsd";
+
+    ExternalResourceManagerImpl.registerResourceTemporarily(url2, url2, getTestRootDisposable());
+
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(getFullRelativeTestName("_2.xml")),
+        getVirtualFile(getFullRelativeTestName("_2.xsd"))
+      },
+      true,
+      false
+    );
+
+  }
+
+  public void testValidationOfDtdFile() throws Exception {
+    doTest(getFullRelativeTestName(".dtd"), false, false);
+  }
+
+  public void testXHtmlValidation() throws Exception {
+    doTest();
+  }
+
+  public void testXHtmlValidation2() throws Exception {
+    disableHtmlSupport();
+    try {
+      doTest();
+    }
+    finally {
+      enableHtmlSupport();
+    }
+  }
+
+  public void testXHtmlValidation3() throws Exception {
+    doManyFilesFromSeparateDirTest(
+      "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd",
+      "xhtml-basic11.dtd",
+      new Runnable() {
+        @Override
+        public void run() {
+          final List<XmlAttribute> attrs = new ArrayList<XmlAttribute>();
+
+          myFile.acceptChildren(new XmlRecursiveElementVisitor() {
+            @Override public void visitXmlAttribute(final XmlAttribute attribute) {
+              if (attribute.getDescriptor() != null) attrs.add(attribute);
+            }
+          });
+
+          assertEquals(8, attrs.size());
+          for(XmlAttribute a:attrs) {
+            final PsiElement element = a.getDescriptor().getDeclaration();
+            assertTrue(((Navigatable)element).canNavigate());
+          }
+        }
+      }
+    );
+  }
+
+  public void testReferencingTargetNamespace() throws Exception {
+    doTest();
+  }
+
+  public void testWebApp() throws Exception {
+    doTest();
+  }
+
+  public void testEnumeratedAttributesValidation() throws Exception {
+    doTest(BASE_PATH + getTestName(false) + ".xsd", false, false);
+  }
+
+  public void testStackOverflow() throws Exception {
+    String location = "relaxng.xsd";
+    String url = "http://relaxng.org/ns/structure/fake/1.0";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    doTest(new VirtualFile[]{getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + location)}, false, false);
+  }
+
+  public void testStackOverflow2() throws Exception {
+    final String url = "urn:aaa";
+    final String location = getTestName(false) + ".xsd";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    doTest(getFullRelativeTestName(".xsd"), false, false);
+
+  }
+
+  public void testComplexSchemaValidation() throws Exception {
+    disableHtmlSupport();
+    try {
+      doTest(getFullRelativeTestName(), false, false);
+    }
+    finally {
+      enableHtmlSupport();
+    }
+  }
+
+  public void testComplexDtdValidation() throws Exception {
+    String location = "Tapestry_3_0.dtd";
+    String url = "http://jakarta.apache.org/tapestry/dtd/Tapestry_3_0.dtd";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+
+    myTestJustJaxpValidation = true;
+    doTest(new VirtualFile[] { getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + location) }, false,false);
+    myTestJustJaxpValidation = false;
+  }
+
+  public void testComplexDtdValidation2() throws Exception {
+    String location = getTestName(false)+".dtd";
+    ExternalResourceManagerImpl.registerResourceTemporarily(location, location, getTestRootDisposable());
+
+    myTestJustJaxpValidation = true;
+    doTest(new VirtualFile[] { getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + location) }, false,false);
+    myTestJustJaxpValidation = false;
+  }
+
+  public void testComplexSchemaValidation2() throws Exception {
+    doTest(new VirtualFile[] { getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + "jdo_2_0.xsd") }, false,false);
+  }
+
+  public void testComplexSchemaValidation3() throws Exception {
+    List<VirtualFile> files = new ArrayList<VirtualFile>();
+    files.add(getVirtualFile(getFullRelativeTestName()));
+
+    final VirtualFile virtualFile = getVirtualFile(BASE_PATH + "ComplexSchemaValidation3Schemas");
+    ContainerUtil.addAll(files, virtualFile.getChildren());
+
+    doTest(VfsUtil.toVirtualFileArray(files), true, false);
+  }
+
+  public void testComplexSchemaValidation4() throws Exception {
+    String[][] urls = {{"http://www.unece.org/etrades/unedocs/repository/codelists/xml/CountryCode.xsd"},
+      {"http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationServiceTypes"},
+      {"http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationContainer"},
+      {"http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration"}};
+
+    doSchemaTestWithManyFilesFromSeparateDir(urls, null);
+  }
+
+  public void testComplexSchemaValidation5() throws Exception {
+    String location = getTestName(false)+".xsd";
+    String url = "http://www.etas.com/TELEGY/Test";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    doTest(new VirtualFile[] { getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + location) }, false,false);
+
+    final XmlTag[] subTags = ((XmlFile)myFile).getDocument().getRootTag().getSubTags();
+
+    for(XmlTag t:subTags) {
+      final PsiReference reference = t.getReference();
+      assertNotNull(reference);
+      final PsiElement psiElement = reference.resolve();
+      assertTrue(psiElement instanceof XmlTag && "xsd:element".equals(((XmlTag)psiElement).getName()));
+    }
+
+  }
+
+  @Override
+  protected boolean doExternalValidation() {
+    return !methodOfTestHasAnnotation(getClass(), getTestName(false), HighlightingFlag.SkipExternalValidation) && super.doExternalValidation();
+  }
+
+  public void testComplexSchemaValidation6() throws Exception {
+    String location = getTestName(false)+".xsd";
+    String url = "http://abcde/pg.html";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    doTest(new VirtualFile[]{getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + location)}, true, false);
+  }
+
+  public void testComplexSchemaValidation7() throws Exception {
+    String[][] urlLocationPairs = {
+      {"http://schemas.xmlsoap.org/wsdl/","wsdl.xsd"},
+      {"http://schemas.xmlsoap.org/wsdl/soap/","soap.xsd"},
+      {"http://schemas.xmlsoap.org/soap/encoding/","encoding.xsd"},
+      {"http://schemas.xmlsoap.org/wsdl/mime/","mime.xsd"},
+      {"http://schemas.xmlsoap.org/wsdl/http/","http.xsd"}
+    };
+
+
+    doSchemaTestWithManyFilesFromSeparateDir(
+      urlLocationPairs,
+      new Processor<List<VirtualFile>>() {
+        @Override
+        public boolean process(final List<VirtualFile> files) {
+          try {
+            files.set(0, getVirtualFile(BASE_PATH + getTestName(false) + "_2.xml"));
+            doTest(VfsUtil.toVirtualFileArray(files), true, false);
+            return true;
+          }
+          catch (Exception e) {
+            throw new RuntimeException(e);
+          }
+        }
+      }
+    );
+  }
+
+  public void testComplexSchemaValidation7_() throws Exception {
+    doTest(
+      new VirtualFile[]{
+        getVirtualFile(getFullRelativeTestName()),
+        getVirtualFile(getFullRelativeTestName(".xsd"))
+      },
+      false,
+      false
+    );
+  }
+
+  public void testWsdlValidation() throws Exception {
+    doTest(getFullRelativeTestName(".wsdl"), false, false);
+  }
+
+  public void testErrorInDtd() throws Exception {
+    String location = "def_xslt.dtd";
+    String url = "http://www.w3.org/1999/XSL/Transform";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    doTest(new VirtualFile[]{getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + location)}, false, false);
+  }
+
+  public void testMavenValidation() throws Exception {
+    doTest(getFullRelativeTestName(), false, false);
+  }
+
+  public void testResolveEntityUrl() throws Throwable {
+    doTest(new VirtualFile[] {
+      getVirtualFile(getFullRelativeTestName()),
+      getVirtualFile(BASE_PATH + "entities.dtd")
+    }, false, false);
+  }
+
+  public void testXsiSchemaLocation() throws Exception {
+    doTest();
+    doTest(getFullRelativeTestName("_2.xml"), false, false);
+  }
+
+  public void testXmlPsi() throws Exception {
+    configureByFile(BASE_PATH + getTestName(false) + ".xml");
+
+    final XmlTag root = ((XmlFile)myFile).getDocument().getRootTag();
+    final XmlTag tag1 = root.getSubTags()[0];
+    assert tag1.getLocalName().equals("foo");
+
+    assertEquals("xxx" ,tag1.getAttributeValue("xxx", "abc"));
+
+    final XmlTag tag2 = root.getSubTags()[0].getSubTags()[0];
+    assert tag2.getLocalName().equals("bar");
+
+    assertEquals("yyy", tag2.getAttributeValue("yyy", "abc"));
+    assertEquals("zzz", tag2.getAttributeValue("zzz"));
+    assertNull(tag2.getAttributeValue("zzz", "unknown"));
+    assertNull(tag2.getAttributeValue("zzz", "abc"));
+
+    final XmlTag tag3 = root.getSubTags()[0].getSubTags()[1];
+    assert tag3.getLocalName().equals("bar2");
+    assertEquals("zzz",tag3.getAttributeValue("zzz", "def"));
+  }
+
+  public void testXsiSchemaLocation2() throws Exception {
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(getFullRelativeTestName()),
+        getVirtualFile(BASE_PATH + getTestName(false) + "_1.xsd"),
+        getVirtualFile(BASE_PATH + getTestName(false) + "_2.xsd"),
+        getVirtualFile(BASE_PATH + getTestName(false) + "_3.xsd"),
+      },
+      false,
+      false
+    );
+
+    XmlTag rootTag = ((XmlFile)myFile).getDocument().getRootTag();
+    checkOneTagForSchemaAttribute(rootTag, "xmlns:test2", getTestName(false) + "_2.xsd");
+
+    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false) + "_2.xsd"), getVirtualFile(BASE_PATH + getTestName(false) + "_3.xsd"));
+
+    rootTag = ((XmlFile)myFile).getDocument().getRootTag();
+    final List<XmlTag> tags = new ArrayList<XmlTag>();
+
+    XmlUtil.processXmlElements(
+      rootTag,
+      new PsiElementProcessor() {
+        @Override
+        public boolean execute(@NotNull final PsiElement element) {
+          if (element instanceof XmlTag &&
+              (((XmlTag)element).getName().equals("xs:element") ||
+               ((XmlTag)element).getName().equals("xs:attribute") ||
+               ((XmlTag)element).getName().equals("xs:restriction") ||
+               ((XmlTag)element).getName().equals("xs:group") ||
+               ((XmlTag)element).getName().equals("xs:attributeGroup")
+              ) &&
+                ( ((XmlTag)element).getAttributeValue("type") != null ||
+                  ((XmlTag)element).getAttributeValue("ref") != null ||
+                  ((XmlTag)element).getAttributeValue("base") != null
+                )
+             ) {
+            tags.add((XmlTag)element);
+          }
+          return true;
+        }
+      },
+      true
+    );
+
+    assertEquals("Should be adequate number of tags", 11, tags.size());
+
+    final String resolveFileName = getTestName(false) + "_3.xsd";
+    checkOneTagForSchemaAttribute(tags.get(1), "type", resolveFileName);
+    checkOneTagForSchemaAttribute(tags.get(0), "ref", resolveFileName);
+    checkOneTagForSchemaAttribute(tags.get(3), "type", resolveFileName);
+    checkOneTagForSchemaAttribute(tags.get(4), "base", resolveFileName);
+    final String schemaFile = "XMLSchema.xsd";
+    checkOneTagForSchemaAttribute(tags.get(5), "base", schemaFile);
+
+    checkOneTagForSchemaAttribute(rootTag, "xmlns:xs", schemaFile);
+    checkOneTagForSchemaAttribute(tags.get(6), "ref", resolveFileName);
+    checkOneTagForSchemaAttribute(tags.get(7), "ref", resolveFileName);
+    checkOneTagForSchemaAttribute(rootTag, "xmlns:test2", getTestName(false) + "_2.xsd");
+
+    checkOneTagForSchemaAttribute(tags.get(8), "type", schemaFile);
+    checkOneTagForSchemaAttribute(tags.get(9), "ref", schemaFile);
+    checkOneTagForSchemaAttribute(tags.get(10), "ref", resolveFileName);
+  }
+
+  private static void checkOneTagForSchemaAttribute(XmlTag tag,String schemaAttrName, String resolveFileName) {
+    String attributeValue = tag.getAttributeValue(schemaAttrName);
+
+    if (attributeValue != null) {
+      XmlAttribute attribute = tag.getAttribute(schemaAttrName, null);
+      PsiReference[] references = attribute.getValueElement().getReferences();
+      assertTrue(
+        "There should resolvable reference to " + schemaAttrName,
+        references.length > 0
+      );
+
+      for (PsiReference reference : references) {
+        PsiElement element = reference.resolve();
+        if (element != null && element.getContainingFile().getName().equals(resolveFileName)) {
+          return;
+        }
+      }
+      assertTrue("There should resolvable reference to "+ schemaAttrName + ", 2", true);              
+    }
+  }
+
+  @Override
+  protected LocalInspectionTool[] configureLocalInspectionTools() {
+    return new LocalInspectionTool[]{
+      new RequiredAttributesInspection(),
+      new XmlDuplicatedIdInspection(),
+      new CheckDtdReferencesInspection(),
+      new XmlUnboundNsPrefixInspection()
+    };
+  }
+
+  @HighlightingFlags({HighlightingFlag.SkipExternalValidation})
+  public void testXsltValidation() throws Exception {
+    doTest(getFullRelativeTestName(".xsl"), true, false);
+    doTest(getFullRelativeTestName("2.xsl"), true, false);
+  }
+
+  public void testXsltValidation3() throws Exception {
+    doTest(getFullRelativeTestName(".xsl"), true, false);
+  }
+
+  public void testXsiSchemaLocation3() throws Exception {
+
+    configureByFile(getFullRelativeTestName(".xsd"), null);
+
+    doDoTest(true,false);
+
+    final List<XmlTag> tags = new ArrayList<XmlTag>();
+
+    XmlUtil.processXmlElements(
+      ((XmlFile)myFile).getDocument(),
+      new PsiElementProcessor() {
+        @Override
+        public boolean execute(@NotNull final PsiElement element) {
+          if (element instanceof XmlTag &&
+              ((XmlTag)element).getName().equals("xs:include")
+             ) {
+            tags.add((XmlTag)element);
+          }
+          return true;
+        }
+      },
+      true
+    );
+
+    assertEquals("Should be three tags", 3, tags.size());
+    String location = "xslt-1_0.xsd";
+    checkOneTagForSchemaAttribute(tags.get(2),"schemaLocation",location);
+  }
+
+  public void testResolvingEntitiesInDtd() throws Exception {
+    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false)+".xml"), getVirtualFile(BASE_PATH + getTestName(false) + "/RatingandServiceSelectionRequest.dtd"),
+                     getVirtualFile(BASE_PATH + getTestName(false) + "/XpciInterchange.dtd"), getVirtualFile(BASE_PATH + getTestName(false) + "/Xpcivocabulary.dtd"));
+    doDoTest(true,false);
+  }
+
+  // TODO: external validator should not be lauched due to error detected after general highlighting pass!
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testEntityHighlighting() throws Exception {
+    doTest();
+    final XmlTag rootTag = ((XmlFile)myFile).getDocument().getRootTag();
+    final List<XmlEntityRef> refs = new ArrayList<XmlEntityRef>();
+
+    XmlUtil.processXmlElements(
+      rootTag,
+      new PsiElementProcessor() {
+        @Override
+        public boolean execute(@NotNull final PsiElement element) {
+          if (element instanceof XmlEntityRef) {
+            refs.add((XmlEntityRef)element);
+          }
+          return true;
+        }
+      },
+      true
+    );
+
+    assertEquals("Should be 2 entity refs",2,refs.size());
+
+    PsiReference[] entityRefs = refs.get(0).getReferences();
+    assertTrue(entityRefs.length == 1 &&
+               entityRefs[0].resolve() == null
+              );
+    entityRefs = refs.get(1).getReferences();
+    assertTrue(entityRefs.length == 1 &&
+               entityRefs[0].resolve() != null
+              );
+
+    doTest(getFullRelativeTestName("2.xml"), false, false);
+  }
+
+  public void testEntityRefBadFormat() throws Exception {
+    doTest();
+  }
+
+  public void testIgnoredNamespaceHighlighting() throws Exception {
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        ExternalResourceManagerEx.getInstanceEx().addIgnoredResource("http://ignored/uri");
+      }
+    });
+
+    doTest();
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        ExternalResourceManagerEx.getInstanceEx().removeIgnoredResource("http://ignored/uri");
+      }
+    });
+  }
+
+  public void testNonEnumeratedValuesHighlighting() throws Exception {
+    final String url = "http://www.w3.org/1999/XSL/Format";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, "fop.xsd", getTestRootDisposable());
+    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false) + ".xml"), getVirtualFile(BASE_PATH + "fop.xsd"));
+    doDoTest(true, false);
+  }
+
+  public void testEditorHighlighting() throws Exception {
+    //                       10
+    //             0123456789012
+    String text = "<html></html>";
+    EditorHighlighter xmlHighlighter = XmlHighlighterFactory.createXMLHighlighter(EditorColorsManager.getInstance().getGlobalScheme());
+    xmlHighlighter.setText(text);
+    HighlighterIterator iterator = xmlHighlighter.createIterator(1);
+    assertSame("Xml tag name", iterator.getTokenType(), XmlTokenType.XML_TAG_NAME);
+    iterator = xmlHighlighter.createIterator(8);
+    assertSame("Xml tag name at end of tag", iterator.getTokenType(), XmlTokenType.XML_TAG_NAME);
+
+    //               10        20         30
+    //      0123456789012345678901234567890
+    text = "<a:xxx /> <a:xxx attr = \"1111\"/>";
+    xmlHighlighter.setText(text);
+
+    iterator = xmlHighlighter.createIterator(6);
+    assertEquals(XmlTokenType.TAG_WHITE_SPACE, iterator.getTokenType());
+
+    iterator = xmlHighlighter.createIterator(21);
+    assertEquals(XmlTokenType.TAG_WHITE_SPACE, iterator.getTokenType());
+
+    iterator = xmlHighlighter.createIterator(23);
+    assertEquals(XmlTokenType.TAG_WHITE_SPACE, iterator.getTokenType());
+
+    iterator = xmlHighlighter.createIterator(9);
+    assertEquals(XmlTokenType.XML_REAL_WHITE_SPACE, iterator.getTokenType());
+
+    //                10        20        30        40          50        60
+    //      012345678901234567890123456789012345678901 234567 890123456789012 345678 90
+    text = "<!DOCTYPE schema [ <!ENTITY RelativeURL  \"[^:#/\\?]*(:{0,0}|[#/\\?].*)\">";
+    xmlHighlighter.setText(text);
+    iterator = xmlHighlighter.createIterator(53);
+    assertSame("Xml attribute value", iterator.getTokenType(), XmlTokenType.XML_DATA_CHARACTERS);
+    assertEquals(iterator.getStart(),41);
+    assertEquals(iterator.getEnd(),70);
+
+    //              10        20        30        40          50        60
+    //    012345678901234567890123456789012345678901 234567 890123456789012 345678 90
+    text="<a name='$'/>";
+
+    xmlHighlighter.setText(text);
+    iterator = xmlHighlighter.createIterator(9);
+    assertEquals("$ in attr value",XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN,iterator.getTokenType());
+    iterator = xmlHighlighter.createIterator(10);
+    assertEquals("' after $ in attr value",XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER,iterator.getTokenType());
+
+    //                10         20         30        40           50        60
+    //      0123456789012345678 901 23456789012345678901 2345 67 890123456789012 345678 90
+    text = "<project><jar file=\"${\"> </jar><jar file=\"${}\"/></project> ";
+
+    xmlHighlighter.setText(text);
+    iterator = xmlHighlighter.createIterator(22);
+    assertEquals("${ in attr value",XmlTokenType.XML_ATTRIBUTE_VALUE_END_DELIMITER,iterator.getTokenType());
+
+    //                10
+    //      01234567890123456789
+    text = "<!--&nbsp; &aaa;-->";
+
+    xmlHighlighter.setText(text);
+    iterator = xmlHighlighter.createIterator(5);
+    assertEquals(
+      "char entity in comment",
+      XmlTokenType.XML_COMMENT_CHARACTERS,
+      iterator.getTokenType()
+    );
+
+    iterator = xmlHighlighter.createIterator(12);
+    assertEquals(
+      "entity ref in comment",
+      XmlTokenType.XML_COMMENT_CHARACTERS,
+      iterator.getTokenType()
+    );
+
+    //                10
+    //      01234567890123456789
+    text = "<!-- -- -->";
+
+    xmlHighlighter.setText(text);
+    iterator = xmlHighlighter.createIterator(5);
+    assertEquals(
+      "double -- in xml comment",
+      XmlTokenType.XML_BAD_CHARACTER,
+      iterator.getTokenType()
+    );
+
+  }
+
+  public void testUsingDtdReference() throws Exception {
+    final String baseName = BASE_PATH + getTestName(false);
+
+    configureByFiles(null, getVirtualFile(baseName + ".xml"), getVirtualFile(baseName + ".dtd"), getVirtualFile(baseName + "2.dtd"));
+    doDoTest(true,false);
+  }
+
+  public void testUnboundNsHighlighting() throws Exception {
+    configureByFile(BASE_PATH + "web-app_2_4.xsd");
+    final String testName = getTestName(false);
+    doTest(BASE_PATH + testName +".xml",true, false);
+
+    doTestWithUnboundNSQuickFix(BASE_PATH + testName + "2");
+//    doTestWithUnboundNSQuickFix(BASE_PATH + testName + "3");
+
+    configureByFiles(null, BASE_PATH + testName +"4.xml", BASE_PATH + testName +"4.dtd");
+    doDoTest(true, false);
+
+    doTestWithUnboundNSQuickFix(BASE_PATH + testName + "5");
+  }
+
+  public void testUnboundNsHighlighting6() throws Exception {
+    configureByFile(BASE_PATH + "web-app_2_4.xsd");
+    doTestWithQuickFix(BASE_PATH + getTestName(false), CREATE_NAMESPACE_DECLARATION_INTENTION_NAME, true);
+  }
+
+  private void doTestWithUnboundNSQuickFix(final String s) throws Exception {
+    doTestWithQuickFix(s, CREATE_NAMESPACE_DECLARATION_INTENTION_NAME, false);
+  }
+
+  private void doTestWithQuickFix(final String s, final String intentionActionName, boolean withInfos) throws Exception {
+    configureByFile(s + ".xml");
+    Collection<HighlightInfo> infos = doDoTest(true, withInfos);
+
+    findAndInvokeIntentionAction(infos, intentionActionName, myEditor, myFile);
+    checkResultByFile(s+"_after.xml");
+  }
+
+  public void testSpecifyXsiSchemaLocationQuickFix() throws Exception {
+    configureByFile(BASE_PATH + "web-app_2_4.xsd");
+    final String testName = getTestName(false);
+    final String actionName = XmlBundle.message("add.xsi.schema.location.for.external.resource");
+    doTestWithQuickFix(BASE_PATH + testName, actionName, true);
+    doTestWithQuickFix(BASE_PATH + testName + "2", actionName, true);
+    doTestWithQuickFix(BASE_PATH + testName + "3", actionName, true);
+  }
+
+  public void testHighlightingWithConditionalSectionsInDtd() throws Exception {
+    final String testName = getTestName(false);
+
+    configureByFiles(null, getVirtualFile(BASE_PATH + testName +".xml"), getVirtualFile(BASE_PATH + testName +".dtd"));
+    doDoTest(true, false);
+
+    configureByFiles(null, getVirtualFile(BASE_PATH + testName +"2.xml"), getVirtualFile(BASE_PATH + testName +".dtd"));
+    doDoTest(true, false);
+  }
+
+  public void testUnresolvedDtdElementReferences() throws Exception {
+    doDtdRefsWithQuickFixTestSequence(BASE_PATH + getTestName(false), "dtd");
+  }
+
+  public void testResolvedDtdElementReferences() throws Exception {
+    configureByFile(BASE_PATH + getTestName(false)+".dtd");
+    doDoTest(true, false);
+
+    final String text = myEditor.getDocument().getText();
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        myEditor.getSelectionModel().setSelection(0, myEditor.getDocument().getTextLength());
+      }
+    });
+
+    AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_COMMENT_BLOCK);
+    action.actionPerformed(new AnActionEvent(null, DataManager.getInstance().getDataContext(), "", action.getTemplatePresentation(),
+                                             ActionManager.getInstance(), 0));
+    assertNotSame(text,myEditor.getDocument().getText());
+    PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
+    Collection<HighlightInfo> infos = doHighlighting();
+    assertEquals(0, infos.size());
+    
+    action.actionPerformed(new AnActionEvent(null, DataManager.getInstance().getDataContext(), "", action.getTemplatePresentation(),
+                                             ActionManager.getInstance(), 0));
+    assertEquals(text,myEditor.getDocument().getText().trim());
+    PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
+    infos = doHighlighting();
+    assertEquals(0, infos.size());
+  }
+
+  // TODO: external validator should not be lauched due to error detected after general highlighting pass!
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testUnresolvedDtdElementReferencesInXml() throws Exception {
+    doDtdRefsWithQuickFixTestSequence(BASE_PATH + getTestName(false), "xml");
+  }
+
+  public void testUnresolvedDtdElementReferencesInXml2() throws Exception {
+    final String s = BASE_PATH + getTestName(false);
+    doDtdEntityRefWithQuickFixTest(s, "xml");
+    doDtdEntityRefWithQuickFixTest(s + "_2", "xml");
+  }
+
+  public void testUnresolvedDtdElementReferencesInXml3() throws Exception {
+    doDtdEntityRefWithQuickFixTest(BASE_PATH + getTestName(false), "xml");
+  }
+
+  public void testUnresolvedDtdEntityReference() throws Exception {
+    final String s = BASE_PATH + getTestName(false);
+    doDtdEntityRefWithQuickFixTest(s, "dtd");
+  }
+
+  private void doDtdEntityRefWithQuickFixTest(final String s, String ext) throws Exception {
+    configureByFile(s + "." + ext);
+    Collection<HighlightInfo> infos = doDoTest(true, false);
+    findAndInvokeIntentionAction(infos, "Create Entity Declaration entity", myEditor, myFile);
+    checkResultByFile(s+"_after" + "." + ext);
+  }
+
+  private void doDtdRefsWithQuickFixTestSequence(final String s, final String extension) throws Exception {
+    configureByFile(s + "." + extension);
+    Collection<HighlightInfo> infos = doDoTest(true, false);
+
+    findAndInvokeIntentionAction(infos, "Create Element Declaration aaa", myEditor, myFile);
+    checkResultByFile(s+"_after." + extension);
+    PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
+    infos = doHighlighting();
+    findAndInvokeIntentionAction(infos, "Create Entity Declaration entity", myEditor, myFile);
+    checkResultByFile(s+"_after2." + extension);
+    PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
+  }
+
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testDocBookHighlighting() throws Exception {
+    doManyFilesFromSeparateDirTest("http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd", "docbookx.dtd", new Runnable() {
+      @Override
+      public void run() {
+        XmlTag rootTag = ((XmlFile)myFile).getDocument().getRootTag();
+        PsiElement psiElement = rootTag.getReferences()[0].resolve();
+        assertTrue(((Navigatable)psiElement).canNavigate());
+      }
+    });
+  }
+
+  public void testDocBookHighlighting2() throws Exception {
+    doManyFilesFromSeparateDirTest("http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd", "docbookx.dtd", null);
+  }
+
+  public void testOasisDocumentHighlighting() throws Exception {
+    doManyFilesFromSeparateDirTest("concept.dtd", "concept.dtd", null);
+  }
+
+  private void doManyFilesFromSeparateDirTest(final String url, final String mainDtdName, @Nullable Runnable additionalTestAction) throws Exception {
+    List<VirtualFile> files = new ArrayList<VirtualFile>();
+    files.add(getVirtualFile(getFullRelativeTestName()));
+
+    final VirtualFile virtualFile = getVirtualFile(BASE_PATH + getTestName(false));
+    ContainerUtil.addAll(files, virtualFile.getChildren());
+
+    ExternalResourceManagerImpl
+        .registerResourceTemporarily(url, UriUtil.findRelativeFile(mainDtdName, virtualFile).getPath(), getTestRootDisposable());
+    doTest(VfsUtil.toVirtualFileArray(files), true, false);
+
+    if (additionalTestAction != null) additionalTestAction.run();
+
+  }
+
+  private void doSchemaTestWithManyFilesFromSeparateDir(final String[][] urls, @Nullable Processor<List<VirtualFile>> additionalTestingProcessor) throws Exception {
+    try {
+      List<VirtualFile> files = new ArrayList<VirtualFile>(6);
+      files.add( getVirtualFile(BASE_PATH + getTestName(false) + ".xml"));
+
+      final Set<VirtualFile> usedFiles = new THashSet<VirtualFile>();
+      final String base = BASE_PATH + getTestName(false) + "Schemas/";
+
+      for(String[] pair:urls) {
+        final String url = pair[0];
+        final String filename = pair.length > 1 ? pair[1]:url.substring(url.lastIndexOf('/')+1) + (url.endsWith(".xsd")?"":".xsd");
+
+        final VirtualFile virtualFile = getVirtualFile(base + filename);
+        usedFiles.add(virtualFile);
+
+        if (url != null) ExternalResourceManagerImpl.registerResourceTemporarily(url, virtualFile.getPath(), getTestRootDisposable());
+        files.add( virtualFile );
+      }
+
+      for(VirtualFile file: LocalFileSystem.getInstance().findFileByPath(getTestDataPath() + base.substring(0, base.length() - 1)).getChildren()) {
+        if (!usedFiles.contains(file)) {
+          files.add(file);
+        }
+      }
+
+      doTest(VfsUtil.toVirtualFileArray(files), true, false);
+
+      if (additionalTestingProcessor != null) additionalTestingProcessor.process(files);
+    }
+    finally {
+      unregisterResources(urls);
+    }
+  }
+
+  enum HighlightingFlag {
+    SkipExternalValidation
+  }
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.METHOD})
+  @interface HighlightingFlags {
+    HighlightingFlag[] value() default {};
+  }
+
+  private static boolean methodOfTestHasAnnotation(final Class testClass, final String testName, final HighlightingFlag flag) {
+    Method method;
+    try {
+      method = testClass.getMethod("test" + testName);
+    } catch (Exception e) {
+      throw new RuntimeException(e);
+    }
+
+    final HighlightingFlags annotation = method.getAnnotation(HighlightingFlags.class);
+    if (annotation != null) {
+      final HighlightingFlag[] testOptions = annotation.value();
+
+      if (testOptions != null) {
+        Arrays.sort(testOptions);
+        return Arrays.binarySearch(testOptions, flag) >= 0;
+      }
+    }
+
+    return false;
+  }
+
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testSchemaUpdate() throws IOException {
+    String location = getTestName(false)+".xsd";
+    String url = "http://example.org/ns/books/";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    configureByFiles(null, getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + location));
+
+    doDoTest(true,false);
+
+    Editor[] allEditors = EditorFactory.getInstance().getAllEditors();
+    final Editor schemaEditor = allEditors[0] == myEditor ? allEditors[1]:allEditors[0];
+    final String text = schemaEditor.getDocument().getText();
+    final String newText = text.replaceAll("xsd","xs");
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        schemaEditor.getDocument().replaceString(0, text.length(), newText);
+      }
+    });
+
+    doDoTest(true, false);
+  }
+
+  public void testXHtmlEditorHighlighting() throws Exception {
+    //                       10
+    //             0123456789012
+    String text = "<html></html>";
+    EditorHighlighter xhtmlHighlighter = HighlighterFactory.createHighlighter(StdFileTypes.XHTML,EditorColorsManager.getInstance().getGlobalScheme(),myProject);
+    xhtmlHighlighter.setText(text);
+    HighlighterIterator iterator = xhtmlHighlighter.createIterator(1);
+    assertSame("Xml tag name", iterator.getTokenType(), XmlTokenType.XML_TAG_NAME);
+    iterator = xhtmlHighlighter.createIterator(8);
+    assertSame("Xml tag name at end of tag", iterator.getTokenType(), XmlTokenType.XML_TAG_NAME);
+
+  }
+
+  public void testSchemaValidation6() throws Exception {
+    String location = getTestName(false)+".xsd";
+    String url = "aaa";
+    ExternalResourceManagerImpl.registerResourceTemporarily(url, location, getTestRootDisposable());
+    configureByFiles(null, getVirtualFile(getFullRelativeTestName()), getVirtualFile(BASE_PATH + location));
+
+    doDoTest(true,false);
+
+  }
+
+  public void testDTDEditorHighlighting() throws Exception {
+    //                       10        20
+    //             012345678901234567890 123456 789
+    String text = "<!ENTITY % Charsets \"CDATA\">";
+    EditorHighlighter dtdHighlighter = HighlighterFactory.createHighlighter(StdFileTypes.DTD,EditorColorsManager.getInstance().getGlobalScheme(),myProject);
+    dtdHighlighter.setText(text);
+    HighlighterIterator iterator = dtdHighlighter.createIterator(3);
+
+    assertSame("Xml entity name", iterator.getTokenType(), XmlTokenType.XML_ENTITY_DECL_START);
+    iterator = dtdHighlighter.createIterator(13);
+    assertSame("Xml name in dtd", iterator.getTokenType(), XmlTokenType.XML_NAME);
+    iterator = dtdHighlighter.createIterator(23);
+    assertSame("Xml attribute value in dtd", iterator.getTokenType(), XmlTokenType.XML_ATTRIBUTE_VALUE_TOKEN);
+
+    //                10        20        30        40
+    //      0123456789012345678901 2345678901234567890123456789
+    text = "<!ELEMENT base EMPTY>\n<!ATTLIST base id ID #IMPLIED>";
+    dtdHighlighter.setText(text);
+    iterator = dtdHighlighter.createIterator(3);
+    assertSame("Xml element name", iterator.getTokenType(), XmlTokenType.XML_ELEMENT_DECL_START);
+    iterator = dtdHighlighter.createIterator(25);
+    assertSame("Xml attr list", iterator.getTokenType(), XmlTokenType.XML_ATTLIST_DECL_START);
+
+    iterator = dtdHighlighter.createIterator(14);
+    assertSame("Xml attr list", iterator.getTokenType(), TokenType.WHITE_SPACE);
+
+    iterator = dtdHighlighter.createIterator(21);
+    assertSame("Xml attr list", iterator.getTokenType(), TokenType.WHITE_SPACE);
+
+    //                10        20        30        40        50        60
+    //      0123456789012345678901234567890123456789012345678901234567890123456789
+    text = "<![%sgml;[<![IGNORE[<![ INCLUDE [<!ENTITY % aaa SYSTEM 'zzz'>]]>]]>]]>";
+
+    dtdHighlighter.setText(text);
+    iterator = dtdHighlighter.createIterator(2);
+    assertEquals("Xml conditional section start",XmlTokenType.XML_CONDITIONAL_SECTION_START,iterator.getTokenType());
+
+    iterator = dtdHighlighter.createIterator(67);
+    assertEquals("Xml conditional section end",XmlTokenType.XML_CONDITIONAL_SECTION_END,iterator.getTokenType());
+
+    iterator = dtdHighlighter.createIterator(5);
+    assertEquals("entity ref in conditional section",XmlTokenType.XML_ENTITY_REF_TOKEN,iterator.getTokenType());
+
+    iterator = dtdHighlighter.createIterator(15);
+    assertEquals("ignore in conditional section",XmlTokenType.XML_CONDITIONAL_IGNORE,iterator.getTokenType());
+
+    iterator = dtdHighlighter.createIterator(27);
+    assertEquals("include in conditional section",XmlTokenType.XML_CONDITIONAL_INCLUDE,iterator.getTokenType());
+
+    iterator = dtdHighlighter.createIterator(9);
+    assertEquals("markup start in conditional section",XmlTokenType.XML_MARKUP_START,iterator.getTokenType());
+
+    iterator = dtdHighlighter.createIterator(33);
+    assertEquals("entity decl start in conditional section",XmlTokenType.XML_ENTITY_DECL_START,iterator.getTokenType());
+
+    //                10        20          30         40        50        60         70
+    //      012345678901234567890123 456789 0 123456789012345678901234567890123456 7890123456789
+    text = "<!ENTITY % ContentType \"CDATA\"\n    -- media type, as per [RFC2045]\n    -- --xxx-->";
+    dtdHighlighter.setText(text);
+    iterator = dtdHighlighter.createIterator(35);
+    assertEquals("Dtd comment start",XmlTokenType.XML_COMMENT_START,iterator.getTokenType());
+    iterator = dtdHighlighter.createIterator(40);
+    assertEquals("Dtd comment content",XmlTokenType.XML_COMMENT_CHARACTERS,iterator.getTokenType());
+    iterator = dtdHighlighter.createIterator(71);
+    assertEquals("Dtd comment end",XmlTokenType.XML_COMMENT_END,iterator.getTokenType());
+    
+    iterator = dtdHighlighter.createIterator(78);
+    assertEquals("Dtd comment content",XmlTokenType.XML_COMMENT_CHARACTERS,iterator.getTokenType());
+  }
+
+  public void testSgmlDTD() throws Exception {
+    doTest(getFullRelativeTestName(".dtd"), true, false);
+  }
+
+  public void testImportProblems() throws Exception {
+    final String testName = getTestName(false);
+    configureByFiles(
+      null,
+      BASE_PATH + testName +".xsd",
+      BASE_PATH +testName +"2.xsd"
+    );
+    doDoTest(true, false, true);
+  }
+
+  public void testEncoding() throws Exception { doTest(true); }
+
+  public void testSchemaImportHighlightingAndResolve() throws Exception {
+    doTestWithLocations(new String[][] { {"http://www.springframework.org/schema/beans", "ComplexSchemaValidation11.xsd"} },"xsd");
+  }
+
+  public void testDocBookV5() throws Exception {
+    doTestWithLocations(
+      new String[][] {
+        {"http://docbook.org/ns/docbook", "DocBookV5.xsd"},
+        {"http://www.w3.org/1999/xlink", "xlink.xsd"},
+        {"http://www.w3.org/XML/1998/namespace", "xml.xsd"}
+      },
+      "xml"
+    );
+
+    doTestWithLocations(
+      new String[][] {
+        {"http://www.w3.org/1999/xlink", "xlink.xsd"},
+        {"http://www.w3.org/XML/1998/namespace", "xml.xsd"}
+      },
+      "xsd"
+    );
+  }
+
+  @HighlightingFlags(HighlightingFlag.SkipExternalValidation)
+  public void testDocBook5() throws Exception {
+    doTestWithLocations(
+      new String[][] {
+        {"http://docbook.org/ns/docbook", "DocBookV5.xsd"},
+        {"http://www.w3.org/1999/xlink", "xlink.xsd"},
+        {"http://www.w3.org/XML/1998/namespace", "xml.xsd"}
+      },
+      "xml"
+    );
+  }
+
+  public void testCorrectGeneratedDtdUpdate() throws Exception {
+    configureByFile(BASE_PATH + getTestName(false) + ".xml");
+    Collection<HighlightInfo> infos = filterInfos(doHighlighting());
+    assertEquals(2, infos.size());
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        EditorModificationUtil.deleteSelectedText(myEditor);
+      }
+    });
+
+    infos = filterInfos(doHighlighting());
+
+    assertEquals(11, infos.size());
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        EditorModificationUtil.insertStringAtCaret(myEditor, "<");
+      }
+    });
+
+    new CodeCompletionHandlerBase(CompletionType.BASIC).invokeCompletion(myProject, myEditor);
+    infos = filterInfos(doHighlighting());
+    assertEquals(2, infos.size());
+    LookupManager.getInstance(myProject).hideActiveLookup();
+  }
+
+  private static Collection<HighlightInfo> filterInfos(final Collection<HighlightInfo> highlightInfos) {
+    for(Iterator<HighlightInfo> i = highlightInfos.iterator(); i.hasNext();) {
+      final HighlightInfo highlightInfo = i.next();
+      if (highlightInfo.getSeverity() == HighlightSeverity.INFORMATION) i.remove();
+    }
+    return highlightInfos;
+  }
+
+  public void testUsingSchemaDtd() throws Exception {
+    doTestWithLocations(null, "xsd");
+  }
+
+  public void testDtdElementRefs() throws Exception {
+    doTestWithLocations(
+      new String[] [] {
+        {"http://example.com/persistence","XIncludeTestSchema.xsd"}
+      },
+      "xml"
+    );
+  }
+
+  public void testDuplicates() throws Exception {
+    doTestWithLocations(null, "xsd");
+    doTestWithLocations(null, "dtd");
+    doTestWithLocations(null, "xml");
+  }
+
+  public void testMinMaxOccursInSchema() throws Exception {
+    doTestWithLocations(null, "xsd");
+  }
+
+  public void testXslt2() throws Exception {
+    doTestWithLocations(null, "xsl");
+  }
+
+  public void testDefaultAndFixedInSchema() throws Exception {
+    doTestWithLocations(null, "xsd");
+  }
+
+  public void testAnyAttributesInAttrGroup() throws Exception {
+    doTestWithLocations(
+      new String[] [] {
+        {"http://www.foo.org/test",getTestName(false)+".xsd"},
+        {"http://www.bar.org/test",getTestName(false)+"_2.xsd"}
+      },
+      "xml"
+    );
+  }
+
+  public void testXInclude() throws Exception {
+    final String testName = getTestName(false);
+    configureByFiles(
+      null,
+      BASE_PATH + testName +".xml",
+      BASE_PATH +testName +"-inc.xml",
+      BASE_PATH +testName +"TestSchema.xsd"
+    );
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      public void run() {
+        ExternalResourceManagerEx.getInstanceEx().addIgnoredResource("oxf:/apps/somefile.xml");
+      }
+    });
+
+    doDoTest(true, false, true);
+
+    VirtualFile[] includedFiles = FileIncludeManager.getManager(getProject()).getIncludedFiles(getFile().getVirtualFile(), true);
+    assertEquals(1, includedFiles.length);
+  }
+
+  public void testComplexRedefine() throws Exception {
+    final String[][] urls = {
+      {"http://graphml.graphdrawing.org/xmlns","graphml.xsd"},
+      {"http://graphml.graphdrawing.org/xmlns/1.0/graphml-structure.xsd","graphml-structure.xsd"},
+      {"http://www.w3.org/1999/xlink","xlink.xsd"}
+    };
+    doSchemaTestWithManyFilesFromSeparateDir(urls, null);
+  }
+
+  public void testComplexRedefine2() throws Exception {
+    final String[][] urls = {
+      {"http://www.yworks.com/xml/schema/graphml/1.0/ygraphml.xsd","ygraphml.xsd"},
+      {"http://graphml.graphdrawing.org/xmlns/1.0/xlink.xsd","xlink.xsd"}
+    };
+    doSchemaTestWithManyFilesFromSeparateDir(urls, null);
+  }
+
+  public void testMuleConfigHighlighting() throws Exception {
+    final String[][] urls = {
+      {"http://www.springframework.org/schema/beans/spring-beans-2.0.xsd", "spring-beans-2.0.xsd"},
+      {"http://www.springframework.org/schema/tool", "spring-tool-2.5.xsd"},
+      {"http://www.springframework.org/schema/context/spring-context-2.5.xsd", "spring-context-2.5.xsd"},
+      {"urn:xxx","mule.xsd"},
+      {"urn:yyy","mule-management.xsd"}
+    };
+    doTestWithLocations(urls, "xml");
+  }
+
+  public void testMuleConfigHighlighting2() throws Exception {
+    String path = getTestName(false) + File.separatorChar;
+    final String[][] urls = {
+      {"http://www.springframework.org/schema/beans/spring-beans-2.0.xsd", "spring-beans-2.0.xsd"},
+      {"http://www.springframework.org/schema/tool", "spring-tool-2.5.xsd"},
+      {"http://www.springframework.org/schema/context/spring-context-2.5.xsd", "spring-context-2.5.xsd"},
+      {"http://www.mulesource.org/schema/mule/core/2.2",path + "mule2_2.xsd"},
+      {"http://www.mulesource.org/schema/mule/cxf/2.2",path + "mule2_2-cxf.xsd"},
+      {"http://cxf.apache.org/core",path + "cxf_core.xsd"},
+      {"http://cxf.apache.org/configuration/beans",path + "cxf-beans.xsd"},
+      {"http://www.mulesource.org/schema/mule/schemadoc/2.2",path + "mule2_2-schemadoc.xsd"}
+    };
+    doTestWithLocations(urls, "xml");
+  }
+
+  @Override
+  protected boolean clearModelBeforeConfiguring() {
+    return "testComplexRedefine3".equals(getName());
+  }
+
+  public void testComplexRedefine3() throws Exception {
+    final String testName = getTestName(false);
+
+    VirtualFile[] files = {getVirtualFile(BASE_PATH + testName + "_2.xsd"), getVirtualFile(BASE_PATH + testName + "_3.xsd")};
+    doTest(files, true, false);
+
+    files = new VirtualFile[] {getVirtualFile(BASE_PATH + testName + ".xsd"),
+      getVirtualFile(BASE_PATH + testName + "_2.xsd"), getVirtualFile(BASE_PATH + testName + "_3.xsd")};
+    doTest(files, true, false);
+  }
+
+  public void testComplexRedefine4() throws Exception {
+    final String testName = getTestName(false);
+    VirtualFile[] files = {getVirtualFile(BASE_PATH + testName + ".xml"),
+      getVirtualFile(BASE_PATH + testName + ".xsd"), getVirtualFile(BASE_PATH + testName + "_2.xsd")};
+    doTest(files, true, false);
+  }
+
+  public void testComplexRedefine5() throws Exception {
+    final String testName = getTestName(false);
+    String[][] urls = {
+      {"http://extended", testName + ".xsd"},
+      {"http://simple", testName + "_2.xsd"}
+    };
+    doTestWithLocations(urls,"xml");
+  }
+
+  public void testComplexRedefine6() throws Exception {
+    final String testName = getTestName(false);
+    String[][] urls = {
+      {"urn:jboss:bean-deployer:2.0", testName + ".xsd"},
+      {null, testName + "_2.xsd"}
+    };
+    doTestWithLocations(urls,"xml");
+  }
+
+  public void testRedefineQualifiedType() throws Exception {
+    final String testName = getTestName(false);
+    VirtualFile[] files = {
+      getVirtualFile(BASE_PATH + testName + ".xml"),
+      getVirtualFile(BASE_PATH + testName + ".xsd"),
+      getVirtualFile(BASE_PATH + testName + "_2.xsd")
+    };
+    doTest(files, true, false);
+  }
+
+  public void testRedefineBaseType() throws Exception {
+    final String testName = getTestName(false);
+    VirtualFile[] files = {
+      getVirtualFile(BASE_PATH + testName + ".xml"),
+      getVirtualFile(BASE_PATH + testName + ".xsd"),
+      getVirtualFile(BASE_PATH + testName + "_2.xsd")
+    };
+    doTest(files, true, false);
+  }
+
+  public void testComplexSchemaValidation18() throws Exception {
+    final String testName = getTestName(false);
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(BASE_PATH + testName + ".xml"),
+        getVirtualFile(BASE_PATH + testName + ".xsd"),
+        getVirtualFile(BASE_PATH + testName + "_2.xsd")
+      },
+      true,
+      false
+    );
+  }
+
+  public void testComplexSchemaValidation19() throws Exception {
+    final String testName = getTestName(false);
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(BASE_PATH + testName + ".xml"),
+        getVirtualFile(BASE_PATH + testName + ".xsd"),
+        getVirtualFile(BASE_PATH + testName + "_2.xsd")
+      },
+      true,
+      false
+    );
+  }
+
+  public void testComplexSchemaValidation20() throws Exception {
+    final String testName = getTestName(false);
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(BASE_PATH + testName + ".xml"),
+        getVirtualFile(BASE_PATH + testName + ".xsd"),
+        getVirtualFile(BASE_PATH + testName + "_2.xsd")
+      },
+      true,
+      false
+    );
+  }
+
+  public void testSubstitutionFromInclude() throws Exception {
+    ExternalResourceManagerImpl
+        .registerResourceTemporarily("http://www.omg.org/spec/BPMN/20100524/MODEL", "BPMN20.xsd", getTestRootDisposable());
+
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(BASE_PATH + "FinancialReportProcess.bpmn20.xml"),
+        getVirtualFile(BASE_PATH + "BPMN20.xsd"),
+        getVirtualFile(BASE_PATH + "Semantic.xsd")
+      },
+      true,
+      false
+    );
+  }
+
+  public void testComplexRedefineFromJar() throws Exception {
+    String[][] urls = null;
+
+    configureByFiles(null,BASE_PATH + getTestName(false) + ".xml", BASE_PATH + "mylib.jar");
+    String path = myFile.getVirtualFile().getParent().getPath() + "/";
+    urls = new String[][] {
+      {"http://graphml.graphdrawing.org/xmlns",path + "mylib.jar!/graphml.xsd"},
+      {"http://graphml.graphdrawing.org/xmlns/1.0/graphml-structure.xsd",path + "mylib.jar!/graphml-structure.xsd"},
+      {"http://www.w3.org/1999/xlink",path + "mylib.jar!/xlink.xsd"}
+    };
+
+    for(String[] s:urls) ExternalResourceManagerImpl.registerResourceTemporarily(s[0], s[1], getTestRootDisposable());
+    doDoTest(true, false);
+  }
+
+  public void testChangeRootElement() throws Exception {
+    enableInspectionTool(new XmlWrongRootElementInspection());
+    final String testName = getTestName(false);
+    configureByFile(BASE_PATH + testName + ".xml");
+    Collection<HighlightInfo> infos = doDoTest(true, false);
+
+    findAndInvokeIntentionAction(infos, "Change Root Tag Name to xxx", myEditor, myFile);
+    checkResultByFile(BASE_PATH + testName+"_after.xml");
+  }
+
+  public void testUnqualifiedAttributePsi() throws Exception {
+    doTestWithLocations(null, "xml");
+    final List<XmlAttribute> attrs = new ArrayList<XmlAttribute>(2);
+
+    myFile.acceptChildren(new XmlRecursiveElementVisitor() {
+      @Override public void visitXmlAttribute(final XmlAttribute attribute) {
+        if (!attribute.isNamespaceDeclaration()) attrs.add(attribute);
+      }
+    });
+
+    assertEquals(4,attrs.size());
+    checkAttribute(attrs.get(0), "");
+    checkAttribute(attrs.get(1), "foo2");
+    checkAttribute(attrs.get(2), "");
+    checkAttribute(attrs.get(3), "foo4");
+  }
+
+  private static void checkAttribute(final XmlAttribute xmlAttribute, String expectedNs) {
+    final String attrNs = xmlAttribute.getNamespace();
+    assertEquals(expectedNs, attrNs);
+    final XmlTag parent = xmlAttribute.getParent();
+
+    assertEquals(parent.getAttribute(xmlAttribute.getLocalName(), attrNs), xmlAttribute);
+    //final String parentNs = parent.getNamespace();
+    //if (!parentNs.equals(attrNs)) assertNull(parent.getAttribute(xmlAttribute.getLocalName(), parentNs));
+    assertEquals(parent.getAttributeValue(xmlAttribute.getLocalName(), attrNs), xmlAttribute.getValue());
+    //if (!parentNs.equals(attrNs)) assertNull(parent.getAttributeValue(xmlAttribute.getLocalName(), parentNs));
+  }
+
+  @HighlightingFlags({HighlightingFlag.SkipExternalValidation})
+  public void testHighlightWhenNoNsSchemaLocation() throws Exception {
+    final String testName = getTestName(false);
+
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(BASE_PATH + testName + ".xml"),
+        getVirtualFile(BASE_PATH + testName + ".xsd")
+      },
+      true,
+      false
+    );
+  }
+
+  public void testSchemaWithXmlId() throws Exception {
+    final String testName = getTestName(false);
+
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(BASE_PATH + testName + ".xml")
+      },
+      true,
+      false
+    );
+  }
+
+  public void testProblemWithImportedNsReference() throws Exception {
+    doTestWithLocations(null,"xsd");
+  }
+
+  public void testBadXmlns() throws Exception {
+    configureByFile(BASE_PATH + "badXmlns.xml");
+    doHighlighting();
+  }
+
+  public void testProblemWithMemberTypes() throws Exception {
+    doTestWithLocations(null,"xsd");
+  }
+
+  public void testDtdHighlighting() throws Exception {
+    final String testName = getTestName(false);
+
+    doTestWithLocations(
+      new String[][] {
+        {"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod",testName + ".mod"}
+      },
+      "dtd"
+    );
+  }
+
+  public void testNoNamespaceLocation() throws Exception {
+    final String testName = getTestName(false);
+
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(BASE_PATH + testName + ".xml"),
+        getVirtualFile(BASE_PATH + testName + ".xsd")
+      },
+      true,
+      false
+    );
+  }
+
+  public void testUnresolvedSymbolForForAttribute() throws Exception {
+    doTest();
+  }
+
+  public void testXsiType() throws Exception {
+    final String testName = getTestName(false);
+
+    doTest(
+      new VirtualFile[] {
+        getVirtualFile(BASE_PATH + testName + ".xml"),
+        getVirtualFile(BASE_PATH + testName + "_TypesV1.00.xsd"),
+        getVirtualFile(BASE_PATH + testName + "_ActivationRequestV1.00.xsd"),
+        getVirtualFile(BASE_PATH + testName + "_GenericActivationRequestV1.00.xsd")
+      },
+      true,
+      false
+    );
+  }
+
+  public void testMappedSchemaLocation() throws Exception {
+    doTestWithLocations(new String[][]{
+      { "schemas/Forms.xsd", "Forms.xsd"}
+    }, "xml");
+  }
+
+  public void testMuleConfigValidation() throws Exception {
+    doSchemaTestWithManyFilesFromSeparateDir(
+      new String[][] {
+        {"http://www.springframework.org/schema/tool", "spring-tool-2.5.xsd"},
+        {"http://www.springframework.org/schema/beans/spring-beans-2.5.xsd", "spring-beans-2.5.xsd"},
+        {"http://www.mulesource.org/schema/mule/core/2.2/mule.xsd", "mule.xsd"},
+        {"http://www.mulesource.org/schema/mule/stdio/2.2/mule-stdio.xsd", "mule-stdio.xsd"},
+        {"http://www.springframework.org/schema/context/spring-context-2.5.xsd", "spring-context-2.5.xsd"},
+        {"http://www.mulesource.org/schema/mule/schemadoc/2.2/mule-schemadoc.xsd", "mule-schemadoc.xsd"},
+      },
+      null
+    );
+  }
+
+  public void testMobileHtml() throws Exception {
+    enableInspectionTool(new HtmlUnknownTagInspection());
+    doTest(getFullRelativeTestName(".html"), true, true);
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    if (!getTestName(false).equals("DoctypeWithoutSchema2")) enableInspectionTool(new CheckXmlFileWithXercesValidatorInspection());
+
+    old = XmlSettings.getInstance().SHOW_XML_ADD_IMPORT_HINTS;
+    XmlSettings.getInstance().SHOW_XML_ADD_IMPORT_HINTS = false;
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://www.springframework.org/schema/beans/spring-beans-2.5.xsd",
+                                                            getTestDataPath() + BASE_PATH + "spring-beans-2.5.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd",
+                                                            getTestDataPath() + BASE_PATH + "web-app_2_4.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd",
+                                                            getTestDataPath() + BASE_PATH + "web-app_2_4.xsd",
+                                                            getTestRootDisposable());
+    //ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/xml/ns/j2ee",
+    //                                                        getTestDataPath() + BASE_PATH + "javaee_5.xsd",
+    //                                                        getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/dtd/web-app_2_3.dtd",
+                                                            getTestDataPath() + BASE_PATH + "web-app_2_3.dtd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://struts.apache.org/dtds/struts-config_1_2.dtd",
+                                                            getTestDataPath() + BASE_PATH + "struts-config_1_2.dtd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/dtd/ejb-jar_2_0.dtd",
+                                                            getTestDataPath() + BASE_PATH + "ejb-jar_2_0.dtd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://schemas.xmlsoap.org/wsdl/",
+                                                            getTestDataPath() + BASE_PATH + "wsdl11.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://schemas.xmlsoap.org/wsdl/soap/",
+                                                            getTestDataPath() + BASE_PATH + "wsdl11_soapbinding.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://schemas.xmlsoap.org/soap/encoding/",
+                                                            getTestDataPath() + BASE_PATH + "soap-encoding.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd",
+                                                            getTestDataPath() + BASE_PATH + "application-client_1_4.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd",
+                                                            getTestDataPath() + BASE_PATH + "hibernate-mapping-3.0.dtd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://maven.apache.org/maven-v4_0_0.xsd",
+                                                            getTestDataPath() + BASE_PATH + "maven-4.0.0.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd",
+                                                            getTestDataPath() + BASE_PATH + "web-jsptaglibrary_1_2.dtd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/JSP/Page",
+                                                            getTestDataPath() + BASE_PATH + "jsp_2_0.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd",
+                                                            getTestDataPath() + BASE_PATH + "web-jsptaglibrary_2_0.xsd",
+                                                            getTestRootDisposable());
+    ExternalResourceManagerImpl.registerResourceTemporarily("http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd",
+                                                            getTestDataPath() + BASE_PATH + "hibernate-configuration-3.0.dtd",
+                                                            getTestRootDisposable());
+  }
+
+  private void disableHtmlSupport() {
+    final ExternalResourceManagerEx manager = ExternalResourceManagerEx.getInstanceEx();
+    myOldDoctype = manager.getDefaultHtmlDoctype(getProject());
+    manager.setDefaultHtmlDoctype("fake", getProject());
+  }
+
+  private void enableHtmlSupport() {
+    ExternalResourceManagerEx.getInstanceEx().setDefaultHtmlDoctype(myOldDoctype, getProject());
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    XmlSettings.getInstance().SHOW_XML_ADD_IMPORT_HINTS = old;
+    super.tearDown();
+  }
+}
diff --git a/xml/tests/xml-tests.iml b/xml/tests/xml-tests.iml
index 54d2cb63d22f..10dee0f83aee 100644
--- a/xml/tests/xml-tests.iml
+++ b/xml/tests/xml-tests.iml
@@ -13,6 +13,10 @@
     <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" />
+    <orderEntry type="module" module-name="java-impl" scope="TEST" />
+    <orderEntry type="module" module-name="ant" scope="TEST" />
+    <orderEntry type="module" module-name="xpath" scope="TEST" />
+    <orderEntry type="module" module-name="dom-impl" scope="TEST" />
   </component>
   <component name="copyright">
     <Base>

From d78cfe268db155f9b8d3c331565087f63c0ff3fb Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Mon, 4 Jun 2012 18:19:41 +0400
Subject: [PATCH 164/239] moving XmlHighlightingTest to community: test data

---
 .../daemon/XmlHighlightingTest.java           |    44 +-
 .../testData/xml/AnyAttributesInAttrGroup.xml |     5 +
 .../testData/xml/AnyAttributesInAttrGroup.xsd |    23 +
 .../xml/AnyAttributesInAttrGroup_2.xsd        |     8 +
 xml/tests/testData/xml/BPMN20.xsd             |    38 +
 xml/tests/testData/xml/ChangeRootElement.xml  |     7 +
 .../testData/xml/ChangeRootElement_after.xml  |     7 +
 xml/tests/testData/xml/ClosedTag2.xml         |     9 +
 .../testData/xml/CommentBeforeProlog.xml      |     3 +
 .../testData/xml/CommentBeforeProlog_2.xml    |     2 +
 .../testData/xml/ComplexDtdValidation.xml     |     9 +
 .../testData/xml/ComplexDtdValidation2.dtd    |     2 +
 .../testData/xml/ComplexDtdValidation2.xml    |     2 +
 xml/tests/testData/xml/ComplexRedefine.xml    |     5 +
 xml/tests/testData/xml/ComplexRedefine2.xml   |     8 +
 .../graphml-attributes.xsd                    |    45 +
 .../graphml-structure.xsd                     |   430 +
 .../xml/ComplexRedefine2Schemas/graphml.xsd   |   345 +
 .../xml/ComplexRedefine2Schemas/xlink.xsd     |    59 +
 .../xml/ComplexRedefine2Schemas/yfeatures.xsd |    16 +
 .../xml/ComplexRedefine2Schemas/ygraphics.xsd |   550 +
 .../xml/ComplexRedefine2Schemas/ygraphml.xsd  |    68 +
 .../ComplexRedefine2Schemas/yprocessors.xsd   |    39 +
 xml/tests/testData/xml/ComplexRedefine3.xsd   |    47 +
 xml/tests/testData/xml/ComplexRedefine3_2.xsd |    45 +
 xml/tests/testData/xml/ComplexRedefine3_3.xsd |   430 +
 xml/tests/testData/xml/ComplexRedefine4.xml   |     6 +
 xml/tests/testData/xml/ComplexRedefine4.xsd   |    15 +
 xml/tests/testData/xml/ComplexRedefine4_2.xsd |    27 +
 xml/tests/testData/xml/ComplexRedefine5.xml   |     8 +
 xml/tests/testData/xml/ComplexRedefine5.xsd   |    25 +
 xml/tests/testData/xml/ComplexRedefine5_2.xsd |    27 +
 xml/tests/testData/xml/ComplexRedefine6.xml   |    20 +
 xml/tests/testData/xml/ComplexRedefine6.xsd   |   311 +
 xml/tests/testData/xml/ComplexRedefine6_2.xsd |  1148 +
 .../testData/xml/ComplexRedefineFromJar.xml   |     5 +
 .../graphml-structure.xsd                     |  1114 +
 .../xml/ComplexRedefineSchemas/graphml.xsd    |   345 +
 .../xml/ComplexRedefineSchemas/xlink.xsd      |    59 +
 .../testData/xml/ComplexSchemaValidation.xml  |    22 +
 .../xml/ComplexSchemaValidation10.xsd         |    26 +
 .../xml/ComplexSchemaValidation10_2.xsd       |     9 +
 .../xml/ComplexSchemaValidation11.xml         |    13 +
 .../xml/ComplexSchemaValidation11.xsd         |   360 +
 .../xml/ComplexSchemaValidation11_2.xsd       |    98 +
 .../xml/ComplexSchemaValidation12.xsd         |    23 +
 .../xml/ComplexSchemaValidation13.xsd         |    13 +
 .../xml/ComplexSchemaValidation13_2.xsd       |    13 +
 .../xml/ComplexSchemaValidation14.xml         |     3 +
 .../xml/ComplexSchemaValidation14.xsd         |    12 +
 .../xml/ComplexSchemaValidation14_2.xsd       |    13 +
 .../xml/ComplexSchemaValidation15.xml         |    15 +
 .../xml/ComplexSchemaValidation15.xsd         |    21 +
 .../xml/ComplexSchemaValidation15_2.xsd       |  1077 +
 .../xml/ComplexSchemaValidation16.xml         |    53 +
 .../xml/ComplexSchemaValidation16.xsd         |    44 +
 .../xml/ComplexSchemaValidation16_2.xsd       |   115 +
 .../xml/ComplexSchemaValidation17.xml         |    10 +
 .../xml/ComplexSchemaValidation17.xsd         |    23 +
 .../xml/ComplexSchemaValidation18.xml         |    16 +
 .../xml/ComplexSchemaValidation18.xsd         | 14419 +++++++++++++
 .../xml/ComplexSchemaValidation18_2.xsd       |  1204 ++
 .../xml/ComplexSchemaValidation19.xml         |    18 +
 .../xml/ComplexSchemaValidation19.xsd         | 14453 +++++++++++++
 .../xml/ComplexSchemaValidation19_2.xsd       |  4368 ++++
 .../testData/xml/ComplexSchemaValidation2.xml |    56 +
 .../xml/ComplexSchemaValidation20.xml         |    10 +
 .../xml/ComplexSchemaValidation20.xsd         |    42 +
 .../xml/ComplexSchemaValidation20_2.xsd       |    20 +
 .../testData/xml/ComplexSchemaValidation3.xml |    26 +
 .../WMD-2002-02.xsd                           |  1384 ++
 .../common-2003-09.xsd                        |   420 +
 .../componentDescriptor-2002-02.xsd           |   163 +
 .../contentPack-2005-01.xsd                   |   127 +
 .../cview-2003-09.xsd                         |    26 +
 .../cview-types-2003-09.xsd                   |   922 +
 .../dataProvider-2003-09.xsd                  |   242 +
 .../dataValidation-2002-02.xsd                |   964 +
 .../dataXml-2002-02.xsd                       |    96 +
 .../httpBinding-2002-02.xsd                   |   173 +
 .../object-2003-09.xsd                        |     6 +
 .../object-base-types-2003-09.xsd             |   245 +
 .../object-types-2003-09.xsd                  |   219 +
 .../pageView-2002-02.xsd                      |   121 +
 .../pmd-2002-02.xsd                           |   682 +
 .../security-2002-02.xsd                      |   156 +
 .../service-2002-02.xsd                       |   208 +
 .../trait-2005-06.xsd                         |    12 +
 .../view-2002-02.xsd                          |  1287 ++
 .../viewL10nConfig-2002-07.xsd                |    57 +
 .../web-2002-02.xsd                           |   881 +
 .../xbl-2003-02.xsd                           |   410 +
 .../xinclude.xsd                              |    18 +
 .../ComplexSchemaValidation3Schemas/xlink.xsd |   111 +
 .../xsl-1.0-1999.xsd                          |  2323 ++
 .../testData/xml/ComplexSchemaValidation4.xml |   410 +
 .../CountryCode.xsd                           |   283 +
 .../SalaryDeclaration.xsd                     |  4143 ++++
 .../SalaryDeclarationContainer.xsd            |   717 +
 .../SalaryDeclarationServiceTypes.xsd         |   189 +
 .../testData/xml/ComplexSchemaValidation5.xml |    11 +
 .../testData/xml/ComplexSchemaValidation5.xsd |    37 +
 .../testData/xml/ComplexSchemaValidation6.xml |     1 +
 .../testData/xml/ComplexSchemaValidation6.xsd |    12 +
 .../testData/xml/ComplexSchemaValidation7.xml |   413 +
 .../encoding.xsd                              |   536 +
 .../ComplexSchemaValidation7Schemas/http.xsd  |    77 +
 .../ComplexSchemaValidation7Schemas/mime.xsd  |    73 +
 .../ComplexSchemaValidation7Schemas/soap.xsd  |   149 +
 .../ComplexSchemaValidation7Schemas/wsdl.xsd  |   310 +
 .../xml/ComplexSchemaValidation7_.xml         |    58 +
 .../xml/ComplexSchemaValidation7_.xsd         |    35 +
 .../xml/ComplexSchemaValidation7_2.xml        |   187 +
 .../testData/xml/ComplexSchemaValidation8.xml |    32 +
 .../testData/xml/ComplexSchemaValidation8.xsd |   127 +
 .../xml/ComplexSchemaValidation8_2.xsd        |    20 +
 .../testData/xml/ComplexSchemaValidation9.xml |     4 +
 .../testData/xml/ComplexSchemaValidation9.xsd |    10 +
 .../xml/CorrectGeneratedDtdUpdate.xml         |   367 +
 .../testData/xml/DefaultAndFixedInSchema.xsd  |    10 +
 xml/tests/testData/xml/DocBook5.xml           |    13 +
 .../testData/xml/DocBookHighlighting.xml      |  1627 ++
 .../xml/DocBookHighlighting/calstblx.dtd      |   205 +
 .../xml/DocBookHighlighting/dbcentx.mod       |   384 +
 .../xml/DocBookHighlighting/dbgenent.mod      |    41 +
 .../xml/DocBookHighlighting/dbhierx.mod       |  2113 ++
 .../xml/DocBookHighlighting/dbnotnx.mod       |   101 +
 .../xml/DocBookHighlighting/dbpoolx.mod       |  8355 ++++++++
 .../xml/DocBookHighlighting/docbookx.dtd      |   170 +
 .../xml/DocBookHighlighting/htmltblx.mod      |   237 +
 .../xml/DocBookHighlighting/soextblx.dtd      |   314 +
 .../testData/xml/DocBookHighlighting2.xml     |    43 +
 .../xml/DocBookHighlighting2/calstblx.dtd     |   215 +
 .../xml/DocBookHighlighting2/dbcentx.mod      |   384 +
 .../xml/DocBookHighlighting2/dbgenent.mod     |    41 +
 .../xml/DocBookHighlighting2/dbhierx.mod      |  2193 ++
 .../xml/DocBookHighlighting2/dbnotnx.mod      |   101 +
 .../xml/DocBookHighlighting2/dbpoolx.mod      |  8701 ++++++++
 .../xml/DocBookHighlighting2/docbookx.dtd     |   170 +
 .../xml/DocBookHighlighting2/htmltblx.mod     |   245 +
 .../xml/DocBookHighlighting2/isoamsa.ent      |    97 +
 .../xml/DocBookHighlighting2/isoamsb.ent      |    83 +
 .../xml/DocBookHighlighting2/isoamsc.ent      |    51 +
 .../xml/DocBookHighlighting2/isoamsn.ent      |   103 +
 .../xml/DocBookHighlighting2/isoamso.ent      |    59 +
 .../xml/DocBookHighlighting2/isoamsr.ent      |   125 +
 .../xml/DocBookHighlighting2/isobox.ent       |    81 +
 .../xml/DocBookHighlighting2/isocyr1.ent      |   108 +
 .../xml/DocBookHighlighting2/isocyr2.ent      |    67 +
 .../xml/DocBookHighlighting2/isodia.ent       |    55 +
 .../xml/DocBookHighlighting2/isogrk1.ent      |    90 +
 .../xml/DocBookHighlighting2/isogrk2.ent      |    61 +
 .../xml/DocBookHighlighting2/isogrk3.ent      |    84 +
 .../xml/DocBookHighlighting2/isogrk4.ent      |    84 +
 .../xml/DocBookHighlighting2/isolat1.ent      |   103 +
 .../xml/DocBookHighlighting2/isolat2.ent      |   162 +
 .../xml/DocBookHighlighting2/isonum.ent       |   117 +
 .../xml/DocBookHighlighting2/isopub.ent       |   125 +
 .../xml/DocBookHighlighting2/isotech.ent      |   103 +
 .../xml/DocBookHighlighting2/soextblx.dtd     |   321 +
 xml/tests/testData/xml/DocBookV5.xml          |     2 +
 xml/tests/testData/xml/DocBookV5.xsd          | 17430 ++++++++++++++++
 .../testData/xml/DoctypeWithoutSchema.ent     |    19 +
 .../testData/xml/DoctypeWithoutSchema.xml     |    13 +
 xml/tests/testData/xml/DtdElementRefs.xml     |    20 +
 xml/tests/testData/xml/DtdHighlighting.dtd    |     4 +
 xml/tests/testData/xml/DtdHighlighting.mod    |     1 +
 .../testData/xml/DuplicateIdAttribute.xml     |    10 +
 .../testData/xml/DuplicateIdAttribute2.xml    |    19 +
 .../testData/xml/DuplicateNameAttribute.xml   |    18 +
 .../spring-beans-2.5.xsd                      |  1164 ++
 xml/tests/testData/xml/Duplicates.dtd         |     3 +
 xml/tests/testData/xml/Duplicates.xml         |     7 +
 xml/tests/testData/xml/Duplicates.xsd         |    16 +
 xml/tests/testData/xml/EmptyNSRef.xml         |     7 +
 xml/tests/testData/xml/Encoding.xml           |     2 +
 xml/tests/testData/xml/EntityHighlighting.xml |     8 +
 .../testData/xml/EntityHighlighting2.xml      |    19 +
 xml/tests/testData/xml/EntityRefBadFormat.xml |     5 +
 .../testData/xml/EntityRefWithEmptyDtd.xml    |     7 +
 xml/tests/testData/xml/EntityRefWithNoDtd.xml |     3 +
 .../xml/EnumeratedAttributesValidation.xsd    |    13 +
 xml/tests/testData/xml/ErrorInDtd.xml         |    11 +
 ...idatorOnValidXmlWithNamespacesNotSetup.xml |    10 +
 ...datorOnValidXmlWithNamespacesNotSetup2.xml |     9 +
 .../xml/FinancialReportProcess.bpmn20.xml     |    44 +
 xml/tests/testData/xml/Forms.xsd              |     4 +
 .../xml/HighlightWhenNoNsSchemaLocation.xml   |     4 +
 .../xml/HighlightWhenNoNsSchemaLocation.xsd   |    47 +
 ...ghlightingWithConditionalSectionsInDtd.dtd |    12 +
 ...ghlightingWithConditionalSectionsInDtd.xml |    13 +
 ...hlightingWithConditionalSectionsInDtd2.xml |    12 +
 .../xml/IgnoredNamespaceHighlighting.xml      |     7 +
 xml/tests/testData/xml/ImportProblems.xsd     |    15 +
 xml/tests/testData/xml/ImportProblems2.xsd    |    26 +
 .../testData/xml/InvalidIdRefAttribute.xml    |     8 +
 xml/tests/testData/xml/InvalidIdRefInXsl.xml  |    15 +
 xml/tests/testData/xml/ManyRootTags.xml       |     2 +
 .../testData/xml/MappedSchemaLocation.xml     |     8 +
 xml/tests/testData/xml/MavenValidation.xml    |   310 +
 .../testData/xml/MinMaxOccursInSchema.xsd     |     7 +
 xml/tests/testData/xml/MobileHtml.html        |    10 +
 .../testData/xml/MuleConfigHighlighting.xml   |    12 +
 .../testData/xml/MuleConfigHighlighting2.xml  |    19 +
 .../xml/MuleConfigHighlighting2/cxf-beans.xsd |    81 +
 .../xml/MuleConfigHighlighting2/cxf_core.xsd  |   122 +
 .../MuleConfigHighlighting2/mule2_2-cxf.xsd   |   414 +
 .../mule2_2-schemadoc.xsd                     |   216 +
 .../xml/MuleConfigHighlighting2/mule2_2.xsd   |  4533 ++++
 .../testData/xml/MuleConfigValidation.xml     |    27 +
 .../mule-schemadoc.xsd                        |   216 +
 .../mule-stdio.xsd                            |   121 +
 .../xml/MuleConfigValidationSchemas/mule.xsd  |  4533 ++++
 .../spring-beans-2.5.xsd                      |  1164 ++
 .../spring-context-2.5.xsd                    |   423 +
 .../spring-tool-2.5.xsd                       |    75 +
 .../xml/NavigateToDeclDefinedWithEntity.dtd   |     2 +
 .../xml/NavigateToDeclDefinedWithEntity.ent   |     2 +
 .../xml/NavigateToDeclDefinedWithEntity.xml   |     3 +
 .../testData/xml/NoNamespaceLocation.xml      |     3 +
 .../testData/xml/NoNamespaceLocation.xsd      |    12 +
 xml/tests/testData/xml/NoRootTag.xml          |     1 +
 .../xml/NoSpaceBeforeAttrAndNoCdataEnd.xml    |     5 +
 .../xml/NonEnumeratedValuesHighlighting.xml   |    21 +
 .../xml/OasisDocumentHighlighting.xml         |    15 +
 .../xml/OasisDocumentHighlighting/bookmap.dtd |   120 +
 .../xml/OasisDocumentHighlighting/bookmap.mod |   644 +
 .../commonElements.ent                        |   128 +
 .../commonElements.ent.rnc                    |   144 +
 .../commonElements.mod                        |   764 +
 .../commonElements.mod.rnc                    |   920 +
 .../xml/OasisDocumentHighlighting/concept.dtd |   176 +
 .../xml/OasisDocumentHighlighting/concept.mod |   127 +
 .../OasisDocumentHighlighting/concept.mod.rnc |   150 +
 .../xml/OasisDocumentHighlighting/concept.rnc |   148 +
 .../OasisDocumentHighlighting/ditabase.dtd    |   214 +
 .../OasisDocumentHighlighting/ditabase.rnc    |   177 +
 .../OasisDocumentHighlighting/glossary.dtd    |   178 +
 .../OasisDocumentHighlighting/glossary.mod    |   129 +
 .../glossary.mod.rnc                          |   155 +
 .../highlightDomain.ent                       |    46 +
 .../highlightDomain.ent.rnc                   |    75 +
 .../highlightDomain.mod                       |   122 +
 .../highlightDomain.mod.rnc                   |   158 +
 .../indexingDomain.ent                        |    48 +
 .../indexingDomain.ent.rnc                    |    72 +
 .../indexingDomain.mod                        |    83 +
 .../indexingDomain.mod.rnc                    |   116 +
 .../xml/OasisDocumentHighlighting/map.dtd     |   115 +
 .../xml/OasisDocumentHighlighting/map.mod     |   322 +
 .../xml/OasisDocumentHighlighting/map.mod.rnc |   355 +
 .../xml/OasisDocumentHighlighting/map.rnc     |   133 +
 .../OasisDocumentHighlighting/mapGroup.ent    |    51 +
 .../mapGroup.ent.rnc                          |    75 +
 .../OasisDocumentHighlighting/mapGroup.mod    |    83 +
 .../mapGroup.mod.rnc                          |   117 +
 .../OasisDocumentHighlighting/metaDecl.mod    |   277 +
 .../metaDecl.mod.rnc                          |   315 +
 .../programmingDomain.ent                     |    55 +
 .../programmingDomain.ent.rnc                 |    81 +
 .../programmingDomain.mod                     |   381 +
 .../programmingDomain.mod.rnc                 |   475 +
 .../OasisDocumentHighlighting/reference.dtd   |   176 +
 .../OasisDocumentHighlighting/reference.mod   |   246 +
 .../reference.mod.rnc                         |   286 +
 .../OasisDocumentHighlighting/reference.rnc   |   148 +
 .../softwareDomain.ent                        |    53 +
 .../softwareDomain.ent.rnc                    |    83 +
 .../softwareDomain.mod                        |   145 +
 .../softwareDomain.mod.rnc                    |   163 +
 .../xml/OasisDocumentHighlighting/task.dtd    |   174 +
 .../xml/OasisDocumentHighlighting/task.mod    |   409 +
 .../OasisDocumentHighlighting/task.mod.rnc    |   445 +
 .../xml/OasisDocumentHighlighting/task.rnc    |   147 +
 .../xml/OasisDocumentHighlighting/tblDecl.mod |   380 +
 .../OasisDocumentHighlighting/tblDecl.mod.rnc |   361 +
 .../xml/OasisDocumentHighlighting/topic.dtd   |   168 +
 .../xml/OasisDocumentHighlighting/topic.mod   |   416 +
 .../OasisDocumentHighlighting/topic.mod.rnc   |   505 +
 .../xml/OasisDocumentHighlighting/topic.rnc   |   146 +
 .../OasisDocumentHighlighting/topicAttr.mod   |    69 +
 .../OasisDocumentHighlighting/topicDefn.ent   |    72 +
 .../topicDefn.ent.rnc                         |    92 +
 .../OasisDocumentHighlighting/uiDomain.ent    |    54 +
 .../uiDomain.ent.rnc                          |    79 +
 .../OasisDocumentHighlighting/uiDomain.mod    |   117 +
 .../uiDomain.mod.rnc                          |   149 +
 .../utilitiesDomain.ent                       |    53 +
 .../utilitiesDomain.ent.rnc                   |    79 +
 .../utilitiesDomain.mod                       |   119 +
 .../utilitiesDomain.mod.rnc                   |   150 +
 .../OasisDocumentHighlighting/xnalDomain.ent  |    46 +
 .../OasisDocumentHighlighting/xnalDomain.mod  |   276 +
 xml/tests/testData/xml/PluginXml.xml          |    36 +
 .../xml/ProblemWithImportedNsReference.xsd    |     8 +
 .../testData/xml/ProblemWithMemberTypes.xsd   |    16 +
 xml/tests/testData/xml/RedefineBaseType.xml   |     9 +
 xml/tests/testData/xml/RedefineBaseType.xsd   |    25 +
 xml/tests/testData/xml/RedefineBaseType_2.xsd |    20 +
 .../testData/xml/RedefineQualifiedType.xml    |     7 +
 .../testData/xml/RedefineQualifiedType.xsd    |    16 +
 .../testData/xml/RedefineQualifiedType_2.xsd  |    20 +
 .../xml/ReferencingTargetNamespace.xml        |     9 +
 xml/tests/testData/xml/ResolveEntityUrl.xml   |    11 +
 .../xml/ResolvedDtdElementReferences.dtd      |     2 +
 .../testData/xml/ResolvingEntitiesInDtd.xml   |    54 +
 .../RatingandServiceSelectionRequest.dtd      |    16 +
 .../XpciInterchange.dtd                       |    63 +
 .../ResolvingEntitiesInDtd/Xpcivocabulary.dtd |   533 +
 .../SchemaImportHighlightingAndResolve.xsd    |    22 +
 .../xml/SchemaReferencesValidation.xsd        |    31 +
 xml/tests/testData/xml/SchemaUpdate.xml       |    13 +
 xml/tests/testData/xml/SchemaUpdate.xsd       |    28 +
 xml/tests/testData/xml/SchemaValidation.xml   |     9 +
 xml/tests/testData/xml/SchemaValidation2.xml  |    14 +
 xml/tests/testData/xml/SchemaValidation2.xsd  |    38 +
 xml/tests/testData/xml/SchemaValidation3.xml  |     5 +
 xml/tests/testData/xml/SchemaValidation3.xsd  |    12 +
 .../testData/xml/SchemaValidation3_2.xsd      |    20 +
 xml/tests/testData/xml/SchemaValidation4.xml  |     5 +
 xml/tests/testData/xml/SchemaValidation4.xsd  |   433 +
 xml/tests/testData/xml/SchemaValidation5.xsd  |    41 +
 xml/tests/testData/xml/SchemaValidation6.xml  |     3 +
 xml/tests/testData/xml/SchemaValidation6.xsd  |    21 +
 xml/tests/testData/xml/SchemaWithXmlId.xml    |    19 +
 xml/tests/testData/xml/Semantic.xsd           |  1562 ++
 xml/tests/testData/xml/SgmlDTD.dtd            |   871 +
 .../xml/SpecifyXsiSchemaLocationQuickFix.xml  |     2 +
 .../xml/SpecifyXsiSchemaLocationQuickFix2.xml |     2 +
 ...pecifyXsiSchemaLocationQuickFix2_after.xml |     4 +
 .../xml/SpecifyXsiSchemaLocationQuickFix3.xml |     2 +
 ...pecifyXsiSchemaLocationQuickFix3_after.xml |     2 +
 ...SpecifyXsiSchemaLocationQuickFix_after.xml |     3 +
 xml/tests/testData/xml/StackOverflow.xml      |     5 +
 xml/tests/testData/xml/StackOverflow2.xsd     |     4 +
 xml/tests/testData/xml/Tapestry_3_0.dtd       |   547 +
 .../testData/xml/UnboundNsHighlighting.xml    |     6 +
 .../testData/xml/UnboundNsHighlighting2.xml   |     1 +
 .../xml/UnboundNsHighlighting2_after.xml      |     1 +
 .../testData/xml/UnboundNsHighlighting3.xml   |     1 +
 .../xml/UnboundNsHighlighting3_after.xml      |     1 +
 .../testData/xml/UnboundNsHighlighting4.dtd   |   165 +
 .../testData/xml/UnboundNsHighlighting4.xml   |    19 +
 .../testData/xml/UnboundNsHighlighting5.xml   |     2 +
 .../xml/UnboundNsHighlighting5_after.xml      |     2 +
 .../testData/xml/UnboundNsHighlighting6.xml   |     2 +
 .../xml/UnboundNsHighlighting6_after.xml      |     2 +
 .../testData/xml/UnqualifiedAttributePsi.xml  |     3 +
 .../xml/UnresolvedDtdElementReferences.dtd    |     2 +
 .../UnresolvedDtdElementReferencesInXml.xml   |     5 +
 .../UnresolvedDtdElementReferencesInXml2.xml  |     1 +
 ...UnresolvedDtdElementReferencesInXml2_2.xml |     2 +
 ...lvedDtdElementReferencesInXml2_2_after.xml |     5 +
 ...solvedDtdElementReferencesInXml2_after.xml |     4 +
 .../UnresolvedDtdElementReferencesInXml3.xml  |     2 +
 ...solvedDtdElementReferencesInXml3_after.xml |     4 +
 ...esolvedDtdElementReferencesInXml_after.xml |     6 +
 ...solvedDtdElementReferencesInXml_after2.xml |     7 +
 .../UnresolvedDtdElementReferences_after.dtd  |     3 +
 .../UnresolvedDtdElementReferences_after2.dtd |     4 +
 .../xml/UnresolvedDtdEntityReference.dtd      |     1 +
 .../UnresolvedDtdEntityReference_after.dtd    |     2 +
 .../xml/UnresolvedSymbolForForAttribute.xml   |     1 +
 xml/tests/testData/xml/UsingDtdReference.dtd  |     2 +
 xml/tests/testData/xml/UsingDtdReference.xml  |     8 +
 xml/tests/testData/xml/UsingDtdReference2.dtd |     3 +
 xml/tests/testData/xml/UsingSchemaDtd.xsd     |   318 +
 .../testData/xml/ValidationOfDtdFile.dtd      |     4 +
 xml/tests/testData/xml/WebApp.xml             |     6 +
 .../testData/xml/WrongRegExpInSchema.xsd      |    13 +
 .../testData/xml/WrongRegExpInSchema2.xsd     |    17 +
 xml/tests/testData/xml/WsdlValidation.wsdl    |   353 +
 xml/tests/testData/xml/XHtmlValidation.xml    |    10 +
 xml/tests/testData/xml/XHtmlValidation2.xml   |    10 +
 xml/tests/testData/xml/XHtmlValidation3.xml   |    20 +
 .../xml/XHtmlValidation3/xhtml-attribs-1.mod  |   142 +
 .../xml/XHtmlValidation3/xhtml-base-1.mod     |    53 +
 .../XHtmlValidation3/xhtml-basic-table-1.mod  |   167 +
 .../xhtml-basic11-model-1.mod                 |   161 +
 .../xml/XHtmlValidation3/xhtml-basic11.dtd    |   221 +
 .../xml/XHtmlValidation3/xhtml-blkphras-1.mod |   163 +
 .../XHtmlValidation3/xhtml-blkstruct-1.mod    |    57 +
 .../xml/XHtmlValidation3/xhtml-charent-1.mod  |    39 +
 .../XHtmlValidation3/xhtml-datatypes-1.mod    |    85 +
 .../xml/XHtmlValidation3/xhtml-form-1.mod     |   291 +
 .../XHtmlValidation3/xhtml-framework-1.mod    |    98 +
 .../XHtmlValidation3/xhtml-hypertext-1.mod    |    54 +
 .../xml/XHtmlValidation3/xhtml-image-1.mod    |    50 +
 .../xml/XHtmlValidation3/xhtml-inlphras-1.mod |   203 +
 .../XHtmlValidation3/xhtml-inlstruct-1.mod    |    62 +
 .../XHtmlValidation3/xhtml-inputmode-1.mod    |    39 +
 .../xml/XHtmlValidation3/xhtml-lat1.ent       |   196 +
 .../xml/XHtmlValidation3/xhtml-link-1.mod     |    59 +
 .../xml/XHtmlValidation3/xhtml-list-1.mod     |   129 +
 .../xml/XHtmlValidation3/xhtml-meta-1.mod     |    47 +
 .../XHtmlValidation3/xhtml-notations-1.mod    |   114 +
 .../xml/XHtmlValidation3/xhtml-object-1.mod   |    60 +
 .../xml/XHtmlValidation3/xhtml-param-1.mod    |    48 +
 .../xml/XHtmlValidation3/xhtml-qname-1.mod    |   318 +
 .../xml/XHtmlValidation3/xhtml-script-1.mod   |    66 +
 .../xml/XHtmlValidation3/xhtml-special.ent    |    80 +
 .../xml/XHtmlValidation3/xhtml-struct-1.mod   |   139 +
 .../xml/XHtmlValidation3/xhtml-style-1.mod    |    47 +
 .../xml/XHtmlValidation3/xhtml-symbol.ent     |   204 +
 .../xml/XHtmlValidation3/xhtml-target-1.mod   |    53 +
 .../xml/XHtmlValidation3/xhtml-text-1.mod     |    52 +
 xml/tests/testData/xml/XInclude-inc.xml       |     5 +
 xml/tests/testData/xml/XInclude.xml           |    10 +
 xml/tests/testData/xml/XIncludeTestSchema.xsd |    24 +
 .../testData/xml/XercesCachingProblem.dtd     |     5 +
 .../testData/xml/XercesCachingProblem.xml     |     7 +
 xml/tests/testData/xml/XercesMessageOnDtd.xml |     8 +
 xml/tests/testData/xml/XercesMessageOnPI.xml  |     5 +
 .../testData/xml/XercesMessagesBinding.xml    |     8 +
 .../testData/xml/XercesMessagesBinding2.xml   |     8 +
 .../testData/xml/XercesMessagesBinding2.xsd   |   106 +
 .../testData/xml/XercesMessagesBinding2_2.xml |     8 +
 .../testData/xml/XercesMessagesBinding2_2.xsd |   106 +
 .../testData/xml/XercesMessagesBinding3.xml   |    16 +
 .../testData/xml/XercesMessagesBinding4.xml   |    30 +
 .../testData/xml/XercesMessagesBinding4.xsd   |     1 +
 .../testData/xml/XercesMessagesBinding5.xml   |     5 +
 xml/tests/testData/xml/XmlPsi.xml             |     6 +
 xml/tests/testData/xml/XsiSchemaLocation.xml  |     4 +
 xml/tests/testData/xml/XsiSchemaLocation2.xml |    14 +
 .../testData/xml/XsiSchemaLocation2_1.xsd     |    11 +
 .../testData/xml/XsiSchemaLocation2_2.xsd     |    48 +
 .../testData/xml/XsiSchemaLocation2_3.xsd     |    51 +
 xml/tests/testData/xml/XsiSchemaLocation3.xsd |     8 +
 .../testData/xml/XsiSchemaLocation_2.xml      |    34 +
 xml/tests/testData/xml/XsiType.xml            |    53 +
 .../xml/XsiType_ActivationRequestV1.00.xsd    |   429 +
 .../XsiType_GenericActivationRequestV1.00.xsd |    24 +
 xml/tests/testData/xml/XsiType_TypesV1.00.xsd |   251 +
 xml/tests/testData/xml/Xslt2.xsl              |    35 +
 xml/tests/testData/xml/XsltValidation.xsl     |    15 +
 xml/tests/testData/xml/XsltValidation2.xsl    |    12 +
 xml/tests/testData/xml/XsltValidation3.xsl    |    16 +
 xml/tests/testData/xml/allUnbound.xsd         |    27 +
 .../testData/xml/application-client_1_4.xsd   |   266 +
 xml/tests/testData/xml/badXmlns.xml           |     6 +
 xml/tests/testData/xml/closedTag1.xml         |     3 +
 xml/tests/testData/xml/def_xslt.dtd           |   280 +
 xml/tests/testData/xml/duplicateAttribute.xml |     5 +
 .../testData/xml/duplicateAttribute2.xml      |     6 +
 .../testData/xml/duplicateAttribute2.xsd      |     0
 xml/tests/testData/xml/ejb-jar_2_0.dtd        |  1671 ++
 xml/tests/testData/xml/entities.dtd           |     1 +
 xml/tests/testData/xml/fop.xsd                |  4312 ++++
 .../xml/hibernate-configuration-3.0.dtd       |    52 +
 .../testData/xml/hibernate-mapping-3.0.dtd    |  1036 +
 xml/tests/testData/xml/javaee_5.xsd           |  2117 ++
 xml/tests/testData/xml/jdo_2_0.xsd            |   653 +
 xml/tests/testData/xml/jsp_2_0.xsd            |   307 +
 xml/tests/testData/xml/maven-4.0.0.xsd        |  2213 ++
 xml/tests/testData/xml/mule-management.xsd    |   200 +
 xml/tests/testData/xml/mule.xsd               |  3827 ++++
 xml/tests/testData/xml/mylib.jar              |   Bin 0 -> 6524 bytes
 xml/tests/testData/xml/relaxng.xsd            |   342 +
 xml/tests/testData/xml/rootTag1.xml           |     5 +
 xml/tests/testData/xml/soap-encoding.xsd      |   536 +
 xml/tests/testData/xml/spring-beans-2.0.xsd   |  1076 +
 xml/tests/testData/xml/spring-beans-2.5.xsd   |  1164 ++
 xml/tests/testData/xml/spring-context-2.5.xsd |   423 +
 xml/tests/testData/xml/spring-tool-2.5.xsd    |    75 +
 xml/tests/testData/xml/struts-config_1_2.dtd  |   686 +
 xml/tests/testData/xml/web-app_2_3.dtd        |  1063 +
 xml/tests/testData/xml/web-app_2_4.xsd        |  1242 ++
 .../testData/xml/web-jsptaglibrary_1_2.dtd    |   462 +
 .../testData/xml/web-jsptaglibrary_2_0.xsd    |  1010 +
 xml/tests/testData/xml/wrongRootTag1.xml      |     5 +
 xml/tests/testData/xml/wsdl11.xsd             |   310 +
 xml/tests/testData/xml/wsdl11_soapbinding.xsd |   149 +
 xml/tests/testData/xml/xhtml-lat1.ent         |   196 +
 xml/tests/testData/xml/xhtml-special.ent      |    80 +
 xml/tests/testData/xml/xhtml-symbol.ent       |   237 +
 .../testData/xml/xhtml1-transitional.xsd      |  2773 +++
 xml/tests/testData/xml/xlink.xsd              |    32 +
 xml/tests/testData/xml/xml.xsd                |    13 +
 479 files changed, 173349 insertions(+), 19 deletions(-)
 create mode 100644 xml/tests/testData/xml/AnyAttributesInAttrGroup.xml
 create mode 100644 xml/tests/testData/xml/AnyAttributesInAttrGroup.xsd
 create mode 100644 xml/tests/testData/xml/AnyAttributesInAttrGroup_2.xsd
 create mode 100644 xml/tests/testData/xml/BPMN20.xsd
 create mode 100644 xml/tests/testData/xml/ChangeRootElement.xml
 create mode 100644 xml/tests/testData/xml/ChangeRootElement_after.xml
 create mode 100644 xml/tests/testData/xml/ClosedTag2.xml
 create mode 100644 xml/tests/testData/xml/CommentBeforeProlog.xml
 create mode 100644 xml/tests/testData/xml/CommentBeforeProlog_2.xml
 create mode 100644 xml/tests/testData/xml/ComplexDtdValidation.xml
 create mode 100644 xml/tests/testData/xml/ComplexDtdValidation2.dtd
 create mode 100644 xml/tests/testData/xml/ComplexDtdValidation2.xml
 create mode 100644 xml/tests/testData/xml/ComplexRedefine.xml
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2.xml
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2Schemas/graphml-attributes.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2Schemas/graphml-structure.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2Schemas/graphml.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2Schemas/xlink.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2Schemas/yfeatures.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2Schemas/ygraphics.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2Schemas/ygraphml.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine2Schemas/yprocessors.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine3.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine3_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine3_3.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine4.xml
 create mode 100644 xml/tests/testData/xml/ComplexRedefine4.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine4_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine5.xml
 create mode 100644 xml/tests/testData/xml/ComplexRedefine5.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine5_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine6.xml
 create mode 100644 xml/tests/testData/xml/ComplexRedefine6.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefine6_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefineFromJar.xml
 create mode 100644 xml/tests/testData/xml/ComplexRedefineSchemas/graphml-structure.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefineSchemas/graphml.xsd
 create mode 100644 xml/tests/testData/xml/ComplexRedefineSchemas/xlink.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation10.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation10_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation11.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation11.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation11_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation12.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation13.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation13_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation14.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation14.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation14_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation15.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation15.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation15_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation16.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation16.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation16_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation17.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation17.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation18.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation18.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation18_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation19.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation19.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation19_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation2.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation20.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation20.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation20_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/WMD-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/common-2003-09.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/componentDescriptor-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/contentPack-2005-01.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/cview-2003-09.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/cview-types-2003-09.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataProvider-2003-09.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataValidation-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataXml-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/httpBinding-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-2003-09.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-base-types-2003-09.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-types-2003-09.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/pageView-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/pmd-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/security-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/service-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/trait-2005-06.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/view-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/viewL10nConfig-2002-07.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/web-2002-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xbl-2003-02.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xinclude.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xlink.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xsl-1.0-1999.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation4.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation4Schemas/CountryCode.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclaration.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclarationContainer.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclarationServiceTypes.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation5.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation5.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation6.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation6.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7Schemas/encoding.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7Schemas/http.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7Schemas/mime.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7Schemas/soap.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7Schemas/wsdl.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7_.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7_.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation7_2.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation8.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation8.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation8_2.xsd
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation9.xml
 create mode 100644 xml/tests/testData/xml/ComplexSchemaValidation9.xsd
 create mode 100644 xml/tests/testData/xml/CorrectGeneratedDtdUpdate.xml
 create mode 100644 xml/tests/testData/xml/DefaultAndFixedInSchema.xsd
 create mode 100644 xml/tests/testData/xml/DocBook5.xml
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting.xml
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/calstblx.dtd
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/dbcentx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/dbgenent.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/dbhierx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/dbnotnx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/dbpoolx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/docbookx.dtd
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/htmltblx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting/soextblx.dtd
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2.xml
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/calstblx.dtd
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/dbcentx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/dbgenent.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/dbhierx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/dbnotnx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/dbpoolx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/docbookx.dtd
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/htmltblx.mod
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isoamsa.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isoamsb.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isoamsc.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isoamsn.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isoamso.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isoamsr.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isobox.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isocyr1.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isocyr2.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isodia.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isogrk1.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isogrk2.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isogrk3.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isogrk4.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isolat1.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isolat2.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isonum.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isopub.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/isotech.ent
 create mode 100644 xml/tests/testData/xml/DocBookHighlighting2/soextblx.dtd
 create mode 100644 xml/tests/testData/xml/DocBookV5.xml
 create mode 100644 xml/tests/testData/xml/DocBookV5.xsd
 create mode 100644 xml/tests/testData/xml/DoctypeWithoutSchema.ent
 create mode 100644 xml/tests/testData/xml/DoctypeWithoutSchema.xml
 create mode 100644 xml/tests/testData/xml/DtdElementRefs.xml
 create mode 100644 xml/tests/testData/xml/DtdHighlighting.dtd
 create mode 100644 xml/tests/testData/xml/DtdHighlighting.mod
 create mode 100644 xml/tests/testData/xml/DuplicateIdAttribute.xml
 create mode 100644 xml/tests/testData/xml/DuplicateIdAttribute2.xml
 create mode 100644 xml/tests/testData/xml/DuplicateNameAttribute.xml
 create mode 100644 xml/tests/testData/xml/DuplicateNameAttributeSchemas/spring-beans-2.5.xsd
 create mode 100644 xml/tests/testData/xml/Duplicates.dtd
 create mode 100644 xml/tests/testData/xml/Duplicates.xml
 create mode 100644 xml/tests/testData/xml/Duplicates.xsd
 create mode 100644 xml/tests/testData/xml/EmptyNSRef.xml
 create mode 100644 xml/tests/testData/xml/Encoding.xml
 create mode 100644 xml/tests/testData/xml/EntityHighlighting.xml
 create mode 100644 xml/tests/testData/xml/EntityHighlighting2.xml
 create mode 100644 xml/tests/testData/xml/EntityRefBadFormat.xml
 create mode 100644 xml/tests/testData/xml/EntityRefWithEmptyDtd.xml
 create mode 100644 xml/tests/testData/xml/EntityRefWithNoDtd.xml
 create mode 100644 xml/tests/testData/xml/EnumeratedAttributesValidation.xsd
 create mode 100644 xml/tests/testData/xml/ErrorInDtd.xml
 create mode 100644 xml/tests/testData/xml/ExternalValidatorOnValidXmlWithNamespacesNotSetup.xml
 create mode 100644 xml/tests/testData/xml/ExternalValidatorOnValidXmlWithNamespacesNotSetup2.xml
 create mode 100644 xml/tests/testData/xml/FinancialReportProcess.bpmn20.xml
 create mode 100644 xml/tests/testData/xml/Forms.xsd
 create mode 100644 xml/tests/testData/xml/HighlightWhenNoNsSchemaLocation.xml
 create mode 100644 xml/tests/testData/xml/HighlightWhenNoNsSchemaLocation.xsd
 create mode 100644 xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd.dtd
 create mode 100644 xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd.xml
 create mode 100644 xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd2.xml
 create mode 100644 xml/tests/testData/xml/IgnoredNamespaceHighlighting.xml
 create mode 100644 xml/tests/testData/xml/ImportProblems.xsd
 create mode 100644 xml/tests/testData/xml/ImportProblems2.xsd
 create mode 100644 xml/tests/testData/xml/InvalidIdRefAttribute.xml
 create mode 100644 xml/tests/testData/xml/InvalidIdRefInXsl.xml
 create mode 100644 xml/tests/testData/xml/ManyRootTags.xml
 create mode 100644 xml/tests/testData/xml/MappedSchemaLocation.xml
 create mode 100644 xml/tests/testData/xml/MavenValidation.xml
 create mode 100644 xml/tests/testData/xml/MinMaxOccursInSchema.xsd
 create mode 100644 xml/tests/testData/xml/MobileHtml.html
 create mode 100644 xml/tests/testData/xml/MuleConfigHighlighting.xml
 create mode 100644 xml/tests/testData/xml/MuleConfigHighlighting2.xml
 create mode 100644 xml/tests/testData/xml/MuleConfigHighlighting2/cxf-beans.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigHighlighting2/cxf_core.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2-cxf.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2-schemadoc.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigValidation.xml
 create mode 100644 xml/tests/testData/xml/MuleConfigValidationSchemas/mule-schemadoc.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigValidationSchemas/mule-stdio.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigValidationSchemas/mule.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigValidationSchemas/spring-beans-2.5.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigValidationSchemas/spring-context-2.5.xsd
 create mode 100644 xml/tests/testData/xml/MuleConfigValidationSchemas/spring-tool-2.5.xsd
 create mode 100644 xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.dtd
 create mode 100644 xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.ent
 create mode 100644 xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.xml
 create mode 100644 xml/tests/testData/xml/NoNamespaceLocation.xml
 create mode 100644 xml/tests/testData/xml/NoNamespaceLocation.xsd
 create mode 100644 xml/tests/testData/xml/NoRootTag.xml
 create mode 100644 xml/tests/testData/xml/NoSpaceBeforeAttrAndNoCdataEnd.xml
 create mode 100644 xml/tests/testData/xml/NonEnumeratedValuesHighlighting.xml
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting.xml
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/bookmap.dtd
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/bookmap.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/concept.dtd
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/concept.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/concept.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/concept.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/ditabase.dtd
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/ditabase.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/glossary.dtd
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/glossary.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/glossary.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/map.dtd
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/map.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/map.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/map.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/metaDecl.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/metaDecl.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/reference.dtd
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/reference.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/reference.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/reference.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/task.dtd
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/task.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/task.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/task.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/tblDecl.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/tblDecl.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/topic.dtd
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/topic.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/topic.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/topic.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/topicAttr.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/topicDefn.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/topicDefn.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.ent.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.mod
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.mod.rnc
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/xnalDomain.ent
 create mode 100644 xml/tests/testData/xml/OasisDocumentHighlighting/xnalDomain.mod
 create mode 100644 xml/tests/testData/xml/PluginXml.xml
 create mode 100644 xml/tests/testData/xml/ProblemWithImportedNsReference.xsd
 create mode 100644 xml/tests/testData/xml/ProblemWithMemberTypes.xsd
 create mode 100644 xml/tests/testData/xml/RedefineBaseType.xml
 create mode 100644 xml/tests/testData/xml/RedefineBaseType.xsd
 create mode 100644 xml/tests/testData/xml/RedefineBaseType_2.xsd
 create mode 100644 xml/tests/testData/xml/RedefineQualifiedType.xml
 create mode 100644 xml/tests/testData/xml/RedefineQualifiedType.xsd
 create mode 100644 xml/tests/testData/xml/RedefineQualifiedType_2.xsd
 create mode 100644 xml/tests/testData/xml/ReferencingTargetNamespace.xml
 create mode 100644 xml/tests/testData/xml/ResolveEntityUrl.xml
 create mode 100644 xml/tests/testData/xml/ResolvedDtdElementReferences.dtd
 create mode 100644 xml/tests/testData/xml/ResolvingEntitiesInDtd.xml
 create mode 100644 xml/tests/testData/xml/ResolvingEntitiesInDtd/RatingandServiceSelectionRequest.dtd
 create mode 100644 xml/tests/testData/xml/ResolvingEntitiesInDtd/XpciInterchange.dtd
 create mode 100644 xml/tests/testData/xml/ResolvingEntitiesInDtd/Xpcivocabulary.dtd
 create mode 100644 xml/tests/testData/xml/SchemaImportHighlightingAndResolve.xsd
 create mode 100644 xml/tests/testData/xml/SchemaReferencesValidation.xsd
 create mode 100644 xml/tests/testData/xml/SchemaUpdate.xml
 create mode 100644 xml/tests/testData/xml/SchemaUpdate.xsd
 create mode 100644 xml/tests/testData/xml/SchemaValidation.xml
 create mode 100644 xml/tests/testData/xml/SchemaValidation2.xml
 create mode 100644 xml/tests/testData/xml/SchemaValidation2.xsd
 create mode 100644 xml/tests/testData/xml/SchemaValidation3.xml
 create mode 100644 xml/tests/testData/xml/SchemaValidation3.xsd
 create mode 100644 xml/tests/testData/xml/SchemaValidation3_2.xsd
 create mode 100644 xml/tests/testData/xml/SchemaValidation4.xml
 create mode 100644 xml/tests/testData/xml/SchemaValidation4.xsd
 create mode 100644 xml/tests/testData/xml/SchemaValidation5.xsd
 create mode 100644 xml/tests/testData/xml/SchemaValidation6.xml
 create mode 100644 xml/tests/testData/xml/SchemaValidation6.xsd
 create mode 100644 xml/tests/testData/xml/SchemaWithXmlId.xml
 create mode 100644 xml/tests/testData/xml/Semantic.xsd
 create mode 100644 xml/tests/testData/xml/SgmlDTD.dtd
 create mode 100644 xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix.xml
 create mode 100644 xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix2.xml
 create mode 100644 xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix2_after.xml
 create mode 100644 xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix3.xml
 create mode 100644 xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix3_after.xml
 create mode 100644 xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix_after.xml
 create mode 100644 xml/tests/testData/xml/StackOverflow.xml
 create mode 100644 xml/tests/testData/xml/StackOverflow2.xsd
 create mode 100644 xml/tests/testData/xml/Tapestry_3_0.dtd
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting2.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting2_after.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting3.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting3_after.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting4.dtd
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting4.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting5.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting5_after.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting6.xml
 create mode 100644 xml/tests/testData/xml/UnboundNsHighlighting6_after.xml
 create mode 100644 xml/tests/testData/xml/UnqualifiedAttributePsi.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferences.dtd
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_2.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_2_after.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_after.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml3.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml3_after.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml_after.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml_after2.xml
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferences_after.dtd
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdElementReferences_after2.dtd
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdEntityReference.dtd
 create mode 100644 xml/tests/testData/xml/UnresolvedDtdEntityReference_after.dtd
 create mode 100644 xml/tests/testData/xml/UnresolvedSymbolForForAttribute.xml
 create mode 100644 xml/tests/testData/xml/UsingDtdReference.dtd
 create mode 100644 xml/tests/testData/xml/UsingDtdReference.xml
 create mode 100644 xml/tests/testData/xml/UsingDtdReference2.dtd
 create mode 100644 xml/tests/testData/xml/UsingSchemaDtd.xsd
 create mode 100644 xml/tests/testData/xml/ValidationOfDtdFile.dtd
 create mode 100644 xml/tests/testData/xml/WebApp.xml
 create mode 100644 xml/tests/testData/xml/WrongRegExpInSchema.xsd
 create mode 100644 xml/tests/testData/xml/WrongRegExpInSchema2.xsd
 create mode 100644 xml/tests/testData/xml/WsdlValidation.wsdl
 create mode 100644 xml/tests/testData/xml/XHtmlValidation.xml
 create mode 100644 xml/tests/testData/xml/XHtmlValidation2.xml
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3.xml
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-attribs-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-base-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-basic-table-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-basic11-model-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-basic11.dtd
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-blkphras-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-blkstruct-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-charent-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-datatypes-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-form-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-framework-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-hypertext-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-image-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-inlphras-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-inlstruct-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-inputmode-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-lat1.ent
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-link-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-list-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-meta-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-notations-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-object-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-param-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-qname-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-script-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-special.ent
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-struct-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-style-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-symbol.ent
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-target-1.mod
 create mode 100644 xml/tests/testData/xml/XHtmlValidation3/xhtml-text-1.mod
 create mode 100644 xml/tests/testData/xml/XInclude-inc.xml
 create mode 100644 xml/tests/testData/xml/XInclude.xml
 create mode 100644 xml/tests/testData/xml/XIncludeTestSchema.xsd
 create mode 100644 xml/tests/testData/xml/XercesCachingProblem.dtd
 create mode 100644 xml/tests/testData/xml/XercesCachingProblem.xml
 create mode 100644 xml/tests/testData/xml/XercesMessageOnDtd.xml
 create mode 100644 xml/tests/testData/xml/XercesMessageOnPI.xml
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding.xml
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding2.xml
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding2.xsd
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding2_2.xml
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding2_2.xsd
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding3.xml
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding4.xml
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding4.xsd
 create mode 100644 xml/tests/testData/xml/XercesMessagesBinding5.xml
 create mode 100644 xml/tests/testData/xml/XmlPsi.xml
 create mode 100644 xml/tests/testData/xml/XsiSchemaLocation.xml
 create mode 100644 xml/tests/testData/xml/XsiSchemaLocation2.xml
 create mode 100644 xml/tests/testData/xml/XsiSchemaLocation2_1.xsd
 create mode 100644 xml/tests/testData/xml/XsiSchemaLocation2_2.xsd
 create mode 100644 xml/tests/testData/xml/XsiSchemaLocation2_3.xsd
 create mode 100644 xml/tests/testData/xml/XsiSchemaLocation3.xsd
 create mode 100644 xml/tests/testData/xml/XsiSchemaLocation_2.xml
 create mode 100644 xml/tests/testData/xml/XsiType.xml
 create mode 100644 xml/tests/testData/xml/XsiType_ActivationRequestV1.00.xsd
 create mode 100644 xml/tests/testData/xml/XsiType_GenericActivationRequestV1.00.xsd
 create mode 100644 xml/tests/testData/xml/XsiType_TypesV1.00.xsd
 create mode 100644 xml/tests/testData/xml/Xslt2.xsl
 create mode 100644 xml/tests/testData/xml/XsltValidation.xsl
 create mode 100644 xml/tests/testData/xml/XsltValidation2.xsl
 create mode 100644 xml/tests/testData/xml/XsltValidation3.xsl
 create mode 100644 xml/tests/testData/xml/allUnbound.xsd
 create mode 100644 xml/tests/testData/xml/application-client_1_4.xsd
 create mode 100644 xml/tests/testData/xml/badXmlns.xml
 create mode 100644 xml/tests/testData/xml/closedTag1.xml
 create mode 100644 xml/tests/testData/xml/def_xslt.dtd
 create mode 100644 xml/tests/testData/xml/duplicateAttribute.xml
 create mode 100644 xml/tests/testData/xml/duplicateAttribute2.xml
 create mode 100644 xml/tests/testData/xml/duplicateAttribute2.xsd
 create mode 100644 xml/tests/testData/xml/ejb-jar_2_0.dtd
 create mode 100644 xml/tests/testData/xml/entities.dtd
 create mode 100644 xml/tests/testData/xml/fop.xsd
 create mode 100644 xml/tests/testData/xml/hibernate-configuration-3.0.dtd
 create mode 100644 xml/tests/testData/xml/hibernate-mapping-3.0.dtd
 create mode 100644 xml/tests/testData/xml/javaee_5.xsd
 create mode 100644 xml/tests/testData/xml/jdo_2_0.xsd
 create mode 100644 xml/tests/testData/xml/jsp_2_0.xsd
 create mode 100644 xml/tests/testData/xml/maven-4.0.0.xsd
 create mode 100644 xml/tests/testData/xml/mule-management.xsd
 create mode 100644 xml/tests/testData/xml/mule.xsd
 create mode 100644 xml/tests/testData/xml/mylib.jar
 create mode 100644 xml/tests/testData/xml/relaxng.xsd
 create mode 100644 xml/tests/testData/xml/rootTag1.xml
 create mode 100644 xml/tests/testData/xml/soap-encoding.xsd
 create mode 100644 xml/tests/testData/xml/spring-beans-2.0.xsd
 create mode 100644 xml/tests/testData/xml/spring-beans-2.5.xsd
 create mode 100644 xml/tests/testData/xml/spring-context-2.5.xsd
 create mode 100644 xml/tests/testData/xml/spring-tool-2.5.xsd
 create mode 100644 xml/tests/testData/xml/struts-config_1_2.dtd
 create mode 100644 xml/tests/testData/xml/web-app_2_3.dtd
 create mode 100644 xml/tests/testData/xml/web-app_2_4.xsd
 create mode 100644 xml/tests/testData/xml/web-jsptaglibrary_1_2.dtd
 create mode 100644 xml/tests/testData/xml/web-jsptaglibrary_2_0.xsd
 create mode 100644 xml/tests/testData/xml/wrongRootTag1.xml
 create mode 100644 xml/tests/testData/xml/wsdl11.xsd
 create mode 100644 xml/tests/testData/xml/wsdl11_soapbinding.xsd
 create mode 100644 xml/tests/testData/xml/xhtml-lat1.ent
 create mode 100644 xml/tests/testData/xml/xhtml-special.ent
 create mode 100644 xml/tests/testData/xml/xhtml-symbol.ent
 create mode 100644 xml/tests/testData/xml/xhtml1-transitional.xsd
 create mode 100644 xml/tests/testData/xml/xlink.xsd
 create mode 100644 xml/tests/testData/xml/xml.xsd

diff --git a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
index 0413a9c23e57..6fbef29a707e 100644
--- a/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
+++ b/xml/tests/src/com/intellij/codeInsight/daemon/XmlHighlightingTest.java
@@ -40,6 +40,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.include.FileIncludeManager;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.xml.*;
+import com.intellij.testFramework.PlatformTestUtil;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.XmlBundle;
@@ -60,7 +61,7 @@ import java.util.*;
 
 @SuppressWarnings({"HardCodedStringLiteral"})
 public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
-  private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/xml/";
+  private static final String BASE_PATH = "/xml/";
 
   private boolean myTestJustJaxpValidation;
   @NonNls private static final String CREATE_NAMESPACE_DECLARATION_INTENTION_NAME = "Create Namespace Declaration";
@@ -390,7 +391,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
   }
 
   public void testComplexSchemaValidation14() throws Exception {
-    doTestWithLocations(new String[][] { {"parent", getTestName(false) + ".xsd"} }, "xml");
+    doTestWithLocations(new String[][]{{"parent", getTestName(false) + ".xsd"}}, "xml");
   }
 
   public void testComplexSchemaValidation14_2() throws Exception {
@@ -420,7 +421,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
 
   public void testComplexSchemaValidation17() throws Exception {
     doTestWithLocations(
-      new String[][] {
+      new String[][]{
         {"urn:test", getTestName(false) + ".xsd"}
       },
       "xml"
@@ -457,7 +458,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
 
     final String expectedFileName = getTestName(false) + ".xsd";
 
-    assertEquals(1,references.length);
+    assertEquals(1, references.length);
     final PsiElement schema = references[0].resolve();
     assertNotNull(schema);
 
@@ -492,7 +493,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
   public void testSchemaValidation4() throws Exception {
     String schemaLocation = getTestName(false)+".xsd";
 
-    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false)+".xml"), getVirtualFile(BASE_PATH + schemaLocation));
+    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false) + ".xml"), getVirtualFile(BASE_PATH + schemaLocation));
 
     ExternalResourceManagerImpl.registerResourceTemporarily(schemaLocation, schemaLocation, getTestRootDisposable());
     doDoTest(true, false);
@@ -502,7 +503,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     String schemaLocation = getTestName(false)+".xsd";
 
     configureByFile(BASE_PATH + schemaLocation);
-    doDoTest(true,false);
+    doDoTest(true, false);
     final List<PsiReference> myTypeOrElementRefs = new ArrayList<PsiReference>(1);
     final List<XmlTag> myTypesAndElementDecls = new ArrayList<XmlTag>(1);
 
@@ -588,7 +589,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     String url = "antlib:org.apache.maven.artifact.ant";
 
     enableInspectionTool(new AntResolveInspection());
-    doTestWithLocations(new String[][] { {url, getTestName(false) + ".xsd"} }, "xml");
+    doTestWithLocations(new String[][]{{url, getTestName(false) + ".xsd"}}, "xml");
   }
 
   public void testWrongRegExpInSchema() throws Exception {
@@ -652,13 +653,14 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
           final List<XmlAttribute> attrs = new ArrayList<XmlAttribute>();
 
           myFile.acceptChildren(new XmlRecursiveElementVisitor() {
-            @Override public void visitXmlAttribute(final XmlAttribute attribute) {
+            @Override
+            public void visitXmlAttribute(final XmlAttribute attribute) {
               if (attribute.getDescriptor() != null) attrs.add(attribute);
             }
           });
 
           assertEquals(8, attrs.size());
-          for(XmlAttribute a:attrs) {
+          for (XmlAttribute a : attrs) {
             final PsiElement element = a.getDescriptor().getDeclaration();
             assertTrue(((Navigatable)element).canNavigate());
           }
@@ -860,7 +862,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
 
     final XmlTag tag3 = root.getSubTags()[0].getSubTags()[1];
     assert tag3.getLocalName().equals("bar2");
-    assertEquals("zzz",tag3.getAttributeValue("zzz", "def"));
+    assertEquals("zzz", tag3.getAttributeValue("zzz", "def"));
   }
 
   public void testXsiSchemaLocation2() throws Exception {
@@ -995,13 +997,15 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
 
     assertEquals("Should be three tags", 3, tags.size());
     String location = "xslt-1_0.xsd";
-    checkOneTagForSchemaAttribute(tags.get(2),"schemaLocation",location);
+    checkOneTagForSchemaAttribute(tags.get(2), "schemaLocation", location);
   }
 
   public void testResolvingEntitiesInDtd() throws Exception {
-    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false)+".xml"), getVirtualFile(BASE_PATH + getTestName(false) + "/RatingandServiceSelectionRequest.dtd"),
-                     getVirtualFile(BASE_PATH + getTestName(false) + "/XpciInterchange.dtd"), getVirtualFile(BASE_PATH + getTestName(false) + "/Xpcivocabulary.dtd"));
-    doDoTest(true,false);
+    configureByFiles(null, getVirtualFile(BASE_PATH + getTestName(false) + ".xml"),
+                     getVirtualFile(BASE_PATH + getTestName(false) + "/RatingandServiceSelectionRequest.dtd"),
+                     getVirtualFile(BASE_PATH + getTestName(false) + "/XpciInterchange.dtd"),
+                     getVirtualFile(BASE_PATH + getTestName(false) + "/Xpcivocabulary.dtd"));
+    doDoTest(true, false);
   }
 
   // TODO: external validator should not be lauched due to error detected after general highlighting pass!
@@ -1157,7 +1161,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     final String baseName = BASE_PATH + getTestName(false);
 
     configureByFiles(null, getVirtualFile(baseName + ".xml"), getVirtualFile(baseName + ".dtd"), getVirtualFile(baseName + "2.dtd"));
-    doDoTest(true,false);
+    doDoTest(true, false);
   }
 
   public void testUnboundNsHighlighting() throws Exception {
@@ -1188,7 +1192,7 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     Collection<HighlightInfo> infos = doDoTest(true, withInfos);
 
     findAndInvokeIntentionAction(infos, intentionActionName, myEditor, myFile);
-    checkResultByFile(s+"_after.xml");
+    checkResultByFile(s + "_after.xml");
   }
 
   public void testSpecifyXsiSchemaLocationQuickFix() throws Exception {
@@ -1979,9 +1983,6 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd",
                                                             getTestDataPath() + BASE_PATH + "web-app_2_4.xsd",
                                                             getTestRootDisposable());
-    //ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/xml/ns/j2ee",
-    //                                                        getTestDataPath() + BASE_PATH + "javaee_5.xsd",
-    //                                                        getTestRootDisposable());
     ExternalResourceManagerImpl.registerResourceTemporarily("http://java.sun.com/dtd/web-app_2_3.dtd",
                                                             getTestDataPath() + BASE_PATH + "web-app_2_3.dtd",
                                                             getTestRootDisposable());
@@ -2033,6 +2034,11 @@ public class XmlHighlightingTest extends DaemonAnalyzerTestCase {
     ExternalResourceManagerEx.getInstanceEx().setDefaultHtmlDoctype(myOldDoctype, getProject());
   }
 
+  @Override
+  protected String getTestDataPath() {
+    return PlatformTestUtil.getCommunityPath().replace(File.separatorChar, '/') + "/xml/tests/testData/";
+  }
+
   @Override
   protected void tearDown() throws Exception {
     XmlSettings.getInstance().SHOW_XML_ADD_IMPORT_HINTS = old;
diff --git a/xml/tests/testData/xml/AnyAttributesInAttrGroup.xml b/xml/tests/testData/xml/AnyAttributesInAttrGroup.xml
new file mode 100644
index 000000000000..7f096fc891a1
--- /dev/null
+++ b/xml/tests/testData/xml/AnyAttributesInAttrGroup.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<foo:foo xmlns:foo="http://www.foo.org/test"
+         xmlns:bar="http://www.bar.org/test">
+  <foo:child bar:bar="false" flag="false"/>
+</foo:foo>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/AnyAttributesInAttrGroup.xsd b/xml/tests/testData/xml/AnyAttributesInAttrGroup.xsd
new file mode 100644
index 000000000000..0bb1bbb7a6e5
--- /dev/null
+++ b/xml/tests/testData/xml/AnyAttributesInAttrGroup.xsd
@@ -0,0 +1,23 @@
+<xsd:schema xmlns="http://www.foo.org/test"
+         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+         targetNamespace="http://www.foo.org/test"
+         elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xsd:attributeGroup name="myAttributes">
+    <xsd:attribute name="flag" type="xsd:boolean" use="required"/>
+    <xsd:anyAttribute namespace="##other" processContents="lax"/>
+  </xsd:attributeGroup>
+
+  <xsd:element name="foo">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="child">
+          <xsd:complexType>
+            <xsd:attributeGroup ref="myAttributes"/>
+          </xsd:complexType>
+        </xsd:element>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/AnyAttributesInAttrGroup_2.xsd b/xml/tests/testData/xml/AnyAttributesInAttrGroup_2.xsd
new file mode 100644
index 000000000000..5589f11439a3
--- /dev/null
+++ b/xml/tests/testData/xml/AnyAttributesInAttrGroup_2.xsd
@@ -0,0 +1,8 @@
+<xsd:schema xmlns="http://www.bar.org/test"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.bar.org/test"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xsd:attribute name="bar" type="xsd:boolean"/>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/BPMN20.xsd b/xml/tests/testData/xml/BPMN20.xsd
new file mode 100644
index 000000000000..8f711a603629
--- /dev/null
+++ b/xml/tests/testData/xml/BPMN20.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified"	
+	xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+	targetNamespace="http://www.omg.org/spec/BPMN/20100524/MODEL">
+
+	<xsd:import namespace="http://www.omg.org/spec/BPMN/20100524/DI" schemaLocation="BPMNDI.xsd"/>
+	 <xsd:include schemaLocation="Semantic.xsd"/>
+
+	<xsd:element name="definitions" type="tDefinitions"/>
+	<xsd:complexType name="tDefinitions">
+		<xsd:sequence>
+			<xsd:element ref="import" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="rootElement" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="bpmndi:BPMNDiagram" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="relationship" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+		<xsd:attribute name="name" type="xsd:string"/>
+		<xsd:attribute name="targetNamespace" type="xsd:anyURI" use="required"/>
+		<xsd:attribute name="expressionLanguage" type="xsd:anyURI" use="optional" default="http://www.w3.org/1999/XPath"/>
+		<xsd:attribute name="typeLanguage" type="xsd:anyURI" use="optional" default="http://www.w3.org/2001/XMLSchema"/>
+		<xsd:attribute name="exporter" type="xsd:string"/>
+		<xsd:attribute name="exporterVersion" type="xsd:string"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	
+	<xsd:element name="import" type="tImport"/>
+	<xsd:complexType name="tImport">
+		<xsd:attribute name="namespace" type="xsd:anyURI" use="required"/>
+		<xsd:attribute name="location" type="xsd:string" use="required"/>
+		<xsd:attribute name="importType" type="xsd:anyURI" use="required"/>
+	</xsd:complexType>
+
+
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ChangeRootElement.xml b/xml/tests/testData/xml/ChangeRootElement.xml
new file mode 100644
index 000000000000..03aedc89dd95
--- /dev/null
+++ b/xml/tests/testData/xml/ChangeRootElement.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE xxx [
+  <!ELEMENT xxx (zzz)*>
+  <!ELEMENT zzz (#PCDATA)>
+  ]>
+<<error>xxx<caret>2</error>>
+  <zzz/>
+</<error>xxx2</error>>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ChangeRootElement_after.xml b/xml/tests/testData/xml/ChangeRootElement_after.xml
new file mode 100644
index 000000000000..80dded409d66
--- /dev/null
+++ b/xml/tests/testData/xml/ChangeRootElement_after.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE xxx [
+  <!ELEMENT xxx (zzz)*>
+  <!ELEMENT zzz (#PCDATA)>
+  ]>
+<xxx<caret>>
+  <zzz/>
+</xxx>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ClosedTag2.xml b/xml/tests/testData/xml/ClosedTag2.xml
new file mode 100644
index 000000000000..6ab43a003a96
--- /dev/null
+++ b/xml/tests/testData/xml/ClosedTag2.xml
@@ -0,0 +1,9 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <<error>abc</error>>
+
+  </<error>abcdef</error>>
+
+  <<error>xyz</error>>
+
+  </<error>x</error>>aaa
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/CommentBeforeProlog.xml b/xml/tests/testData/xml/CommentBeforeProlog.xml
new file mode 100644
index 000000000000..d020956e7cb1
--- /dev/null
+++ b/xml/tests/testData/xml/CommentBeforeProlog.xml
@@ -0,0 +1,3 @@
+<error descr="Xml declaration should precede all document content"><!--Comment--></error>
+<?xml version="1.0"?>
+<foo />
\ No newline at end of file
diff --git a/xml/tests/testData/xml/CommentBeforeProlog_2.xml b/xml/tests/testData/xml/CommentBeforeProlog_2.xml
new file mode 100644
index 000000000000..9f1e0f71c262
--- /dev/null
+++ b/xml/tests/testData/xml/CommentBeforeProlog_2.xml
@@ -0,0 +1,2 @@
+<!--Comment-->
+<foo />
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexDtdValidation.xml b/xml/tests/testData/xml/ComplexDtdValidation.xml
new file mode 100644
index 000000000000..cc0a0d5baf61
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexDtdValidation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<!DOCTYPE page-specification PUBLIC
+  "-//Apache Software Foundation//Tapestry Specification 3.0//EN"
+  "http://jakarta.apache.org/tapestry/dtd/Tapestry_3_0.dtd">
+
+<page-specification class="org.sigpath.tapestry.pages.ViewUsersPage">
+    <property-specification name="users" type="java.util.Collection" persistent="yes"/>
+    <<error>bean</error> name="evenOdd" <error>type</error>="org.apache.tapestry.bean.EvenOdd"/>
+</page-specification>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexDtdValidation2.dtd b/xml/tests/testData/xml/ComplexDtdValidation2.dtd
new file mode 100644
index 000000000000..94eb62dd64a9
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexDtdValidation2.dtd
@@ -0,0 +1,2 @@
+<!ELEMENT foo (bar)>
+<!ELEMENT bar (#PCDATA)>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexDtdValidation2.xml b/xml/tests/testData/xml/ComplexDtdValidation2.xml
new file mode 100644
index 000000000000..76bc7137b5a2
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexDtdValidation2.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE foo SYSTEM "ComplexDtdValidation2.dtd">
+<<error>foo</error>></<error>foo</error>>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine.xml b/xml/tests/testData/xml/ComplexRedefine.xml
new file mode 100644
index 000000000000..75ab2f6c7198
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<graph edgedefault="directed">
+</graph>
+</graphml>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine2.xml b/xml/tests/testData/xml/ComplexRedefine2.xml
new file mode 100644
index 000000000000..81fbc83b31aa
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns/graphml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns/graphml http://www.yworks.com/xml/schema/graphml/1.0/ygraphml.xsd">
+<key id="d0" for="node" yfiles.type="nodegraphics"/>
+<key id="d1" for="edge" yfiles.type="edgegraphics"/>
+<graph id="G" edgedefault="directed">
+</graph>
+</graphml>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml-attributes.xsd b/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml-attributes.xsd
new file mode 100644
index 000000000000..d57855f029ef
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml-attributes.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<xs:schema
+             targetNamespace="http://graphml.graphdrawing.org/xmlns/graphml"
+
+             xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+
+             elementFormDefault="unqualified"
+             attributeFormDefault="unqualified"
+>
+
+<!--=============redefinition of the======================-->
+<!--=============key attributes===========================-->
+
+<xs:redefine schemaLocation="graphml-structure.xsd">
+
+  <xs:attributeGroup name="key.extra.attrib">
+    <xs:attributeGroup ref="key.extra.attrib"/>
+    <xs:attributeGroup ref="key.attributes.attrib"/>
+  </xs:attributeGroup>
+
+</xs:redefine>
+
+	<xs:simpleType name="key.name.type" final="#all">
+		<xs:restriction base="xs:NMTOKEN"/>
+	</xs:simpleType>
+
+<xs:simpleType name="key.type.type" final="#all">
+  <xs:restriction base="xs:NMTOKEN">  
+    <xs:enumeration value="boolean"/>
+    <xs:enumeration value="int"/>
+    <xs:enumeration value="long"/>
+    <xs:enumeration value="float"/>
+    <xs:enumeration value="double"/>
+    <xs:enumeration value="string"/>
+  </xs:restriction>
+</xs:simpleType>
+
+	<xs:attributeGroup name="key.attributes.attrib">
+		<xs:attribute name="attr.name" type="key.name.type" use="optional"/>
+		<xs:attribute name="attr.type" type="key.type.type" use="optional"/>
+	</xs:attributeGroup>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml-structure.xsd b/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml-structure.xsd
new file mode 100644
index 000000000000..f785136685b1
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml-structure.xsd
@@ -0,0 +1,430 @@
+<?xml version="1.0"?>
+
+<xs:schema
+             targetNamespace="http://graphml.graphdrawing.org/xmlns/graphml"
+
+             xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:g="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+             xmlns:xlink="http://www.w3.org/1999/xlink" 
+
+             elementFormDefault="unqualified"
+             attributeFormDefault="unqualified"
+>
+
+<xs:import namespace="http://www.w3.org/1999/xlink" 
+           schemaLocation="xlink.xsd"
+/>
+
+
+
+<!--======================================================-->
+<!--=========user-defined extra attributes================-->
+<!--======================================================-->
+
+<!--extra attributes common to all GraphML elements-->
+
+<xs:attributeGroup name="common.extra.attrib"/>
+
+<!--specific extra attributes-->
+
+<xs:attributeGroup name="graphml.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="data.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="key.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="default.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="graph.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="node.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="edge.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="port.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="hyperedge.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="endpoint.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="locator.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+
+
+
+<!--======================================================-->
+<!--=============element type definitions=================-->
+<!--======================================================-->
+
+<!--=============data type================================-->
+
+<!--extension mechanism for the content of data and default-->
+<xs:complexType name="data-extension.type"/>
+
+<xs:complexType name="data.type" final="#all">
+  <xs:complexContent mixed="true">
+    <xs:extension base="data-extension.type">
+      <xs:attribute name="key" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="id" type="xs:NMTOKEN" use="optional"/>
+      <xs:attributeGroup ref="data.extra.attrib"/>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+
+
+<!--=============key type=================================-->
+<xs:simpleType name="key.for.type" final="#all">
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="all"/>
+    <xs:enumeration value="graph"/>
+    <xs:enumeration value="node"/>
+    <xs:enumeration value="edge"/>
+    <xs:enumeration value="hyperedge"/>
+    <xs:enumeration value="port"/>
+    <xs:enumeration value="endpoint"/>
+  </xs:restriction>
+</xs:simpleType>
+
+
+<xs:complexType name="key.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>    
+    <xs:element ref="default" minOccurs="0"/>
+  </xs:sequence>
+  <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
+  <xs:attribute name="for" type="key.for.type" default="all"/>
+  <xs:attributeGroup ref="key.extra.attrib"/>
+</xs:complexType>
+
+<!--=============default type=============================-->
+<xs:complexType name="default.type" final="#all">
+  <xs:complexContent mixed="true">
+    <xs:extension base="data-extension.type">
+      <xs:attributeGroup ref="default.extra.attrib"/>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+
+
+<!--=============graphml type=============================-->
+
+<xs:complexType name="graphml.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>    
+    <xs:element ref="key" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="graph"/>
+        <xs:element ref="data"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:sequence>
+  <xs:attributeGroup ref="graphml.extra.attrib"/>
+</xs:complexType>
+
+
+<!--=============graph type===============================-->
+
+<xs:simpleType name="graph.edgedefault.type" final="#all">
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="directed"/>
+    <xs:enumeration value="undirected"/>
+  </xs:restriction>
+</xs:simpleType>
+
+
+<xs:complexType name="graph.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:choice>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="data"/>
+          <xs:element ref="node"/>
+          <xs:element ref="edge"/>
+          <xs:element ref="hyperedge"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:element ref="locator"/>
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="graph.extra.attrib"/>
+  <xs:attribute name="id" type="xs:NMTOKEN"  />
+  <xs:attribute name="edgedefault" 
+                type="graph.edgedefault.type" use="required"/>
+</xs:complexType>
+
+<!--=============node type================================-->
+
+<xs:complexType name="node.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:choice>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="data"/>
+          <xs:element ref="port"/>
+        </xs:choice>
+        <xs:element ref="graph" minOccurs="0"/>
+      </xs:sequence>
+      <xs:element ref="locator"/>
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="node.extra.attrib"/>
+  <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
+</xs:complexType>
+
+<!--=============port type================================-->
+
+<xs:complexType name="port.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="data" />
+      <xs:element ref="port" />
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="port.extra.attrib"/> 
+  <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
+</xs:complexType>
+  
+<!--=============edge type================================-->
+
+<xs:complexType name="edge.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:element ref="data" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element ref="graph" minOccurs="0"/>
+  </xs:sequence>
+  <xs:attributeGroup ref="edge.extra.attrib"/>
+  <xs:attribute name="id" type="xs:NMTOKEN" />
+  <xs:attribute name="directed" type="xs:boolean"/>
+  <xs:attribute name="source" type="xs:NMTOKEN" use="required"/>
+  <xs:attribute name="target" type="xs:NMTOKEN" use="required"/>
+  <xs:attribute name="sourceport" type="xs:NMTOKEN"/>
+  <xs:attribute name="targetport" type="xs:NMTOKEN"/>
+</xs:complexType>
+
+<!--=============hyperedge type===========================-->
+
+<xs:complexType name="hyperedge.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="data" />
+      <xs:element ref="endpoint" />
+    </xs:choice>
+    <xs:element ref="graph" minOccurs="0" />
+  </xs:sequence>
+  <xs:attributeGroup ref="hyperedge.extra.attrib"/> 
+  <xs:attribute name="id" type="xs:NMTOKEN" />
+</xs:complexType>
+  
+<!--=============endpoint type============================-->
+
+<xs:simpleType name="endpoint.type.type" final="#all">
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="in"/>
+    <xs:enumeration value="out"/>
+    <xs:enumeration value="undir"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:complexType name="endpoint.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+  </xs:sequence>
+  <xs:attributeGroup ref="endpoint.extra.attrib"/> 
+  <xs:attribute name="id" type="xs:NMTOKEN"/>
+  <xs:attribute name="port" type="xs:NMTOKEN" />
+  <xs:attribute name="node" type="xs:NMTOKEN" use="required"/>
+  <xs:attribute name="type" type="endpoint.type.type" default="undir"/>
+</xs:complexType>
+
+<!--=============locator type=============================-->
+
+<xs:complexType name="locator.type" final="#all">
+  <xs:attributeGroup ref="locator.extra.attrib"/>
+  <xs:attribute ref="xlink:href" use="required"/>
+  <xs:attribute ref="xlink:type" fixed="simple"/>
+</xs:complexType>
+
+
+<!--======================================================-->
+<!--============element declarations======================-->
+<!--======================================================-->
+
+<!--=============element: desc============================-->
+<xs:element name="desc" type="xs:string" block="#all"/>
+
+<!--=============element: locator=========================-->
+<xs:element name="locator" type="locator.type" block="#all"/>
+
+<!--=============element: data============================-->
+<xs:element name="data" type="data.type" block="#all">
+
+  <xs:unique name="data_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: key=============================-->
+<xs:element name="key" type="key.type" block="#all"/>
+
+<!--=============element: default=========================-->
+<xs:element name="default" type="default.type" block="#all"/>
+
+<!--=============element: graphml=========================-->
+<xs:element name="graphml" type="graphml.type" block="#all">
+
+  <xs:unique name="all_id_unique">
+    <xs:selector xpath=".//g:*"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="graphml_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+  <xs:key name="key_id_key"> 
+    <xs:selector xpath=".//g:key"/>
+    <xs:field xpath="@id"/>
+  </xs:key>
+
+  <xs:key name="node_id_key"> 
+    <xs:selector xpath=".//g:node"/>
+    <xs:field xpath="@id"/>
+  </xs:key>
+
+  <xs:unique name="edge_id_unique"> 
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="hyperedge_id_unique"> 
+    <xs:selector xpath=".//g:hyperedge"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="endpoint_id_unique"> 
+    <xs:selector xpath=".//g:endpoint"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="graph_id_unique"> 
+    <xs:selector xpath=".//g:graph"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:keyref name="data_key_ref" refer="key_id_key">
+    <xs:selector xpath=".//g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:keyref> 
+
+  <xs:keyref name="edge_source_ref" refer="node_id_key">
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@source"/>
+  </xs:keyref> 
+
+  <xs:keyref name="edge_target_ref" refer="node_id_key">
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@target"/>
+  </xs:keyref>
+
+  <xs:keyref name="endpoint_node_ref" refer="node_id_key">
+    <xs:selector xpath=".//g:endpoint"/>
+    <xs:field xpath="@node"/>
+  </xs:keyref>
+
+</xs:element>
+
+
+<!--=============element: graph===========================-->
+<xs:element name="graph" type="graph.type" block="#all">
+
+  <xs:unique name="graph_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: node============================-->
+<xs:element name="node" type="node.type" block="#all">
+
+  <xs:key name="port_name_key"> 
+    <xs:selector xpath=".//g:port"/>
+    <xs:field xpath="@name"/>
+  </xs:key>
+
+  <xs:unique name="node_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: port============================-->
+<xs:element name="port" type="port.type" block="#all">
+
+  <xs:unique name="port_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: edge============================-->
+<xs:element name="edge" type="edge.type" block="#all">
+
+  <xs:unique name="edge_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: hyperedge=======================-->
+<xs:element name="hyperedge" type="hyperedge.type" block="#all">
+
+  <xs:unique name="hyperedge_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: endpoint========================-->
+<xs:element name="endpoint" type="endpoint.type" block="#all"/>
+
+</xs:schema>
+
+<!--======================================================-->
+<!--      end of file: graphml-structure.xsd             -->
+<!--======================================================-->
diff --git a/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml.xsd b/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml.xsd
new file mode 100644
index 000000000000..00e79f4ab8ee
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2Schemas/graphml.xsd
@@ -0,0 +1,345 @@
+<?xml version="1.0"?>
+
+<xs:schema   
+             targetNamespace="http://graphml.graphdrawing.org/xmlns"
+
+             xmlns="http://graphml.graphdrawing.org/xmlns"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+
+             elementFormDefault="qualified"
+             attributeFormDefault="unqualified"
+>
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     This document defines the GraphML language including GraphML attributes and GraphML parseinfo.
+    </xs:documentation>
+  </xs:annotation>
+
+
+<xs:redefine schemaLocation="http://graphml.graphdrawing.org/xmlns/1.0/graphml-structure.xsd">
+
+  <!--redefinition as in graphml-attributes.xsd -->
+
+  <xs:attributeGroup name="key.extra.attrib">
+    <xs:attributeGroup ref="key.extra.attrib"/>
+    <xs:attributeGroup ref="key.attributes.attrib"/>
+  </xs:attributeGroup>
+
+  <!--redefinition as in graphml-parseinfo.xsd -->
+
+  <xs:attributeGroup name="graph.extra.attrib">
+    <xs:attributeGroup ref="graph.extra.attrib"/>
+    <xs:attributeGroup ref="graph.parseinfo.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="node.extra.attrib">
+    <xs:attributeGroup ref="node.extra.attrib"/>
+    <xs:attributeGroup ref="node.parseinfo.attrib"/>
+  </xs:attributeGroup>
+
+</xs:redefine>
+
+
+  <!--types as in graphml-attributes.xsd -->
+
+<xs:simpleType name="key.name.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/(Dokumentation der Attributes Erweiterung; entsprechende Stelle.html)"
+        xml:lang="en">
+      Simple type for the attr.name attribute of &lt;key>.
+      key.name.type is final, that is, it may not be extended
+                          or restricted.
+      key.name.type is a restriction of xs:NMTOKEN
+      Allowed values: (no restriction)
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN"/>
+
+</xs:simpleType>
+
+
+
+<xs:simpleType name="key.type.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/(Dokumentation der Attributes Erweiterung; entsprechende Stelle.html)"
+        xml:lang="en">
+      Simple type for the attr.type attribute of &lt;key>.
+      key.type.type is final, that is, it may not be extended
+                          or restricted.
+      key.type.type is a restriction of xs:NMTOKEN
+      Allowed values: boolean, int, long, float, double, string.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN">  
+    <xs:enumeration value="boolean"/>
+    <xs:enumeration value="int"/>
+    <xs:enumeration value="long"/>
+    <xs:enumeration value="float"/>
+    <xs:enumeration value="double"/>
+    <xs:enumeration value="string"/>
+  </xs:restriction>
+
+</xs:simpleType>
+
+
+<xs:attributeGroup name="key.attributes.attrib">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     Definition of the attribute group key.attributes.attrib.
+     This group consists of the two optional attributes
+         - attr.name (gives the name for the data function)
+         - attr.type ((declares the range of values for the data function)
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attribute name="attr.name" type="key.name.type" use="optional"/>
+  <xs:attribute name="attr.type" type="key.type.type" use="optional"/>
+</xs:attributeGroup>
+
+  <!--types as in graphml-parseinfo.xsd -->
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+       Simple type definitions for the new graph attributes.
+    </xs:documentation>
+  </xs:annotation>
+
+<xs:simpleType name="graph.order.type"  final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.order attribute of &lt;graph>.
+      graph.order.type is final, that is, it may not be extended
+                          or restricted.
+      graph.order.type is a restriction of xs:NMTOKEN
+      Allowed values: free, nodesfirst, adjacencylist.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="free"/>
+    <xs:enumeration value="nodesfirst"/>
+    <xs:enumeration value="adjacencylist"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:simpleType name="graph.nodes.type"  final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.nodes attribute of &lt;graph>.
+      graph.nodes.type is final, that is, it may not be extended
+                          or restricted.
+      graph.nodes.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.edges.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.edges attribute of &lt;graph>.
+      graph.edges.type is final, that is, it may not be extended
+                          or restricted.
+      graph.edges.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.maxindegree.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.maxindegree attribute of &lt;graph>.
+      graph.maxindegree.type is final, that is, it may not be extended
+                          or restricted.
+      graph.maxindegree.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.maxoutdegree.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.maxoutdegree attribute of &lt;graph>.
+      graph.maxoutdegree.type is final, that is, it may not be extended
+                          or restricted.
+      graph.maxoutdegree.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.nodeids.type"  final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.nodeids attribute of &lt;graph>.
+      graph.nodeids.type is final, that is, it may not be extended
+                          or restricted.
+      graph.nodeids.type is a restriction of xs:string
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="canonical"/>
+    <xs:enumeration value="free"/>
+  </xs:restriction>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.edgeids.type"  final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.edgeids attribute of &lt;graph>.
+      graph.edgeids.type is final, that is, it may not be extended
+                          or restricted.
+      graph.edgeids.type is a restriction of xs:string
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="canonical"/>
+    <xs:enumeration value="free"/>
+  </xs:restriction>  
+</xs:simpleType>
+
+<xs:attributeGroup name="graph.parseinfo.attrib">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     Definition of the attribute group graph.parseinfo.attrib.
+     This group consists of the seven attributes
+     - parse.nodeids (fixed to 'canonical' meaning that the id attribute
+                      of &lt;node> follows the pattern 'n[number]),
+     - parse.edgeids (fixed to 'canonical' meaning that the id attribute
+                      of &lt;edge> follows the pattern 'e[number]),
+     - parse.order (required; one of the values 'nodesfirst', 
+                    'adjacencylist' or 'free'),
+     - parse.nodes (required; number of nodes in this graph), 
+     - parse.edges (required; number of edges in this graph), 
+     - parse.maxindegree (optional; maximal indegree of a node in this graph),
+     - parse.maxoutdegree (optional; maximal outdegree of a node in this graph)
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attribute name="parse.nodeids" type="graph.nodeids.type"/>
+  <xs:attribute name="parse.edgeids" type="graph.edgeids.type"/>
+  <xs:attribute name="parse.order" type="graph.order.type"/>
+  <xs:attribute name="parse.nodes" type="graph.nodes.type"/>
+  <xs:attribute name="parse.edges" type="graph.edges.type"/>
+  <xs:attribute name="parse.maxindegree" type="graph.maxindegree.type" use="optional"/>
+  <xs:attribute name="parse.maxoutdegree" type="graph.maxoutdegree.type" use="optional"/>
+</xs:attributeGroup>
+
+
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+       Simple type definitions for the new node attributes.
+    </xs:documentation>
+  </xs:annotation>
+
+<xs:simpleType name="node.indegree.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.indegree attribute of &lt;node>.
+      node.indegree.type is final, that is, it may not be extended
+                          or restricted.
+      node.indegree.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="node.outdegree.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.outdegree attribute of &lt;node>.
+      node.outdegree.type is final, that is, it may not be extended
+                          or restricted.
+      node.outdegree.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:attributeGroup name="node.parseinfo.attrib">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     Definition of the attribute group node.parseinfo.attrib.
+     This group consists of two attributes
+     - parse.indegree (optional; indegree of this node),
+     - parse.outdegree (optional; outdegree of this node).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attribute name="parse.indegree" type="node.indegree.type" use="optional"/>
+  <xs:attribute name="parse.outdegree" type="node.outdegree.type" use="optional"/>
+</xs:attributeGroup>
+
+</xs:schema>
+
+<!--======================================================-->
+<!--      end of file: graphml-parseinfo.xsd             -->
+<!--======================================================-->
diff --git a/xml/tests/testData/xml/ComplexRedefine2Schemas/xlink.xsd b/xml/tests/testData/xml/ComplexRedefine2Schemas/xlink.xsd
new file mode 100644
index 000000000000..0fa621b64147
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2Schemas/xlink.xsd
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<xs:schema 
+        targetNamespace="http://www.w3.org/1999/xlink" 
+
+        xmlns:xlink="http://www.w3.org/1999/xlink" 
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+>
+
+<xs:attribute name="type" default="simple">
+  <xs:simpleType>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="simple"/>
+      <xs:enumeration value="extended"/>
+      <xs:enumeration value="locator"/>
+      <xs:enumeration value="arc"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:attribute>
+
+<xs:attribute name="href" type="xs:anyURI" />
+
+<xs:attribute name="role" type="xs:string" />
+
+<xs:attribute name="arcrole" type="xs:string" />
+
+<xs:attribute name="title" type="xs:string" />
+
+<xs:attribute name="show" default="embed">
+  <xs:simpleType>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="new"/>
+      <xs:enumeration value="replace"/>
+      <xs:enumeration value="embed"/>
+      <xs:enumeration value="other"/>
+      <xs:enumeration value="none"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:attribute>
+
+<xs:attribute name="actuate" default="onLoad">
+  <xs:simpleType>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="onLoad"/>
+      <xs:enumeration value="onRequest"/>
+      <xs:enumeration value="other"/>
+      <xs:enumeration value="none"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:attribute>
+
+<xs:attribute name="from" type="xs:string" />
+
+<xs:attribute name="to" type="xs:string" />
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexRedefine2Schemas/yfeatures.xsd b/xml/tests/testData/xml/ComplexRedefine2Schemas/yfeatures.xsd
new file mode 100644
index 000000000000..1b96acba3f25
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2Schemas/yfeatures.xsd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema 
+  targetNamespace="http://www.yworks.com/xml/graphml" 
+  
+  xmlns="http://www.yworks.com/xml/graphml" 
+  xmlns:g="http://graphml.graphdrawing.org/xmlns/graphml" 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xlink="http://www.w3.org/1999/xlink" 
+  
+  elementFormDefault="qualified" 
+  attributeFormDefault="unqualified">
+  
+<xs:include schemaLocation="ygraphics.xsd"/>
+<xs:include schemaLocation="yprocessors.xsd"/>
+</xs:schema>
+
diff --git a/xml/tests/testData/xml/ComplexRedefine2Schemas/ygraphics.xsd b/xml/tests/testData/xml/ComplexRedefine2Schemas/ygraphics.xsd
new file mode 100644
index 000000000000..68f6617b8237
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2Schemas/ygraphics.xsd
@@ -0,0 +1,550 @@
+<?xml version="1.0"?>
+
+<!-- Header -->
+<xs:schema 
+             targetNamespace="http://www.yworks.com/xml/graphml"
+
+             xmlns="http://www.yworks.com/xml/graphml"
+             xmlns:g="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+             xmlns:xlink="http://www.w3.org/1999/xlink"
+
+             elementFormDefault="qualified"
+             attributeFormDefault="unqualified"
+>
+
+<!--                             -->
+<!-- Enumeration Types --> 
+<!--                             -->
+
+
+<!-- LineType -->
+<xs:simpleType name="lineType.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="line"/>
+    	<xs:enumeration value="dashed"/>
+    	<xs:enumeration value="dotted"/>
+    </xs:restriction>
+</xs:simpleType>
+
+<!-- Font styles -->
+<xs:simpleType name="fontStyle.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="plain"/>
+    	<xs:enumeration value="bold"/>
+    	<xs:enumeration value="italic"/>
+    </xs:restriction>
+</xs:simpleType>
+
+<!-- Shape of Shape Nodes -->
+<xs:simpleType name="ShapeType.type">
+	<xs:restriction base="xs:NMTOKEN">
+        <xs:enumeration value="rectangle"/>
+        <xs:enumeration value="roundrectangle"/>
+        <xs:enumeration value="ellipse"/>
+        <xs:enumeration value="parallelogram"/>
+        <xs:enumeration value="hexagon"/>
+        <xs:enumeration value="octagon"/>
+        <xs:enumeration value="diamond"/>
+        <xs:enumeration value="triangle"/>
+        <xs:enumeration value="trapezoid"/>
+        <xs:enumeration value="trapezoid2"/>
+        <xs:enumeration value="rectangle3d"/>
+    </xs:restriction>
+</xs:simpleType>
+
+<!-- Arrow types -->
+<xs:simpleType name="arrowType.type">
+	<xs:restriction base="xs:NMTOKEN">
+        <xs:enumeration value="standard"/>
+        <xs:enumeration value="delta"/>
+        <xs:enumeration value="diamond"/>
+        <xs:enumeration value="white_diamond"/>
+        <xs:enumeration value="white_delta"/>
+        <xs:enumeration value="none"/>
+    </xs:restriction>
+</xs:simpleType>
+
+
+<!-- Alignment of Labels -->
+<xs:simpleType name="alignment.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="center"/>
+    	<xs:enumeration value="left"/>
+    	<xs:enumeration value="right"/>
+    </xs:restriction>
+</xs:simpleType>
+
+<!-- Node Label Models -->
+
+<xs:simpleType name="nodeLabelModel.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="free"/>
+		<xs:enumeration value="sides"/>
+		<xs:enumeration value="corners"/>
+		<xs:enumeration value="eight_pos"/>
+		<xs:enumeration value="sandwich"/>
+		<xs:enumeration value="internal"/>
+    </xs:restriction>
+</xs:simpleType>
+
+<!-- Node Label Positions -->
+
+<xs:simpleType name="nodeLabelPosition.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="n"/>
+		<xs:enumeration value="nw"/>
+		<xs:enumeration value="ne"/>
+		<xs:enumeration value="w"/>
+		<xs:enumeration value="e"/>
+		<xs:enumeration value="sw"/>
+		<xs:enumeration value="s"/>
+		<xs:enumeration value="se"/>
+		<xs:enumeration value="c"/>
+		<xs:enumeration value="tl"/>
+		<xs:enumeration value="t"/>
+		<xs:enumeration value="tr"/>
+		<xs:enumeration value="r"/>
+		<xs:enumeration value="l"/>
+		<xs:enumeration value="bl"/>
+		<xs:enumeration value="b"/>
+		<xs:enumeration value="br"/>
+		<xs:enumeration value="anywhere"/>
+    </xs:restriction>
+</xs:simpleType>
+
+<!-- AutoSizePolicy -->
+
+<xs:simpleType name="autoSizePolicy.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="node_width"/>
+		<xs:enumeration value="node_height"/>
+		<xs:enumeration value="content"/>
+    </xs:restriction>
+</xs:simpleType>
+
+<!-- Edge Label Models -->
+
+<xs:simpleType name="edgeLabelModel.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="centered"/>
+		<xs:enumeration value="center_slider"/>
+		<xs:enumeration value="side_slider"/>
+		<xs:enumeration value="free"/>
+		<xs:enumeration value="two_pos"/>
+		<xs:enumeration value="three_center"/>
+		<xs:enumeration value="six_pos"/>		
+    </xs:restriction>
+</xs:simpleType>
+
+<!-- Edge Label Positions -->
+
+<xs:simpleType name="edgeLabelPosition.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="center"/>
+		<xs:enumeration value="tcentr"/>
+		<xs:enumeration value="scentr"/>
+		<xs:enumeration value="anywhere"/>
+		<xs:enumeration value="stail"/>
+		<xs:enumeration value="ttail"/>
+		<xs:enumeration value="tail"/>
+		<xs:enumeration value="shead"/>
+		<xs:enumeration value="thead"/>
+		<xs:enumeration value="head"/>
+	</xs:restriction>
+</xs:simpleType>
+
+<!-- Preferred Edge Label Positions -->
+
+<xs:simpleType name="preferredPlacement.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="target_right"/>	
+		<xs:enumeration value="target"/>	
+		<xs:enumeration value="target_left"/>	
+		<xs:enumeration value="source_right"/>	
+		<xs:enumeration value="source"/>	
+		<xs:enumeration value="source_left"/>	
+		<xs:enumeration value="center_right"/>	
+		<xs:enumeration value="center"/>	
+		<xs:enumeration value="center_left"/>	
+		<xs:enumeration value="anywhere"/>	
+  </xs:restriction>
+</xs:simpleType>
+
+<!-- horizontalTextPosition value type for labels -->
+<xs:simpleType name="horizontalTextPosition.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="left"/>	
+		<xs:enumeration value="right"/>	
+		<xs:enumeration value="center"/>	
+		<xs:enumeration value="left_aligned"/>	
+		<xs:enumeration value="right_aligned"/>	
+  </xs:restriction>
+</xs:simpleType>
+
+<!-- verticalTextPosition value type for labels -->
+<xs:simpleType name="verticalTextPosition.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="top"/>	
+		<xs:enumeration value="bottom"/>	
+		<xs:enumeration value="center"/>	
+  </xs:restriction>
+</xs:simpleType>
+
+<!--                             -->
+<!--  Geometric types     -->
+<!--                             -->
+
+<!-- Location defined by x,y coordinates -->
+<xs:attributeGroup name="Location.group">
+		<xs:attribute name="x" type="xs:double" use="required"/>
+		<xs:attribute name="y" type="xs:double" use="required"/>
+</xs:attributeGroup>
+
+<!-- Location defined by x,y coordinates and width,height -->
+<xs:attributeGroup name="Rectangle.group">
+		<xs:attribute name="x" type="xs:double" use="required"/>
+		<xs:attribute name="y" type="xs:double" use="required"/>
+		<xs:attribute name="width" type="xs:double" use="required"/>
+		<xs:attribute name="height" type="xs:double" use="required"/>
+</xs:attributeGroup>
+
+<!-- type for required rectangles -->
+<xs:complexType name="Rectangle.type">
+		<xs:attributeGroup ref="Rectangle.group"/>
+</xs:complexType>
+
+<!-- type for optional rectangles -->
+<xs:attributeGroup name="OpRectangle.group">
+		<xs:attribute name="x" type="xs:double" use="optional"/>
+		<xs:attribute name="y" type="xs:double" use="optional"/>
+		<xs:attribute name="width" type="xs:double" use="optional"/>
+		<xs:attribute name="height" type="xs:double" use="optional"/>
+</xs:attributeGroup>
+
+<!-- type for a path -->
+<xs:complexType name="Path.type">
+		<xs:sequence>
+			<xs:element name="Point" minOccurs="0" maxOccurs="unbounded">
+				<xs:complexType>
+					<xs:attributeGroup ref="Location.group"/>
+				</xs:complexType>			
+			</xs:element>
+		</xs:sequence>	
+		<xs:attribute name="reversedPathRendering" type="xs:boolean" use="optional"/>
+		<xs:attribute name="sx" type="xs:double" use="optional"/>
+		<xs:attribute name="sy" type="xs:double" use="optional"/>
+		<xs:attribute name="tx" type="xs:double" use="optional"/>
+		<xs:attribute name="ty" type="xs:double" use="optional"/>
+</xs:complexType>
+
+
+<!--                             -->
+<!--     Misc Types       -->
+<!--                             -->
+
+<!-- color -->
+
+<xs:simpleType name="color.type">
+  <xs:restriction base="xs:string">
+    <xs:pattern value="#(([A-F]|[0-9]){2}){3,4}"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<!-- Style for a line -->
+
+<xs:complexType name="LineStyle.type">
+		<xs:attribute name="color"    type="color.type" use="optional"/>
+		<xs:attribute name="hasColor" type="xs:boolean" use="optional"/>
+		<xs:attribute name="type" type="lineType.type" use="optional"/>
+		<xs:attribute name="width" type="xs:double" use="optional"/>
+</xs:complexType>
+
+<!-- drop shadow style -->
+<xs:complexType name="DropShadow.type">
+		<xs:attribute name="color" type="color.type" use="optional"/>
+		<xs:attribute name="offsetX" type="xs:byte" use="optional"/>
+		<xs:attribute name="offsetY" type="xs:byte" use="optional"/>
+</xs:complexType>
+
+<!--                             -->
+<!--        Labels            -->
+<!--                             -->
+
+<!-- Basic properties of all kind of labels -->
+<xs:complexType name="Label.type">
+	<xs:simpleContent>
+		<xs:extension base="xs:string">
+		<xs:attributeGroup ref="OpRectangle.group"/>
+		<xs:attribute name="visible" type="xs:boolean" use="optional"/>
+		<xs:attribute name="alignment" type="alignment.type" use="optional"/>
+		<xs:attribute name="textColor" type="color.type" use="optional"/>	
+		<xs:attribute name="lineColor" type="color.type" use="optional"/>
+    <xs:attribute name="hasLineColor" type="xs:boolean" use="optional"/>
+    <xs:attribute name="backgroundColor" type="color.type" use="optional"/>
+    <xs:attribute name="hasBackgroundColor" type="xs:boolean" use="optional"/>
+		<xs:attribute name="fontFamily" type="xs:string" use="optional"/>
+		<xs:attribute name="fontSize" type="xs:unsignedByte" use="optional"/>	
+		<xs:attribute name="fontStyle" type="fontStyle.type" use="optional"/>	
+		<xs:attribute name="rotationAngle" type="xs:double" use="optional"/>
+		<xs:attribute name="icon" type="xs:anyURI" use="optional"/>	
+		<xs:attribute name="underlinedText" type="xs:boolean" use="optional"/>	
+		<xs:attribute name="horizontalTextPosition" type="horizontalTextPosition.type" use="optional"/>	
+		<xs:attribute name="verticalTextPosition" type="verticalTextPosition.type" use="optional"/>	
+		<xs:attribute name="iconTextGap" type="xs:byte" use="optional"/>	
+		</xs:extension>
+	</xs:simpleContent>
+</xs:complexType>
+
+<!-- Node Labels -->
+<xs:complexType name="NodeLabel.type">
+	<xs:simpleContent>
+		<xs:extension base="Label.type">
+			<xs:attribute name="modelName" type="nodeLabelModel.type" use="optional"/>	
+			<xs:attribute name="modelPosition" type="nodeLabelPosition.type" use="optional"/>	
+			<xs:attribute name="autoSizePolicy" type="autoSizePolicy.type" use="optional"/>	
+		</xs:extension>
+	</xs:simpleContent>
+</xs:complexType>
+
+<!-- Edge Labels -->
+<xs:complexType name="EdgeLabel.type">
+	<xs:simpleContent>
+		<xs:extension base="Label.type">
+			<xs:attribute name="modelName" type="edgeLabelModel.type" use="optional"/>	
+			<xs:attribute name="modelPosition" type="edgeLabelPosition.type" use="optional"/>	
+			<xs:attribute name="preferredPlacement" type="preferredPlacement.type" use="optional"/>	
+			<xs:attribute name="distance" type="xs:double" use="optional"/>
+			<xs:attribute name="ratio" type="xs:double" use="optional"/>
+		</xs:extension>
+	</xs:simpleContent>
+</xs:complexType>
+
+<xs:complexType name="Geometry.type">
+	<xs:attributeGroup ref="Rectangle.group"/>
+</xs:complexType>	
+<!--                             -->
+<!--      Nodes              -->
+<!--                             -->
+
+<!-- Generic attributes for all nodes --> 
+<xs:complexType name="Node.type">
+	<xs:sequence>
+		<xs:element name="Geometry" minOccurs="0" maxOccurs="1" type="Geometry.type"/>
+		<xs:element name="Fill" minOccurs="0" maxOccurs="1">
+			<xs:complexType>
+		 		<xs:attribute name="hasColor" type="xs:boolean" use="optional"/>
+		 		<xs:attribute name="color" type="xs:string" use="optional"/>
+		 		<xs:attribute name="color2" type="xs:string" use="optional"/>
+		 		<xs:attribute name="transparent" type="xs:boolean" use="optional"/>
+			</xs:complexType>
+		</xs:element>
+		<xs:element name="BorderStyle" type="LineStyle.type" minOccurs="0" maxOccurs="1"/>
+		<xs:element name="NodeLabel" type="NodeLabel.type" minOccurs="0" maxOccurs="1"/>		
+	</xs:sequence>
+  <xs:attribute name="selected" type="xs:boolean" use="optional"/>
+</xs:complexType>
+
+<!-- Shape Node --> 
+<xs:complexType name="ShapeNode.type">
+	<xs:complexContent>
+		<xs:extension base="Node.type">
+			<xs:sequence>
+				<xs:element name="Shape" minOccurs="0" maxOccurs="1">		
+					<xs:complexType>
+						<xs:attribute name="type" type="ShapeType.type" use="required"/>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="DropShadow" type="DropShadow.type" minOccurs="0" maxOccurs="1"/>
+			</xs:sequence>
+		</xs:extension>
+	</xs:complexContent>
+</xs:complexType>
+
+<!-- Image Node --> 
+<xs:complexType name="ImageNode.type">
+	<xs:complexContent>
+		<xs:extension base="Node.type">
+			<xs:sequence>
+				<xs:element name="Image">		
+					<xs:complexType>
+						<xs:attribute name="href" type="xs:anyURI" use="required"/>
+						<xs:attribute name="alphaImage" type="xs:boolean" use="optional"/>
+					</xs:complexType>
+				</xs:element>		
+			</xs:sequence>
+		</xs:extension>
+	</xs:complexContent>
+</xs:complexType>
+
+<!-- Group Node --> 
+<xs:complexType name="GroupNode.type">
+	<xs:complexContent>
+		<xs:extension base="Node.type">
+			<xs:sequence>
+				<xs:element name="State" minOccurs="0" maxOccurs="1">		
+					<xs:complexType>
+						<xs:attribute name="closed" type="xs:boolean" use="optional"/>
+						<xs:attribute name="innerGraphDisplayEnabled" type="xs:boolean" use="optional"/>
+					</xs:complexType>
+				</xs:element>		
+				<xs:element name="Insets" minOccurs="0" maxOccurs="1">		
+					<xs:complexType>
+						<xs:attribute name="top" type="xs:nonNegativeInteger" use="required"/>
+						<xs:attribute name="bottom" type="xs:nonNegativeInteger" use="required"/>
+						<xs:attribute name="left" type="xs:nonNegativeInteger" use="required"/>
+						<xs:attribute name="right" type="xs:nonNegativeInteger" use="required"/>
+					</xs:complexType>
+				</xs:element>		
+				<xs:element name="BorderInsets" minOccurs="0" maxOccurs="1">		
+					<xs:complexType>
+						<xs:attribute name="top" type="xs:nonNegativeInteger" use="required"/>
+						<xs:attribute name="bottom" type="xs:nonNegativeInteger" use="required"/>
+						<xs:attribute name="left" type="xs:nonNegativeInteger" use="required"/>
+						<xs:attribute name="right" type="xs:nonNegativeInteger" use="required"/>
+					</xs:complexType>
+				</xs:element>		
+			</xs:sequence>
+		</xs:extension>
+	</xs:complexContent>
+</xs:complexType>
+
+<!-- Proxy Shape Node --> 
+<xs:complexType name="ProxyShapeNode.type">
+		<xs:sequence>
+			<xs:element name="Realizers">
+					<xs:complexType>
+      					<xs:sequence>
+        					<xs:choice minOccurs="0" maxOccurs="unbounded">
+          						<xs:element ref="ShapeNode"/>
+          						<xs:element ref="ImageNode"/>
+          						<xs:element ref="GroupNode"/>
+        					</xs:choice>
+      					</xs:sequence>
+      					<xs:attribute name="active" type="xs:nonNegativeInteger" use="required"/>
+					</xs:complexType>
+      		</xs:element>
+		</xs:sequence>
+</xs:complexType>
+
+<!-- Generic Node --> 
+<xs:complexType name="GenericNode.type">
+	<xs:complexContent>
+		<xs:extension base="Node.type">
+			<xs:sequence>
+				<xs:element name="UserData">		
+					<xs:complexType>
+						<xs:attribute name="class" type="xs:string" use="required"/>
+						<xs:attribute name="value" type="xs:string" use="required"/>
+					</xs:complexType>
+				</xs:element>		
+			</xs:sequence>
+      <xs:attribute name="configuration" type="xs:string" use="required"/>
+		</xs:extension>
+	</xs:complexContent>
+</xs:complexType>
+
+<!-- Element Definitions for  Nodes --> 
+<xs:element name="ShapeNode" type="ShapeNode.type"/>
+<xs:element name="ImageNode" type="ImageNode.type"/>
+<xs:element name="GroupNode" type="GroupNode.type"/>
+<xs:element name="GenericNode" type="GenericNode.type"/>
+<xs:element name="ProxyShapeNode" type="ProxyShapeNode.type"/>
+<xs:element name="ProxyAutoBoundsNode" type="ProxyShapeNode.type"/>
+
+<!--                             -->
+<!--      Edges              -->
+<!--                             -->
+
+<!-- Generic attributes for all edges --> 
+<xs:complexType name="Edge.type">
+	<xs:sequence>
+		<xs:element name="Path" type="Path.type" minOccurs="0" maxOccurs="1"/>
+		<xs:element name="LineStyle" type="LineStyle.type" minOccurs="0" maxOccurs="1"/>
+		<xs:element name="Arrows" minOccurs="0" maxOccurs="1">
+			<xs:complexType>
+				<xs:attribute name="source" type="arrowType.type"/>
+				<xs:attribute name="target" type="arrowType.type"/>
+			</xs:complexType>
+		</xs:element>
+		<xs:element name="EdgeLabel" type="EdgeLabel.type" minOccurs="0" maxOccurs="unbounded"/>		
+	</xs:sequence>	
+	<xs:attribute name="selected" type="xs:boolean" use="optional"/>
+</xs:complexType>
+
+<!-- Polyline edges -->
+<xs:complexType name="PolyLineEdge.type">
+	<xs:complexContent>
+		<xs:extension base="Edge.type">
+			<xs:sequence>
+				<xs:element name="BendStyle">		
+					<xs:complexType>
+						<xs:attribute name="smoothed" type="xs:boolean" use="optional"/>
+					</xs:complexType>
+				</xs:element>		
+			</xs:sequence>
+		</xs:extension>
+	</xs:complexContent>
+</xs:complexType>
+
+
+<!-- Type of Arc edges -->
+<xs:simpleType name="arc.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="fixedHeight"/>
+  	<xs:enumeration value="fixedRatio"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<!-- Arc edges -->
+<xs:complexType name="ArcEdge.type">
+	<xs:complexContent>
+		<xs:extension base="Edge.type">
+			<xs:sequence>
+				<xs:element name="Arc">		
+					<xs:complexType>
+						<xs:attribute name="type" type="arc.type" use="optional"/>
+						<xs:attribute name="height" type="xs:double" use="optional"/>
+						<xs:attribute name="ratio" type="xs:double" use="optional"/>
+					</xs:complexType>
+				</xs:element>		
+			</xs:sequence>
+		</xs:extension>
+	</xs:complexContent>
+</xs:complexType>
+
+<!-- QuadCurve edges -->
+<xs:complexType name="QuadCurveEdge.type">
+	<xs:complexContent>
+		<xs:extension base="Edge.type">
+      <xs:attribute name="straightness" type="xs:double" use="optional"/>
+		</xs:extension>
+	</xs:complexContent>
+</xs:complexType>
+
+<!-- Generic edges -->
+<xs:complexType name="GenericEdge.type">
+	<xs:complexContent>
+		<xs:extension base="Edge.type">
+			<xs:sequence>
+				<xs:element name="UserData">		
+					<xs:complexType>
+						<xs:attribute name="class" type="xs:string" use="required"/>
+						<xs:attribute name="value" type="xs:string" use="required"/>
+					</xs:complexType>
+				</xs:element>		
+			</xs:sequence>
+      <xs:attribute name="configuration" type="xs:string" use="required"/>
+		</xs:extension>
+	</xs:complexContent>
+</xs:complexType>
+
+<!-- Element definitions for edges -->
+<xs:element name="PolyLineEdge"  type="PolyLineEdge.type"/>
+<xs:element name="ArcEdge"       type="ArcEdge.type"/>
+<xs:element name="BezierEdge"    type="Edge.type"/>
+<xs:element name="SplineEdge"    type="Edge.type"/>
+<xs:element name="QuadCurveEdge" type="QuadCurveEdge.type"/>
+<xs:element name="GenericEdge"   type="GenericEdge.type"/>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexRedefine2Schemas/ygraphml.xsd b/xml/tests/testData/xml/ComplexRedefine2Schemas/ygraphml.xsd
new file mode 100644
index 000000000000..d5d83eda9ade
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2Schemas/ygraphml.xsd
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+
+<!-- Header -->
+<xs:schema 
+             targetNamespace="http://graphml.graphdrawing.org/xmlns/graphml"
+
+             xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:g="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:y="http://www.yworks.com/xml/graphml"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+             xmlns:xlink="http://www.w3.org/1999/xlink"
+
+             elementFormDefault="qualified"
+             attributeFormDefault="unqualified"
+>
+
+<xs:import namespace="http://www.yworks.com/xml/graphml" schemaLocation="yfeatures.xsd"/>
+
+<!-- Redefinition of the elements in the graphml-structure schema -->
+<xs:redefine schemaLocation="graphml-attributes.xsd">
+
+	<xs:attributeGroup name="key.extra.attrib">
+		<xs:attributeGroup ref="key.extra.attrib"/>
+		<xs:attribute name="yfiles.type" type="xs:string" use="optional"/>
+	</xs:attributeGroup>
+	<!-- Definition of the different grouping types -->
+	<!-- The grouping type is stored as attribute at the node element -->
+	<xs:attributeGroup name="node.extra.attrib">
+		<xs:attributeGroup ref="node.extra.attrib"/>
+		<xs:attribute name="yfiles.foldertype" type="yfiles.foldertype.type" use="optional"/>
+	</xs:attributeGroup>
+	
+	<!-- Definition of the different node and edge types -->
+	<xs:complexType name="data-extension.type">
+	<xs:complexContent mixed="true">
+    <xs:extension base="data-extension.type">
+				<xs:choice minOccurs="0" maxOccurs="1">
+					<xs:element ref="y:ShapeNode"/>
+					<xs:element ref="y:ImageNode"/>
+					<xs:element ref="y:GroupNode"/>
+					<xs:element ref="y:GenericNode"/>
+					<xs:element ref="y:ProxyShapeNode"/>
+					<xs:element ref="y:ProxyAutoBoundsNode"/>
+					<xs:element ref="y:PolyLineEdge"/>
+					<xs:element ref="y:ArcEdge"/>
+					<xs:element ref="y:BezierEdge"/>
+					<xs:element ref="y:SplineEdge"/>
+					<xs:element ref="y:QuadCurveEdge"/>
+					<xs:element ref="y:GenericEdge"/>
+					<xs:element ref="y:Postprocessors"/>
+				</xs:choice>
+		</xs:extension>
+	</xs:complexContent>
+	</xs:complexType>
+</xs:redefine>		
+
+<!-- Type of Grouping -->
+<xs:simpleType name="yfiles.foldertype.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="folder"/>
+    	<xs:enumeration value="group"/>
+    	<xs:enumeration value="leaf"/>
+    </xs:restriction>
+</xs:simpleType>
+
+</xs:schema>
+
+
diff --git a/xml/tests/testData/xml/ComplexRedefine2Schemas/yprocessors.xsd b/xml/tests/testData/xml/ComplexRedefine2Schemas/yprocessors.xsd
new file mode 100644
index 000000000000..60bfa4b65e9c
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine2Schemas/yprocessors.xsd
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<!-- Header -->
+<xs:schema 
+             targetNamespace="http://www.yworks.com/xml/graphml"
+
+             xmlns="http://www.yworks.com/xml/graphml"
+             xmlns:g="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+             xmlns:xlink="http://www.w3.org/1999/xlink"
+
+             elementFormDefault="qualified"
+             attributeFormDefault="unqualified"
+>
+
+<!-- Processor -->
+<xs:complexType name="Processor.type">
+  <xs:sequence>
+    <xs:element name="Option" minOccurs="0" maxOccurs="unbounded">
+      <xs:complexType>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="value" type="xs:string" use="required"/>
+      </xs:complexType>			
+    </xs:element>
+  </xs:sequence>	
+  <xs:attribute name="class" type="xs:string" use="required"/>
+</xs:complexType>
+
+<!-- Postprocessors --> 
+<xs:complexType name="Postprocessors.type">
+		<xs:sequence>
+			<xs:element name="Processor" type="Processor.type" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+</xs:complexType>
+
+<!-- Element Definition for  Postprocessors --> 
+<xs:element name="Postprocessors" type="Postprocessors.type"/>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexRedefine3.xsd b/xml/tests/testData/xml/ComplexRedefine3.xsd
new file mode 100644
index 000000000000..89e13d6a5bfc
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine3.xsd
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+
+<!-- Header -->
+<xs:schema
+             targetNamespace="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+             elementFormDefault="qualified"
+             attributeFormDefault="unqualified"
+>
+
+<!-- Redefinition of the elements in the graphml-structure schema -->
+<xs:redefine schemaLocation="ComplexRedefine3_2.xsd">
+
+	<xs:attributeGroup name="key.extra.attrib">
+		<xs:attributeGroup ref="key.extra.attrib"/>
+		<xs:attribute name="yfiles.type" type="xs:string" use="optional"/>
+	</xs:attributeGroup>
+	<!-- Definition of the different grouping types -->
+	<!-- The grouping type is stored as attribute at the node element -->
+	<xs:attributeGroup name="node.extra.attrib">
+		<xs:attributeGroup ref="node.extra.attrib"/>
+		<xs:attribute name="yfiles.foldertype" type="yfiles.foldertype.type" use="optional"/>
+	</xs:attributeGroup>
+
+	<!-- Definition of the different node and edge types -->
+	<xs:complexType name="data-extension.type">
+	<xs:complexContent mixed="true">
+    <xs:extension base="data-extension.type">
+				<xs:choice minOccurs="0" maxOccurs="1"/>
+		</xs:extension>
+	</xs:complexContent>
+	</xs:complexType>
+</xs:redefine>
+
+<!-- Type of Grouping -->
+<xs:simpleType name="yfiles.foldertype.type">
+	<xs:restriction base="xs:NMTOKEN">
+		<xs:enumeration value="folder"/>
+    	<xs:enumeration value="group"/>
+    	<xs:enumeration value="leaf"/>
+    </xs:restriction>
+</xs:simpleType>
+
+</xs:schema>
+
+
diff --git a/xml/tests/testData/xml/ComplexRedefine3_2.xsd b/xml/tests/testData/xml/ComplexRedefine3_2.xsd
new file mode 100644
index 000000000000..d25adda182ef
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine3_2.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+
+<xs:schema
+             targetNamespace="http://graphml.graphdrawing.org/xmlns/graphml"
+
+             xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+
+             elementFormDefault="unqualified"
+             attributeFormDefault="unqualified"
+>
+
+<!--=============redefinition of the======================-->
+<!--=============key attributes===========================-->
+
+<xs:redefine schemaLocation="ComplexRedefine3_3.xsd">
+
+  <xs:attributeGroup name="key.extra.attrib">
+    <xs:attributeGroup ref="key.extra.attrib"/>
+    <xs:attributeGroup ref="key.attributes.attrib"/>
+  </xs:attributeGroup>
+
+</xs:redefine>
+
+	<xs:simpleType name="key.name.type" final="#all">
+		<xs:restriction base="xs:NMTOKEN"/>
+	</xs:simpleType>
+
+<xs:simpleType name="key.type.type" final="#all">
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="boolean"/>
+    <xs:enumeration value="int"/>
+    <xs:enumeration value="long"/>
+    <xs:enumeration value="float"/>
+    <xs:enumeration value="double"/>
+    <xs:enumeration value="string"/>
+  </xs:restriction>
+</xs:simpleType>
+
+	<xs:attributeGroup name="key.attributes.attrib">
+		<xs:attribute name="attr.name" type="key.name.type" use="optional"/>
+		<xs:attribute name="attr.type" type="key.type.type" use="optional"/>
+	</xs:attributeGroup>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexRedefine3_3.xsd b/xml/tests/testData/xml/ComplexRedefine3_3.xsd
new file mode 100644
index 000000000000..19b03d529f70
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine3_3.xsd
@@ -0,0 +1,430 @@
+<?xml version="1.0"?>
+
+<xs:schema
+             targetNamespace="http://graphml.graphdrawing.org/xmlns/graphml"
+
+             xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:g="http://graphml.graphdrawing.org/xmlns/graphml"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+             xmlns:xlink="http://www.w3.org/1999/xlink" 
+
+             elementFormDefault="unqualified"
+             attributeFormDefault="unqualified"
+>
+
+<xs:import namespace="http://www.w3.org/1999/xlink"
+           schemaLocation="xlink.xsd"
+/>
+
+
+
+<!--======================================================-->
+<!--=========user-defined extra attributes================-->
+<!--======================================================-->
+
+<!--extra attributes common to all GraphML elements-->
+
+<xs:attributeGroup name="common.extra.attrib"/>
+
+<!--specific extra attributes-->
+
+<xs:attributeGroup name="graphml.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="data.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="key.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="default.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="graph.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="node.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="edge.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="port.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="hyperedge.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="endpoint.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="locator.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+
+
+
+<!--======================================================-->
+<!--=============element type definitions=================-->
+<!--======================================================-->
+
+<!--=============data type================================-->
+
+<!--extension mechanism for the content of data and default-->
+<xs:complexType name="data-extension.type"/>
+
+<xs:complexType name="data.type" final="#all">
+  <xs:complexContent mixed="true">
+    <xs:extension base="data-extension.type">
+      <xs:attribute name="key" type="xs:NMTOKEN" use="required"/>
+      <xs:attribute name="id" type="xs:NMTOKEN" use="optional"/>
+      <xs:attributeGroup ref="data.extra.attrib"/>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+
+
+<!--=============key type=================================-->
+<xs:simpleType name="key.for.type" final="#all">
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="all"/>
+    <xs:enumeration value="graph"/>
+    <xs:enumeration value="node"/>
+    <xs:enumeration value="edge"/>
+    <xs:enumeration value="hyperedge"/>
+    <xs:enumeration value="port"/>
+    <xs:enumeration value="endpoint"/>
+  </xs:restriction>
+</xs:simpleType>
+
+
+<xs:complexType name="key.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:element ref="default" minOccurs="0"/>
+  </xs:sequence>
+  <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
+  <xs:attribute name="for" type="key.for.type" default="all"/>
+  <xs:attributeGroup ref="key.extra.attrib"/>
+</xs:complexType>
+
+<!--=============default type=============================-->
+<xs:complexType name="default.type" final="#all">
+  <xs:complexContent mixed="true">
+    <xs:extension base="data-extension.type">
+      <xs:attributeGroup ref="default.extra.attrib"/>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+
+
+<!--=============graphml type=============================-->
+
+<xs:complexType name="graphml.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:element ref="key" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="graph"/>
+        <xs:element ref="data"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:sequence>
+  <xs:attributeGroup ref="graphml.extra.attrib"/>
+</xs:complexType>
+
+
+<!--=============graph type===============================-->
+
+<xs:simpleType name="graph.edgedefault.type" final="#all">
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="directed"/>
+    <xs:enumeration value="undirected"/>
+  </xs:restriction>
+</xs:simpleType>
+
+
+<xs:complexType name="graph.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:choice>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="data"/>
+          <xs:element ref="node"/>
+          <xs:element ref="edge"/>
+          <xs:element ref="hyperedge"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:element ref="locator"/>
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="graph.extra.attrib"/>
+  <xs:attribute name="id" type="xs:NMTOKEN"  />
+  <xs:attribute name="edgedefault"
+                type="graph.edgedefault.type" use="required"/>
+</xs:complexType>
+
+<!--=============node type================================-->
+
+<xs:complexType name="node.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:choice>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="data"/>
+          <xs:element ref="port"/>
+        </xs:choice>
+        <xs:element ref="graph" minOccurs="0"/>
+      </xs:sequence>
+      <xs:element ref="locator"/>
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="node.extra.attrib"/>
+  <xs:attribute name="id" type="xs:NMTOKEN" use="required"/>
+</xs:complexType>
+
+<!--=============port type================================-->
+
+<xs:complexType name="port.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="data" />
+      <xs:element ref="port" />
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="port.extra.attrib"/>
+  <xs:attribute name="name" type="xs:NMTOKEN" use="required"/>
+</xs:complexType>
+
+<!--=============edge type================================-->
+
+<xs:complexType name="edge.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:element ref="data" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element ref="graph" minOccurs="0"/>
+  </xs:sequence>
+  <xs:attributeGroup ref="edge.extra.attrib"/>
+  <xs:attribute name="id" type="xs:NMTOKEN" />
+  <xs:attribute name="directed" type="xs:boolean"/>
+  <xs:attribute name="source" type="xs:NMTOKEN" use="required"/>
+  <xs:attribute name="target" type="xs:NMTOKEN" use="required"/>
+  <xs:attribute name="sourceport" type="xs:NMTOKEN"/>
+  <xs:attribute name="targetport" type="xs:NMTOKEN"/>
+</xs:complexType>
+
+<!--=============hyperedge type===========================-->
+
+<xs:complexType name="hyperedge.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="data" />
+      <xs:element ref="endpoint" />
+    </xs:choice>
+    <xs:element ref="graph" minOccurs="0" />
+  </xs:sequence>
+  <xs:attributeGroup ref="hyperedge.extra.attrib"/>
+  <xs:attribute name="id" type="xs:NMTOKEN" />
+</xs:complexType>
+
+<!--=============endpoint type============================-->
+
+<xs:simpleType name="endpoint.type.type" final="#all">
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="in"/>
+    <xs:enumeration value="out"/>
+    <xs:enumeration value="undir"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:complexType name="endpoint.type" final="#all">
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+  </xs:sequence>
+  <xs:attributeGroup ref="endpoint.extra.attrib"/>
+  <xs:attribute name="id" type="xs:NMTOKEN"/>
+  <xs:attribute name="port" type="xs:NMTOKEN" />
+  <xs:attribute name="node" type="xs:NMTOKEN" use="required"/>
+  <xs:attribute name="type" type="endpoint.type.type" default="undir"/>
+</xs:complexType>
+
+<!--=============locator type=============================-->
+
+<xs:complexType name="locator.type" final="#all">
+  <xs:attributeGroup ref="locator.extra.attrib"/>
+  <xs:attribute ref="xlink:href" use="required"/>
+  <xs:attribute ref="xlink:type" fixed="simple"/>
+</xs:complexType>
+
+
+<!--======================================================-->
+<!--============element declarations======================-->
+<!--======================================================-->
+
+<!--=============element: desc============================-->
+<xs:element name="desc" type="xs:string" block="#all"/>
+
+<!--=============element: locator=========================-->
+<xs:element name="locator" type="locator.type" block="#all"/>
+
+<!--=============element: data============================-->
+<xs:element name="data" type="data.type" block="#all">
+
+  <xs:unique name="data_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: key=============================-->
+<xs:element name="key" type="key.type" block="#all"/>
+
+<!--=============element: default=========================-->
+<xs:element name="default" type="default.type" block="#all"/>
+
+<!--=============element: graphml=========================-->
+<xs:element name="graphml" type="graphml.type" block="#all">
+
+  <xs:unique name="all_id_unique">
+    <xs:selector xpath=".//g:*"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="graphml_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+  <xs:key name="key_id_key">
+    <xs:selector xpath=".//g:key"/>
+    <xs:field xpath="@id"/>
+  </xs:key>
+
+  <xs:key name="node_id_key">
+    <xs:selector xpath=".//g:node"/>
+    <xs:field xpath="@id"/>
+  </xs:key>
+
+  <xs:unique name="edge_id_unique">
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="hyperedge_id_unique">
+    <xs:selector xpath=".//g:hyperedge"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="endpoint_id_unique">
+    <xs:selector xpath=".//g:endpoint"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="graph_id_unique">
+    <xs:selector xpath=".//g:graph"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:keyref name="data_key_ref" refer="key_id_key">
+    <xs:selector xpath=".//g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:keyref>
+
+  <xs:keyref name="edge_source_ref" refer="node_id_key">
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@source"/>
+  </xs:keyref>
+
+  <xs:keyref name="edge_target_ref" refer="node_id_key">
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@target"/>
+  </xs:keyref>
+
+  <xs:keyref name="endpoint_node_ref" refer="node_id_key">
+    <xs:selector xpath=".//g:endpoint"/>
+    <xs:field xpath="@node"/>
+  </xs:keyref>
+
+</xs:element>
+
+
+<!--=============element: graph===========================-->
+<xs:element name="graph" type="graph.type" block="#all">
+
+  <xs:unique name="graph_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: node============================-->
+<xs:element name="node" type="node.type" block="#all">
+
+  <xs:key name="port_name_key">
+    <xs:selector xpath=".//g:port"/>
+    <xs:field xpath="@name"/>
+  </xs:key>
+
+  <xs:unique name="node_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: port============================-->
+<xs:element name="port" type="port.type" block="#all">
+
+  <xs:unique name="port_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: edge============================-->
+<xs:element name="edge" type="edge.type" block="#all">
+
+  <xs:unique name="edge_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: hyperedge=======================-->
+<xs:element name="hyperedge" type="hyperedge.type" block="#all">
+
+  <xs:unique name="hyperedge_data_key_unique">
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+<!--=============element: endpoint========================-->
+<xs:element name="endpoint" type="endpoint.type" block="#all"/>
+
+</xs:schema>
+
+<!--======================================================-->
+<!--      end of file: graphml-structure.xsd             -->
+<!--======================================================-->
diff --git a/xml/tests/testData/xml/ComplexRedefine4.xml b/xml/tests/testData/xml/ComplexRedefine4.xml
new file mode 100644
index 000000000000..9220227cae99
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<outer xmlns="http://simple"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://simple ComplexRedefine4.xsd">
+    <inner attr="true" extended.attr="fail"/>
+</outer>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine4.xsd b/xml/tests/testData/xml/ComplexRedefine4.xsd
new file mode 100644
index 000000000000..06ac3ccabfa0
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine4.xsd
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<xs:schema targetNamespace="http://simple" xmlns="http://simple" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xs:redefine schemaLocation="ComplexRedefine4_2.xsd">
+
+    <xs:attributeGroup name="innerAttributes">
+      <xs:attributeGroup ref="innerAttributes"/>
+      <xs:attribute name="extended.attr" type="xs:string" use="optional"/>
+    </xs:attributeGroup>
+
+  </xs:redefine>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine4_2.xsd b/xml/tests/testData/xml/ComplexRedefine4_2.xsd
new file mode 100644
index 000000000000..58ca57f6bf0f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine4_2.xsd
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<xs:schema targetNamespace="http://simple" xmlns="http://simple" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+    <xs:complexType name="outer.type">
+        <xs:sequence>
+            <xs:element ref="inner" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:attributeGroup name="innerAttributes">
+        <xs:attribute name="attr" type="xs:boolean" use="optional"/>
+    </xs:attributeGroup>
+
+    <xs:complexType name="inner.type">
+        <xs:attributeGroup ref="innerAttributes">
+        </xs:attributeGroup>
+    </xs:complexType>
+
+    <xs:element name="outer" type="outer.type">
+    </xs:element>
+
+    <xs:element name="inner" type="inner.type">
+    </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine5.xml b/xml/tests/testData/xml/ComplexRedefine5.xml
new file mode 100644
index 000000000000..30b47d41995a
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine5.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<outer xmlns="http://simple"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://simple http://extended">
+    <inner attr="true" extended.attr="fail">
+      <extended></extended>
+    </inner>
+</outer>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine5.xsd b/xml/tests/testData/xml/ComplexRedefine5.xsd
new file mode 100644
index 000000000000..e24128caf797
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine5.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+
+<xs:schema targetNamespace="http://simple" xmlns="http://simple" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+    <xs:redefine schemaLocation="http://simple">
+
+        <xs:attributeGroup name="innerAttributes">
+            <xs:attributeGroup ref="innerAttributes"/>
+            <xs:attribute name="extended.attr" type="xs:string" use="optional"/>
+        </xs:attributeGroup>
+
+      <xs:complexType name="inner.type">
+          <xs:complexContent>
+              <xs:extension base="inner.type">
+                  <xs:sequence minOccurs="0">
+                      <xs:element name="extended"/>
+                  </xs:sequence>
+              </xs:extension>
+          </xs:complexContent>
+      </xs:complexType>
+
+    </xs:redefine>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine5_2.xsd b/xml/tests/testData/xml/ComplexRedefine5_2.xsd
new file mode 100644
index 000000000000..58ca57f6bf0f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine5_2.xsd
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+
+<xs:schema targetNamespace="http://simple" xmlns="http://simple" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+    <xs:complexType name="outer.type">
+        <xs:sequence>
+            <xs:element ref="inner" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:attributeGroup name="innerAttributes">
+        <xs:attribute name="attr" type="xs:boolean" use="optional"/>
+    </xs:attributeGroup>
+
+    <xs:complexType name="inner.type">
+        <xs:attributeGroup ref="innerAttributes">
+        </xs:attributeGroup>
+    </xs:complexType>
+
+    <xs:element name="outer" type="outer.type">
+    </xs:element>
+
+    <xs:element name="inner" type="inner.type">
+    </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefine6.xml b/xml/tests/testData/xml/ComplexRedefine6.xml
new file mode 100644
index 000000000000..30873ba7d53a
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine6.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+    <bean name="JBossThreadsMetaDataFactoryDeployer"
+          class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryDeployer">
+        <constructor>
+            <parameter>org.jboss.threads.metadata.ThreadsMetaData</parameter>
+        </constructor>
+    </bean>
+
+    <bean name="JBossThreadsMetaDataSchemaResolverDeployer"
+          class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+        <constructor>
+            <parameter>org.jboss.threads.metadata.ThreadsMetaData</parameter>
+        </constructor>
+        <property name="name">jboss-threads.xml</property>
+        <property name="registerWithJBossXB">true</property>
+    </bean>
+</deployment>
diff --git a/xml/tests/testData/xml/ComplexRedefine6.xsd b/xml/tests/testData/xml/ComplexRedefine6.xsd
new file mode 100644
index 000000000000..bac5179099a6
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine6.xsd
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- A prototype xsd schema for the pojoserver xml deployer
+$Id: bean-deployer_2_0.xsd 76911 2008-08-11 12:42:15Z alesj $
+ -->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   targetNamespace="urn:jboss:bean-deployer:2.0"
+   xmlns="urn:jboss:bean-deployer:2.0"
+   elementFormDefault="qualified"
+   attributeFormDefault="unqualified"
+   version="1.0">
+
+   <xsd:annotation>
+      <xsd:documentation>
+         <![CDATA[
+         The xml deployer schema. The deployment document instance
+         root element should reference the schema in the root
+         deployment element using something like:
+
+         <deployment xmlns="urn:jboss:bean-deployer:2.0">
+         ...
+         ]]>
+      </xsd:documentation>
+   </xsd:annotation>
+
+   <xsd:redefine schemaLocation="ComplexRedefine6_2.xsd">
+      <xsd:complexType name="beanType">
+         <xsd:complexContent>
+            <xsd:extension base="beanType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="classloaderType">
+         <xsd:complexContent>
+            <xsd:extension base="classloaderType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="abstractBeanfactoryType">
+         <xsd:complexContent>
+            <xsd:extension base="abstractBeanfactoryType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="beanfactoryType">
+         <xsd:complexContent>
+            <xsd:extension base="beanfactoryType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="lazyType">
+         <xsd:complexContent>
+            <xsd:extension base="lazyType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="constructorType">
+         <xsd:complexContent>
+            <xsd:extension base="constructorType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="lifecycleType">
+         <xsd:complexContent>
+            <xsd:extension base="lifecycleType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="installType">
+         <xsd:complexContent>
+            <xsd:extension base="installType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="uninstallCallbackType">
+         <xsd:complexContent>
+            <xsd:extension base="uninstallCallbackType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="installCallbackType">
+         <xsd:complexContent>
+            <xsd:extension base="installCallbackType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="dependencyType">
+         <xsd:complexContent>
+            <xsd:extension base="dependencyType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="injectionType">
+         <xsd:complexContent>
+            <xsd:extension base="injectionType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="searchType">
+         <xsd:complexContent>
+            <xsd:extension base="searchType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="valueFactoryType">
+         <xsd:complexContent>
+            <xsd:extension base="valueFactoryType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="factoryType">
+         <xsd:complexContent>
+            <xsd:extension base="factoryType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="aliasType">
+         <xsd:complexContent>
+            <xsd:extension base="aliasType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="namedAliasType">
+         <xsd:complexContent>
+            <xsd:extension base="namedAliasType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="parameterType">
+         <xsd:complexContent>
+            <xsd:extension base="parameterType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="propertyType">
+         <xsd:complexContent>
+            <xsd:extension base="propertyType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="relatedClassType">
+         <xsd:complexContent>
+            <xsd:extension base="relatedClassType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="annotationType">
+         <xsd:complexContent>
+            <xsd:extension base="annotationType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="interfaceType">
+         <xsd:complexContent>
+            <xsd:extension base="interfaceType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:simpleType name="classNameType">
+         <xsd:restriction base="classNameType"/>
+      </xsd:simpleType>
+      <xsd:complexType name="plainValueType">
+         <xsd:complexContent>
+            <xsd:extension base="plainValueType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="valueType">
+         <xsd:complexContent>
+            <xsd:extension base="valueType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="classLoaderValueType">
+         <xsd:complexContent>
+            <xsd:extension base="classLoaderValueType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="annotatedValueType">
+         <xsd:complexContent>
+            <xsd:extension base="annotatedValueType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="namedValueType">
+         <xsd:complexContent>
+            <xsd:extension base="namedValueType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="baseCollectionType">
+         <xsd:complexContent>
+            <xsd:extension base="baseCollectionType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="collectionType">
+         <xsd:complexContent>
+            <xsd:extension base="collectionType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="listType">
+         <xsd:complexContent>
+            <xsd:extension base="listType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="setType">
+         <xsd:complexContent>
+            <xsd:extension base="setType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="arrayType">
+         <xsd:complexContent>
+            <xsd:extension base="arrayType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="mapType">
+         <xsd:complexContent>
+            <xsd:extension base="mapType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="entryType">
+         <xsd:complexContent>
+            <xsd:extension base="entryType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="dependsType">
+         <xsd:complexContent>
+            <xsd:extension base="dependsType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="demandType">
+         <xsd:complexContent>
+            <xsd:extension base="demandType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="supplyType">
+         <xsd:complexContent>
+            <xsd:extension base="supplyType"/>
+         </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:simpleType name="controllerStateType">
+         <xsd:restriction base="controllerStateType"/>
+      </xsd:simpleType>
+      <xsd:simpleType name="controllerModeType">
+         <xsd:restriction base="controllerModeType"/>
+      </xsd:simpleType>
+      <xsd:simpleType name="autowireTypeType">
+         <xsd:restriction base="autowireTypeType"/>
+      </xsd:simpleType>
+      <xsd:simpleType name="accessModeType">
+         <xsd:restriction base="accessModeType"/>
+      </xsd:simpleType>
+      <xsd:simpleType name="optionType">
+         <xsd:restriction base="optionType"/>
+      </xsd:simpleType>
+      <xsd:simpleType name="contextType">
+         <xsd:restriction base="contextType"/>
+      </xsd:simpleType>
+   </xsd:redefine>
+
+   <xsd:element name="deployment" type="deploymentType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The root of the xml deployer instance document
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+   </xsd:element>
+
+   <xsd:complexType name="deploymentType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The deployment contains a number of beans and bean factories.
+
+           e.g.
+           <deployment ...>
+              <bean .../>
+              <bean .../>
+              <beanfactory .../>
+           </deployment>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+         <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="classloader" type="classloaderType" minOccurs="0"/>
+         <xsd:element name="alias" type="namedAliasType" minOccurs="0"/>
+         <xsd:element name="create" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="start" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="stop" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="destroy" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="bean" type="beanType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="beanfactory" type="beanfactoryType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="lazy" type="lazyType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:any namespace="##other" processContents="strict" minOccurs="0">
+            <xsd:annotation>
+               <xsd:documentation>An extension value</xsd:documentation>
+            </xsd:annotation>
+         </xsd:any>
+      </xsd:choice>
+      <xsd:attribute name="name" type="xsd:string" use="optional"/>
+      <xsd:attribute name="scoped" type="xsd:boolean" use="optional"/>
+      <xsd:attribute name="mode" type="controllerModeType" use="optional"/>
+   </xsd:complexType>
+
+   <!--
+     WARN:
+     Do not use this in the bean deployer, it won't work!
+     FIXME:
+     The correct way to do this is to have two separate
+     schemas (one for deployments the other for beans)
+     then use schema imports.
+   -->
+   <xsd:element name="bean" type="beanType"/>
+
+   <!--
+     WARN:
+     Do not use this in the bean deployer, it won't work!
+     FIXME:
+     The correct way to do this is to have two separate
+     schemas (one for deployments the other for beans)
+     then use schema imports.
+   -->
+   <xsd:element name="beanfactory" type="beanfactoryType"/>
+
+   <!--
+     WARN:
+     Do not use this in the bean deployer, it won't work!
+     FIXME:
+     The correct way to do this is to have two separate
+     schemas (one for deployments the other for beans)
+     then use schema imports.
+   -->
+   <xsd:element name="lazy" type="lazyType"/>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexRedefine6_2.xsd b/xml/tests/testData/xml/ComplexRedefine6_2.xsd
new file mode 100644
index 000000000000..bdbdaa66ee9c
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefine6_2.xsd
@@ -0,0 +1,1148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- A prototype xsd schema for the pojoserver xml deployer
+$Id: bean-deployer_2_0.xsd 70437 2008-03-05 17:13:04Z alesj $
+ -->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   elementFormDefault="qualified"
+   attributeFormDefault="unqualified"
+   targetNamespace="urn:jboss:bean-deployer:2.0"
+   xmlns="urn:jboss:bean-deployer:2.0"
+   version="1.0">
+
+   <xsd:complexType name="beanType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The bean is an instance of a pojo.
+
+           e.g.
+           <bean name="MyName" class="com.acme.POJO">
+              <classloader .../>
+              <constructor .../>
+              <property .../>
+              <property .../>
+              <depends .../>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="alias" type="aliasType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="related-class" type="relatedClassType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="classloader" type="classloaderType" minOccurs="0"/>
+         <xsd:element name="constructor" type="constructorType" minOccurs="0"/>
+         <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="create" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="start" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="stop" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="destroy" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="depends" type="dependsType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="demand" type="demandType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="supply" type="supplyType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="install" type="installType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="uninstall" type="installType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="incallback" type="installCallbackType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="uncallback" type="uninstallCallbackType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string" use="optional"/>
+      <xsd:attribute name="class" type="xsd:token" use="optional"/>
+      <xsd:attribute name="mode" type="controllerModeType" use="optional"/>
+      <xsd:attribute name="parent" type="xsd:string" use="optional"/>
+      <xsd:attribute name="abstract" type="xsd:boolean" use="optional"/>
+      <xsd:attribute name="autowire-type" type="autowireTypeType" use="optional"/>
+      <xsd:attribute name="autowire-candidate" type="xsd:boolean" use="optional"/>
+      <xsd:attribute name="access-mode" type="accessModeType" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="classloaderType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The classloader is to load the bean
+
+           e.g.
+           <bean ...>
+              <classloader><inject bean="Classloader"/></classloader>
+           </bean>
+
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="classLoaderValueType"/>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="abstractBeanfactoryType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           Base type for beanfatoryType.
+           ]]>
+
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="alias" type="aliasType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="related-class" type="relatedClassType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="classloader" type="classloaderType" minOccurs="0"/>
+         <xsd:element name="constructor" type="constructorType" minOccurs="0"/>
+         <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="create" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="start" type="lifecycleType" minOccurs="0"/>
+         <xsd:element name="depends" type="dependsType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="demand" type="demandType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="supply" type="supplyType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="install" type="installType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="uninstall" type="installType" minOccurs="0" maxOccurs="unbounded"/>
+<!--
+         <xsd:element name="incallback" type="intallCallbackType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="uncallback" type="uninstallCallbackType" minOccurs="0" maxOccurs="unbounded"/>
+-->
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="beanfactoryType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The beanfactory is a org.jboss.beans.metadata.plugins.factory.GenericBeanFactory deployment.
+           This gives you a factory such you can invoke createBean() multiple times with the guarantee
+           that the injected objects are "installed".
+
+           e.g.
+           <bean name="User" class="com.acme.User">
+              <property name="factory"><inject bean="Factory"/></property>
+           </bean>
+
+           <beanfactory name="Factory" class="com.acme.SomeBean">
+              <property name="someProperty"><inject bean="SomeOtherBean"/></property>
+           </beanFactory>
+
+           package com.acme.User;
+           public class User {
+              // factory has been configured at this point
+              public void setFactory(GenericBeanFactory factory) {
+                 SomeBean bean1 = factory.createBean();
+                 System.out.println(bean1.getSomeProperty()); // "SomeOtherBean"
+                 SomeBean bean2 = factory.createBean();
+                 System.out.println(bean2.getSomeProperty()); // "SomeOtherBean"
+              }
+           }
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="abstractBeanfactoryType">
+            <xsd:attribute name="class" type="xsd:token" use="required"/>
+            <xsd:attribute name="access-mode" type="accessModeType" use="optional"/>
+            <xsd:attribute name="factoryClass" type="xsd:token" use="optional"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="lazyType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           Wrap the existing bean into lazy proxy.
+           Expose the full class or just interfaces.
+           Name is optional, and if no name is provided bean+'Proxy' will be used.
+
+           e.g.
+           <lazy name="UserProxy" bean="User">
+              <interface>org.acme.domain.IUser</interface>
+           </lazy>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="interface" type="interfaceType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string" use="optional"/>
+      <xsd:attribute name="bean" type="xsd:string" use="required"/>
+      <xsd:attribute name="exposeClass" type="xsd:boolean" default="false" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="constructorType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The constructor for this bean(factory) instance.
+
+           e.g. simple constructor - new POJO(new String("String value"));
+           <bean name="MyBean" class="com.acme.POJO">
+              <constructor>
+                 <parameter>String value</parameter>
+              </constructor>
+           </bean>
+
+           e.g. static factory - com.acme.Factory.newInstance(new String("String value"));
+           <bean name="MyBean" class="com.acme.POJO">
+              <constructor factoryClass="com.acme.Factory" factoryMethod="newInstance">
+                 <parameter>String value</parameter>
+              </constructor>
+           </bean>
+
+           e.g. instance factory - "SomeOtherBean".newInstance(new String("String value"));
+           <bean name="MyBean" class="com.acme.POJO">
+              <constructor factoryMethod="newInstance">
+                 <factory bean="SomeOtherBean"/>
+                 <parameter>String value</parameter>
+              </constructor>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:choice minOccurs="0">
+            <xsd:sequence>
+               <xsd:element name="factory" type="factoryType" minOccurs="0"/>
+               <xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+            <xsd:element name="bean" type="beanType"/>
+            <xsd:element name="lazy" type="lazyType"/>
+            <xsd:element name="value" type="plainValueType"/>
+            <xsd:element name="collection" type="collectionType"/>
+            <xsd:element name="list" type="listType"/>
+            <xsd:element name="set" type="setType"/>
+            <xsd:element name="array" type="arrayType"/>
+            <xsd:element name="map" type="mapType"/>
+            <xsd:element name="inject" type="injectionType"/>
+            <xsd:element name="value-factory" type="valueFactoryType"/>
+            <xsd:any namespace="##other" processContents="strict">
+               <xsd:annotation>
+                  <xsd:documentation>An extension value</xsd:documentation>
+               </xsd:annotation>
+            </xsd:any>
+         </xsd:choice>
+      </xsd:sequence>
+      <xsd:attribute name="factoryClass" type="classNameType" use="optional"/>
+      <xsd:attribute name="factoryMethod" type="xsd:token" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="lifecycleType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The lifecycle lets you override the method parameters passed to the
+           create, start, stop, destroy lifecycle callbacks.
+
+           e.g.
+           <bean>
+              <create method="initialize">
+                 <parameter>String value</parameter>
+              </create>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="method" type="xsd:token" use="optional"/>
+      <xsd:attribute name="ignored" type="xsd:boolean" use="optional" default="false"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="installType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The install type you write your installation methods state operations.
+           The install operation is invoked after the start lifecycle.
+           The uninstall operation is invoked before the stop lifecycle.
+
+           e.g.
+           <bean>
+              <install bean="Repository" method="add">
+                 <parameter><this/></parameter>
+              </install>
+              <uninstall bean="Repository" method="remove">
+                 <parameter><this/></parameter>
+              </uninstall>
+           </bean>
+
+           If you don't include a bean attribute, the method is invoked on your bean
+
+           e.g.
+           <bean>
+              <install method="install"/>
+              <uninstall bean="method="uninstall"/>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+         <xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="bean" type="xsd:string" use="optional"/>
+      <xsd:attribute name="method" type="xsd:token" use="required"/>
+      <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="uninstallCallbackType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           Callback item description.
+           Define you methods for callback invocation.
+
+           e.g.
+           <bean>
+              <uncallback method="addSomething" />
+              <uncallback property="items" cardinality="2..n" />
+              <uncallback property="info" signature="org.jboss.test.Info"/>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="method" type="xsd:token" use="optional"/>
+      <xsd:attribute name="property" type="xsd:token" use="optional"/>
+      <xsd:attribute name="cardinality" type="xsd:token" use="optional"/>
+      <xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="signature" type="xsd:token" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="installCallbackType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           Callback item description.
+           Define you methods for callback invocation.
+
+           e.g.
+           <bean>
+              <incallback method="addSomething" />
+              <incallback property="items" cardinality="2..n" />
+              <incallback property="info" signature="org.jboss.test.Info"/>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="method" type="xsd:token" use="optional"/>
+      <xsd:attribute name="property" type="xsd:token" use="optional"/>
+      <xsd:attribute name="cardinality" type="xsd:token" use="optional"/>
+      <xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="signature" type="xsd:token" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="dependencyType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A dependency represents an injection into the bean.
+           They can be used anywhere a string value can appear.
+
+           e.g. Bean instance - "InjectedIntoMe".setSomeProperty("BeanInjected");
+           <bean name="InjectedIntoMe" ...>
+              <property name="someProperty"><inject bean="BeanInjected"/>
+           </bean>
+           <bean name="BeanInjected" .../>
+
+           e.g. Bean property - "InjectedIntoMe".setSomeProperty("BeanInjected".getOtherProperty());
+           <bean name="InjectedIntoMe" ...>
+              <property name="someProperty"><inject bean="BeanInjected" property="otherProperty"/>
+           </bean>
+           <bean name="BeanInjected" .../>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:attribute name="bean" type="xsd:string" use="required"/>
+      <xsd:attribute name="property" type="xsd:string" use="optional"/>
+      <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="injectionType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A dependency represents an injection into the bean.
+           They can be used anywhere a string value can appear.
+
+           e.g. Bean instance - "InjectedIntoMe".setSomeProperty("BeanInjected");
+           <bean name="InjectedIntoMe" ...>
+              <property name="someProperty"><inject bean="BeanInjected"/>
+           </bean>
+           <bean name="BeanInjected" .../>
+
+           e.g. Bean property - "InjectedIntoMe".setSomeProperty("BeanInjected".getOtherProperty());
+           <bean name="InjectedIntoMe" ...>
+              <property name="someProperty"><inject bean="BeanInjected" property="otherProperty"/>
+           </bean>
+           <bean name="BeanInjected" .../>
+
+           e.g. Contextual injection - finding exactly one instance which matches property's class type
+           <bean name="InjectedIntoMe" ...>
+              <property name="transactionManager"><inject/></property>
+           </bean>
+
+           e.g. Contextual injection - finding exactly one instance which matches property's name
+           <bean name="InjectedIntoMe" ...>
+              <property name="transactionManager"><inject type="ByName"/></property>
+           </bean>
+
+           e.g. Contextual injection - set optional injection; execute callback if currently no matching context exists
+           <bean name="InjectedIntoMe" ...>
+              <property name="transactionManager"><inject option="Callback"/></property>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:attribute name="bean" type="xsd:string" use="optional"/>
+      <xsd:attribute name="property" type="xsd:string" use="optional"/>
+      <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="type" type="autowireTypeType" use="optional" default="ByClass"/>
+      <xsd:attribute name="option" type="optionType" use="optional" default="Strict"/>
+      <xsd:attribute name="fromContext" type="contextType" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="searchType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           e.g. Search injection - by scope.
+           <bean name="InjectedIntoMe" ...>
+              <property name="transactionManager"><search bean="someTMbean" type="top"/></property>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:attribute name="bean" type="xsd:string" use="required"/>
+      <xsd:attribute name="property" type="xsd:string" use="optional"/>
+      <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="type" type="searchTypeType" use="required"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="valueFactoryType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A dependency represents an value injection into the bean.
+           They can be used anywhere a string value can appear.
+
+           e.g. Bean instance - "InjectedIntoMe".setSomeProperty("ValueFactory".getValue("foo.bar.prop", "mydefault"));
+           <bean name="InjectedIntoMe" ...>
+              <property name="someProperty">
+                  <value-factory bean="BeanInjected" method="getValue">
+                     <parameter>foo.bar.prop</parameter>
+                     <parameter>mydefault</parameter>
+                  </value-factory>
+              </property>
+           </bean>
+           <bean name="BeanInjected" .../>
+
+           e.g. Bean instance - "InjectedIntoMe".setSomeProperty("ValueFactory".getValue("foo.bar.prop"));
+           <bean name="InjectedIntoMe" ...>
+              <property name="someProperty">
+                  <value-factory bean="BeanInjected" method="getValue" parameter="foo.bar.prop" default="mydefault" />
+              </property>
+           </bean>
+           <bean name="BeanInjected" .../>
+
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="parameter" type="parameterType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="bean" type="xsd:string"/>
+      <xsd:attribute name="method" type="xsd:string"/>
+      <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="parameter" type="xsd:string" use="optional"/>
+      <xsd:attribute name="default" type="xsd:string" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="factoryType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A factory represents another bean used to construct an object.
+
+           e.g. Bean instance - "InjectedIntoMe".setSomeProperty("BeanInjected");
+           <bean name="ConstructMe" ...>
+              <constructor factoryMethod="someMethod">
+                 <factory bean="Factory"/>
+              </constructor>
+           </bean>
+           <bean name="Factory" .../>
+
+           You can also inject a property of the bean bean
+           e.g.
+           <bean name="ConstructMe" ...>
+              <constructor factoryMethod="someMethod">
+                 <factory bean="Builder" property="getFactory"/>
+              </constructor>
+           </bean>
+
+           Or you can construct a factory in place using a different schema/namsapce
+           e.g.
+           <bean name="ConstructMe" ...>
+              <constructor factoryMethod="someMethod">
+                 <factory>
+                    <javabean xmlns="someOtherNamespace" class="com.acme.FactoryClass"/>
+                 </factory>
+              </constructor>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:choice minOccurs="0">
+         <xsd:any namespace="##other" processContents="strict"/>
+      </xsd:choice>
+      <xsd:attribute name="bean" type="xsd:string" use="optional"/>
+      <xsd:attribute name="property" type="xsd:string" use="optional"/>
+      <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+      <xsd:attribute name="whenRequired" type="controllerStateType" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="aliasType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            Bean's aliases.
+
+            e.g.
+            <bean name="MyName" class="com.acme.POJO">
+               <alias>YourName</alias>
+               <alias><javabean xmlns="urn:jboss:javabean:2.0" class="whatevever"/></alias>
+            </bean>
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:choice minOccurs="0">
+         <xsd:any namespace="##other" processContents="strict"/>
+      </xsd:choice>
+   </xsd:complexType>
+
+   <xsd:complexType name="namedAliasType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           An alias that has a name attribute.
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="aliasType">
+            <xsd:attribute name="name" type="xsd:string" use="required"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="relatedClassType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           Related classes.
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+         <xsd:any namespace="##other" processContents="strict"/>
+      </xsd:choice>
+      <xsd:attribute name="name" type="xsd:string" use="required"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="parameterType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A parameter is used to define the constructor, factory
+           and lifecycle method usage.
+
+           e.g. Using number of parameters when this is unique enough
+           <bean ...>
+              <constructor>
+                 <parameter>1st Parameter</parameter>
+                 <parameter>2nd Parameter</parameter>
+              </constructor>
+           </bean>
+
+           e.g. Explicitly stating the parameter type to resolve overloading
+           <bean ...>
+              <constructor>
+                 <parameter>1st Parameter</parameter>
+                 <parameter class="java.lang.String">2nd Parameter</parameter>
+              </constructor>
+           </bean>
+
+           e.g. To override the injected type use <value/>
+           <bean ...>
+              <constructor>
+                 <parameter>1st Parameter</parameter>
+                 <!-- Parameter is java.lang.Object, but we inject a String -->
+                 <parameter class="java.lang.Object">
+                    <value class="java.lang.String">2nd Parameter</value>
+                 </parameter>
+              </constructor>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="annotatedValueType"/>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="propertyType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A property defines values passed to the setters.
+
+           e.g. Using the type from the setter argument
+           <bean ...>
+              <property name="someProperty">Some value</property>
+           </bean>
+
+           e.g. Overridding the injected type
+           <bean ...>
+              <property name="someProperty" class="java.lang.String">Some value</property>
+           </bean>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="namedValueType">
+            <xsd:attribute name="preinstantiate" type="xsd:boolean" use="optional" default="true"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="annotationType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The annotation type represents a Java5 annotation on the particular join point.
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleContent>
+         <xsd:extension base="xsd:string">
+            <xsd:attribute name="replace" type="xsd:boolean"/>
+         </xsd:extension>
+      </xsd:simpleContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="interfaceType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The interface type represents an interface class.
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleContent>
+         <xsd:extension base="xsd:string" />
+      </xsd:simpleContent>
+   </xsd:complexType>
+
+   <xsd:simpleType name="classNameType">
+      <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 and as used in Class.forName().
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:whiteSpace value="collapse"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+   <xsd:group name="valueGroup">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           The value group represents the comment elements of the other configurations
+           <parameter/>, <property/> or collection components
+           e.g.
+
+           <property name="someProperty">
+              <list><value class="java.lang.String">Hello</value></list>
+           </property>
+
+           e.g. This also defines the null value
+           <property name="someProperty"><null/></property>
+           as opposed to the empty string
+           <property name="someProperty"></property>
+           or the string "null"
+           <property name="someProperty">null</property>
+
+           The this operation lets you pass yourself as a parameter.
+           e.g.
+           <install bean="SomeOtherBean> method="install">
+              <parameter><this/></parameter>
+           </install>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:choice>
+         <!--<xsd:element name="bean" type="beanType"/>-->
+         <!--<xsd:element name="lazy" type="lazyType"/>-->
+         <xsd:element name="value" type="plainValueType"/>
+         <xsd:element name="inject" type="injectionType"/>
+         <xsd:element name="value-factory" type="valueFactoryType"/>
+         <xsd:element name="collection" type="collectionType"/>
+         <xsd:element name="list" type="listType"/>
+         <xsd:element name="set" type="setType"/>
+         <xsd:element name="array" type="arrayType"/>
+         <xsd:element name="map" type="mapType"/>
+         <xsd:element name="null">
+            <xsd:complexType/>
+         </xsd:element>
+         <xsd:element name="this">
+            <xsd:complexType/>
+         </xsd:element>
+         <xsd:any namespace="##other" processContents="strict">
+            <xsd:annotation>
+               <xsd:documentation>An extension value</xsd:documentation>
+            </xsd:annotation>
+         </xsd:any>
+      </xsd:choice>
+   </xsd:group>
+
+   <xsd:complexType name="plainValueType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A simple value, used in collections and to specify a type for parameters.
+
+           e.g.
+           <parameter><value class="com.acme.MyClass">xxx</value></parameter>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:attribute name="class" type="classNameType" use="optional"/>
+      <xsd:attribute name="replace" type="xsd:boolean" use="optional"/>
+      <xsd:attribute name="trim" type="xsd:boolean" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="valueType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A value that can take other values, i.e. properties and parameters.
+
+           e.g.
+           <parameter><value class="com.acme.MyClass">xxx</value></parameter>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="plainValueType">
+            <xsd:sequence>
+               <xsd:choice minOccurs="0">
+                  <xsd:group ref="valueGroup"/>
+               </xsd:choice>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="classLoaderValueType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A value that represents a classloader.
+
+           e.g.
+           <classloader><inject bean="SomeClassLoader"/></parameter>
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:choice>
+         <xsd:element name="bean" type="beanType"/>
+         <xsd:element name="inject" type="dependencyType"/>
+         <xsd:element name="null">
+            <xsd:complexType/>
+         </xsd:element>
+         <xsd:any namespace="##other" processContents="strict">
+            <xsd:annotation>
+               <xsd:documentation>An extension value</xsd:documentation>
+            </xsd:annotation>
+         </xsd:any>
+      </xsd:choice>
+   </xsd:complexType>
+
+   <xsd:complexType name="annotatedValueType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A value that can take annotations.
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="valueType">
+            <xsd:sequence>
+               <xsd:element name="annotation" type="annotationType" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="namedValueType" mixed="true">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A value that has a name, currently only a property.
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="annotatedValueType">
+            <xsd:attribute name="name" type="xsd:string" use="required"/>
+         </xsd:extension>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="baseCollectionType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            A collection defines a java.util.Collection object.
+            It has two class definitions:
+            class: The implementation class of the collection
+            elementClass: The default implementation class of the elements
+            The default "class" is a java.util.ArrayList unless the point of injection
+            defines a concrete type, e.g. in the signature of the setter
+
+            example:
+            <property name="whatever" class="java.util.ArrayList" elementClass="java.net.URL">
+               <value>http://localhost</value> <!-- Creates a URL -->
+               <value class="java.lang.String">http://localhost</value> <!-- Creates a String -->
+            </property>
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+         <xsd:group ref="valueGroup"/>
+      </xsd:choice>
+      <xsd:attribute name="class" type="classNameType" use="optional"/>
+      <xsd:attribute name="elementClass" type="classNameType" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="collectionType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A collection, see baseCollectionType
+           the default collection is a java.util.ArrayList
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="baseCollectionType"/>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="listType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A list, see baseCollectionType
+           the default list is a java.util.ArrayList
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="baseCollectionType"/>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="setType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           A set, see baseCollectionType
+           the default set is a java.util.HashSet
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="baseCollectionType"/>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="arrayType">
+      <xsd:annotation>
+         <xsd:documentation>
+           <![CDATA[
+           An array, see baseCollectionType
+           the default array is a java.lang.Object[]
+           ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:complexContent>
+         <xsd:extension base="baseCollectionType"/>
+      </xsd:complexContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="mapType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            A map defines a java.util.Map object.
+            It has three class definitions:
+            class: The implementation class of the class
+            keyClass: The default implementation class of the keys
+            valueClass: The default implementation class of the values
+            The default "class" is a java.util.HashMap unless the point of injection
+            defines a concrete type, e.g. in the signature of the setter
+
+            e.g.:
+            <property name="whatever" class="java.util.HashMap" keyClass="java.lang.String" valueClas="java.net.URL">
+               <!-- map.put(new String("default"), new URL("http://localhost"));
+               <entry><key>default</key><value>http://localhost</value>
+               <!-- map.put(new String("default"), new String("http://localhost"));
+               <entry><key>default</key><value class="java.lang.String">http://localhost</value>
+            </property>
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="entry" type="entryType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="class" type="classNameType" use="optional"/>
+      <xsd:attribute name="keyClass" type="classNameType" use="optional"/>
+      <xsd:attribute name="valueClass" type="classNameType" use="optional"/>
+   </xsd:complexType>
+
+   <xsd:complexType name="entryType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            An entry in map. These are made of key/value pairs
+
+            e.g.:
+            <entry><key>default</key><value>http://localhost</value>
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:sequence>
+         <xsd:element name="key" type="valueType" minOccurs="0"/>
+         <xsd:element name="value" type="valueType" minOccurs="0"/>
+      </xsd:sequence>
+   </xsd:complexType>
+
+   <xsd:complexType name="dependsType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            The depends element is used to define that one bean depends upon
+            another for the create/start/stop/destroy lifecycle
+
+            e.g.:
+            <bean name="IGoFirst" .../>
+            <bean name="IGoSecond" ...>
+               <depends>IGoFirst</depends>
+            </bean>
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleContent>
+         <xsd:extension base="xsd:string"/>
+      </xsd:simpleContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="demandType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            The demand is used to specify a dependency on a supply
+            and when the demand should be supplied
+
+            e.g.:
+            ISupply must be installed before IDemand is constructed
+
+            <bean name="IDemand">
+               <demand state="Instantiated">theSupply</demand>
+            </bean>
+            <bean name="ISupply" ...>
+               <supply>theSupply</supply>
+            </bean>
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleContent>
+         <xsd:extension base="xsd:string">
+            <xsd:attribute name="state" type="controllerStateType" use="optional"/>
+            <xsd:attribute name="transformer" type="xsd:token" use="optional"/>
+         </xsd:extension>
+      </xsd:simpleContent>
+   </xsd:complexType>
+
+   <xsd:complexType name="supplyType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            The supply is used to specify that the bean supplies a demanded dependency
+
+            e.g.:
+            <bean name="IDemand" ...>
+               <demand>theSupply</demand>
+            </bean>
+            <bean name="ISupply" ...>
+               <supply>theSupply</supply>
+            </bean>
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleContent>
+         <xsd:extension base="xsd:string">
+            <xsd:attribute name="class" type="classNameType" use="optional"/>
+         </xsd:extension>
+      </xsd:simpleContent>
+   </xsd:complexType>
+
+   <xsd:simpleType name="controllerStateType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            The controller state is used to say when dependencies must be satisfied.
+            Valid values include:
+            Described
+            Instantiated
+            Configured
+            Create
+            Start
+            Installed
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:whiteSpace value="collapse"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+   <xsd:simpleType name="controllerModeType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            The controller mode, used to control how automatic the bean progresses
+            through the controller lifecyle (the states).
+            Valid values include:
+            Automatic (default) - the controller takes the bean to "Installed"
+            Manual - the user must tell the controller the required state
+            On Demand - the controller takes the bean to "Installed" when another bean depends on it
+            Disabled - the controller or user cannot change the state
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:whiteSpace value="collapse"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+   <xsd:simpleType name="accessModeType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            Access type, valid values include:
+            property (default)
+            field
+            public_member
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:whiteSpace value="collapse"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+   <xsd:simpleType name="autowireTypeType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            You can set the type of lookup requirement - class type (ByClass) or property name (ByName)
+            Valid values include:
+            None
+            ByClass (default)
+            ByName
+            Constructor
+            Auto
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:whiteSpace value="collapse"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+   <xsd:simpleType name="searchTypeType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            You can set the search lookup by type:
+            Valid values include:
+             DEFAULT,
+             LOCAL,
+             TOP,
+             PARENT_ONLY,
+             PARENT,
+             DEPTH,
+             LEAVES,
+             WIDTH,
+             CHILD_ONLY_DEPTH,
+             CHILD_ONLY_LEAVES,
+             CHILD_ONLY_WIDTH
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:whiteSpace value="collapse"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+   <xsd:simpleType name="optionType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            You can set the type of lookup option - Strict or Callback
+            Valid values include:
+            Strict (default)
+            Callback
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:whiteSpace value="collapse"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+   <xsd:simpleType name="contextType">
+      <xsd:annotation>
+         <xsd:documentation>
+            <![CDATA[
+            You can set the type of context property lookup
+            Valid values include:
+            name
+            metadata
+            scope
+            ]]>
+         </xsd:documentation>
+      </xsd:annotation>
+      <xsd:restriction base="xsd:string">
+         <xsd:whiteSpace value="collapse"/>
+      </xsd:restriction>
+   </xsd:simpleType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexRedefineFromJar.xml b/xml/tests/testData/xml/ComplexRedefineFromJar.xml
new file mode 100644
index 000000000000..75ab2f6c7198
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefineFromJar.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<graph edgedefault="directed">
+</graph>
+</graphml>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexRedefineSchemas/graphml-structure.xsd b/xml/tests/testData/xml/ComplexRedefineSchemas/graphml-structure.xsd
new file mode 100644
index 000000000000..ca614d6da14f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefineSchemas/graphml-structure.xsd
@@ -0,0 +1,1114 @@
+<?xml version="1.0"?>
+
+<xs:schema   
+             targetNamespace="http://graphml.graphdrawing.org/xmlns"
+
+             xmlns="http://graphml.graphdrawing.org/xmlns"
+             xmlns:g="http://graphml.graphdrawing.org/xmlns"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+             xmlns:xlink="http://www.w3.org/1999/xlink" 
+
+             elementFormDefault="qualified"
+             attributeFormDefault="unqualified"
+>
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     The schema corresponding to this document defines the structural
+     layer of the Graph Markup Language (GraphML).
+     Although a DTD is provided, this schema is, together with its extensions
+     http://graphml.graphdrawing.org/xmlns/1.0/graphml-attributes.xsd
+     and
+     http://graphml.graphdrawing.org/xmlns/1.0/graphml-parseinfo.xsd,
+     the only normative reference.
+    </xs:documentation>
+  </xs:annotation>
+
+<xs:import namespace="http://www.w3.org/1999/xlink" 
+           schemaLocation="http://graphml.graphdrawing.org/xmlns/1.0/xlink.xsd">
+  <xs:annotation>
+    <xs:documentation 
+        source="???"
+        xml:lang="en">
+       Get access to the xlink attribute groups for the attributes
+       xlink:href and xlink:type of locator.type.
+    </xs:documentation>
+  </xs:annotation>
+</xs:import>
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      The attribute groups &lt;element_name>.extra.attrib may be used
+      for adding user defined attributes to the elements
+      &lt;element_name>.
+      The attribute group common.extra.attrib may be used for adding
+      user defined attributes to all elements.
+    </xs:documentation>
+  </xs:annotation>
+
+
+<xs:attributeGroup name="common.extra.attrib"/>
+
+
+<xs:attributeGroup name="graphml.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="data.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="key.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="default.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="graph.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="node.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="edge.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="port.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="hyperedge.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="endpoint.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+<xs:attributeGroup name="locator.extra.attrib">
+  <xs:attributeGroup ref="common.extra.attrib"/>
+</xs:attributeGroup>
+
+
+
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type definitions for the GraphML structural layer elements:
+      &lt;data>, &lt;default>, &lt;key>, &lt;graphml>, &lt;graph>, 
+      &lt;node>, &lt;port>, 
+      &lt;edge>, &lt;hyperedge>, &lt;endpoint> and &lt;locator>.
+      The names of the complex types are constructed corresponding
+      to the pattern element_name.type.
+      (The only remaining GraphML structural layer element
+      &lt;desc> is of simple type xs:string.)
+    </xs:documentation>
+  </xs:annotation>
+
+
+<xs:complexType name="data-extension.type" mixed="true">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Extension mechanism for the content of &lt;data> and &lt;default>.
+      The complex type data-extension.type is empty per default.
+      Users may redefine this type in order to add content to 
+      the complex types data.type and default.type which are 
+      extensions of data-extension.type.
+    </xs:documentation>
+  </xs:annotation>
+</xs:complexType>
+
+
+<xs:complexType name="data.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;data> element.
+      data.type is mixed, that is, &lt;data> may contain #PCDATA.
+      Content type: extension of data-extension.type which is empty
+                    per default.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:complexContent mixed="true">
+    <xs:extension base="data-extension.type">
+      <xs:attribute name="key" type="xs:NMTOKEN" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">refers to the id attribute of a &lt;key>.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="id" type="xs:NMTOKEN" use="optional">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">identifies this &lt;data>.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attributeGroup ref="data.extra.attrib">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                 user defined extra attributes for &lt;data> elements
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attributeGroup>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+
+
+<xs:complexType name="default.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;default> element.
+      default.type is mixed, that is, data may contain #PCDATA.
+      Content type: extension of data-extension.type which is empty
+                    per default.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:complexContent mixed="true">
+    <xs:extension base="data-extension.type">
+      <xs:attributeGroup ref="default.extra.attrib">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                 user defined extra attributes for &lt;default> elements
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attributeGroup>
+    </xs:extension>
+  </xs:complexContent>
+</xs:complexType>
+
+
+
+<xs:simpleType name="key.for.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the for attribute of &lt;key>.
+      key.for.type is a restriction of xs:NMTOKEN
+      Allowed values: all, graph, node, edge, hyperedge, port and endpoint.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="all"/>
+    <xs:enumeration value="graph"/>
+    <xs:enumeration value="node"/>
+    <xs:enumeration value="edge"/>
+    <xs:enumeration value="hyperedge"/>
+    <xs:enumeration value="port"/>
+    <xs:enumeration value="endpoint"/>
+  </xs:restriction>
+</xs:simpleType>
+
+
+<xs:complexType name="key.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;key> element.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>    
+    <xs:element ref="default" minOccurs="0"/>
+  </xs:sequence>
+  <xs:attribute name="id" type="xs:NMTOKEN" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">identifies this &lt;key>.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="for" type="key.for.type" default="all">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                 describes the domain of definition for 
+                 the corresponding graph attribute. 
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attributeGroup ref="key.extra.attrib">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                  user defined extra attributes for &lt;key> elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+</xs:complexType>
+
+
+<xs:complexType name="graphml.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;graphml> element.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>    
+    <xs:element ref="key" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="graph"/>
+        <xs:element ref="data"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:sequence>
+  <xs:attributeGroup ref="graphml.extra.attrib">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                user defined extra attributes for &lt;graphml> elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+</xs:complexType>
+
+
+<xs:simpleType name="graph.edgedefault.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the edgedefault attribute of &lt;graph>.
+      graph.edgedefault.type is a restriction of xs:NMTOKEN
+      Allowed values: directed, undirected.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="directed"/>
+    <xs:enumeration value="undirected"/>
+  </xs:restriction>
+</xs:simpleType>
+
+
+<xs:complexType name="graph.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;graph> element.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:choice>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="data"/>
+          <xs:element ref="node"/>
+          <xs:element ref="edge"/>
+          <xs:element ref="hyperedge"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:element ref="locator"/>
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="graph.extra.attrib">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                user defined extra attributes for &lt;graph> elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attribute name="id" type="xs:NMTOKEN"  >
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                  identifies this graph .
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="edgedefault" 
+                type="graph.edgedefault.type" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                        describes whether edges of this graph are considered
+                        as directed or undirected per default (unless 
+                        specified by the attribute directed of &lt;edge>).
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+</xs:complexType>
+
+
+
+<xs:complexType name="node.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;node> element.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:choice>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="data"/>
+          <xs:element ref="port"/>
+        </xs:choice>
+        <xs:element ref="graph" minOccurs="0"/>
+      </xs:sequence>
+      <xs:element ref="locator"/>
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="node.extra.attrib">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                user defined extra attributes for &lt;node elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attribute name="id" type="xs:NMTOKEN" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                 identifies this node.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+</xs:complexType>
+
+
+
+<xs:complexType name="port.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;port> element.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="data" />
+      <xs:element ref="port" />
+    </xs:choice>
+  </xs:sequence>
+  <xs:attributeGroup ref="port.extra.attrib"> 
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                 user defined extra attributes for &lt;port> elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attribute name="name" type="xs:NMTOKEN" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                   identifies this port, within the node it is contained in.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+</xs:complexType>
+  
+
+
+<xs:complexType name="edge.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;edge> element.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0"/>
+    <xs:element ref="data" minOccurs="0" maxOccurs="unbounded"/>
+    <xs:element ref="graph" minOccurs="0"/>
+  </xs:sequence>
+  <xs:attributeGroup ref="edge.extra.attrib">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                 user defined extra attributes for &lt;edge> elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attribute name="id" type="xs:NMTOKEN" >
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                identifies this edge .
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="directed" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                overwrites the edgedefault attribute of &lt;graph> .
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="source" type="xs:NMTOKEN" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                  points to the id attribute of the source &lt;node>.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="target" type="xs:NMTOKEN" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                   points to the id attribute of the target &lt;node>.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="sourceport" type="xs:NMTOKEN">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                 points to the name attribute of the source &lt;port>.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="targetport" type="xs:NMTOKEN">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                    points to the name attribute of the target &lt;port>.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+</xs:complexType>
+
+
+<xs:complexType name="hyperedge.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;hyperedge> element.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="data" />
+      <xs:element ref="endpoint" />
+    </xs:choice>
+    <xs:element ref="graph" minOccurs="0" />
+  </xs:sequence>
+  <xs:attributeGroup ref="hyperedge.extra.attrib"> 
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+               user defined extra attributes for &lt;hyperedge> elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attribute name="id" type="xs:NMTOKEN" >
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                  identifies this &lt;hyperedge> .
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+</xs:complexType>
+  
+
+<xs:simpleType name="endpoint.type.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the type attribute of &lt;endpoint>.
+      endpoint.type.type is a restriction of xs:NMTOKEN
+      Allowed values: in, out, undir.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="in"/>
+    <xs:enumeration value="out"/>
+    <xs:enumeration value="undir"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:complexType name="endpoint.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;endpoint> element.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:sequence>
+    <xs:element ref="desc" minOccurs="0" />
+  </xs:sequence>
+  <xs:attributeGroup ref="endpoint.extra.attrib"> 
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                 user defined extra attributes for &lt;endpoint> elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attribute name="id" type="xs:NMTOKEN">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                  identifies this &lt;endpoint> .
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="port" type="xs:NMTOKEN" >
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                points to the name of the port, to which this endpoint is 
+                 connected .
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="node" type="xs:NMTOKEN" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en"> 
+            points to the id of the node, to which this endpoint is connected. 
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <xs:attribute name="type" type="endpoint.type.type" default="undir">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+               defines the direction on this endpoint (undirected per default).
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+</xs:complexType>
+
+
+<xs:complexType name="locator.type" final="#all">
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Complex type for the &lt;locator> element.
+      Content type: (empty)
+    </xs:documentation>
+  </xs:annotation>
+  <xs:attributeGroup ref="locator.extra.attrib">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+               user defined extra attributes for &lt;locator> elements.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attributeGroup>
+  <xs:attribute ref="xlink:href" use="required">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+                points to the resource of this locator.
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+  <!-- xs:attribute ref="xlink:type" fixed="simple"-->
+  <xs:attribute ref="xlink:type">
+        <xs:annotation>
+          <xs:documentation 
+              source="http://graphml.graphdrawing.org/"
+              xml:lang="en">
+               type of the hyperlink (fixed as simple).
+          </xs:documentation>
+        </xs:annotation>
+  </xs:attribute>
+</xs:complexType>
+
+<!--========================================================-->
+
+<xs:element name="desc" type="xs:string" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: Provides human-readable descriptions for the GraphML
+                        element containing this &lt;desc> as its first child.
+           Occurence:   &lt;key>, &lt;graphml>, &lt;graph>, 
+                        &lt;node>, &lt;port>, &lt;edge>, &lt;hyperedge>, and
+                        &lt;endpoint>. 
+      </xs:documentation>
+    </xs:annotation>
+</xs:element>
+
+
+<xs:element name="locator" type="locator.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: Graphs and nodes are declared by the elements
+                        &lt;graph> and &lt;node>, respectively. The optional
+                        &lt;locator>-child of these elements point to 
+                        their definition. (If there is no &lt;locator>-child
+                        the graphs/nodes are defined by their content).
+           Occurence:   &lt;graph>, and &lt;node>. 
+      </xs:documentation>
+    </xs:annotation>
+</xs:element>
+
+<xs:element name="data" type="data.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: In GraphML there may be data-functions attached
+                        to graphs, nodes, ports, edges, hyperedges and
+                        endpoint and to the whole collection of 
+                        graphs described by the content of &lt;graphml>. 
+                        These functions are declared by &lt;key> elements
+                        (children of &lt;graphml>) and defined by &lt;data>
+                        elements.
+           Occurence: &lt;graphml>, &lt;graph>, &lt;node>, &lt;port>, 
+                      &lt;edge>, &lt;hyperedge>, and &lt;endpoint>. 
+      </xs:documentation>
+    </xs:annotation>
+
+  <xs:unique name="data_data_key_unique">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">        
+        Ensures: uniqueness of the key attributes of &lt;data> children
+                 of this &lt;data> element.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+
+<xs:element name="key" type="key.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: In GraphML there may be data-functions attached
+                        to graphs, nodes, ports, edges, hyperedges and
+                        endpoint and to the whole collection of 
+                        graphs described by the content of &lt;graphml>. 
+                        These functions are declared by &lt;key> elements
+                        (children of &lt;graphml>) and defined by &lt;data>
+                        elements.
+           Occurence: &lt;graphml>. 
+      </xs:documentation>
+    </xs:annotation>
+</xs:element>
+
+<xs:element name="default" type="default.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: In GraphML there may be data-functions attached
+                        to graphs, nodes, ports, edges, hyperedges and
+                        endpoint and to the whole collection of 
+                        graphs described by the content of &lt;graphml>. 
+                        These functions are declared by &lt;key> elements
+                        (children of &lt;graphml>) and defined by &lt;data>
+                        elements.
+                        The (optional) &lt;default> child of &lt;key> gives 
+                        the default value for the corresponding function. 
+           Occurence: &lt;key>. 
+      </xs:documentation>
+    </xs:annotation>
+</xs:element>
+
+<xs:element name="graphml" type="graphml.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: &lt;graphml> is the root element of each GraphML 
+                      document.
+           Occurence: root. 
+      </xs:documentation>
+    </xs:annotation>
+
+  <xs:unique name="graphml_data_key_unique">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the key attributes of &lt;data> children
+                 of this &lt;graphml> element.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+  <xs:key name="key_id_key"> 
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: existence and uniqueness of the id attributes of 
+                 each &lt;key> element in this document.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:key"/>
+    <xs:field xpath="@id"/>
+  </xs:key>
+
+
+  <xs:unique name="graph_id_unique"> 
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the id attributes of 
+                 each &lt;graph> element in this document.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:graph"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:keyref name="data_key_ref" refer="key_id_key">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: for the key attribute of each &lt;data> in this document, 
+                 the existence of an id attribute of 
+                 &lt;key> which matches the value of it. 
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:keyref> 
+
+</xs:element>
+
+
+
+<xs:element name="graph" type="graph.type" block="#all">
+
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+          Description: Describes one graph in this document.
+          Occurence: &lt;graphml>, &lt;node>, &lt;edge>, &lt;hyperedge>.
+      </xs:documentation>
+    </xs:annotation>
+
+  <xs:unique name="graph_data_key_unique">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the key attributes of &lt;data> children
+                 of this &lt;graph> element.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+  <xs:key name="node_id_key"> 
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: existence and uniqueness of the id attributes of 
+                 each &lt;node> element in this graph.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:node"/>
+    <xs:field xpath="@id"/>
+  </xs:key>
+
+  <xs:unique name="edge_id_unique"> 
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the id attributes of 
+                 each &lt;edge> element in this graph.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="hyperedge_id_unique"> 
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the id attributes of 
+                 each &lt;hyperedge> element in this graph.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:hyperedge"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:unique name="endpoint_id_unique"> 
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the id attributes of 
+                 each &lt;endpoint> element in this graph.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:endpoint"/>
+    <xs:field xpath="@id"/>
+  </xs:unique>
+
+  <xs:keyref name="edge_source_ref" refer="node_id_key">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: for the source attribute of each &lt;edge> in this graph, 
+                 the existence of an id attribute of 
+                 &lt;node> which matches the value of it. 
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@source"/>
+  </xs:keyref> 
+
+  <xs:keyref name="edge_target_ref" refer="node_id_key">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: for the target attribute of each &lt;edge> in this graph, 
+                 the existence of an id attribute of 
+                 &lt;node> which matches the value of it. 
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:edge"/>
+    <xs:field xpath="@target"/>
+  </xs:keyref>
+
+  <xs:keyref name="endpoint_node_ref" refer="node_id_key">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: for the node attribute of each &lt;endpoint> in this graph,
+                 the existence of an id attribute of 
+                 &lt;node> which matches the value of it. 
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:endpoint"/>
+    <xs:field xpath="@node"/>
+  </xs:keyref>
+
+</xs:element>
+
+
+<xs:element name="node" type="node.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: Describes one node in the &lt;graph>
+                        containing this &lt;node>.
+           Occurence: &lt;graph>. 
+      </xs:documentation>
+    </xs:annotation>
+
+  <xs:key name="port_name_key"> 
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: existence and uniqueness of the name attributes of 
+                 each &lt;port> element within this &lt;node>.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath=".//g:port"/>
+    <xs:field xpath="@name"/>
+  </xs:key>
+
+  <xs:unique name="node_data_key_unique">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the key attributes of &lt;data> children
+                 of this &lt;node> element.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+
+<xs:element name="port" type="port.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: Nodes may be structured by ports; thus edges
+                        are not only attached to a node but to a certain
+                        port in this node.
+           Occurence: &lt;node>, &lt;port>. 
+      </xs:documentation>
+    </xs:annotation>
+
+  <xs:unique name="port_data_key_unique">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the key attributes of &lt;data> children
+                 of this &lt;port> element.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+
+<xs:element name="edge" type="edge.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: Describes an edge in the &lt;graph> which contains this
+                        &lt;edge>.
+           Occurence: &lt;graph>. 
+      </xs:documentation>
+    </xs:annotation>
+
+  <xs:unique name="edge_data_key_unique">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the key attributes of &lt;data> children
+                 of this &lt;edge> element.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+
+<xs:element name="hyperedge" type="hyperedge.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: While edges describe relations between two nodes, 
+                        a hyperedge describes a relation between an arbitrary
+                        number of nodes.
+           Occurence: &lt;graph>. 
+      </xs:documentation>
+    </xs:annotation>
+
+  <xs:unique name="hyperedge_data_key_unique">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+        Ensures: uniqueness of the key attributes of &lt;data> children
+                 of this &lt;hyperedge> element.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:selector xpath="./g:data"/>
+    <xs:field xpath="@key"/>
+  </xs:unique>
+
+</xs:element>
+
+
+<xs:element name="endpoint" type="endpoint.type" block="#all">
+    <xs:annotation>
+      <xs:documentation 
+          source="http://graphml.graphdrawing.org/"
+          xml:lang="en">
+           Description: The list of &lt;endpoints> within a hyperedge
+                        points to the nodes contained in this hyperedge.
+           Occurence: &lt;hyperedge>. 
+      </xs:documentation>
+    </xs:annotation>
+</xs:element>
+
+</xs:schema>
+
+<!--======================================================-->
+<!--      end of file: graphml-structure.xsd              -->
+<!--======================================================-->
diff --git a/xml/tests/testData/xml/ComplexRedefineSchemas/graphml.xsd b/xml/tests/testData/xml/ComplexRedefineSchemas/graphml.xsd
new file mode 100644
index 000000000000..00e79f4ab8ee
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefineSchemas/graphml.xsd
@@ -0,0 +1,345 @@
+<?xml version="1.0"?>
+
+<xs:schema   
+             targetNamespace="http://graphml.graphdrawing.org/xmlns"
+
+             xmlns="http://graphml.graphdrawing.org/xmlns"
+             xmlns:xs="http://www.w3.org/2001/XMLSchema"
+
+             elementFormDefault="qualified"
+             attributeFormDefault="unqualified"
+>
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     This document defines the GraphML language including GraphML attributes and GraphML parseinfo.
+    </xs:documentation>
+  </xs:annotation>
+
+
+<xs:redefine schemaLocation="http://graphml.graphdrawing.org/xmlns/1.0/graphml-structure.xsd">
+
+  <!--redefinition as in graphml-attributes.xsd -->
+
+  <xs:attributeGroup name="key.extra.attrib">
+    <xs:attributeGroup ref="key.extra.attrib"/>
+    <xs:attributeGroup ref="key.attributes.attrib"/>
+  </xs:attributeGroup>
+
+  <!--redefinition as in graphml-parseinfo.xsd -->
+
+  <xs:attributeGroup name="graph.extra.attrib">
+    <xs:attributeGroup ref="graph.extra.attrib"/>
+    <xs:attributeGroup ref="graph.parseinfo.attrib"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="node.extra.attrib">
+    <xs:attributeGroup ref="node.extra.attrib"/>
+    <xs:attributeGroup ref="node.parseinfo.attrib"/>
+  </xs:attributeGroup>
+
+</xs:redefine>
+
+
+  <!--types as in graphml-attributes.xsd -->
+
+<xs:simpleType name="key.name.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/(Dokumentation der Attributes Erweiterung; entsprechende Stelle.html)"
+        xml:lang="en">
+      Simple type for the attr.name attribute of &lt;key>.
+      key.name.type is final, that is, it may not be extended
+                          or restricted.
+      key.name.type is a restriction of xs:NMTOKEN
+      Allowed values: (no restriction)
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN"/>
+
+</xs:simpleType>
+
+
+
+<xs:simpleType name="key.type.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/(Dokumentation der Attributes Erweiterung; entsprechende Stelle.html)"
+        xml:lang="en">
+      Simple type for the attr.type attribute of &lt;key>.
+      key.type.type is final, that is, it may not be extended
+                          or restricted.
+      key.type.type is a restriction of xs:NMTOKEN
+      Allowed values: boolean, int, long, float, double, string.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN">  
+    <xs:enumeration value="boolean"/>
+    <xs:enumeration value="int"/>
+    <xs:enumeration value="long"/>
+    <xs:enumeration value="float"/>
+    <xs:enumeration value="double"/>
+    <xs:enumeration value="string"/>
+  </xs:restriction>
+
+</xs:simpleType>
+
+
+<xs:attributeGroup name="key.attributes.attrib">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     Definition of the attribute group key.attributes.attrib.
+     This group consists of the two optional attributes
+         - attr.name (gives the name for the data function)
+         - attr.type ((declares the range of values for the data function)
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attribute name="attr.name" type="key.name.type" use="optional"/>
+  <xs:attribute name="attr.type" type="key.type.type" use="optional"/>
+</xs:attributeGroup>
+
+  <!--types as in graphml-parseinfo.xsd -->
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+       Simple type definitions for the new graph attributes.
+    </xs:documentation>
+  </xs:annotation>
+
+<xs:simpleType name="graph.order.type"  final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.order attribute of &lt;graph>.
+      graph.order.type is final, that is, it may not be extended
+                          or restricted.
+      graph.order.type is a restriction of xs:NMTOKEN
+      Allowed values: free, nodesfirst, adjacencylist.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="free"/>
+    <xs:enumeration value="nodesfirst"/>
+    <xs:enumeration value="adjacencylist"/>
+  </xs:restriction>
+</xs:simpleType>
+
+<xs:simpleType name="graph.nodes.type"  final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.nodes attribute of &lt;graph>.
+      graph.nodes.type is final, that is, it may not be extended
+                          or restricted.
+      graph.nodes.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.edges.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.edges attribute of &lt;graph>.
+      graph.edges.type is final, that is, it may not be extended
+                          or restricted.
+      graph.edges.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.maxindegree.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.maxindegree attribute of &lt;graph>.
+      graph.maxindegree.type is final, that is, it may not be extended
+                          or restricted.
+      graph.maxindegree.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.maxoutdegree.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.maxoutdegree attribute of &lt;graph>.
+      graph.maxoutdegree.type is final, that is, it may not be extended
+                          or restricted.
+      graph.maxoutdegree.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.nodeids.type"  final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.nodeids attribute of &lt;graph>.
+      graph.nodeids.type is final, that is, it may not be extended
+                          or restricted.
+      graph.nodeids.type is a restriction of xs:string
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="canonical"/>
+    <xs:enumeration value="free"/>
+  </xs:restriction>  
+</xs:simpleType>
+
+<xs:simpleType name="graph.edgeids.type"  final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.edgeids attribute of &lt;graph>.
+      graph.edgeids.type is final, that is, it may not be extended
+                          or restricted.
+      graph.edgeids.type is a restriction of xs:string
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:NMTOKEN">
+    <xs:enumeration value="canonical"/>
+    <xs:enumeration value="free"/>
+  </xs:restriction>  
+</xs:simpleType>
+
+<xs:attributeGroup name="graph.parseinfo.attrib">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     Definition of the attribute group graph.parseinfo.attrib.
+     This group consists of the seven attributes
+     - parse.nodeids (fixed to 'canonical' meaning that the id attribute
+                      of &lt;node> follows the pattern 'n[number]),
+     - parse.edgeids (fixed to 'canonical' meaning that the id attribute
+                      of &lt;edge> follows the pattern 'e[number]),
+     - parse.order (required; one of the values 'nodesfirst', 
+                    'adjacencylist' or 'free'),
+     - parse.nodes (required; number of nodes in this graph), 
+     - parse.edges (required; number of edges in this graph), 
+     - parse.maxindegree (optional; maximal indegree of a node in this graph),
+     - parse.maxoutdegree (optional; maximal outdegree of a node in this graph)
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attribute name="parse.nodeids" type="graph.nodeids.type"/>
+  <xs:attribute name="parse.edgeids" type="graph.edgeids.type"/>
+  <xs:attribute name="parse.order" type="graph.order.type"/>
+  <xs:attribute name="parse.nodes" type="graph.nodes.type"/>
+  <xs:attribute name="parse.edges" type="graph.edges.type"/>
+  <xs:attribute name="parse.maxindegree" type="graph.maxindegree.type" use="optional"/>
+  <xs:attribute name="parse.maxoutdegree" type="graph.maxoutdegree.type" use="optional"/>
+</xs:attributeGroup>
+
+
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+       Simple type definitions for the new node attributes.
+    </xs:documentation>
+  </xs:annotation>
+
+<xs:simpleType name="node.indegree.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.indegree attribute of &lt;node>.
+      node.indegree.type is final, that is, it may not be extended
+                          or restricted.
+      node.indegree.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:simpleType name="node.outdegree.type" final="#all">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+      Simple type for the parse.outdegree attribute of &lt;node>.
+      node.outdegree.type is final, that is, it may not be extended
+                          or restricted.
+      node.outdegree.type is a restriction of xs:nonNegativeInteger
+      Allowed values: (no restriction).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:restriction base="xs:nonNegativeInteger"/>  
+</xs:simpleType>
+
+<xs:attributeGroup name="node.parseinfo.attrib">
+
+  <xs:annotation>
+    <xs:documentation 
+        source="http://graphml.graphdrawing.org/"
+        xml:lang="en">
+     Definition of the attribute group node.parseinfo.attrib.
+     This group consists of two attributes
+     - parse.indegree (optional; indegree of this node),
+     - parse.outdegree (optional; outdegree of this node).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attribute name="parse.indegree" type="node.indegree.type" use="optional"/>
+  <xs:attribute name="parse.outdegree" type="node.outdegree.type" use="optional"/>
+</xs:attributeGroup>
+
+</xs:schema>
+
+<!--======================================================-->
+<!--      end of file: graphml-parseinfo.xsd             -->
+<!--======================================================-->
diff --git a/xml/tests/testData/xml/ComplexRedefineSchemas/xlink.xsd b/xml/tests/testData/xml/ComplexRedefineSchemas/xlink.xsd
new file mode 100644
index 000000000000..0fa621b64147
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexRedefineSchemas/xlink.xsd
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<xs:schema 
+        targetNamespace="http://www.w3.org/1999/xlink" 
+
+        xmlns:xlink="http://www.w3.org/1999/xlink" 
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+>
+
+<xs:attribute name="type" default="simple">
+  <xs:simpleType>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="simple"/>
+      <xs:enumeration value="extended"/>
+      <xs:enumeration value="locator"/>
+      <xs:enumeration value="arc"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:attribute>
+
+<xs:attribute name="href" type="xs:anyURI" />
+
+<xs:attribute name="role" type="xs:string" />
+
+<xs:attribute name="arcrole" type="xs:string" />
+
+<xs:attribute name="title" type="xs:string" />
+
+<xs:attribute name="show" default="embed">
+  <xs:simpleType>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="new"/>
+      <xs:enumeration value="replace"/>
+      <xs:enumeration value="embed"/>
+      <xs:enumeration value="other"/>
+      <xs:enumeration value="none"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:attribute>
+
+<xs:attribute name="actuate" default="onLoad">
+  <xs:simpleType>
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="onLoad"/>
+      <xs:enumeration value="onRequest"/>
+      <xs:enumeration value="other"/>
+      <xs:enumeration value="none"/>
+    </xs:restriction>
+  </xs:simpleType>
+</xs:attribute>
+
+<xs:attribute name="from" type="xs:string" />
+
+<xs:attribute name="to" type="xs:string" />
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation.xml b/xml/tests/testData/xml/ComplexSchemaValidation.xml
new file mode 100644
index 000000000000..49aa455d5f8d
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output method="xml" indent="yes" encoding="ISO-8859-1"
+        doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+		doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml-strict.dtd"/>
+    <xsl:template match="/page">
+    <html xmlns="http://www.w3.org/1999/xhtml">
+        <head>
+            <meta content="text/html; charset=ISO-8859-1" http-equiv="Content-Type"/>
+            <link title="Esquema de cores padr?o" rel="stylesheet" type="text/css" href="stylesheets/css/default.css"/>
+        </head>
+        <body id="_top">
+            <script src="scripts/toolbar.js" type="text/javascript">//</script>
+            <div id="page_banner">
+                <div id="page_title">
+                    <br/>
+                </div>
+            </div>
+        </body>
+    </html>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation10.xsd b/xml/tests/testData/xml/ComplexSchemaValidation10.xsd
new file mode 100644
index 000000000000..17d3ff4a04a8
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation10.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://www.w3.org/2001/vxml" elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <xsd:redefine schemaLocation="ComplexSchemaValidation10_2.xsd">
+    <xsd:complexType name="say-as" mixed="true">
+      <xsd:complexContent>
+	<xsd:extension base="say-as">
+          <xsd:choice minOccurs="0" maxOccurs="unbounded">
+            <xsd:element ref="value"/>
+          </xsd:choice>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:group name="said">
+      <xsd:sequence>
+        <xsd:element ref="value"/>
+        <xsd:group ref="said"/>
+      </xsd:sequence>
+    </xsd:group>
+  </xsd:redefine>
+  <xsd:redefine schemaLocation="<error>vxml-synthesis-restriction.xsd</error>"/>
+  <xsd:element name="value">
+    <xsd:complexType>
+      <xsd:attribute name="expr"/>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation10_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation10_2.xsd
new file mode 100644
index 000000000000..e10f68e74734
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation10_2.xsd
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://www.w3.org/2001/vxml" elementFormDefault="qualified" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <xsd:complexType name="say-as" mixed="true">
+    <xsd:el></xsd:el>
+  </xsd:complexType>
+  <xsd:group name="said">
+    <xsd:sequence/>
+  </xsd:group>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation11.xml b/xml/tests/testData/xml/ComplexSchemaValidation11.xml
new file mode 100644
index 000000000000..aac46728ef4f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation11.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
+
+  <util:properties id="myProperties" location="classpath:org/springframework/beans/factory/config/util.properties"/>
+  <util:constant id="min" static-field="java.lang.Integer.MIN_VALUE"/>
+  <util:map id="myProps">
+    <entry key="bbb" value="aaa"/>
+  </util:map>
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation11.xsd b/xml/tests/testData/xml/ComplexSchemaValidation11.xsd
new file mode 100644
index 000000000000..4a9107965c3e
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation11.xsd
@@ -0,0 +1,360 @@
+<?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"/>
+  <!-- base types -->
+  <xsd:complexType name="identifiedType" abstract="true">
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+  <!-- Top-level <beans> tag -->
+  <xsd:element name="beans">
+    <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:attribute name="default-merge" default="false" type="xsd:boolean"/>
+      <xsd:attribute name="default-dependency-check" default="none">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:NMTOKEN">
+            <xsd:enumeration value="none"/>
+            <xsd:enumeration value="all"/>
+            <xsd:enumeration value="objects"/>
+            <xsd:enumeration value="simple"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:attribute>
+      <xsd:attribute name="default-autowire" default="no">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:NMTOKEN">
+            <xsd:enumeration value="byType"/>
+            <xsd:enumeration value="byName"/>
+            <xsd:enumeration value="no"/>
+            <xsd:enumeration value="autodetect"/>
+            <xsd:enumeration value="constructor"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:attribute>
+      <xsd:attribute name="default-init-method" type="xsd:string"/>
+      <xsd:attribute name="default-destroy-method" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="description">
+    <xsd:complexType mixed="true">
+      <xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="import">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:restriction base="xsd:anyType">
+          <xsd:attribute name="resource" type="xsd:string" use="required"/>
+        </xsd:restriction>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="alias">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:restriction base="xsd:anyType">
+          <xsd:attribute name="name" type="xsd:string" use="required"/>
+          <xsd:attribute name="alias" type="xsd:string" use="required"/>
+        </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>
+
+  <!-- Attibutes for the <beans> tag -->
+  <xsd:attributeGroup name="beanAttributes">
+    <xsd:attribute name="name" type="xsd:string"/>
+    <xsd:attribute name="class" type="xsd:string"/>
+    <xsd:attribute name="parent" type="xsd:string"/>
+    <xsd:attribute name="abstract" default="false" type="xsd:boolean"/>
+    <xsd:attribute name="singleton" default="true" type="xsd:boolean"/>
+    <xsd:attribute name="lazy-init" default="default" type="defaultable-boolean"/>
+    <xsd:attribute name="autowire" default="default">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:NMTOKEN">
+          <xsd:enumeration value="byType"/>
+          <xsd:enumeration value="byName"/>
+          <xsd:enumeration value="default"/>
+          <xsd:enumeration value="no"/>
+          <xsd:enumeration value="autodetect"/>
+          <xsd:enumeration value="constructor"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="dependency-check" default="default">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:NMTOKEN">
+          <xsd:enumeration value="default"/>
+          <xsd:enumeration value="none"/>
+          <xsd:enumeration value="all"/>
+          <xsd:enumeration value="objects"/>
+          <xsd:enumeration value="simple"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="depends-on" type="xsd:string"/>
+    <xsd:attribute name="init-method" type="xsd:string"/>
+    <xsd:attribute name="destroy-method" type="xsd:string"/>
+    <xsd:attribute name="factory-method" type="xsd:string"/>
+    <xsd:attribute name="factory-bean" type="xsd:string"/>
+    <xsd:attribute name="autowire-candidate" type="xsd:boolean" default="true"/>
+    <xsd:anyAttribute namespace="##other" processContents="strict"/>
+  </xsd:attributeGroup>
+
+  <!-- the <meta> element -->
+  <xsd:element name="meta" type="metaType"/>
+
+  <xsd:complexType name="metaType">
+    <xsd:attribute name="key" type="xsd:string" use="required"/>
+    <xsd:attribute name="value" type="xsd:string" use="required"/>
+  </xsd:complexType>
+
+  <!-- the <bean> element -->
+  <xsd:element name="bean">
+    <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:complexType>
+      <xsd:sequence>
+        <xsd:element ref="description" minOccurs="0"/>
+        <xsd:choice minOccurs="0">
+          <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:choice>
+      </xsd:sequence>
+      <xsd:attribute name="index" type="xsd:string"/>
+      <xsd:attribute name="type" type="xsd:string"/>
+      <xsd:attribute name="ref" type="xsd:string"/>
+      <xsd:attribute name="value" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="property" type="propertyType"/>
+  <xsd:element name="lookup-method">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:restriction base="xsd:anyType">
+          <xsd:attribute name="name" type="xsd:string"/>
+          <xsd:attribute name="bean" type="xsd:string"/>
+        </xsd:restriction>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="replaced-method">
+    <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:attribute name="replacer" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="arg-type">
+    <xsd:complexType mixed="true">
+      <xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:attribute name="match" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="ref">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:restriction base="xsd:anyType">
+          <xsd:attribute name="bean" type="xsd:string"/>
+          <xsd:attribute name="local" type="xsd:IDREF"/>
+          <xsd:attribute name="parent" type="xsd:string"/>
+        </xsd:restriction>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="idref">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:restriction base="xsd:anyType">
+          <xsd:attribute name="bean" type="xsd:string"/>
+          <xsd:attribute name="local" type="xsd:IDREF"/>
+        </xsd:restriction>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="value">
+    <xsd:complexType mixed="true">
+      <xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:attribute name="type" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="null">
+    <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:choice>
+    </xsd:sequence>
+  </xsd:group>
+
+  <xsd:element name="list" type="listOrSetType"/>
+  <xsd:element name="set" type="listOrSetType"/>
+  <xsd:element name="map" type="mapType"/>
+  <xsd:element name="entry" type="entryType"/>
+  <xsd:element name="props" type="propsType"/>
+
+  <xsd:element name="key">
+    <xsd:complexType>
+      <xsd:group ref="collectionElements"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="prop">
+    <xsd:complexType mixed="true">
+      <xsd:choice minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:attribute name="key" type="xsd:string" use="required"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <!-- Property Type -->
+  <xsd:complexType name="propertyType">
+    <xsd:sequence>
+      <xsd:element ref="description" minOccurs="0"/>
+      <xsd:choice minOccurs="0">
+        <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" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="ref" type="xsd:string"/>
+    <xsd:attribute name="value" type="xsd:string"/>
+  </xsd:complexType>
+
+
+  <!-- Collection Types -->
+
+  <!-- base collection type -->
+  <xsd:complexType name="baseCollectionType">
+    <xsd:attribute name="merge" type="defaultable-boolean"/>
+  </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: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: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:attribute name="key-ref" type="xsd:string"/>
+    <xsd:attribute name="value" type="xsd:string"/>
+    <xsd:attribute name="value-ref" type="xsd:string"/>
+  </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/xml/ComplexSchemaValidation11_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation11_2.xsd
new file mode 100644
index 000000000000..bc0f93061467
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation11_2.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/util"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:beans="http://www.springframework.org/schema/beans"
+            targetNamespace="http://www.springframework.org/schema/util"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+  <xsd:import namespace="http://www.springframework.org/schema/beans"/>
+
+  <xsd:element name="properties">
+    <xsd:complexType>
+      <xsd:attribute name="id" type="xsd:string"/>
+      <xsd:attribute name="location" type="xsd:string" use="required"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="constant">
+    <xsd:annotation>
+      <xsd:documentation>
+        Reference a public, static field on a type and expose its value as
+        a bean. For example &lt;util:constant static-field=&quot;java.lang.Integer.MAX_VALUE&quot;/&gt;.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:attribute name="id" type="xsd:string"/>
+      <xsd:attribute name="static-field" type="xsd:string" use="required"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="property-path">
+    <xsd:annotation>
+      <xsd:documentation>
+        Reference a property on a bean (or as a nested value) and expose its values as
+        a bean. For example &lt;util:property-path path=&quot;order.customer.name&quot;/&gt;.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:attribute name="id" type="xsd:string"/>
+      <xsd:attribute name="path" type="xsd:string" use="required"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="map">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="beans:mapType">
+          <xsd:attribute name="id" type="xsd:string" use="required"/>
+          <xsd:attribute name="map-class" type="xsd:string">
+            <xsd:annotation>
+              <xsd:appinfo>
+                <expected-type class="java.util.Class"/>
+                <assignable-from class="java.util.Map"/>
+              </xsd:appinfo>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="list">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="beans:listOrSetType">
+          <xsd:attribute name="id" type="xsd:string" use="required"/>
+          <xsd:attribute name="list-class" type="xsd:string">
+            <xsd:annotation>
+              <xsd:appinfo>
+                <expected-type class="java.util.Class"/>
+                <assignable-from class="java.util.List"/>
+              </xsd:appinfo>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="set">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="beans:listOrSetType">
+          <xsd:attribute name="id" type="xsd:string" use="required"/>
+          <xsd:attribute name="set-class" type="xsd:string">
+            <xsd:annotation>
+              <xsd:appinfo>
+                <expected-type class="java.util.Class"/>
+                <assignable-from class="java.util.Set"/>
+              </xsd:appinfo>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation12.xsd b/xml/tests/testData/xml/ComplexSchemaValidation12.xsd
new file mode 100644
index 000000000000..345e22309427
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation12.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<!--
+Test XML-schema
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="TestXSD">
+	<xs:complexType>
+	    <xs:sequence>
+                <!--Type is not allowed with ref-->
+                <xs:element ref="TestElement" <error>type="xs:string"</error>/>
+	    </xs:sequence>
+	</xs:complexType>
+    </xs:element>
+
+
+    <xs:element name="TestElement">
+	<xs:complexType>
+	    <xs:sequence>
+	    	<xs:element name="Name" type="xs:string"/>
+	    </xs:sequence>
+	</xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation13.xsd b/xml/tests/testData/xml/ComplexSchemaValidation13.xsd
new file mode 100644
index 000000000000..77f0935b4e6a
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation13.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:test" xmlns="urn:test" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+   <xs:complexType name="TestType1">
+        <xs:sequence>
+            <xs:element name="Test2" type="TestType2" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="TestType2">
+    </xs:complexType>
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation13_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation13_2.xsd
new file mode 100644
index 000000000000..57f4caa6800d
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation13_2.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:test" xmlns="urn:test" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+     <xs:complexType name="TestType3">
+        <xs:sequence>
+            <xs:element name="Test4" type="TestType4" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="TestType4">
+    </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation14.xml b/xml/tests/testData/xml/ComplexSchemaValidation14.xml
new file mode 100644
index 000000000000..29fd3cec2576
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation14.xml
@@ -0,0 +1,3 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<p:Parent xmlns:p="parent" p:name="aaa"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation14.xsd b/xml/tests/testData/xml/ComplexSchemaValidation14.xsd
new file mode 100644
index 000000000000..13c7e37bb592
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation14.xsd
@@ -0,0 +1,12 @@
+<xs:schema targetNamespace="parent"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:p="parent"
+    elementFormDefault="qualified">
+
+   <xs:complexType name="ParentType">
+        <xs:attribute name="name" form="qualified" use="required"/>
+    </xs:complexType>
+
+    <xs:element name="Parent" type="p:ParentType"/>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation14_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation14_2.xsd
new file mode 100644
index 000000000000..c07193a9d7e5
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation14_2.xsd
@@ -0,0 +1,13 @@
+<xs:schema targetNamespace="parent"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:p="parent"
+    xmlns:p2="p:myns"
+    elementFormDefault="qualified">
+   <xs:import namespace="p:myns" schemaLocation="<error>ComplexSchemaValidation14_2_2.xsd</error>"/>
+   <xs:complexType name="ParentType">
+        <xs:attribute name="name" form="qualified" use="required"/>
+    </xs:complexType>
+
+    <xs:element name="Parent" type="p:ParentType"/>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation15.xml b/xml/tests/testData/xml/ComplexSchemaValidation15.xml
new file mode 100644
index 000000000000..e5cd34015fb0
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation15.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:lin="http://www.linkedin.com/lispring">
+  <bean id="b4.1" class="java.lang.String">
+    <lin:config>
+      <property name="p1" value="v1"/>
+    </lin:config>
+  </bean>
+  <bean id="b4.2" class="java.lang.String">
+    <lin:config class="test.spring.TestSpring$Bean4$Config2">
+      <property name="p2" value="v2"/>
+    </lin:config>
+  </bean>
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation15.xsd b/xml/tests/testData/xml/ComplexSchemaValidation15.xsd
new file mode 100644
index 000000000000..71b23c6c31b5
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation15.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.linkedin.com/lispring"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:beans="http://www.springframework.org/schema/beans"
+            targetNamespace="http://www.linkedin.com/lispring"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+  <xsd:import namespace="http://www.springframework.org/schema/beans"/>
+  <!-- **************************************************************************** -->
+  <!-- * <configtag                                                             * -->
+  <!-- **************************************************************************** -->
+  <xsd:element name="config">
+    <xsd:complexType>
+      <xsd:choice minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="beans:property"/>
+      </xsd:choice>
+      <xsd:attribute name="class" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation15_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation15_2.xsd
new file mode 100644
index 000000000000..1830fb635381
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation15_2.xsd
@@ -0,0 +1,1077 @@
+<?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="all"/>
+						<xsd:enumeration value="objects"/>
+						<xsd:enumeration value="simple"/>
+					</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="byType"/>
+						<xsd:enumeration value="byName"/>
+						<xsd:enumeration value="no"/>
+						<xsd:enumeration value="autodetect"/>
+						<xsd:enumeration value="constructor"/>
+					</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 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 (for example, 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="byType"/>
+					<xsd:enumeration value="byName"/>
+					<xsd:enumeration value="default"/>
+					<xsd:enumeration value="no"/>
+					<xsd:enumeration value="autodetect"/>
+					<xsd:enumeration value="constructor"/>
+				</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="all"/>
+					<xsd:enumeration value="objects"/>
+					<xsd:enumeration value="simple"/>
+				</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 beans 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/xml/ComplexSchemaValidation16.xml b/xml/tests/testData/xml/ComplexSchemaValidation16.xml
new file mode 100644
index 000000000000..403f720961b1
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation16.xml
@@ -0,0 +1,53 @@
+<project xmlns="http://www.inversoft.com/schemas/savant-2.0/project"
+    name="slingshot"
+    group="texturemedia"
+    version="8.0-RC3">
+
+
+  <!-- import property file properties -->
+  <properties file="${user.home}/build.properties"/>
+
+  <!-- Compile properties -->
+  <property name="dir.src" value="src"/>
+  <property name="dir.src.java.main" value="${dir.src}/java/main"/>
+  <property name="dir.src.java.test" value="${dir.src}/java/test"/>
+  <property name="dir.target" value="target"/>
+  <property name="dir.target.jars" value="${dir.target}/jars"/>
+  <property name="dir.target.classes.main" value="${dir.target}/classes/main"/>
+  <property name="dir.target.classes.test" value="${dir.target}/classes/test"/>
+  <property name="compile.javac" value="${jdk1.6}/bin/javac"/>
+  <property name="run.java" value="${jdk1.6}/bin/java"/>
+  <property name="svn.host" value="http://192.168.1.212/svn/internal"/>
+  <property name="repos.url" value="${svn.host}/${project.name}"/>
+
+  <dependencies id="project.dependencies">
+    <artifactGroup type="run"/>
+    <artifactGroup type="compile">
+      <artifact group="apache" project="lucene" name="lucene" version="1.4.1" type="jar"/>
+      <artifact group="apache" project="poi" name="poi" version="2.5.1" type="jar"/>
+      <artifact group="jdom" project="jdom" name="jdom" version="1.0" type="jar"/>
+      <artifact group="oreilly" project="cos" name="cos" version="1.0" type="jar"/>
+      <artifact group="paypal" project="Verisign" name="Verisign" version="1.0" type="jar"/>
+      <artifact group="sun" project="servletapi" name="servletapi" version="2.4" type="jar"/>
+      <artifact group="sun" project="jspapi" name="jsp-api" version="2.0" type="jar"/>
+      <artifact group="sun" project="jaf" name="activation" version="1.1" type="jar"/>
+      <artifact group="sun" project="javamail" name="javamail" version="1.3.2" type="jar"/>
+    </artifactGroup>
+    <artifactGroup type="test-run"/>
+    <artifactGroup type="test-compile">
+      <artifact group="junit" project="junit" name="junit" version="3.8.1" type="jar"/>
+    </artifactGroup>
+  </dependencies>
+  <workflow id="workflow.texturemedia">
+    <fetchWorkflow>
+      <process type="localCacheFetchProcess"/>
+      <process type="mavenInternetFetchProcess" url="http://192.168.1.21/maven/"/>
+      <process type="savantInternetFetchProcess" url="http://192.168.1.212/savant/"/>
+      <process type="mavenInternetFetchProcess" url="http://www.apextechnology.com/maven/"/>
+      <process type="mavenInternetFetchProcess" url="http://mirrors.ibiblio.org/pub/mirrors/maven/"/>
+    </fetchWorkflow>
+    <publishWorkflow>
+      <process type="localCachePublishProcess"/>
+    </publishWorkflow>
+  </workflow>
+</project>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation16.xsd b/xml/tests/testData/xml/ComplexSchemaValidation16.xsd
new file mode 100644
index 000000000000..d68ad9ef5f92
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation16.xsd
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://www.inversoft.com/schemas/savant-2.0/project"
+    xmlns:project="http://www.inversoft.com/schemas/savant-2.0/project"
+    xmlns:base="http://www.inversoft.com/schemas/savant-2.0/base">
+
+  <xsd:import namespace="http://www.inversoft.com/schemas/savant-2.0/base"/>
+
+  <xsd:complexType name="dialect">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="namespace" type="xsd:string" use="required"/>
+    <xsd:attribute name="version" type="xsd:string" use="required"/>
+    <xsd:attribute name="config" use="optional">
+      <xsd:simpleType>
+        <xsd:list itemType="xsd:string"/>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:complexType>
+
+  <xsd:element name="project">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="properties" type="base:properties" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="property" type="base:property" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="dialect" type="project:dialect" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="dependencies" type="base:dependencies" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="workflow" type="base:workflow" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="publishWorkflow" type="base:publishWorkflow" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="name" type="xsd:string" use="required"/>
+      <xsd:attribute name="version" type="xsd:string" use="required"/>
+      <xsd:attribute name="group" type="xsd:string" use="required"/>
+      <xsd:attribute name="savantConfigVersion" type="xsd:string" use="optional"/>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation16_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation16_2.xsd
new file mode 100644
index 000000000000..26e2f38c2edc
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation16_2.xsd
@@ -0,0 +1,115 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://www.inversoft.com/schemas/savant-2.0/base"
+    xmlns:base="http://www.inversoft.com/schemas/savant-2.0/base">
+
+  <xsd:complexType name="property">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="value" type="xsd:string" use="required"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="properties">
+    <xsd:annotation>
+      <xsd:documentation>
+        Used to specify a properties file to load into the Savant runtime.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="file" type="xsd:string" use="required"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="publishWorkflow">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="process" type="process" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="process">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="type" type="xsd:string" use="required"/>
+    <xsd:anyAttribute processContents="skip"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="fetchWorkflow">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="process" type="process" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="workflow">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="fetchWorkflow" type="fetchWorkflow" minOccurs="1" maxOccurs="1"/>
+      <xsd:element name="publishWorkflow" type="publishWorkflow" minOccurs="1" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+
+
+  <xsd:complexType name="artifact">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="project" type="xsd:string" use="required"/>
+    <xsd:attribute name="group" type="xsd:string" use="required"/>
+    <xsd:attribute name="type" type="xsd:string" use="required"/>
+    <xsd:attribute name="version" type="xsd:string" use="required"/>
+    <xsd:attribute name="compatType" type="xsd:string" use="optional"/>
+    <xsd:attribute name="expireMinutes" type="xsd:integer" use="optional"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="artifactGroup">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="artifact" type="artifact" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="type" type="xsd:string" use="required"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="localProject">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="group" type="xsd:string" use="required"/>
+    <xsd:attribute name="projectFile" type="xsd:string" use="optional"/>
+    <xsd:attribute name="target" type="xsd:string" use="optional"/>
+    <xsd:attribute name="type" type="xsd:string" use="required"/>
+    <xsd:attribute name="dir" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="dependencies">
+    <xsd:annotation>
+      <xsd:documentation>
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="localProject" type="localProject" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="artifactGroup" type="artifactGroup" minOccurs="1" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation17.xml b/xml/tests/testData/xml/ComplexSchemaValidation17.xml
new file mode 100644
index 000000000000..6a971fdaaa96
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation17.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<utest:type1 xmlns:utest="urn:test"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:type="utest:TestType2"
+       >
+
+	<utest:int1>3</utest:int1>
+    <utest:int2>3</utest:int2>
+    <utest:int3>5</utest:int3>
+</utest:type1>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation17.xsd b/xml/tests/testData/xml/ComplexSchemaValidation17.xsd
new file mode 100644
index 000000000000..c2c2faca0aa5
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation17.xsd
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="urn:test" xmlns:utest="urn:test" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified" attributeFormDefault="unqualified">
+    <xs:element name="type1" type="utest:TestType1"/>
+
+    <xs:complexType name="TestType1">
+        <xs:sequence>
+            <xs:element name="int1" type="xs:int"></xs:element>
+            <xs:element name="int2" type="xs:int"></xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="TestType2">
+        <xs:complexContent>
+            <xs:extension base="utest:TestType1">
+                <xs:sequence>
+                    <xs:element name="int3" type="xs:int" >
+                    </xs:element>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation18.xml b/xml/tests/testData/xml/ComplexSchemaValidation18.xml
new file mode 100644
index 000000000000..6d5a89947167
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation18.xml
@@ -0,0 +1,16 @@
+<Application
+  xmlns="http://www.bindows.net/IVBindowsSchema"
+  xmlns:iv="http://www.infiview.net/infiview"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation=
+    "http://www.bindows.net/IVBindowsSchema ComplexSchemaValidation18.xsd
+     http://www.infiview.net/infiview ComplexSchemaValidation18_2.xsd"
+  autoNameMapping="true"
+  >
+
+  <Window caption="Network Topology Test" width="1024" height="728" >
+    <InfiView currentState="">
+      <iv:AbstractViewport/>
+    </InfiView>
+  </Window>
+</Application>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation18.xsd b/xml/tests/testData/xml/ComplexSchemaValidation18.xsd
new file mode 100644
index 000000000000..dd5f97efdace
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation18.xsd
@@ -0,0 +1,14419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="http://www.bindows.net/IVBindowsSchema"
+           targetNamespace="http://www.bindows.net/IVBindowsSchema"
+           elementFormDefault="qualified"
+           xmlns:iv="http://www.infiview.net/infiview"
+  >
+
+  <xs:import namespace="http://www.infiview.net/infiview"
+             schemaLocation="ComplexSchemaValidation18_2.xsd"/>
+
+  <xs:element name="Application">
+    <xs:complexType>
+      <xs:choice minOccurs="1" maxOccurs="unbounded">
+        <xs:element name="SplashScreen" minOccurs="0" maxOccurs="1"/>
+        <xs:element ref="Theme" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element name="Window" minOccurs="1" maxOccurs="1">
+          <!--<xs:complexType>-->
+          <!--<xs:choice minOccurs="0" maxOccurs="unbounded">-->
+          <!--<xs:element ref="iv:InfiView" minOccurs="0" maxOccurs="unbounded"/>-->
+          <!--<xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+          <!--</xs:choice>-->
+          <!--<xs:attributeGroup ref="ApplicationWindowAttributes"/>-->
+          <!--</xs:complexType>-->
+          <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+              <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+              <xs:element name="InfiView">
+                <xs:complexType>
+                  <xs:choice minOccurs="0" maxOccurs="unbounded">
+                    <xs:group ref="iv:InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+                    <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+                  </xs:choice>
+                  <xs:attributeGroup ref="ComponentAttributes"/>
+                  <xs:attributeGroup ref="iv:InfiViewAttributes"/>
+                </xs:complexType>
+              </xs:element>
+            </xs:choice>
+            <xs:attributeGroup ref="ApplicationWindowAttributes"/>
+          </xs:complexType>
+
+        </xs:element>
+
+        <xs:element name="Resources" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:choice maxOccurs="unbounded" minOccurs="0">
+              <xs:element name="Script">
+                <xs:complexType mixed="true">
+                  <xs:attributeGroup ref="ScriptAttributes"/>
+                </xs:complexType>
+              </xs:element>
+
+              <xs:element name="Package">
+                <xs:complexType>
+                  <xs:annotation>
+                    <xs:documentation>A package which will be loaded before the rest of the ADF is parsed.</xs:documentation>
+                  </xs:annotation>
+                  <xs:attributeGroup ref="PackageAttributes"/>
+                </xs:complexType>
+              </xs:element>
+
+            </xs:choice>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
+      <xs:attributeGroup ref="ApplicationAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+
+  <xs:attributeGroup name="PackageAttributes">
+    <xs:annotation>
+      <xs:documentation>Loads a Bindows package or script before parsing the rest of the ADF (including &lt;Script&gt; tags).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The location of the package script file (relative to Bindows)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="PackageTypes">
+      <xs:annotation>
+        <xs:documentation>The name of the package</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+
+  <xs:simpleType name="PackageTypes">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Loaders"/>
+      <xs:enumeration value="OlapGrid"/>
+      <xs:enumeration value="Charting"/>
+      <xs:enumeration value="WebService2"/>
+      <xs:enumeration value="Accessibility"/>
+      <xs:enumeration value="Animation"/>
+      <xs:enumeration value="Gauge2"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+
+  <xs:element name="AbstractChart">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for charts that are to be used with
+        BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChart" substitutionGroup="AbstractChart"/>
+
+  <xs:attributeGroup name="AbstractChartAttributes">
+
+    <xs:attributeGroup ref="AbstractChartBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for charts that are to be used with
+        BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChart2" substitutionGroup="AbstractChart2"/>
+
+  <xs:attributeGroup name="AbstractChart2Attributes">
+
+    <xs:attributeGroup ref="AbstractChartBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChartBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiAbstractChart
+        and BiAbstractChart2. All the charts
+        in BiGraph and BiGraph2
+        extend either BiAbstractChart or
+        BiAbstractChart2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChartBase" substitutionGroup="AbstractChartBase"/>
+
+  <xs:attributeGroup name="AbstractChartBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChartSection">
+    <xs:annotation>
+      <xs:documentation>
+        Used as base class for marker, column rect and pie chart section. These
+        are used to create the visual presentation for the data points of a chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChartSection" substitutionGroup="AbstractChartSection"/>
+
+  <xs:attributeGroup name="AbstractChartSectionAttributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChartSection2">
+    <xs:annotation>
+      <xs:documentation>
+        Used as base class for the column rectangles in BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartSection2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChartSection2" substitutionGroup="AbstractChartSection2"/>
+
+  <xs:attributeGroup name="AbstractChartSection2Attributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChartSectionBase">
+    <xs:annotation>
+      <xs:documentation>
+        Used as base class for marker, column rect and pie chart section. These
+        are used to create the visual presentation for the data points of a chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartSectionBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChartSectionBase" substitutionGroup="AbstractChartSectionBase"/>
+
+  <xs:attributeGroup name="AbstractChartSectionBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="strokeOpacity">
+      <xs:annotation>
+        <xs:documentation>The stroke opacity for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The stroke color for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillOpacity">
+      <xs:annotation>
+        <xs:documentation>The fill opacity for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor2">
+      <xs:annotation>
+        <xs:documentation>The alternate fill color used when fill type is gradient</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillType">
+      <xs:annotation>
+        <xs:documentation>The fill type used when painting the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillAngle">
+      <xs:annotation>
+        <xs:documentation>The fill angle used when painting the chart.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerType">
+      <xs:annotation>
+        <xs:documentation>The marker type for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerVisible">
+      <xs:annotation>
+        <xs:documentation>Whether markers are visible for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="explode">
+      <xs:annotation>
+        <xs:documentation>The amount to move the pie chart section from the center (percentage of radius)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Border">
+    <xs:annotation>
+      <xs:documentation>BiAbstractGauge2Border is the base class of all gauge2 borders
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2BorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Border" substitutionGroup="AbstractGauge2Border"/>
+
+  <xs:attributeGroup name="AbstractGauge2BorderAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Cap">
+    <xs:annotation>
+      <xs:documentation>This the base class of all caps
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2CapAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Cap" substitutionGroup="AbstractGauge2Cap"/>
+
+  <xs:attributeGroup name="AbstractGauge2CapAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Filler">
+    <xs:annotation>
+      <xs:documentation>This the base class of all fillers, fillers is used for coloring the background of gauge2 objects
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2FillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Filler" substitutionGroup="AbstractGauge2Filler"/>
+
+  <xs:attributeGroup name="AbstractGauge2FillerAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2GradientFiller">
+    <xs:annotation>
+      <xs:documentation>This class is the base class of all gradient fillers.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2GradientFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2GradientFiller" substitutionGroup="AbstractGauge2GradientFiller"/>
+
+  <xs:attributeGroup name="AbstractGauge2GradientFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2FillerAttributes"/>
+
+    <xs:attribute name="color1" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The color1 that the filler is going to use.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="color2" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The color2 that the filler is going to use.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opacity1" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The opacity1 that the filler is going to use for color1.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opacity2" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The opacity2 that the filler is going to use for color2.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="xpos" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The the x position of the center of the radial filling.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ypos" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The the y position of the center of the radial filling.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="highLightCenter" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Center of the highlight of the ring in percent. 0 being at the inner radius, 100
+          at the outer radius.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="thickness" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Thickness of the "ring" in percent.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Range">
+    <xs:annotation>
+      <xs:documentation>This class is the base class of all gauge2 ranges. A gauge2 range contains the "ticks" and "scales" and it can also
+        contain "borders".
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2RangeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Range" substitutionGroup="AbstractGauge2Range"/>
+
+  <xs:attributeGroup name="AbstractGauge2RangeAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Scale">
+    <xs:annotation>
+      <xs:documentation>This class is the base class of all scales
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2ScaleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Scale" substitutionGroup="AbstractGauge2Scale"/>
+
+  <xs:attributeGroup name="AbstractGauge2ScaleAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+    <xs:attribute name="labelColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Color of the label printing the scale values</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Size of the label printing the scale values</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="numValSteps" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Number of steps between values</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="startVal" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The start value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endVal" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The end value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="postString" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - String that is printed before values.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preString" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - String that is printed after values.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2ScaleSection">
+    <xs:annotation>
+      <xs:documentation>This is the base class for all scale sections
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2ScaleSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2ScaleSection" substitutionGroup="AbstractGauge2ScaleSection"/>
+
+  <xs:attributeGroup name="AbstractGauge2ScaleSectionAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+    <xs:attribute name="startVal" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The start value of the sacle section</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endVal" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The end value of the sacle section</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Ticks">
+    <xs:annotation>
+      <xs:documentation>This class is the base class of all ticks classes
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2TicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Ticks" substitutionGroup="AbstractGauge2Ticks"/>
+
+  <xs:attributeGroup name="AbstractGauge2TicksAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+    <xs:attribute name="tickLength" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The length of each tick.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="numTickSteps" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Number of steps between ticks i.e. 10 steps gives you 11 ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2ValueMarker">
+    <xs:annotation>
+      <xs:documentation>This is the base class of all value markers inBiGauge2 i.e.BiGauge2RadialNeedle
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2ValueMarkerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2ValueMarker" substitutionGroup="AbstractGauge2ValueMarker"/>
+
+  <xs:attributeGroup name="AbstractGauge2ValueMarkerAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGrid">
+    <xs:annotation>
+      <xs:documentation>The abstract base class for the grid and the
+        tree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGridAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGrid" substitutionGroup="AbstractGrid"/>
+
+  <xs:attributeGroup name="AbstractGridAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="allowInlineFind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When true, typing a word will select the first matching item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRowHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the row headers on the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowHeadersWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the row headers that can be shown when using a grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of each row in the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnCount" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of columns to show in the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - An array containing the widths of the columns.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - An array containing the orders of the columns. A value of
+          [2, 0, 1] means that the third column should be displayed left most
+          and the second column right most.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnAligns" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - An array containing the text aligns for the columns.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnNames" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - An array containing the names for
+          the columns. The names are used for the text on the column header.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnSortTypes" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - An array containg the sort types for the columns. Valid values can
+          be found in the documentation for the BiGridColumn
+          sortType.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="iconColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The column to show the icon on.
+          Setting this to -1 (or a value greater than the column count) removes
+          the icons.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fitColumnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true the columns will be sized horizontally so that they fill the grid viewport
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="liveResize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is set to true the column size in the grid body is
+          updated as the user resizes the headers. If this is false the
+          column size in the body is only updated as the user finishes the
+          resize of the column header.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the headers on the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="headersHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the headers.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="multipleSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to allow multiple selection.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiSelectionModel - This handles the selection of the rows in the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforesort" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the sort happens. Call
+          preventDefault
+          to prevent the sorting.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onsort" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires after the grid has been sorted.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGridRow">
+    <xs:annotation>
+      <xs:documentation>The base class for the rows and
+        nodes in a grid
+        or a tree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGridRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGridRow" substitutionGroup="AbstractGridRow"/>
+
+  <xs:attributeGroup name="AbstractGridRowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="backColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The background color name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="foreColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The foreground color name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage /BiUri / String - The image to use as icon on the row. The icon supports bothBiImage (or
+          other objects with getIconHtml) as well as a string/uri for backwards compat
+          and more lightweight
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the grid row is selected or not.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractLoader">
+    <xs:annotation>
+      <xs:documentation>This abstract class defines the minimal interface for supporting loading
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractLoader" substitutionGroup="AbstractLoader"/>
+
+  <xs:attributeGroup name="AbstractLoaderAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="async" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to load the text file asynchronously</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="supportsSync" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the loader supports loading the file synchronously</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AccordionButton">
+    <xs:annotation>
+      <xs:documentation>This button component is a internal part of BiAccordionPage
+        and is used to expand the page.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AccordionButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAccordionButton" substitutionGroup="AccordionButton"/>
+
+  <xs:attributeGroup name="AccordionButtonAttributes">
+
+    <xs:attributeGroup ref="ButtonAttributes"/>
+
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Returns whether the parent BiAccordionPage is the
+          currently expanded page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AccordionPage">
+    <xs:annotation>
+      <xs:documentation>This class represents the pages inside a BiAccordionPane.
+        A accordion page has a BiAccordionButton placed directly
+        above its content, this button is used to set the page to be the only page in the parent
+        BiAccordionPane to be shown.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AccordionPageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAccordionPage" substitutionGroup="AccordionPage"/>
+
+  <xs:attributeGroup name="AccordionPageAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text to show on the page button</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The icon to show on the page button</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="contentPane" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The content of the page</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AccordionPane">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating accordion controls. A accordion control contains
+        one or more BiAccordionPage. Each accordion page also
+        has a BiAccordionButton that is shown above the
+        page and when the button is clicked the page is shown.
+        Pages are oriented vertically from top to bottom and can either be statically shown or animated.
+
+        The property animationSpeed (a) alters the speed (s) in proportion to the animated
+        page height (h), using the following formula h2 = h1 - h1 / a, every 0.05 s.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AccordionPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAccordionPane" substitutionGroup="AccordionPane"/>
+
+  <xs:attributeGroup name="AccordionPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="animated" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the pages are animated or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="animationSpeed" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Float - Animation speed (1 - infinite) where 1 is the same as setting animated to false.
+          Default value is 1.4
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiAccordionPage - The currently selected accordion button.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Adf">
+    <xs:annotation>
+      <xs:documentation>This class handles the loading and interpretation of the Application
+        Definition File (ADF).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AdfAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAdf" substitutionGroup="Adf"/>
+
+  <xs:attributeGroup name="AdfAttributes">
+
+    <xs:attributeGroup ref="XmlLoaderAttributes"/>
+
+    <xs:attribute name="caption" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The desired caption for the application window</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference to the object created from this XML element. This property
+          is mapped to the xmlResourceParser as well as the resource
+          loader used to load the resources.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AnimationRange">
+    <xs:annotation>
+      <xs:documentation>Defines a value range, used by BiComponentAnimation, when animating.
+        You specify a start and an end value that will be animated.
+        You also specify the duration/time, in ms, that it should take to animate the value range.
+        There are several different acceleration behaviors/types that you can choose from.
+        BiAnimationRange has the ability to progress (displace) the current value, within the animation range.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AnimationRangeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAnimationRange" substitutionGroup="AnimationRange"/>
+
+  <xs:attributeGroup name="AnimationRangeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="startValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Lower boundry of the value range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Upper boundry of the value range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The acceleration type/behavior for this value range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="time" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Desired duration of this value range, measured in milliseconds.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="curValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The current position/value inside the value range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="ApplicationAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="progressStatus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the progress status text shown while loading</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accessibilityMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This property can be used to tell whether the application should be in an
+          accessibility mode. This does not really do anything and it is up to the
+          components and implementations to make sure of this.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accessibilityDescription" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This property can be used to popup an alert with a description about the
+          application when the application is in accessibility mode. This is useful
+          if the user needs to be informed about something to be able to use the
+          application.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference to the object created from this XML element. This property
+          is mapped to the xmlResourceParser as well as the resource
+          loader used to load the resources.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="focusOnLoad" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to try to focus the window when the application loads</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="inactivityTimeout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - When this is set the application will fire an event
+          called inactive. The value of this is the number of minutes before
+          the inactive is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="defaultPackages" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The default packages to load. This needs to be set before the loading
+          actually starts. To do this you can use an attribute in the Application tag
+          in your ADF or set this in the HTML file hosting your application.
+          If you just want to add a few packages then use a Package tag in your Resources
+          section of the ADF.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this wizard pane.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondispose" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires just before the application is disposed.
+          This allows you to clean up your main program
+          before closing the application window.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onprogressstatus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the progress status has changed.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onresourcesready" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired after the Bindows markup has been
+          handled but before the main method is called.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when everything has been loaded
+          and initialized. This is called after the main
+          method has been called.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="ApplicationWindowAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="caption" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The title text on the application window</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="acceptButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default accept button. If this is set
+          then the action
+          event is dispatched from the accept button when the enter key
+          is pressed. This does not have to be a
+          BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cancelButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default cancel button. If this is set
+          then the action
+          event is dispatched from the cancel button. This does not have to
+          be aBiButton, anyBiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="glassPaneVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to hide or show the glass pane. The glass pane is shown automatically when using dialogs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="globalCursor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Setting the global cursor will make the mouse pointer use the
+          given cursor for all the components and thus overriding the
+          cursor property of the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="allowBrowserContextMenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Decides whether the browser context menu should be shown by default.
+          If this is set to true you can still prevent the
+          browser context menu from being shown by calling preventDefault on the event object
+          used in the contextmenu
+          event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Area">
+    <xs:annotation>
+      <xs:documentation>This class represents an area with a given left, top, width and height
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiArea" substitutionGroup="Area"/>
+
+  <xs:attributeGroup name="AreaAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="left" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The left position of the area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="top" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The top position of the area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="height" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AreaCollection">
+    <xs:annotation>
+      <xs:documentation>This collection containsBiArea objects
+
+        This implements the same interface asBiSelectionItemCollection
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AreaCollectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAreaCollection" substitutionGroup="AreaCollection"/>
+
+  <xs:attributeGroup name="AreaCollectionAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AttachedComponentModel">
+    <xs:annotation>
+      <xs:documentation>This class is used to handleBiComponent objects insideBiTreeView andBiOlapGrid. An
+        attached component will be positioned at the same place as the cell it is
+        attached to and have the same size as that cell.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AttachedComponentModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAttachedComponentModel" substitutionGroup="AttachedComponentModel"/>
+
+  <xs:attributeGroup name="AttachedComponentModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BarChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a bar chart for the given series.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BarChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBarChart" substitutionGroup="BarChart"/>
+
+  <xs:attributeGroup name="BarChartAttributes">
+
+    <xs:attributeGroup ref="ColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BarChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a bar chart for the given series. This is used
+        with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BarChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBarChart2" substitutionGroup="BarChart2"/>
+
+  <xs:attributeGroup name="BarChart2Attributes">
+
+    <xs:attributeGroup ref="ColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Base64">
+    <xs:annotation>
+      <xs:documentation>This class is used to represent base 64 encoded data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Base64Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBase64" substitutionGroup="Base64"/>
+
+  <xs:attributeGroup name="Base64Attributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="base64" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the base 64 encoded data</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the plain text data (the decoded base 64 data)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Border">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to describe a border for a component. The border
+        consists of three properties; width, style and color. Supported styles
+        are: none - No border is drawn, regardless of the width. dotted dashed solid double groove ridge inset outset
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBorder" substitutionGroup="Border"/>
+
+  <xs:attributeGroup name="BorderAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="leftWidth">
+      <xs:annotation>
+        <xs:documentation>The left border width</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightWidth">
+      <xs:annotation>
+        <xs:documentation>The right border width</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topWidth">
+      <xs:annotation>
+        <xs:documentation>The top border width</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomWidth">
+      <xs:annotation>
+        <xs:documentation>The bottom border width</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leftStyle">
+      <xs:annotation>
+        <xs:documentation>The left border style</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightStyle">
+      <xs:annotation>
+        <xs:documentation>The right border style</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topStyle">
+      <xs:annotation>
+        <xs:documentation>The top border style</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomStyle">
+      <xs:annotation>
+        <xs:documentation>The bottom border style</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leftColor">
+      <xs:annotation>
+        <xs:documentation>The left border color</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightColor">
+      <xs:annotation>
+        <xs:documentation>The right border color</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topColor">
+      <xs:annotation>
+        <xs:documentation>The top border color</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomColor">
+      <xs:annotation>
+        <xs:documentation>The bottom border color</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width">
+      <xs:annotation>
+        <xs:documentation>The width (in pixels) of the border on all sides</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="style">
+      <xs:annotation>
+        <xs:documentation>The style of the border on all sides</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="color">
+      <xs:annotation>
+        <xs:documentation>The color of the border on all sides</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Box">
+    <xs:annotation>
+      <xs:documentation>This layout component places its children from left to right for the horizontal
+        box and from top to bottom for the vertical box. This is a fairly advanced
+        layout component that takes preferred, minimum and maximum size of the children
+        into account. It also takes margins into account and it uses margin collapsing
+        so that two adjacent children share the larger margin.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBox" substitutionGroup="Box"/>
+
+  <xs:attributeGroup name="BoxAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="orient" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The orientation to layout the children. Valid values are "horizontal" and
+          "vertical". When set to "horizontal", rightToLeft is taken into account.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The align property decides how to size and position the children. This
+          describes the size and position in the orthogonal direction of the
+          box orientation. For a
+          horizontal box this describes the height and top position and for a vertical
+          layout this describes the width and left position
+          Valid values are:
+          stretch
+          start
+          center
+          end
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="pack" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes how to layout the controls when there are no flexing children
+          and there is any remaining space.
+
+          Valid values are:
+          start
+          center
+          end
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="BrowserCheck">
+    <xs:annotation>
+      <xs:documentation>This class is used to identify the browser that the user is using.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BrowserCheckAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBrowserCheck" substitutionGroup="BrowserCheck"/>
+
+  <xs:attributeGroup name="BrowserCheckAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Button">
+    <xs:annotation>
+      <xs:documentation>A button that can contain both text and an icon
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiButton" substitutionGroup="Button"/>
+
+  <xs:attributeGroup name="ButtonAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user presses the button (either
+          using the mouse or the keyboard)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Calendar">
+    <xs:annotation>
+      <xs:documentation>This class represents a calendar control
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CalendarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCalendar" substitutionGroup="Calendar"/>
+
+  <xs:attributeGroup name="CalendarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - Getter for the maximum selectable date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - Getter for the maximum selectable date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showYearButtons" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the buttons that allow you to go to next or previous year
+          in the caption
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMonthButtons" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the buttons that allow you to go to next or previous month
+          in the caption
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showCaption" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the caption or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scaleFonts" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to resize the font in the day labels and days
+          when calendar is resized.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="currentDate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The date describing the currently shown month. To get the selected date(s)
+          use selectedDate(s)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dateFormatSymbols" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDateFormatSymbols - The object providing the date picker with the symbols needed to display
+          localized strings
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedDate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The selected date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedDates" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date[] - These are the selected dates. In case multiple selection is used then use
+          this instead of selectedDate
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the selection changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user clicks on a day</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="CalendarSelectionModel">
+    <xs:annotation>
+      <xs:documentation>This selection model is used withBiCalendar and the items in the model
+        are Javascript date objects. Two dates are considered equal if they are
+        representing the same date (in other words the time of the day is ignored).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CalendarSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCalendarSelectionModel" substitutionGroup="CalendarSelectionModel"/>
+
+  <xs:attributeGroup name="CalendarSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The minimum selectable date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The maximum selectable date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartArea">
+    <xs:annotation>
+      <xs:documentation>
+        This class represents the area where the charts inside a graph are displayed.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartArea" substitutionGroup="ChartArea"/>
+
+  <xs:attributeGroup name="ChartAreaAttributes">
+
+    <xs:attributeGroup ref="ChartAreaBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartArea2">
+    <xs:annotation>
+      <xs:documentation>
+        This is the chart area used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartArea2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartArea2" substitutionGroup="ChartArea2"/>
+
+  <xs:attributeGroup name="ChartArea2Attributes">
+
+    <xs:attributeGroup ref="ChartAreaBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartAreaBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiChartArea
+        and BiChartArea2.
+        The chart area is the part of the graph that contains the charts.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartAreaBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartAreaBase" substitutionGroup="ChartAreaBase"/>
+
+  <xs:attributeGroup name="ChartAreaBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The background color of the
+          chart area
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor2">
+      <xs:annotation>
+        <xs:documentation>The alternate color of the
+          chart area (used when fill type is gradient)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillOpacity">
+      <xs:annotation>
+        <xs:documentation>The background color opacity of the
+          chart area
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillType">
+      <xs:annotation>
+        <xs:documentation>
+          The type of the fill. Valid values are:
+          solid
+          gradient
+          gradientradial
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillAngle">
+      <xs:annotation>
+        <xs:documentation>The angle of the gradient</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The border color of the
+          chart area
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeOpacity">
+      <xs:annotation>
+        <xs:documentation>The border opacity of the
+          chart area
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartCategory">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to describe the categories of the data for a
+        graph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartCategoryAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartCategory" substitutionGroup="ChartCategory"/>
+
+  <xs:attributeGroup name="ChartCategoryAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="title">
+      <xs:annotation>
+        <xs:documentation>The title of the category</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartCategoryAxis">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the drawing of the category axis for a
+        BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartCategoryAxisAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartCategoryAxis" substitutionGroup="ChartCategoryAxis"/>
+
+  <xs:attributeGroup name="ChartCategoryAxisAttributes">
+
+    <xs:attributeGroup ref="ChartCategoryAxisBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartCategoryAxis2">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the drawing of the category axis for a
+        BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartCategoryAxis2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartCategoryAxis2" substitutionGroup="ChartCategoryAxis2"/>
+
+  <xs:attributeGroup name="ChartCategoryAxis2Attributes">
+
+    <xs:attributeGroup ref="ChartCategoryAxisBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartCategoryAxisBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base calss for BiChartCategoryAxis
+        and BiChartCategoryAxis2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartCategoryAxisBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartCategoryAxisBase" substitutionGroup="ChartCategoryAxisBase"/>
+
+  <xs:attributeGroup name="ChartCategoryAxisBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="majorTickInterval">
+      <xs:annotation>
+        <xs:documentation>
+          The distance between the major ticks. Setting this to null makes
+          the tick interval automatic, which means that the tick interval is decided by
+          looking at the data of the charts.
+          This value needs to be an integer.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorTickInterval">
+      <xs:annotation>
+        <xs:documentation>
+          The distance between the minor ticks. Setting this to null makes
+          the tick interval automatic, which means that the tick interval is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMajorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showLabels">
+      <xs:annotation>
+        <xs:documentation>Whether to show the labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="axisBetweenCategories">
+      <xs:annotation>
+        <xs:documentation>
+          When this is true the data points, the labels and the value axis are
+          placed between the major ticks. When false the data points, the labels
+          and the value axis are placed on the major ticks. The default is
+          true and therefore the first value will not be placed on
+          the value axis.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fontSize">
+      <xs:annotation>
+        <xs:documentation>
+          The font size (in pixels) for the labels of the axis.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartGridLines">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to display the grid lines for
+        BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartGridLinesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartGridLines" substitutionGroup="ChartGridLines"/>
+
+  <xs:attributeGroup name="ChartGridLinesAttributes">
+
+    <xs:attributeGroup ref="ChartGridLinesBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartGridLines2">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to display the grid lines for
+        BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartGridLines2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartGridLines2" substitutionGroup="ChartGridLines2"/>
+
+  <xs:attributeGroup name="ChartGridLines2Attributes">
+
+    <xs:attributeGroup ref="ChartGridLinesBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartGridLinesBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiChartGridLines
+        and BiChartGridLines2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartGridLinesBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartGridLinesBase" substitutionGroup="ChartGridLinesBase"/>
+
+  <xs:attributeGroup name="ChartGridLinesBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="showMajorValue">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major value grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorValue">
+      <xs:annotation>
+        <xs:documentation>Whether to show the minor value grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMajorCategory">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major category grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorCategory">
+      <xs:annotation>
+        <xs:documentation>Whether to show the minor category grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorValueStrokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the major value grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorValueStrokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the minor value grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorCategoryStrokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the major category grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorCategoryStrokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the minor category grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartLegend">
+    <xs:annotation>
+      <xs:documentation>
+        The legend component is used to show a list of the titles of the series
+        or categories depending on the chart type.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartLegendAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartLegend" substitutionGroup="ChartLegend"/>
+
+  <xs:attributeGroup name="ChartLegendAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="fontSize">
+      <xs:annotation>
+        <xs:documentation>
+          The font size (in pixels) of the labels inside the legend.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartLegendLabel">
+    <xs:annotation>
+      <xs:documentation>
+        A special lable used for the items in the chart
+        legend
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartLegendLabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartLegendLabel" substitutionGroup="ChartLegendLabel"/>
+
+  <xs:attributeGroup name="ChartLegendLabelAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="legendFor">
+      <xs:annotation>
+        <xs:documentation>
+          The object used for the text and the icon for the label. This object
+          needs to have the methods getTitle() (See for example
+          title for BiAbstractChart)
+          and getIconHtml(oLabel) (See for example
+          getIconHtml for BiImage).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartMouseEvent">
+    <xs:annotation>
+      <xs:documentation>
+        This event is used for mouse events that are specific for a data point
+        inside a graph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartMouseEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartMouseEvent" substitutionGroup="ChartMouseEvent"/>
+
+  <xs:attributeGroup name="ChartMouseEventAttributes">
+
+    <xs:attributeGroup ref="MouseEventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartPoint">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to describe how to display a data point in the graph.
+        Each point is bound to a series and a category.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartPointAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartPoint" substitutionGroup="ChartPoint"/>
+
+  <xs:attributeGroup name="ChartPointAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="strokeOpacity">
+      <xs:annotation>
+        <xs:documentation>The stroke opacity for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The stroke color for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillOpacity">
+      <xs:annotation>
+        <xs:documentation>The fill opacity for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor2">
+      <xs:annotation>
+        <xs:documentation>The alternate fill color used when fill type is gradient</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillType">
+      <xs:annotation>
+        <xs:documentation>The fill type used when painting the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillAngle">
+      <xs:annotation>
+        <xs:documentation>The fill angle used when painting the section of the chart this point descibes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerType">
+      <xs:annotation>
+        <xs:documentation>The marker type for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerVisible">
+      <xs:annotation>
+        <xs:documentation>Whether markers are visible for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="explode">
+      <xs:annotation>
+        <xs:documentation>The amount to move the pie chart section from the middle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartPresentation">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to define the presentation attributes for a chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartPresentationAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartPresentation" substitutionGroup="ChartPresentation"/>
+
+  <xs:attributeGroup name="ChartPresentationAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="strokeOpacity">
+      <xs:annotation>
+        <xs:documentation>The stroke opacity for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The stroke color for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillOpacity">
+      <xs:annotation>
+        <xs:documentation>The fill opacity for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor2">
+      <xs:annotation>
+        <xs:documentation>The alternate fill color used when fill type is gradient</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillType">
+      <xs:annotation>
+        <xs:documentation>The fill type used when painting the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillAngle">
+      <xs:annotation>
+        <xs:documentation>The fill angle used when painting the chart.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerType">
+      <xs:annotation>
+        <xs:documentation>The marker type for the line chart. Valid values are
+          circle
+          square
+          trianle
+          diamond
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerVisible">
+      <xs:annotation>
+        <xs:documentation>Whether markers are visible for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="explode">
+      <xs:annotation>
+        <xs:documentation>The amount to move the pie chart sections from the middle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="barSpacing">
+      <xs:annotation>
+        <xs:documentation>
+          This is the relative distance between the bars or columns of different categories.
+          1 means that the distance is the same as the width/height of the column/bar.
+          0 means that there is no spacing.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartPresentationManager">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to find the properties for different visual aspects of
+        of the graph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartPresentationManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartPresentationManager" substitutionGroup="ChartPresentationManager"/>
+
+  <xs:attributeGroup name="ChartPresentationManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartSeries">
+    <xs:annotation>
+      <xs:documentation>
+        This describes a series of values that is used with the graph
+        control. Each series has a unique id and every value of the series
+        belongs to a certain category.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartSeriesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartSeries" substitutionGroup="ChartSeries"/>
+
+  <xs:attributeGroup name="ChartSeriesAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="title">
+      <xs:annotation>
+        <xs:documentation>The title of the series</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="values">
+      <xs:annotation>
+        <xs:documentation>
+          The values in the series. This is the same order as the order of
+          the categories. If a value for a certain category is missing the
+          value for that is null in the array.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartValueAxis">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the drawing of the value axis for a
+        graph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartValueAxisAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartValueAxis" substitutionGroup="ChartValueAxis"/>
+
+  <xs:attributeGroup name="ChartValueAxisAttributes">
+
+    <xs:attributeGroup ref="ChartValueAxisBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartValueAxis2">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the drawing of the value axis for a
+        BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartValueAxis2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartValueAxis2" substitutionGroup="ChartValueAxis2"/>
+
+  <xs:attributeGroup name="ChartValueAxis2Attributes">
+
+    <xs:attributeGroup ref="ChartValueAxisBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartValueAxisBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiChartValueAxis
+        and BiChartValueAxis2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartValueAxisBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartValueAxisBase" substitutionGroup="ChartValueAxisBase"/>
+
+  <xs:attributeGroup name="ChartValueAxisBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="showMajorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showLabels">
+      <xs:annotation>
+        <xs:documentation>Whether to show the labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fontSize">
+      <xs:annotation>
+        <xs:documentation>
+          The font size (in pixels) for the labels of the axis.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorTickInterval">
+      <xs:annotation>
+        <xs:documentation>
+          The distance between the major ticks. Setting this to null makes
+          the tick interval automatic, which means that the tick interval is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorTickInterval">
+      <xs:annotation>
+        <xs:documentation>
+          The distance between the minor ticks. Setting this to null makes
+          the tick interval automatic, which means that the tick interval is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum">
+      <xs:annotation>
+        <xs:documentation>
+          The max value of the value axis. Setting this to null makes
+          the max value automatic, which means that the max value is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum">
+      <xs:annotation>
+        <xs:documentation>
+          The min value of the value axis. Setting this to null makes
+          the min value automatic, which means that the min value is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="CheckBox">
+    <xs:annotation>
+      <xs:documentation>Represents a check box control
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CheckBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCheckBox" substitutionGroup="CheckBox"/>
+
+  <xs:attributeGroup name="CheckBoxAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the check box</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the check box is checked or not. When this is changed the
+          change event is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user presses the button (either
+          using the mouse or the keyboard)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked property is
+          changed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="CheckBoxMenuItem">
+    <xs:annotation>
+      <xs:documentation>This class is used for a menu item that displays a check box to the left
+        of the text.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CheckBoxMenuItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCheckBoxMenuItem" substitutionGroup="CheckBoxMenuItem"/>
+
+  <xs:attributeGroup name="CheckBoxMenuItemAttributes">
+
+    <xs:attributeGroup ref="MenuItemAttributes"/>
+
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the item is checked or not.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked property changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Circle">
+    <xs:annotation>
+      <xs:documentation>This class represents the shape of a Circle.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CircleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCircle" substitutionGroup="Circle"/>
+
+  <xs:attributeGroup name="CircleAttributes">
+
+    <xs:attributeGroup ref="ShapeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColorPicker">
+    <xs:annotation>
+      <xs:documentation>This dialog allows the user to select a predefined color or define his
+        own color.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColorPickerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColorPicker" substitutionGroup="ColorPicker"/>
+
+  <xs:attributeGroup name="ColorPickerAttributes">
+
+    <xs:attributeGroup ref="DialogAttributes"/>
+
+    <xs:attribute name="rgbString" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The rgb string ("rgb(255,255,255)") describing the selected color.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rgb" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The rgb triplet describing the selected color.
+          The rgb triplet is an object with r (0 - 255), g (0 - 255) and b (0 - 255) fields
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hsl" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The hsl triplet describing the selected color.
+          The hsl triplet is an object with h (0 - 360), s (0 - 1) and l (0 - 1) fields
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this color picker. If this is set to null
+          then the static string bundle forBiColorPicker is used
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event fires continiously when the user changes the color.
+          If you want to know when the user closes the dialog use the
+          dialogresult
+          event inherited from the BiDialog.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColumnChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a column chart for the given series
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColumnChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColumnChart" substitutionGroup="ColumnChart"/>
+
+  <xs:attributeGroup name="ColumnChartAttributes">
+
+    <xs:attributeGroup ref="AbstractChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColumnChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a column chart for the given series
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColumnChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColumnChart2" substitutionGroup="ColumnChart2"/>
+
+  <xs:attributeGroup name="ColumnChart2Attributes">
+
+    <xs:attributeGroup ref="AbstractChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColumnChartSection">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the components used to show the rectangles for a
+        column chart.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColumnChartSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColumnChartSection" substitutionGroup="ColumnChartSection"/>
+
+  <xs:attributeGroup name="ColumnChartSectionAttributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColumnChartSection2">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the components used to show the rectangles for a
+        column chart.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColumnChartSection2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColumnChartSection2" substitutionGroup="ColumnChartSection2"/>
+
+  <xs:attributeGroup name="ColumnChartSection2Attributes">
+
+    <xs:attributeGroup ref="AbstractChartSection2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComboBox">
+    <xs:annotation>
+      <xs:documentation>This class represents a combo box.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComboBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiComboBox" substitutionGroup="ComboBox"/>
+
+  <xs:attributeGroup name="ComboBoxAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="sortType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets built in sort method to use to sort the combobox items, this
+          property is only used in the absence of a custom sort method.
+          Valid settings are: (seeBiSort for more details)
+          string caseInsensitiveString number date - Uses the native JS Date type
+          To get better control over the sorting, set the sortFunction property
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortFunction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - Compare function used to sort combobox items. The function
+          takes two arguments and returns a number (just like the normal
+          comparison function used when sorting arrays in JavaScript).
+          If this property is not set, it uses the predefined
+          functions set by the sortType property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedItem" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComboBoxItem - The selected combo box item. If no item is selected this will be null.
+          When this changes the change event fires.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the currently selected item. -1 if none.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - This is the userValue of the selected combo box item.
+          If no item is selected then this returns null.
+          When setting this, the first item with the given user value will be selected.
+          If no item has this value the selection will not change.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Deprecated. Use userValue instead.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="editable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the text field can be edited</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dropDownVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the combo box is displaying its drop-down list.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dropDownWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The desired width of the drop-down list.
+          The width of the drop-down is always greater than or equal to the width of the combo box.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text shown in the combo box.
+          This can be used to find the text that the user is currently typing into the text field of the combo box.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="validator" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - A function that is used to validate the text</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="invalidMessage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - A string that can be used to describe why the input is invalid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataTextField" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column to use as the data for the text property of the combo box items.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataUserValueField" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column to use as the data for the userValue property of the combo box items.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onactivechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the active item changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedItem changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondatabind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Called after the component has been data bound</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ontextchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the text changes in the text field of the combo box. To get the new text use the text property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComboBoxItem">
+    <xs:annotation>
+      <xs:documentation>This class represents an item in theBiComboBox.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComboBoxItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiComboBoxItem" substitutionGroup="ComboBoxItem"/>
+
+  <xs:attributeGroup name="ComboBoxItemAttributes">
+
+    <xs:attributeGroup ref="ListItemAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Command">
+    <xs:annotation>
+      <xs:documentation>
+        Command objects can be used to make several user interface components
+        execute the command when they are invoked. Components that use the command
+        object will be synchronized with the properties of the command. For example,
+        if a button has a disabled command the button will also be disabled.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CommandAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCommand" substitutionGroup="Command"/>
+
+  <xs:attributeGroup name="CommandAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="enabled">
+      <xs:annotation>
+        <xs:documentation>
+          Whether the command is enabled or not
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked">
+      <xs:annotation>
+        <xs:documentation>
+          The checked state of the command. This is usually used to synchronize
+          the checked property of the components using this command (such as
+          BiRadioButton,
+          BiCheckBox and others).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue">
+      <xs:annotation>
+        <xs:documentation>
+          The user value of the command. This is usually used to synchronize
+          the user values of the components using this command (such as
+          BiRadioGroup and
+          BiComboBox).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="shortcut">
+      <xs:annotation>
+        <xs:documentation>
+          The keyboard shortcut used to execute the command. The format for
+          the shortcut is:
+          Ctrl+Shift+Alt+k
+          You can also use the static fields of BiKeyboardEvent
+          for describing the key codes:
+
+          Shift+Del
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="keyCode">
+      <xs:annotation>
+        <xs:documentation>
+          This gives a bit more detail than the shortcut property because
+          there are cases where there is no name for the key. Use shortcut
+          whenever possible and fall back on keyCode when needed. If keyCode
+          is provided only the modifiers from the shortcut is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onexecute" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the command is executed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onenabledchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the enabled property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncheckedchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the checked property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onuservaluechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the userValue property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onshortcutchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the shortcut property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Component">
+    <xs:annotation>
+      <xs:documentation>This is the core class for all visual components in Bindows.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:group ref="iv:ElementsAllowedExternally"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiComponent" substitutionGroup="Component"/>
+
+  <xs:attributeGroup name="ComponentAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="parent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - Returns the parent component. This is the component that the
+          current component was added to. If the current component has not
+          been added to any component this returns null. If the real
+          parent component is anonymous then this returns the first non anonymous
+          ancestor.
+          When setting this the component is added last to the new parent. If you set
+          this to null the component is removed from its current parent
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="children" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent[] - The components added to the current component. This does not include anonymous
+          children.
+          When setting this all the old children are first removed and disposed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="foreColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The foreground color name. The supported color names follows CSS2.1</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The background color name. The supported color names follows CSS2.1</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="zIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The z index of the component. A higher z index means that the component will
+          cover components with lower z index and therefore appear to be closer to
+          the user.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the component is visible or not. Note that all the ancestors must be
+          visible for the component to be actually shown. Use isVisible to
+          check that the component is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cursor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the cursor to show when the mouse pointer is over the component.
+          This is any valid CSS2 cursor name.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backgroundImage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI of the image file to use as background image.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opacity" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the opacity for the component. Any child component inside the
+          component will also become transparent. The value should be a
+          number between 0 and 1 where 1 means totally opaque and 0 invisible.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="left" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The left position relative to the parent inner edge.
+          When using get the return value is always a number
+          representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="right" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The right position relative to the parent inner edge. When using
+          right a width should also be set. When using get the
+          return value is always a number representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="top" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The top position relative to the parent inner edge.
+          When using get the return value is always a number
+          representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The bottom position relative to the parent inner edge. When using
+          bottom a height should also be set. When using get the
+          return value is always a number representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the component. When using get the return value is
+          always a number representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="height" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the component. When using get the return value is
+          always a number representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preferredWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired width of the component. This is usually the
+          size of the content plus the borders.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preferredHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired height of the component. This is usually the
+          size of the content plus the borders.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimumWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired minimum width of the component. This does not
+          limit the size but is used by some components as a layout hint.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximumWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired maximum width of the component. This does not
+          limit the size but is used by some components as a layout hint.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimumHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired minimum height of the component. This does not
+          limit the size but is used by some components as a layout hint.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximumHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired maximum height of the component. This does not
+          limit the size but is used by some components as a layout hint.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="border" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiBorder - The border property describes how to paint the border on the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="marginLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The left margin for the component. Margins are used by some layout managers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="marginRight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The right margin for the component. Margins are used by some layout managers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="marginTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The top margin for the component. Margins are used by some layout managers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="marginBottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The bottom margin for the component. Margins are used by some layout managers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clipLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is the clip left value. When this is set the shown region of the component
+          starts this many pixels from the left.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clipTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is the clip top value. When this is set the shown region of the component
+          starts this many pixels from the top.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clipWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is the width of the shown region when the component is clipped.
+          A value of null means the entire (remaining) width is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clipHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is the height of the shown region when the component is clipped.
+          A value of null means the entire (remaining) height is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="overflow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Describes how to handle content that is too large to fit inside
+          the component. hidden - The content is clipped auto - Scroll bars are shown as needed scroll - Scroll bars are always shown. Even
+          if there
+          is enough room for the content inside the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="overflowX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes how to handle content that is too large to fit inside
+          the component. This only covers the horizontal overflow. hidden - The content is clipped auto - Scroll bars are shown as needed
+          scroll - Scroll bars are always shown. Even if there
+          is enough room for the content inside the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="overflowY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes how to handle content that is too large to fit inside
+          the component. This only covers the vertical overflow hidden - The content is clipped auto - Scroll bars are shown as needed
+          scroll - Scroll bars are always shown. Even if there
+          is enough room for the content inside the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the content relative to the view port of the component. This
+          is the distance the view port has scrolled horizontally.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the content relative to the view port of the component. This
+          is the distance the view port has scrolled vertically.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="tabIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Setting this to less than 0 prevents the component from becoming
+          focusable. The tab index is used to tell in what order to focus
+          the components when naviagting between components using the tab key.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hideFocus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to hide the dotted outline that the OS usually draws around focused
+          components.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="focused" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If the component can be focused then this makes the component
+          focused (if set to true). If the component was focused
+          and this is set to false then the component is blurred.
+          Changing this fires the focus
+          and blur events (depending on the
+          previous state).
+          A disabled component cannot recieve focus.
+          To be able to recieve focus the tabIndex
+          must be greater or equal to 0.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="focusManager" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiFocusManager - The focus manager that handles focus inside the component. This is usually
+          null forBiComponent and the focus is usually handled by some
+          ancestor.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="canSelect" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether textual content is selectable</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="enabled" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the component is enabled or not. When this is changed the
+          component fires the enabledchanged event.
+          A disabled component cannot recieve focus.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="capture" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This is true when the component is set to capture all mouse events even if
+          the mouse pointer is outside the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accessKey" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The key, in combination with the Alt key, that will activate the component.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="contextMenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - If set then this is the menu that will be shown
+          when the user right clicks (or uses some other UI mechanism) to bring up
+          a context menu. Set this to null when no contex menu
+          is desired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name does not have any real meaning except that it can be useful to
+          identify the component
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toolTip" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiToolTip - Sets the tool tip to show when the user hovers the component.
+          Setting this to null prevents a tooltip from beeing shown (unless
+          toolTipText is set.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toolTipText" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the tool tip text to show when the user hovers the component.
+          This allows a simple plain text tool tip to be shown. This property
+          is preferred over the toolTip property when the extra
+          functionality provided by the BiToolTip
+          instance is not needed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightToLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Describes whether the component should be be layed out to support
+          locales using right-to-left fonts. If this is set to null
+          then the rightToLeft property for the parent component
+          is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="command" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiCommand - Commands are used to make more than one component trigger the
+          same action. Commands also synchronize different properties on
+          the components using the command.BiComponent only synchronizes
+          the enabled property with the command. Sub classes
+          that have a value property usually synchronizes that as well.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dropDataTypes" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The data type that are supported when dropping on the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cssClassName" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The CSS class name for the element representing the component.
+          This should be used with caution since in some cases this might give unrespected results.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="appearance" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the appearance on the component. This allows a theme to do custom
+          styling of the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onresize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a created component
+          changes its size.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onenabledchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the enabled
+          property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncreate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the component has been
+          created and inserted into the document. When it is
+          fired it is quaranteed that the component has been
+          inserted into a application
+          window and at that time it has a visual representation.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onlosecapture" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired if the component has taken
+          the capture but for some reason lost it.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onscroll" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the user scrolls the component scroll
+          events are continuously fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfocus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the component becomes focused.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfocusin" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the component becomes focused.
+          This event is fired before the focus event
+          and unlike the focus event it bubbles up
+          to the parent component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfocusout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the component loses focus. This
+          event is fired before the blur event and
+          unlike the blur event it bubbles up to the
+          parent component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onblur" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired by a focused compinent when it loses focus.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onkeydown" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired by the component when it is focused
+          and the user presses down a key on the keyboard. This event
+          then bubbles up to ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onkeypress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is continuously fired by the component when it
+          is focused and the user holds down a key on the keyboard.
+          This event then bubbles up to ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onkeyup" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired by the component when it is focused
+          and the user releases a key on the keyboard. This event
+          then bubbles up to ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onclick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the user clicks on a component it fires this event.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncontextmenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user wants to show the context
+          menu. This is usually done by right clicking on the component
+          but can be done in several different ways depending on the
+          users operating system. This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondblclick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the user double clicks on a component it fires this event.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmousedown" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user presses down a mouse button on a
+          component. This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmousemove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user moves the mouse and the pointer
+          is over the current component. This event bubbles to the
+          ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmouseout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the mouse pointer leaves the component.
+          relatedTarget
+          can be used to find the component that was entered.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmouseover" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the mouse pointer enters a component.
+          relatedTarget
+          can be used to find the component that was left.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmouseup" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user releases a mouse button on the
+          component. This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmousewheel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user scrolls the mouse wheel over the
+          component. This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragstart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user starts to drag a component.
+          Call startDrag
+          on the event object to initiate a drag'n drop session.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragover" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When doing drag'n drop this is fired when the user drags over
+          the component. This is similar to mouseover except
+          that it only happens on valid drop targets during a drag'n drop
+          sessions. The relatedTarget points to the component
+          of the drag'n drop session that was left (if any).
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When doing drag'n drop this is fired when the mouse pointer
+          leaves the component. This is similar to mouseout
+          except that it only happens on valid drop targets during a
+          drag'n drop sessions. The relatedTarget points to the component
+          of the drag'n drop session that was entered (if any).
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragmove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When doing drag'n drop this is fired when the mouse pointer
+          moves over the component. This is similar to mousemove
+          except that it only happens on valid drop targets during a
+          drag'n drop sessions.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragdrop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user drops something on the component.
+          This is only fired by valid drop targets for the drag'n drop
+          session. The relatedTarget points to the source
+          of the drag'n drop session.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired on the component that the user started the drag on
+          when the drag and drop session ends. If the drag'n drop was
+          successful then the relatedTarget is the component
+          where the drag'n drop started. If the drag'n drop failed the
+          relatedTarget
+          is null.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentAnimation">
+    <xs:annotation>
+      <xs:documentation>This class is the basis for all animations. Typically you don't work with this class directly, but
+        instead use one of it's subclasses. You will need to use some methods here, common to all animations.
+        Such as start and stop for example.
+        If you want to create a completely new type of animation, however you need to be aware of the specifics
+        of this class.BiComponentAnimation generates values in a specified range a certain number of times per second.
+        This is useded to drive the value of properties to create animation. It is possible to have several
+        different value ranges which each can have various properties like speed and acceleration behavior.
+        Predefined acceleration curves exist to simulate acceleration and deceleration.
+        To animate, you create aBiComponentAnimation object and setup parameters as needed. You then
+        registerBiComponents with it. When you start the animation, all registeredBiComponents will
+        be animated in the same way. If you need different animation behaviors for differentBiComponents
+        you will have to create differentBiComponentAnimation objects with different properties.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentAnimationAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiComponentAnimation" substitutionGroup="ComponentAnimation"/>
+
+  <xs:attributeGroup name="ComponentAnimationAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="frameRate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number : Current frame rate, Frames Per Second. - Current frame rate.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="looping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Turns looping on.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoStart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If animation should start automatically once the first component is added.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="generator" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiFpsGenerator - Accesses the frame generator that drives the animation.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onanimationend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the animation has played through completely.
+          Once per loop iteration if looping is active.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onframeprogression" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired upon every new frame</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="CssLoader">
+    <xs:annotation>
+      <xs:documentation>This class loads and executes a CSS file
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CssLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCssLoader" substitutionGroup="CssLoader"/>
+
+  <xs:attributeGroup name="CssLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI (location) of the file to load. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataColumn">
+    <xs:annotation>
+      <xs:documentation>This class represents a data column of a data
+        table.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataColumnAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataColumn" substitutionGroup="DataColumn"/>
+
+  <xs:attributeGroup name="DataColumnAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="dataType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the type that values in this column has.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="defaultValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The default value for items in this column. This may be
+          used by the BiDataRow.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataRow">
+    <xs:annotation>
+      <xs:documentation>This class represents a row in aBiDataTable.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataRow" substitutionGroup="DataRow"/>
+
+  <xs:attributeGroup name="DataRowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataSet">
+    <xs:annotation>
+      <xs:documentation>This class represents a data set. A data set contains
+        tables, which
+        consists of columns and
+        rows.
+
+        @option
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataSetAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataSet" substitutionGroup="DataSet"/>
+
+  <xs:attributeGroup name="DataSetAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataSetDataModel">
+    <xs:annotation>
+      <xs:documentation>This is a data model forBiTreeView that takes aBiDataSet as the data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataSetDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataSetDataModel" substitutionGroup="DataSetDataModel"/>
+
+  <xs:attributeGroup name="DataSetDataModelAttributes">
+
+    <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+
+    <xs:attribute name="dataSet" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDataSet/BiDataSetTable - The data set to use as the data for the model</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondatastructurechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired after a major
+          data structure change
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforedatastructurechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event happens before
+          the data has actually changed. This
+          happens before datastructurechanged
+          event and the old data is still available.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataTable">
+    <xs:annotation>
+      <xs:documentation>This class represents a data table inside a data set. A data table
+        consists of columns and
+        rows.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataTableAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataTable" substitutionGroup="DataTable"/>
+
+  <xs:attributeGroup name="DataTableAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DateFormat">
+    <xs:annotation>
+      <xs:documentation>This class is used to format and parse dates. It is based on the Java class
+        SimpleDateFormat.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DateFormatAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDateFormat" substitutionGroup="DateFormat"/>
+
+  <xs:attributeGroup name="DateFormatAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="dateFormatSymbols" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDateFormatSymbols - The date format symbols used to define how to parse and format strings and
+          dates
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="pattern" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The pattern to use when formatting and parsing</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="localizedPattern" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The pattern using localized pattern characters</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="lenient" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true parsing will try to parse the string even
+          though it does not correctly match the given pattern. For example it will
+          try to use the Javascript Date parse method.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DateFormatSymbols">
+    <xs:annotation>
+      <xs:documentation>A class that provides locale specific date strings and date patterns. The
+        specific strings to use are provided by a staticBiStringBundle. This calss
+        is based on the Java class
+        DateFormatSymbols.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DateFormatSymbolsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDateFormatSymbols" substitutionGroup="DateFormatSymbols"/>
+
+  <xs:attributeGroup name="DateFormatSymbolsAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="amPmStrings" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the am pm strings</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="eras" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing strings representing the eras berfore and after
+          year zero.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="localePatternChars" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is a string the localized pattern charaters. This allows the pattern
+          to use other characters than the default to identify the different parts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="months" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the full month names</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="shortMonths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short month names</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="weekdays" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the weekday names</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="shortWeekdays" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short weekday names</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="datePatterns" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short and long date pattern</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="timePatterns" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short and long time pattern</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dateTimePatterns" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short and long date time pattern</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="firstWeekday" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The weekday that starts the week. 0 is Sunday and 6 is Saturday. Setting this
+          to 1 means that Monday starts the week just like in ISO.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="redWeekdays" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The days of the week that are considered red. 0 is Sunday and 6 is Saturday. Setting this
+          to [0] means that Sundays will be considered red days.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightToLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Returns whether right to left should be used for this language</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DatePicker">
+    <xs:annotation>
+      <xs:documentation>This component provides a text field where one can write a date and a popup
+        containing aBiCalendar that allows one to pick a date.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DatePickerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDatePicker" substitutionGroup="DatePicker"/>
+
+  <xs:attributeGroup name="DatePickerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - Getter for the maximum selectable date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - Getter for the minimum selectable date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedDate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The selected date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dateFormat" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDateFormat - The object describing how to parse and format dates</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dropDownVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the calendar part is visible or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text shown in the text field part of the date picker. Setting
+          this causes the text to be parsed and this might trigger a change
+          event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="validator" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - A function that is used to validate the text</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="invalidMessage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - A string that can be used to describe why the input is invalid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ontextchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the text in the text field
+          is changed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user clicks to select
+          a date or when the enter key is pressed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the selecetd date changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the calendar is shown.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onhide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the calendar is hidden.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DesktopPane">
+    <xs:annotation>
+      <xs:documentation>A special container that can be used to add internal
+        windows to. The desktop pane has a
+        window manager that provides some
+        extra features for the windows inside the desktop pane.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DesktopPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDesktopPane" substitutionGroup="DesktopPane"/>
+
+  <xs:attributeGroup name="DesktopPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Dialog">
+    <xs:annotation>
+      <xs:documentation>This class is used for dialog windows. Dialog windows are internal windows
+        that require immediate attention. Dialog windows are modal to the application.
+        Example usage: var confirm = newBiDialog("Are you sure");
+        // add components to the dialog
+        confirm.addEventListener("dialogresult", this.doSomething, this);
+        confirm.setVisible(true);
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DialogAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDialog" substitutionGroup="Dialog"/>
+
+  <xs:attributeGroup name="DialogAttributes">
+
+    <xs:attributeGroup ref="WindowAttributes"/>
+
+    <xs:attribute name="dialogResult" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The value set by the dialog before it is closed. the dialogResult should be
+          set by the content of the dialog before it is closed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="defaultFocusedComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - This allows you to set the component that should be focused when the dialog
+          is shown. If null then the acceptButton is used for this.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="centered" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This property decides whether to automatically center the dialog when it
+          is shown
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondialogresult" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is called when the dialog is
+          closed (or hidden). This is the main event
+          to use with dialogs since it is fired when
+          the user closes it or selects a value in it.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DockPanel">
+    <xs:annotation>
+      <xs:documentation>This layout component position and sizes its children using docking guidelines.
+        The children are laid out from first child to last and after a child has
+        been docked to one edge the following child will be docked to remaining
+        available space. Once a child sets its docking hint to "fill", the following
+        will not be shown.
+        To define that side the child should be docked at a so called attached property
+        is used. This is a static method on theBiDockPanel. There exists a Bindows
+        markup shortcut for setting these properties
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DockPanelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDockPanel" substitutionGroup="DockPanel"/>
+
+  <xs:attributeGroup name="DockPanelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DragAndDropManager">
+    <xs:annotation>
+      <xs:documentation>This class is used to manage the drag and drop system
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DragAndDropManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDragAndDropManager" substitutionGroup="DragAndDropManager"/>
+
+  <xs:attributeGroup name="DragAndDropManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="action" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The desired action to use for the drag and drop session</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dragIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:oComp :BiComponent The component to show - The component to use as the icon next to the cursor when doing
+          drag
+          and drop. When this is set to null images are shown that represents the
+          action
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DragEvent">
+    <xs:annotation>
+      <xs:documentation>This event is used in drag and drop sesssions
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DragEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDragEvent" substitutionGroup="DragEvent"/>
+
+  <xs:attributeGroup name="DragEventAttributes">
+
+    <xs:attributeGroup ref="MouseEventAttributes"/>
+
+    <xs:attribute name="dragIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component to use as the icon next to the pointer</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DrawAnchor">
+    <xs:annotation>
+      <xs:documentation>This class defines static properties that represent the anchoring locations for link lines.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DrawAnchorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDrawAnchor" substitutionGroup="DrawAnchor"/>
+
+  <xs:attributeGroup name="DrawAnchorAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <!--<xs:element name="DrawLine">-->
+  <!--<xs:annotation><xs:documentation>This class represents a link line.-->
+  <!--</xs:documentation></xs:annotation>-->
+  <!--<xs:complexType>-->
+  <!--<xs:choice>-->
+  <!--<xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+  <!--</xs:choice>-->
+  <!--<xs:attributeGroup ref="DrawLineAttributes" />-->
+  <!--</xs:complexType>-->
+  <!--</xs:element>-->
+  <!--<xs:element name="BiDrawLine" substitutionGroup="DrawLine"/>-->
+
+  <!--<xs:attributeGroup name="DrawLineAttributes">-->
+
+  <!--<xs:attribute name="foreColor" type="xs:string"><xs:annotation><xs:documentation>Type:String - The color of this line.</xs:documentation></xs:annotation></xs:attribute>-->
+  <!--<xs:attribute name="hoverColor" type="xs:string"><xs:annotation><xs:documentation>Type:String - The color of this line when the cursor is moved over it.</xs:documentation></xs:annotation></xs:attribute>-->
+  <!--<xs:attribute name="startArrowStyle" type="xs:string"><xs:annotation><xs:documentation>Type:String - The style of the start arrow for this line.-->
+  <!--Accepted values are:- circle, arrow, none</xs:documentation></xs:annotation></xs:attribute>-->
+  <!--<xs:attribute name="endArrowStyle" type="xs:string"><xs:annotation><xs:documentation>Type:String - The style of the end arrow for this line.-->
+  <!--Accepted values are:- circle, arrow, none</xs:documentation></xs:annotation></xs:attribute>-->
+  <!--<xs:attribute name="width" type="xs:string"><xs:annotation><xs:documentation>Type:Number - The width of this line.</xs:documentation></xs:annotation></xs:attribute>-->
+  <!--<xs:attribute name="type" type="xs:string"><xs:annotation><xs:documentation>Type:String - The type of this line.-->
+  <!--Accepted values are:- dotted, dashed, solid</xs:documentation></xs:annotation></xs:attribute>-->
+
+  <!--</xs:attributeGroup>-->
+
+  <xs:element name="Event">
+    <xs:annotation>
+      <xs:documentation>The event class is the core class describing the event objects passed
+        around in an event.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiEvent" substitutionGroup="Event"/>
+
+  <xs:attributeGroup name="EventAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EventManager">
+    <xs:annotation>
+      <xs:documentation>This is the core class for the UI event system. Attach this to a browser
+        window object to forward browser events to the correct component.
+        There is usually no need to use this class. It is created as needed by the
+        core components
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiEventManager" substitutionGroup="EventManager"/>
+
+  <xs:attributeGroup name="EventManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="allowBrowserContextMenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to allow the browser's default context menu</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="captureComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that currently has the mouse capture. It is
+          better to call setCapture
+          on the component directly.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="EventTarget">
+    <xs:annotation>
+      <xs:documentation>This class provides the functionality to add and remove event listeners
+        as well as dispatch events. When an event is dispatched the listeners
+        are notified.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventTargetAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiEventTarget" substitutionGroup="EventTarget"/>
+
+  <xs:attributeGroup name="EventTargetAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+  </xs:attributeGroup>
+
+  <xs:element name="FlowPanel">
+    <xs:annotation>
+      <xs:documentation>This layout component flows its children from left to right and wraps to
+        the next row when no more children can fit on the current row. This
+        layout component uses the preferred size and it also takes margins into
+        account and uses margin collapsing so that two adjacent children share the
+        larger margin.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FlowPanelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFlowPanel" substitutionGroup="FlowPanel"/>
+
+  <xs:attributeGroup name="FlowPanelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The align property decides how to size and position the children. This
+          describes the size and position in the in the ortogonal direction of the
+          box orientation. For a
+          horizontal box this describes the height and top position and for a vertical
+          layout this describes the width and left position
+          Valid values are:
+          stretch
+          start
+          center
+          end
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="vAlign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The vAlign property decides how to position the lines of children if there
+          is any remaining vertical space.
+          Valid values are:
+          start/top
+          center
+          end/bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="baselineAlign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The baseline align describes how to do the vertical align of the items on
+          a row. This can be set for individual children as well using the attached
+          property.
+          Valid values are:
+          start/top
+          center
+          end/bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="wrap" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to wrap the children to a new line if there isn't enough space to
+          put them all on the same line.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="FocusElementWrapper">
+    <xs:annotation>
+      <xs:documentation>This class is used when tabbing between Bindows components and plain HTML
+        elements. It creates an interface that is a subset ofBiComponent with the
+        required method needed to work with theBiFocusManager
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FocusElementWrapperAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFocusElementWrapper" substitutionGroup="FocusElementWrapper"/>
+
+  <xs:attributeGroup name="FocusElementWrapperAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="focused" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If the component can be focused then this makes the component
+          focused (if set to true). If the component was focused
+          and this is set to false then the component is blurred.
+          Changing this fires the focus
+          and blur events (depending on the
+          previous state).
+          A disabled component cannot recieve focus.
+          To be able to recieve focus the tabIndex
+          must be greater or equal to 0.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="FocusEvent">
+    <xs:annotation>
+      <xs:documentation>This class describes event objects used in focus events.
+        The focusin and focusout events bubble by default,
+        focus and blur do not.
+        All mouse events bubble by default. This means that once all the
+        event listeners have been notified the event propagates to the parent
+        BiComponent. To prevent the event to
+        bubble to the parent call
+        stopPropagation() on the event object.
+        The currently supported events by BiComponent
+        are: focus blur focusin focusout
+        The order these events occur, when a focused component is left and another
+        focused component takes the focus, is the following: focusout focusin blur focus
+        This object should not be created by the user. It is created as needed by the event system.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FocusEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFocusEvent" substitutionGroup="FocusEvent"/>
+
+  <xs:attributeGroup name="FocusEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="FocusManager">
+    <xs:annotation>
+      <xs:documentation>This class handles the focus management in Bindows
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FocusManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFocusManager" substitutionGroup="FocusManager"/>
+
+  <xs:attributeGroup name="FocusManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Font">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used with BiLabel to provide
+        the font style information.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FontAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFont" substitutionGroup="Font"/>
+
+  <xs:attributeGroup name="FontAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="size">
+      <xs:annotation>
+        <xs:documentation>The font size (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bold">
+      <xs:annotation>
+        <xs:documentation>Whether to use bold</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="italic">
+      <xs:annotation>
+        <xs:documentation>Whether to use italic</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="underline">
+      <xs:annotation>
+        <xs:documentation>Whether to underline the text</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strikeout">
+      <xs:annotation>
+        <xs:documentation>Whether to line through the text</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name">
+      <xs:annotation>
+        <xs:documentation>The name of the font. A comma seprated list also works</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="FpsGenerator">
+    <xs:annotation>
+      <xs:documentation>Frame generation engine, used for animation.
+        Each animation can have it's ownBiFpsGenerator or it can use the globalBiFpsGenerator.
+        Different animations can share the global generator, which saves system resources.
+        Use the factory method, instead of the constructor, to get the global generator.
+        The frame generator generates FrameProgressionEvents a certain
+        number of times per second, as specified by the framerate.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FpsGeneratorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFpsGenerator" substitutionGroup="FpsGenerator"/>
+
+  <xs:attributeGroup name="FpsGeneratorAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="frameRate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the frame rate.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onframeprogression" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired upon every new frame</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="FrameProgressionEvent">
+    <xs:annotation>
+      <xs:documentation>Event that denotifies a new frame during animation.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FrameProgressionEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFrameProgressionEvent" substitutionGroup="FrameProgressionEvent"/>
+
+  <xs:attributeGroup name="FrameProgressionEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge">
+    <xs:annotation>
+      <xs:documentation>
+        This control displays a gauge.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge" substitutionGroup="Gauge"/>
+
+  <xs:attributeGroup name="GaugeAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="minimumAngle">
+      <xs:annotation>
+        <xs:documentation>The angle where the minimum value is located</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximumAngle">
+      <xs:annotation>
+        <xs:documentation>The angle where the minimum value is located</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorTickInterval">
+      <xs:annotation>
+        <xs:documentation>The distance between the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorTickInterval">
+      <xs:annotation>
+        <xs:documentation>The distance between the minor ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelInterval">
+      <xs:annotation>
+        <xs:documentation>The difference between the labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="warningValue">
+      <xs:annotation>
+        <xs:documentation>This shows a red section on the gauge between the warning value and the maximum value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showLabels">
+      <xs:annotation>
+        <xs:documentation>Whether to show the text labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMajorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the minor ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showWarningSection">
+      <xs:annotation>
+        <xs:documentation>Whether to show the red section between the warning value and the maximum value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum">
+      <xs:annotation>
+        <xs:documentation>The maximum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum">
+      <xs:annotation>
+        <xs:documentation>The minimum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value">
+      <xs:annotation>
+        <xs:documentation>The value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="plate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugePlate - The plate of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorTicks" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeMinorTicks - The minor ticks of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorTicks" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeMajorTicks - The major ticks of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="needle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeNeedle - The needle of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="title" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeTitle - The title of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labels" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeLabels - The labels of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2">
+    <xs:annotation>
+      <xs:documentation>The gauge2 class, encapsulating the gauge2 structure
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2" substitutionGroup="Gauge2"/>
+
+  <xs:attributeGroup name="Gauge2Attributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="coordWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Coord width is the inner coord vertical max value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="coordHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Coord width is the inner coord horizontal max value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2BasicCap">
+    <xs:annotation>
+      <xs:documentation>This class creates a basic round cap
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2BasicCapAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2BasicCap" substitutionGroup="Gauge2BasicCap"/>
+
+  <xs:attributeGroup name="Gauge2BasicCapAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2CapAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2CircularBorder">
+    <xs:annotation>
+      <xs:documentation>This class creates an circular border.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2CircularBorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2CircularBorder" substitutionGroup="Gauge2CircularBorder"/>
+
+  <xs:attributeGroup name="Gauge2CircularBorderAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2BorderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2Component">
+    <xs:annotation>
+      <xs:documentation>This class is the base of all classes residing inside aBiGauge2Group
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2Component" substitutionGroup="Gauge2Component"/>
+
+  <xs:attributeGroup name="Gauge2ComponentAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2Group">
+    <xs:annotation>
+      <xs:documentation>BiGauge2Group representing the main gauge2 vector graphic group
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2GroupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2Group" substitutionGroup="Gauge2Group"/>
+
+  <xs:attributeGroup name="Gauge2GroupAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2ImageBorder">
+    <xs:annotation>
+      <xs:documentation>This class creates an image border
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2ImageBorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2ImageBorder" substitutionGroup="Gauge2ImageBorder"/>
+
+  <xs:attributeGroup name="Gauge2ImageBorderAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2BorderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2Label">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating labels
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2Label" substitutionGroup="Gauge2Label"/>
+
+  <xs:attributeGroup name="Gauge2LabelAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="centerX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The centerX property represents the x coordinate of the center of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="centerY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The centerY property represents the y coordinate of the center of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text shown on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The label size</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearGradientFiller">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial linear fill of theBiGauge2Component.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearGradientFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearGradientFiller" substitutionGroup="Gauge2LinearGradientFiller"/>
+
+  <xs:attributeGroup name="Gauge2LinearGradientFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2GradientFillerAttributes"/>
+
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The angle of the linear filler</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearNeedle">
+    <xs:annotation>
+      <xs:documentation>This class creates a linear needle.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearNeedleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearNeedle" substitutionGroup="Gauge2LinearNeedle"/>
+
+  <xs:attributeGroup name="Gauge2LinearNeedleAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2ValueMarkerAttributes"/>
+
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The angle of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="needlePosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="needleBase" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The base width of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="needleHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearRange">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial range. The child "ticks" and "scales" inherits the angle.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearRangeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearRange" substitutionGroup="Gauge2LinearRange"/>
+
+  <xs:attributeGroup name="Gauge2LinearRangeAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2RangeAttributes"/>
+
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Angle of the lineear range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearScale">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating linear scales
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearScaleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearScale" substitutionGroup="Gauge2LinearScale"/>
+
+  <xs:attributeGroup name="Gauge2LinearScaleAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2ScaleAttributes"/>
+
+    <xs:attribute name="labelSpace" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The space between labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelPosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The angle of the scale</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearTicks">
+    <xs:annotation>
+      <xs:documentation>This class layout it's ticks in radial manner depeding on radius, start angle and end angle
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearTicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearTicks" substitutionGroup="Gauge2LinearTicks"/>
+
+  <xs:attributeGroup name="Gauge2LinearTicksAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2TicksAttributes"/>
+
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Angle of the line on wich the ticks will be placed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="tickSpace" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The space between ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2PlainColorFiller">
+    <xs:annotation>
+      <xs:documentation>This class creates a plain color filler
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2PlainColorFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2PlainColorFiller" substitutionGroup="Gauge2PlainColorFiller"/>
+
+  <xs:attributeGroup name="Gauge2PlainColorFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2FillerAttributes"/>
+
+    <xs:attribute name="color" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The color that the filler is going to use.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialGradientFiller">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial gradient fill of theBiGauge2Component.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialGradientFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialGradientFiller" substitutionGroup="Gauge2RadialGradientFiller"/>
+
+  <xs:attributeGroup name="Gauge2RadialGradientFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2GradientFillerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialNeedle">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial needle
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialNeedleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialNeedle" substitutionGroup="Gauge2RadialNeedle"/>
+
+  <xs:attributeGroup name="Gauge2RadialNeedleAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2ValueMarkerAttributes"/>
+
+    <xs:attribute name="outerRadius" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Outer radius of the needle.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="innerRadius" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Inner radius of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="innerWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:EDIT_THIS - The inner width of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="outerWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:EDIT_THIS - The outer width of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The value of the needle.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialRange">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial range. The child "ticks" and "scales" inherits the start- and end angles.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialRangeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialRange" substitutionGroup="Gauge2RadialRange"/>
+
+  <xs:attributeGroup name="Gauge2RadialRangeAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2RangeAttributes"/>
+
+    <xs:attribute name="startAngle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The startAngle of the range, this angle is where the radial range starts.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endAngle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The endAngle of the range, this angle is where the radial range ends.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialScaleSection">
+    <xs:annotation>
+      <xs:documentation>This class creates a radius scale
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialScaleSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialScaleSection" substitutionGroup="Gauge2RadialScaleSection"/>
+
+  <xs:attributeGroup name="Gauge2RadialScaleSectionAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2ScaleSectionAttributes"/>
+
+    <xs:attribute name="radius" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The radius</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialTicks">
+    <xs:annotation>
+      <xs:documentation>This class layout it's ticks in radial maner depeding on radius, start angle and end angle
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialTicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialTicks" substitutionGroup="Gauge2RadialTicks"/>
+
+  <xs:attributeGroup name="Gauge2RadialTicksAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2TicksAttributes"/>
+
+    <xs:attribute name="startAngle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The start angle of the ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endAngle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The end angle of the ticks.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="radius" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The radius of the circle on wich the ticks is placed.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RectangularBorder">
+    <xs:annotation>
+      <xs:documentation>This class creates a rectangular border
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RectangularBorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RectangularBorder" substitutionGroup="Gauge2RectangularBorder"/>
+
+  <xs:attributeGroup name="Gauge2RectangularBorderAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2BorderAttributes"/>
+
+    <xs:attribute name="rotation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The rotation angle of the rectangular border</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RingGradientFiller">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial gradient fill of theBiGauge2Component.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RingGradientFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RingGradientFiller" substitutionGroup="Gauge2RingGradientFiller"/>
+
+  <xs:attributeGroup name="Gauge2RingGradientFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2GradientFillerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeLabels">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the labels (the tick labels) for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeLabelsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeLabels" substitutionGroup="GaugeLabels"/>
+
+  <xs:attributeGroup name="GaugeLabelsAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeMajorTicks">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the major ticks for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeMajorTicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeMajorTicks" substitutionGroup="GaugeMajorTicks"/>
+
+  <xs:attributeGroup name="GaugeMajorTicksAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeMinorTicks">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the minor ticks for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeMinorTicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeMinorTicks" substitutionGroup="GaugeMinorTicks"/>
+
+  <xs:attributeGroup name="GaugeMinorTicksAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeNeedle">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the needle of a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeNeedleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeNeedle" substitutionGroup="GaugeNeedle"/>
+
+  <xs:attributeGroup name="GaugeNeedleAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The stroke color of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value">
+      <xs:annotation>
+        <xs:documentation>The value of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugePlate">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to the plate (the background circle) for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugePlateAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugePlate" substitutionGroup="GaugePlate"/>
+
+  <xs:attributeGroup name="GaugePlateAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the stroke (edge) of the plate</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color of the plate</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeSection">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show a section for a gauge.
+        A guage can have several sections and these are usually used to split
+        the gaguge values into logical value ranges.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeSection" substitutionGroup="GaugeSection"/>
+
+  <xs:attributeGroup name="GaugeSectionAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="startValue">
+      <xs:annotation>
+        <xs:documentation>
+          The start value of the section
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endValue">
+      <xs:annotation>
+        <xs:documentation>
+          The end value of the section
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="color">
+      <xs:annotation>
+        <xs:documentation>The color of the section</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeTitle">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the title for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeTitleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeTitle" substitutionGroup="GaugeTitle"/>
+
+  <xs:attributeGroup name="GaugeTitleAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Graph">
+    <xs:annotation>
+      <xs:documentation>
+        This is the container used with graphs. The graph component contains
+        other components for the axes, legend, charts and more.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGraph" substitutionGroup="Graph"/>
+
+  <xs:attributeGroup name="GraphAttributes">
+
+    <xs:attributeGroup ref="GraphBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Graph2">
+    <xs:annotation>
+      <xs:documentation>
+        This is a simpler graph control than BiGraph.
+        BiGraph2 works in Mozilla but it is a bit
+        more limited. For example, BiGraph2 does
+        not support line charts nor pie charts. Gradient fills are ignored
+        by BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Graph2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGraph2" substitutionGroup="Graph2"/>
+
+  <xs:attributeGroup name="Graph2Attributes">
+
+    <xs:attributeGroup ref="GraphBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiGraph
+        and BiGraph2. If Mozilla support is needed
+        use BiGraph2. If line chart and/or pie chart
+        is needed then use BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGraphBase" substitutionGroup="GraphBase"/>
+
+  <xs:attributeGroup name="GraphBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="autoScale">
+      <xs:annotation>
+        <xs:documentation>
+          Allows you turn off the automatic scaling of the graph
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fontSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number -
+          Sets the font size for the legend and axes. If autoScale
+          is true then this does not apply.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="series" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiChartSeries[] - This is an array containing the series used for the data of the graph.
+          After this property is changed the graph component needs to be updated.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="categories" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiChartCategory[] - This is an array containing the categories used for the data of the graph.
+          After this property is changed the graph component needs to be updated.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="points" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiChartPoint[] - This is an array containing the points used for the data of the graph.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="chartType">
+      <xs:annotation>
+        <xs:documentation>
+          The type of the chart. Available types are:
+          bar
+          column
+          grid
+          line
+          pie
+          percentagestackedbar
+          percentagestackedcolum
+          stackedbar
+          stackedcolumn
+          grid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onpointclick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user clicks on a point in the graph</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointcontextmenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user right clicks on a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointdblclick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user double clicks on a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmousedown" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user presses down the mouse button on a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmousemove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user moves the mouse over a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmouseout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Fires when the mouse pointer leaves a point
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmouseover" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Fires when the mouse pointer enters a point
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmouseup" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the releases the mouse button on a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmousewheel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user scrolls the mouse wheel over a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphContentArea">
+    <xs:annotation>
+      <xs:documentation>This component is used as a container for the graph content
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphContentAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGraphContentArea" substitutionGroup="GraphContentArea"/>
+
+  <xs:attributeGroup name="GraphContentAreaAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid">
+    <xs:annotation>
+      <xs:documentation>This component is used to display a grid (table, column list). A grid
+        can show headers for both the columns and the rows. A grid also supports
+        selection of whole rows as well as of individual cells.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid" substitutionGroup="Grid"/>
+
+  <xs:attributeGroup name="GridAttributes">
+
+    <xs:attributeGroup ref="AbstractGridAttributes"/>
+
+    <xs:attribute name="selectionMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the selection mode. Allowed values are "cell" and "row".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataSource" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDataSet /BiDataTable - The object to use as the data source. This can be a either a
+          BiDataTable or aBiDataSet (in which case the first table is used).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="currentDataPage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the current data page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataPageSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount of rows to show at one time from the data source.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected row/cell changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondatabind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Called after the component has been data bound</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2">
+    <xs:annotation>
+      <xs:documentation>This component is a special case ofBiTreeView which has an interface which
+        is similar toBiGrid
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2" substitutionGroup="Grid2"/>
+
+  <xs:attributeGroup name="Grid2Attributes">
+
+    <xs:attributeGroup ref="TreeViewAttributes"/>
+
+    <xs:attribute name="columnCount" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of columns in the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnNames" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The text to show on the headers of the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The widths of the columns of the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The order of the columns. This an array containing the indexes of the
+          columns.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the headers for the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRowHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the row headers for the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showGridLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show grid lines between the cells in the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2Cell">
+    <xs:annotation>
+      <xs:documentation>This is used for the cells in aBiGrid2Row row
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2CellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2Cell" substitutionGroup="Grid2Cell"/>
+
+  <xs:attributeGroup name="Grid2CellAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The data that is associated with the cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2DataModel">
+    <xs:annotation>
+      <xs:documentation>This data model is to be used withBiGrid2. It uses theBiGrid2Row and
+        BiGrid2Cell to provide the data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2DataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2DataModel" substitutionGroup="Grid2DataModel"/>
+
+  <xs:attributeGroup name="Grid2DataModelAttributes">
+
+    <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+
+    <xs:attribute name="treeView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiGrid2 - The tree view the data model is acting on</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onrowcountchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event happens after
+          the number of rows has changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2Row">
+    <xs:annotation>
+      <xs:documentation>This class is used as the data for rows in theBiGrid2 component
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2RowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2Row" substitutionGroup="Grid2Row"/>
+
+  <xs:attributeGroup name="Grid2RowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2ViewManager">
+    <xs:annotation>
+      <xs:documentation>This class is a special view manager to be used withBiGrid2
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2ViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2ViewManager" substitutionGroup="Grid2ViewManager"/>
+
+  <xs:attributeGroup name="Grid2ViewManagerAttributes">
+
+    <xs:attributeGroup ref="TreeViewViewManagerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridCell">
+    <xs:annotation>
+      <xs:documentation>This class represents a cell in a grid row.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridCellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridCell" substitutionGroup="GridCell"/>
+
+  <xs:attributeGroup name="GridCellAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The data associated with the cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The background color name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="foreColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The foreground color name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the cell is selected or not. This should not be set when
+          the selection mode for the grid is set to row selection.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridChart">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to display a grid containing the values in a graph.
+        Each series in the graph is shown as a row
+        in the grid and each point is shown as a cell.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridChart" substitutionGroup="GridChart"/>
+
+  <xs:attributeGroup name="GridChartAttributes">
+
+    <xs:attributeGroup ref="GridAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridChartCell">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to display a cell in a grid chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridChartCellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridChartCell" substitutionGroup="GridChartCell"/>
+
+  <xs:attributeGroup name="GridChartCellAttributes">
+
+    <xs:attributeGroup ref="GridCellAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridChartRow">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to display a row in a grid chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridChartRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridChartRow" substitutionGroup="GridChartRow"/>
+
+  <xs:attributeGroup name="GridChartRowAttributes">
+
+    <xs:attributeGroup ref="GridRowAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridColumn">
+    <xs:annotation>
+      <xs:documentation>This class is used to describe columns forBiGrid andBiTree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridColumnAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridColumn" substitutionGroup="GridColumn"/>
+
+  <xs:attributeGroup name="GridColumnAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The alignment of the content inside the column.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column. This is the same as the text shown on
+          the header.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the column.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="indentColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Whether the current column is the indent column in the grid.
+          This is ignored when using the columns for a non tree.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="iconColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Whether the current column is the icon column in the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the column is visible or not.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The type of the data in the column. This is used to decide how
+          to sort the data in the column. Built in support for the following
+          types: string caseInsensitiveString number date - Uses the native JS Date type
+          To get better control over the sorting create a subclass that
+          overrides the sortFunction getter.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridDataModel">
+    <xs:annotation>
+      <xs:documentation>This data model takes an array of arrays containing the text for a grid. This data model is to be used
+        withBiTreeView
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridDataModel" substitutionGroup="GridDataModel"/>
+
+  <xs:attributeGroup name="GridDataModelAttributes">
+
+    <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridHeader">
+    <xs:annotation>
+      <xs:documentation>This represents a header cell for the
+        headers of a
+        grid or a tree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridHeaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridHeader" substitutionGroup="GridHeader"/>
+
+  <xs:attributeGroup name="GridHeaderAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="resizable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can resize the current header.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can click on the header to sort by that column.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="movable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can move the current header.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ascending" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true a down arrow is shown as the icon
+          of the header. When false an up arrow and when
+          null no icon is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ascendingIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon to use for the sort arrow when sorting ascendingly</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="descendingIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon to use for the sort arrow when sorting descendingly</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridHeaderCorner">
+    <xs:annotation>
+      <xs:documentation>This component is used to paint the upper left corner of the headers
+        in case both row headers and column headers are visible for a grid.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridHeaderCornerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridHeaderCorner" substitutionGroup="GridHeaderCorner"/>
+
+  <xs:attributeGroup name="GridHeaderCornerAttributes">
+
+    <xs:attributeGroup ref="GridHeaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridHeaderFiller">
+    <xs:annotation>
+      <xs:documentation>This component is used to fill the headers
+        in case the widths of the header cells do not cover the entire width of
+        the headers.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridHeaderFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridHeaderFiller" substitutionGroup="GridHeaderFiller"/>
+
+  <xs:attributeGroup name="GridHeaderFillerAttributes">
+
+    <xs:attributeGroup ref="GridHeaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridHeaders">
+    <xs:annotation>
+      <xs:documentation>This class represents the headers for a grid
+        or a tree.
+        The headers contain several header cells.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridHeadersAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridHeaders" substitutionGroup="GridHeaders"/>
+
+  <xs:attributeGroup name="GridHeadersAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="fitColumnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true the column widths are distributed so that the fill the
+          width of the grid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnCount" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of columns in the header</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The widths of the cell headers in the headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The order in which the cell headers should be displayed in. A
+          value of [2,0,1] means that the third cell comes first,
+          then comes the first cell and last the second.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the column that should show the sort arrow.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ascending" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this is true then the sorting should be done
+          ascending, if false descending and if null
+          no sort. This is also reflected on the ascending property for the
+          header this applies to.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="oncolumnwidthschanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the column widths are changed. This happens when either
+          the user has finished resized a column or the column widths are
+          changed through script.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncolumnorderschanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the column orders are changed. This happens when either
+          the user has reordered the columns or the order is
+          changed through script.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onsortcolumnchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the sort column is changed. This happens when either
+          the user has clicks on a sortable column or the sort column is
+          changed through script.
+          Note that when the user clicks on the currently sorted column this
+          event is not fired. Instead the ascendingchanged event
+          is triggered because the sorting is changed from ascending to
+          descending or the other way around.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onascendingchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the ascending property changes. This happens when either
+          the user clicks on a column header cell that is already sorted or
+          this property is changed through script.
+          Note that if the ascending property changed due to
+          a change of the sortColumn this event is not fired.
+          This is by design to prevent preformance issues.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncolumnwidthschanging" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the column widths are changing. This happens when
+          the user is resizing a column.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridPanel">
+    <xs:annotation>
+      <xs:documentation>This layout component positions and sizes its children in a simple grid where
+        the columns and rows are decided using string patterns much
+        like the way the rows and cols attribute for HTML framesets decides the
+        size and position of the frames.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridPanelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridPanel" substitutionGroup="GridPanel"/>
+
+  <xs:attributeGroup name="GridPanelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="hGap" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The horizontal gap between the columns</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="vGap" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The vertical gap between the rows</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cols" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is a string representing the column widths. It is a comma seperated
+          string of column sizes. See the remarks for more info.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rows" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is a string representing the row heights. It is a comma seperated
+          string of row sizes. See the remarks for more info.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridPanel2">
+    <xs:annotation>
+      <xs:documentation>BiGridPanel2 is a layout component based onBiGridPanel.
+        It works similair to a html table. A layout is created by
+        adding rows and cells to the Panel. Cells and rows can have
+        padding, colspan, rowspan, alignment etc. Defaults can also
+        be set on the grid panel itself.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridPanel2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridPanel2" substitutionGroup="GridPanel2"/>
+
+  <xs:attributeGroup name="GridPanel2Attributes">
+
+    <xs:attributeGroup ref="GridPanelAttributes"/>
+
+    <xs:attribute name="cellPadding" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Padding for cells in the grid. Individual rows and cells can override this.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Horizontal alignment for cells in the grid. Individual rows and cells can
+          override this.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="valign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Vertical alignment for cells in the grid. Individual rows and cells can
+          override this.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridPanel2Cell">
+    <xs:annotation>
+      <xs:documentation>A cell in aBiGridPanel2Cell
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridPanel2CellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridPanel2Cell" substitutionGroup="GridPanel2Cell"/>
+
+  <xs:attributeGroup name="GridPanel2CellAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="cellPadding" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Padding for a cell.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="contentComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - Component in the cell.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stretch" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:string - How the content component should be stretched.
+          Possible settings are:
+          none, both, horizontal, vertical
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="parent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiGridPanel2Row - The row this cell was added to.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="colSpan" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - ColSpan of the cell. The cell will span colspan number of columns horizontally.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowSpan" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Rowspan of a cell. The cell spans rowspan number of rows vertically.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The horizontal alignment of the cell. Possible values are:
+          left
+          center
+          right
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="valign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The vertical alignment of the cell. Possible values are:
+          top
+          center
+          middle
+          bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preferredWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The preferred width of the cell. Defaulted to the preferredWidth
+          of the content component, plus any padding it needs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preferredHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Preferred height of the cell. Defaults to preferredHieght of the
+          content component plus padding it needs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridPanel2Row">
+    <xs:annotation>
+      <xs:documentation>A row of cells in aBiGridPanel2
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridPanel2RowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridPanel2Row" substitutionGroup="GridPanel2Row"/>
+
+  <xs:attributeGroup name="GridPanel2RowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="cellPadding" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Padding for cells in the row. Individual cells can override this.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The horizontal alignment for cells in the row. Individual cells can
+          override this. SeeBiGridPanel2Cell for specific settings.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="valign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The vertical alignment for cells in the row. Individual cells can
+          override this. SeeBiGridPanel2Cell for settings.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridRow">
+    <xs:annotation>
+      <xs:documentation>This class represents the rows inBiGrid. Each row contains
+        cells that contains the text to show for
+        the column.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridRow" substitutionGroup="GridRow"/>
+
+  <xs:attributeGroup name="GridRowAttributes">
+
+    <xs:attributeGroup ref="AbstractGridRowAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridRowHeaders">
+    <xs:annotation>
+      <xs:documentation>This component is used to paint the grid row headers for a grid.
+        The component asks the BiGridRow for the HTML
+        for each item by calling getRowHeaderHtml.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridRowHeadersAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridRowHeaders" substitutionGroup="GridRowHeaders"/>
+
+  <xs:attributeGroup name="GridRowHeadersAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridSelectionModel">
+    <xs:annotation>
+      <xs:documentation>This class handles the selection of rows
+        or cells in a grid.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridSelectionModel" substitutionGroup="GridSelectionModel"/>
+
+  <xs:attributeGroup name="GridSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+    <xs:attribute name="selectionMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The grid selection model supports both selection entire rows
+          and individual grid cells. Valid values are:
+          row
+          cell
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GroupBox">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating group boxes. A group box is a container
+        with a border and possibly a title at the top.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GroupBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGroupBox" substitutionGroup="GroupBox"/>
+
+  <xs:attributeGroup name="GroupBoxAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="groupBoxTitle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiGroupBoxTitle - This property points to theBiGroupBoxTitle component which handles the title
+          of the group box.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="titlePosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The position of the title. Valid values are: left center right</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the text of the title. Setting this to null removes the title.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GroupBoxTitle">
+    <xs:annotation>
+      <xs:documentation>This component is used with theBiGroupBox to handle the title.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GroupBoxTitleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGroupBoxTitle" substitutionGroup="GroupBoxTitle"/>
+
+  <xs:attributeGroup name="GroupBoxTitleAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="titlePosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The position of the title. Valid values are: left center right</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="HashTable">
+    <xs:annotation>
+      <xs:documentation>This is a basci implementation of a hash table. It works around a known
+        bug in IE/JScript that causes IE to leak memory when using Objects as hashes
+        in javascript
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="HashTableAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiHashTable" substitutionGroup="HashTable"/>
+
+  <xs:attributeGroup name="HashTableAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="HBox">
+    <xs:annotation>
+      <xs:documentation>This is a horizontalBiBox where components are laid out from left to right
+        (or right to left if rightToLeft
+        is true).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="HBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiHBox" substitutionGroup="HBox"/>
+
+  <xs:attributeGroup name="HBoxAttributes">
+
+    <xs:attributeGroup ref="BoxAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Iframe">
+    <xs:annotation>
+      <xs:documentation>
+        This component allows usage of an HTML 4 iframe element. This allows
+        any document/file that is supported by the platform to be shown inside a
+        component.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="IframeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiIframe" substitutionGroup="Iframe"/>
+
+  <xs:attributeGroup name="IframeAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiUri -
+          The URI to the file to show inside the frame. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Happens when the iframe is loaded. Note that this might fire more
+          often than one might expect so be sure to check that you really
+          want your code run when the event is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Image">
+    <xs:annotation>
+      <xs:documentation>This class is used for showing images.
+        Supported image types are GIF, JPEG and PNG (including support for 32-bit RGBA).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImage" substitutionGroup="Image"/>
+
+  <xs:attributeGroup name="ImageAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="alt" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The alternate text which is read out instead of the image when Bindows is
+          in accessibility mode.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The location of the image file. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image loads. Note that the image file may be
+          loaded before the constructor finishes and you should not only
+          rely on this event but also use loaded property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onerror" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image failed to load.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageLoader">
+    <xs:annotation>
+      <xs:documentation>This class loads an image file to memory
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImageLoader" substitutionGroup="ImageLoader"/>
+
+  <xs:attributeGroup name="ImageLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI (location) of the file to load. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageMap">
+    <xs:annotation>
+      <xs:documentation>This class emulates the classic image map found in HTML.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageMapAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImageMap" substitutionGroup="ImageMap"/>
+
+  <xs:attributeGroup name="ImageMapAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageMapArea">
+    <xs:annotation>
+      <xs:documentation>This class represents a particular area on an image map.
+
+        This class supports the following events:-
+        mousemove
+        mousedown
+        mouseover
+        mouseout
+        click
+        contextmenu
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageMapAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImageMapArea" substitutionGroup="ImageMapArea"/>
+
+  <xs:attributeGroup name="ImageMapAreaAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="cursor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The cursor to show when the mouse hovers over this area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageMapEvent">
+    <xs:annotation>
+      <xs:documentation>This type of event is fired when UI events (mousemove, mousedown, etc) are fired on
+        the image that is associated with an image map.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageMapEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImageMapEvent" substitutionGroup="ImageMapEvent"/>
+
+  <xs:attributeGroup name="ImageMapEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImagePreloader">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles preloading of an image. There will never be more than
+        one instance of this class per image URI. So if there already exists a
+        preloader for the given URI that will be returned.
+        Since there might be other objects dependent on the current instance it
+        is not a good idea to call dispose on the instance object. Disposal is
+        handled by the system.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImagePreloaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImagePreloader" substitutionGroup="ImagePreloader"/>
+
+  <xs:attributeGroup name="ImagePreloaderAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image file loads</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onerror" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires if the image file fails to load</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImagePreloaderManager">
+    <xs:annotation>
+      <xs:documentation>
+        A singleton class that handles the BiImagePreloader
+        instances
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImagePreloaderManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImagePreloaderManager" substitutionGroup="ImagePreloaderManager"/>
+
+  <xs:attributeGroup name="ImagePreloaderManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InlineComponent">
+    <xs:annotation>
+      <xs:documentation>This class is used to create components that can be used in the
+        inline flow of the HTML document hosting the application.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InlineComponentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiInlineComponent" substitutionGroup="InlineComponent"/>
+
+  <xs:attributeGroup name="InlineComponentAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="inlineId" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the id that the HTML element acting as the container is
+          having. Don't change this after the component has been added
+          to the application window.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="InlineEditModel">
+    <xs:annotation>
+      <xs:documentation>This class is used to handle inline editing in aBiTreeView and aBiOlapGrid.
+        This class provides editing by using one attached component at a time.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InlineEditModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiInlineEditModel" substitutionGroup="InlineEditModel"/>
+
+  <xs:attributeGroup name="InlineEditModelAttributes">
+
+    <xs:attributeGroup ref="AttachedComponentModelAttributes"/>
+
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The value of the currently editing cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforeshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched before the editing
+          component is added to theBiTreeView component
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the value of the
+          currently editing cell has changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforehide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This happens before the editing component is
+          hidden. If the default action is prevented here
+          the component is not removed from the tree view
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onhide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the editing component has been removed/hidden.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="IpField">
+    <xs:annotation>
+      <xs:documentation>This component is used to enter an IPv4 address. The control consists of different text fields
+        for the different parts of the address.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="IpFieldAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiIpField" substitutionGroup="IpField"/>
+
+  <xs:attributeGroup name="IpFieldAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="ip" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The IP address that is shown in the IP field.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the enter key is pressed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the IP field is blurred
+          and the text has changed since the IP field got
+          focus.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfieldchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the active field of the
+          component changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ontextchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the text has changed.
+          This happens when the user in some way changes
+          the text inside the IP field. This event
+          is fired continiously as the user types.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oninvalidinput" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired if an invalid character is typed or
+          invalid text is pasted into the IP field.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Json">
+    <xs:annotation>
+      <xs:documentation>This class is used to serialize and deserialize javascript objects from and
+        to a JSON string. JSON stands for JavaScript Notation Format and you can find
+        more information at http://json.org.
+        When serializing objects we check if the object has a serialize
+        method and if so we use that instead.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="JsonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiJson" substitutionGroup="Json"/>
+
+  <xs:attributeGroup name="JsonAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="JsonLoader">
+    <xs:annotation>
+      <xs:documentation>Loads a JSON file and returns the javascript object that the JSON file
+        describes.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="JsonLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiJsonLoader" substitutionGroup="JsonLoader"/>
+
+  <xs:attributeGroup name="JsonLoaderAttributes">
+
+    <xs:attributeGroup ref="TextLoaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="KeyboardEvent">
+    <xs:annotation>
+      <xs:documentation>
+        This class describes event object used in keyboard events.
+        All keyboard events bubble by default. This means that once all the
+        event listeners have been notified the event propagates to the parent
+        BiComponent. To prevent the event to
+        bubble to the parent call
+        stopPropagation() on the event object.
+        The currently supported keyboard events by BiComponent
+        are: keydown keypress keyup
+        This object should not be created by the user. It is created as needed by the event system.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="KeyboardEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiKeyboardEvent" substitutionGroup="KeyboardEvent"/>
+
+  <xs:attributeGroup name="KeyboardEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="L10nLoader">
+    <xs:annotation>
+      <xs:documentation>This class handles the loading and interpretation of localization templates files.
+        This loader search for language specific template file i.e..
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="L10nLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiL10nLoader" substitutionGroup="L10nLoader"/>
+
+  <xs:attributeGroup name="L10nLoaderAttributes">
+
+    <xs:attributeGroup ref="XmlLoaderAttributes"/>
+
+    <xs:attribute name="language" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The desired language, otherwise the browser language is used.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="defaultLanguage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The desired default language. The default langugae will be used if no localization template file can
+          be found using the language property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="prefix" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Prefix of the localization template files, the loader will search for files named</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="L10nString">
+    <xs:annotation>
+      <xs:documentation>This class converts a localization template to a string.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="L10nStringAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiL10nString" substitutionGroup="L10nString"/>
+
+  <xs:attributeGroup name="L10nStringAttributes">
+
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String : The localization template name - Sets the localization template name.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Label">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to show text
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLabel" substitutionGroup="Label"/>
+
+  <xs:attributeGroup name="LabelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="text">
+      <xs:annotation>
+        <xs:documentation>The plain text shown on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="html">
+      <xs:annotation>
+        <xs:documentation>The HTML text shown on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mnemonic">
+      <xs:annotation>
+        <xs:documentation>A character used to give UI hints about the access key for the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="font" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiFont - This is used to describe how to paint the text on the label.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelFor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiComponent - If this is set then focusing on the current label moves the focus to another component
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="wrap">
+      <xs:annotation>
+        <xs:documentation>Whether to wrap the text if the label is not wide enough</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingLeft">
+      <xs:annotation>
+        <xs:documentation>The left padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingRight">
+      <xs:annotation>
+        <xs:documentation>The right padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingTop">
+      <xs:annotation>
+        <xs:documentation>The top padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingBottom">
+      <xs:annotation>
+        <xs:documentation>The bottom padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align">
+      <xs:annotation>
+        <xs:documentation>
+          The text alignment. Valid values are: left right center justify
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="verticalAlign">
+      <xs:annotation>
+        <xs:documentation>
+          NOT IMPLEMENTED
+          The vertical text alignment. Valid values are: top middle bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiImage - The icon image to show on the label. Note that changing
+          the image object does not update the label icon. You'll have to
+          set the icon property to update the label icon.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="iconPosition">
+      <xs:annotation>
+        <xs:documentation>
+          The position of the icon relative to the text. Valid values are: left right top bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="iconTextGap">
+      <xs:annotation>
+        <xs:documentation>The gap between the icon and the text (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Launcher">
+    <xs:annotation>
+      <xs:documentation>This class can be used to create a launcher for launching Bindows applications
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LauncherAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLauncher" substitutionGroup="Launcher"/>
+
+  <xs:attributeGroup name="LauncherAttributes">
+
+    <xs:attribute name="reuseWindow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to reuse a previously opened window. If you want to launch
+          the new application in the current window set newWindow to
+          false.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="newWindow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to launch the application in a new window</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rootPath" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The path where Bindows resides. This is usually the path where bimain.html
+          can be found.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="adfPath" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The path to the ADF file.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="adfName" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The ADF name is taken from the ADF path</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="arguments" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The arguments to pass to the main method of the ADF</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="target" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The target name of the window or frame to open the application in. If this is ""
+          or null the ADF name will be used instead. If reuseWindow
+          is false then this property will be ignored.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accessibilityMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This property can be used to tell whether the application should be in an
+          accessibility mode.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="focusOnLoad" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to try to focus the window when the application loads</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Line">
+    <xs:annotation>
+      <xs:documentation>ABiLine contains screen coordinates. It can be used to store eg. a line.
+        This class is used in animation.
+        Storage is implemented as a stack where you add points at the end.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LineAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLine" substitutionGroup="Line"/>
+
+  <xs:attributeGroup name="LineAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="LineChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a line chart for the given series
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LineChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLineChart" substitutionGroup="LineChart"/>
+
+  <xs:attributeGroup name="LineChartAttributes">
+
+    <xs:attributeGroup ref="AbstractChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="LineMarker">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the components used to show the markers for a
+        line chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LineMarkerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLineMarker" substitutionGroup="LineMarker"/>
+
+  <xs:attributeGroup name="LineMarkerAttributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Link">
+    <xs:annotation>
+      <xs:documentation>This class represents the relationship between two components that are to be linked by a link line.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LinkAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLink" substitutionGroup="Link"/>
+
+  <xs:attributeGroup name="LinkAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="startComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The first ("left") component that is part of this link.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The second ("right") component that is part of this link.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="line" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDrawLine - The line used to link the components.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="startAnchor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The anchor point on startComponent which line anchors to.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endAnchor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The anchor point on endComponent which line anchors to.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="direction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The direction of this link.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="LinkManager">
+    <xs:annotation>
+      <xs:documentation>This class is a component that holds linked components. It also manages the links involved with these components.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LinkManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLinkManager" substitutionGroup="LinkManager"/>
+
+  <xs:attributeGroup name="LinkManagerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="List">
+    <xs:annotation>
+      <xs:documentation>This is a list component that can contain BiListItem
+        objects. It uses the normal object model and can therefore be extended and
+        used just like any other component. The only limitation is that the the direct
+        children should only be of type BiListItem
+        and the size and position of these should not be changed.
+        The list uses a BiListSelectionModel
+        that handles the selection.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ListAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiList" substitutionGroup="List"/>
+
+  <xs:attributeGroup name="ListAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="allowInlineFind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When true, typing a word will select the first matching item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Used to decide how to sort the list items. It is used when calling sort()
+          if the sortFunction property has not been set to a function.
+          If the list items has its userValue property set, it has precedence over its
+          text property in being the value that is compared
+          Built in support for the following
+          types: string (default) caseInsensitiveString number date - Uses the native JS Date type
+          To get better control over the sorting, define a function and set
+          the sortFunction property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortFunction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - Sets a property which is a function used to compare two listItems.
+          This function should take two arguments and return a
+          number (just like the normal comparison function used when sorting
+          arrays in JavaScript). If this property is not set, it uses the predefined
+          functions set by the sortType property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - This is the userValue of
+          the first selected list item.
+          If no item is selected then this returns null.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiListSelectionModel - This handles the selection of the items in the list</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="multipleSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the list supports multiple selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataTextField" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column to use as the data for the text property
+          of the BiListItems.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataUserValueField" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column to use as the data for the userValue
+          property of the BiListItems.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataSource" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDataTable /BiDataSet - The object to use as the data source. This can be a either a
+          BiDataTable or a
+          BiDataSet (in which case the
+          first table is used).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataPageSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount of rows to show at one time from the data source.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="currentDataPage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the current data page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected items change</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondatabind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Called after the component has been data bound</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ListItem">
+    <xs:annotation>
+      <xs:documentation>This class is used for the items in a list
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ListItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiListItem" substitutionGroup="ListItem"/>
+
+  <xs:attributeGroup name="ListItemAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the item is visible or not. Note that all the ancestors must be
+          visible for the component to be actually shown. Use isVisible to
+          check that the item is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the item is selected or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the list item. This is not the text on the item. To
+          change the text use the text
+          property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the item is double
+          clicked or when enter is pressed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ListSelectionModel">
+    <xs:annotation>
+      <xs:documentation>This class handles the selection for lists
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ListSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiListSelectionModel" substitutionGroup="ListSelectionModel"/>
+
+  <xs:attributeGroup name="ListSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="LoadManager">
+    <xs:annotation>
+      <xs:documentation>This singleton class is used to keep track of loading of resources
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LoadManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLoadManager" substitutionGroup="LoadManager"/>
+
+  <xs:attributeGroup name="LoadManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="loadPerDomain" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is is the number of requests that can be loaded at the same time from
+          the same domain
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="LocationAnimator">
+    <xs:annotation>
+      <xs:documentation>Animates the location ofBiComponents to create movement.
+        This class has a repository of motion paths. A motion path is created by setting start and end
+        screen coordinates. Objects will be animated between these in a straight line.
+        Motion paths are stored in a stack where the first motion path, called the default motion path,
+        is created upon construction.
+        The default motion path can be changed and modified dynamically via getter/setter function,
+        whereas additional motion paths can only be either added or removed. For each motion path you have
+        independent control over speed and acceleration algorithms.
+        By pushing more motion paths onto the stack you can make the object animate around multiple
+        positions on the screen and create complex movement.
+        To animate a component, you create the animator object and add componen(s) to it, then start the animation.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LocationAnimatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLocationAnimator" substitutionGroup="LocationAnimator"/>
+
+  <xs:attributeGroup name="LocationAnimatorAttributes">
+
+    <xs:attributeGroup ref="ComponentAnimationAttributes"/>
+
+    <xs:attribute name="fromX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Starting point's X position measured in pixels.
+          Modifies the default motion path, that components will be animated between.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Starting point's Y position measured in pixels.
+          Modifies the default motion path, that components will be animated between.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Ending point's X position measured in pixels.
+          Modifies the default motion path, that components will be animated between.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Ending point's Y position measured in pixels.
+          Modifies the default motion path, that components will be animated between.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Changes the acceleration type for the default motion path.
+          Use one of the acceleration constants defined inBiComponentAnimation
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="speed" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number/String - Changes the speed of the default motion path.
+          Time measured in milliseconds it should take to complete
+          the animation of the default motion path.
+          It Could also be a string with the following values:
+          slowest, slow, normal, fast, fastest
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets both the speed and the acceleration type for the animation.
+          Can be either: "normal" or "smooth"
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - Instead of using absolute window positions, you can position the animation relative
+          another components position. By setting the from-component you specify anotherBiComponent
+          whos location will be used for the animation's start state.
+          If the from-component's location or size is changed, the animation
+          will update dynamically. By default the top left corner of the from-component will be this
+          animation's start x/y.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - Instead of using absolute window positions, you can position the animation relative
+          another components position. By setting the to-component you specify anotherBiComponent
+          whos location will be used for the animation's target state.
+          If the to-component's location or size is changed, the animation
+          will update dynamically. By default the top left corner of the to-component will be this
+          animation's end x/y.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation start y position relative to either a from-component, if set. Otherwise
+          top relates to the browser's viewport. Setting top cancels bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation end y position relative to either a to-component, if set. Otherwise
+          top relates to the browser's viewport. Setting top cancels bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation start x position relative to either a from-component, if set. Otherwise
+          left relates to the browser's viewport. Setting left cancels right.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation end x position relative to either a to-component, if set. Otherwise
+          left relates to the browser's viewport. Setting left cancels right.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromBottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation start y position relative to either a from-component, if set. Otherwise
+          bottom relates to the browser's viewport. Setting bottom cancels top.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toBottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation end y position relative to either a to-component, if set. Otherwise
+          bottom relates to the browser's viewport. Setting bottom cancels top.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromRight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation start x position relative to either a from-component, if set. Otherwise
+          right relates to the browser's viewport. Setting right cancels left.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toRight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation end x position relative to either a to-component, if set. Otherwise
+          right relates to the browser's viewport. Setting right cancels left.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Math">
+    <xs:annotation>
+      <xs:documentation>Collection of static functions used in various math operations.
+        Used heavily in the animation library for example.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MathAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMath" substitutionGroup="Math"/>
+
+  <xs:attributeGroup name="MathAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Menu">
+    <xs:annotation>
+      <xs:documentation>This class represents a menu. Menus can be filled with menu items by
+        addingBiMenuItem objects.
+        The content model for the menu is very similiar to the content model for
+        BiComponent but there are slight differences.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenu" substitutionGroup="Menu"/>
+
+  <xs:attributeGroup name="MenuAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Shows or hides the menu</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="left" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets or gets the left position of the menu relative to the screen</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="top" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets or gets the top position of the menu relative to the screen</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the menu</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="height" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The heightof the menu</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightToLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Describes whether the component should be be layed out to support
+          locales using right-to-left fonts. If this is set to null
+          then the rightToLeft property for the parent component
+          is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the menu is shown</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the menu is shown.
+          This is a good place to change the content of the menu to reflect the
+          component causing the menu to be shown
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onhide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the menu is hidden</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MenuBar">
+    <xs:annotation>
+      <xs:documentation>This class is used to display a menu bar
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenuBar" substitutionGroup="MenuBar"/>
+
+  <xs:attributeGroup name="MenuBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MenuButton">
+    <xs:annotation>
+      <xs:documentation>This class is used for displaying the buttons of a menu bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenuButton" substitutionGroup="MenuButton"/>
+
+  <xs:attributeGroup name="MenuButtonAttributes">
+
+    <xs:attributeGroup ref="MenuItemAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MenuItem">
+    <xs:annotation>
+      <xs:documentation>Represents a menu item for a menu.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenuItem" substitutionGroup="MenuItem"/>
+
+  <xs:attributeGroup name="MenuItemAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The plain text to show on the menu item</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="html" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The html text to show on the menu item</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon image to show on the menu item. Note that changing
+          the image object does not update the label icon. You'll have to
+          set the icon property to update the label icon. The size of the icon
+          of the menu item is currently fixed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mnemonic" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - A character used to give UI hints about the access key for the menu label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="subMenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - The menu that should be opened as a sub menu when the current menu is selected.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Shows or hides the menu item</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="enabled" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the component is enabled or not. When this is changed the
+          component fires the enabledchanged event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="shortcutText" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The shortcut text is shown on the menu to give the user a hint about
+          keyboard shortcuts. Setting this on the menu just adds the text. It
+          does not set up the keyboard shortcut.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toolTipText" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text to show as a tool tip for the menu item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the menu item is clicked or invoked using the keyboard</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onenabledchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the enabled property is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MenuSeparator">
+    <xs:annotation>
+      <xs:documentation>This class is used to display a separator inside a menu
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuSeparatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenuSeparator" substitutionGroup="MenuSeparator"/>
+
+  <xs:attributeGroup name="MenuSeparatorAttributes">
+
+    <xs:attributeGroup ref="MenuItemAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MouseEvent">
+    <xs:annotation>
+      <xs:documentation>This class describes event objects used in mouse events.
+        All mouse events bubble by default. This means that once all the
+        event listeners have been notified the event propagates to the parent
+        BiComponent. To prevent the event to
+        bubble to the parent call
+        stopPropagation() on the event object.
+        The currently supported events by BiComponent
+        are: mousedown mouseup click dblclick contextmenu - this one is a bit tricky since it might also be dispatched when the user presses
+        the context menu key on their keyboard mouseover mouseout mousemove mousewheel
+        When a user double clicks on a component the order of the mouse events is
+        the following: mousedown mouseup click mousedown mouseup click dblclick
+        This object should not be created by the user. It is created as needed by the event system.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MouseEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMouseEvent" substitutionGroup="MouseEvent"/>
+
+  <xs:attributeGroup name="MouseEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MoveHandle">
+    <xs:annotation>
+      <xs:documentation>This component can be used to allow another component to become movable
+        using the mouse. The component can be used as a move handle for the
+        component to move. It can also be used without adding it to another
+        component by manually calling startMove in a mouse down
+        event handler.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MoveHandleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMoveHandle" substitutionGroup="MoveHandle"/>
+
+  <xs:attributeGroup name="MoveHandleAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="continuousLayout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Indicates that the ghost must be used to be a visual indicator for the duration of the move
+          operation.
+          Once complete, the original component's location will be updated accordingly.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ghost" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that should be visually updated if continuousLayout is set to false.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="handleFor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that the handle should be a move handle for.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="moveDirection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The direction the component can be moved. Possible values are: vertical horizontal both.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforemove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires continually during the moving of the component. Call
+          preventDefault
+          on the event object to prevent the new location from being applied.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires continually during the moving of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmoveend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the movement is ended.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmovestart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired before the movement is started. To prevent this
+          from being moved call preventDefault
+          on the event object.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Object">
+    <xs:annotation>
+      <xs:documentation>This is the core class of all Bindows classes. This class provides
+        some useful methods over the standard Javascript Object.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ObjectAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiObject" substitutionGroup="Object"/>
+
+
+  <xs:attributeGroup name="ObjectAttributes">
+
+    <xs:attribute name="id" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - An identifier for the object. Be careful when changing this because
+          it might have undesired side effects.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userData" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Allows custom data to be stored on the object. Although Javascript
+          allows custom fields to be added to any object this property makes
+          this a bit more consistent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="properties" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Allows you to set multiple properties at once. setProperties takes a hash
+          of name/value pairs as its argument and sets the properties using setProperty
+          sample: myObj.setProperties( { property1:'value1', property2:'value2' } )
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ObjectLoader">
+    <xs:annotation>
+      <xs:documentation>This class is used to encapsulate an object created from XML markup in a
+        loader object. The loader can be used to create several objects from the same
+        XML node. Each time the load() method is called a new object is created from
+        the node. The method getComponentById() will be added to the created objects and
+        can be used to obtain child components with. The last created object is stored
+        in the object property of the loader.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ObjectLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiObjectLoader" substitutionGroup="ObjectLoader"/>
+
+  <xs:attributeGroup name="ObjectLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="node" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:XMLElement - This is the XML element describing the object.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference to the object created from this XML element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGrid">
+    <xs:annotation>
+      <xs:documentation>This class is used to display an OLAP Grid
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGrid" substitutionGroup="OlapGrid"/>
+
+  <xs:attributeGroup name="OlapGridAttributes">
+
+    <xs:attributeGroup ref="TreeViewBaseAttributes"/>
+
+    <xs:attribute name="allowHeaderSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiOlapGridSelectionModel - Whether clicking on a dimension header also selects the rows/column of the
+          header.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="canReorganizeDimensions" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true the user can reorganize the dimensions using drag and drop
+          TODO: Document what events are fired when the reorg should happen
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondimensiondrop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when a dimension
+          of the current grid is dropped
+          on another dimension. This can
+          only happen if canReorganizeDimensions
+          is true
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridCellInfo">
+    <xs:annotation>
+      <xs:documentation>This represents information about a cell in the OLAP grid. This information
+        describes if a cell is part of the header and more.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridCellInfoAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridCellInfo" substitutionGroup="OlapGridCellInfo"/>
+
+  <xs:attributeGroup name="OlapGridCellInfoAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="header" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the cell is part of the header</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="body" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the cell is part of the body</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="row" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - What row the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="column" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - What column the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dimension" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The dimension the axis header cell is part of. If the cell is part of the
+          body then this is null.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="axis" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The axis the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="axisPosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The axis position is the start position of the axis header cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="quadrant" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is used to tell what part of the OLAP grid the cell belongs to</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridDataModel">
+    <xs:annotation>
+      <xs:documentation>This defines the interface that is needed for a data model for aBiOlapGrid.
+        This actually implements a dummy data model. Extend this class to create
+        more useful data models. *
+        All methods in this data model can be safely overriden without calling the super
+        class since there are no side effects in any of the methods.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridDataModel" substitutionGroup="OlapGridDataModel"/>
+
+  <xs:attributeGroup name="OlapGridDataModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridDragEvent">
+    <xs:annotation>
+      <xs:documentation>This event is used for events related to some drag and drop inside the OLAP grid.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridDragEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridDragEvent" substitutionGroup="OlapGridDragEvent"/>
+
+  <xs:attributeGroup name="OlapGridDragEventAttributes">
+
+    <xs:attributeGroup ref="DragEventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridDropMarker">
+    <xs:annotation>
+      <xs:documentation>This component is used to draw a drop marker on top/inside an OLAP grid
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridDropMarkerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridDropMarker" substitutionGroup="OlapGridDropMarker"/>
+
+  <xs:attributeGroup name="OlapGridDropMarkerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridResizeOutline">
+    <xs:annotation>
+      <xs:documentation>This component is used as an overlay above the column that is currently being
+        resized
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridResizeOutlineAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridResizeOutline" substitutionGroup="OlapGridResizeOutline"/>
+
+  <xs:attributeGroup name="OlapGridResizeOutlineAttributes">
+
+    <xs:attributeGroup ref="ResizeHandleAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridSelectionModel">
+    <xs:annotation>
+      <xs:documentation>Selection model forBiOlapGrid.
+
+        This selection model contains of selected areas (BiArea). An area consists
+        of a left, top, width and height propertty. Two selected areas may overlap
+        so be careful when trying to get all selected cells.
+
+        The selectedItems collection is aBiAreaCollection
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridSelectionModel" substitutionGroup="OlapGridSelectionModel"/>
+
+  <xs:attributeGroup name="OlapGridSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridStateManager">
+    <xs:annotation>
+      <xs:documentation>A simple class that is used internally with theBiOlapGrid to keep track
+        of active and hover cell
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridStateManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridStateManager" substitutionGroup="OlapGridStateManager"/>
+
+  <xs:attributeGroup name="OlapGridStateManagerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="active" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiOlapGridCellInfo - The active cell info</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onhoverchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the user hovers over a different part
+          of the OLAP grid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondropoverchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user is doing drag and drop
+          and the cell that the user is over changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridViewManager">
+    <xs:annotation>
+      <xs:documentation>This class handles the visual properties of aBiOlapGrid
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridViewManager" substitutionGroup="OlapGridViewManager"/>
+
+  <xs:attributeGroup name="OlapGridViewManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="showGridLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show grid lines between the cells in the OLAP grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the scroll left to the view manager so that the view manager can figure
+          out what column to start at
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the scroll top to the view manager so that the view manager can figure
+          out what row to start at
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="axisOnTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is used to tell which axis is to be shown as the column headers and
+          which to be shown as the row headers. A value of 0 means that the first
+          axis should be shown at the top.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cellMinimumWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum width a cell might have. This is used when the user resizes a
+          colum. Setting this does not update the exisiting columns.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cellMinimumHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum height a cell might have. This is used when the user resizes a
+          row. Setting this does not update the exisiting rows.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapStateEvent">
+    <xs:annotation>
+      <xs:documentation>This class is used when the interactive state of the OLAP grid changes
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapStateEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapStateEvent" substitutionGroup="OlapStateEvent"/>
+
+  <xs:attributeGroup name="OlapStateEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OpacityAnimator">
+    <xs:annotation>
+      <xs:documentation>Animates the opacity ofBiComponents to create various visual effects.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OpacityAnimatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOpacityAnimator" substitutionGroup="OpacityAnimator"/>
+
+  <xs:attributeGroup name="OpacityAnimatorAttributes">
+
+    <xs:attributeGroup ref="ComponentAnimationAttributes"/>
+
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Setups common values (speed, acceleration type and loop mode) for default opacity animations.
+          Possible values are: pulsate, blink, fadeIn, fadeOut
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minOpacity" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Float - Limits how transparent the animated objects are allowed to be.
+          0.0 completely transparent, 1.0 completely opaque
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="speed" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number/String - Sets the duration, in milliseconds, of one animation cycle (some animation types use two
+          cycles).
+          The following string constants are also allowed:
+          slowest, slow, normal, fast, fastest
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OptionPane">
+    <xs:annotation>
+      <xs:documentation>This class is used to layout default dialog controls. Normally this class
+        is not used directly but one of the static methods are used to create
+        new dialogs.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OptionPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOptionPane" substitutionGroup="OptionPane"/>
+
+  <xs:attributeGroup name="OptionPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="initialValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - This is used to define which of the options that
+          should be treated as the default acceptButton.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="acceptButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default accept button. If this is set
+          then the action
+          event is dispatched from the accept button when the enter key
+          is pressed. This does not have to
+          be a BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cancelButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default cancel button. If this is set
+          then the action
+          event is dispatched from the cancel button. This does not have to
+          be a BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Sets the value of the option pane. This is used as the
+          dialogResult
+          when the option pane is used with a dialog.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="inputComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - This allows an input component to be shown below the message
+          component. This is created when creating input dialogs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this option pane. If this is set to null
+          then the static string bundle forBiOptionPane is used
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OrderedIterator">
+    <xs:annotation>
+      <xs:documentation>This is an ordered iterator that allows you to add items ordered by an index.
+        The items are ordered based on the index and finding and removing an item
+        based on its index is done in constant time. Inserting an item is in worst
+        case O(n) (where n is the number of items in the iterator).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OrderedIteratorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOrderedIterator" substitutionGroup="OrderedIterator"/>
+
+  <xs:attributeGroup name="OrderedIteratorAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PasswordField">
+    <xs:annotation>
+      <xs:documentation>A text field where the entered text is masked.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PasswordFieldAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPasswordField" substitutionGroup="PasswordField"/>
+
+  <xs:attributeGroup name="PasswordFieldAttributes">
+
+    <xs:attributeGroup ref="TextFieldAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PercentageStackedBarChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a percentage stacked bar chart for the given series.
+        A percentage stacked bar chart stacks the columns from the different series next to each
+        other and the value of the columns is expressed in percentage so all values
+        from the same category add up to 100%.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PercentageStackedBarChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPercentageStackedBarChart" substitutionGroup="PercentageStackedBarChart"/>
+
+  <xs:attributeGroup name="PercentageStackedBarChartAttributes">
+
+    <xs:attributeGroup ref="PercentageStackedColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PercentageStackedBarChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a percentage stacked bar chart for the given series.
+        A percentage stacked bar chart stacks the columns from the different series next to each
+        other and the value of the columns is expressed in percentage so all values
+        from the same category add up to 100%.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PercentageStackedBarChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPercentageStackedBarChart2" substitutionGroup="PercentageStackedBarChart2"/>
+
+  <xs:attributeGroup name="PercentageStackedBarChart2Attributes">
+
+    <xs:attributeGroup ref="PercentageStackedColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PercentageStackedColumnChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a percentage stacked column chart for the given series.
+        A percentage stacked column chart stacks the columns from the different series on top of each
+        other and the value of the columns is expressed in percentage so all values
+        from the same category add up to 100%.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PercentageStackedColumnChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPercentageStackedColumnChart" substitutionGroup="PercentageStackedColumnChart"/>
+
+  <xs:attributeGroup name="PercentageStackedColumnChartAttributes">
+
+    <xs:attributeGroup ref="ColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PercentageStackedColumnChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a percentage stacked column chart for the given series.
+        A percentage stacked column chart stacks the columns from the different series on top of each
+        other and the value of the columns is expressed in percentage so all values
+        from the same category add up to 100%.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PercentageStackedColumnChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPercentageStackedColumnChart2" substitutionGroup="PercentageStackedColumnChart2"/>
+
+  <xs:attributeGroup name="PercentageStackedColumnChart2Attributes">
+
+    <xs:attributeGroup ref="ColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PieChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a pie chart for the given series
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PieChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPieChart" substitutionGroup="PieChart"/>
+
+  <xs:attributeGroup name="PieChartAttributes">
+
+    <xs:attributeGroup ref="AbstractChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PieChartSection">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the components used to show the rectangles for a
+        pie chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PieChartSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPieChartSection" substitutionGroup="PieChartSection"/>
+
+  <xs:attributeGroup name="PieChartSectionAttributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionAttributes"/>
+
+    <xs:attribute name="radius">
+      <xs:annotation>
+        <xs:documentation>The size of the radius (0-1)
+          where 1 means that it will take up the entire available size
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="explode">
+      <xs:annotation>
+        <xs:documentation>The distance to move the sectio from the
+          center (0-1, percentage of available size).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="startAngle">
+      <xs:annotation>
+        <xs:documentation>The angle given in radians
+          where the pie chart section starts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endAngle">
+      <xs:annotation>
+        <xs:documentation>The angle given in radians
+          where the pie chart section ends.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Point">
+    <xs:annotation>
+      <xs:documentation>Simple class that describes a location of Point on a plane.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PointAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPoint" substitutionGroup="Point"/>
+
+  <xs:attributeGroup name="PointAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Polygon">
+    <xs:annotation>
+      <xs:documentation>This class represents a convex polygon. In a convex polygon,
+        no two sides may intersect more than once (at their endpoints),
+        and no vertex may be the intersection point of more than two
+        sides.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PolygonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPolygon" substitutionGroup="Polygon"/>
+
+  <xs:attributeGroup name="PolygonAttributes">
+
+    <xs:attributeGroup ref="ShapeAttributes"/>
+
+    <xs:attribute name="vertices" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiPoint[] - The vertices of this polygon</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Popup">
+    <xs:annotation>
+      <xs:documentation>A popup is a component that is displayed on top of all other components
+        and is not limited by the parent components view port.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PopupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPopup" substitutionGroup="Popup"/>
+
+  <xs:attributeGroup name="PopupAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="screenLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position relative to the screen. Note that this can be both set and get
+          for popups.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="screenTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position relative to the screen. Note that this can be both set and get
+          for popups.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clientLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position relative to the browser client area. Note that this can be both
+          set and get for popups.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clientTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position relative to the browser client area. Note that this can be both
+          set and get for popups.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opaque" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to make the popup opaque. An opaque popup will not let plugins and
+          other windowed controls show through. However, there is a price to this. This
+          is achieved using an internal iframe and this makes the popup heavier and
+          slower.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoHide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to let the system decide when to hide the popup. Setting this to
+          false gives you better control but it also requires you to
+          handle the closing of the popup.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="allowOffScreen" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to allow the popup to be positioned off screen</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforeshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the popup is shown. This is a good
+          place to change the content of the popup and
+          set the preferred size if the default preferred
+          size is not wanted
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the popup is shown</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onhide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the popup is hidden</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PopupManager">
+    <xs:annotation>
+      <xs:documentation>This singleton class manages the BiPopup
+        objects.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PopupManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPopupManager" substitutionGroup="PopupManager"/>
+
+  <xs:attributeGroup name="PopupManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="useOpaquePopups" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to make popup opaque by default. An opaque popup will not let plugins
+          and other windowed controls show through. However, there is a price to this.
+          This is achieved using an internal iframe and this makes the popup heavier and
+          slower.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="PrintFrame">
+    <xs:annotation>
+      <xs:documentation>BiPrintFrame is a helper class for printing any data from within a Bindows
+        application. It takes a Uri to a template file and a object containing named
+        strings as arguments and parses the template before sending it to the printer.
+
+        A template is typically an HTML document containing customizable tags used as
+        placeholders for data. The parser function being used can be easily extended to
+        handle more complex data, e.g. tables etc.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PrintFrameAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPrintFrame" substitutionGroup="PrintFrame"/>
+
+  <xs:attributeGroup name="PrintFrameAttributes">
+
+    <xs:attributeGroup ref="IframeAttributes"/>
+
+    <xs:attribute name="textParser" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTextParser - The Parser used for generating parsed content.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ProgressBar">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show a progress bar.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ProgressBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiProgressBar" substitutionGroup="ProgressBar"/>
+
+  <xs:attributeGroup name="ProgressBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="maximum">
+      <xs:annotation>
+        <xs:documentation>The maximum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum">
+      <xs:annotation>
+        <xs:documentation>The minimum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value">
+      <xs:annotation>
+        <xs:documentation>The value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This event is fired when the maximum, minimum
+          or maximum properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RadioButton">
+    <xs:annotation>
+      <xs:documentation>Represents a radio button control. A radio button control can have two
+        states; checked and unchecked. These are represented by the
+        checked property.
+        Once a radio button is checked clicking it again will not uncheck it. To
+        uncheck a radio button another radio button in the same
+        radio group must be checked.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RadioButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRadioButton" substitutionGroup="RadioButton"/>
+
+  <xs:attributeGroup name="RadioButtonAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the radio button.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the radio button is checked or not. When this is changed
+          the change event is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiRadioGroup - The group that the radio button should be part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user presses the button (either using
+          the mouse or the keyboard)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RadioButtonMenuItem">
+    <xs:annotation>
+      <xs:documentation>This class is used for a menu item that displays a radio button to the left
+        of the text. To group different radio button menu items into a radio group
+        use theBiRadioGroup class in the same way it would be used for normal
+        radio buttons.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RadioButtonMenuItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRadioButtonMenuItem" substitutionGroup="RadioButtonMenuItem"/>
+
+  <xs:attributeGroup name="RadioButtonMenuItemAttributes">
+
+    <xs:attributeGroup ref="MenuItemAttributes"/>
+
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the item is checked or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiRadioGroup - The group that the radio button menu item should be part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked change</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RadioGroup">
+    <xs:annotation>
+      <xs:documentation>This class is used in conjunction with radio
+        buttons to ensure only one buttons is checked.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RadioGroupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRadioGroup" substitutionGroup="RadioGroup"/>
+
+  <xs:attributeGroup name="RadioGroupAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiRadioButton - This is the radio button that is checked</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="enabled" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the radio group is enabled or not. Setting this also
+          sets the enabled property on the radio buttons.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - This is the user value of the checked radio button in this radio
+          group. Setting this checks the first item that has this value.
+          If no item has this value the setting will have no effect.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="command" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiCommand - When the radio group has a command the enabled and
+          userValue are synchronized with the command.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the selected radio button is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RangeModel">
+    <xs:annotation>
+      <xs:documentation>This class represents a range model that has a minumum, maximum, value and
+        an extent. This class is used by theBiProgressBar,BiScrollBar,BiSlider and
+        BiSpinner classes.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RangeModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRangeModel" substitutionGroup="RangeModel"/>
+
+  <xs:attributeGroup name="RangeModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The value for the range</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The maximum value for the range</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum value for the range</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="extent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The extent for the range</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the maximum,
+          minimum, value or
+          extent properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RepeatButton">
+    <xs:annotation>
+      <xs:documentation>This class is used for buttons that repeatedly fire action events
+        The first action event is fired firstInterval milliseconds
+        after the mouse is pressed down on the button. The following action events
+        are fired every interval millisecond until the mouse button is
+        released.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RepeatButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRepeatButton" substitutionGroup="RepeatButton"/>
+
+  <xs:attributeGroup name="RepeatButtonAttributes">
+
+    <xs:attributeGroup ref="ButtonAttributes"/>
+
+    <xs:attribute name="interval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The time in milliseconds between the repeating action events</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="firstInterval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The time in milliseconds before the first action event is fired</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ResizeHandle">
+    <xs:annotation>
+      <xs:documentation>This component can be used to allow another component to be resizable
+        using the mouse. The component can be used as a resize handle for the
+        component to resize. It can also be used without adding it to another
+        component by manually calling startResize in a mouse down
+        event handler.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResizeHandleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiResizeHandle" substitutionGroup="ResizeHandle"/>
+
+  <xs:attributeGroup name="ResizeHandleAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="continuousLayout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Indicates that the ghost must be used to be a visual indicator for the duration of the resize
+          operation.
+          Once complete, the original component's dimensions will be updated accordingly.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ghost" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that should be visually updated if continuousLayout is set to false.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="handleFor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that the handle should be a resize handle for.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="resizeDirection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The direction that the resizing should be done in. Valid
+          values are:
+          s - south
+          n - north
+          e - east
+          w - west
+          se - south east
+          sw - south west
+          ne - north east
+          nw - north west
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onresize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires continually during the resizing of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeresize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires continually during the resizing of the component. Call
+          preventDefault
+          on the event object to prevent the new size from being applied.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onresizestart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires once when the resizing begins. Call
+          preventDefault
+          on the event object to prevent the component from being resized.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onresizeend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when resizing of the component ends.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ResourceLoader">
+    <xs:annotation>
+      <xs:documentation>This class is used to load different kinds of resources. There are basically
+        3 types of resources that this class can handle. The first 2 are script files
+        and a code string. The third one is a genereal object described by an XML
+        element and in this case an object is created using aBiXmlResourceParser.
+        When creating general objects a few special rules apply. If the created object
+        is an event target the resource loader will listen to load
+        and error events so that it can be notified by the object that
+        it is loaded. If the object has a load() method that will be
+        called if the object is not already loaded. To decide if the object is loaded
+        the resource loader will use getLoaded() if available and if that
+        isn't available it is assumed that the object is loaded (or does not require
+        loading).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResourceLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiResourceLoader" substitutionGroup="ResourceLoader"/>
+
+  <xs:attributeGroup name="ResourceLoaderAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference to the object created from this XML element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onprogress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires every time one of the external resources have
+          been loaded. This is useful for providing visual feedback.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when all the resources have been loaded and executed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Resources">
+    <xs:annotation>
+      <xs:documentation>This class is used to load multiple resources
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResourcesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiResources" substitutionGroup="Resources"/>
+
+  <xs:attributeGroup name="ResourcesAttributes">
+
+    <xs:attributeGroup ref="SerializedLoaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RichEdit">
+    <xs:annotation>
+      <xs:documentation>
+        This control is used to to provide rich text editing of HTML documents
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RichEditAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRichEdit" substitutionGroup="RichEdit"/>
+
+  <xs:attributeGroup name="RichEditAttributes">
+
+    <xs:attributeGroup ref="IframeAttributes"/>
+
+    <xs:attribute name="contentHtml">
+      <xs:annotation>
+        <xs:documentation>
+          The HTML code inside the rich editor frame. This does not include
+          the doctype nor any comments outside the root element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Script">
+    <xs:annotation>
+      <xs:documentation>This class works much like the script element in HTML. You can set the uri
+        and it will fetch an external file that will be executed or you can use the
+        text property to execute some text.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ScriptAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiScript" substitutionGroup="Script"/>
+
+  <xs:attributeGroup name="ScriptAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The script text to evaluate</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The location of the script file</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="src" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - Alias to uri for backwards compatibility</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ScriptLoader">
+    <xs:annotation>
+      <xs:documentation>This class loads and executes a javascript file
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ScriptLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiScriptLoader" substitutionGroup="ScriptLoader"/>
+
+  <xs:attributeGroup name="ScriptLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI (location) of the file to load. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ScriptLoaderQueue">
+    <xs:annotation>
+      <xs:documentation>Used to load multiple js files and once all are loaded they are executed
+        in the order they were added.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ScriptLoaderQueueAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiScriptLoaderQueue" substitutionGroup="ScriptLoaderQueue"/>
+
+  <xs:attributeGroup name="ScriptLoaderQueueAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="async" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this is set to false then the loading will lock the UI thread
+          but the loading and execution will happen and finish when
+          load is called.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when all the scripts have been loaded and executed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onprogress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires every time one of the external scripts have
+          been loaded. This is useful for providing visual feedback.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ScrollBar">
+    <xs:annotation>
+      <xs:documentation>This component is used to show a scroll bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ScrollBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiScrollBar" substitutionGroup="ScrollBar"/>
+
+  <xs:attributeGroup name="ScrollBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="extent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The extent for the scroll bar.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The maximum value for the scroll bar.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum value for the scroll bar.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The value for the scroll bar.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minThumbSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The mimimum size of the thumb.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="unitIncrement" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount to change the scroll bar when pressing the buttons.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="blockIncrement" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount to change the scroll bar when the mouse is pressed on the scroll
+          bar (and not on the thumb or buttons).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="orientation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The orientation of the scroll bar. Valid values are: horizontal vertical</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the extent,
+          value, minimum or
+          maximum properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onscrollend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the thumb is released
+          after scrolling.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SelectionItemCollection">
+    <xs:annotation>
+      <xs:documentation>This class is used internally insideBiSelectionModel to keep track of the
+        selected items. If you create a custom selection model you might need to also
+        create a custom selection model item collection. The type of the items is not
+        very important but the selection model needs to be able to work with this
+        type. You also need to override getItemHashCode if the items
+        are not instances ofBiObject.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SelectionItemCollectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSelectionItemCollection" substitutionGroup="SelectionItemCollection"/>
+
+  <xs:attributeGroup name="SelectionItemCollectionAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SelectionModel">
+    <xs:annotation>
+      <xs:documentation>This class provides a basic selection model
+        This treats children as
+        selectable items inside a component. The items can
+        be of any type but if they are not BiComponents you
+        will have to override the following methods and properties: first,
+        last, items, getNext, getPrevious,
+        scrollItemIntoView,
+        getItemLeft, getItemTop, getItemWidth
+        and getItemHeight.
+        To update the visuals (to show what is selected) override the following
+        methods: updateItemSelectionState, updateItemAnchorState
+        and updateItemLeadState.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSelectionModel" substitutionGroup="SelectionModel"/>
+
+  <xs:attributeGroup name="SelectionModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="owner" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - This is the owner component that is
+          containing the selectable objects. This should not be set after the
+          selection model has been used
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="multipleSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the selection model supports multiple selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="canDeselect" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can deselect items. If this is false you need to select something
+          else to deselect an item
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dragSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Drag selection is used to hold down the mouse to select mutliple items</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="anchorItem" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent/Object - This item is used when doing multiple selection with the shift key</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leadItem" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent/Object - This item is used when doing multiple selection. This is the last item selected.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedItems" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent[]/Object[] - Returns an array containing the selected items</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected items are changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onleaditemchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the lead item is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SerializedLoader">
+    <xs:annotation>
+      <xs:documentation>Used to start multiple loaders in the order they were added.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SerializedLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSerializedLoader" substitutionGroup="SerializedLoader"/>
+
+  <xs:attributeGroup name="SerializedLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when all the loaders have finished loading,
+          or if an error occurs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onprogress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires every time one of the loaders has finished.
+          This is useful for providing visual feedback.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Set">
+    <xs:annotation>
+      <xs:documentation>A simple class for storing a set of objects
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SetAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSet" substitutionGroup="Set"/>
+
+  <xs:attributeGroup name="SetAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Shape">
+    <xs:annotation>
+      <xs:documentation>This class is an abstract base class for describing
+        the shapes of Image areas. This is a very general
+        class and can be extended to mean a variety of things.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ShapeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiShape" substitutionGroup="Shape"/>
+
+  <xs:attributeGroup name="ShapeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SingleTree">
+    <xs:annotation>
+      <xs:documentation>A Simple one column Tree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SingleTreeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSingleTree" substitutionGroup="SingleTree"/>
+
+  <xs:attributeGroup name="SingleTreeAttributes">
+
+    <xs:attributeGroup ref="TreeViewAttributes"/>
+
+    <xs:attribute name="indentWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount to indent child nodes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showExpandIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the expand and collapse icons</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortFunction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:function - The sort function to use. The function is passed the two
+          nodes to compare as arguments, to compare the value (text)
+          of the node use getData() on the node. Defaults to case
+          sensitive string compare.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="SingleTreeDataModel">
+    <xs:annotation>
+      <xs:documentation>Data model forBiSingleTree
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SingleTreeDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSingleTreeDataModel" substitutionGroup="SingleTreeDataModel"/>
+
+  <xs:attributeGroup name="SingleTreeDataModelAttributes">
+
+    <xs:attributeGroup ref="TreeDataModelAttributes"/>
+
+    <xs:attribute name="treeView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTree2 - The tree view the data model is acting on</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="SingleTreeNode">
+    <xs:annotation>
+      <xs:documentation>This class is used as the data for rows in theBiTree2 component
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SingleTreeNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSingleTreeNode" substitutionGroup="SingleTreeNode"/>
+
+  <xs:attributeGroup name="SingleTreeNodeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Uri of image icon. Used for collapsed/leaf nodes and expanded nodes
+          without expandedIcon set.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="expandedIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Icon to show for an expanded node</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Data to display for the node</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="expanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is expanded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is selected</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="lead" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is the lead item</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="SingleTreeViewManager">
+    <xs:annotation>
+      <xs:documentation>This class handles the visual properties of aBiSingleTree
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SingleTreeViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSingleTreeViewManager" substitutionGroup="SingleTreeViewManager"/>
+
+  <xs:attributeGroup name="SingleTreeViewManagerAttributes">
+
+    <xs:attributeGroup ref="TreeViewViewManagerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SizeAnimator">
+    <xs:annotation>
+      <xs:documentation>This class is used to animate the size ofBiComponent(s) and can be used to create visual effects.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SizeAnimatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSizeAnimator" substitutionGroup="SizeAnimator"/>
+
+  <xs:attributeGroup name="SizeAnimatorAttributes">
+
+    <xs:attributeGroup ref="ComponentAnimationAttributes"/>
+
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets speed and acceleration type to useful values.
+          Can be one of the following string values: normal, smooth
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Starting width of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Starting height of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Destination width of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Destination height of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets starting size for both width and height.
+          Note: The component will be square shaped.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets target size for both width and height.
+          Note: The component will be square shaped.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the acceleration type. Use constants fromBiComponentAnimation.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="speed" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number/String - Sets the duration of the animation.
+          Can be set in three different ways:
+          1.BiSizeAnimator.SPEEDx constants can be used.
+          2. One of the following strings: slowest, slow, normal, fast, fastest.
+          3. A number representing the length of the animation, measured in milliseconds.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - By setting the from-component you specify anotherBiComponent whos size will be used
+          for the animation's start state. If the from-component's size is changed, the animation
+          will update dynamically.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - By setting the to-component you specify anotherBiComponent whos size will be used
+          for the animation's target state. If the to-component's size is changed, the animation
+          will update dynamically.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Slider">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show a slider control.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SliderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSlider" substitutionGroup="Slider"/>
+
+  <xs:attributeGroup name="SliderAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="orientation">
+      <xs:annotation>
+        <xs:documentation>
+          The orientation of the slider. Valid values are: horizontal vertical
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="unitIncrement">
+      <xs:annotation>
+        <xs:documentation>
+          The amount to increase the slider when using the arrow keys and
+          the mouse wheel.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="blockIncrement">
+      <xs:annotation>
+        <xs:documentation>
+          The amount to increase the slider when using the page up and page
+          down keys as well as the amount to change the slider when the
+          mouse is pressed on the slider (and not on the handle).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum">
+      <xs:annotation>
+        <xs:documentation>The maximum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum">
+      <xs:annotation>
+        <xs:documentation>The minimum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value">
+      <xs:annotation>
+        <xs:documentation>The value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This event is fired when the maximum, minimum
+          or maximum properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Sort">
+    <xs:annotation>
+      <xs:documentation>Collection of static functions used for sorting and comparing
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SortAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSort" substitutionGroup="Sort"/>
+
+  <xs:attributeGroup name="SortAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Spinner">
+    <xs:annotation>
+      <xs:documentation>A spinner is a text box that accepts a number. A spinner also has buttons
+        for increasing and decreasing the value.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SpinnerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSpinner" substitutionGroup="Spinner"/>
+
+  <xs:attributeGroup name="SpinnerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The value for the spinner</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The maximum value for the spinner</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum value for the spinner</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="font" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiFont - This is used to describe how to paint the text in the spinner.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text alignment. Valid values are: left right center</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the maximum,
+          minimum or maximum
+          properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the enter key is pressed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oninvalidvalue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the value is change
+          becuase the value entered by the user was
+          not valid.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oninvalidcharacter" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired if an invalid character
+          is typed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SplitPane">
+    <xs:annotation>
+      <xs:documentation>A split pane is used to show two components with a splitter betwee them.
+        The splitter between the components can be dragged and in that way the
+        components are resized. If right to left the left and right component switch
+        palces.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SplitPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSplitPane" substitutionGroup="SplitPane"/>
+
+  <xs:attributeGroup name="SplitPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="orientation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The orientation of the split pane. Valid values are horizontal
+          and vertical. If horizontal is used the components are placed to
+          the left and to the right of the splitter respectively. When vertical the
+          components are placed above and below. When using horizontal and right to
+          left the position of the left and right components are switched.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dividerLocation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The location of the splitter from the left if horizontal orientation
+          and from the top if vertical orientation. If right to left is used this is
+          from the right instead of from the left.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dividerSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the divider (height if vertical orientation)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leftComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component to the left (or top if vertical orientation) of the
+          splitter. This property is the same as topComponent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component to the right (or bottom if vertical orientation) of the
+          splitter. This property is the same as bottomComponent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component above (or to the left if horizontal orientation) of the
+          splitter. This property is the same as leftComponent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component below (or to the right if hoizontal orientation)
+          the splitter. This property is the same as rightComponent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leftVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the left component. If this is false
+          the right component will take up the entire space of the split pane
+          and the splitter will be hidden.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Sets whether to show the top component. If this is false
+          the bottom component will take up the entire space of the split pane
+          and the splitter will be hidden. This property is the same as
+          leftVisible.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the right component. If this is false
+          the left component will take up the entire space of the split pane
+          and the splitter will be hidden.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Sets whether to show the bottom component. If this is false
+          the top component will take up the entire space of the split pane
+          and the splitter will be hidden. This property is the same as
+          rightVisible.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondividerlocationchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when then
+          dividerLocation is
+          changed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StackedBarChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a stacked bar chart for the given series. A stacked
+        bar chart stacks the bars from the different series next to each
+        other.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StackedBarChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStackedBarChart" substitutionGroup="StackedBarChart"/>
+
+  <xs:attributeGroup name="StackedBarChartAttributes">
+
+    <xs:attributeGroup ref="StackedColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StackedBarChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a stacked bar chart for the given series. A stacked
+        bar chart stacks the bars from the different series next to each
+        other.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StackedBarChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStackedBarChart2" substitutionGroup="StackedBarChart2"/>
+
+  <xs:attributeGroup name="StackedBarChart2Attributes">
+
+    <xs:attributeGroup ref="StackedColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StackedColumnChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a stacked column chart for the given series. A stacked
+        column chart stacks teh columns from the different series on top of each
+        other.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StackedColumnChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStackedColumnChart" substitutionGroup="StackedColumnChart"/>
+
+  <xs:attributeGroup name="StackedColumnChartAttributes">
+
+    <xs:attributeGroup ref="ColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StackedColumnChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a stacked column chart for the given series. A stacked
+        column chart stacks teh columns from the different series on top of each
+        other.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StackedColumnChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStackedColumnChart2" substitutionGroup="StackedColumnChart2"/>
+
+  <xs:attributeGroup name="StackedColumnChart2Attributes">
+
+    <xs:attributeGroup ref="ColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StatusBar">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used for displaying status bars in Bindows
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StatusBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStatusBar" substitutionGroup="StatusBar"/>
+
+  <xs:attributeGroup name="StatusBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StatusBarPanel">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to display sections in a
+        status bar.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StatusBarPanelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStatusBarPanel" substitutionGroup="StatusBarPanel"/>
+
+  <xs:attributeGroup name="StatusBarPanelAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StringBuffer">
+    <xs:annotation>
+      <xs:documentation>Creates a StringBuffer object which handles string concatenation faster
+        than the String class.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StringBufferAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStringBuffer" substitutionGroup="StringBuffer"/>
+
+  <xs:attributeGroup name="StringBufferAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StringBundle">
+    <xs:annotation>
+      <xs:documentation>This class is used to make creating multilingual applications easier.
+        The string bundle is uses one hash table (objects in JavaScript) for
+        every language and falls back on English ("en") in case the
+        user language is not available.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StringBundleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStringBundle" substitutionGroup="StringBundle"/>
+
+  <xs:attributeGroup name="StringBundleAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="language" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The current language</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the current strings
+          changes in some way. This happens when the
+          language is changed or a new bundle is added
+          with the current language.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Style">
+    <xs:annotation>
+      <xs:documentation>This class works much like the script element in HTML. You can set the uri
+        and it will fetch an external file that will be executed or you can use the
+        text property to execute some text.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StyleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStyle" substitutionGroup="Style"/>
+
+  <xs:attributeGroup name="StyleAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The script text to evaluate</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The location of the script file</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="src" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - Alias to uri for backwards compatibility</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Subtree">
+    <xs:annotation>
+      <xs:documentation>Internal class for handling subtrees
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SubtreeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSubtree" substitutionGroup="Subtree"/>
+
+  <xs:attributeGroup name="SubtreeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TabBar">
+    <xs:annotation>
+      <xs:documentation>This component is used as a container for tab
+        buttons. When using tab panes this
+        control is used internally.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TabBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTabBar" substitutionGroup="TabBar"/>
+
+  <xs:attributeGroup name="TabBarAttributes">
+
+    <xs:attributeGroup ref="ToolBarAttributes"/>
+
+    <xs:attribute name="alignment" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes how to draw the tab bar. Supported values are top and
+          bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTabButton - The currently selected tab button.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the selected tab button.
+          If no button is selected this returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected tab
+          button changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TabButton">
+    <xs:annotation>
+      <xs:documentation>This class is used to display tabs for aBiTabPane or aBiTabBar
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TabButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTabButton" substitutionGroup="TabButton"/>
+
+  <xs:attributeGroup name="TabButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarRadioButtonAttributes"/>
+
+    <xs:attribute name="alignment" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes whether the tab button should be drawn so that it looks like
+          it would be at the top of a tab pane or at the bottom of a tab pane.
+          Supported values are top and bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TabPage">
+    <xs:annotation>
+      <xs:documentation>This class represents the pages inside a tab
+        pane. A tab page has a BiTabButton
+        that is used to display a button for the page when used with a tab pane.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TabPageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTabPage" substitutionGroup="TabPage"/>
+
+  <xs:attributeGroup name="TabPageAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="alignment" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes whether the tab page should be drawn so that it appears like the
+          tabes are placed at the top of a tab pane or at the bottom of a tab pane.
+          Supported values are top and bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="tabButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTabButton - The tab button used with the tab page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the page is selected</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text to show on the tab button</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon to show on the tab button</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected value changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TabPane">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating tab controls. A tab control contains
+        one or more tab pages. Each tab page also
+        has a tab button that is shown above the
+        page and when the button is clicked the page is shown.
+        Bindows supports showing the tabs at the bottom or the top. Use the
+        alignmnet property to change this.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TabPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTabPane" substitutionGroup="TabPane"/>
+
+  <xs:attributeGroup name="TabPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="alignment" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes whether the tabs should be placed at the top of a tab pane or
+          at the bottom of a tab pane.
+          Supported values are top and bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTabPage - The currently selected tab page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the selected tab page.
+          If no page is selected this returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected tab page changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TextArea">
+    <xs:annotation>
+      <xs:documentation>A multiline text input field
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TextAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTextArea" substitutionGroup="TextArea"/>
+
+  <xs:attributeGroup name="TextAreaAttributes">
+
+    <xs:attributeGroup ref="TextFieldAttributes"/>
+
+    <xs:attribute name="wrap" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the text should wrap automatically as the user types.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TextField">
+    <xs:annotation>
+      <xs:documentation>This class is used to display a single line plain text input
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TextFieldAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTextField" substitutionGroup="TextField"/>
+
+  <xs:attributeGroup name="TextFieldAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text on the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="font" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiFont - This is used to describe how to paint the text in the text field.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text alignment. Valid values are: left right center</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maxLength" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The maximum number of characters that the user can enter into the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="readOnly" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can enter text in the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="validator" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - This property is a function that is used to validate the text of
+          the text field. The function should take a string and return
+          true if the text is valid.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="invalidMessage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This property can be used to give information about why the value
+          might be invalid.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionStart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The starting point of the selection in the text field. If not selected this
+          returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionLength" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The length (number of chracters) of the currently selected text in the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionText" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The currently selected text in the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="allowTab" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether pressing the tab key should insert a tab character or move the focus from
+          the text field
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The left padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingRight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The right padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The top padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingBottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The bottom padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the enter key is pressed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ontextchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the text has changed.
+          This happens when the user in some way changes
+          the text inside the text field. This event
+          is fired continiously as the user types.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the text field is blurred
+          and the text has changed since the text field got
+          focus.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TextLoader">
+    <xs:annotation>
+      <xs:documentation>This class is used to load a plain text document from the server or the
+        file system (if the application is run locally).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TextLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTextLoader" substitutionGroup="TextLoader"/>
+
+  <xs:attributeGroup name="TextLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="method" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The HTTP method to use for the request</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI (location) of the file to load. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The user name to use when authentication is needed to load the file</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="password" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The password to use when authentication is needed to load the file</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TextParser">
+    <xs:annotation>
+      <xs:documentation>BiTextParser is a helper class for parsing text within a Bindows
+        application.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TextParserAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTextParser" substitutionGroup="TextParser"/>
+
+  <xs:attributeGroup name="TextParserAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="replacePattern" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The pattern to match and replace.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="replaceFlags" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - RegExp flags</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="printStringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The Object containing the strings for replacing</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="parseFunction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - The function being used while parsing.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Theme">
+    <xs:annotation>
+      <xs:documentation>This class represents a theme which consists of a css file
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ThemeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTheme" substitutionGroup="Theme"/>
+
+  <xs:attributeGroup name="ThemeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="default" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the theme is the default theme</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="menuCss" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the string needed for the IE menus to work correctly</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ThemeManager">
+    <xs:annotation>
+      <xs:documentation>This singleton class is used for theme support in Bindows
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ThemeManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiThemeManager" substitutionGroup="ThemeManager"/>
+
+  <xs:attributeGroup name="ThemeManagerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="defaultTheme" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTheme - The theme that is currently being used</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onthemechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the default
+          theme changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TimePicker">
+    <xs:annotation>
+      <xs:documentation>This component provides a spinner like component
+        that is used to enter a time. The control consists of different text fields
+        for the different parts of the time string. The string format is decided
+        using aBiDateFormat object.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TimePickerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTimePicker" substitutionGroup="TimePicker"/>
+
+  <xs:attributeGroup name="TimePickerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The minimum selectable date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The maximum selectable date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="date" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - This is a date object that describes the currently entered time</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dateFormat" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDateFormat - This is theBiDateFormat that describes how to format the text inside
+          the time date picker.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the time is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfieldchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the active field of the
+          component changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oninvalidcharacter" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired if an invalid character
+          is typed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Timer">
+    <xs:annotation>
+      <xs:documentation>This class can be used to schedule events to occur later in time.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TimerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTimer" substitutionGroup="Timer"/>
+
+  <xs:attributeGroup name="TimerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="enabled" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this is false no tick events are fired.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="interval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of milliseconds between the firing of the tick
+          events. Changing this also stops the timer.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ontick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires every interval milliseconds for
+          an enabled and started timer.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TimerManager">
+    <xs:annotation>
+      <xs:documentation>This is a singleton class that handles the disposal of all
+        timers.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TimerManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTimerManager" substitutionGroup="TimerManager"/>
+
+  <xs:attributeGroup name="TimerManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBar">
+    <xs:annotation>
+      <xs:documentation>This class is used to create a tool bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBar" substitutionGroup="ToolBar"/>
+
+  <xs:attributeGroup name="ToolBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarButton">
+    <xs:annotation>
+      <xs:documentation>This is used to create buttons that are placed on a tool bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarButton" substitutionGroup="ToolBarButton"/>
+
+  <xs:attributeGroup name="ToolBarButtonAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the button is clicked</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarMenuButton">
+    <xs:annotation>
+      <xs:documentation>This class creates a tool bar button that shows a menu
+        when the button is pressed.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarMenuButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarMenuButton" substitutionGroup="ToolBarMenuButton"/>
+
+  <xs:attributeGroup name="ToolBarMenuButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarButtonAttributes"/>
+
+    <xs:attribute name="menu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - The menu to show when the button is pressed.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarRadioButton">
+    <xs:annotation>
+      <xs:documentation>This represents a radio button that can be placed on a tool bar.
+        To group different tool bar radio buttons into a radio group
+        use the BiRadioGroup class in the same
+        way it would be used for normal radio buttons.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarRadioButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarRadioButton" substitutionGroup="ToolBarRadioButton"/>
+
+  <xs:attributeGroup name="ToolBarRadioButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarToggleButtonAttributes"/>
+
+    <xs:attribute name="group" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiRadioGroup - The group that the radio button should be part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarSeparator">
+    <xs:annotation>
+      <xs:documentation>This class is used to display a separator on a tool bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarSeparatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarSeparator" substitutionGroup="ToolBarSeparator"/>
+
+  <xs:attributeGroup name="ToolBarSeparatorAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarSplitMenuButton">
+    <xs:annotation>
+      <xs:documentation>This compound widget consists of a toggle-button and a drop down menu.
+        The toggle-button can be plain text or have an icon or both.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarSplitMenuButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarSplitMenuButton" substitutionGroup="ToolBarSplitMenuButton"/>
+
+  <xs:attributeGroup name="ToolBarSplitMenuButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarButtonAttributes"/>
+
+    <xs:attribute name="menu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - Sets the menu on the control</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:: String The text to use on the button - Sets the label text on the button of the control.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarSplitToggleMenuButton">
+    <xs:annotation>
+      <xs:documentation>This compound widget consists of a button and a drop down menu.
+        The Button can be plain text or have an icon or both.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarSplitToggleMenuButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarSplitToggleMenuButton" substitutionGroup="ToolBarSplitToggleMenuButton"/>
+
+  <xs:attributeGroup name="ToolBarSplitToggleMenuButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarToggleButtonAttributes"/>
+
+    <xs:attribute name="menu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - Sets the menu on the control</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the label text on the button of the control.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarToggleButton">
+    <xs:annotation>
+      <xs:documentation>This represents a toggle button (check box button) that can be placed on a tool bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarToggleButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarToggleButton" substitutionGroup="ToolBarToggleButton"/>
+
+  <xs:attributeGroup name="ToolBarToggleButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarButtonAttributes"/>
+
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the button is checked or not. When this is changed
+          the change event is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the button.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolTip">
+    <xs:annotation>
+      <xs:documentation>This class is used for showing generic tool tip controls. A tool tip
+        can contain other controls.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolTipAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolTip" substitutionGroup="ToolTip"/>
+
+  <xs:attributeGroup name="ToolTipAttributes">
+
+    <xs:attributeGroup ref="PopupAttributes"/>
+
+    <xs:attribute name="hideOnHover" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this is true then the tool tip is hidden if the mouse pointer enters the
+          tool tip.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mousePointerOffsetX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the tool tip relative to the mouse pointer</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mousePointerOffsetY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the tool tip relative to the mouse pointer</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hideInterval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of milliseconds before hiding the tool tip</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showInterval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of milliseconds before showing the tool tip</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolTipManager">
+    <xs:annotation>
+      <xs:documentation>A singleton class used by the system to manage tool
+        tips.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolTipManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolTipManager" substitutionGroup="ToolTipManager"/>
+
+  <xs:attributeGroup name="ToolTipManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="currentToolTip" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiToolTip - The currently shown (or about to show) tool tip</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree">
+    <xs:annotation>
+      <xs:documentation>This class is used for showing a tree, a column list and a combined
+        tree with multiple columns. The control also provides headers that can
+        be used to resize the columns, reorder the columns or sort the data by
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree" substitutionGroup="Tree"/>
+
+  <xs:attributeGroup name="TreeAttributes">
+
+    <xs:attributeGroup ref="AbstractGridAttributes"/>
+
+    <xs:attribute name="indentWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount to indent child nodes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showPlusMinus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the expand and collapse icons</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRootLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show lines on the top most level</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="indentColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The column to indent by.
+          Setting this to -1 (or a value greater than the column count) removes
+          the indentation.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the lines in the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="expanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is expanded or not. The tree control is always
+          expanded so setting this to false has no effect.
+          This is provided so that the tree has the same interface as the
+          tree nodes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected row/cell changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onexpandedchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the tree is expanded or
+          collapsed and the lead item is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2">
+    <xs:annotation>
+      <xs:documentation>This component is a special case ofBiTreeView which has an interface which
+        is similar toBiTree
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2" substitutionGroup="Tree2"/>
+
+  <xs:attributeGroup name="Tree2Attributes">
+
+    <xs:attributeGroup ref="TreeViewAttributes"/>
+
+    <xs:attribute name="columnCount" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of columns in the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnNames" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The text to show on the headers of the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The widths of the columns of the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The order of the columns. This an array containing the indexes of the
+          columns.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the headers for the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRowHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the row headers for the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showGridLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show grid lines between the cells in the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2Cell">
+    <xs:annotation>
+      <xs:documentation>This is used for the cells in aBiTree2Row row
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2CellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2Cell" substitutionGroup="Tree2Cell"/>
+
+  <xs:attributeGroup name="Tree2CellAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The data that is associated with the cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2DataModel">
+    <xs:annotation>
+      <xs:documentation>This data model is to be used withBiTree2. It uses theBiTree2Row and
+        BiTree2Cell to provide the data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2DataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2DataModel" substitutionGroup="Tree2DataModel"/>
+
+  <xs:attributeGroup name="Tree2DataModelAttributes">
+
+    <xs:attributeGroup ref="TreeDataModelAttributes"/>
+
+    <xs:attribute name="treeView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTree2 - The tree view the data model is acting on</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2Row">
+    <xs:annotation>
+      <xs:documentation>This class is used as the data for rows in theBiTree2 component
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2RowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2Row" substitutionGroup="Tree2Row"/>
+
+  <xs:attributeGroup name="Tree2RowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="expanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the row is expanded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2ViewManager">
+    <xs:annotation>
+      <xs:documentation>This class is a special view manager to be used withBiTree2
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2ViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2ViewManager" substitutionGroup="Tree2ViewManager"/>
+
+  <xs:attributeGroup name="Tree2ViewManagerAttributes">
+
+    <xs:attributeGroup ref="TreeViewViewManagerAttributes"/>
+
+    <xs:attribute name="indentColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The column to indent</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeDataModel">
+    <xs:annotation>
+      <xs:documentation>This data model takes a a tree consisting ofBiTreeNode2 nodes and exposes
+        the interface needed by theBiTreeView. The internal tree does not have to
+        be aBiTreeNode2 as long as getNodeChildren, getNodeHashCode, getCellText and
+        getSortFunction (if sorting is needed) are overridden.
+        The default implementation assumes that the data in theBiTreeNode2 objects
+        are arrays containing the cell data.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeDataModel" substitutionGroup="TreeDataModel"/>
+
+  <xs:attributeGroup name="TreeDataModelAttributes">
+
+    <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+
+    <xs:attribute name="rootNode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeNode2 - The tree node that is the root of the data</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondatachanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the
+          data changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onexpand" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a row has expanded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncollapse" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a row has collapsed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeexpand" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired before a row is expanded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforecollapse" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired before a row is collapsed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onrowcountchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the row count changes.
+          The rowIndex and the rowCount properties on the
+          event object are available for this event
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeHelper">
+    <xs:annotation>
+      <xs:documentation>This class contains some static methods that are usufull when working
+        with trees.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeHelperAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeHelper" substitutionGroup="TreeHelper"/>
+
+  <xs:attributeGroup name="TreeHelperAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeIterator">
+    <xs:annotation>
+      <xs:documentation>This class is used for iterating over rows and subtrees in a tree
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeIteratorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeIterator" substitutionGroup="TreeIterator"/>
+
+  <xs:attributeGroup name="TreeIteratorAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="rowIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The row index that the iterator is currently at</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeIteratorStackItem">
+    <xs:annotation>
+      <xs:documentation>This class is used internally byBiTreeIterator to keep track of the path stack
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeIteratorStackItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeIteratorStackItem" substitutionGroup="TreeIteratorStackItem"/>
+
+  <xs:attributeGroup name="TreeIteratorStackItemAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeNode">
+    <xs:annotation>
+      <xs:documentation>This represents a tree node for a tree or a
+        row for a tree. A tree node is not a component
+        but it has some visual properties that are similar to a
+        component.
+        When working with trees and column list it is usually suitable to extend
+        this class instead of using it directly because this gives better control
+        over what data is bound to the node and what text to show on the row.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeNode" substitutionGroup="TreeNode"/>
+
+  <xs:attributeGroup name="TreeNodeAttributes">
+
+    <xs:attributeGroup ref="AbstractGridRowAttributes"/>
+
+    <xs:attribute name="expanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is expanded or not.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeNode2">
+    <xs:annotation>
+      <xs:documentation>This class is used to build up the tree for the tree model to use
+        with theBiTreeView andBiTreeDataModel
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeNode2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeNode2" substitutionGroup="TreeNode2"/>
+
+  <xs:attributeGroup name="TreeNode2Attributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object[] - The data that is associated to the node</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeSelectionModel">
+    <xs:annotation>
+      <xs:documentation>This class is used to handle the selection of the
+        nodes in a tree.
+        It extends the BiListSelectionModel
+        to be able to handle threaded data.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeSelectionModel" substitutionGroup="TreeSelectionModel"/>
+
+  <xs:attributeGroup name="TreeSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeView">
+    <xs:annotation>
+      <xs:documentation>This class is the base forBiGrid2 andBiTree2. It can be used directly
+        with a data model.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeView" substitutionGroup="TreeView"/>
+
+  <xs:attributeGroup name="TreeViewAttributes">
+
+    <xs:attributeGroup ref="TreeViewBaseAttributes"/>
+
+    <xs:attribute name="showBrokenCellTextAsToolTip" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:boolean - If this is property is set to true, tooltip will show whenever a broken cell is hovered. Default
+          value is false.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewBase">
+    <xs:annotation>
+      <xs:documentation>This is the abstract base class forBiTreeView andBiOlapGrid. It contains
+        the shared methods and implementations of these 2 classes
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewBase" substitutionGroup="TreeViewBase"/>
+
+  <xs:attributeGroup name="TreeViewBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="useNativeScrollBars" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to use native or custom scroll bars. Custom scroll bars are needed/preferred
+          when the tree view/grid has an attached component model or inline edit model.
+          If you want to change this it is better to change it before the component has
+          been created.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeViewSelectionModel/BiOlapGridSelectionModel - The selection model handling the selected rows and cells
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="viewManager" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeViewViewManager/BiOlapGridViewManager - The view manager handles visual aspects that are not directly
+          related to
+          the data model
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeViewDataModel/BiOlapGridDataModel - The data model describes the data to be shown in the tree view and
+          OLAP grid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="inlineEditModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiInlineEditModel - The inline edit model is used to handle editing of cells in the tree view.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="attachedComponentModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiAttachedComponentModel - The attached component model is used to handle Bindows components inside the
+          cells of the tree view.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewCellInfo">
+    <xs:annotation>
+      <xs:documentation>This represents information about a cell in the tree view.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewCellInfoAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewCellInfo" substitutionGroup="TreeViewCellInfo"/>
+
+  <xs:attributeGroup name="TreeViewCellInfoAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="row" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - What row the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="column" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - What column the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewDataModel">
+    <xs:annotation>
+      <xs:documentation>This defines the interface that is needed for a data model for aBiTreeView.
+        This actually implements a dummy data model. Extend this class to create
+        more useful data models
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewDataModel" substitutionGroup="TreeViewDataModel"/>
+
+  <xs:attributeGroup name="TreeViewDataModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="allExpanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Sets all available rows expanded.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondatachanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the data
+          has changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewDataModelEvent">
+    <xs:annotation>
+      <xs:documentation>This event class is used withBiTreeViewDataModel instances so that tree view can be updated to reflect the changes
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewDataModelEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewDataModelEvent" substitutionGroup="TreeViewDataModelEvent"/>
+
+  <xs:attributeGroup name="TreeViewDataModelEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+    <xs:attribute name="preventUpdate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Prevent update flag.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewDragHeader">
+    <xs:annotation>
+      <xs:documentation>This component is used to show a header being dragged when the user is
+        reorganizing the headers for aBiTreeView
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewDragHeaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewDragHeader" substitutionGroup="TreeViewDragHeader"/>
+
+  <xs:attributeGroup name="TreeViewDragHeaderAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewDragHeaderMarker">
+    <xs:annotation>
+      <xs:documentation>This class is used withBiTreeView when the columns are being reorder to
+        give feedback where the column will be dropped
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewDragHeaderMarkerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewDragHeaderMarker" substitutionGroup="TreeViewDragHeaderMarker"/>
+
+  <xs:attributeGroup name="TreeViewDragHeaderMarkerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewResizeOutline">
+    <xs:annotation>
+      <xs:documentation>This component is used as an overlay above the column that is currently being
+        resized
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewResizeOutlineAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewResizeOutline" substitutionGroup="TreeViewResizeOutline"/>
+
+  <xs:attributeGroup name="TreeViewResizeOutlineAttributes">
+
+    <xs:attributeGroup ref="ResizeHandleAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewSelectionModel">
+    <xs:annotation>
+      <xs:documentation>Selection model forBiTreeView.
+
+        The selection model can operate in 2 modes: cell or row.
+        The selected cells/rows are identified by the row index/column index in the
+        data model.
+
+        The items in the selectedItems hash are of typeBiTreeViewSelectionModelItem
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewSelectionModel" substitutionGroup="TreeViewSelectionModel"/>
+
+  <xs:attributeGroup name="TreeViewSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+    <xs:attribute name="selectionMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Whether to use row selection or cell selection. Valid values are "row"
+          and "cell"
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewSelectionModelItem">
+    <xs:annotation>
+      <xs:documentation>This class is used internally inBiTreeViewSelectionModel to keep track of
+        the selected rows
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewSelectionModelItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewSelectionModelItem" substitutionGroup="TreeViewSelectionModelItem"/>
+
+  <xs:attributeGroup name="TreeViewSelectionModelItemAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="row" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The row that this represents</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="column" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The column that this represents</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewStateManager">
+    <xs:annotation>
+      <xs:documentation>A simple class that is used internally with theBiTreeView to keep track
+        of active and hover cell
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewStateManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewStateManager" substitutionGroup="TreeViewStateManager"/>
+
+  <xs:attributeGroup name="TreeViewStateManagerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewViewManager">
+    <xs:annotation>
+      <xs:documentation>This class handles the visual properties of aBiTreeView
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewViewManager" substitutionGroup="TreeViewViewManager"/>
+
+  <xs:attributeGroup name="TreeViewViewManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="treeView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeView - The tree view this view manager is to be used with</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showGridLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show grid lines between the cells in the tree view</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the scroll left to the view manager so that the view manager can figure out what column to
+          start at
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the scroll top to the view manager so that the view manager can figure out what row to start at
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="indentColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the column that should be indented. Use -1 to not show any
+          indention
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="highlightSortColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to highlight the background of the sorted column</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The order of the columns in the visual representation</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of a row in the tree view</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="headersHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the column headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ascendingIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The path to the arrow image to use for ascending sort</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="descendingIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The path to the arrow image to use for descending sort</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRowHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the row headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowHeadersWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the row headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="UndeterminedProgressBar">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show a progress bar that shows progress
+        of an undeterminable size. The progress bar is animated to show that it
+        is busy. Use start and stop to control the
+        animation. Changing the maximum
+        changes the number of steps the animation does.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UndeterminedProgressBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiUndeterminedProgressBar" substitutionGroup="UndeterminedProgressBar"/>
+
+  <xs:attributeGroup name="UndeterminedProgressBarAttributes">
+
+    <xs:attributeGroup ref="ProgressBarAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Uri">
+    <xs:annotation>
+      <xs:documentation>This class is used to define a Universal Resource Identifier (URI). This
+        is sometimes also known as a Uniform Resource Locator (URL). A URI is
+        used to describe the location and source of external files. A URI is
+        only a representation of the string format describing the URI. It does
+        not know how to lookup the information the URI might point at.
+        A general URI has the following format. Below this is a list of what
+        part of the URI maps to what property. http://user:password@www.domain.com:80/dir/file.html?param0=value=0;param1=value1#fragment
+        scheme - http userInfo - user:password host - www.domain.com port - 80 path - /dir/file.html dirPath - /dir/ query -
+        ?param0=value=0;param1=value1
+        fragment - #fragment getParam("param0") - value0 getParam("param1") - value1 href -
+        http://user:password@www.domain.com:80/dir/file.html?param0=value=0;param1=value1#fragment
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UriAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiUri" substitutionGroup="Uri"/>
+
+  <xs:attributeGroup name="UriAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="href" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the complete string representation of the URI.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="VBox">
+    <xs:annotation>
+      <xs:documentation>This is a verticalBiBox where components are laid out from top to bottom.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiVBox" substitutionGroup="VBox"/>
+
+  <xs:attributeGroup name="VBoxAttributes">
+
+    <xs:attributeGroup ref="BoxAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WebService">
+    <xs:annotation>
+      <xs:documentation>This is a factory class to the
+        Microsoft
+        WebService Behavior. Creating aBiWebService actually creates and returns
+        an HTML element with the given behavior attached.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WebServiceAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWebService" substitutionGroup="WebService"/>
+
+  <xs:attributeGroup name="WebServiceAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WebService2">
+    <xs:annotation>
+      <xs:documentation>Construct a web service client. A BiWebService2 object allows accessing web services through SOAP, based on a WSDL
+        describing the services' interfaces. To use BiWebService2, first construct an object of this class. Then, call the object's
+        useService method -- passing the URL to the WSDL describing the service and the service's name. Finally, call syncInvoke,
+        asyncInvoke and callMethod to invoke service operations synchronously or asynchronously.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WebService2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWebService2" substitutionGroup="WebService2"/>
+
+  <xs:attributeGroup name="WebService2Attributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="async" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This property determines whether or not calls made by the web service using callMethod and service
+          loading using useService without specifying an async flag is done asynchronously.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onserviceloaded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Notifies that loading the WSDL used to describe the service represented by this instance is complete. If the event
+          has an 'err' member, this describes an error which occurred during loading.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncallcomplete" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Notifies that an asynchronous web service operation invocation was completed, either succesfuly or with errors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Window">
+    <xs:annotation>
+      <xs:documentation>This class is used for internal windows inside the application window.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WindowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWindow" substitutionGroup="Window"/>
+
+  <xs:attributeGroup name="WindowAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="continuousLayout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether resizing/moving of the window should be continuously updated.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="contentPane" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - This returns the component representing the client area of the window.
+          All components should be added to this component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the icon on the caption.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinimize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the minimize button on the caption.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMaximize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiWindow - Whether to show the maximize button on the caption</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showClose" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the close button on the caption.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="caption" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The title text of the window.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon image to show on the window caption. Note that changing
+          the image object does not update the window icon. You'll have to
+          set the icon property to update the icon. The size of the icon
+          is ignored and will always be 16 x 16 pixels.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="canMinimize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the window can be minimized by the user.
+          If the window cannot be minimized and the minimize button is shown the
+          button is disabled.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hideChrome" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to hide the caption bar of the window.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="resizable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the window can be resized by the user.
+          If the window cannot be resized and the maximize button is shown the
+          button is disabled.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="movable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the window can be moved by the user.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="state" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The state of the window. Valid values are: normal maximized minimized</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="active" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the window should be the active window.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="acceptButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default accept button. If this is set
+          then the action
+          event is dispatched from the accept button when the enter key
+          is pressed. This does not have to
+          be a BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cancelButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default cancel button. If this is set
+          then the action
+          event is dispatched from the cancel button when the Esc key is pressed.
+          This does not have to be a BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opaque" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to make the window opaque. An opaque window will not let plugins and
+          other windowed controls show through. However, there is a price to this. This
+          is achieved using an internal iframe and this makes the window heavier and
+          slower.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this window. If this is set to
+          null then the string bundle for
+          application is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforeclose" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the window is closed. If the
+          default action is prevented the window is
+          not closed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onclose" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the window is closed.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncaptionchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the caption changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onstatechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the window state changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oniconchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the icon changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onactivated" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the window becomes active.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondeactivated" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the window becomes inactive</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WindowManager">
+    <xs:annotation>
+      <xs:documentation>This class can be used with internal windows
+        to provide more features.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WindowManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWindowManager" substitutionGroup="WindowManager"/>
+
+  <xs:attributeGroup name="WindowManagerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="component" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that the windows are added to</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="activeWindow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiWindow - The window that is currently active. This might be null
+          if no window is active.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this window manager. If this is set to
+          null then the string bundle for
+          application is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onactivation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The window manager has become activated. E.g. one of its windows is activated.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondeactivation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The window manager is deactivated. You have left it and can no longer
+          manipulate its windows via keyboard shortcuts etc..
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Wizard">
+    <xs:annotation>
+      <xs:documentation>This component creates a dialog that contains a BiWizardPane.
+        The wizard pane provides buttons for navigating back and forth and finishing
+        and canceling the wizard.
+        Any BiComponent may be used as a page.
+        Use addPage to add pages to the wizard. The pages dispatch
+        activated and deactivated when the active page
+        changes. You can also use the change event to get notifications
+        about when the user changes the active page.
+        Most of the methods and properties provided by the BiWizardPane
+        are also available on the wizard dialog.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WizardAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWizard" substitutionGroup="Wizard"/>
+
+  <xs:attributeGroup name="WizardAttributes">
+
+    <xs:attributeGroup ref="DialogAttributes"/>
+
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the selected page. If no page is selected this
+          returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedPage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The currently selected page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backdropImage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The image used as the backdrop on the left side of the wizard pane.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this wizard dialog. For keys to use in the string
+          bundle seeBiWizardPane.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onback" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage changes to the previous page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnext" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage changes to the next page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage page changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforechange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage page changes. Call
+          preventDefault
+          on the event object to prevent the wizard to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeback" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage changes to the previous page. Call
+          preventDefault
+          on the event object to prevent the wizard to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforenext" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage changes to the next page. Call
+          preventDefault
+          on the event object to prevent the wizard to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforefinish" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the the wizard's finish event is called. Calling
+          preventDefault
+          on the event object will prevent the wizard from dispatching the finish event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforecancel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the the wizard's cancel event is called. Calling
+          preventDefault
+          on the event object will prevent the wizard from dispatching the cancel event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfinish" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched when the user clicks
+          the finish button.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncancel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched when the user clicks
+          the cancel button.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WizardPane">
+    <xs:annotation>
+      <xs:documentation>This component creates a wizard that can contain 1 or more pages. The
+        wizard pane provides buttons for navigating back and forth and finishing
+        and canceling the wizard.
+        Any BiComponent may be used as a page.
+        Use addPage to add pages to the wizard. The pages dispatch
+        activated and deactivated when the active page
+        changes. You can also use the change event to get notifications
+        about when the user changes the active page.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WizardPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWizardPane" substitutionGroup="WizardPane"/>
+
+  <xs:attributeGroup name="WizardPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the selected page. If no page is selected this
+          returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedPage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The currently selected page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this wizard pane. If this is set to
+          null then the string bundle for
+          application is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onback" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage changes to the previous page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnext" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage changes to the next page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage page changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforechange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage page changes. Call
+          preventDefault
+          on the event object to prevent the wizard pane to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeback" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage changes to the previous page. Call
+          preventDefault
+          on the event object to prevent the wizard pane to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforenext" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage changes to the next page. Call
+          preventDefault
+          on the event object to prevent the wizard pane to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforefinish" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the the wizard pane's finish event is called. Calling
+          preventDefault
+          on the event object will prevent the wizard pane from dispatching the finish event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforecancel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the the wizard pane's cancel event is called. Calling
+          preventDefault
+          on the event object will prevent the wizard pane from dispatching the cancel event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfinish" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched when the user clicks
+          the finish button.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncancel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched when the user clicks
+          the cancel button.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="VmlLabel">
+    <xs:annotation>
+      <xs:documentation>This class is used internally inside aBiGraph for labels.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VmlLabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiVmlLabel" substitutionGroup="VmlLabel"/>
+
+  <xs:attributeGroup name="VmlLabelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text align of the the text on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text to show on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fontSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The font size in pixels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="WsCallCompleteEvent">
+    <xs:annotation>
+      <xs:documentation>BiWsCallCompleteEvent -- notifies of an asynchronous call completion.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WsCallCompleteEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWsCallCompleteEvent" substitutionGroup="WsCallCompleteEvent"/>
+
+  <xs:attributeGroup name="WsCallCompleteEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDataColumn">
+    <xs:annotation>
+      <xs:documentation>This class is used for the columns in aBiXmlDataSet.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDataColumnAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDataColumn" substitutionGroup="XmlDataColumn"/>
+
+  <xs:attributeGroup name="XmlDataColumnAttributes">
+
+    <xs:attributeGroup ref="DataColumnAttributes"/>
+
+    <xs:attribute name="xsType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The XML Schema type used for the column</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDataRow">
+    <xs:annotation>
+      <xs:documentation>This class is used for the rows in aBiXmlDataSet.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDataRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDataRow" substitutionGroup="XmlDataRow"/>
+
+  <xs:attributeGroup name="XmlDataRowAttributes">
+
+    <xs:attributeGroup ref="DataRowAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDataSet">
+    <xs:annotation>
+      <xs:documentation>This class maps an xml file outputted from an ADO.NET DataSet to aBiDataSet.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDataSetAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDataSet" substitutionGroup="XmlDataSet"/>
+
+  <xs:attributeGroup name="XmlDataSetAttributes">
+
+    <xs:attributeGroup ref="DataSetAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - This property can be used to load an external XML document and use that as
+          the source for the XML data set
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rootNode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Node - The root XML node used to define the data set. This is either aBiXmlDocument
+          or an XML element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondataready" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is dispatched when the data set uses external
+          data and the data has been loaded.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDataTable">
+    <xs:annotation>
+      <xs:documentation>This class is used for the tables in aBiXmlDataSet.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDataTableAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDataTable" substitutionGroup="XmlDataTable"/>
+
+  <xs:attributeGroup name="XmlDataTableAttributes">
+
+    <xs:attributeGroup ref="DataTableAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDocument">
+    <xs:annotation>
+      <xs:documentation>This is a factory class to the Microsoft
+        DOMDocument
+        object. Creating aBiXmlDocument actually creates and returns a DOMDocument.
+        For Mozilla this returns a new XMLDocument (as defined by the W3C DOM). For
+        Mozilla we also extend the DOM Node interfaces to make it more compatible
+        with MSXML.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDocumentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDocument" substitutionGroup="XmlDocument"/>
+
+  <xs:attributeGroup name="XmlDocumentAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlHttp">
+    <xs:annotation>
+      <xs:documentation>This is a factory class to the Microsoft
+        IXMLHTTPRequest
+        object. Creating aBiXmlHttp actually creates and returns an IXMLHTTPRequest.
+        For Mozilla this creates XMLHttpRequest, which happen
+        to implement the IXMLHTTPRequest interface.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlHttpAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlHttp" substitutionGroup="XmlHttp"/>
+
+  <xs:attributeGroup name="XmlHttpAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlLoader">
+    <xs:annotation>
+      <xs:documentation>Loads an XML document from the server or the local file system. (The
+        local file system can only be accessed when using a local application.)
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlLoader" substitutionGroup="XmlLoader"/>
+
+  <xs:attributeGroup name="XmlLoaderAttributes">
+
+    <xs:attributeGroup ref="TextLoaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlResourceParser">
+    <xs:annotation>
+      <xs:documentation>This class deserializes an XML document to a Bindows object hierarchy.
+        This is mostly tailored for BiComponent
+        hierarchies but can be used for any class extending BiObject.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlResourceParserAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlResourceParser" substitutionGroup="XmlResourceParser"/>
+
+  <xs:attributeGroup name="XmlResourceParserAttributes">
+
+    <xs:attributeGroup ref="XmlLoaderAttributes"/>
+
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference (with the same name as the id value) to the object created
+          from this XML element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rootNode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Node - The XML element that describes the root of the object hierarchy.
+          Only set this before you actually use the parser.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpc">
+    <xs:annotation>
+      <xs:documentation>This is a class that implements an XML-RPC client. The XML-RPC
+        specifcation can be found at http://www.xmlrpc.com/spec.
+        For more info and XML-RPC server implementations see
+        http://www.xmlrpc.com/.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpc" substitutionGroup="XmlRpc"/>
+
+  <xs:attributeGroup name="XmlRpcAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI where to find the remote procedure</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="async" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to use asynchronous method call. If this is true then
+          the call to callMethod returns instantly. When using
+          asynchronous calling use the result event for the call back
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The user name to pass to the server when calling the remote procedure</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="password" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The password to pass to the server when calling the remote procedure</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a method call
+          response is received from the server.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncallcomplete" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when
+          a method call is complete.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpcCallCompleteEvent">
+    <xs:annotation>
+      <xs:documentation>This event is used when a call to an XML-RPC server is completed
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcCallCompleteEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpcCallCompleteEvent" substitutionGroup="XmlRpcCallCompleteEvent"/>
+
+  <xs:attributeGroup name="XmlRpcCallCompleteEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpcDouble">
+    <xs:annotation>
+      <xs:documentation>This class is useful when working withBiXmlRpc whenever a double is required
+        but you don't know whether the number is an integer or not
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcDoubleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpcDouble" substitutionGroup="XmlRpcDouble"/>
+
+  <xs:attributeGroup name="XmlRpcDoubleAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpcError">
+    <xs:annotation>
+      <xs:documentation>This class is used when an error happens either at the server or due to an
+        invalid response from the server. Errors of this type are thrown byBiXmlRpc
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcErrorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpcError" substitutionGroup="XmlRpcError"/>
+
+  <xs:attributeGroup name="XmlRpcErrorAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpcInt">
+    <xs:annotation>
+      <xs:documentation>This class is useful when working withBiXmlRpc whenever an int is required
+        but you don't know whether the number is an integer or not
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcIntAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpcInt" substitutionGroup="XmlRpcInt"/>
+
+  <xs:attributeGroup name="XmlRpcIntAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XsTypeConverter">
+    <xs:annotation>
+      <xs:documentation>This class contains static methods that converts XML Schema types to Javascript
+        types as well as converting strings formatted according to the XML Schema
+        to Javascript values.
+        The following type relations are used
+
+        XS type name - JS type name - JS class
+        "negativeInteger" - "number" - Number
+        "unsignedShort" - "number" - Number
+        "unsignedByte" - "number" - Number
+        "unsignedLong" - "number" - Number
+        "unsignedInt" - "number" - Number
+        "decimal" - "number" - Number
+        "boolean" - "number" - Number
+        "integer" - "number" - Number
+        "double" - "number" - Number
+        "float" - "number" - Number
+        "short" - "number" - Number
+        "byte" - "number" - Number
+        "long" - "number" - Number
+        "int" - "number" - Number
+        "QName" - "string" - String
+        "string" - "string" - String
+        "normalizedString" - "string" - String
+        "dateTime" - "date" - Date
+        "date" - "date" - Date
+        "time" - "date" - Date
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XsTypeConverterAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXsTypeConverter" substitutionGroup="XsTypeConverter"/>
+
+  <xs:attributeGroup name="XsTypeConverterAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+
+  <xs:group name="BindowsComponentsGroup">
+    <xs:choice>
+      <!--<xs:group ref="iv:InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+      <!--<xs:element ref="DrawLine" minOccurs="0" maxOccurs="unbounded"/>-->
+      <xs:element ref="GridRow" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridChartRow" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeNode" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AnimationRange" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Area" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AreaCollection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Base64" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Border" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartCategory" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartPoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartPresentation" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartPresentationManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartSeries" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataColumn" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDataColumn" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataRow" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDataRow" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataTable" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDataTable" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DateFormat" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DateFormatSymbols" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DrawAnchor" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="CssLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ImageLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ObjectLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Script" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ScriptLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SerializedLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Style" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TextLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="JsonLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="L10nLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlResourceParser" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AttachedComponentModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InlineEditModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Command" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Component" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColumnChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="BarChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PercentageStackedColumnChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PercentageStackedBarChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StackedColumnChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StackedBarChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LineChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PieChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColumnChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="BarChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PercentageStackedColumnChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PercentageStackedBarChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StackedColumnChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StackedBarChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColumnChartSection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LineMarker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PieChartSection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColumnChartSection2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AccordionPage" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AccordionPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Box" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="HBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="VBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Calendar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartAreaBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartArea" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartArea2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartCategoryAxisBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartCategoryAxis" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartCategoryAxis2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartGridLinesBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartGridLines" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartGridLines2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartLegend" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartValueAxisBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartValueAxis" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartValueAxis2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComboBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DatePicker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DesktopPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DockPanel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="FlowPanel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2Component" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2CircularBorder" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2ImageBorder" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RectangularBorder" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2BasicCap" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearGradientFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialGradientFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RingGradientFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2PlainColorFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearRange" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialRange" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearScale" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialScaleSection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearTicks" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialTicks" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearNeedle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialNeedle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2Group" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeLabels" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeMajorTicks" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeMinorTicks" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeNeedle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugePlate" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeSection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GraphBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Graph" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Graph2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GraphContentArea" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridHeaders" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridPanel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridPanel2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridRowHeaders" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GroupBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Iframe" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PrintFrame" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RichEdit" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Image" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InlineComponent" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="IpField" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Label" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Button" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AccordionButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RepeatButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartLegendLabel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="CheckBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2Label" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeTitle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridHeader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridHeaderCorner" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridHeaderFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GroupBoxTitle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ListItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComboBoxItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Popup" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolTip" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RadioButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StatusBarPanel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarMenuButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarSplitMenuButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarToggleButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarRadioButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TabButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarSplitToggleMenuButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewDragHeader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LinkManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="List" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MenuBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MoveHandle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridDropMarker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OptionPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ProgressBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="UndeterminedProgressBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ResizeHandle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridResizeOutline" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewResizeOutline" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ScrollBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Slider" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Spinner" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SplitPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StatusBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TabPage" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TabPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TextField" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PasswordField" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TextArea" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TimePicker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TabBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarSeparator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGrid" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeView" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SingleTree" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewDragHeaderMarker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="VmlLabel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Window" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Dialog" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColorPicker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Wizard" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="WizardPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComponentAnimation" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LocationAnimator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OpacityAnimator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SizeAnimator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataSet" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDataSet" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="FpsGenerator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ImageMap" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ImageMapArea" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ImagePreloader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Link" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Menu" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MenuItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="CheckBoxMenuItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MenuButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MenuSeparator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RadioButtonMenuItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridStateManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RadioGroup" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RangeModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ResourceLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ScriptLoaderQueue" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="CalendarSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ListSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StringBundle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TextParser" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ThemeManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Timer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataSetDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2DataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SingleTreeDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2DataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewStateManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="WebService2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="WindowManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlRpc" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Font" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2Cell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2Row" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridCell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridChartCell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridColumn" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridPanel2Cell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridPanel2Row" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="HashTable" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Json" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Line" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LoadManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Math" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridCellInfo" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OrderedIterator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Point" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PopupManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SelectionItemCollection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Set" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Shape" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Circle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Polygon" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SingleTreeNode" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Sort" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StringBuffer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Subtree" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Theme" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TimerManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolTipManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2Cell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2Row" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeHelper" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeIterator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeIteratorStackItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeNode2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewCellInfo" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewSelectionModelItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2ViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SingleTreeViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2ViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Uri" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XsTypeConverter" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="WebService" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDocument" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlHttp" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlRpcError" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlRpcDouble" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlRpcInt" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="L10nString" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:choice>
+  </xs:group>
+
+</xs:schema>
+
+
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation18_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation18_2.xsd
new file mode 100644
index 000000000000..45de8b92985f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation18_2.xsd
@@ -0,0 +1,1204 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.infiview.net/infiview"
+           xmlns="http://www.infiview.net/infiview"
+           xmlns:bi="http://www.bindows.net/IVBindowsSchema"
+           elementFormDefault="qualified">
+
+  <xs:import namespace="http://www.bindows.net/IVBindowsSchema" schemaLocation="IVBindowsAdfSchema.xsd"/>
+
+  <!--<xs:element name="InfiView">-->
+  <!--<xs:annotation>-->
+  <!--<xs:documentation>This class is the main class of InfiView.-->
+  <!--It can configured for many different purposes using the InfiView Markup format.-->
+  <!--</xs:documentation>-->
+  <!--</xs:annotation>-->
+  <!--<xs:complexType>-->
+  <!--<xs:choice minOccurs="0" maxOccurs="unbounded">-->
+  <!--<xs:group ref="InfiViewComponentsGroup"/>-->
+  <!--</xs:choice>-->
+  <!--<xs:attributeGroup ref="InfiViewAttributes"/>-->
+  <!--</xs:complexType>-->
+  <!--</xs:element>-->
+
+  <!--<xs:element name="AbstractDataContainer">-->
+  <!--<xs:annotation>-->
+  <!--<xs:documentation>Abstract data container class-->
+  <!--</xs:documentation>-->
+  <!--</xs:annotation>-->
+  <!--<xs:complexType>-->
+  <!--<xs:choice>-->
+  <!--<xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+  <!--</xs:choice>-->
+  <!--<xs:attributeGroup ref="AbstractDataContainerAttributes"/>-->
+  <!--</xs:complexType>-->
+  <!--</xs:element>-->
+
+  <xs:attributeGroup name="AbstractDataContainerAttributes">
+
+    <xs:attributeGroup ref="ViewportRectangleAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractViewport">
+    <xs:annotation>
+      <xs:documentation>The abstract representation of the viewport collects methods giving
+        a consistent interface for building custom viewports. x
+
+        The viewport is a component which makes it possible to write
+        applications with practically infinite surfaces containing a
+        tremendous amount of information which should be swapped in and out
+        from either an internal lightweight information structure or server
+        side information.
+        <br/>
+
+        The abstract viewport adds a resize and a
+        mousewheel event listener in its constructor. The resize event is
+        coupled to the resizeVisibleArea method of the given data model and
+        the mousewheel event scrolls the viewport vertically by 50 pixels.
+        This behavior can be overriden by overriding the onMouseWheel method.
+        <br/>
+
+        The default render margin is zero in both directions.
+        <br/>
+
+        setScrollLeft and setScrollTop are overridden to empty functions to
+        avoid auto-scrolling problems when using drag-and-drop.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractViewportAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractViewportModel">
+    <xs:annotation>
+      <xs:documentation>This is the is the foundation for all viewport data models which are
+        used to manage the information on which infiview.AbstractViewport
+        descendants are dependent on. The data model should store either
+        lightweight information about components or manage communication
+        with information on a server.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractViewportModelAttributes">
+
+    <xs:attribute name="onzoomchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Dispatched when the zoom level changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncenterview" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Dispatched when the view is centered.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Actions">
+    <xs:annotation>
+      <xs:documentation>The class infiview.Actions is used by infiview.InfiView.
+
+        TODO: Explain the purpose of this class.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ActionsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ActionsAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentDataConstructor">
+    <xs:annotation>
+      <xs:documentation>Data contructor holder
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentDataConstructorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentDataConstructorAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentDataContainer">
+    <xs:annotation>
+      <xs:documentation>Wrapper class for objects inserted into a infiview.GraphViewportDatamodel
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentDataContainerAttributes">
+
+    <xs:attributeGroup ref="AbstractDataContainerAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Set the data of this container.
+          The properties that are given in the "persistentDataMap" property are saved int the container.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentViewport">
+    <xs:annotation>
+      <xs:documentation>Implemented viewport for handling components. It is used together
+        with a infiview.ComponentViewportModel.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentViewportAttributes">
+
+    <xs:attributeGroup ref="AbstractViewportAttributes"/>
+
+    <xs:attribute name="zoomFactorDependantData" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:EDIT_THIS - This property turns on or off the zoom factor dependant data.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentViewportModel">
+    <xs:annotation>
+      <xs:documentation>Data model intended for keeping externally added components.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentViewportModelAttributes">
+
+    <xs:attributeGroup ref="ZoomableViewportModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DrawAnchor">
+    <xs:annotation>
+      <xs:documentation>This class defines static properties that represent the anchoring locations for edge
+        lines.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DrawAnchorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DrawAnchorAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DynamicPreviewViewportNavigator">
+    <xs:annotation>
+      <xs:documentation>This class is specialized navigator that loads images as preview background.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DynamicPreviewViewportNavigatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DynamicPreviewViewportNavigatorAttributes">
+
+    <xs:attributeGroup ref="ViewportNavigatorAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EdgeType">
+    <xs:annotation>
+      <xs:documentation>The class infiview.PropertyForms is used by infiview.InfiView.
+        Container for edge type information.
+        Used as data holder when creating edges in InfiView graphs.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EdgeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EdgeTypeAttributes">
+
+    <xs:attributeGroup ref="InfiViewTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EdgeTypes">
+    <xs:annotation>
+      <xs:documentation>The class infiview.EdgeTypes is used by infiview.InfiView.
+        It holds a list of EdgeType.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EdgeTypesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EdgeTypesAttributes">
+
+    <xs:attributeGroup ref="TypeTableAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EventListener">
+    <xs:annotation>
+      <xs:documentation>The class infiview.EventListener is used by infiview.InfiView.
+        This class is the holder of a event l├нstener. Used by property forms.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventListenerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EventListenerAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EventListeners">
+    <xs:annotation>
+      <xs:documentation>The class infiview.EventListeners is used by infiview.InfiView.
+        Holder of a list of infiview.EventListener.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventListenersAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EventListenersAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphDataContainer">
+    <xs:annotation>
+      <xs:documentation>Wrapper class for objects inserted into a infiview.GraphViewportDatamodel
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GraphDataContainerAttributes">
+
+    <xs:attributeGroup ref="ComponentDataContainerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphViewport">
+    <xs:annotation>
+      <xs:documentation>Viewport specialized for containing a edge manager to handle very
+        large graphs.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GraphViewportAttributes">
+
+    <xs:attributeGroup ref="ComponentViewportAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphViewportModel">
+    <xs:annotation>
+      <xs:documentation>Specialized model for the infiview.GraphViewport which handles very
+        large graphs.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GraphViewportModelAttributes">
+
+    <xs:attributeGroup ref="ComponentViewportModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+
+  <xs:attributeGroup name="InfiViewAttributes">
+    <xs:attribute name="currentState" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:EDIT_THIS - This method sets the current state, it loads the panel icons and
+          troolbar associated with the desired state
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewComponentDataContainer">
+    <xs:annotation>
+      <xs:documentation>infiview.InfiViewComponentDataContainer is the light weight representation of an node
+        residing
+        in a InfiView.
+        This class can be inherit for adding och changing features of adding and dipsosing visual nodes in a
+        InfiView.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewComponentDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewComponentDataContainerAttributes">
+
+    <xs:attributeGroup ref="InteractiveGraphDataContainerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewType">
+    <xs:annotation>
+      <xs:documentation>Basic class for element and edge type classes.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewTypeAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewViewport">
+    <xs:annotation>
+      <xs:documentation>Viewport specialized for representing different charts using the edge api
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewViewportAttributes">
+
+    <xs:attributeGroup ref="InteractiveGraphViewportAttributes"/>
+
+    <xs:attribute name="infiView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:EDIT_THIS - EDIT_THIS</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewViewportModel">
+    <xs:annotation>
+      <xs:documentation>Specialized model for the infiview.GraphViewport which handles very
+        large graphs.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewViewportModelAttributes">
+
+    <xs:attributeGroup ref="InteractiveGraphViewportModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InteractiveGraphDataContainer">
+    <xs:annotation>
+      <xs:documentation>Wrapper class for objects inserted into a infiview.GraphViewportDatamodel
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InteractiveGraphDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InteractiveGraphDataContainerAttributes">
+
+    <xs:attributeGroup ref="GraphDataContainerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InteractiveGraphViewport">
+    <xs:annotation>
+      <xs:documentation>Viewport specialized for representing different interactive charts.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InteractiveGraphViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InteractiveGraphViewportAttributes">
+
+    <xs:attributeGroup ref="GraphViewportAttributes"/>
+
+    <xs:attribute name="edgeMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:boolean - Edge mode enabled / disabled</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="multiSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this value is set to true it enables multipe selection of elements
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="InteractiveGraphViewportModel">
+    <xs:annotation>
+      <xs:documentation>Specialized model of the infiview.GraphViewport which adds additional features for
+        interactivity.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InteractiveGraphViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InteractiveGraphViewportModelAttributes">
+
+    <xs:attributeGroup ref="GraphViewportModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MarqueeSelector">
+    <xs:annotation>
+      <xs:documentation>This component can be used as a wireframe for selecting components on a drawing area. Add
+        this to the same area and
+        on the mousedown event call startSelection(e) passing the BiMouseEvent object from the mousedown event
+        handler as
+        the parameter e.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MarqueeSelectorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="MarqueeSelectorAttributes">
+
+    <xs:attribute name="onselectionprogress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.SelectionEvent Fires continually during the resizing of the wireframe
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onselectionend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.SelectionEvent This is fired when the user releases the mouse button to signal
+          that the selection is complete.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onselectionstart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired before the selection is starts. To prevent the wireframe
+          from being displayed call
+          preventDefault
+          on the event object.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="NodeDefinition">
+    <xs:annotation>
+      <xs:documentation>This class represents a node definition.
+        A node type can contain 1-* node definitions.
+        The node definition keeps information about how a node should be created.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="NodeDefinitionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="NodeDefinitionAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="NodeDefinitionConstructor">
+    <xs:annotation>
+      <xs:documentation>Node constuctor holder for InfiViewComponentDataContainer.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="NodeDefinitionConstructorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="NodeDefinitionConstructorAttributes">
+
+    <xs:attributeGroup ref="ComponentDataConstructorAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="NodeType">
+    <xs:annotation>
+      <xs:documentation>The class infiview.NodeType is used by infiview.InfiView.
+        This class holds the information how to create a data container for
+        a specific node type.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="NodeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="NodeTypeAttributes">
+
+    <xs:attributeGroup ref="InfiViewTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="NodeTypes">
+    <xs:annotation>
+      <xs:documentation>Container for node types.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="NodeTypesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="NodeTypesAttributes">
+
+    <xs:attributeGroup ref="TypeTableAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PreviewImage">
+    <xs:annotation>
+      <xs:documentation>This class is used for showing images.
+        Supported image types are GIF, JPEG and PNG (including support for 32-bit RGBA).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PreviewImageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PreviewImageAttributes">
+
+    <!--<xs:attribute name="onload" type="xs:string">-->
+    <!--<xs:annotation>-->
+    <!--<xs:documentation>Fires when the image loads. Note that the image file may be-->
+    <!--loaded before the constructor finishes and you should not only-->
+    <!--rely on this event but also use loaded property.-->
+    <!--</xs:documentation>-->
+    <!--</xs:annotation>-->
+    <!--</xs:attribute>-->
+
+    <xs:attribute name="onerror" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image failed to load.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PropertyForm">
+    <xs:annotation>
+      <xs:documentation>The class infiview.PropertyForm is used by infiview.InfiView.
+        This class holds information for creating a property form
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PropertyFormAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PropertyFormAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PropertyForms">
+    <xs:annotation>
+      <xs:documentation>The class infiview.PropertyForms is used by infiview.InfiView.
+        This class is a container holding PropertyForm objects.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PropertyFormsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PropertyFormsAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Resources">
+    <xs:annotation>
+      <xs:documentation>The class infiview.Resources is used by infiview.InfiView.
+        Container for the resources.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResourcesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ResourcesAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RTree">
+    <xs:annotation>
+      <xs:documentation>R-Tree implementation. The R-tree is a tree designed to make fast
+        searches of rectangular areas.
+
+        Code is based on Guttman, A. "R-Trees: A Dynamic Index Structure for
+        Spatial Searching", ACM 1984.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RTreeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="RTreeAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Selection">
+    <xs:annotation>
+      <xs:documentation>Adds a selection wireframe around multiple nodes that can then be dragged with the mouse.
+        Nodes can be added to and removed from the selection as needed.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SelectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="SelectionAttributes">
+
+    <!--<xs:attributeGroup ref="AbstractSelectionAttributes"/>-->
+
+    <xs:attribute name="border" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiBorder - Sets the default appearance of the wireframe</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when nodes are added to and removed from the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmovestart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when user starts dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmoveend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when user has finished dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SelectionEvent">
+    <xs:annotation>
+      <xs:documentation>The event dispatched by infiview.MarqueeSelector.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SelectionEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="SelectionEventAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="State">
+    <xs:annotation>
+      <xs:documentation>The class infiview.State is used by infiview.InfiView.
+        This class represents a state.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StateAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="StateAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="States">
+    <xs:annotation>
+      <xs:documentation>The class infiview.States is used by infiview.InfiView.
+        Container of states.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StatesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="StatesAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolGroup">
+    <xs:annotation>
+      <xs:documentation>The class infiview.ToolGroup is used by infiview.InfiView.
+        Container for tools, when tools are layout every group will separated.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolGroupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ToolGroupAttributes">
+
+    <xs:attribute name="upActions" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:infiview.InfiView - This method binds certains tool components events to infiview
+          actions.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tools">
+    <xs:annotation>
+      <xs:documentation>The class infiview.Tools is used by infiview.InfiView.
+
+        TODO: Describe the purpose of this class.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ToolsAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TypeTable">
+    <xs:annotation>
+      <xs:documentation>The class infiview.TypeTable is used by infiview.InfiView.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TypeTableAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="TypeTableAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportMarqueeSelector">
+    <xs:annotation>
+      <xs:documentation>This component can be used as a wireframe for selecting components on a drawing area. Add
+        this to the same area and
+        on the mousedown event call startSelection(e) passing the infiview.MouseEvent object from the mousedown
+        event handler as
+        the parameter e.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportMarqueeSelectorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportMarqueeSelectorAttributes">
+
+    <xs:attributeGroup ref="MarqueeSelectorAttributes"/>
+
+    <!--<xs:attribute name="onselectionprogress" type="xs:string">-->
+    <!--<xs:annotation>-->
+    <!--<xs:documentation>.SelectionEvent Fires continually during the resizing of the wireframe-->
+    <!--</xs:documentation>-->
+    <!--</xs:annotation>-->
+    <!--</xs:attribute>-->
+
+    <!--<xs:attribute name="onselectionend" type="xs:string">-->
+    <!--<xs:annotation>-->
+    <!--<xs:documentation>.SelectionEvent This is fired when the user releases the mouse button to signal-->
+    <!--that the selection is complete.-->
+    <!--</xs:documentation>-->
+    <!--</xs:annotation>-->
+    <!--</xs:attribute>-->
+
+    <!--<xs:attribute name="onselectionstart" type="xs:string">-->
+    <!--<xs:annotation>-->
+    <!--<xs:documentation>.Event This is fired before the selection is starts. To prevent the wireframe-->
+    <!--from being displayed call-->
+    <!--preventDefault-->
+    <!--on the event object.-->
+    <!--</xs:documentation>-->
+    <!--</xs:annotation>-->
+    <!--</xs:attribute>-->
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportNavigator">
+    <xs:annotation>
+      <xs:documentation>This class implements the basic viewport navigator.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportNavigatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportNavigatorAttributes">
+
+    <xs:attribute name="cursorColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the color of the cursor.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportNavigatorCursor">
+    <xs:annotation>
+      <xs:documentation>TODO: Document class.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportNavigatorCursorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportNavigatorCursorAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportRectangle">
+    <xs:annotation>
+      <xs:documentation>Helping class for describing a bounding rectangle in viewports.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportRectangleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportRectangleAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomableViewportModel">
+    <xs:annotation>
+      <xs:documentation>This is the is foundation for all viewport data models which are
+        used to manage the information on which infiview.ZoomableViewport
+        decendents are dependent on. The data model should either store
+        lightweight information about components or manage communication
+        with information on a server.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomableViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomableViewportModelAttributes">
+
+    <xs:attributeGroup ref="AbstractViewportModelAttributes"/>
+
+    <xs:attribute name="nearestZoomFactor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Set nearest available zoom factor</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="nearestLowerZoomFactor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Set nearest lower available zoom factor</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="zoomFactorModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:infiview.ZoomFactorModel - Set the zoom factor model.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onzoomfactorchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Dispatched when the zoom level changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:group name="InfiViewComponentsGroup">
+    <xs:choice>
+      <!--<xs:group ref="bi:BindowsComponentsGroup"/>-->
+      <xs:element ref="AbstractViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComponentViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GraphViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InteractiveGraphViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InfiViewViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AbstractViewportModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ZoomableViewportModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComponentViewportModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GraphViewportModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InteractiveGraphViewportModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InfiViewViewportModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Actions" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComponentDataConstructor" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="NodeDefinitionConstructor" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DrawAnchor" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="EventListener" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="EventListeners" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InfiViewType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="EdgeType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="NodeType" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MarqueeSelector" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ViewportMarqueeSelector" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="NodeDefinition" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PreviewImage" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PropertyForm" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PropertyForms" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Resources" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RTree" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Selection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SelectionEvent" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="State" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="States" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolGroup" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tools" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TypeTable" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="EdgeTypes" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="NodeTypes" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ViewportNavigator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DynamicPreviewViewportNavigator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ViewportNavigatorCursor" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ViewportRectangle" minOccurs="0" maxOccurs="unbounded"/>
+      <!--<xs:element ref="AbstractDataContainer" minOccurs="0" maxOccurs="unbounded"/>-->
+      <xs:element ref="ComponentDataContainer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GraphDataContainer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InteractiveGraphDataContainer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InfiViewComponentDataContainer" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:choice>
+  </xs:group>
+
+  <!--These infiview specific elements are allowed inside normal Bindows component elements -->
+  <xs:group name="ElementsAllowedExternally">
+    <xs:choice>
+      <xs:element ref="ViewportNavigator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InfiViewViewport" minOccurs="0" maxOccurs="unbounded"/>
+
+    </xs:choice>
+  </xs:group>
+</xs:schema>
+
+
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation19.xml b/xml/tests/testData/xml/ComplexSchemaValidation19.xml
new file mode 100644
index 000000000000..cab183ce9569
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation19.xml
@@ -0,0 +1,18 @@
+<Application
+  xmlns="http://www.bindows.net/IVBindowsSchema"
+  xmlns:iv="http://www.infiview.net/infiview"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation=
+    "http://www.bindows.net/IVBindowsSchema ComplexSchemaValidation19.xsd
+                 http://www.infiview.net/infiview ComplexSchemaValidation19_2.xsd"
+  autoNameMapping="true"
+  >
+
+  <Window caption="Network Topology Test" width="1024" height="728">
+    <iv:InfiView id="aaa">
+      <iv:AbstractViewport/>
+    </iv:InfiView>
+
+  </Window>
+
+</Application>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation19.xsd b/xml/tests/testData/xml/ComplexSchemaValidation19.xsd
new file mode 100644
index 000000000000..e37796fe9ec2
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation19.xsd
@@ -0,0 +1,14453 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns="http://www.bindows.net/IVBindowsSchema"
+           targetNamespace="http://www.bindows.net/IVBindowsSchema"
+           elementFormDefault="qualified"
+           xmlns:iv="http://www.infiview.net/infiview"
+  >
+
+  <xs:import namespace="http://www.infiview.net/infiview"
+             schemaLocation="ComplexSchemaValidation19_2.xsd"/>
+
+  <xs:element name="Application">
+    <xs:complexType>
+      <xs:choice minOccurs="1" maxOccurs="unbounded">
+        <xs:element name="SplashScreen" minOccurs="0" maxOccurs="1"/>
+        <xs:element ref="Theme" minOccurs="0" maxOccurs="unbounded"/>
+
+        <xs:element name="Window" minOccurs="1" maxOccurs="1">
+          <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+              <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+              <xs:element ref="iv:InfiView" minOccurs="0" maxOccurs="1"/>
+              <!--<xs:element ref="iv:InfiView" minOccurs="0" maxOccurs="unbounded"/>-->
+              <!--<xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+            </xs:choice>
+            <xs:attributeGroup ref="ApplicationWindowAttributes"/>
+          </xs:complexType>
+          <!--<xs:complexType>-->
+          <!--<xs:choice minOccurs="0" maxOccurs="unbounded">-->
+          <!--<xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+          <!--<xs:element name="InfiView">-->
+          <!--<xs:complexType>-->
+          <!--<xs:choice minOccurs="0" maxOccurs="unbounded">-->
+          <!--<xs:group ref="iv:InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+          <!--<xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+          <!--</xs:choice>-->
+          <!--<xs:attributeGroup ref="ComponentAttributes"/>-->
+          <!--<xs:attributeGroup ref="iv:InfiViewAttributes"/>-->
+          <!--</xs:complexType>-->
+          <!--</xs:element>-->
+          <!--</xs:choice>-->
+          <!--<xs:attributeGroup ref="ApplicationWindowAttributes"/>-->
+          <!--</xs:complexType>-->
+
+        </xs:element>
+
+        <xs:element name="Resources" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:choice maxOccurs="unbounded" minOccurs="0">
+              <xs:element name="Script">
+                <xs:complexType mixed="true">
+                  <xs:attributeGroup ref="ScriptAttributes"/>
+                </xs:complexType>
+              </xs:element>
+
+              <xs:element name="Package">
+                <xs:complexType>
+                  <xs:annotation>
+                    <xs:documentation>A package which will be loaded before the rest of the ADF is parsed.</xs:documentation>
+                  </xs:annotation>
+                  <xs:attributeGroup ref="PackageAttributes"/>
+                </xs:complexType>
+              </xs:element>
+
+            </xs:choice>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
+      <xs:attributeGroup ref="ApplicationAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+
+  <xs:attributeGroup name="PackageAttributes">
+    <xs:annotation>
+      <xs:documentation>Loads a Bindows package or script before parsing the rest of the ADF (including &lt;Script&gt; tags).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The location of the package script file (relative to Bindows)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="PackageTypes">
+      <xs:annotation>
+        <xs:documentation>The name of the package</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:attributeGroup>
+
+  <xs:simpleType name="PackageTypes">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Loaders"/>
+      <xs:enumeration value="OlapGrid"/>
+      <xs:enumeration value="Charting"/>
+      <xs:enumeration value="WebService2"/>
+      <xs:enumeration value="Accessibility"/>
+      <xs:enumeration value="Animation"/>
+      <xs:enumeration value="Gauge2"/>
+      <xs:enumeration value="InfiView"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+
+  <xs:element name="AbstractChart">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for charts that are to be used with
+        BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChart" substitutionGroup="AbstractChart"/>
+
+  <xs:attributeGroup name="AbstractChartAttributes">
+
+    <xs:attributeGroup ref="AbstractChartBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for charts that are to be used with
+        BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChart2" substitutionGroup="AbstractChart2"/>
+
+  <xs:attributeGroup name="AbstractChart2Attributes">
+
+    <xs:attributeGroup ref="AbstractChartBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChartBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiAbstractChart
+        and BiAbstractChart2. All the charts
+        in BiGraph and BiGraph2
+        extend either BiAbstractChart or
+        BiAbstractChart2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChartBase" substitutionGroup="AbstractChartBase"/>
+
+  <xs:attributeGroup name="AbstractChartBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChartSection">
+    <xs:annotation>
+      <xs:documentation>
+        Used as base class for marker, column rect and pie chart section. These
+        are used to create the visual presentation for the data points of a chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChartSection" substitutionGroup="AbstractChartSection"/>
+
+  <xs:attributeGroup name="AbstractChartSectionAttributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChartSection2">
+    <xs:annotation>
+      <xs:documentation>
+        Used as base class for the column rectangles in BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartSection2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChartSection2" substitutionGroup="AbstractChartSection2"/>
+
+  <xs:attributeGroup name="AbstractChartSection2Attributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractChartSectionBase">
+    <xs:annotation>
+      <xs:documentation>
+        Used as base class for marker, column rect and pie chart section. These
+        are used to create the visual presentation for the data points of a chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractChartSectionBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractChartSectionBase" substitutionGroup="AbstractChartSectionBase"/>
+
+  <xs:attributeGroup name="AbstractChartSectionBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="strokeOpacity">
+      <xs:annotation>
+        <xs:documentation>The stroke opacity for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The stroke color for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillOpacity">
+      <xs:annotation>
+        <xs:documentation>The fill opacity for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor2">
+      <xs:annotation>
+        <xs:documentation>The alternate fill color used when fill type is gradient</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillType">
+      <xs:annotation>
+        <xs:documentation>The fill type used when painting the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillAngle">
+      <xs:annotation>
+        <xs:documentation>The fill angle used when painting the chart.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerType">
+      <xs:annotation>
+        <xs:documentation>The marker type for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerVisible">
+      <xs:annotation>
+        <xs:documentation>Whether markers are visible for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="explode">
+      <xs:annotation>
+        <xs:documentation>The amount to move the pie chart section from the center (percentage of radius)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Border">
+    <xs:annotation>
+      <xs:documentation>BiAbstractGauge2Border is the base class of all gauge2 borders
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2BorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Border" substitutionGroup="AbstractGauge2Border"/>
+
+  <xs:attributeGroup name="AbstractGauge2BorderAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Cap">
+    <xs:annotation>
+      <xs:documentation>This the base class of all caps
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2CapAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Cap" substitutionGroup="AbstractGauge2Cap"/>
+
+  <xs:attributeGroup name="AbstractGauge2CapAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Filler">
+    <xs:annotation>
+      <xs:documentation>This the base class of all fillers, fillers is used for coloring the background of gauge2 objects
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2FillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Filler" substitutionGroup="AbstractGauge2Filler"/>
+
+  <xs:attributeGroup name="AbstractGauge2FillerAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2GradientFiller">
+    <xs:annotation>
+      <xs:documentation>This class is the base class of all gradient fillers.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2GradientFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2GradientFiller" substitutionGroup="AbstractGauge2GradientFiller"/>
+
+  <xs:attributeGroup name="AbstractGauge2GradientFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2FillerAttributes"/>
+
+    <xs:attribute name="color1" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The color1 that the filler is going to use.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="color2" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The color2 that the filler is going to use.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opacity1" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The opacity1 that the filler is going to use for color1.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opacity2" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The opacity2 that the filler is going to use for color2.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="xpos" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The the x position of the center of the radial filling.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ypos" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The the y position of the center of the radial filling.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="highLightCenter" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Center of the highlight of the ring in percent. 0 being at the inner radius, 100
+          at the outer radius.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="thickness" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Thickness of the "ring" in percent.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Range">
+    <xs:annotation>
+      <xs:documentation>This class is the base class of all gauge2 ranges. A gauge2 range contains the "ticks" and "scales" and it can also
+        contain "borders".
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2RangeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Range" substitutionGroup="AbstractGauge2Range"/>
+
+  <xs:attributeGroup name="AbstractGauge2RangeAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Scale">
+    <xs:annotation>
+      <xs:documentation>This class is the base class of all scales
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2ScaleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Scale" substitutionGroup="AbstractGauge2Scale"/>
+
+  <xs:attributeGroup name="AbstractGauge2ScaleAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+    <xs:attribute name="labelColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Color of the label printing the scale values</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Size of the label printing the scale values</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="numValSteps" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Number of steps between values</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="startVal" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The start value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endVal" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The end value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="postString" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - String that is printed before values.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preString" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - String that is printed after values.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2ScaleSection">
+    <xs:annotation>
+      <xs:documentation>This is the base class for all scale sections
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2ScaleSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2ScaleSection" substitutionGroup="AbstractGauge2ScaleSection"/>
+
+  <xs:attributeGroup name="AbstractGauge2ScaleSectionAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+    <xs:attribute name="startVal" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The start value of the sacle section</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endVal" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The end value of the sacle section</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2Ticks">
+    <xs:annotation>
+      <xs:documentation>This class is the base class of all ticks classes
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2TicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2Ticks" substitutionGroup="AbstractGauge2Ticks"/>
+
+  <xs:attributeGroup name="AbstractGauge2TicksAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+    <xs:attribute name="tickLength" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The length of each tick.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="numTickSteps" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Number of steps between ticks i.e. 10 steps gives you 11 ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGauge2ValueMarker">
+    <xs:annotation>
+      <xs:documentation>This is the base class of all value markers inBiGauge2 i.e.BiGauge2RadialNeedle
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGauge2ValueMarkerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGauge2ValueMarker" substitutionGroup="AbstractGauge2ValueMarker"/>
+
+  <xs:attributeGroup name="AbstractGauge2ValueMarkerAttributes">
+
+    <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGrid">
+    <xs:annotation>
+      <xs:documentation>The abstract base class for the grid and the
+        tree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGridAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGrid" substitutionGroup="AbstractGrid"/>
+
+  <xs:attributeGroup name="AbstractGridAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="allowInlineFind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When true, typing a word will select the first matching item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRowHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the row headers on the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowHeadersWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the row headers that can be shown when using a grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of each row in the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnCount" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of columns to show in the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - An array containing the widths of the columns.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - An array containing the orders of the columns. A value of
+          [2, 0, 1] means that the third column should be displayed left most
+          and the second column right most.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnAligns" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - An array containing the text aligns for the columns.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnNames" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - An array containing the names for
+          the columns. The names are used for the text on the column header.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnSortTypes" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - An array containg the sort types for the columns. Valid values can
+          be found in the documentation for the BiGridColumn
+          sortType.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="iconColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The column to show the icon on.
+          Setting this to -1 (or a value greater than the column count) removes
+          the icons.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fitColumnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true the columns will be sized horizontally so that they fill the grid viewport
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="liveResize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is set to true the column size in the grid body is
+          updated as the user resizes the headers. If this is false the
+          column size in the body is only updated as the user finishes the
+          resize of the column header.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the headers on the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="headersHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the headers.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="multipleSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to allow multiple selection.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiSelectionModel - This handles the selection of the rows in the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforesort" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the sort happens. Call
+          preventDefault
+          to prevent the sorting.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onsort" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires after the grid has been sorted.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGridRow">
+    <xs:annotation>
+      <xs:documentation>The base class for the rows and
+        nodes in a grid
+        or a tree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGridRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractGridRow" substitutionGroup="AbstractGridRow"/>
+
+  <xs:attributeGroup name="AbstractGridRowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="backColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The background color name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="foreColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The foreground color name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage /BiUri / String - The image to use as icon on the row. The icon supports bothBiImage (or
+          other objects with getIconHtml) as well as a string/uri for backwards compat
+          and more lightweight
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the grid row is selected or not.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractLoader">
+    <xs:annotation>
+      <xs:documentation>This abstract class defines the minimal interface for supporting loading
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAbstractLoader" substitutionGroup="AbstractLoader"/>
+
+  <xs:attributeGroup name="AbstractLoaderAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="async" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to load the text file asynchronously</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="supportsSync" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the loader supports loading the file synchronously</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AccordionButton">
+    <xs:annotation>
+      <xs:documentation>This button component is a internal part of BiAccordionPage
+        and is used to expand the page.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AccordionButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAccordionButton" substitutionGroup="AccordionButton"/>
+
+  <xs:attributeGroup name="AccordionButtonAttributes">
+
+    <xs:attributeGroup ref="ButtonAttributes"/>
+
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Returns whether the parent BiAccordionPage is the
+          currently expanded page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AccordionPage">
+    <xs:annotation>
+      <xs:documentation>This class represents the pages inside a BiAccordionPane.
+        A accordion page has a BiAccordionButton placed directly
+        above its content, this button is used to set the page to be the only page in the parent
+        BiAccordionPane to be shown.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AccordionPageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAccordionPage" substitutionGroup="AccordionPage"/>
+
+  <xs:attributeGroup name="AccordionPageAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text to show on the page button</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The icon to show on the page button</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="contentPane" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The content of the page</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AccordionPane">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating accordion controls. A accordion control contains
+        one or more BiAccordionPage. Each accordion page also
+        has a BiAccordionButton that is shown above the
+        page and when the button is clicked the page is shown.
+        Pages are oriented vertically from top to bottom and can either be statically shown or animated.
+
+        The property animationSpeed (a) alters the speed (s) in proportion to the animated
+        page height (h), using the following formula h2 = h1 - h1 / a, every 0.05 s.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AccordionPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAccordionPane" substitutionGroup="AccordionPane"/>
+
+  <xs:attributeGroup name="AccordionPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="animated" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the pages are animated or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="animationSpeed" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Float - Animation speed (1 - infinite) where 1 is the same as setting animated to false.
+          Default value is 1.4
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiAccordionPage - The currently selected accordion button.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Adf">
+    <xs:annotation>
+      <xs:documentation>This class handles the loading and interpretation of the Application
+        Definition File (ADF).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AdfAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAdf" substitutionGroup="Adf"/>
+
+  <xs:attributeGroup name="AdfAttributes">
+
+    <xs:attributeGroup ref="XmlLoaderAttributes"/>
+
+    <xs:attribute name="caption" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The desired caption for the application window</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference to the object created from this XML element. This property
+          is mapped to the xmlResourceParser as well as the resource
+          loader used to load the resources.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AnimationRange">
+    <xs:annotation>
+      <xs:documentation>Defines a value range, used by BiComponentAnimation, when animating.
+        You specify a start and an end value that will be animated.
+        You also specify the duration/time, in ms, that it should take to animate the value range.
+        There are several different acceleration behaviors/types that you can choose from.
+        BiAnimationRange has the ability to progress (displace) the current value, within the animation range.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AnimationRangeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAnimationRange" substitutionGroup="AnimationRange"/>
+
+  <xs:attributeGroup name="AnimationRangeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="startValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Lower boundry of the value range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Upper boundry of the value range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The acceleration type/behavior for this value range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="time" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Desired duration of this value range, measured in milliseconds.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="curValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The current position/value inside the value range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="ApplicationAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="progressStatus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the progress status text shown while loading</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accessibilityMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This property can be used to tell whether the application should be in an
+          accessibility mode. This does not really do anything and it is up to the
+          components and implementations to make sure of this.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accessibilityDescription" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This property can be used to popup an alert with a description about the
+          application when the application is in accessibility mode. This is useful
+          if the user needs to be informed about something to be able to use the
+          application.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference to the object created from this XML element. This property
+          is mapped to the xmlResourceParser as well as the resource
+          loader used to load the resources.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="focusOnLoad" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to try to focus the window when the application loads</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="inactivityTimeout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - When this is set the application will fire an event
+          called inactive. The value of this is the number of minutes before
+          the inactive is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="defaultPackages" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The default packages to load. This needs to be set before the loading
+          actually starts. To do this you can use an attribute in the Application tag
+          in your ADF or set this in the HTML file hosting your application.
+          If you just want to add a few packages then use a Package tag in your Resources
+          section of the ADF.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this wizard pane.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondispose" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires just before the application is disposed.
+          This allows you to clean up your main program
+          before closing the application window.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onprogressstatus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the progress status has changed.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onresourcesready" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired after the Bindows markup has been
+          handled but before the main method is called.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when everything has been loaded
+          and initialized. This is called after the main
+          method has been called.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="ApplicationWindowAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="caption" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The title text on the application window</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="acceptButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default accept button. If this is set
+          then the action
+          event is dispatched from the accept button when the enter key
+          is pressed. This does not have to be a
+          BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cancelButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default cancel button. If this is set
+          then the action
+          event is dispatched from the cancel button. This does not have to
+          be aBiButton, anyBiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="glassPaneVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to hide or show the glass pane. The glass pane is shown automatically when using dialogs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="globalCursor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Setting the global cursor will make the mouse pointer use the
+          given cursor for all the components and thus overriding the
+          cursor property of the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="allowBrowserContextMenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Decides whether the browser context menu should be shown by default.
+          If this is set to true you can still prevent the
+          browser context menu from being shown by calling preventDefault on the event object
+          used in the contextmenu
+          event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Area">
+    <xs:annotation>
+      <xs:documentation>This class represents an area with a given left, top, width and height
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiArea" substitutionGroup="Area"/>
+
+  <xs:attributeGroup name="AreaAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="left" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The left position of the area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="top" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The top position of the area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="height" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="AreaCollection">
+    <xs:annotation>
+      <xs:documentation>This collection containsBiArea objects
+
+        This implements the same interface asBiSelectionItemCollection
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AreaCollectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAreaCollection" substitutionGroup="AreaCollection"/>
+
+  <xs:attributeGroup name="AreaCollectionAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AttachedComponentModel">
+    <xs:annotation>
+      <xs:documentation>This class is used to handleBiComponent objects insideBiTreeView andBiOlapGrid. An
+        attached component will be positioned at the same place as the cell it is
+        attached to and have the same size as that cell.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AttachedComponentModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiAttachedComponentModel" substitutionGroup="AttachedComponentModel"/>
+
+  <xs:attributeGroup name="AttachedComponentModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BarChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a bar chart for the given series.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BarChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBarChart" substitutionGroup="BarChart"/>
+
+  <xs:attributeGroup name="BarChartAttributes">
+
+    <xs:attributeGroup ref="ColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BarChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a bar chart for the given series. This is used
+        with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BarChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBarChart2" substitutionGroup="BarChart2"/>
+
+  <xs:attributeGroup name="BarChart2Attributes">
+
+    <xs:attributeGroup ref="ColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Base64">
+    <xs:annotation>
+      <xs:documentation>This class is used to represent base 64 encoded data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Base64Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBase64" substitutionGroup="Base64"/>
+
+  <xs:attributeGroup name="Base64Attributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="base64" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the base 64 encoded data</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the plain text data (the decoded base 64 data)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Border">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to describe a border for a component. The border
+        consists of three properties; width, style and color. Supported styles
+        are: none - No border is drawn, regardless of the width. dotted dashed solid double groove ridge inset outset
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBorder" substitutionGroup="Border"/>
+
+  <xs:attributeGroup name="BorderAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="leftWidth">
+      <xs:annotation>
+        <xs:documentation>The left border width</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightWidth">
+      <xs:annotation>
+        <xs:documentation>The right border width</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topWidth">
+      <xs:annotation>
+        <xs:documentation>The top border width</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomWidth">
+      <xs:annotation>
+        <xs:documentation>The bottom border width</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leftStyle">
+      <xs:annotation>
+        <xs:documentation>The left border style</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightStyle">
+      <xs:annotation>
+        <xs:documentation>The right border style</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topStyle">
+      <xs:annotation>
+        <xs:documentation>The top border style</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomStyle">
+      <xs:annotation>
+        <xs:documentation>The bottom border style</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leftColor">
+      <xs:annotation>
+        <xs:documentation>The left border color</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightColor">
+      <xs:annotation>
+        <xs:documentation>The right border color</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topColor">
+      <xs:annotation>
+        <xs:documentation>The top border color</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomColor">
+      <xs:annotation>
+        <xs:documentation>The bottom border color</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width">
+      <xs:annotation>
+        <xs:documentation>The width (in pixels) of the border on all sides</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="style">
+      <xs:annotation>
+        <xs:documentation>The style of the border on all sides</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="color">
+      <xs:annotation>
+        <xs:documentation>The color of the border on all sides</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Box">
+    <xs:annotation>
+      <xs:documentation>This layout component places its children from left to right for the horizontal
+        box and from top to bottom for the vertical box. This is a fairly advanced
+        layout component that takes preferred, minimum and maximum size of the children
+        into account. It also takes margins into account and it uses margin collapsing
+        so that two adjacent children share the larger margin.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBox" substitutionGroup="Box"/>
+
+  <xs:attributeGroup name="BoxAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="orient" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The orientation to layout the children. Valid values are "horizontal" and
+          "vertical". When set to "horizontal", rightToLeft is taken into account.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The align property decides how to size and position the children. This
+          describes the size and position in the orthogonal direction of the
+          box orientation. For a
+          horizontal box this describes the height and top position and for a vertical
+          layout this describes the width and left position
+          Valid values are:
+          stretch
+          start
+          center
+          end
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="pack" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes how to layout the controls when there are no flexing children
+          and there is any remaining space.
+
+          Valid values are:
+          start
+          center
+          end
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="BrowserCheck">
+    <xs:annotation>
+      <xs:documentation>This class is used to identify the browser that the user is using.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BrowserCheckAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiBrowserCheck" substitutionGroup="BrowserCheck"/>
+
+  <xs:attributeGroup name="BrowserCheckAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Button">
+    <xs:annotation>
+      <xs:documentation>A button that can contain both text and an icon
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiButton" substitutionGroup="Button"/>
+
+  <xs:attributeGroup name="ButtonAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user presses the button (either
+          using the mouse or the keyboard)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Calendar">
+    <xs:annotation>
+      <xs:documentation>This class represents a calendar control
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CalendarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCalendar" substitutionGroup="Calendar"/>
+
+  <xs:attributeGroup name="CalendarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - Getter for the maximum selectable date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - Getter for the maximum selectable date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showYearButtons" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the buttons that allow you to go to next or previous year
+          in the caption
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMonthButtons" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the buttons that allow you to go to next or previous month
+          in the caption
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showCaption" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the caption or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scaleFonts" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to resize the font in the day labels and days
+          when calendar is resized.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="currentDate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The date describing the currently shown month. To get the selected date(s)
+          use selectedDate(s)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dateFormatSymbols" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDateFormatSymbols - The object providing the date picker with the symbols needed to display
+          localized strings
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedDate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The selected date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedDates" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date[] - These are the selected dates. In case multiple selection is used then use
+          this instead of selectedDate
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the selection changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user clicks on a day</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="CalendarSelectionModel">
+    <xs:annotation>
+      <xs:documentation>This selection model is used withBiCalendar and the items in the model
+        are Javascript date objects. Two dates are considered equal if they are
+        representing the same date (in other words the time of the day is ignored).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CalendarSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCalendarSelectionModel" substitutionGroup="CalendarSelectionModel"/>
+
+  <xs:attributeGroup name="CalendarSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The minimum selectable date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The maximum selectable date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartArea">
+    <xs:annotation>
+      <xs:documentation>
+        This class represents the area where the charts inside a graph are displayed.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartArea" substitutionGroup="ChartArea"/>
+
+  <xs:attributeGroup name="ChartAreaAttributes">
+
+    <xs:attributeGroup ref="ChartAreaBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartArea2">
+    <xs:annotation>
+      <xs:documentation>
+        This is the chart area used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartArea2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartArea2" substitutionGroup="ChartArea2"/>
+
+  <xs:attributeGroup name="ChartArea2Attributes">
+
+    <xs:attributeGroup ref="ChartAreaBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartAreaBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiChartArea
+        and BiChartArea2.
+        The chart area is the part of the graph that contains the charts.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartAreaBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartAreaBase" substitutionGroup="ChartAreaBase"/>
+
+  <xs:attributeGroup name="ChartAreaBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The background color of the
+          chart area
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor2">
+      <xs:annotation>
+        <xs:documentation>The alternate color of the
+          chart area (used when fill type is gradient)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillOpacity">
+      <xs:annotation>
+        <xs:documentation>The background color opacity of the
+          chart area
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillType">
+      <xs:annotation>
+        <xs:documentation>
+          The type of the fill. Valid values are:
+          solid
+          gradient
+          gradientradial
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillAngle">
+      <xs:annotation>
+        <xs:documentation>The angle of the gradient</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The border color of the
+          chart area
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeOpacity">
+      <xs:annotation>
+        <xs:documentation>The border opacity of the
+          chart area
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartCategory">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to describe the categories of the data for a
+        graph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartCategoryAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartCategory" substitutionGroup="ChartCategory"/>
+
+  <xs:attributeGroup name="ChartCategoryAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="title">
+      <xs:annotation>
+        <xs:documentation>The title of the category</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartCategoryAxis">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the drawing of the category axis for a
+        BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartCategoryAxisAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartCategoryAxis" substitutionGroup="ChartCategoryAxis"/>
+
+  <xs:attributeGroup name="ChartCategoryAxisAttributes">
+
+    <xs:attributeGroup ref="ChartCategoryAxisBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartCategoryAxis2">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the drawing of the category axis for a
+        BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartCategoryAxis2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartCategoryAxis2" substitutionGroup="ChartCategoryAxis2"/>
+
+  <xs:attributeGroup name="ChartCategoryAxis2Attributes">
+
+    <xs:attributeGroup ref="ChartCategoryAxisBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartCategoryAxisBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base calss for BiChartCategoryAxis
+        and BiChartCategoryAxis2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartCategoryAxisBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartCategoryAxisBase" substitutionGroup="ChartCategoryAxisBase"/>
+
+  <xs:attributeGroup name="ChartCategoryAxisBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="majorTickInterval">
+      <xs:annotation>
+        <xs:documentation>
+          The distance between the major ticks. Setting this to null makes
+          the tick interval automatic, which means that the tick interval is decided by
+          looking at the data of the charts.
+          This value needs to be an integer.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorTickInterval">
+      <xs:annotation>
+        <xs:documentation>
+          The distance between the minor ticks. Setting this to null makes
+          the tick interval automatic, which means that the tick interval is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMajorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showLabels">
+      <xs:annotation>
+        <xs:documentation>Whether to show the labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="axisBetweenCategories">
+      <xs:annotation>
+        <xs:documentation>
+          When this is true the data points, the labels and the value axis are
+          placed between the major ticks. When false the data points, the labels
+          and the value axis are placed on the major ticks. The default is
+          true and therefore the first value will not be placed on
+          the value axis.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fontSize">
+      <xs:annotation>
+        <xs:documentation>
+          The font size (in pixels) for the labels of the axis.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartGridLines">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to display the grid lines for
+        BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartGridLinesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartGridLines" substitutionGroup="ChartGridLines"/>
+
+  <xs:attributeGroup name="ChartGridLinesAttributes">
+
+    <xs:attributeGroup ref="ChartGridLinesBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartGridLines2">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to display the grid lines for
+        BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartGridLines2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartGridLines2" substitutionGroup="ChartGridLines2"/>
+
+  <xs:attributeGroup name="ChartGridLines2Attributes">
+
+    <xs:attributeGroup ref="ChartGridLinesBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartGridLinesBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiChartGridLines
+        and BiChartGridLines2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartGridLinesBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartGridLinesBase" substitutionGroup="ChartGridLinesBase"/>
+
+  <xs:attributeGroup name="ChartGridLinesBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="showMajorValue">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major value grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorValue">
+      <xs:annotation>
+        <xs:documentation>Whether to show the minor value grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMajorCategory">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major category grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorCategory">
+      <xs:annotation>
+        <xs:documentation>Whether to show the minor category grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorValueStrokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the major value grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorValueStrokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the minor value grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorCategoryStrokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the major category grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorCategoryStrokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the minor category grid lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartLegend">
+    <xs:annotation>
+      <xs:documentation>
+        The legend component is used to show a list of the titles of the series
+        or categories depending on the chart type.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartLegendAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartLegend" substitutionGroup="ChartLegend"/>
+
+  <xs:attributeGroup name="ChartLegendAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="fontSize">
+      <xs:annotation>
+        <xs:documentation>
+          The font size (in pixels) of the labels inside the legend.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartLegendLabel">
+    <xs:annotation>
+      <xs:documentation>
+        A special lable used for the items in the chart
+        legend
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartLegendLabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartLegendLabel" substitutionGroup="ChartLegendLabel"/>
+
+  <xs:attributeGroup name="ChartLegendLabelAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="legendFor">
+      <xs:annotation>
+        <xs:documentation>
+          The object used for the text and the icon for the label. This object
+          needs to have the methods getTitle() (See for example
+          title for BiAbstractChart)
+          and getIconHtml(oLabel) (See for example
+          getIconHtml for BiImage).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartMouseEvent">
+    <xs:annotation>
+      <xs:documentation>
+        This event is used for mouse events that are specific for a data point
+        inside a graph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartMouseEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartMouseEvent" substitutionGroup="ChartMouseEvent"/>
+
+  <xs:attributeGroup name="ChartMouseEventAttributes">
+
+    <xs:attributeGroup ref="MouseEventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartPoint">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to describe how to display a data point in the graph.
+        Each point is bound to a series and a category.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartPointAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartPoint" substitutionGroup="ChartPoint"/>
+
+  <xs:attributeGroup name="ChartPointAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="strokeOpacity">
+      <xs:annotation>
+        <xs:documentation>The stroke opacity for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The stroke color for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillOpacity">
+      <xs:annotation>
+        <xs:documentation>The fill opacity for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor2">
+      <xs:annotation>
+        <xs:documentation>The alternate fill color used when fill type is gradient</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillType">
+      <xs:annotation>
+        <xs:documentation>The fill type used when painting the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillAngle">
+      <xs:annotation>
+        <xs:documentation>The fill angle used when painting the section of the chart this point descibes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerType">
+      <xs:annotation>
+        <xs:documentation>The marker type for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerVisible">
+      <xs:annotation>
+        <xs:documentation>Whether markers are visible for the section of the chart this point descibes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="explode">
+      <xs:annotation>
+        <xs:documentation>The amount to move the pie chart section from the middle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartPresentation">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to define the presentation attributes for a chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartPresentationAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartPresentation" substitutionGroup="ChartPresentation"/>
+
+  <xs:attributeGroup name="ChartPresentationAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="strokeOpacity">
+      <xs:annotation>
+        <xs:documentation>The stroke opacity for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The stroke color for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillOpacity">
+      <xs:annotation>
+        <xs:documentation>The fill opacity for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor2">
+      <xs:annotation>
+        <xs:documentation>The alternate fill color used when fill type is gradient</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillType">
+      <xs:annotation>
+        <xs:documentation>The fill type used when painting the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillAngle">
+      <xs:annotation>
+        <xs:documentation>The fill angle used when painting the chart.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerType">
+      <xs:annotation>
+        <xs:documentation>The marker type for the line chart. Valid values are
+          circle
+          square
+          trianle
+          diamond
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="markerVisible">
+      <xs:annotation>
+        <xs:documentation>Whether markers are visible for the chart</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="explode">
+      <xs:annotation>
+        <xs:documentation>The amount to move the pie chart sections from the middle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="barSpacing">
+      <xs:annotation>
+        <xs:documentation>
+          This is the relative distance between the bars or columns of different categories.
+          1 means that the distance is the same as the width/height of the column/bar.
+          0 means that there is no spacing.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartPresentationManager">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to find the properties for different visual aspects of
+        of the graph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartPresentationManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartPresentationManager" substitutionGroup="ChartPresentationManager"/>
+
+  <xs:attributeGroup name="ChartPresentationManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartSeries">
+    <xs:annotation>
+      <xs:documentation>
+        This describes a series of values that is used with the graph
+        control. Each series has a unique id and every value of the series
+        belongs to a certain category.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartSeriesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartSeries" substitutionGroup="ChartSeries"/>
+
+  <xs:attributeGroup name="ChartSeriesAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="title">
+      <xs:annotation>
+        <xs:documentation>The title of the series</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="values">
+      <xs:annotation>
+        <xs:documentation>
+          The values in the series. This is the same order as the order of
+          the categories. If a value for a certain category is missing the
+          value for that is null in the array.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartValueAxis">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the drawing of the value axis for a
+        graph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartValueAxisAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartValueAxis" substitutionGroup="ChartValueAxis"/>
+
+  <xs:attributeGroup name="ChartValueAxisAttributes">
+
+    <xs:attributeGroup ref="ChartValueAxisBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartValueAxis2">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the drawing of the value axis for a
+        BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartValueAxis2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartValueAxis2" substitutionGroup="ChartValueAxis2"/>
+
+  <xs:attributeGroup name="ChartValueAxis2Attributes">
+
+    <xs:attributeGroup ref="ChartValueAxisBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ChartValueAxisBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiChartValueAxis
+        and BiChartValueAxis2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ChartValueAxisBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiChartValueAxisBase" substitutionGroup="ChartValueAxisBase"/>
+
+  <xs:attributeGroup name="ChartValueAxisBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="showMajorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showLabels">
+      <xs:annotation>
+        <xs:documentation>Whether to show the labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fontSize">
+      <xs:annotation>
+        <xs:documentation>
+          The font size (in pixels) for the labels of the axis.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorTickInterval">
+      <xs:annotation>
+        <xs:documentation>
+          The distance between the major ticks. Setting this to null makes
+          the tick interval automatic, which means that the tick interval is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorTickInterval">
+      <xs:annotation>
+        <xs:documentation>
+          The distance between the minor ticks. Setting this to null makes
+          the tick interval automatic, which means that the tick interval is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum">
+      <xs:annotation>
+        <xs:documentation>
+          The max value of the value axis. Setting this to null makes
+          the max value automatic, which means that the max value is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum">
+      <xs:annotation>
+        <xs:documentation>
+          The min value of the value axis. Setting this to null makes
+          the min value automatic, which means that the min value is decided by
+          looking at the data of the charts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="CheckBox">
+    <xs:annotation>
+      <xs:documentation>Represents a check box control
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CheckBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCheckBox" substitutionGroup="CheckBox"/>
+
+  <xs:attributeGroup name="CheckBoxAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the check box</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the check box is checked or not. When this is changed the
+          change event is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user presses the button (either
+          using the mouse or the keyboard)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked property is
+          changed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="CheckBoxMenuItem">
+    <xs:annotation>
+      <xs:documentation>This class is used for a menu item that displays a check box to the left
+        of the text.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CheckBoxMenuItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCheckBoxMenuItem" substitutionGroup="CheckBoxMenuItem"/>
+
+  <xs:attributeGroup name="CheckBoxMenuItemAttributes">
+
+    <xs:attributeGroup ref="MenuItemAttributes"/>
+
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the item is checked or not.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked property changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Circle">
+    <xs:annotation>
+      <xs:documentation>This class represents the shape of a Circle.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CircleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCircle" substitutionGroup="Circle"/>
+
+  <xs:attributeGroup name="CircleAttributes">
+
+    <xs:attributeGroup ref="ShapeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColorPicker">
+    <xs:annotation>
+      <xs:documentation>This dialog allows the user to select a predefined color or define his
+        own color.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColorPickerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColorPicker" substitutionGroup="ColorPicker"/>
+
+  <xs:attributeGroup name="ColorPickerAttributes">
+
+    <xs:attributeGroup ref="DialogAttributes"/>
+
+    <xs:attribute name="rgbString" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The rgb string ("rgb(255,255,255)") describing the selected color.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rgb" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The rgb triplet describing the selected color.
+          The rgb triplet is an object with r (0 - 255), g (0 - 255) and b (0 - 255) fields
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hsl" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The hsl triplet describing the selected color.
+          The hsl triplet is an object with h (0 - 360), s (0 - 1) and l (0 - 1) fields
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this color picker. If this is set to null
+          then the static string bundle forBiColorPicker is used
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event fires continiously when the user changes the color.
+          If you want to know when the user closes the dialog use the
+          dialogresult
+          event inherited from the BiDialog.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColumnChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a column chart for the given series
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColumnChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColumnChart" substitutionGroup="ColumnChart"/>
+
+  <xs:attributeGroup name="ColumnChartAttributes">
+
+    <xs:attributeGroup ref="AbstractChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColumnChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a column chart for the given series
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColumnChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColumnChart2" substitutionGroup="ColumnChart2"/>
+
+  <xs:attributeGroup name="ColumnChart2Attributes">
+
+    <xs:attributeGroup ref="AbstractChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColumnChartSection">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the components used to show the rectangles for a
+        column chart.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColumnChartSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColumnChartSection" substitutionGroup="ColumnChartSection"/>
+
+  <xs:attributeGroup name="ColumnChartSectionAttributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ColumnChartSection2">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the components used to show the rectangles for a
+        column chart.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ColumnChartSection2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiColumnChartSection2" substitutionGroup="ColumnChartSection2"/>
+
+  <xs:attributeGroup name="ColumnChartSection2Attributes">
+
+    <xs:attributeGroup ref="AbstractChartSection2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComboBox">
+    <xs:annotation>
+      <xs:documentation>This class represents a combo box.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComboBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiComboBox" substitutionGroup="ComboBox"/>
+
+  <xs:attributeGroup name="ComboBoxAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="sortType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets built in sort method to use to sort the combobox items, this
+          property is only used in the absence of a custom sort method.
+          Valid settings are: (seeBiSort for more details)
+          string caseInsensitiveString number date - Uses the native JS Date type
+          To get better control over the sorting, set the sortFunction property
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortFunction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - Compare function used to sort combobox items. The function
+          takes two arguments and returns a number (just like the normal
+          comparison function used when sorting arrays in JavaScript).
+          If this property is not set, it uses the predefined
+          functions set by the sortType property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedItem" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComboBoxItem - The selected combo box item. If no item is selected this will be null.
+          When this changes the change event fires.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the currently selected item. -1 if none.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - This is the userValue of the selected combo box item.
+          If no item is selected then this returns null.
+          When setting this, the first item with the given user value will be selected.
+          If no item has this value the selection will not change.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Deprecated. Use userValue instead.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="editable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the text field can be edited</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dropDownVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the combo box is displaying its drop-down list.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dropDownWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The desired width of the drop-down list.
+          The width of the drop-down is always greater than or equal to the width of the combo box.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text shown in the combo box.
+          This can be used to find the text that the user is currently typing into the text field of the combo box.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="validator" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - A function that is used to validate the text</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="invalidMessage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - A string that can be used to describe why the input is invalid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataTextField" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column to use as the data for the text property of the combo box items.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataUserValueField" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column to use as the data for the userValue property of the combo box items.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onactivechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the active item changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedItem changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondatabind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Called after the component has been data bound</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ontextchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the text changes in the text field of the combo box. To get the new text use the text property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComboBoxItem">
+    <xs:annotation>
+      <xs:documentation>This class represents an item in theBiComboBox.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComboBoxItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiComboBoxItem" substitutionGroup="ComboBoxItem"/>
+
+  <xs:attributeGroup name="ComboBoxItemAttributes">
+
+    <xs:attributeGroup ref="ListItemAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Command">
+    <xs:annotation>
+      <xs:documentation>
+        Command objects can be used to make several user interface components
+        execute the command when they are invoked. Components that use the command
+        object will be synchronized with the properties of the command. For example,
+        if a button has a disabled command the button will also be disabled.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CommandAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCommand" substitutionGroup="Command"/>
+
+  <xs:attributeGroup name="CommandAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="enabled">
+      <xs:annotation>
+        <xs:documentation>
+          Whether the command is enabled or not
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked">
+      <xs:annotation>
+        <xs:documentation>
+          The checked state of the command. This is usually used to synchronize
+          the checked property of the components using this command (such as
+          BiRadioButton,
+          BiCheckBox and others).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue">
+      <xs:annotation>
+        <xs:documentation>
+          The user value of the command. This is usually used to synchronize
+          the user values of the components using this command (such as
+          BiRadioGroup and
+          BiComboBox).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="shortcut">
+      <xs:annotation>
+        <xs:documentation>
+          The keyboard shortcut used to execute the command. The format for
+          the shortcut is:
+          Ctrl+Shift+Alt+k
+          You can also use the static fields of BiKeyboardEvent
+          for describing the key codes:
+
+          Shift+Del
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="keyCode">
+      <xs:annotation>
+        <xs:documentation>
+          This gives a bit more detail than the shortcut property because
+          there are cases where there is no name for the key. Use shortcut
+          whenever possible and fall back on keyCode when needed. If keyCode
+          is provided only the modifiers from the shortcut is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onexecute" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the command is executed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onenabledchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the enabled property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncheckedchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the checked property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onuservaluechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the userValue property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onshortcutchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This is fired when the shortcut property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Component">
+    <xs:annotation>
+      <xs:documentation>This is the core class for all visual components in Bindows.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+        <!--<xs:group ref="iv:ElementsAllowedExternally"/>-->
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiComponent" substitutionGroup="Component"/>
+
+  <xs:attributeGroup name="ComponentAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="parent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - Returns the parent component. This is the component that the
+          current component was added to. If the current component has not
+          been added to any component this returns null. If the real
+          parent component is anonymous then this returns the first non anonymous
+          ancestor.
+          When setting this the component is added last to the new parent. If you set
+          this to null the component is removed from its current parent
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="children" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent[] - The components added to the current component. This does not include anonymous
+          children.
+          When setting this all the old children are first removed and disposed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="foreColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The foreground color name. The supported color names follows CSS2.1</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The background color name. The supported color names follows CSS2.1</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="zIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The z index of the component. A higher z index means that the component will
+          cover components with lower z index and therefore appear to be closer to
+          the user.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the component is visible or not. Note that all the ancestors must be
+          visible for the component to be actually shown. Use isVisible to
+          check that the component is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cursor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the cursor to show when the mouse pointer is over the component.
+          This is any valid CSS2 cursor name.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backgroundImage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI of the image file to use as background image.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opacity" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the opacity for the component. Any child component inside the
+          component will also become transparent. The value should be a
+          number between 0 and 1 where 1 means totally opaque and 0 invisible.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="left" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The left position relative to the parent inner edge.
+          When using get the return value is always a number
+          representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="right" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The right position relative to the parent inner edge. When using
+          right a width should also be set. When using get the
+          return value is always a number representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="top" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The top position relative to the parent inner edge.
+          When using get the return value is always a number
+          representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The bottom position relative to the parent inner edge. When using
+          bottom a height should also be set. When using get the
+          return value is always a number representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the component. When using get the return value is
+          always a number representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="height" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the component. When using get the return value is
+          always a number representing the pixel value.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preferredWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired width of the component. This is usually the
+          size of the content plus the borders.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preferredHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired height of the component. This is usually the
+          size of the content plus the borders.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimumWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired minimum width of the component. This does not
+          limit the size but is used by some components as a layout hint.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximumWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired maximum width of the component. This does not
+          limit the size but is used by some components as a layout hint.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimumHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired minimum height of the component. This does not
+          limit the size but is used by some components as a layout hint.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximumHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Returns the desired maximum height of the component. This does not
+          limit the size but is used by some components as a layout hint.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="border" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiBorder - The border property describes how to paint the border on the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="marginLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The left margin for the component. Margins are used by some layout managers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="marginRight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The right margin for the component. Margins are used by some layout managers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="marginTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The top margin for the component. Margins are used by some layout managers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="marginBottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The bottom margin for the component. Margins are used by some layout managers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clipLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is the clip left value. When this is set the shown region of the component
+          starts this many pixels from the left.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clipTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is the clip top value. When this is set the shown region of the component
+          starts this many pixels from the top.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clipWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is the width of the shown region when the component is clipped.
+          A value of null means the entire (remaining) width is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clipHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is the height of the shown region when the component is clipped.
+          A value of null means the entire (remaining) height is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="overflow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Describes how to handle content that is too large to fit inside
+          the component. hidden - The content is clipped auto - Scroll bars are shown as needed scroll - Scroll bars are always shown. Even
+          if there
+          is enough room for the content inside the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="overflowX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes how to handle content that is too large to fit inside
+          the component. This only covers the horizontal overflow. hidden - The content is clipped auto - Scroll bars are shown as needed
+          scroll - Scroll bars are always shown. Even if there
+          is enough room for the content inside the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="overflowY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes how to handle content that is too large to fit inside
+          the component. This only covers the vertical overflow hidden - The content is clipped auto - Scroll bars are shown as needed
+          scroll - Scroll bars are always shown. Even if there
+          is enough room for the content inside the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the content relative to the view port of the component. This
+          is the distance the view port has scrolled horizontally.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the content relative to the view port of the component. This
+          is the distance the view port has scrolled vertically.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="tabIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Setting this to less than 0 prevents the component from becoming
+          focusable. The tab index is used to tell in what order to focus
+          the components when naviagting between components using the tab key.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hideFocus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to hide the dotted outline that the OS usually draws around focused
+          components.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="focused" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If the component can be focused then this makes the component
+          focused (if set to true). If the component was focused
+          and this is set to false then the component is blurred.
+          Changing this fires the focus
+          and blur events (depending on the
+          previous state).
+          A disabled component cannot recieve focus.
+          To be able to recieve focus the tabIndex
+          must be greater or equal to 0.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="focusManager" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiFocusManager - The focus manager that handles focus inside the component. This is usually
+          null forBiComponent and the focus is usually handled by some
+          ancestor.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="canSelect" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether textual content is selectable</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="enabled" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the component is enabled or not. When this is changed the
+          component fires the enabledchanged event.
+          A disabled component cannot recieve focus.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="capture" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This is true when the component is set to capture all mouse events even if
+          the mouse pointer is outside the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accessKey" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The key, in combination with the Alt key, that will activate the component.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="contextMenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - If set then this is the menu that will be shown
+          when the user right clicks (or uses some other UI mechanism) to bring up
+          a context menu. Set this to null when no contex menu
+          is desired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name does not have any real meaning except that it can be useful to
+          identify the component
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toolTip" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiToolTip - Sets the tool tip to show when the user hovers the component.
+          Setting this to null prevents a tooltip from beeing shown (unless
+          toolTipText is set.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toolTipText" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the tool tip text to show when the user hovers the component.
+          This allows a simple plain text tool tip to be shown. This property
+          is preferred over the toolTip property when the extra
+          functionality provided by the BiToolTip
+          instance is not needed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightToLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Describes whether the component should be be layed out to support
+          locales using right-to-left fonts. If this is set to null
+          then the rightToLeft property for the parent component
+          is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="command" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiCommand - Commands are used to make more than one component trigger the
+          same action. Commands also synchronize different properties on
+          the components using the command.BiComponent only synchronizes
+          the enabled property with the command. Sub classes
+          that have a value property usually synchronizes that as well.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dropDataTypes" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The data type that are supported when dropping on the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cssClassName" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The CSS class name for the element representing the component.
+          This should be used with caution since in some cases this might give unrespected results.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="appearance" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the appearance on the component. This allows a theme to do custom
+          styling of the component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onresize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a created component
+          changes its size.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onenabledchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the enabled
+          property is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncreate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the component has been
+          created and inserted into the document. When it is
+          fired it is quaranteed that the component has been
+          inserted into a application
+          window and at that time it has a visual representation.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onlosecapture" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired if the component has taken
+          the capture but for some reason lost it.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onscroll" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the user scrolls the component scroll
+          events are continuously fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfocus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the component becomes focused.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfocusin" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the component becomes focused.
+          This event is fired before the focus event
+          and unlike the focus event it bubbles up
+          to the parent component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfocusout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the component loses focus. This
+          event is fired before the blur event and
+          unlike the blur event it bubbles up to the
+          parent component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onblur" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired by a focused compinent when it loses focus.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onkeydown" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired by the component when it is focused
+          and the user presses down a key on the keyboard. This event
+          then bubbles up to ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onkeypress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is continuously fired by the component when it
+          is focused and the user holds down a key on the keyboard.
+          This event then bubbles up to ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onkeyup" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired by the component when it is focused
+          and the user releases a key on the keyboard. This event
+          then bubbles up to ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onclick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the user clicks on a component it fires this event.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncontextmenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user wants to show the context
+          menu. This is usually done by right clicking on the component
+          but can be done in several different ways depending on the
+          users operating system. This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondblclick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the user double clicks on a component it fires this event.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmousedown" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user presses down a mouse button on a
+          component. This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmousemove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user moves the mouse and the pointer
+          is over the current component. This event bubbles to the
+          ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmouseout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the mouse pointer leaves the component.
+          relatedTarget
+          can be used to find the component that was entered.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmouseover" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the mouse pointer enters a component.
+          relatedTarget
+          can be used to find the component that was left.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmouseup" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user releases a mouse button on the
+          component. This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmousewheel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user scrolls the mouse wheel over the
+          component. This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragstart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user starts to drag a component.
+          Call startDrag
+          on the event object to initiate a drag'n drop session.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragover" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When doing drag'n drop this is fired when the user drags over
+          the component. This is similar to mouseover except
+          that it only happens on valid drop targets during a drag'n drop
+          sessions. The relatedTarget points to the component
+          of the drag'n drop session that was left (if any).
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When doing drag'n drop this is fired when the mouse pointer
+          leaves the component. This is similar to mouseout
+          except that it only happens on valid drop targets during a
+          drag'n drop sessions. The relatedTarget points to the component
+          of the drag'n drop session that was entered (if any).
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragmove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When doing drag'n drop this is fired when the mouse pointer
+          moves over the component. This is similar to mousemove
+          except that it only happens on valid drop targets during a
+          drag'n drop sessions.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragdrop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user drops something on the component.
+          This is only fired by valid drop targets for the drag'n drop
+          session. The relatedTarget points to the source
+          of the drag'n drop session.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondragend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired on the component that the user started the drag on
+          when the drag and drop session ends. If the drag'n drop was
+          successful then the relatedTarget is the component
+          where the drag'n drop started. If the drag'n drop failed the
+          relatedTarget
+          is null.
+          This event bubbles to the ancestors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentAnimation">
+    <xs:annotation>
+      <xs:documentation>This class is the basis for all animations. Typically you don't work with this class directly, but
+        instead use one of it's subclasses. You will need to use some methods here, common to all animations.
+        Such as start and stop for example.
+        If you want to create a completely new type of animation, however you need to be aware of the specifics
+        of this class.BiComponentAnimation generates values in a specified range a certain number of times per second.
+        This is useded to drive the value of properties to create animation. It is possible to have several
+        different value ranges which each can have various properties like speed and acceleration behavior.
+        Predefined acceleration curves exist to simulate acceleration and deceleration.
+        To animate, you create aBiComponentAnimation object and setup parameters as needed. You then
+        registerBiComponents with it. When you start the animation, all registeredBiComponents will
+        be animated in the same way. If you need different animation behaviors for differentBiComponents
+        you will have to create differentBiComponentAnimation objects with different properties.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentAnimationAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiComponentAnimation" substitutionGroup="ComponentAnimation"/>
+
+  <xs:attributeGroup name="ComponentAnimationAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="frameRate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number : Current frame rate, Frames Per Second. - Current frame rate.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="looping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Turns looping on.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoStart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If animation should start automatically once the first component is added.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="generator" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiFpsGenerator - Accesses the frame generator that drives the animation.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onanimationend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the animation has played through completely.
+          Once per loop iteration if looping is active.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onframeprogression" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired upon every new frame</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="CssLoader">
+    <xs:annotation>
+      <xs:documentation>This class loads and executes a CSS file
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CssLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiCssLoader" substitutionGroup="CssLoader"/>
+
+  <xs:attributeGroup name="CssLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI (location) of the file to load. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataColumn">
+    <xs:annotation>
+      <xs:documentation>This class represents a data column of a data
+        table.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataColumnAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataColumn" substitutionGroup="DataColumn"/>
+
+  <xs:attributeGroup name="DataColumnAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="dataType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the type that values in this column has.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="defaultValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The default value for items in this column. This may be
+          used by the BiDataRow.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataRow">
+    <xs:annotation>
+      <xs:documentation>This class represents a row in aBiDataTable.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataRow" substitutionGroup="DataRow"/>
+
+  <xs:attributeGroup name="DataRowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataSet">
+    <xs:annotation>
+      <xs:documentation>This class represents a data set. A data set contains
+        tables, which
+        consists of columns and
+        rows.
+
+        @option
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataSetAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataSet" substitutionGroup="DataSet"/>
+
+  <xs:attributeGroup name="DataSetAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataSetDataModel">
+    <xs:annotation>
+      <xs:documentation>This is a data model forBiTreeView that takes aBiDataSet as the data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataSetDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataSetDataModel" substitutionGroup="DataSetDataModel"/>
+
+  <xs:attributeGroup name="DataSetDataModelAttributes">
+
+    <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+
+    <xs:attribute name="dataSet" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDataSet/BiDataSetTable - The data set to use as the data for the model</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondatastructurechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired after a major
+          data structure change
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforedatastructurechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event happens before
+          the data has actually changed. This
+          happens before datastructurechanged
+          event and the old data is still available.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DataTable">
+    <xs:annotation>
+      <xs:documentation>This class represents a data table inside a data set. A data table
+        consists of columns and
+        rows.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DataTableAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDataTable" substitutionGroup="DataTable"/>
+
+  <xs:attributeGroup name="DataTableAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DateFormat">
+    <xs:annotation>
+      <xs:documentation>This class is used to format and parse dates. It is based on the Java class
+        SimpleDateFormat.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DateFormatAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDateFormat" substitutionGroup="DateFormat"/>
+
+  <xs:attributeGroup name="DateFormatAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="dateFormatSymbols" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDateFormatSymbols - The date format symbols used to define how to parse and format strings and
+          dates
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="pattern" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The pattern to use when formatting and parsing</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="localizedPattern" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The pattern using localized pattern characters</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="lenient" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true parsing will try to parse the string even
+          though it does not correctly match the given pattern. For example it will
+          try to use the Javascript Date parse method.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DateFormatSymbols">
+    <xs:annotation>
+      <xs:documentation>A class that provides locale specific date strings and date patterns. The
+        specific strings to use are provided by a staticBiStringBundle. This calss
+        is based on the Java class
+        DateFormatSymbols.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DateFormatSymbolsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDateFormatSymbols" substitutionGroup="DateFormatSymbols"/>
+
+  <xs:attributeGroup name="DateFormatSymbolsAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="amPmStrings" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the am pm strings</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="eras" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing strings representing the eras berfore and after
+          year zero.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="localePatternChars" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is a string the localized pattern charaters. This allows the pattern
+          to use other characters than the default to identify the different parts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="months" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the full month names</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="shortMonths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short month names</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="weekdays" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the weekday names</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="shortWeekdays" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short weekday names</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="datePatterns" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short and long date pattern</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="timePatterns" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short and long time pattern</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dateTimePatterns" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - This is an array containing the short and long date time pattern</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="firstWeekday" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The weekday that starts the week. 0 is Sunday and 6 is Saturday. Setting this
+          to 1 means that Monday starts the week just like in ISO.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="redWeekdays" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The days of the week that are considered red. 0 is Sunday and 6 is Saturday. Setting this
+          to [0] means that Sundays will be considered red days.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightToLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Returns whether right to left should be used for this language</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DatePicker">
+    <xs:annotation>
+      <xs:documentation>This component provides a text field where one can write a date and a popup
+        containing aBiCalendar that allows one to pick a date.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DatePickerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDatePicker" substitutionGroup="DatePicker"/>
+
+  <xs:attributeGroup name="DatePickerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - Getter for the maximum selectable date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - Getter for the minimum selectable date.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedDate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The selected date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dateFormat" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDateFormat - The object describing how to parse and format dates</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dropDownVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the calendar part is visible or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text shown in the text field part of the date picker. Setting
+          this causes the text to be parsed and this might trigger a change
+          event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="validator" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - A function that is used to validate the text</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="invalidMessage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - A string that can be used to describe why the input is invalid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ontextchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the text in the text field
+          is changed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the user clicks to select
+          a date or when the enter key is pressed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the selecetd date changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the calendar is shown.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onhide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the calendar is hidden.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DesktopPane">
+    <xs:annotation>
+      <xs:documentation>A special container that can be used to add internal
+        windows to. The desktop pane has a
+        window manager that provides some
+        extra features for the windows inside the desktop pane.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DesktopPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDesktopPane" substitutionGroup="DesktopPane"/>
+
+  <xs:attributeGroup name="DesktopPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Dialog">
+    <xs:annotation>
+      <xs:documentation>This class is used for dialog windows. Dialog windows are internal windows
+        that require immediate attention. Dialog windows are modal to the application.
+        Example usage: var confirm = newBiDialog("Are you sure");
+        // add components to the dialog
+        confirm.addEventListener("dialogresult", this.doSomething, this);
+        confirm.setVisible(true);
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DialogAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDialog" substitutionGroup="Dialog"/>
+
+  <xs:attributeGroup name="DialogAttributes">
+
+    <xs:attributeGroup ref="WindowAttributes"/>
+
+    <xs:attribute name="dialogResult" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The value set by the dialog before it is closed. the dialogResult should be
+          set by the content of the dialog before it is closed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="defaultFocusedComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - This allows you to set the component that should be focused when the dialog
+          is shown. If null then the acceptButton is used for this.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="centered" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This property decides whether to automatically center the dialog when it
+          is shown
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondialogresult" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is called when the dialog is
+          closed (or hidden). This is the main event
+          to use with dialogs since it is fired when
+          the user closes it or selects a value in it.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DockPanel">
+    <xs:annotation>
+      <xs:documentation>This layout component position and sizes its children using docking guidelines.
+        The children are laid out from first child to last and after a child has
+        been docked to one edge the following child will be docked to remaining
+        available space. Once a child sets its docking hint to "fill", the following
+        will not be shown.
+        To define that side the child should be docked at a so called attached property
+        is used. This is a static method on theBiDockPanel. There exists a Bindows
+        markup shortcut for setting these properties
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DockPanelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDockPanel" substitutionGroup="DockPanel"/>
+
+  <xs:attributeGroup name="DockPanelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DragAndDropManager">
+    <xs:annotation>
+      <xs:documentation>This class is used to manage the drag and drop system
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DragAndDropManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDragAndDropManager" substitutionGroup="DragAndDropManager"/>
+
+  <xs:attributeGroup name="DragAndDropManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="action" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The desired action to use for the drag and drop session</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dragIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:oComp :BiComponent The component to show - The component to use as the icon next to the cursor when doing
+          drag
+          and drop. When this is set to null images are shown that represents the
+          action
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DragEvent">
+    <xs:annotation>
+      <xs:documentation>This event is used in drag and drop sesssions
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DragEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDragEvent" substitutionGroup="DragEvent"/>
+
+  <xs:attributeGroup name="DragEventAttributes">
+
+    <xs:attributeGroup ref="MouseEventAttributes"/>
+
+    <xs:attribute name="dragIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component to use as the icon next to the pointer</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="DrawAnchor">
+    <xs:annotation>
+      <xs:documentation>This class defines static properties that represent the anchoring locations for link lines.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DrawAnchorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDrawAnchor" substitutionGroup="DrawAnchor"/>
+
+  <xs:attributeGroup name="DrawAnchorAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DrawLine">
+    <xs:annotation>
+      <xs:documentation>This class represents a link line.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DrawLineAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiDrawLine" substitutionGroup="DrawLine"/>
+
+  <xs:attributeGroup name="DrawLineAttributes">
+
+    <xs:attribute name="foreColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The color of this line.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hoverColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The color of this line when the cursor is moved over it.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="startArrowStyle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The style of the start arrow for this line.
+          Accepted values are:- circle, arrow, none
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endArrowStyle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The style of the end arrow for this line.
+          Accepted values are:- circle, arrow, none
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of this line.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The type of this line.
+          Accepted values are:- dotted, dashed, solid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Event">
+    <xs:annotation>
+      <xs:documentation>The event class is the core class describing the event objects passed
+        around in an event.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiEvent" substitutionGroup="Event"/>
+
+  <xs:attributeGroup name="EventAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EventManager">
+    <xs:annotation>
+      <xs:documentation>This is the core class for the UI event system. Attach this to a browser
+        window object to forward browser events to the correct component.
+        There is usually no need to use this class. It is created as needed by the
+        core components
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiEventManager" substitutionGroup="EventManager"/>
+
+  <xs:attributeGroup name="EventManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="allowBrowserContextMenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to allow the browser's default context menu</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="captureComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that currently has the mouse capture. It is
+          better to call setCapture
+          on the component directly.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="EventTarget">
+    <xs:annotation>
+      <xs:documentation>This class provides the functionality to add and remove event listeners
+        as well as dispatch events. When an event is dispatched the listeners
+        are notified.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventTargetAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiEventTarget" substitutionGroup="EventTarget"/>
+
+  <xs:attributeGroup name="EventTargetAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+  </xs:attributeGroup>
+
+  <xs:element name="FlowPanel">
+    <xs:annotation>
+      <xs:documentation>This layout component flows its children from left to right and wraps to
+        the next row when no more children can fit on the current row. This
+        layout component uses the preferred size and it also takes margins into
+        account and uses margin collapsing so that two adjacent children share the
+        larger margin.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FlowPanelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFlowPanel" substitutionGroup="FlowPanel"/>
+
+  <xs:attributeGroup name="FlowPanelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The align property decides how to size and position the children. This
+          describes the size and position in the in the ortogonal direction of the
+          box orientation. For a
+          horizontal box this describes the height and top position and for a vertical
+          layout this describes the width and left position
+          Valid values are:
+          stretch
+          start
+          center
+          end
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="vAlign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The vAlign property decides how to position the lines of children if there
+          is any remaining vertical space.
+          Valid values are:
+          start/top
+          center
+          end/bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="baselineAlign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The baseline align describes how to do the vertical align of the items on
+          a row. This can be set for individual children as well using the attached
+          property.
+          Valid values are:
+          start/top
+          center
+          end/bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="wrap" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to wrap the children to a new line if there isn't enough space to
+          put them all on the same line.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="FocusElementWrapper">
+    <xs:annotation>
+      <xs:documentation>This class is used when tabbing between Bindows components and plain HTML
+        elements. It creates an interface that is a subset ofBiComponent with the
+        required method needed to work with theBiFocusManager
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FocusElementWrapperAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFocusElementWrapper" substitutionGroup="FocusElementWrapper"/>
+
+  <xs:attributeGroup name="FocusElementWrapperAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="focused" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If the component can be focused then this makes the component
+          focused (if set to true). If the component was focused
+          and this is set to false then the component is blurred.
+          Changing this fires the focus
+          and blur events (depending on the
+          previous state).
+          A disabled component cannot recieve focus.
+          To be able to recieve focus the tabIndex
+          must be greater or equal to 0.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="FocusEvent">
+    <xs:annotation>
+      <xs:documentation>This class describes event objects used in focus events.
+        The focusin and focusout events bubble by default,
+        focus and blur do not.
+        All mouse events bubble by default. This means that once all the
+        event listeners have been notified the event propagates to the parent
+        BiComponent. To prevent the event to
+        bubble to the parent call
+        stopPropagation() on the event object.
+        The currently supported events by BiComponent
+        are: focus blur focusin focusout
+        The order these events occur, when a focused component is left and another
+        focused component takes the focus, is the following: focusout focusin blur focus
+        This object should not be created by the user. It is created as needed by the event system.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FocusEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFocusEvent" substitutionGroup="FocusEvent"/>
+
+  <xs:attributeGroup name="FocusEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="FocusManager">
+    <xs:annotation>
+      <xs:documentation>This class handles the focus management in Bindows
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FocusManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFocusManager" substitutionGroup="FocusManager"/>
+
+  <xs:attributeGroup name="FocusManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Font">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used with BiLabel to provide
+        the font style information.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FontAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFont" substitutionGroup="Font"/>
+
+  <xs:attributeGroup name="FontAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="size">
+      <xs:annotation>
+        <xs:documentation>The font size (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bold">
+      <xs:annotation>
+        <xs:documentation>Whether to use bold</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="italic">
+      <xs:annotation>
+        <xs:documentation>Whether to use italic</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="underline">
+      <xs:annotation>
+        <xs:documentation>Whether to underline the text</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="strikeout">
+      <xs:annotation>
+        <xs:documentation>Whether to line through the text</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name">
+      <xs:annotation>
+        <xs:documentation>The name of the font. A comma seprated list also works</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="FpsGenerator">
+    <xs:annotation>
+      <xs:documentation>Frame generation engine, used for animation.
+        Each animation can have it's ownBiFpsGenerator or it can use the globalBiFpsGenerator.
+        Different animations can share the global generator, which saves system resources.
+        Use the factory method, instead of the constructor, to get the global generator.
+        The frame generator generates FrameProgressionEvents a certain
+        number of times per second, as specified by the framerate.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FpsGeneratorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFpsGenerator" substitutionGroup="FpsGenerator"/>
+
+  <xs:attributeGroup name="FpsGeneratorAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="frameRate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the frame rate.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onframeprogression" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired upon every new frame</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="FrameProgressionEvent">
+    <xs:annotation>
+      <xs:documentation>Event that denotifies a new frame during animation.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="FrameProgressionEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiFrameProgressionEvent" substitutionGroup="FrameProgressionEvent"/>
+
+  <xs:attributeGroup name="FrameProgressionEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge">
+    <xs:annotation>
+      <xs:documentation>
+        This control displays a gauge.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge" substitutionGroup="Gauge"/>
+
+  <xs:attributeGroup name="GaugeAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="minimumAngle">
+      <xs:annotation>
+        <xs:documentation>The angle where the minimum value is located</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximumAngle">
+      <xs:annotation>
+        <xs:documentation>The angle where the minimum value is located</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorTickInterval">
+      <xs:annotation>
+        <xs:documentation>The distance between the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorTickInterval">
+      <xs:annotation>
+        <xs:documentation>The distance between the minor ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelInterval">
+      <xs:annotation>
+        <xs:documentation>The difference between the labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="warningValue">
+      <xs:annotation>
+        <xs:documentation>This shows a red section on the gauge between the warning value and the maximum value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showLabels">
+      <xs:annotation>
+        <xs:documentation>Whether to show the text labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMajorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the major ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinorTicks">
+      <xs:annotation>
+        <xs:documentation>Whether to show the minor ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showWarningSection">
+      <xs:annotation>
+        <xs:documentation>Whether to show the red section between the warning value and the maximum value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum">
+      <xs:annotation>
+        <xs:documentation>The maximum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum">
+      <xs:annotation>
+        <xs:documentation>The minimum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value">
+      <xs:annotation>
+        <xs:documentation>The value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="plate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugePlate - The plate of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minorTicks" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeMinorTicks - The minor ticks of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="majorTicks" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeMajorTicks - The major ticks of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="needle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeNeedle - The needle of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="title" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeTitle - The title of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labels" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiGaugeLabels - The labels of the gauge</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2">
+    <xs:annotation>
+      <xs:documentation>The gauge2 class, encapsulating the gauge2 structure
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2" substitutionGroup="Gauge2"/>
+
+  <xs:attributeGroup name="Gauge2Attributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="coordWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Coord width is the inner coord vertical max value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="coordHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Coord width is the inner coord horizontal max value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2BasicCap">
+    <xs:annotation>
+      <xs:documentation>This class creates a basic round cap
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2BasicCapAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2BasicCap" substitutionGroup="Gauge2BasicCap"/>
+
+  <xs:attributeGroup name="Gauge2BasicCapAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2CapAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2CircularBorder">
+    <xs:annotation>
+      <xs:documentation>This class creates an circular border.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2CircularBorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2CircularBorder" substitutionGroup="Gauge2CircularBorder"/>
+
+  <xs:attributeGroup name="Gauge2CircularBorderAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2BorderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2Component">
+    <xs:annotation>
+      <xs:documentation>This class is the base of all classes residing inside aBiGauge2Group
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2ComponentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2Component" substitutionGroup="Gauge2Component"/>
+
+  <xs:attributeGroup name="Gauge2ComponentAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2Group">
+    <xs:annotation>
+      <xs:documentation>BiGauge2Group representing the main gauge2 vector graphic group
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2GroupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2Group" substitutionGroup="Gauge2Group"/>
+
+  <xs:attributeGroup name="Gauge2GroupAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2ImageBorder">
+    <xs:annotation>
+      <xs:documentation>This class creates an image border
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2ImageBorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2ImageBorder" substitutionGroup="Gauge2ImageBorder"/>
+
+  <xs:attributeGroup name="Gauge2ImageBorderAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2BorderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2Label">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating labels
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2Label" substitutionGroup="Gauge2Label"/>
+
+  <xs:attributeGroup name="Gauge2LabelAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="centerX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The centerX property represents the x coordinate of the center of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="centerY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The centerY property represents the y coordinate of the center of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text shown on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The label size</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearGradientFiller">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial linear fill of theBiGauge2Component.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearGradientFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearGradientFiller" substitutionGroup="Gauge2LinearGradientFiller"/>
+
+  <xs:attributeGroup name="Gauge2LinearGradientFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2GradientFillerAttributes"/>
+
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The angle of the linear filler</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearNeedle">
+    <xs:annotation>
+      <xs:documentation>This class creates a linear needle.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearNeedleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearNeedle" substitutionGroup="Gauge2LinearNeedle"/>
+
+  <xs:attributeGroup name="Gauge2LinearNeedleAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2ValueMarkerAttributes"/>
+
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The angle of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="needlePosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="needleBase" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The base width of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="needleHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearRange">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial range. The child "ticks" and "scales" inherits the angle.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearRangeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearRange" substitutionGroup="Gauge2LinearRange"/>
+
+  <xs:attributeGroup name="Gauge2LinearRangeAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2RangeAttributes"/>
+
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Angle of the lineear range.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearScale">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating linear scales
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearScaleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearScale" substitutionGroup="Gauge2LinearScale"/>
+
+  <xs:attributeGroup name="Gauge2LinearScaleAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2ScaleAttributes"/>
+
+    <xs:attribute name="labelSpace" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The space between labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelPosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the labels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The angle of the scale</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2LinearTicks">
+    <xs:annotation>
+      <xs:documentation>This class layout it's ticks in radial manner depeding on radius, start angle and end angle
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2LinearTicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2LinearTicks" substitutionGroup="Gauge2LinearTicks"/>
+
+  <xs:attributeGroup name="Gauge2LinearTicksAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2TicksAttributes"/>
+
+    <xs:attribute name="angle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Angle of the line on wich the ticks will be placed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="tickSpace" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The space between ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2PlainColorFiller">
+    <xs:annotation>
+      <xs:documentation>This class creates a plain color filler
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2PlainColorFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2PlainColorFiller" substitutionGroup="Gauge2PlainColorFiller"/>
+
+  <xs:attributeGroup name="Gauge2PlainColorFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2FillerAttributes"/>
+
+    <xs:attribute name="color" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The color that the filler is going to use.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialGradientFiller">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial gradient fill of theBiGauge2Component.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialGradientFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialGradientFiller" substitutionGroup="Gauge2RadialGradientFiller"/>
+
+  <xs:attributeGroup name="Gauge2RadialGradientFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2GradientFillerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialNeedle">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial needle
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialNeedleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialNeedle" substitutionGroup="Gauge2RadialNeedle"/>
+
+  <xs:attributeGroup name="Gauge2RadialNeedleAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2ValueMarkerAttributes"/>
+
+    <xs:attribute name="outerRadius" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Outer radius of the needle.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="innerRadius" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Inner radius of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="innerWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:EDIT_THIS - The inner width of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="outerWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:EDIT_THIS - The outer width of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The value of the needle.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialRange">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial range. The child "ticks" and "scales" inherits the start- and end angles.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialRangeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialRange" substitutionGroup="Gauge2RadialRange"/>
+
+  <xs:attributeGroup name="Gauge2RadialRangeAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2RangeAttributes"/>
+
+    <xs:attribute name="startAngle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The startAngle of the range, this angle is where the radial range starts.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endAngle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The endAngle of the range, this angle is where the radial range ends.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialScaleSection">
+    <xs:annotation>
+      <xs:documentation>This class creates a radius scale
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialScaleSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialScaleSection" substitutionGroup="Gauge2RadialScaleSection"/>
+
+  <xs:attributeGroup name="Gauge2RadialScaleSectionAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2ScaleSectionAttributes"/>
+
+    <xs:attribute name="radius" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The radius</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RadialTicks">
+    <xs:annotation>
+      <xs:documentation>This class layout it's ticks in radial maner depeding on radius, start angle and end angle
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RadialTicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RadialTicks" substitutionGroup="Gauge2RadialTicks"/>
+
+  <xs:attributeGroup name="Gauge2RadialTicksAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2TicksAttributes"/>
+
+    <xs:attribute name="startAngle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The start angle of the ticks</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endAngle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The end angle of the ticks.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="radius" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The radius of the circle on wich the ticks is placed.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RectangularBorder">
+    <xs:annotation>
+      <xs:documentation>This class creates a rectangular border
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RectangularBorderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RectangularBorder" substitutionGroup="Gauge2RectangularBorder"/>
+
+  <xs:attributeGroup name="Gauge2RectangularBorderAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2BorderAttributes"/>
+
+    <xs:attribute name="rotation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The rotation angle of the rectangular border</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Gauge2RingGradientFiller">
+    <xs:annotation>
+      <xs:documentation>This class creates a radial gradient fill of theBiGauge2Component.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Gauge2RingGradientFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGauge2RingGradientFiller" substitutionGroup="Gauge2RingGradientFiller"/>
+
+  <xs:attributeGroup name="Gauge2RingGradientFillerAttributes">
+
+    <xs:attributeGroup ref="AbstractGauge2GradientFillerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeLabels">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the labels (the tick labels) for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeLabelsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeLabels" substitutionGroup="GaugeLabels"/>
+
+  <xs:attributeGroup name="GaugeLabelsAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeMajorTicks">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the major ticks for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeMajorTicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeMajorTicks" substitutionGroup="GaugeMajorTicks"/>
+
+  <xs:attributeGroup name="GaugeMajorTicksAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeMinorTicks">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the minor ticks for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeMinorTicksAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeMinorTicks" substitutionGroup="GaugeMinorTicks"/>
+
+  <xs:attributeGroup name="GaugeMinorTicksAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeNeedle">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the needle of a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeNeedleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeNeedle" substitutionGroup="GaugeNeedle"/>
+
+  <xs:attributeGroup name="GaugeNeedleAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The stroke color of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value">
+      <xs:annotation>
+        <xs:documentation>The value of the needle</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugePlate">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to the plate (the background circle) for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugePlateAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugePlate" substitutionGroup="GaugePlate"/>
+
+  <xs:attributeGroup name="GaugePlateAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="strokeColor">
+      <xs:annotation>
+        <xs:documentation>The color of the stroke (edge) of the plate</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fillColor">
+      <xs:annotation>
+        <xs:documentation>The fill color of the plate</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeSection">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show a section for a gauge.
+        A guage can have several sections and these are usually used to split
+        the gaguge values into logical value ranges.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeSection" substitutionGroup="GaugeSection"/>
+
+  <xs:attributeGroup name="GaugeSectionAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="startValue">
+      <xs:annotation>
+        <xs:documentation>
+          The start value of the section
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endValue">
+      <xs:annotation>
+        <xs:documentation>
+          The end value of the section
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="color">
+      <xs:annotation>
+        <xs:documentation>The color of the section</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GaugeTitle">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show the title for a gauge
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GaugeTitleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGaugeTitle" substitutionGroup="GaugeTitle"/>
+
+  <xs:attributeGroup name="GaugeTitleAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Graph">
+    <xs:annotation>
+      <xs:documentation>
+        This is the container used with graphs. The graph component contains
+        other components for the axes, legend, charts and more.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGraph" substitutionGroup="Graph"/>
+
+  <xs:attributeGroup name="GraphAttributes">
+
+    <xs:attributeGroup ref="GraphBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Graph2">
+    <xs:annotation>
+      <xs:documentation>
+        This is a simpler graph control than BiGraph.
+        BiGraph2 works in Mozilla but it is a bit
+        more limited. For example, BiGraph2 does
+        not support line charts nor pie charts. Gradient fills are ignored
+        by BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Graph2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGraph2" substitutionGroup="Graph2"/>
+
+  <xs:attributeGroup name="Graph2Attributes">
+
+    <xs:attributeGroup ref="GraphBaseAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphBase">
+    <xs:annotation>
+      <xs:documentation>
+        This is the abstract base class for BiGraph
+        and BiGraph2. If Mozilla support is needed
+        use BiGraph2. If line chart and/or pie chart
+        is needed then use BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGraphBase" substitutionGroup="GraphBase"/>
+
+  <xs:attributeGroup name="GraphBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="autoScale">
+      <xs:annotation>
+        <xs:documentation>
+          Allows you turn off the automatic scaling of the graph
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fontSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number -
+          Sets the font size for the legend and axes. If autoScale
+          is true then this does not apply.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="series" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiChartSeries[] - This is an array containing the series used for the data of the graph.
+          After this property is changed the graph component needs to be updated.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="categories" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiChartCategory[] - This is an array containing the categories used for the data of the graph.
+          After this property is changed the graph component needs to be updated.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="points" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiChartPoint[] - This is an array containing the points used for the data of the graph.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="chartType">
+      <xs:annotation>
+        <xs:documentation>
+          The type of the chart. Available types are:
+          bar
+          column
+          grid
+          line
+          pie
+          percentagestackedbar
+          percentagestackedcolum
+          stackedbar
+          stackedcolumn
+          grid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onpointclick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user clicks on a point in the graph</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointcontextmenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user right clicks on a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointdblclick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user double clicks on a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmousedown" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user presses down the mouse button on a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmousemove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user moves the mouse over a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmouseout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Fires when the mouse pointer leaves a point
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmouseover" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Fires when the mouse pointer enters a point
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmouseup" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the releases the mouse button on a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpointmousewheel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user scrolls the mouse wheel over a point</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphContentArea">
+    <xs:annotation>
+      <xs:documentation>This component is used as a container for the graph content
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphContentAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGraphContentArea" substitutionGroup="GraphContentArea"/>
+
+  <xs:attributeGroup name="GraphContentAreaAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid">
+    <xs:annotation>
+      <xs:documentation>This component is used to display a grid (table, column list). A grid
+        can show headers for both the columns and the rows. A grid also supports
+        selection of whole rows as well as of individual cells.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid" substitutionGroup="Grid"/>
+
+  <xs:attributeGroup name="GridAttributes">
+
+    <xs:attributeGroup ref="AbstractGridAttributes"/>
+
+    <xs:attribute name="selectionMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the selection mode. Allowed values are "cell" and "row".</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataSource" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDataSet /BiDataTable - The object to use as the data source. This can be a either a
+          BiDataTable or aBiDataSet (in which case the first table is used).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="currentDataPage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the current data page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataPageSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount of rows to show at one time from the data source.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected row/cell changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondatabind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Called after the component has been data bound</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2">
+    <xs:annotation>
+      <xs:documentation>This component is a special case ofBiTreeView which has an interface which
+        is similar toBiGrid
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2" substitutionGroup="Grid2"/>
+
+  <xs:attributeGroup name="Grid2Attributes">
+
+    <xs:attributeGroup ref="TreeViewAttributes"/>
+
+    <xs:attribute name="columnCount" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of columns in the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnNames" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The text to show on the headers of the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The widths of the columns of the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The order of the columns. This an array containing the indexes of the
+          columns.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the headers for the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRowHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the row headers for the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showGridLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show grid lines between the cells in the grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2Cell">
+    <xs:annotation>
+      <xs:documentation>This is used for the cells in aBiGrid2Row row
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2CellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2Cell" substitutionGroup="Grid2Cell"/>
+
+  <xs:attributeGroup name="Grid2CellAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The data that is associated with the cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2DataModel">
+    <xs:annotation>
+      <xs:documentation>This data model is to be used withBiGrid2. It uses theBiGrid2Row and
+        BiGrid2Cell to provide the data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2DataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2DataModel" substitutionGroup="Grid2DataModel"/>
+
+  <xs:attributeGroup name="Grid2DataModelAttributes">
+
+    <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+
+    <xs:attribute name="treeView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiGrid2 - The tree view the data model is acting on</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onrowcountchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event happens after
+          the number of rows has changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2Row">
+    <xs:annotation>
+      <xs:documentation>This class is used as the data for rows in theBiGrid2 component
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2RowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2Row" substitutionGroup="Grid2Row"/>
+
+  <xs:attributeGroup name="Grid2RowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid2ViewManager">
+    <xs:annotation>
+      <xs:documentation>This class is a special view manager to be used withBiGrid2
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Grid2ViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGrid2ViewManager" substitutionGroup="Grid2ViewManager"/>
+
+  <xs:attributeGroup name="Grid2ViewManagerAttributes">
+
+    <xs:attributeGroup ref="TreeViewViewManagerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridCell">
+    <xs:annotation>
+      <xs:documentation>This class represents a cell in a grid row.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridCellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridCell" substitutionGroup="GridCell"/>
+
+  <xs:attributeGroup name="GridCellAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The data associated with the cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The background color name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="foreColor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The foreground color name</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the cell is selected or not. This should not be set when
+          the selection mode for the grid is set to row selection.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridChart">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to display a grid containing the values in a graph.
+        Each series in the graph is shown as a row
+        in the grid and each point is shown as a cell.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridChart" substitutionGroup="GridChart"/>
+
+  <xs:attributeGroup name="GridChartAttributes">
+
+    <xs:attributeGroup ref="GridAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridChartCell">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to display a cell in a grid chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridChartCellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridChartCell" substitutionGroup="GridChartCell"/>
+
+  <xs:attributeGroup name="GridChartCellAttributes">
+
+    <xs:attributeGroup ref="GridCellAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridChartRow">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to display a row in a grid chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridChartRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridChartRow" substitutionGroup="GridChartRow"/>
+
+  <xs:attributeGroup name="GridChartRowAttributes">
+
+    <xs:attributeGroup ref="GridRowAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridColumn">
+    <xs:annotation>
+      <xs:documentation>This class is used to describe columns forBiGrid andBiTree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridColumnAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridColumn" substitutionGroup="GridColumn"/>
+
+  <xs:attributeGroup name="GridColumnAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The alignment of the content inside the column.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column. This is the same as the text shown on
+          the header.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the column.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="indentColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Whether the current column is the indent column in the grid.
+          This is ignored when using the columns for a non tree.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="iconColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Whether the current column is the icon column in the grid.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the column is visible or not.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The type of the data in the column. This is used to decide how
+          to sort the data in the column. Built in support for the following
+          types: string caseInsensitiveString number date - Uses the native JS Date type
+          To get better control over the sorting create a subclass that
+          overrides the sortFunction getter.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridDataModel">
+    <xs:annotation>
+      <xs:documentation>This data model takes an array of arrays containing the text for a grid. This data model is to be used
+        withBiTreeView
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridDataModel" substitutionGroup="GridDataModel"/>
+
+  <xs:attributeGroup name="GridDataModelAttributes">
+
+    <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridHeader">
+    <xs:annotation>
+      <xs:documentation>This represents a header cell for the
+        headers of a
+        grid or a tree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridHeaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridHeader" substitutionGroup="GridHeader"/>
+
+  <xs:attributeGroup name="GridHeaderAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="resizable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can resize the current header.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can click on the header to sort by that column.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="movable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can move the current header.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ascending" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true a down arrow is shown as the icon
+          of the header. When false an up arrow and when
+          null no icon is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ascendingIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon to use for the sort arrow when sorting ascendingly</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="descendingIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon to use for the sort arrow when sorting descendingly</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridHeaderCorner">
+    <xs:annotation>
+      <xs:documentation>This component is used to paint the upper left corner of the headers
+        in case both row headers and column headers are visible for a grid.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridHeaderCornerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridHeaderCorner" substitutionGroup="GridHeaderCorner"/>
+
+  <xs:attributeGroup name="GridHeaderCornerAttributes">
+
+    <xs:attributeGroup ref="GridHeaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridHeaderFiller">
+    <xs:annotation>
+      <xs:documentation>This component is used to fill the headers
+        in case the widths of the header cells do not cover the entire width of
+        the headers.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridHeaderFillerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridHeaderFiller" substitutionGroup="GridHeaderFiller"/>
+
+  <xs:attributeGroup name="GridHeaderFillerAttributes">
+
+    <xs:attributeGroup ref="GridHeaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridHeaders">
+    <xs:annotation>
+      <xs:documentation>This class represents the headers for a grid
+        or a tree.
+        The headers contain several header cells.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridHeadersAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridHeaders" substitutionGroup="GridHeaders"/>
+
+  <xs:attributeGroup name="GridHeadersAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="fitColumnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true the column widths are distributed so that the fill the
+          width of the grid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnCount" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of columns in the header</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The widths of the cell headers in the headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The order in which the cell headers should be displayed in. A
+          value of [2,0,1] means that the third cell comes first,
+          then comes the first cell and last the second.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the column that should show the sort arrow.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ascending" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this is true then the sorting should be done
+          ascending, if false descending and if null
+          no sort. This is also reflected on the ascending property for the
+          header this applies to.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="oncolumnwidthschanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the column widths are changed. This happens when either
+          the user has finished resized a column or the column widths are
+          changed through script.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncolumnorderschanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the column orders are changed. This happens when either
+          the user has reordered the columns or the order is
+          changed through script.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onsortcolumnchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the sort column is changed. This happens when either
+          the user has clicks on a sortable column or the sort column is
+          changed through script.
+          Note that when the user clicks on the currently sorted column this
+          event is not fired. Instead the ascendingchanged event
+          is triggered because the sorting is changed from ascending to
+          descending or the other way around.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onascendingchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the ascending property changes. This happens when either
+          the user clicks on a column header cell that is already sorted or
+          this property is changed through script.
+          Note that if the ascending property changed due to
+          a change of the sortColumn this event is not fired.
+          This is by design to prevent preformance issues.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncolumnwidthschanging" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the column widths are changing. This happens when
+          the user is resizing a column.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridPanel">
+    <xs:annotation>
+      <xs:documentation>This layout component positions and sizes its children in a simple grid where
+        the columns and rows are decided using string patterns much
+        like the way the rows and cols attribute for HTML framesets decides the
+        size and position of the frames.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridPanelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridPanel" substitutionGroup="GridPanel"/>
+
+  <xs:attributeGroup name="GridPanelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="hGap" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The horizontal gap between the columns</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="vGap" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The vertical gap between the rows</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cols" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is a string representing the column widths. It is a comma seperated
+          string of column sizes. See the remarks for more info.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rows" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is a string representing the row heights. It is a comma seperated
+          string of row sizes. See the remarks for more info.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridPanel2">
+    <xs:annotation>
+      <xs:documentation>BiGridPanel2 is a layout component based onBiGridPanel.
+        It works similair to a html table. A layout is created by
+        adding rows and cells to the Panel. Cells and rows can have
+        padding, colspan, rowspan, alignment etc. Defaults can also
+        be set on the grid panel itself.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridPanel2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridPanel2" substitutionGroup="GridPanel2"/>
+
+  <xs:attributeGroup name="GridPanel2Attributes">
+
+    <xs:attributeGroup ref="GridPanelAttributes"/>
+
+    <xs:attribute name="cellPadding" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Padding for cells in the grid. Individual rows and cells can override this.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Horizontal alignment for cells in the grid. Individual rows and cells can
+          override this.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="valign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Vertical alignment for cells in the grid. Individual rows and cells can
+          override this.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridPanel2Cell">
+    <xs:annotation>
+      <xs:documentation>A cell in aBiGridPanel2Cell
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridPanel2CellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridPanel2Cell" substitutionGroup="GridPanel2Cell"/>
+
+  <xs:attributeGroup name="GridPanel2CellAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="cellPadding" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Padding for a cell.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="contentComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - Component in the cell.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stretch" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:string - How the content component should be stretched.
+          Possible settings are:
+          none, both, horizontal, vertical
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="parent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiGridPanel2Row - The row this cell was added to.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="colSpan" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - ColSpan of the cell. The cell will span colspan number of columns horizontally.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowSpan" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Rowspan of a cell. The cell spans rowspan number of rows vertically.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The horizontal alignment of the cell. Possible values are:
+          left
+          center
+          right
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="valign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The vertical alignment of the cell. Possible values are:
+          top
+          center
+          middle
+          bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preferredWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The preferred width of the cell. Defaulted to the preferredWidth
+          of the content component, plus any padding it needs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="preferredHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Preferred height of the cell. Defaults to preferredHieght of the
+          content component plus padding it needs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridPanel2Row">
+    <xs:annotation>
+      <xs:documentation>A row of cells in aBiGridPanel2
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridPanel2RowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridPanel2Row" substitutionGroup="GridPanel2Row"/>
+
+  <xs:attributeGroup name="GridPanel2RowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="cellPadding" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Padding for cells in the row. Individual cells can override this.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The horizontal alignment for cells in the row. Individual cells can
+          override this. SeeBiGridPanel2Cell for specific settings.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="valign" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The vertical alignment for cells in the row. Individual cells can
+          override this. SeeBiGridPanel2Cell for settings.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridRow">
+    <xs:annotation>
+      <xs:documentation>This class represents the rows inBiGrid. Each row contains
+        cells that contains the text to show for
+        the column.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridRow" substitutionGroup="GridRow"/>
+
+  <xs:attributeGroup name="GridRowAttributes">
+
+    <xs:attributeGroup ref="AbstractGridRowAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridRowHeaders">
+    <xs:annotation>
+      <xs:documentation>This component is used to paint the grid row headers for a grid.
+        The component asks the BiGridRow for the HTML
+        for each item by calling getRowHeaderHtml.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridRowHeadersAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridRowHeaders" substitutionGroup="GridRowHeaders"/>
+
+  <xs:attributeGroup name="GridRowHeadersAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GridSelectionModel">
+    <xs:annotation>
+      <xs:documentation>This class handles the selection of rows
+        or cells in a grid.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGridSelectionModel" substitutionGroup="GridSelectionModel"/>
+
+  <xs:attributeGroup name="GridSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+    <xs:attribute name="selectionMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The grid selection model supports both selection entire rows
+          and individual grid cells. Valid values are:
+          row
+          cell
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GroupBox">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating group boxes. A group box is a container
+        with a border and possibly a title at the top.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GroupBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGroupBox" substitutionGroup="GroupBox"/>
+
+  <xs:attributeGroup name="GroupBoxAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="groupBoxTitle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiGroupBoxTitle - This property points to theBiGroupBoxTitle component which handles the title
+          of the group box.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="titlePosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The position of the title. Valid values are: left center right</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the text of the title. Setting this to null removes the title.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="GroupBoxTitle">
+    <xs:annotation>
+      <xs:documentation>This component is used with theBiGroupBox to handle the title.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GroupBoxTitleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiGroupBoxTitle" substitutionGroup="GroupBoxTitle"/>
+
+  <xs:attributeGroup name="GroupBoxTitleAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="titlePosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The position of the title. Valid values are: left center right</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="HashTable">
+    <xs:annotation>
+      <xs:documentation>This is a basci implementation of a hash table. It works around a known
+        bug in IE/JScript that causes IE to leak memory when using Objects as hashes
+        in javascript
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="HashTableAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiHashTable" substitutionGroup="HashTable"/>
+
+  <xs:attributeGroup name="HashTableAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="HBox">
+    <xs:annotation>
+      <xs:documentation>This is a horizontalBiBox where components are laid out from left to right
+        (or right to left if rightToLeft
+        is true).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="HBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiHBox" substitutionGroup="HBox"/>
+
+  <xs:attributeGroup name="HBoxAttributes">
+
+    <xs:attributeGroup ref="BoxAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Iframe">
+    <xs:annotation>
+      <xs:documentation>
+        This component allows usage of an HTML 4 iframe element. This allows
+        any document/file that is supported by the platform to be shown inside a
+        component.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="IframeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiIframe" substitutionGroup="Iframe"/>
+
+  <xs:attributeGroup name="IframeAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiUri -
+          The URI to the file to show inside the frame. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Happens when the iframe is loaded. Note that this might fire more
+          often than one might expect so be sure to check that you really
+          want your code run when the event is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Image">
+    <xs:annotation>
+      <xs:documentation>This class is used for showing images.
+        Supported image types are GIF, JPEG and PNG (including support for 32-bit RGBA).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImage" substitutionGroup="Image"/>
+
+  <xs:attributeGroup name="ImageAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="alt" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The alternate text which is read out instead of the image when Bindows is
+          in accessibility mode.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The location of the image file. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image loads. Note that the image file may be
+          loaded before the constructor finishes and you should not only
+          rely on this event but also use loaded property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onerror" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image failed to load.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageLoader">
+    <xs:annotation>
+      <xs:documentation>This class loads an image file to memory
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImageLoader" substitutionGroup="ImageLoader"/>
+
+  <xs:attributeGroup name="ImageLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI (location) of the file to load. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageMap">
+    <xs:annotation>
+      <xs:documentation>This class emulates the classic image map found in HTML.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageMapAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImageMap" substitutionGroup="ImageMap"/>
+
+  <xs:attributeGroup name="ImageMapAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageMapArea">
+    <xs:annotation>
+      <xs:documentation>This class represents a particular area on an image map.
+
+        This class supports the following events:-
+        mousemove
+        mousedown
+        mouseover
+        mouseout
+        click
+        contextmenu
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageMapAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImageMapArea" substitutionGroup="ImageMapArea"/>
+
+  <xs:attributeGroup name="ImageMapAreaAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="cursor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The cursor to show when the mouse hovers over this area</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageMapEvent">
+    <xs:annotation>
+      <xs:documentation>This type of event is fired when UI events (mousemove, mousedown, etc) are fired on
+        the image that is associated with an image map.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageMapEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImageMapEvent" substitutionGroup="ImageMapEvent"/>
+
+  <xs:attributeGroup name="ImageMapEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImagePreloader">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles preloading of an image. There will never be more than
+        one instance of this class per image URI. So if there already exists a
+        preloader for the given URI that will be returned.
+        Since there might be other objects dependent on the current instance it
+        is not a good idea to call dispose on the instance object. Disposal is
+        handled by the system.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImagePreloaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImagePreloader" substitutionGroup="ImagePreloader"/>
+
+  <xs:attributeGroup name="ImagePreloaderAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image file loads</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onerror" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires if the image file fails to load</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImagePreloaderManager">
+    <xs:annotation>
+      <xs:documentation>
+        A singleton class that handles the BiImagePreloader
+        instances
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImagePreloaderManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiImagePreloaderManager" substitutionGroup="ImagePreloaderManager"/>
+
+  <xs:attributeGroup name="ImagePreloaderManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InlineComponent">
+    <xs:annotation>
+      <xs:documentation>This class is used to create components that can be used in the
+        inline flow of the HTML document hosting the application.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InlineComponentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiInlineComponent" substitutionGroup="InlineComponent"/>
+
+  <xs:attributeGroup name="InlineComponentAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="inlineId" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the id that the HTML element acting as the container is
+          having. Don't change this after the component has been added
+          to the application window.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="InlineEditModel">
+    <xs:annotation>
+      <xs:documentation>This class is used to handle inline editing in aBiTreeView and aBiOlapGrid.
+        This class provides editing by using one attached component at a time.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InlineEditModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiInlineEditModel" substitutionGroup="InlineEditModel"/>
+
+  <xs:attributeGroup name="InlineEditModelAttributes">
+
+    <xs:attributeGroup ref="AttachedComponentModelAttributes"/>
+
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The value of the currently editing cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforeshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched before the editing
+          component is added to theBiTreeView component
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the value of the
+          currently editing cell has changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforehide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This happens before the editing component is
+          hidden. If the default action is prevented here
+          the component is not removed from the tree view
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onhide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the editing component has been removed/hidden.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="IpField">
+    <xs:annotation>
+      <xs:documentation>This component is used to enter an IPv4 address. The control consists of different text fields
+        for the different parts of the address.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="IpFieldAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiIpField" substitutionGroup="IpField"/>
+
+  <xs:attributeGroup name="IpFieldAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="ip" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The IP address that is shown in the IP field.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the enter key is pressed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the IP field is blurred
+          and the text has changed since the IP field got
+          focus.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfieldchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the active field of the
+          component changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ontextchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the text has changed.
+          This happens when the user in some way changes
+          the text inside the IP field. This event
+          is fired continiously as the user types.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oninvalidinput" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired if an invalid character is typed or
+          invalid text is pasted into the IP field.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Json">
+    <xs:annotation>
+      <xs:documentation>This class is used to serialize and deserialize javascript objects from and
+        to a JSON string. JSON stands for JavaScript Notation Format and you can find
+        more information at http://json.org.
+        When serializing objects we check if the object has a serialize
+        method and if so we use that instead.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="JsonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiJson" substitutionGroup="Json"/>
+
+  <xs:attributeGroup name="JsonAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="JsonLoader">
+    <xs:annotation>
+      <xs:documentation>Loads a JSON file and returns the javascript object that the JSON file
+        describes.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="JsonLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiJsonLoader" substitutionGroup="JsonLoader"/>
+
+  <xs:attributeGroup name="JsonLoaderAttributes">
+
+    <xs:attributeGroup ref="TextLoaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="KeyboardEvent">
+    <xs:annotation>
+      <xs:documentation>
+        This class describes event object used in keyboard events.
+        All keyboard events bubble by default. This means that once all the
+        event listeners have been notified the event propagates to the parent
+        BiComponent. To prevent the event to
+        bubble to the parent call
+        stopPropagation() on the event object.
+        The currently supported keyboard events by BiComponent
+        are: keydown keypress keyup
+        This object should not be created by the user. It is created as needed by the event system.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="KeyboardEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiKeyboardEvent" substitutionGroup="KeyboardEvent"/>
+
+  <xs:attributeGroup name="KeyboardEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="L10nLoader">
+    <xs:annotation>
+      <xs:documentation>This class handles the loading and interpretation of localization templates files.
+        This loader search for language specific template file i.e..
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="L10nLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiL10nLoader" substitutionGroup="L10nLoader"/>
+
+  <xs:attributeGroup name="L10nLoaderAttributes">
+
+    <xs:attributeGroup ref="XmlLoaderAttributes"/>
+
+    <xs:attribute name="language" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The desired language, otherwise the browser language is used.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="defaultLanguage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The desired default language. The default langugae will be used if no localization template file can
+          be found using the language property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="prefix" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Prefix of the localization template files, the loader will search for files named</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="L10nString">
+    <xs:annotation>
+      <xs:documentation>This class converts a localization template to a string.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="L10nStringAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiL10nString" substitutionGroup="L10nString"/>
+
+  <xs:attributeGroup name="L10nStringAttributes">
+
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String : The localization template name - Sets the localization template name.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Label">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to show text
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLabel" substitutionGroup="Label"/>
+
+  <xs:attributeGroup name="LabelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="text">
+      <xs:annotation>
+        <xs:documentation>The plain text shown on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="html">
+      <xs:annotation>
+        <xs:documentation>The HTML text shown on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mnemonic">
+      <xs:annotation>
+        <xs:documentation>A character used to give UI hints about the access key for the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="font" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiFont - This is used to describe how to paint the text on the label.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="labelFor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiComponent - If this is set then focusing on the current label moves the focus to another component
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="wrap">
+      <xs:annotation>
+        <xs:documentation>Whether to wrap the text if the label is not wide enough</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingLeft">
+      <xs:annotation>
+        <xs:documentation>The left padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingRight">
+      <xs:annotation>
+        <xs:documentation>The right padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingTop">
+      <xs:annotation>
+        <xs:documentation>The top padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingBottom">
+      <xs:annotation>
+        <xs:documentation>The bottom padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align">
+      <xs:annotation>
+        <xs:documentation>
+          The text alignment. Valid values are: left right center justify
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="verticalAlign">
+      <xs:annotation>
+        <xs:documentation>
+          NOT IMPLEMENTED
+          The vertical text alignment. Valid values are: top middle bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:BiImage - The icon image to show on the label. Note that changing
+          the image object does not update the label icon. You'll have to
+          set the icon property to update the label icon.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="iconPosition">
+      <xs:annotation>
+        <xs:documentation>
+          The position of the icon relative to the text. Valid values are: left right top bottom
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="iconTextGap">
+      <xs:annotation>
+        <xs:documentation>The gap between the icon and the text (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Launcher">
+    <xs:annotation>
+      <xs:documentation>This class can be used to create a launcher for launching Bindows applications
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LauncherAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLauncher" substitutionGroup="Launcher"/>
+
+  <xs:attributeGroup name="LauncherAttributes">
+
+    <xs:attribute name="reuseWindow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to reuse a previously opened window. If you want to launch
+          the new application in the current window set newWindow to
+          false.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="newWindow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to launch the application in a new window</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rootPath" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The path where Bindows resides. This is usually the path where bimain.html
+          can be found.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="adfPath" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The path to the ADF file.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="adfName" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The ADF name is taken from the ADF path</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="arguments" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The arguments to pass to the main method of the ADF</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="target" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The target name of the window or frame to open the application in. If this is ""
+          or null the ADF name will be used instead. If reuseWindow
+          is false then this property will be ignored.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accessibilityMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This property can be used to tell whether the application should be in an
+          accessibility mode.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="focusOnLoad" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to try to focus the window when the application loads</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Line">
+    <xs:annotation>
+      <xs:documentation>ABiLine contains screen coordinates. It can be used to store eg. a line.
+        This class is used in animation.
+        Storage is implemented as a stack where you add points at the end.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LineAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLine" substitutionGroup="Line"/>
+
+  <xs:attributeGroup name="LineAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="LineChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a line chart for the given series
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LineChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLineChart" substitutionGroup="LineChart"/>
+
+  <xs:attributeGroup name="LineChartAttributes">
+
+    <xs:attributeGroup ref="AbstractChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="LineMarker">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the components used to show the markers for a
+        line chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LineMarkerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLineMarker" substitutionGroup="LineMarker"/>
+
+  <xs:attributeGroup name="LineMarkerAttributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Link">
+    <xs:annotation>
+      <xs:documentation>This class represents the relationship between two components that are to be linked by a link line.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LinkAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLink" substitutionGroup="Link"/>
+
+  <xs:attributeGroup name="LinkAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="startComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The first ("left") component that is part of this link.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The second ("right") component that is part of this link.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="line" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDrawLine - The line used to link the components.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="startAnchor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The anchor point on startComponent which line anchors to.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endAnchor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The anchor point on endComponent which line anchors to.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="direction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The direction of this link.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="LinkManager">
+    <xs:annotation>
+      <xs:documentation>This class is a component that holds linked components. It also manages the links involved with these components.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LinkManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLinkManager" substitutionGroup="LinkManager"/>
+
+  <xs:attributeGroup name="LinkManagerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="List">
+    <xs:annotation>
+      <xs:documentation>This is a list component that can contain BiListItem
+        objects. It uses the normal object model and can therefore be extended and
+        used just like any other component. The only limitation is that the the direct
+        children should only be of type BiListItem
+        and the size and position of these should not be changed.
+        The list uses a BiListSelectionModel
+        that handles the selection.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ListAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiList" substitutionGroup="List"/>
+
+  <xs:attributeGroup name="ListAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="allowInlineFind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When true, typing a word will select the first matching item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Used to decide how to sort the list items. It is used when calling sort()
+          if the sortFunction property has not been set to a function.
+          If the list items has its userValue property set, it has precedence over its
+          text property in being the value that is compared
+          Built in support for the following
+          types: string (default) caseInsensitiveString number date - Uses the native JS Date type
+          To get better control over the sorting, define a function and set
+          the sortFunction property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortFunction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - Sets a property which is a function used to compare two listItems.
+          This function should take two arguments and return a
+          number (just like the normal comparison function used when sorting
+          arrays in JavaScript). If this property is not set, it uses the predefined
+          functions set by the sortType property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - This is the userValue of
+          the first selected list item.
+          If no item is selected then this returns null.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiListSelectionModel - This handles the selection of the items in the list</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="multipleSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the list supports multiple selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataTextField" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column to use as the data for the text property
+          of the BiListItems.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataUserValueField" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The name of the column to use as the data for the userValue
+          property of the BiListItems.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataSource" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDataTable /BiDataSet - The object to use as the data source. This can be a either a
+          BiDataTable or a
+          BiDataSet (in which case the
+          first table is used).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataPageSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount of rows to show at one time from the data source.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="currentDataPage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the current data page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected items change</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondatabind" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Called after the component has been data bound</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ListItem">
+    <xs:annotation>
+      <xs:documentation>This class is used for the items in a list
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ListItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiListItem" substitutionGroup="ListItem"/>
+
+  <xs:attributeGroup name="ListItemAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the item is visible or not. Note that all the ancestors must be
+          visible for the component to be actually shown. Use isVisible to
+          check that the item is shown.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the item is selected or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the list item. This is not the text on the item. To
+          change the text use the text
+          property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the item is double
+          clicked or when enter is pressed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ListSelectionModel">
+    <xs:annotation>
+      <xs:documentation>This class handles the selection for lists
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ListSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiListSelectionModel" substitutionGroup="ListSelectionModel"/>
+
+  <xs:attributeGroup name="ListSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="LoadManager">
+    <xs:annotation>
+      <xs:documentation>This singleton class is used to keep track of loading of resources
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LoadManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLoadManager" substitutionGroup="LoadManager"/>
+
+  <xs:attributeGroup name="LoadManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="loadPerDomain" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is is the number of requests that can be loaded at the same time from
+          the same domain
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="LocationAnimator">
+    <xs:annotation>
+      <xs:documentation>Animates the location ofBiComponents to create movement.
+        This class has a repository of motion paths. A motion path is created by setting start and end
+        screen coordinates. Objects will be animated between these in a straight line.
+        Motion paths are stored in a stack where the first motion path, called the default motion path,
+        is created upon construction.
+        The default motion path can be changed and modified dynamically via getter/setter function,
+        whereas additional motion paths can only be either added or removed. For each motion path you have
+        independent control over speed and acceleration algorithms.
+        By pushing more motion paths onto the stack you can make the object animate around multiple
+        positions on the screen and create complex movement.
+        To animate a component, you create the animator object and add componen(s) to it, then start the animation.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LocationAnimatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiLocationAnimator" substitutionGroup="LocationAnimator"/>
+
+  <xs:attributeGroup name="LocationAnimatorAttributes">
+
+    <xs:attributeGroup ref="ComponentAnimationAttributes"/>
+
+    <xs:attribute name="fromX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Starting point's X position measured in pixels.
+          Modifies the default motion path, that components will be animated between.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Starting point's Y position measured in pixels.
+          Modifies the default motion path, that components will be animated between.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Ending point's X position measured in pixels.
+          Modifies the default motion path, that components will be animated between.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Ending point's Y position measured in pixels.
+          Modifies the default motion path, that components will be animated between.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Changes the acceleration type for the default motion path.
+          Use one of the acceleration constants defined inBiComponentAnimation
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="speed" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number/String - Changes the speed of the default motion path.
+          Time measured in milliseconds it should take to complete
+          the animation of the default motion path.
+          It Could also be a string with the following values:
+          slowest, slow, normal, fast, fastest
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets both the speed and the acceleration type for the animation.
+          Can be either: "normal" or "smooth"
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - Instead of using absolute window positions, you can position the animation relative
+          another components position. By setting the from-component you specify anotherBiComponent
+          whos location will be used for the animation's start state.
+          If the from-component's location or size is changed, the animation
+          will update dynamically. By default the top left corner of the from-component will be this
+          animation's start x/y.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - Instead of using absolute window positions, you can position the animation relative
+          another components position. By setting the to-component you specify anotherBiComponent
+          whos location will be used for the animation's target state.
+          If the to-component's location or size is changed, the animation
+          will update dynamically. By default the top left corner of the to-component will be this
+          animation's end x/y.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation start y position relative to either a from-component, if set. Otherwise
+          top relates to the browser's viewport. Setting top cancels bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation end y position relative to either a to-component, if set. Otherwise
+          top relates to the browser's viewport. Setting top cancels bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation start x position relative to either a from-component, if set. Otherwise
+          left relates to the browser's viewport. Setting left cancels right.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation end x position relative to either a to-component, if set. Otherwise
+          left relates to the browser's viewport. Setting left cancels right.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromBottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation start y position relative to either a from-component, if set. Otherwise
+          bottom relates to the browser's viewport. Setting bottom cancels top.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toBottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation end y position relative to either a to-component, if set. Otherwise
+          bottom relates to the browser's viewport. Setting bottom cancels top.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromRight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation start x position relative to either a from-component, if set. Otherwise
+          right relates to the browser's viewport. Setting right cancels left.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toRight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the animation end x position relative to either a to-component, if set. Otherwise
+          right relates to the browser's viewport. Setting right cancels left.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Math">
+    <xs:annotation>
+      <xs:documentation>Collection of static functions used in various math operations.
+        Used heavily in the animation library for example.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MathAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMath" substitutionGroup="Math"/>
+
+  <xs:attributeGroup name="MathAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Menu">
+    <xs:annotation>
+      <xs:documentation>This class represents a menu. Menus can be filled with menu items by
+        addingBiMenuItem objects.
+        The content model for the menu is very similiar to the content model for
+        BiComponent but there are slight differences.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenu" substitutionGroup="Menu"/>
+
+  <xs:attributeGroup name="MenuAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Shows or hides the menu</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="left" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets or gets the left position of the menu relative to the screen</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="top" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets or gets the top position of the menu relative to the screen</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="width" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the menu</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="height" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The heightof the menu</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightToLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Describes whether the component should be be layed out to support
+          locales using right-to-left fonts. If this is set to null
+          then the rightToLeft property for the parent component
+          is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the menu is shown</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the menu is shown.
+          This is a good place to change the content of the menu to reflect the
+          component causing the menu to be shown
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onhide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the menu is hidden</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MenuBar">
+    <xs:annotation>
+      <xs:documentation>This class is used to display a menu bar
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenuBar" substitutionGroup="MenuBar"/>
+
+  <xs:attributeGroup name="MenuBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MenuButton">
+    <xs:annotation>
+      <xs:documentation>This class is used for displaying the buttons of a menu bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenuButton" substitutionGroup="MenuButton"/>
+
+  <xs:attributeGroup name="MenuButtonAttributes">
+
+    <xs:attributeGroup ref="MenuItemAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MenuItem">
+    <xs:annotation>
+      <xs:documentation>Represents a menu item for a menu.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenuItem" substitutionGroup="MenuItem"/>
+
+  <xs:attributeGroup name="MenuItemAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The plain text to show on the menu item</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="html" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The html text to show on the menu item</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon image to show on the menu item. Note that changing
+          the image object does not update the label icon. You'll have to
+          set the icon property to update the label icon. The size of the icon
+          of the menu item is currently fixed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mnemonic" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - A character used to give UI hints about the access key for the menu label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="subMenu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - The menu that should be opened as a sub menu when the current menu is selected.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="visible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Shows or hides the menu item</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="enabled" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the component is enabled or not. When this is changed the
+          component fires the enabledchanged event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="shortcutText" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The shortcut text is shown on the menu to give the user a hint about
+          keyboard shortcuts. Setting this on the menu just adds the text. It
+          does not set up the keyboard shortcut.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toolTipText" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text to show as a tool tip for the menu item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when the menu item is clicked or invoked using the keyboard</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onenabledchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the enabled property is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MenuSeparator">
+    <xs:annotation>
+      <xs:documentation>This class is used to display a separator inside a menu
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MenuSeparatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMenuSeparator" substitutionGroup="MenuSeparator"/>
+
+  <xs:attributeGroup name="MenuSeparatorAttributes">
+
+    <xs:attributeGroup ref="MenuItemAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MouseEvent">
+    <xs:annotation>
+      <xs:documentation>This class describes event objects used in mouse events.
+        All mouse events bubble by default. This means that once all the
+        event listeners have been notified the event propagates to the parent
+        BiComponent. To prevent the event to
+        bubble to the parent call
+        stopPropagation() on the event object.
+        The currently supported events by BiComponent
+        are: mousedown mouseup click dblclick contextmenu - this one is a bit tricky since it might also be dispatched when the user presses
+        the context menu key on their keyboard mouseover mouseout mousemove mousewheel
+        When a user double clicks on a component the order of the mouse events is
+        the following: mousedown mouseup click mousedown mouseup click dblclick
+        This object should not be created by the user. It is created as needed by the event system.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MouseEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMouseEvent" substitutionGroup="MouseEvent"/>
+
+  <xs:attributeGroup name="MouseEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MoveHandle">
+    <xs:annotation>
+      <xs:documentation>This component can be used to allow another component to become movable
+        using the mouse. The component can be used as a move handle for the
+        component to move. It can also be used without adding it to another
+        component by manually calling startMove in a mouse down
+        event handler.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MoveHandleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiMoveHandle" substitutionGroup="MoveHandle"/>
+
+  <xs:attributeGroup name="MoveHandleAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="continuousLayout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Indicates that the ghost must be used to be a visual indicator for the duration of the move
+          operation.
+          Once complete, the original component's location will be updated accordingly.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ghost" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that should be visually updated if continuousLayout is set to false.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="handleFor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that the handle should be a move handle for.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="moveDirection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The direction the component can be moved. Possible values are: vertical horizontal both.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforemove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires continually during the moving of the component. Call
+          preventDefault
+          on the event object to prevent the new location from being applied.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmove" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires continually during the moving of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmoveend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the movement is ended.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmovestart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired before the movement is started. To prevent this
+          from being moved call preventDefault
+          on the event object.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Object">
+    <xs:annotation>
+      <xs:documentation>This is the core class of all Bindows classes. This class provides
+        some useful methods over the standard Javascript Object.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ObjectAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiObject" substitutionGroup="Object"/>
+
+
+  <xs:attributeGroup name="ObjectAttributes">
+
+    <xs:attribute name="id" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - An identifier for the object. Be careful when changing this because
+          it might have undesired side effects.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userData" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Allows custom data to be stored on the object. Although Javascript
+          allows custom fields to be added to any object this property makes
+          this a bit more consistent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="properties" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Allows you to set multiple properties at once. setProperties takes a hash
+          of name/value pairs as its argument and sets the properties using setProperty
+          sample: myObj.setProperties( { property1:'value1', property2:'value2' } )
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ObjectLoader">
+    <xs:annotation>
+      <xs:documentation>This class is used to encapsulate an object created from XML markup in a
+        loader object. The loader can be used to create several objects from the same
+        XML node. Each time the load() method is called a new object is created from
+        the node. The method getComponentById() will be added to the created objects and
+        can be used to obtain child components with. The last created object is stored
+        in the object property of the loader.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ObjectLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiObjectLoader" substitutionGroup="ObjectLoader"/>
+
+  <xs:attributeGroup name="ObjectLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="node" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:XMLElement - This is the XML element describing the object.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference to the object created from this XML element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGrid">
+    <xs:annotation>
+      <xs:documentation>This class is used to display an OLAP Grid
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGrid" substitutionGroup="OlapGrid"/>
+
+  <xs:attributeGroup name="OlapGridAttributes">
+
+    <xs:attributeGroup ref="TreeViewBaseAttributes"/>
+
+    <xs:attribute name="allowHeaderSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiOlapGridSelectionModel - Whether clicking on a dimension header also selects the rows/column of the
+          header.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="canReorganizeDimensions" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true the user can reorganize the dimensions using drag and drop
+          TODO: Document what events are fired when the reorg should happen
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondimensiondrop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when a dimension
+          of the current grid is dropped
+          on another dimension. This can
+          only happen if canReorganizeDimensions
+          is true
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridCellInfo">
+    <xs:annotation>
+      <xs:documentation>This represents information about a cell in the OLAP grid. This information
+        describes if a cell is part of the header and more.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridCellInfoAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridCellInfo" substitutionGroup="OlapGridCellInfo"/>
+
+  <xs:attributeGroup name="OlapGridCellInfoAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="header" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the cell is part of the header</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="body" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the cell is part of the body</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="row" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - What row the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="column" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - What column the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dimension" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The dimension the axis header cell is part of. If the cell is part of the
+          body then this is null.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="axis" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The axis the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="axisPosition" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The axis position is the start position of the axis header cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="quadrant" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is used to tell what part of the OLAP grid the cell belongs to</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridDataModel">
+    <xs:annotation>
+      <xs:documentation>This defines the interface that is needed for a data model for aBiOlapGrid.
+        This actually implements a dummy data model. Extend this class to create
+        more useful data models. *
+        All methods in this data model can be safely overriden without calling the super
+        class since there are no side effects in any of the methods.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridDataModel" substitutionGroup="OlapGridDataModel"/>
+
+  <xs:attributeGroup name="OlapGridDataModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridDragEvent">
+    <xs:annotation>
+      <xs:documentation>This event is used for events related to some drag and drop inside the OLAP grid.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridDragEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridDragEvent" substitutionGroup="OlapGridDragEvent"/>
+
+  <xs:attributeGroup name="OlapGridDragEventAttributes">
+
+    <xs:attributeGroup ref="DragEventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridDropMarker">
+    <xs:annotation>
+      <xs:documentation>This component is used to draw a drop marker on top/inside an OLAP grid
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridDropMarkerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridDropMarker" substitutionGroup="OlapGridDropMarker"/>
+
+  <xs:attributeGroup name="OlapGridDropMarkerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridResizeOutline">
+    <xs:annotation>
+      <xs:documentation>This component is used as an overlay above the column that is currently being
+        resized
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridResizeOutlineAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridResizeOutline" substitutionGroup="OlapGridResizeOutline"/>
+
+  <xs:attributeGroup name="OlapGridResizeOutlineAttributes">
+
+    <xs:attributeGroup ref="ResizeHandleAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridSelectionModel">
+    <xs:annotation>
+      <xs:documentation>Selection model forBiOlapGrid.
+
+        This selection model contains of selected areas (BiArea). An area consists
+        of a left, top, width and height propertty. Two selected areas may overlap
+        so be careful when trying to get all selected cells.
+
+        The selectedItems collection is aBiAreaCollection
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridSelectionModel" substitutionGroup="OlapGridSelectionModel"/>
+
+  <xs:attributeGroup name="OlapGridSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridStateManager">
+    <xs:annotation>
+      <xs:documentation>A simple class that is used internally with theBiOlapGrid to keep track
+        of active and hover cell
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridStateManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridStateManager" substitutionGroup="OlapGridStateManager"/>
+
+  <xs:attributeGroup name="OlapGridStateManagerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="active" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiOlapGridCellInfo - The active cell info</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onhoverchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>When the user hovers over a different part
+          of the OLAP grid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondropoverchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the user is doing drag and drop
+          and the cell that the user is over changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapGridViewManager">
+    <xs:annotation>
+      <xs:documentation>This class handles the visual properties of aBiOlapGrid
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapGridViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapGridViewManager" substitutionGroup="OlapGridViewManager"/>
+
+  <xs:attributeGroup name="OlapGridViewManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="showGridLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show grid lines between the cells in the OLAP grid</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the scroll left to the view manager so that the view manager can figure
+          out what column to start at
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the scroll top to the view manager so that the view manager can figure
+          out what row to start at
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="axisOnTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - This is used to tell which axis is to be shown as the column headers and
+          which to be shown as the row headers. A value of 0 means that the first
+          axis should be shown at the top.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cellMinimumWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum width a cell might have. This is used when the user resizes a
+          colum. Setting this does not update the exisiting columns.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cellMinimumHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum height a cell might have. This is used when the user resizes a
+          row. Setting this does not update the exisiting rows.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OlapStateEvent">
+    <xs:annotation>
+      <xs:documentation>This class is used when the interactive state of the OLAP grid changes
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OlapStateEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOlapStateEvent" substitutionGroup="OlapStateEvent"/>
+
+  <xs:attributeGroup name="OlapStateEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="OpacityAnimator">
+    <xs:annotation>
+      <xs:documentation>Animates the opacity ofBiComponents to create various visual effects.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OpacityAnimatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOpacityAnimator" substitutionGroup="OpacityAnimator"/>
+
+  <xs:attributeGroup name="OpacityAnimatorAttributes">
+
+    <xs:attributeGroup ref="ComponentAnimationAttributes"/>
+
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Setups common values (speed, acceleration type and loop mode) for default opacity animations.
+          Possible values are: pulsate, blink, fadeIn, fadeOut
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minOpacity" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Float - Limits how transparent the animated objects are allowed to be.
+          0.0 completely transparent, 1.0 completely opaque
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="speed" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number/String - Sets the duration, in milliseconds, of one animation cycle (some animation types use two
+          cycles).
+          The following string constants are also allowed:
+          slowest, slow, normal, fast, fastest
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OptionPane">
+    <xs:annotation>
+      <xs:documentation>This class is used to layout default dialog controls. Normally this class
+        is not used directly but one of the static methods are used to create
+        new dialogs.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OptionPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOptionPane" substitutionGroup="OptionPane"/>
+
+  <xs:attributeGroup name="OptionPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="initialValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - This is used to define which of the options that
+          should be treated as the default acceptButton.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="acceptButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default accept button. If this is set
+          then the action
+          event is dispatched from the accept button when the enter key
+          is pressed. This does not have to
+          be a BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cancelButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default cancel button. If this is set
+          then the action
+          event is dispatched from the cancel button. This does not have to
+          be a BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Sets the value of the option pane. This is used as the
+          dialogResult
+          when the option pane is used with a dialog.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="inputComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - This allows an input component to be shown below the message
+          component. This is created when creating input dialogs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this option pane. If this is set to null
+          then the static string bundle forBiOptionPane is used
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="OrderedIterator">
+    <xs:annotation>
+      <xs:documentation>This is an ordered iterator that allows you to add items ordered by an index.
+        The items are ordered based on the index and finding and removing an item
+        based on its index is done in constant time. Inserting an item is in worst
+        case O(n) (where n is the number of items in the iterator).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="OrderedIteratorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiOrderedIterator" substitutionGroup="OrderedIterator"/>
+
+  <xs:attributeGroup name="OrderedIteratorAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PasswordField">
+    <xs:annotation>
+      <xs:documentation>A text field where the entered text is masked.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PasswordFieldAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPasswordField" substitutionGroup="PasswordField"/>
+
+  <xs:attributeGroup name="PasswordFieldAttributes">
+
+    <xs:attributeGroup ref="TextFieldAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PercentageStackedBarChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a percentage stacked bar chart for the given series.
+        A percentage stacked bar chart stacks the columns from the different series next to each
+        other and the value of the columns is expressed in percentage so all values
+        from the same category add up to 100%.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PercentageStackedBarChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPercentageStackedBarChart" substitutionGroup="PercentageStackedBarChart"/>
+
+  <xs:attributeGroup name="PercentageStackedBarChartAttributes">
+
+    <xs:attributeGroup ref="PercentageStackedColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PercentageStackedBarChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a percentage stacked bar chart for the given series.
+        A percentage stacked bar chart stacks the columns from the different series next to each
+        other and the value of the columns is expressed in percentage so all values
+        from the same category add up to 100%.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PercentageStackedBarChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPercentageStackedBarChart2" substitutionGroup="PercentageStackedBarChart2"/>
+
+  <xs:attributeGroup name="PercentageStackedBarChart2Attributes">
+
+    <xs:attributeGroup ref="PercentageStackedColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PercentageStackedColumnChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a percentage stacked column chart for the given series.
+        A percentage stacked column chart stacks the columns from the different series on top of each
+        other and the value of the columns is expressed in percentage so all values
+        from the same category add up to 100%.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PercentageStackedColumnChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPercentageStackedColumnChart" substitutionGroup="PercentageStackedColumnChart"/>
+
+  <xs:attributeGroup name="PercentageStackedColumnChartAttributes">
+
+    <xs:attributeGroup ref="ColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PercentageStackedColumnChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a percentage stacked column chart for the given series.
+        A percentage stacked column chart stacks the columns from the different series on top of each
+        other and the value of the columns is expressed in percentage so all values
+        from the same category add up to 100%.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PercentageStackedColumnChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPercentageStackedColumnChart2" substitutionGroup="PercentageStackedColumnChart2"/>
+
+  <xs:attributeGroup name="PercentageStackedColumnChart2Attributes">
+
+    <xs:attributeGroup ref="ColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PieChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a pie chart for the given series
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PieChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPieChart" substitutionGroup="PieChart"/>
+
+  <xs:attributeGroup name="PieChartAttributes">
+
+    <xs:attributeGroup ref="AbstractChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PieChartSection">
+    <xs:annotation>
+      <xs:documentation>
+        This class handles the components used to show the rectangles for a
+        pie chart.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PieChartSectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPieChartSection" substitutionGroup="PieChartSection"/>
+
+  <xs:attributeGroup name="PieChartSectionAttributes">
+
+    <xs:attributeGroup ref="AbstractChartSectionAttributes"/>
+
+    <xs:attribute name="radius">
+      <xs:annotation>
+        <xs:documentation>The size of the radius (0-1)
+          where 1 means that it will take up the entire available size
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="explode">
+      <xs:annotation>
+        <xs:documentation>The distance to move the sectio from the
+          center (0-1, percentage of available size).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="startAngle">
+      <xs:annotation>
+        <xs:documentation>The angle given in radians
+          where the pie chart section starts.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="endAngle">
+      <xs:annotation>
+        <xs:documentation>The angle given in radians
+          where the pie chart section ends.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Point">
+    <xs:annotation>
+      <xs:documentation>Simple class that describes a location of Point on a plane.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PointAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPoint" substitutionGroup="Point"/>
+
+  <xs:attributeGroup name="PointAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Polygon">
+    <xs:annotation>
+      <xs:documentation>This class represents a convex polygon. In a convex polygon,
+        no two sides may intersect more than once (at their endpoints),
+        and no vertex may be the intersection point of more than two
+        sides.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PolygonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPolygon" substitutionGroup="Polygon"/>
+
+  <xs:attributeGroup name="PolygonAttributes">
+
+    <xs:attributeGroup ref="ShapeAttributes"/>
+
+    <xs:attribute name="vertices" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiPoint[] - The vertices of this polygon</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Popup">
+    <xs:annotation>
+      <xs:documentation>A popup is a component that is displayed on top of all other components
+        and is not limited by the parent components view port.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PopupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPopup" substitutionGroup="Popup"/>
+
+  <xs:attributeGroup name="PopupAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="screenLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position relative to the screen. Note that this can be both set and get
+          for popups.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="screenTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position relative to the screen. Note that this can be both set and get
+          for popups.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clientLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position relative to the browser client area. Note that this can be both
+          set and get for popups.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="clientTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position relative to the browser client area. Note that this can be both
+          set and get for popups.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opaque" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to make the popup opaque. An opaque popup will not let plugins and
+          other windowed controls show through. However, there is a price to this. This
+          is achieved using an internal iframe and this makes the popup heavier and
+          slower.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="autoHide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to let the system decide when to hide the popup. Setting this to
+          false gives you better control but it also requires you to
+          handle the closing of the popup.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="allowOffScreen" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to allow the popup to be positioned off screen</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforeshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the popup is shown. This is a good
+          place to change the content of the popup and
+          set the preferred size if the default preferred
+          size is not wanted
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onshow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the popup is shown</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onhide" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the popup is hidden</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PopupManager">
+    <xs:annotation>
+      <xs:documentation>This singleton class manages the BiPopup
+        objects.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PopupManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPopupManager" substitutionGroup="PopupManager"/>
+
+  <xs:attributeGroup name="PopupManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="useOpaquePopups" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to make popup opaque by default. An opaque popup will not let plugins
+          and other windowed controls show through. However, there is a price to this.
+          This is achieved using an internal iframe and this makes the popup heavier and
+          slower.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="PrintFrame">
+    <xs:annotation>
+      <xs:documentation>BiPrintFrame is a helper class for printing any data from within a Bindows
+        application. It takes a Uri to a template file and a object containing named
+        strings as arguments and parses the template before sending it to the printer.
+
+        A template is typically an HTML document containing customizable tags used as
+        placeholders for data. The parser function being used can be easily extended to
+        handle more complex data, e.g. tables etc.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PrintFrameAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiPrintFrame" substitutionGroup="PrintFrame"/>
+
+  <xs:attributeGroup name="PrintFrameAttributes">
+
+    <xs:attributeGroup ref="IframeAttributes"/>
+
+    <xs:attribute name="textParser" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTextParser - The Parser used for generating parsed content.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ProgressBar">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show a progress bar.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ProgressBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiProgressBar" substitutionGroup="ProgressBar"/>
+
+  <xs:attributeGroup name="ProgressBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="maximum">
+      <xs:annotation>
+        <xs:documentation>The maximum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum">
+      <xs:annotation>
+        <xs:documentation>The minimum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value">
+      <xs:annotation>
+        <xs:documentation>The value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This event is fired when the maximum, minimum
+          or maximum properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RadioButton">
+    <xs:annotation>
+      <xs:documentation>Represents a radio button control. A radio button control can have two
+        states; checked and unchecked. These are represented by the
+        checked property.
+        Once a radio button is checked clicking it again will not uncheck it. To
+        uncheck a radio button another radio button in the same
+        radio group must be checked.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RadioButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRadioButton" substitutionGroup="RadioButton"/>
+
+  <xs:attributeGroup name="RadioButtonAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the radio button.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the radio button is checked or not. When this is changed
+          the change event is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiRadioGroup - The group that the radio button should be part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the user presses the button (either using
+          the mouse or the keyboard)
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RadioButtonMenuItem">
+    <xs:annotation>
+      <xs:documentation>This class is used for a menu item that displays a radio button to the left
+        of the text. To group different radio button menu items into a radio group
+        use theBiRadioGroup class in the same way it would be used for normal
+        radio buttons.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RadioButtonMenuItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRadioButtonMenuItem" substitutionGroup="RadioButtonMenuItem"/>
+
+  <xs:attributeGroup name="RadioButtonMenuItemAttributes">
+
+    <xs:attributeGroup ref="MenuItemAttributes"/>
+
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the item.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the item is checked or not</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="group" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiRadioGroup - The group that the radio button menu item should be part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked change</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RadioGroup">
+    <xs:annotation>
+      <xs:documentation>This class is used in conjunction with radio
+        buttons to ensure only one buttons is checked.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RadioGroupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRadioGroup" substitutionGroup="RadioGroup"/>
+
+  <xs:attributeGroup name="RadioGroupAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiRadioButton - This is the radio button that is checked</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="enabled" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the radio group is enabled or not. Setting this also
+          sets the enabled property on the radio buttons.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - This is the user value of the checked radio button in this radio
+          group. Setting this checks the first item that has this value.
+          If no item has this value the setting will have no effect.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="command" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiCommand - When the radio group has a command the enabled and
+          userValue are synchronized with the command.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the selected radio button is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RangeModel">
+    <xs:annotation>
+      <xs:documentation>This class represents a range model that has a minumum, maximum, value and
+        an extent. This class is used by theBiProgressBar,BiScrollBar,BiSlider and
+        BiSpinner classes.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RangeModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRangeModel" substitutionGroup="RangeModel"/>
+
+  <xs:attributeGroup name="RangeModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The value for the range</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The maximum value for the range</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum value for the range</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="extent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The extent for the range</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the maximum,
+          minimum, value or
+          extent properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RepeatButton">
+    <xs:annotation>
+      <xs:documentation>This class is used for buttons that repeatedly fire action events
+        The first action event is fired firstInterval milliseconds
+        after the mouse is pressed down on the button. The following action events
+        are fired every interval millisecond until the mouse button is
+        released.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RepeatButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRepeatButton" substitutionGroup="RepeatButton"/>
+
+  <xs:attributeGroup name="RepeatButtonAttributes">
+
+    <xs:attributeGroup ref="ButtonAttributes"/>
+
+    <xs:attribute name="interval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The time in milliseconds between the repeating action events</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="firstInterval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The time in milliseconds before the first action event is fired</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ResizeHandle">
+    <xs:annotation>
+      <xs:documentation>This component can be used to allow another component to be resizable
+        using the mouse. The component can be used as a resize handle for the
+        component to resize. It can also be used without adding it to another
+        component by manually calling startResize in a mouse down
+        event handler.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResizeHandleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiResizeHandle" substitutionGroup="ResizeHandle"/>
+
+  <xs:attributeGroup name="ResizeHandleAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="continuousLayout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Indicates that the ghost must be used to be a visual indicator for the duration of the resize
+          operation.
+          Once complete, the original component's dimensions will be updated accordingly.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ghost" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that should be visually updated if continuousLayout is set to false.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="handleFor" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that the handle should be a resize handle for.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="resizeDirection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The direction that the resizing should be done in. Valid
+          values are:
+          s - south
+          n - north
+          e - east
+          w - west
+          se - south east
+          sw - south west
+          ne - north east
+          nw - north west
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onresize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires continually during the resizing of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeresize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires continually during the resizing of the component. Call
+          preventDefault
+          on the event object to prevent the new size from being applied.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onresizestart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires once when the resizing begins. Call
+          preventDefault
+          on the event object to prevent the component from being resized.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onresizeend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when resizing of the component ends.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ResourceLoader">
+    <xs:annotation>
+      <xs:documentation>This class is used to load different kinds of resources. There are basically
+        3 types of resources that this class can handle. The first 2 are script files
+        and a code string. The third one is a genereal object described by an XML
+        element and in this case an object is created using aBiXmlResourceParser.
+        When creating general objects a few special rules apply. If the created object
+        is an event target the resource loader will listen to load
+        and error events so that it can be notified by the object that
+        it is loaded. If the object has a load() method that will be
+        called if the object is not already loaded. To decide if the object is loaded
+        the resource loader will use getLoaded() if available and if that
+        isn't available it is assumed that the object is loaded (or does not require
+        loading).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResourceLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiResourceLoader" substitutionGroup="ResourceLoader"/>
+
+  <xs:attributeGroup name="ResourceLoaderAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference to the object created from this XML element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onprogress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires every time one of the external resources have
+          been loaded. This is useful for providing visual feedback.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when all the resources have been loaded and executed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Resources">
+    <xs:annotation>
+      <xs:documentation>This class is used to load multiple resources
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResourcesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiResources" substitutionGroup="Resources"/>
+
+  <xs:attributeGroup name="ResourcesAttributes">
+
+    <xs:attributeGroup ref="SerializedLoaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RichEdit">
+    <xs:annotation>
+      <xs:documentation>
+        This control is used to to provide rich text editing of HTML documents
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RichEditAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiRichEdit" substitutionGroup="RichEdit"/>
+
+  <xs:attributeGroup name="RichEditAttributes">
+
+    <xs:attributeGroup ref="IframeAttributes"/>
+
+    <xs:attribute name="contentHtml">
+      <xs:annotation>
+        <xs:documentation>
+          The HTML code inside the rich editor frame. This does not include
+          the doctype nor any comments outside the root element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Script">
+    <xs:annotation>
+      <xs:documentation>This class works much like the script element in HTML. You can set the uri
+        and it will fetch an external file that will be executed or you can use the
+        text property to execute some text.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ScriptAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiScript" substitutionGroup="Script"/>
+
+  <xs:attributeGroup name="ScriptAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The script text to evaluate</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The location of the script file</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="src" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - Alias to uri for backwards compatibility</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ScriptLoader">
+    <xs:annotation>
+      <xs:documentation>This class loads and executes a javascript file
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ScriptLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiScriptLoader" substitutionGroup="ScriptLoader"/>
+
+  <xs:attributeGroup name="ScriptLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI (location) of the file to load. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ScriptLoaderQueue">
+    <xs:annotation>
+      <xs:documentation>Used to load multiple js files and once all are loaded they are executed
+        in the order they were added.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ScriptLoaderQueueAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiScriptLoaderQueue" substitutionGroup="ScriptLoaderQueue"/>
+
+  <xs:attributeGroup name="ScriptLoaderQueueAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="async" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this is set to false then the loading will lock the UI thread
+          but the loading and execution will happen and finish when
+          load is called.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when all the scripts have been loaded and executed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onprogress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires every time one of the external scripts have
+          been loaded. This is useful for providing visual feedback.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ScrollBar">
+    <xs:annotation>
+      <xs:documentation>This component is used to show a scroll bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ScrollBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiScrollBar" substitutionGroup="ScrollBar"/>
+
+  <xs:attributeGroup name="ScrollBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="extent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The extent for the scroll bar.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The maximum value for the scroll bar.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum value for the scroll bar.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The value for the scroll bar.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minThumbSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The mimimum size of the thumb.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="unitIncrement" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount to change the scroll bar when pressing the buttons.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="blockIncrement" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount to change the scroll bar when the mouse is pressed on the scroll
+          bar (and not on the thumb or buttons).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="orientation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The orientation of the scroll bar. Valid values are: horizontal vertical</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the extent,
+          value, minimum or
+          maximum properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onscrollend" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the thumb is released
+          after scrolling.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SelectionItemCollection">
+    <xs:annotation>
+      <xs:documentation>This class is used internally insideBiSelectionModel to keep track of the
+        selected items. If you create a custom selection model you might need to also
+        create a custom selection model item collection. The type of the items is not
+        very important but the selection model needs to be able to work with this
+        type. You also need to override getItemHashCode if the items
+        are not instances ofBiObject.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SelectionItemCollectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSelectionItemCollection" substitutionGroup="SelectionItemCollection"/>
+
+  <xs:attributeGroup name="SelectionItemCollectionAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SelectionModel">
+    <xs:annotation>
+      <xs:documentation>This class provides a basic selection model
+        This treats children as
+        selectable items inside a component. The items can
+        be of any type but if they are not BiComponents you
+        will have to override the following methods and properties: first,
+        last, items, getNext, getPrevious,
+        scrollItemIntoView,
+        getItemLeft, getItemTop, getItemWidth
+        and getItemHeight.
+        To update the visuals (to show what is selected) override the following
+        methods: updateItemSelectionState, updateItemAnchorState
+        and updateItemLeadState.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSelectionModel" substitutionGroup="SelectionModel"/>
+
+  <xs:attributeGroup name="SelectionModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="owner" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - This is the owner component that is
+          containing the selectable objects. This should not be set after the
+          selection model has been used
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="multipleSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the selection model supports multiple selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="canDeselect" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can deselect items. If this is false you need to select something
+          else to deselect an item
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dragSelection" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Drag selection is used to hold down the mouse to select mutliple items</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="anchorItem" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent/Object - This item is used when doing multiple selection with the shift key</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leadItem" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent/Object - This item is used when doing multiple selection. This is the last item selected.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedItems" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent[]/Object[] - Returns an array containing the selected items</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected items are changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onleaditemchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the lead item is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SerializedLoader">
+    <xs:annotation>
+      <xs:documentation>Used to start multiple loaders in the order they were added.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SerializedLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSerializedLoader" substitutionGroup="SerializedLoader"/>
+
+  <xs:attributeGroup name="SerializedLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when all the loaders have finished loading,
+          or if an error occurs.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onprogress" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires every time one of the loaders has finished.
+          This is useful for providing visual feedback.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Set">
+    <xs:annotation>
+      <xs:documentation>A simple class for storing a set of objects
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SetAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSet" substitutionGroup="Set"/>
+
+  <xs:attributeGroup name="SetAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Shape">
+    <xs:annotation>
+      <xs:documentation>This class is an abstract base class for describing
+        the shapes of Image areas. This is a very general
+        class and can be extended to mean a variety of things.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ShapeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiShape" substitutionGroup="Shape"/>
+
+  <xs:attributeGroup name="ShapeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SingleTree">
+    <xs:annotation>
+      <xs:documentation>A Simple one column Tree.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SingleTreeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSingleTree" substitutionGroup="SingleTree"/>
+
+  <xs:attributeGroup name="SingleTreeAttributes">
+
+    <xs:attributeGroup ref="TreeViewAttributes"/>
+
+    <xs:attribute name="indentWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount to indent child nodes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showExpandIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the expand and collapse icons</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="sortFunction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:function - The sort function to use. The function is passed the two
+          nodes to compare as arguments, to compare the value (text)
+          of the node use getData() on the node. Defaults to case
+          sensitive string compare.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="SingleTreeDataModel">
+    <xs:annotation>
+      <xs:documentation>Data model forBiSingleTree
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SingleTreeDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSingleTreeDataModel" substitutionGroup="SingleTreeDataModel"/>
+
+  <xs:attributeGroup name="SingleTreeDataModelAttributes">
+
+    <xs:attributeGroup ref="TreeDataModelAttributes"/>
+
+    <xs:attribute name="treeView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTree2 - The tree view the data model is acting on</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="SingleTreeNode">
+    <xs:annotation>
+      <xs:documentation>This class is used as the data for rows in theBiTree2 component
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SingleTreeNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSingleTreeNode" substitutionGroup="SingleTreeNode"/>
+
+  <xs:attributeGroup name="SingleTreeNodeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Uri of image icon. Used for collapsed/leaf nodes and expanded nodes
+          without expandedIcon set.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="expandedIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Icon to show for an expanded node</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - Data to display for the node</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="expanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is expanded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is selected</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="lead" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is the lead item</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="SingleTreeViewManager">
+    <xs:annotation>
+      <xs:documentation>This class handles the visual properties of aBiSingleTree
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SingleTreeViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSingleTreeViewManager" substitutionGroup="SingleTreeViewManager"/>
+
+  <xs:attributeGroup name="SingleTreeViewManagerAttributes">
+
+    <xs:attributeGroup ref="TreeViewViewManagerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SizeAnimator">
+    <xs:annotation>
+      <xs:documentation>This class is used to animate the size ofBiComponent(s) and can be used to create visual effects.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SizeAnimatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSizeAnimator" substitutionGroup="SizeAnimator"/>
+
+  <xs:attributeGroup name="SizeAnimatorAttributes">
+
+    <xs:attributeGroup ref="ComponentAnimationAttributes"/>
+
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets speed and acceleration type to useful values.
+          Can be one of the following string values: normal, smooth
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Starting width of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Starting height of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Destination width of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Destination height of the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets starting size for both width and height.
+          Note: The component will be square shaped.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets target size for both width and height.
+          Note: The component will be square shaped.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="accType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the acceleration type. Use constants fromBiComponentAnimation.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="speed" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number/String - Sets the duration of the animation.
+          Can be set in three different ways:
+          1.BiSizeAnimator.SPEEDx constants can be used.
+          2. One of the following strings: slowest, slow, normal, fast, fastest.
+          3. A number representing the length of the animation, measured in milliseconds.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fromComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - By setting the from-component you specify anotherBiComponent whos size will be used
+          for the animation's start state. If the from-component's size is changed, the animation
+          will update dynamically.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="toComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - By setting the to-component you specify anotherBiComponent whos size will be used
+          for the animation's target state. If the to-component's size is changed, the animation
+          will update dynamically.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Slider">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show a slider control.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SliderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSlider" substitutionGroup="Slider"/>
+
+  <xs:attributeGroup name="SliderAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="orientation">
+      <xs:annotation>
+        <xs:documentation>
+          The orientation of the slider. Valid values are: horizontal vertical
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="unitIncrement">
+      <xs:annotation>
+        <xs:documentation>
+          The amount to increase the slider when using the arrow keys and
+          the mouse wheel.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="blockIncrement">
+      <xs:annotation>
+        <xs:documentation>
+          The amount to increase the slider when using the page up and page
+          down keys as well as the amount to change the slider when the
+          mouse is pressed on the slider (and not on the handle).
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum">
+      <xs:annotation>
+        <xs:documentation>The maximum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum">
+      <xs:annotation>
+        <xs:documentation>The minimum value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value">
+      <xs:annotation>
+        <xs:documentation>The value for the component</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          This event is fired when the maximum, minimum
+          or maximum properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Sort">
+    <xs:annotation>
+      <xs:documentation>Collection of static functions used for sorting and comparing
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SortAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSort" substitutionGroup="Sort"/>
+
+  <xs:attributeGroup name="SortAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Spinner">
+    <xs:annotation>
+      <xs:documentation>A spinner is a text box that accepts a number. A spinner also has buttons
+        for increasing and decreasing the value.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SpinnerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSpinner" substitutionGroup="Spinner"/>
+
+  <xs:attributeGroup name="SpinnerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="value" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The value for the spinner</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The maximum value for the spinner</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The minimum value for the spinner</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="font" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiFont - This is used to describe how to paint the text in the spinner.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text alignment. Valid values are: left right center</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the maximum,
+          minimum or maximum
+          properties are changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the enter key is pressed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oninvalidvalue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the value is change
+          becuase the value entered by the user was
+          not valid.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oninvalidcharacter" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired if an invalid character
+          is typed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SplitPane">
+    <xs:annotation>
+      <xs:documentation>A split pane is used to show two components with a splitter betwee them.
+        The splitter between the components can be dragged and in that way the
+        components are resized. If right to left the left and right component switch
+        palces.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SplitPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSplitPane" substitutionGroup="SplitPane"/>
+
+  <xs:attributeGroup name="SplitPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="orientation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The orientation of the split pane. Valid values are horizontal
+          and vertical. If horizontal is used the components are placed to
+          the left and to the right of the splitter respectively. When vertical the
+          components are placed above and below. When using horizontal and right to
+          left the position of the left and right components are switched.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dividerLocation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The location of the splitter from the left if horizontal orientation
+          and from the top if vertical orientation. If right to left is used this is
+          from the right instead of from the left.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dividerSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the divider (height if vertical orientation)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leftComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component to the left (or top if vertical orientation) of the
+          splitter. This property is the same as topComponent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component to the right (or bottom if vertical orientation) of the
+          splitter. This property is the same as bottomComponent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component above (or to the left if horizontal orientation) of the
+          splitter. This property is the same as leftComponent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomComponent" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component below (or to the right if hoizontal orientation)
+          the splitter. This property is the same as rightComponent.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="leftVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the left component. If this is false
+          the right component will take up the entire space of the split pane
+          and the splitter will be hidden.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="topVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Sets whether to show the top component. If this is false
+          the bottom component will take up the entire space of the split pane
+          and the splitter will be hidden. This property is the same as
+          leftVisible.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rightVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the right component. If this is false
+          the left component will take up the entire space of the split pane
+          and the splitter will be hidden.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="bottomVisible" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Sets whether to show the bottom component. If this is false
+          the top component will take up the entire space of the split pane
+          and the splitter will be hidden. This property is the same as
+          rightVisible.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondividerlocationchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when then
+          dividerLocation is
+          changed
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StackedBarChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a stacked bar chart for the given series. A stacked
+        bar chart stacks the bars from the different series next to each
+        other.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StackedBarChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStackedBarChart" substitutionGroup="StackedBarChart"/>
+
+  <xs:attributeGroup name="StackedBarChartAttributes">
+
+    <xs:attributeGroup ref="StackedColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StackedBarChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a stacked bar chart for the given series. A stacked
+        bar chart stacks the bars from the different series next to each
+        other.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StackedBarChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStackedBarChart2" substitutionGroup="StackedBarChart2"/>
+
+  <xs:attributeGroup name="StackedBarChart2Attributes">
+
+    <xs:attributeGroup ref="StackedColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StackedColumnChart">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a stacked column chart for the given series. A stacked
+        column chart stacks teh columns from the different series on top of each
+        other.
+        This is used with BiGraph.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StackedColumnChartAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStackedColumnChart" substitutionGroup="StackedColumnChart"/>
+
+  <xs:attributeGroup name="StackedColumnChartAttributes">
+
+    <xs:attributeGroup ref="ColumnChartAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StackedColumnChart2">
+    <xs:annotation>
+      <xs:documentation>
+        This chart displays a stacked column chart for the given series. A stacked
+        column chart stacks teh columns from the different series on top of each
+        other.
+        This is used with BiGraph2.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StackedColumnChart2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStackedColumnChart2" substitutionGroup="StackedColumnChart2"/>
+
+  <xs:attributeGroup name="StackedColumnChart2Attributes">
+
+    <xs:attributeGroup ref="ColumnChart2Attributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StatusBar">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used for displaying status bars in Bindows
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StatusBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStatusBar" substitutionGroup="StatusBar"/>
+
+  <xs:attributeGroup name="StatusBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StatusBarPanel">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used to display sections in a
+        status bar.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StatusBarPanelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStatusBarPanel" substitutionGroup="StatusBarPanel"/>
+
+  <xs:attributeGroup name="StatusBarPanelAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StringBuffer">
+    <xs:annotation>
+      <xs:documentation>Creates a StringBuffer object which handles string concatenation faster
+        than the String class.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StringBufferAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStringBuffer" substitutionGroup="StringBuffer"/>
+
+  <xs:attributeGroup name="StringBufferAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="StringBundle">
+    <xs:annotation>
+      <xs:documentation>This class is used to make creating multilingual applications easier.
+        The string bundle is uses one hash table (objects in JavaScript) for
+        every language and falls back on English ("en") in case the
+        user language is not available.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StringBundleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStringBundle" substitutionGroup="StringBundle"/>
+
+  <xs:attributeGroup name="StringBundleAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="language" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The current language</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the current strings
+          changes in some way. This happens when the
+          language is changed or a new bundle is added
+          with the current language.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Style">
+    <xs:annotation>
+      <xs:documentation>This class works much like the script element in HTML. You can set the uri
+        and it will fetch an external file that will be executed or you can use the
+        text property to execute some text.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StyleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiStyle" substitutionGroup="Style"/>
+
+  <xs:attributeGroup name="StyleAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The script text to evaluate</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The location of the script file</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="src" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - Alias to uri for backwards compatibility</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Subtree">
+    <xs:annotation>
+      <xs:documentation>Internal class for handling subtrees
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SubtreeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiSubtree" substitutionGroup="Subtree"/>
+
+  <xs:attributeGroup name="SubtreeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TabBar">
+    <xs:annotation>
+      <xs:documentation>This component is used as a container for tab
+        buttons. When using tab panes this
+        control is used internally.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TabBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTabBar" substitutionGroup="TabBar"/>
+
+  <xs:attributeGroup name="TabBarAttributes">
+
+    <xs:attributeGroup ref="ToolBarAttributes"/>
+
+    <xs:attribute name="alignment" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes how to draw the tab bar. Supported values are top and
+          bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTabButton - The currently selected tab button.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the selected tab button.
+          If no button is selected this returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected tab
+          button changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TabButton">
+    <xs:annotation>
+      <xs:documentation>This class is used to display tabs for aBiTabPane or aBiTabBar
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TabButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTabButton" substitutionGroup="TabButton"/>
+
+  <xs:attributeGroup name="TabButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarRadioButtonAttributes"/>
+
+    <xs:attribute name="alignment" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes whether the tab button should be drawn so that it looks like
+          it would be at the top of a tab pane or at the bottom of a tab pane.
+          Supported values are top and bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TabPage">
+    <xs:annotation>
+      <xs:documentation>This class represents the pages inside a tab
+        pane. A tab page has a BiTabButton
+        that is used to display a button for the page when used with a tab pane.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TabPageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTabPage" substitutionGroup="TabPage"/>
+
+  <xs:attributeGroup name="TabPageAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="alignment" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes whether the tab page should be drawn so that it appears like the
+          tabes are placed at the top of a tab pane or at the bottom of a tab pane.
+          Supported values are top and bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="tabButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTabButton - The tab button used with the tab page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the page is selected</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text to show on the tab button</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon to show on the tab button</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected value changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TabPane">
+    <xs:annotation>
+      <xs:documentation>This class is used for creating tab controls. A tab control contains
+        one or more tab pages. Each tab page also
+        has a tab button that is shown above the
+        page and when the button is clicked the page is shown.
+        Bindows supports showing the tabs at the bottom or the top. Use the
+        alignmnet property to change this.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TabPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTabPane" substitutionGroup="TabPane"/>
+
+  <xs:attributeGroup name="TabPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="alignment" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This describes whether the tabs should be placed at the top of a tab pane or
+          at the bottom of a tab pane.
+          Supported values are top and bottom.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selected" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTabPage - The currently selected tab page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the selected tab page.
+          If no page is selected this returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected tab page changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TextArea">
+    <xs:annotation>
+      <xs:documentation>A multiline text input field
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TextAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTextArea" substitutionGroup="TextArea"/>
+
+  <xs:attributeGroup name="TextAreaAttributes">
+
+    <xs:attributeGroup ref="TextFieldAttributes"/>
+
+    <xs:attribute name="wrap" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the text should wrap automatically as the user types.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TextField">
+    <xs:annotation>
+      <xs:documentation>This class is used to display a single line plain text input
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TextFieldAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTextField" substitutionGroup="TextField"/>
+
+  <xs:attributeGroup name="TextFieldAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text on the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="font" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiFont - This is used to describe how to paint the text in the text field.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text alignment. Valid values are: left right center</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maxLength" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The maximum number of characters that the user can enter into the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="readOnly" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the user can enter text in the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="validator" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - This property is a function that is used to validate the text of
+          the text field. The function should take a string and return
+          true if the text is valid.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="invalidMessage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This property can be used to give information about why the value
+          might be invalid.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionStart" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The starting point of the selection in the text field. If not selected this
+          returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionLength" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The length (number of chracters) of the currently selected text in the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionText" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The currently selected text in the text field</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="allowTab" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether pressing the tab key should insert a tab character or move the focus from
+          the text field
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The left padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingRight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The right padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The top padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="paddingBottom" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The bottom padding (in pixels)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the enter key is pressed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ontextchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the text has changed.
+          This happens when the user in some way changes
+          the text inside the text field. This event
+          is fired continiously as the user types.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the text field is blurred
+          and the text has changed since the text field got
+          focus.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TextLoader">
+    <xs:annotation>
+      <xs:documentation>This class is used to load a plain text document from the server or the
+        file system (if the application is run locally).
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TextLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTextLoader" substitutionGroup="TextLoader"/>
+
+  <xs:attributeGroup name="TextLoaderAttributes">
+
+    <xs:attributeGroup ref="AbstractLoaderAttributes"/>
+
+    <xs:attribute name="method" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The HTTP method to use for the request</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI (location) of the file to load. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The user name to use when authentication is needed to load the file</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="password" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The password to use when authentication is needed to load the file</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the file has been loaded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TextParser">
+    <xs:annotation>
+      <xs:documentation>BiTextParser is a helper class for parsing text within a Bindows
+        application.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TextParserAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTextParser" substitutionGroup="TextParser"/>
+
+  <xs:attributeGroup name="TextParserAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="replacePattern" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The pattern to match and replace.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="replaceFlags" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - RegExp flags</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="printStringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The Object containing the strings for replacing</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="parseFunction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Function - The function being used while parsing.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Theme">
+    <xs:annotation>
+      <xs:documentation>This class represents a theme which consists of a css file
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ThemeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTheme" substitutionGroup="Theme"/>
+
+  <xs:attributeGroup name="ThemeAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="default" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the theme is the default theme</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="menuCss" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the string needed for the IE menus to work correctly</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ThemeManager">
+    <xs:annotation>
+      <xs:documentation>This singleton class is used for theme support in Bindows
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ThemeManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiThemeManager" substitutionGroup="ThemeManager"/>
+
+  <xs:attributeGroup name="ThemeManagerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="defaultTheme" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTheme - The theme that is currently being used</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onthemechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the default
+          theme changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TimePicker">
+    <xs:annotation>
+      <xs:documentation>This component provides a spinner like component
+        that is used to enter a time. The control consists of different text fields
+        for the different parts of the time string. The string format is decided
+        using aBiDateFormat object.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TimePickerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTimePicker" substitutionGroup="TimePicker"/>
+
+  <xs:attributeGroup name="TimePickerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="minimum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The minimum selectable date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maximum" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - The maximum selectable date</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="date" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Date - This is a date object that describes the currently entered time</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dateFormat" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiDateFormat - This is theBiDateFormat that describes how to format the text inside
+          the time date picker.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the time is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfieldchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired when the active field of the
+          component changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oninvalidcharacter" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired if an invalid character
+          is typed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Timer">
+    <xs:annotation>
+      <xs:documentation>This class can be used to schedule events to occur later in time.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TimerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTimer" substitutionGroup="Timer"/>
+
+  <xs:attributeGroup name="TimerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="enabled" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this is false no tick events are fired.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="interval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of milliseconds between the firing of the tick
+          events. Changing this also stops the timer.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ontick" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires every interval milliseconds for
+          an enabled and started timer.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TimerManager">
+    <xs:annotation>
+      <xs:documentation>This is a singleton class that handles the disposal of all
+        timers.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TimerManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTimerManager" substitutionGroup="TimerManager"/>
+
+  <xs:attributeGroup name="TimerManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBar">
+    <xs:annotation>
+      <xs:documentation>This class is used to create a tool bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBar" substitutionGroup="ToolBar"/>
+
+  <xs:attributeGroup name="ToolBarAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarButton">
+    <xs:annotation>
+      <xs:documentation>This is used to create buttons that are placed on a tool bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarButton" substitutionGroup="ToolBarButton"/>
+
+  <xs:attributeGroup name="ToolBarButtonAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+    <xs:attribute name="onaction" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the button is clicked</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarMenuButton">
+    <xs:annotation>
+      <xs:documentation>This class creates a tool bar button that shows a menu
+        when the button is pressed.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarMenuButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarMenuButton" substitutionGroup="ToolBarMenuButton"/>
+
+  <xs:attributeGroup name="ToolBarMenuButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarButtonAttributes"/>
+
+    <xs:attribute name="menu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - The menu to show when the button is pressed.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarRadioButton">
+    <xs:annotation>
+      <xs:documentation>This represents a radio button that can be placed on a tool bar.
+        To group different tool bar radio buttons into a radio group
+        use the BiRadioGroup class in the same
+        way it would be used for normal radio buttons.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarRadioButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarRadioButton" substitutionGroup="ToolBarRadioButton"/>
+
+  <xs:attributeGroup name="ToolBarRadioButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarToggleButtonAttributes"/>
+
+    <xs:attribute name="group" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiRadioGroup - The group that the radio button should be part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarSeparator">
+    <xs:annotation>
+      <xs:documentation>This class is used to display a separator on a tool bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarSeparatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarSeparator" substitutionGroup="ToolBarSeparator"/>
+
+  <xs:attributeGroup name="ToolBarSeparatorAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarSplitMenuButton">
+    <xs:annotation>
+      <xs:documentation>This compound widget consists of a toggle-button and a drop down menu.
+        The toggle-button can be plain text or have an icon or both.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarSplitMenuButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarSplitMenuButton" substitutionGroup="ToolBarSplitMenuButton"/>
+
+  <xs:attributeGroup name="ToolBarSplitMenuButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarButtonAttributes"/>
+
+    <xs:attribute name="menu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - Sets the menu on the control</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:: String The text to use on the button - Sets the label text on the button of the control.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarSplitToggleMenuButton">
+    <xs:annotation>
+      <xs:documentation>This compound widget consists of a button and a drop down menu.
+        The Button can be plain text or have an icon or both.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarSplitToggleMenuButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarSplitToggleMenuButton" substitutionGroup="ToolBarSplitToggleMenuButton"/>
+
+  <xs:attributeGroup name="ToolBarSplitToggleMenuButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarToggleButtonAttributes"/>
+
+    <xs:attribute name="menu" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiMenu - Sets the menu on the control</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Sets the label text on the button of the control.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolBarToggleButton">
+    <xs:annotation>
+      <xs:documentation>This represents a toggle button (check box button) that can be placed on a tool bar.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolBarToggleButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolBarToggleButton" substitutionGroup="ToolBarToggleButton"/>
+
+  <xs:attributeGroup name="ToolBarToggleButtonAttributes">
+
+    <xs:attributeGroup ref="ToolBarButtonAttributes"/>
+
+    <xs:attribute name="checked" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the button is checked or not. When this is changed
+          the change event is fired.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="userValue" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - A value associated with the button.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the checked is changed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolTip">
+    <xs:annotation>
+      <xs:documentation>This class is used for showing generic tool tip controls. A tool tip
+        can contain other controls.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolTipAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolTip" substitutionGroup="ToolTip"/>
+
+  <xs:attributeGroup name="ToolTipAttributes">
+
+    <xs:attributeGroup ref="PopupAttributes"/>
+
+    <xs:attribute name="hideOnHover" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - If this is true then the tool tip is hidden if the mouse pointer enters the
+          tool tip.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mousePointerOffsetX" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the tool tip relative to the mouse pointer</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="mousePointerOffsetY" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The position of the tool tip relative to the mouse pointer</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hideInterval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of milliseconds before hiding the tool tip</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showInterval" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of milliseconds before showing the tool tip</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolTipManager">
+    <xs:annotation>
+      <xs:documentation>A singleton class used by the system to manage tool
+        tips.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolTipManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiToolTipManager" substitutionGroup="ToolTipManager"/>
+
+  <xs:attributeGroup name="ToolTipManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="currentToolTip" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiToolTip - The currently shown (or about to show) tool tip</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree">
+    <xs:annotation>
+      <xs:documentation>This class is used for showing a tree, a column list and a combined
+        tree with multiple columns. The control also provides headers that can
+        be used to resize the columns, reorder the columns or sort the data by
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree" substitutionGroup="Tree"/>
+
+  <xs:attributeGroup name="TreeAttributes">
+
+    <xs:attributeGroup ref="AbstractGridAttributes"/>
+
+    <xs:attribute name="indentWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The amount to indent child nodes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showPlusMinus" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the expand and collapse icons</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRootLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show lines on the top most level</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="indentColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The column to indent by.
+          Setting this to -1 (or a value greater than the column count) removes
+          the indentation.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the lines in the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="expanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is expanded or not. The tree control is always
+          expanded so setting this to false has no effect.
+          This is provided so that the tree has the same interface as the
+          tree nodes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selected row/cell changes</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onexpandedchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the tree is expanded or
+          collapsed and the lead item is changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2">
+    <xs:annotation>
+      <xs:documentation>This component is a special case ofBiTreeView which has an interface which
+        is similar toBiTree
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2" substitutionGroup="Tree2"/>
+
+  <xs:attributeGroup name="Tree2Attributes">
+
+    <xs:attributeGroup ref="TreeViewAttributes"/>
+
+    <xs:attribute name="columnCount" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The number of columns in the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnNames" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The text to show on the headers of the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnWidths" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String[] - The widths of the columns of the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The order of the columns. This an array containing the indexes of the
+          columns.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the headers for the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRowHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the row headers for the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showGridLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show grid lines between the cells in the tree</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2Cell">
+    <xs:annotation>
+      <xs:documentation>This is used for the cells in aBiTree2Row row
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2CellAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2Cell" substitutionGroup="Tree2Cell"/>
+
+  <xs:attributeGroup name="Tree2CellAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object - The data that is associated with the cell</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2DataModel">
+    <xs:annotation>
+      <xs:documentation>This data model is to be used withBiTree2. It uses theBiTree2Row and
+        BiTree2Cell to provide the data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2DataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2DataModel" substitutionGroup="Tree2DataModel"/>
+
+  <xs:attributeGroup name="Tree2DataModelAttributes">
+
+    <xs:attributeGroup ref="TreeDataModelAttributes"/>
+
+    <xs:attribute name="treeView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTree2 - The tree view the data model is acting on</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2Row">
+    <xs:annotation>
+      <xs:documentation>This class is used as the data for rows in theBiTree2 component
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2RowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2Row" substitutionGroup="Tree2Row"/>
+
+  <xs:attributeGroup name="Tree2RowAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="expanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the row is expanded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tree2ViewManager">
+    <xs:annotation>
+      <xs:documentation>This class is a special view manager to be used withBiTree2
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Tree2ViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTree2ViewManager" substitutionGroup="Tree2ViewManager"/>
+
+  <xs:attributeGroup name="Tree2ViewManagerAttributes">
+
+    <xs:attributeGroup ref="TreeViewViewManagerAttributes"/>
+
+    <xs:attribute name="indentColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The column to indent</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeDataModel">
+    <xs:annotation>
+      <xs:documentation>This data model takes a a tree consisting ofBiTreeNode2 nodes and exposes
+        the interface needed by theBiTreeView. The internal tree does not have to
+        be aBiTreeNode2 as long as getNodeChildren, getNodeHashCode, getCellText and
+        getSortFunction (if sorting is needed) are overridden.
+        The default implementation assumes that the data in theBiTreeNode2 objects
+        are arrays containing the cell data.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeDataModel" substitutionGroup="TreeDataModel"/>
+
+  <xs:attributeGroup name="TreeDataModelAttributes">
+
+    <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+
+    <xs:attribute name="rootNode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeNode2 - The tree node that is the root of the data</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondatachanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the
+          data changes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onexpand" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a row has expanded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncollapse" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a row has collapsed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeexpand" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired before a row is expanded</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforecollapse" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired before a row is collapsed</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onrowcountchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the row count changes.
+          The rowIndex and the rowCount properties on the
+          event object are available for this event
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeHelper">
+    <xs:annotation>
+      <xs:documentation>This class contains some static methods that are usufull when working
+        with trees.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeHelperAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeHelper" substitutionGroup="TreeHelper"/>
+
+  <xs:attributeGroup name="TreeHelperAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeIterator">
+    <xs:annotation>
+      <xs:documentation>This class is used for iterating over rows and subtrees in a tree
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeIteratorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeIterator" substitutionGroup="TreeIterator"/>
+
+  <xs:attributeGroup name="TreeIteratorAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="rowIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The row index that the iterator is currently at</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeIteratorStackItem">
+    <xs:annotation>
+      <xs:documentation>This class is used internally byBiTreeIterator to keep track of the path stack
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeIteratorStackItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeIteratorStackItem" substitutionGroup="TreeIteratorStackItem"/>
+
+  <xs:attributeGroup name="TreeIteratorStackItemAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeNode">
+    <xs:annotation>
+      <xs:documentation>This represents a tree node for a tree or a
+        row for a tree. A tree node is not a component
+        but it has some visual properties that are similar to a
+        component.
+        When working with trees and column list it is usually suitable to extend
+        this class instead of using it directly because this gives better control
+        over what data is bound to the node and what text to show on the row.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeNode" substitutionGroup="TreeNode"/>
+
+  <xs:attributeGroup name="TreeNodeAttributes">
+
+    <xs:attributeGroup ref="AbstractGridRowAttributes"/>
+
+    <xs:attribute name="expanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the node is expanded or not.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeNode2">
+    <xs:annotation>
+      <xs:documentation>This class is used to build up the tree for the tree model to use
+        with theBiTreeView andBiTreeDataModel
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeNode2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeNode2" substitutionGroup="TreeNode2"/>
+
+  <xs:attributeGroup name="TreeNode2Attributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="data" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Object[] - The data that is associated to the node</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeSelectionModel">
+    <xs:annotation>
+      <xs:documentation>This class is used to handle the selection of the
+        nodes in a tree.
+        It extends the BiListSelectionModel
+        to be able to handle threaded data.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeSelectionModel" substitutionGroup="TreeSelectionModel"/>
+
+  <xs:attributeGroup name="TreeSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeView">
+    <xs:annotation>
+      <xs:documentation>This class is the base forBiGrid2 andBiTree2. It can be used directly
+        with a data model.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeView" substitutionGroup="TreeView"/>
+
+  <xs:attributeGroup name="TreeViewAttributes">
+
+    <xs:attributeGroup ref="TreeViewBaseAttributes"/>
+
+    <xs:attribute name="showBrokenCellTextAsToolTip" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:boolean - If this is property is set to true, tooltip will show whenever a broken cell is hovered. Default
+          value is false.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewBase">
+    <xs:annotation>
+      <xs:documentation>This is the abstract base class forBiTreeView andBiOlapGrid. It contains
+        the shared methods and implementations of these 2 classes
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewBaseAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewBase" substitutionGroup="TreeViewBase"/>
+
+  <xs:attributeGroup name="TreeViewBaseAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="useNativeScrollBars" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to use native or custom scroll bars. Custom scroll bars are needed/preferred
+          when the tree view/grid has an attached component model or inline edit model.
+          If you want to change this it is better to change it before the component has
+          been created.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectionModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeViewSelectionModel/BiOlapGridSelectionModel - The selection model handling the selected rows and cells
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="viewManager" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeViewViewManager/BiOlapGridViewManager - The view manager handles visual aspects that are not directly
+          related to
+          the data model
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dataModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeViewDataModel/BiOlapGridDataModel - The data model describes the data to be shown in the tree view and
+          OLAP grid
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="inlineEditModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiInlineEditModel - The inline edit model is used to handle editing of cells in the tree view.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="attachedComponentModel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiAttachedComponentModel - The attached component model is used to handle Bindows components inside the
+          cells of the tree view.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewCellInfo">
+    <xs:annotation>
+      <xs:documentation>This represents information about a cell in the tree view.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewCellInfoAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewCellInfo" substitutionGroup="TreeViewCellInfo"/>
+
+  <xs:attributeGroup name="TreeViewCellInfoAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="row" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - What row the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="column" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - What column the cell is part of</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewDataModel">
+    <xs:annotation>
+      <xs:documentation>This defines the interface that is needed for a data model for aBiTreeView.
+        This actually implements a dummy data model. Extend this class to create
+        more useful data models
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewDataModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewDataModel" substitutionGroup="TreeViewDataModel"/>
+
+  <xs:attributeGroup name="TreeViewDataModelAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="allExpanded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Sets all available rows expanded.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondatachanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the data
+          has changed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewDataModelEvent">
+    <xs:annotation>
+      <xs:documentation>This event class is used withBiTreeViewDataModel instances so that tree view can be updated to reflect the changes
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewDataModelEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewDataModelEvent" substitutionGroup="TreeViewDataModelEvent"/>
+
+  <xs:attributeGroup name="TreeViewDataModelEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+    <xs:attribute name="preventUpdate" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Prevent update flag.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewDragHeader">
+    <xs:annotation>
+      <xs:documentation>This component is used to show a header being dragged when the user is
+        reorganizing the headers for aBiTreeView
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewDragHeaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewDragHeader" substitutionGroup="TreeViewDragHeader"/>
+
+  <xs:attributeGroup name="TreeViewDragHeaderAttributes">
+
+    <xs:attributeGroup ref="LabelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewDragHeaderMarker">
+    <xs:annotation>
+      <xs:documentation>This class is used withBiTreeView when the columns are being reorder to
+        give feedback where the column will be dropped
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewDragHeaderMarkerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewDragHeaderMarker" substitutionGroup="TreeViewDragHeaderMarker"/>
+
+  <xs:attributeGroup name="TreeViewDragHeaderMarkerAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewResizeOutline">
+    <xs:annotation>
+      <xs:documentation>This component is used as an overlay above the column that is currently being
+        resized
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewResizeOutlineAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewResizeOutline" substitutionGroup="TreeViewResizeOutline"/>
+
+  <xs:attributeGroup name="TreeViewResizeOutlineAttributes">
+
+    <xs:attributeGroup ref="ResizeHandleAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewSelectionModel">
+    <xs:annotation>
+      <xs:documentation>Selection model forBiTreeView.
+
+        The selection model can operate in 2 modes: cell or row.
+        The selected cells/rows are identified by the row index/column index in the
+        data model.
+
+        The items in the selectedItems hash are of typeBiTreeViewSelectionModelItem
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewSelectionModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewSelectionModel" substitutionGroup="TreeViewSelectionModel"/>
+
+  <xs:attributeGroup name="TreeViewSelectionModelAttributes">
+
+    <xs:attributeGroup ref="SelectionModelAttributes"/>
+
+    <xs:attribute name="selectionMode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - Whether to use row selection or cell selection. Valid values are "row"
+          and "cell"
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewSelectionModelItem">
+    <xs:annotation>
+      <xs:documentation>This class is used internally inBiTreeViewSelectionModel to keep track of
+        the selected rows
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewSelectionModelItemAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewSelectionModelItem" substitutionGroup="TreeViewSelectionModelItem"/>
+
+  <xs:attributeGroup name="TreeViewSelectionModelItemAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="row" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The row that this represents</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="column" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The column that this represents</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewStateManager">
+    <xs:annotation>
+      <xs:documentation>A simple class that is used internally with theBiTreeView to keep track
+        of active and hover cell
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewStateManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewStateManager" substitutionGroup="TreeViewStateManager"/>
+
+  <xs:attributeGroup name="TreeViewStateManagerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeViewViewManager">
+    <xs:annotation>
+      <xs:documentation>This class handles the visual properties of aBiTreeView
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeViewViewManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiTreeViewViewManager" substitutionGroup="TreeViewViewManager"/>
+
+  <xs:attributeGroup name="TreeViewViewManagerAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="treeView" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiTreeView - The tree view this view manager is to be used with</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showGridLines" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show grid lines between the cells in the tree view</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollLeft" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the scroll left to the view manager so that the view manager can figure out what column to
+          start at
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scrollTop" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - Sets the scroll top to the view manager so that the view manager can figure out what row to start at
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="indentColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the column that should be indented. Use -1 to not show any
+          indention
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="highlightSortColumn" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to highlight the background of the sorted column</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="columnOrders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number[] - The order of the columns in the visual representation</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of a row in the tree view</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="headersHeight" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The height of the column headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ascendingIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The path to the arrow image to use for ascending sort</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="descendingIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The path to the arrow image to use for descending sort</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showRowHeaders" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the row headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rowHeadersWidth" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The width of the row headers</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="UndeterminedProgressBar">
+    <xs:annotation>
+      <xs:documentation>
+        This component is used to show a progress bar that shows progress
+        of an undeterminable size. The progress bar is animated to show that it
+        is busy. Use start and stop to control the
+        animation. Changing the maximum
+        changes the number of steps the animation does.
+
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UndeterminedProgressBarAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiUndeterminedProgressBar" substitutionGroup="UndeterminedProgressBar"/>
+
+  <xs:attributeGroup name="UndeterminedProgressBarAttributes">
+
+    <xs:attributeGroup ref="ProgressBarAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Uri">
+    <xs:annotation>
+      <xs:documentation>This class is used to define a Universal Resource Identifier (URI). This
+        is sometimes also known as a Uniform Resource Locator (URL). A URI is
+        used to describe the location and source of external files. A URI is
+        only a representation of the string format describing the URI. It does
+        not know how to lookup the information the URI might point at.
+        A general URI has the following format. Below this is a list of what
+        part of the URI maps to what property. http://user:password@www.domain.com:80/dir/file.html?param0=value=0;param1=value1#fragment
+        scheme - http userInfo - user:password host - www.domain.com port - 80 path - /dir/file.html dirPath - /dir/ query -
+        ?param0=value=0;param1=value1
+        fragment - #fragment getParam("param0") - value0 getParam("param1") - value1 href -
+        http://user:password@www.domain.com:80/dir/file.html?param0=value=0;param1=value1#fragment
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UriAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiUri" substitutionGroup="Uri"/>
+
+  <xs:attributeGroup name="UriAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+    <xs:attribute name="href" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - This is the complete string representation of the URI.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="VBox">
+    <xs:annotation>
+      <xs:documentation>This is a verticalBiBox where components are laid out from top to bottom.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VBoxAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiVBox" substitutionGroup="VBox"/>
+
+  <xs:attributeGroup name="VBoxAttributes">
+
+    <xs:attributeGroup ref="BoxAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WebService">
+    <xs:annotation>
+      <xs:documentation>This is a factory class to the
+        Microsoft
+        WebService Behavior. Creating aBiWebService actually creates and returns
+        an HTML element with the given behavior attached.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WebServiceAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWebService" substitutionGroup="WebService"/>
+
+  <xs:attributeGroup name="WebServiceAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WebService2">
+    <xs:annotation>
+      <xs:documentation>Construct a web service client. A BiWebService2 object allows accessing web services through SOAP, based on a WSDL
+        describing the services' interfaces. To use BiWebService2, first construct an object of this class. Then, call the object's
+        useService method -- passing the URL to the WSDL describing the service and the service's name. Finally, call syncInvoke,
+        asyncInvoke and callMethod to invoke service operations synchronously or asynchronously.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WebService2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWebService2" substitutionGroup="WebService2"/>
+
+  <xs:attributeGroup name="WebService2Attributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="async" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - This property determines whether or not calls made by the web service using callMethod and service
+          loading using useService without specifying an async flag is done asynchronously.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onserviceloaded" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Notifies that loading the WSDL used to describe the service represented by this instance is complete. If the event
+          has an 'err' member, this describes an error which occurred during loading.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncallcomplete" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Notifies that an asynchronous web service operation invocation was completed, either succesfuly or with errors.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Window">
+    <xs:annotation>
+      <xs:documentation>This class is used for internal windows inside the application window.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WindowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWindow" substitutionGroup="Window"/>
+
+  <xs:attributeGroup name="WindowAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="continuousLayout" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether resizing/moving of the window should be continuously updated.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="contentPane" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - This returns the component representing the client area of the window.
+          All components should be added to this component.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showIcon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the icon on the caption.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMinimize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the minimize button on the caption.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showMaximize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiWindow - Whether to show the maximize button on the caption</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="showClose" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to show the close button on the caption.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="caption" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The title text of the window.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="icon" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The icon image to show on the window caption. Note that changing
+          the image object does not update the window icon. You'll have to
+          set the icon property to update the icon. The size of the icon
+          is ignored and will always be 16 x 16 pixels.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="canMinimize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the window can be minimized by the user.
+          If the window cannot be minimized and the minimize button is shown the
+          button is disabled.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="hideChrome" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to hide the caption bar of the window.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="resizable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the window can be resized by the user.
+          If the window cannot be resized and the maximize button is shown the
+          button is disabled.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="movable" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the window can be moved by the user.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="state" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The state of the window. Valid values are: normal maximized minimized</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="active" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether the window should be the active window.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="acceptButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default accept button. If this is set
+          then the action
+          event is dispatched from the accept button when the enter key
+          is pressed. This does not have to
+          be a BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="cancelButton" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiEventTarget - The button that acts as the default cancel button. If this is set
+          then the action
+          event is dispatched from the cancel button when the Esc key is pressed.
+          This does not have to be a BiButton, any
+          BiEventTarget will work.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="opaque" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to make the window opaque. An opaque window will not let plugins and
+          other windowed controls show through. However, there is a price to this. This
+          is achieved using an internal iframe and this makes the window heavier and
+          slower.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this window. If this is set to
+          null then the string bundle for
+          application is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onbeforeclose" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the window is closed. If the
+          default action is prevented the window is
+          not closed.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onclose" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the window is closed.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncaptionchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the caption changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onstatechanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the window state changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oniconchanged" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the icon changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onactivated" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the window becomes active.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondeactivated" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the window becomes inactive</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WindowManager">
+    <xs:annotation>
+      <xs:documentation>This class can be used with internal windows
+        to provide more features.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WindowManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWindowManager" substitutionGroup="WindowManager"/>
+
+  <xs:attributeGroup name="WindowManagerAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="component" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The component that the windows are added to</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="activeWindow" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiWindow - The window that is currently active. This might be null
+          if no window is active.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this window manager. If this is set to
+          null then the string bundle for
+          application is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onactivation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The window manager has become activated. E.g. one of its windows is activated.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ondeactivation" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>The window manager is deactivated. You have left it and can no longer
+          manipulate its windows via keyboard shortcuts etc..
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Wizard">
+    <xs:annotation>
+      <xs:documentation>This component creates a dialog that contains a BiWizardPane.
+        The wizard pane provides buttons for navigating back and forth and finishing
+        and canceling the wizard.
+        Any BiComponent may be used as a page.
+        Use addPage to add pages to the wizard. The pages dispatch
+        activated and deactivated when the active page
+        changes. You can also use the change event to get notifications
+        about when the user changes the active page.
+        Most of the methods and properties provided by the BiWizardPane
+        are also available on the wizard dialog.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WizardAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWizard" substitutionGroup="Wizard"/>
+
+  <xs:attributeGroup name="WizardAttributes">
+
+    <xs:attributeGroup ref="DialogAttributes"/>
+
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the selected page. If no page is selected this
+          returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedPage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The currently selected page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backdropImage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiImage - The image used as the backdrop on the left side of the wizard pane.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this wizard dialog. For keys to use in the string
+          bundle seeBiWizardPane.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onback" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage changes to the previous page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnext" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage changes to the next page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage page changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforechange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage page changes. Call
+          preventDefault
+          on the event object to prevent the wizard to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeback" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage changes to the previous page. Call
+          preventDefault
+          on the event object to prevent the wizard to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforenext" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage changes to the next page. Call
+          preventDefault
+          on the event object to prevent the wizard to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforefinish" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the the wizard's finish event is called. Calling
+          preventDefault
+          on the event object will prevent the wizard from dispatching the finish event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforecancel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the the wizard's cancel event is called. Calling
+          preventDefault
+          on the event object will prevent the wizard from dispatching the cancel event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfinish" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched when the user clicks
+          the finish button.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncancel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched when the user clicks
+          the cancel button.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WizardPane">
+    <xs:annotation>
+      <xs:documentation>This component creates a wizard that can contain 1 or more pages. The
+        wizard pane provides buttons for navigating back and forth and finishing
+        and canceling the wizard.
+        Any BiComponent may be used as a page.
+        Use addPage to add pages to the wizard. The pages dispatch
+        activated and deactivated when the active page
+        changes. You can also use the change event to get notifications
+        about when the user changes the active page.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WizardPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWizardPane" substitutionGroup="WizardPane"/>
+
+  <xs:attributeGroup name="WizardPaneAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="selectedIndex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The index of the selected page. If no page is selected this
+          returns -1.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="selectedPage" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiComponent - The currently selected page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="stringBundle" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiStringBundle - The string bundle to use for this wizard pane. If this is set to
+          null then the string bundle for
+          application is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onback" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage changes to the previous page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnext" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage changes to the next page.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the selectedPage page changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforechange" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage page changes. Call
+          preventDefault
+          on the event object to prevent the wizard pane to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforeback" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage changes to the previous page. Call
+          preventDefault
+          on the event object to prevent the wizard pane to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforenext" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the selectedPage changes to the next page. Call
+          preventDefault
+          on the event object to prevent the wizard pane to change the page.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforefinish" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the the wizard pane's finish event is called. Calling
+          preventDefault
+          on the event object will prevent the wizard pane from dispatching the finish event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onbeforecancel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires before the the wizard pane's cancel event is called. Calling
+          preventDefault
+          on the event object will prevent the wizard pane from dispatching the cancel event.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onfinish" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched when the user clicks
+          the finish button.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncancel" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is dispatched when the user clicks
+          the cancel button.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="VmlLabel">
+    <xs:annotation>
+      <xs:documentation>This class is used internally inside aBiGraph for labels.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VmlLabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiVmlLabel" substitutionGroup="VmlLabel"/>
+
+  <xs:attributeGroup name="VmlLabelAttributes">
+
+    <xs:attributeGroup ref="ComponentAttributes"/>
+
+    <xs:attribute name="align" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text align of the the text on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The text to show on the label</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="fontSize" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Number - The font size in pixels</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="WsCallCompleteEvent">
+    <xs:annotation>
+      <xs:documentation>BiWsCallCompleteEvent -- notifies of an asynchronous call completion.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WsCallCompleteEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiWsCallCompleteEvent" substitutionGroup="WsCallCompleteEvent"/>
+
+  <xs:attributeGroup name="WsCallCompleteEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDataColumn">
+    <xs:annotation>
+      <xs:documentation>This class is used for the columns in aBiXmlDataSet.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDataColumnAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDataColumn" substitutionGroup="XmlDataColumn"/>
+
+  <xs:attributeGroup name="XmlDataColumnAttributes">
+
+    <xs:attributeGroup ref="DataColumnAttributes"/>
+
+    <xs:attribute name="xsType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The XML Schema type used for the column</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDataRow">
+    <xs:annotation>
+      <xs:documentation>This class is used for the rows in aBiXmlDataSet.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDataRowAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDataRow" substitutionGroup="XmlDataRow"/>
+
+  <xs:attributeGroup name="XmlDataRowAttributes">
+
+    <xs:attributeGroup ref="DataRowAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDataSet">
+    <xs:annotation>
+      <xs:documentation>This class maps an xml file outputted from an ADO.NET DataSet to aBiDataSet.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDataSetAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDataSet" substitutionGroup="XmlDataSet"/>
+
+  <xs:attributeGroup name="XmlDataSetAttributes">
+
+    <xs:attributeGroup ref="DataSetAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - This property can be used to load an external XML document and use that as
+          the source for the XML data set
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rootNode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Node - The root XML node used to define the data set. This is either aBiXmlDocument
+          or an XML element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ondataready" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is dispatched when the data set uses external
+          data and the data has been loaded.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDataTable">
+    <xs:annotation>
+      <xs:documentation>This class is used for the tables in aBiXmlDataSet.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDataTableAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDataTable" substitutionGroup="XmlDataTable"/>
+
+  <xs:attributeGroup name="XmlDataTableAttributes">
+
+    <xs:attributeGroup ref="DataTableAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlDocument">
+    <xs:annotation>
+      <xs:documentation>This is a factory class to the Microsoft
+        DOMDocument
+        object. Creating aBiXmlDocument actually creates and returns a DOMDocument.
+        For Mozilla this returns a new XMLDocument (as defined by the W3C DOM). For
+        Mozilla we also extend the DOM Node interfaces to make it more compatible
+        with MSXML.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlDocumentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlDocument" substitutionGroup="XmlDocument"/>
+
+  <xs:attributeGroup name="XmlDocumentAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlHttp">
+    <xs:annotation>
+      <xs:documentation>This is a factory class to the Microsoft
+        IXMLHTTPRequest
+        object. Creating aBiXmlHttp actually creates and returns an IXMLHTTPRequest.
+        For Mozilla this creates XMLHttpRequest, which happen
+        to implement the IXMLHTTPRequest interface.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlHttpAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlHttp" substitutionGroup="XmlHttp"/>
+
+  <xs:attributeGroup name="XmlHttpAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlLoader">
+    <xs:annotation>
+      <xs:documentation>Loads an XML document from the server or the local file system. (The
+        local file system can only be accessed when using a local application.)
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlLoaderAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlLoader" substitutionGroup="XmlLoader"/>
+
+  <xs:attributeGroup name="XmlLoaderAttributes">
+
+    <xs:attributeGroup ref="TextLoaderAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlResourceParser">
+    <xs:annotation>
+      <xs:documentation>This class deserializes an XML document to a Bindows object hierarchy.
+        This is mostly tailored for BiComponent
+        hierarchies but can be used for any class extending BiObject.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlResourceParserAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlResourceParser" substitutionGroup="XmlResourceParser"/>
+
+  <xs:attributeGroup name="XmlResourceParserAttributes">
+
+    <xs:attributeGroup ref="XmlLoaderAttributes"/>
+
+    <xs:attribute name="autoNameMapping" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - When this is true any XML object that has an id attribute will create a
+          global reference (with the same name as the id value) to the object created
+          from this XML element.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="rootNode" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Node - The XML element that describes the root of the object hierarchy.
+          Only set this before you actually use the parser.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpc">
+    <xs:annotation>
+      <xs:documentation>This is a class that implements an XML-RPC client. The XML-RPC
+        specifcation can be found at http://www.xmlrpc.com/spec.
+        For more info and XML-RPC server implementations see
+        http://www.xmlrpc.com/.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpc" substitutionGroup="XmlRpc"/>
+
+  <xs:attributeGroup name="XmlRpcAttributes">
+
+    <xs:attributeGroup ref="EventTargetAttributes"/>
+
+    <xs:attribute name="uri" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type: BiUri - The URI where to find the remote procedure</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="async" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:Boolean - Whether to use asynchronous method call. If this is true then
+          the call to callMethod returns instantly. When using
+          asynchronous calling use the result event for the call back
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="user" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The user name to pass to the server when calling the remote procedure</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="password" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type:String - The password to pass to the server when calling the remote procedure</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="onload" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a method call
+          response is received from the server.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncallcomplete" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when
+          a method call is complete.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpcCallCompleteEvent">
+    <xs:annotation>
+      <xs:documentation>This event is used when a call to an XML-RPC server is completed
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcCallCompleteEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpcCallCompleteEvent" substitutionGroup="XmlRpcCallCompleteEvent"/>
+
+  <xs:attributeGroup name="XmlRpcCallCompleteEventAttributes">
+
+    <xs:attributeGroup ref="EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpcDouble">
+    <xs:annotation>
+      <xs:documentation>This class is useful when working withBiXmlRpc whenever a double is required
+        but you don't know whether the number is an integer or not
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcDoubleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpcDouble" substitutionGroup="XmlRpcDouble"/>
+
+  <xs:attributeGroup name="XmlRpcDoubleAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpcError">
+    <xs:annotation>
+      <xs:documentation>This class is used when an error happens either at the server or due to an
+        invalid response from the server. Errors of this type are thrown byBiXmlRpc
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcErrorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpcError" substitutionGroup="XmlRpcError"/>
+
+  <xs:attributeGroup name="XmlRpcErrorAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XmlRpcInt">
+    <xs:annotation>
+      <xs:documentation>This class is useful when working withBiXmlRpc whenever an int is required
+        but you don't know whether the number is an integer or not
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XmlRpcIntAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXmlRpcInt" substitutionGroup="XmlRpcInt"/>
+
+  <xs:attributeGroup name="XmlRpcIntAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="XsTypeConverter">
+    <xs:annotation>
+      <xs:documentation>This class contains static methods that converts XML Schema types to Javascript
+        types as well as converting strings formatted according to the XML Schema
+        to Javascript values.
+        The following type relations are used
+
+        XS type name - JS type name - JS class
+        "negativeInteger" - "number" - Number
+        "unsignedShort" - "number" - Number
+        "unsignedByte" - "number" - Number
+        "unsignedLong" - "number" - Number
+        "unsignedInt" - "number" - Number
+        "decimal" - "number" - Number
+        "boolean" - "number" - Number
+        "integer" - "number" - Number
+        "double" - "number" - Number
+        "float" - "number" - Number
+        "short" - "number" - Number
+        "byte" - "number" - Number
+        "long" - "number" - Number
+        "int" - "number" - Number
+        "QName" - "string" - String
+        "string" - "string" - String
+        "normalizedString" - "string" - String
+        "dateTime" - "date" - Date
+        "date" - "date" - Date
+        "time" - "date" - Date
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="BindowsComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="XsTypeConverterAttributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="BiXsTypeConverter" substitutionGroup="XsTypeConverter"/>
+
+  <xs:attributeGroup name="XsTypeConverterAttributes">
+
+    <xs:attributeGroup ref="ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+
+  <xs:group name="BindowsComponentsGroup">
+    <xs:choice>
+      <!--<xs:group ref="iv:InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>-->
+      <xs:group ref="iv:ElementsAllowedExternally" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DrawLine" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridRow" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridChartRow" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeNode" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AnimationRange" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Area" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AreaCollection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Base64" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Border" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartCategory" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartPoint" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartPresentation" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartPresentationManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartSeries" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataColumn" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDataColumn" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataRow" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDataRow" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataTable" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDataTable" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DateFormat" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DateFormatSymbols" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DrawAnchor" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="CssLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ImageLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ObjectLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Script" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ScriptLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SerializedLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Style" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TextLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="JsonLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="L10nLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlResourceParser" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AttachedComponentModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InlineEditModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Command" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Component" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColumnChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="BarChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PercentageStackedColumnChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PercentageStackedBarChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StackedColumnChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StackedBarChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LineChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PieChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColumnChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="BarChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PercentageStackedColumnChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PercentageStackedBarChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StackedColumnChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StackedBarChart2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColumnChartSection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LineMarker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PieChartSection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColumnChartSection2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridChart" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AccordionPage" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AccordionPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Box" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="HBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="VBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Calendar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartAreaBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartArea" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartArea2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartCategoryAxisBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartCategoryAxis" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartCategoryAxis2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartGridLinesBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartGridLines" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartGridLines2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartLegend" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartValueAxisBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartValueAxis" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartValueAxis2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComboBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DatePicker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DesktopPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DockPanel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="FlowPanel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2Component" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2CircularBorder" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2ImageBorder" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RectangularBorder" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2BasicCap" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearGradientFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialGradientFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RingGradientFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2PlainColorFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearRange" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialRange" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearScale" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialScaleSection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearTicks" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialTicks" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2LinearNeedle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2RadialNeedle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2Group" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeLabels" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeMajorTicks" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeMinorTicks" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeNeedle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugePlate" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeSection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GraphBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Graph" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Graph2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GraphContentArea" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridHeaders" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridPanel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridPanel2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridRowHeaders" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GroupBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Iframe" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PrintFrame" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RichEdit" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Image" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InlineComponent" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="IpField" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Label" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Button" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="AccordionButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RepeatButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ChartLegendLabel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="CheckBox" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Gauge2Label" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GaugeTitle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridHeader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridHeaderCorner" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridHeaderFiller" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GroupBoxTitle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ListItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComboBoxItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Popup" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolTip" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RadioButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StatusBarPanel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarMenuButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarSplitMenuButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarToggleButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarRadioButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TabButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarSplitToggleMenuButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewDragHeader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LinkManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="List" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MenuBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MoveHandle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridDropMarker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OptionPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ProgressBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="UndeterminedProgressBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ResizeHandle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridResizeOutline" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewResizeOutline" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ScrollBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Slider" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Spinner" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SplitPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StatusBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TabPage" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TabPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TextField" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PasswordField" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TextArea" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TimePicker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TabBar" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolBarSeparator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewBase" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGrid" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeView" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SingleTree" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewDragHeaderMarker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="VmlLabel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Window" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Dialog" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ColorPicker" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Wizard" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="WizardPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComponentAnimation" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LocationAnimator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OpacityAnimator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SizeAnimator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataSet" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDataSet" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="FpsGenerator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ImageMap" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ImageMapArea" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ImagePreloader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Link" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Menu" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MenuItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="CheckBoxMenuItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MenuButton" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="MenuSeparator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RadioButtonMenuItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridStateManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RadioGroup" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="RangeModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ResourceLoader" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ScriptLoaderQueue" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="CalendarSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ListSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewSelectionModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StringBundle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TextParser" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ThemeManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Timer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DataSetDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2DataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SingleTreeDataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2DataModel" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewStateManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="WebService2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="WindowManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlRpc" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Font" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2Cell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2Row" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridCell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridChartCell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridColumn" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridPanel2Cell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GridPanel2Row" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="HashTable" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Json" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Line" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LoadManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Math" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridCellInfo" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OlapGridViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="OrderedIterator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Point" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PopupManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SelectionItemCollection" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Set" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Shape" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Circle" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Polygon" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SingleTreeNode" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Sort" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="StringBuffer" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Subtree" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Theme" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TimerManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ToolTipManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2Cell" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2Row" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeHelper" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeIterator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeIteratorStackItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeNode2" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewCellInfo" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewSelectionModelItem" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="TreeViewViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Grid2ViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="SingleTreeViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Tree2ViewManager" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="Uri" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XsTypeConverter" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="WebService" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlDocument" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlHttp" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlRpcError" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlRpcDouble" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="XmlRpcInt" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="L10nString" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:choice>
+  </xs:group>
+
+</xs:schema>
+
+
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation19_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation19_2.xsd
new file mode 100644
index 000000000000..b3fd4ea5dae2
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation19_2.xsd
@@ -0,0 +1,4368 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://www.infiview.net/infiview"
+           xmlns="http://www.infiview.net/infiview"
+           xmlns:bi="http://www.bindows.net/IVBindowsSchema"
+           elementFormDefault="qualified">
+
+  <xs:import namespace="http://www.bindows.net/IVBindowsSchema"
+             schemaLocation="ComplexSchemaValidation19.xsd"/>
+
+  <xs:group name="ElementsAllowedExternally">
+    <xs:choice>
+      <xs:element ref="ViewportNavigator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="ComponentViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="GraphViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InteractiveGraphViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="DynamicViewportNavigator" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="InfiViewViewport" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="LayerPane" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element ref="PerspectiveTitle" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:attributeGroup name="VGComponentAttributes"></xs:attributeGroup>
+
+  <xs:element name="DefaultSelectionDefinition">
+    <xs:complexType>
+      <xs:choice>
+        <xs:element ref="Selection2"/>
+        <xs:element ref="Selection"/>
+        <xs:element ref="VGSelection"/>
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="Layout">
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="AbstractDataContainer">
+    <xs:annotation>
+      <xs:documentation>
+        Abstract data container class
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractDataContainerAttributes">
+
+    <xs:attributeGroup ref="ViewportRectangleAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGroupNode">
+    <xs:annotation>
+      <xs:documentation>
+        This class represent a special grouping data container.
+        The member area of the group is the area where members are placed.
+        Use the addMember method for adding data containers to a group.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGroupNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractGroupNodeAttributes">
+
+    <xs:attributeGroup ref="InfiViewNodeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractGroupNodeType">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.AbstractGroupNodeType acts as a template for nodes that have grouping features.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractGroupNodeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractGroupNodeTypeAttributes">
+
+    <xs:attributeGroup ref="NodeTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractNode">
+    <xs:annotation>
+      <xs:documentation>
+        Abstract data container class
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractNodeAttributes">
+
+    <xs:attributeGroup ref="ViewportRectangleAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractNodeRepAdapter">
+    <xs:annotation>
+      <xs:documentation>
+        The abstract node representation adapter.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractNodeRepAdapterAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractNodeRepAdapterAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractSelection">
+    <xs:annotation>
+      <xs:documentation>
+        Adds a selection wireframe around multiple nodes that can then be dragged with the mouse.
+        Nodes can be added to and removed from the selection as needed.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractSelectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractSelectionAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+    <xs:attribute name="nodes"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          Array Nodes inside the selection
+          -
+          Nodes inside the selection.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="parent"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          BiComponent
+          -
+          Sets the surface area in which the selection is allowed to operate.
+          This method can be overidden if more than one component is used.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="moveDirection"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          String
+          -
+          Limits movement in various direction.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when nodes are added to and removed from the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmovestart"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when user starts dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmoveend"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when user has finished dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractUndoRedoCommand">
+    <xs:annotation>
+      <xs:documentation>
+        This is the base class of all undo redo commands.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractUndoRedoCommandAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractUndoRedoCommandAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractViewport">
+    <xs:annotation>
+      <xs:documentation>
+        The abstract representation of the viewport collects methods giving
+        a consistent interface for building custom viewports.
+
+        The viewport is a component which makes it possible to write
+        applications with practically infinite surfaces containing a
+        tremendous amount of information which should be swapped in and out
+        from either an internal lightweight information structure or server
+        side information.
+
+        The abstract viewport adds a resize and a
+        mousewheel event listener in its constructor. The resize event is
+        coupled to the resizeVisibleArea method of the given data model and
+        the mousewheel event scrolls the viewport vertically by 50 pixels.
+        This behavior can be overriden by overriding the onMouseWheel method.
+
+
+        The default render margin is zero in both directions.
+
+        setScrollLeft and setScrollTop are overridden to empty functions to
+        avoid auto-scrolling problems when using drag-and-drop.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractViewportAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+    <xs:attribute name="zoomable"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          boolean
+          -
+          Zoomable viewport or not
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AbstractViewportModel">
+    <xs:annotation>
+      <xs:documentation>
+        This is the is the foundation for all viewport data models which are
+        used to manage the information on which infiview.AbstractViewport
+        descendants are dependent on. The data model should store either
+        lightweight information about components or manage communication
+        with information on a server.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AbstractViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AbstractViewportModelAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+    <xs:attribute name="onzoomchange"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Dispatched when the zoom level changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="oncenterview"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Dispatched when the view is centered.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Actions">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.Actions acts as a manager for InfiView actions.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ActionsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ActionsAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="AnchorPoints">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="AnchorPointsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="AnchorPointsAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+    <xs:attribute name="anchors"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="colorMap"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BalloonTreeLayout">
+    <xs:annotation>
+      <xs:documentation>
+        In this class a ballon tree layout algorithm is implemented
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BalloonTreeLayoutAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="BalloonTreeLayoutAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BiconnectedComponentLayout">
+    <xs:annotation>
+      <xs:documentation>
+        A layout for general graphs that exhibits cluster structure. The
+        graph (which is assumed to be connected) is subdivided in its
+        bicomponents, and the vertices of each bicomponent are laid out on
+        a circle. The bicomponents (which together with the cutpoints form
+        a tree) are then laid out using the wedge tree layout algorithm.
+
+        With this layout it is easy to visually identify the clusters
+        (bicomponents) and cutpoints.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BiconnectedComponentLayoutAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="BiconnectedComponentLayoutAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BiconnectedComponentLayout.BiconnectedComponent">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BiconnectedComponentLayout.BiconnectedComponentAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="BiconnectedComponentLayout.BiconnectedComponentAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BiconnectedComponentLayout.BlockCutpointVertex">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BiconnectedComponentLayout.BlockCutpointVertexAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="BiconnectedComponentLayout.BlockCutpointVertexAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="BiconnectedComponentLayout.Cutpoint">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="BiconnectedComponentLayout.CutpointAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="BiconnectedComponentLayout.CutpointAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentConstructor">
+    <xs:annotation>
+      <xs:documentation>
+        NodeRepAdapter contructor holder
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentConstructorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentConstructorAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentDataContainer">
+    <xs:annotation>
+      <xs:documentation>
+        Wrapper class for objects inserted into a infiview.GraphViewportDatamodel
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentDataContainerAttributes">
+
+    <xs:attributeGroup ref="AbstractDataContainerAttributes"/>
+
+    <xs:attribute name="visible"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="data"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          Object
+          -
+          Set the data of this container.
+          The properties that are given in the "persistentDataMap" property are saved int the container.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentNode">
+    <xs:annotation>
+      <xs:documentation>
+        The ComponentNode class represent a BiComponent based node.
+        Observe that an instance of this class could reside in other models than infiview.ComponentViewportModel
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentNodeAttributes">
+
+    <xs:attributeGroup ref="AbstractNodeAttributes"/>
+
+    <xs:attribute name="componentConstructors"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.ComponentConstructor[]
+          -
+          Sets the array of constructors to use for this node.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="component"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          Set the component of this node, it will be wrapped by a ComponentNodeRepAdapter.
+          The properties that are given in the "persistentDataMap" property are saved int the container.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmove"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.MoveEvent When the node is moved.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onresize"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.MoveEvent When the node is resized.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentNodeRepAdapter">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.ComponentNodeRepAdapter represents a NodeRepAdapter containing a zoomable and resizable component.
+        This class is used together with ComponentNode.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentNodeRepAdapterAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentNodeRepAdapterAttributes">
+
+    <xs:attributeGroup ref="AbstractNodeRepAdapterAttributes"/>
+
+    <xs:attribute name="component"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentViewport">
+    <xs:annotation>
+      <xs:documentation>
+        Implemented viewport for handling components. It is used together
+        with a infiview.ComponentViewportModel.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentViewportAttributes">
+
+    <xs:attributeGroup ref="ZoomableViewportAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ComponentViewportModel">
+    <xs:annotation>
+      <xs:documentation>
+        Model intended for keeping externally added components.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ComponentViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ComponentViewportModelAttributes">
+
+    <xs:attributeGroup ref="ZoomableViewportModelAttributes"/>
+
+    <xs:attribute name="rTreeEnabled"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          boolean
+          -
+          The rTree, see infiview.RTree for mor information.
+          @Type infiview.RTree
+
+
+          Whether the RTree is used for storing nodes. Storing nodes in an RTree
+          allows for finding nodes inside a certain area qucikly, while it slows down
+          insert and remove operations.
+
+          When inserting many nodes (>100) it is often faster to first disable
+          the rtree, then enable it again. This is because it is alot faster
+          to create an rtree out of many nodes than to insert nodes one by one.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ContextMenu">
+    <xs:annotation>
+      <xs:documentation>
+        This class represents an InfiView context menu.
+        It takes MenuItems as children.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ContextMenuAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ContextMenuAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+    <xs:attribute name="upActions"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.InfiView
+          -
+          Binds the menu items to infiview actions.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ContextMenus">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.ContextMenus represent a set of available context menus.
+
+        TODO: Explain the purpose of this class.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ContextMenusAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ContextMenusAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="CornerStitchArea">
+    <xs:annotation>
+      <xs:documentation>
+        TODO: Document class.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="CornerStitchAreaAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="CornerStitchAreaAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+    <xs:attribute name="solid"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DefaultSymbol">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DefaultSymbolAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DefaultSymbolAttributes">
+
+    <xs:attributeGroup ref="VGSymbolAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DiamondSymbol">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DiamondSymbolAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DiamondSymbolAttributes">
+
+    <xs:attributeGroup ref="DefaultSymbolAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DocSymbol">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DocSymbolAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DocSymbolAttributes">
+
+    <xs:attributeGroup ref="DefaultSymbolAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DoubleZoomFactorModel">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DoubleZoomFactorModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DoubleZoomFactorModelAttributes">
+
+    <xs:attributeGroup ref="ZoomFactorModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DrawAnchor">
+    <xs:annotation>
+      <xs:documentation>
+        This class defines static properties that represent the anchoring locations for edge lines.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DrawAnchorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DrawAnchorAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DynamicPreviewViewportNavigator">
+    <xs:annotation>
+      <xs:documentation>
+        This class is specialized navigator that loads images as preview background.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DynamicPreviewViewportNavigatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DynamicPreviewViewportNavigatorAttributes">
+
+    <xs:attributeGroup ref="ViewportNavigatorAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="DynamicViewportNavigator">
+    <xs:annotation>
+      <xs:documentation>
+        Dynamic Viewport Navigator updates when connected viewport is updated.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="DynamicViewportNavigatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="DynamicViewportNavigatorAttributes">
+
+    <xs:attributeGroup ref="ViewportNavigatorAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Edge">
+    <xs:annotation>
+      <xs:documentation>
+        This class represents the relationship between two components that are to be edgeed by a edge line.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EdgeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EdgeAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EdgeContainer">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EdgeContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EdgeContainerAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+    <xs:attribute name="labelNode"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          Sets a label node on the edge.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="edge"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="visible"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EdgeManager">
+    <xs:annotation>
+      <xs:documentation>
+        This class is a component that holds edgeed components. It also manages the edges involved with these components.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EdgeManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EdgeManagerAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EdgeType">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.EdgeType acts as a template for edges.
+        It holds properties usied by infiview.InfiView when creating an
+        edge of a specific edge type.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EdgeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EdgeTypeAttributes">
+
+    <xs:attributeGroup ref="InfiViewTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EdgeTypes">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.EdgeTypes acts as a manager for the edge types.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EdgeTypesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EdgeTypesAttributes">
+
+    <xs:attributeGroup ref="TypeTableAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EllipseSymbol">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EllipseSymbolAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EllipseSymbolAttributes">
+
+    <xs:attributeGroup ref="DefaultSymbolAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EventListener">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.EventListener is used by infiview.InfiView.
+        This class is the holder of a event l├нstener. Used by property forms.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventListenerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EventListenerAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="EventListeners">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.EventListeners is used by infiview.InfiView.
+        Holder of a list of infiview.EventListener.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="EventListenersAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="EventListenersAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ExpandCollapseImage">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ExpandCollapseImageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ExpandCollapseImageAttributes">
+
+    <xs:attributeGroup ref="VGImageAttributes"/>
+
+    <xs:attribute name="expandedUri"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="expanded"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GoogleMapsNode">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.GoogleMapsNode is the light weight representation of an node residing
+        in a InfiView using infiview.GoogleMapsViewport.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GoogleMapsNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GoogleMapsNodeAttributes">
+
+    <xs:attributeGroup ref="InfiViewNodeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GoogleMapsNodeRepAdapter">
+    <xs:annotation>
+      <xs:documentation>
+        The holds the representation of a node residing inside a google maps based graph.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GoogleMapsNodeRepAdapterAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GoogleMapsNodeRepAdapterAttributes">
+
+    <xs:attributeGroup ref="InfiViewNodeRepAdapterAttributes"/>
+
+    <xs:attribute name="left"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="top"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GoogleMapsNodeType">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.GoogleMapsNodeType acts as a template for nodes that are used together with the GoogleMapsViewport
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GoogleMapsNodeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GoogleMapsNodeTypeAttributes">
+
+    <xs:attributeGroup ref="NodeTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GoogleMapsViewport">
+    <xs:annotation>
+      <xs:documentation>
+        This viewport is specilized for InfiView application that uses google maps.
+        The method is used setUpGoogleMaps for setting up the Google Maps API together with this viewport.
+        The GMap2 class is used internally.
+        To make sure that the viewport works correctly a "glass pane" must be placed in front of the container component.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GoogleMapsViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GoogleMapsViewportAttributes">
+
+    <xs:attributeGroup ref="InfiViewViewportAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GradientEdgeType">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GradientEdgeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GradientEdgeTypeAttributes">
+
+    <xs:attributeGroup ref="EdgeTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphDataContainer">
+    <xs:annotation>
+      <xs:documentation>
+        Wrapper class for objects inserted into a infiview.GraphViewportDatamodel
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GraphDataContainerAttributes">
+
+    <xs:attributeGroup ref="ComponentDataContainerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphNode">
+    <xs:annotation>
+      <xs:documentation>
+        Wrapper class for objects inserted into a infiview.GraphViewportDatamodel
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GraphNodeAttributes">
+
+    <xs:attributeGroup ref="ComponentNodeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphViewport">
+    <xs:annotation>
+      <xs:documentation>
+        Viewport specialized for containing a edge manager to handle very
+        large graphs.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GraphViewportAttributes">
+
+    <xs:attributeGroup ref="ComponentViewportAttributes"/>
+
+    <xs:attribute name="grid"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.VGGrid
+          -
+          The grid object.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GraphViewportModel">
+    <xs:annotation>
+      <xs:documentation>
+        Specialized model for the infiview.GraphViewport which handles very
+        large graphs.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GraphViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GraphViewportModelAttributes">
+
+    <xs:attributeGroup ref="ComponentViewportModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Grid">
+    <xs:annotation>
+      <xs:documentation>
+        Basic grid class, contains logic and grid related properties.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GridAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GridAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+    <xs:attribute name="color"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="xStep"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="yStep"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="startX"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="startY"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="visible"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          boolean
+          -
+          The component
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GroupNode">
+    <xs:annotation>
+      <xs:documentation>
+        This class represent a special grouping node.
+        The member area of the group is the area where members are placed.
+        Use the addMember method for adding nodes to a group.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GroupNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GroupNodeAttributes">
+
+    <xs:attributeGroup ref="AbstractGroupNodeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="GroupNodeType">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.GroupNodeType acts as a template for nodes that have grouping features.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="GroupNodeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="GroupNodeTypeAttributes">
+
+    <xs:attributeGroup ref="AbstractGroupNodeTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageBasedNode">
+    <xs:annotation>
+      <xs:documentation>
+        Class for showing nodes composed by an images in an infiview viewport.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageBasedNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ImageBasedNodeAttributes">
+
+    <xs:attributeGroup ref="VGSymbolAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ImageBasedNodeImage">
+    <xs:annotation>
+      <xs:documentation>
+        This class contains one zoomfactor specific image.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ImageBasedNodeImageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ImageBasedNodeImageAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+    <xs:attribute name="uri"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          BiUri
+          -
+          The location of the image file. If this is set to a string a
+          new URI is created from that string relative to the
+          ADF path.
+          @Returns void
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiView">
+    <xs:annotation>
+      <xs:documentation>
+        The InfiView class extends the standard Bindows BiComponent wich means that it can be used in any Bindows ADF
+        and acts as a facade towards the inner InfiView object model, gathering events in form av actions and offering a set of
+        convenient operations for the InfiView programmer.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+    <xs:attribute name="undoBufferSize"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          Number
+          -
+          Size of the undo/redo buffer. Default is 0 which is the same as turned off.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="activePerspective"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.Perspective
+          -
+          The resources of this InfiView object.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="activeViewport"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.InfiViewViewport
+          -
+          An instance of an additional class that will be accessible in every action.
+          Typically the main application object.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="blockedActions"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          Object
+          -
+          Returns blocked actions as a hash (object) with
+          the keys being the name of the blocked actios.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnewnode"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when the node representation is created for the first time.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onconnection"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a connection between nodes is issued by the user by carrying out a drag drop operation.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onviewportmarqueeselection"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a selection is issued by user by enclosing a set of node using marquee selector.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnodemove"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a node is moved.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnoderesize"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a node is resized.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnodeclick"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a node is clicked.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onnodedoubleclick"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a node double clicked.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onedgeclick"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a edge is clicked</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onedgedoubleclick"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a edge is double clicked.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="ontoolaction"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a tool button is clicked.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onpropertyformlistener"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired when a event listener of a property form is dispatched.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onstart"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This event is fired after the entire InfiView object is loaded.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewBackEndViewport">
+    <xs:annotation>
+      <xs:documentation>
+        Viewport specialized for InfiView backend applications
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewBackEndViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewBackEndViewportAttributes">
+
+    <xs:attributeGroup ref="InfiViewViewportAttributes"/>
+
+    <xs:attribute name="requestHandler"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.AbstractViewport
+          -
+          The request handler to use for retrieving nodes from back end.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewBackEndViewportModel">
+    <xs:annotation>
+      <xs:documentation>
+        General back end model using the InfiViewGraph xml format for loading nodes
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewBackEndViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewBackEndViewportModelAttributes">
+
+    <xs:attributeGroup ref="InfiViewViewportModelAttributes"/>
+
+    <xs:attribute name="requestHandler"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.AbstractRequestHandler
+          -
+          The request handler this model is using for retreiving back end data.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="taskInterval"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          number
+          -
+          The interval the task timer should work. The task timer is responssible for adding and deleting nodes.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewComponentDataContainer">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.InfiViewComponentDataContainer is the light weight representation of an node residing
+        in a InfiView.
+        This class can be inherit for adding och changing features of adding and dipsosing visual nodes in a InfiView.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewComponentDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewComponentDataContainerAttributes">
+
+    <xs:attributeGroup ref="InteractiveGraphDataContainerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewNode">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.InfiViewNode is the light weight representation of an node residing
+        in a InfiView.
+        This class can be inherit for adding och changing features of adding and dipsosing visual nodes in a InfiView.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewNodeAttributes">
+
+    <xs:attributeGroup ref="InteractiveGraphNodeAttributes"/>
+
+    <xs:attribute name="decorator"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          The node type of this data node.
+          @Type infiview.NodeType
+
+
+          The node id of this data node.
+          @Type infiview.NodeType
+
+
+          If this node is a member of a group this is the group.
+          @Type infiview.AbstractGroupNode
+
+
+          The decorator of this object (see decorator pattern)
+          @Type infiview.InfiViewNode
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewNodeRepAdapter">
+    <xs:annotation>
+      <xs:documentation>
+        The InteractiveGraphNodeRepAdapter holds the rpresentation logic of a node residing inside a interactive graph.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewNodeRepAdapterAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewNodeRepAdapterAttributes">
+
+    <xs:attributeGroup ref="InteractiveGraphNodeRepAdapterAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewType">
+    <xs:annotation>
+      <xs:documentation>
+        Basic class for element and edge type classes.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewTypeAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewViewport">
+    <xs:annotation>
+      <xs:documentation>
+        Viewport specialized for the InfiView facade.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewViewportAttributes">
+
+    <xs:attributeGroup ref="InteractiveGraphViewportAttributes"/>
+
+    <xs:attribute name="infiView"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InfiViewViewportModel">
+    <xs:annotation>
+      <xs:documentation>
+        Specialized model for the infiview.GraphViewport which handles very
+        large graphs.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InfiViewViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InfiViewViewportModelAttributes">
+
+    <xs:attributeGroup ref="InteractiveGraphViewportModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InteractiveGraphDataContainer">
+    <xs:annotation>
+      <xs:documentation>
+        Wrapper class for objects inserted into a infiview.GraphViewportDatamodel
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InteractiveGraphDataContainerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InteractiveGraphDataContainerAttributes">
+
+    <xs:attributeGroup ref="GraphDataContainerAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InteractiveGraphNode">
+    <xs:annotation>
+      <xs:documentation>
+        Wrapper class for objects inserted into a infiview.GraphViewportDatamodel
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InteractiveGraphNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InteractiveGraphNodeAttributes">
+
+    <xs:attributeGroup ref="GraphNodeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InteractiveGraphNodeRepAdapter">
+    <xs:annotation>
+      <xs:documentation>
+        The InteractiveGraphNodeRepAdapter holds the representation logic of a node residing inside a interactive graph.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InteractiveGraphNodeRepAdapterAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InteractiveGraphNodeRepAdapterAttributes">
+
+    <xs:attributeGroup ref="ComponentNodeRepAdapterAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InteractiveGraphViewport">
+    <xs:annotation>
+      <xs:documentation>
+        Viewport specialized for representing different interactive charts.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InteractiveGraphViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InteractiveGraphViewportAttributes">
+
+    <xs:attributeGroup ref="GraphViewportAttributes"/>
+
+    <xs:attribute name="edgeMode"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          boolean
+          -
+          Edge mode enabled / disabled
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="multiSelection"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          Boolean
+
+
+          Turn of or on nultiple selection
+          -
+          If this value is set to true it enables multipe selection of elements
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="selection"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="InteractiveGraphViewportModel">
+    <xs:annotation>
+      <xs:documentation>
+        Specialized model of the infiview.GraphViewport which adds additional features for interactivity.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="InteractiveGraphViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="InteractiveGraphViewportModelAttributes">
+
+    <xs:attributeGroup ref="GraphViewportModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="LayerPane">
+    <xs:annotation>
+      <xs:documentation>
+        A pane with layers of viewports enabling the user to select or move a component on any layer.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LayerPaneAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="LayerPaneAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="LineRouterManager">
+    <xs:annotation>
+      <xs:documentation>
+        TODO: Document class.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="LineRouterManagerAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="LineRouterManagerAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ListZoomFactorModel">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ListZoomFactorModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ListZoomFactorModelAttributes">
+
+    <xs:attributeGroup ref="ZoomFactorModelAttributes"/>
+
+    <xs:attribute name="factorList"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="currentFactor"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MapViewport">
+    <xs:annotation>
+      <xs:documentation>
+        Viewport specialized for containing images in thr form of tiles.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MapViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="MapViewportAttributes">
+
+    <xs:attributeGroup ref="ZoomableViewportAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MapViewportModel">
+    <xs:annotation>
+      <xs:documentation>
+        This class is a specialized model for tile based map applications.
+        It's a low level implemntation using ComponentNode for representation BUT it doesn't use a RTree therefore
+        the tiles must be in same size for each zoom level.
+        infiview.MapZoomLevelDefinition is used for setting up zoom level logic.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MapViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="MapViewportModelAttributes">
+
+    <xs:attributeGroup ref="ZoomableViewportModelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MapZoomLevelDefinition">
+    <xs:annotation>
+      <xs:documentation>
+        An instance of this class keeps track of a certain zoom level in a InfiView map application.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MapZoomLevelDefinitionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="MapZoomLevelDefinitionAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MarqueeSelector">
+    <xs:annotation>
+      <xs:documentation>
+        This component can be used as a wireframe for selecting components on a drawing area. Add this to the same area and
+        on the mousedown event call startSelection(e) passing the BiMouseEvent object from the mousedown event handler as
+        the parameter e.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MarqueeSelectorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="MarqueeSelectorAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+    <xs:attribute name="onselectionprogress"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.SelectionEvent Fires continually during the resizing of the wireframe</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onselectionend"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.SelectionEvent This is fired when the user releases the mouse button to signal
+          that the selection is complete.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onselectionstart"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>This is fired before the selection is starts. To prevent the wireframe
+          from being displayed call
+          preventDefault
+          on the event object.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MinPriorityQueue">
+    <xs:annotation>
+      <xs:documentation>
+        TODO: Document class.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MinPriorityQueueAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="MinPriorityQueueAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="MoveEvent">
+    <xs:annotation>
+      <xs:documentation>
+        This event class is used in the infiview package for handling move events.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="MoveEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="MoveEventAttributes">
+
+    <xs:attributeGroup ref="bi:MoveEventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="NodeAnimation">
+    <xs:annotation>
+      <xs:documentation>
+        This class implements a general node item animation algorithm.
+        This class assumes that the node items are infiview nodes.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="NodeAnimationAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="NodeAnimationAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="NodeType">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.NodeType acts as a template for nodes.
+        A infiview.NodeType instance supplies three different parts used for creating and represent a node of this node type - "symbol",
+        "viewport" and "node".
+        The "symbol" describes how this node type is suposed to be represented i.e. a panel.
+        The "viewport" describes how this node type should be represented in a viewport.
+        The "node" describes how a node of this node type should be created.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="NodeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="NodeTypeAttributes">
+
+    <xs:attributeGroup ref="InfiViewTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="NodeTypes">
+    <xs:annotation>
+      <xs:documentation>
+        Container for node types.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="NodeTypesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="NodeTypesAttributes">
+
+    <xs:attributeGroup ref="TypeTableAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="NodeTypeViewport">
+    <xs:annotation>
+      <xs:documentation>
+        This class holds logic how to create the viewport representation of the a node type.
+        A node type can contain 1-* instances of this class.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="NodeTypeViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="NodeTypeViewportAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Perspective">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.Perspective is used by infiview.InfiView.
+        This class represents a Perspective.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PerspectiveAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PerspectiveAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Perspectives">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.Perspectives is used by infiview.InfiView.
+        Container of perspectives.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PerspectivesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PerspectivesAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PerspectiveTitle">
+    <xs:annotation>
+      <xs:documentation>
+        Label holding the perspective title
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PerspectiveTitleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PerspectiveTitleAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+    <xs:attribute name="text"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          String
+          -
+          Sets the perspective title
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PreviewImage">
+    <xs:annotation>
+      <xs:documentation>
+        This class is used for showing images.
+        Supported image types are GIF, JPEG and PNG (including support for 32-bit RGBA).
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PreviewImageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PreviewImageAttributes">
+
+    <xs:attributeGroup ref="bi:ImageAttributes"/>
+
+    <xs:attribute name="onload"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image loads. Note that the image file may be
+          loaded before the constructor finishes and you should not only
+          rely on this event but also use loaded property.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onerror"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fires when the image failed to load.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PriorityQueue">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PriorityQueueAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PriorityQueueAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PriorityQueueNode">
+    <xs:annotation>
+      <xs:documentation>
+        TODO: Document class.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PriorityQueueNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PriorityQueueNodeAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PropertyForm">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.PropertyForm is used by infiview.InfiView.
+        This class holds information for creating a property form
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PropertyFormAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PropertyFormAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="PropertyForms">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.PropertyForms is used by infiview.InfiView.
+        This class is a container holding PropertyForm objects.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="PropertyFormsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="PropertyFormsAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RectSymbol">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RectSymbolAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="RectSymbolAttributes">
+
+    <xs:attributeGroup ref="DefaultSymbolAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ResizeEvent">
+    <xs:annotation>
+      <xs:documentation>
+        This event class is used in the infiview package for handling resize events.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResizeEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ResizeEventAttributes">
+
+    <xs:attributeGroup ref="bi:ResizeEventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Resources">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.Resources acts as a manager for the resources used by infiview.InfiView
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ResourcesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ResourcesAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RoundRectImageSymbol">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RoundRectImageSymbolAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="RoundRectImageSymbolAttributes">
+
+    <xs:attributeGroup ref="VGSymbolAttributes"/>
+
+    <xs:attribute name="href"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RoundrectSymbol">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RoundrectSymbolAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="RoundrectSymbolAttributes">
+
+    <xs:attributeGroup ref="DefaultSymbolAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="RTree">
+    <xs:annotation>
+      <xs:documentation>
+        R-Tree implementation. The R-tree is a tree designed to make fast
+        searches of rectangular areas.
+
+        Code is based on Guttman, A. "R-Trees: A Dynamic Index Structure for
+        Spatial Searching", ACM 1984.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="RTreeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="RTreeAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Selection">
+    <xs:annotation>
+      <xs:documentation>
+        Adds a selection wireframe around multiple nodes that can then be dragged with the mouse.
+        Nodes can be added to and removed from the selection as needed.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SelectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="SelectionAttributes">
+
+    <xs:attributeGroup ref="AbstractSelectionAttributes"/>
+
+    <xs:attribute name="border"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          BiBorder
+          -
+          Sets the default appearance of the wireframe
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onchange"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when nodes are added to and removed from the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmovestart"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when user starts dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmoveend"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when user has finished dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Selection2">
+    <xs:annotation>
+      <xs:documentation>
+        Adds a selection wireframe around multiple nodes that can then be dragged with the mouse.
+        Nodes can be added to and removed from the selection as needed. This selection is created using
+        4 border components so the internal components can still be clicked.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="Selection2Attributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="Selection2Attributes">
+
+    <xs:attributeGroup ref="SelectionAttributes"/>
+
+    <xs:attribute name="onchange"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when nodes are added to and removed from the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmovestart"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when user starts dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmoveend"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event Fired when user has finished dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="SelectionEvent">
+    <xs:annotation>
+      <xs:documentation>
+        The event dispatched by infiview.MarqueeSelector.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="SelectionEventAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="SelectionEventAttributes">
+
+    <xs:attributeGroup ref="bi:EventAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="State">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.State is used by infiview.InfiView.
+        This class represents a state.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StateAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="StateAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="States">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.States is used by infiview.InfiView.
+        Container of states.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="StatesAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="StatesAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ToolGroup">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.ToolGroup is used by infiview.InfiView.
+        Container for tools, when tools are layout every group will separated.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolGroupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ToolGroupAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+    <xs:attribute name="upActions"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.InfiView
+          -
+          This method binds certains tool components events to infiview actions.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="Tools">
+    <xs:annotation>
+      <xs:documentation>
+        This class is managing the tool groups.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ToolsAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ToolsAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TreeLayout">
+    <xs:annotation>
+      <xs:documentation>
+        Walker's layout algorithm for rooted trees, improved version with
+        linear run-time [1], [2]. The tree is drawn in a top-down,
+        hierarchical manner. The levels are placed on parallel lines with
+        the root at the highest level. Each vertex is positioned above the
+        midpoint of its children, and the children are placed in the
+        order specified in the input and separated by at least a specified
+        minimum distance. The algorithm minimizes the width of the drawing
+        (under the relevant constraints).
+
+        [1] Christoph Buchheim, Michael J├Г┬╝nger and Sebastian Leipert,
+        "Improving Walker's Algorithm to Run in Linear Time". Graph
+        Drawing: 10th International Symposium, Lecture Notes in Computer
+        Science 2528 (2002), pp. 347-364, Springer.
+
+        [2] Christoph Buchheim, Michael J├Г┬╝nger and Sebastian Leipert,
+        "Improving Walker's Algorithm to Run in Linear Time". Technical
+        Report zaik2002-431 (2002), ZAIK, Universit├Г┬дt zu K├Г┬╢ln.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TreeLayoutAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="TreeLayoutAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="TypeTable">
+    <xs:annotation>
+      <xs:documentation>
+        The class infiview.TypeTable is used by infiview.InfiView.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="TypeTableAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="TypeTableAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="UndoRedo">
+    <xs:annotation>
+      <xs:documentation>
+        This class is a help class for implementing undo redo mechanisms in an InfiView application.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UndoRedoAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="UndoRedoAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="UndoRedoAddOrRemoveEdgeCommand">
+    <xs:annotation>
+      <xs:documentation>
+        This class implements undo redo mechanisms for edge adding and removing.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UndoRedoAddOrRemoveEdgeCommandAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="UndoRedoAddOrRemoveEdgeCommandAttributes">
+
+    <xs:attributeGroup ref="AbstractUndoRedoCommandAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="UndoRedoAddOrRemoveNodeCommand">
+    <xs:annotation>
+      <xs:documentation>
+        This class implements undo redo mechanisms for node adding and removing.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UndoRedoAddOrRemoveNodeCommandAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="UndoRedoAddOrRemoveNodeCommandAttributes">
+
+    <xs:attributeGroup ref="UndoRedoNodeCommandAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="UndoRedoChangeBoundsCommand">
+    <xs:annotation>
+      <xs:documentation>
+        The node id of the node related to the command.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UndoRedoChangeBoundsCommandAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="UndoRedoChangeBoundsCommandAttributes">
+
+    <xs:attributeGroup ref="UndoRedoNodeCommandAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="UndoRedoNodeCommand">
+    <xs:annotation>
+      <xs:documentation>
+        This class is the base class for all node undo redo commands.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="UndoRedoNodeCommandAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="UndoRedoNodeCommandAttributes">
+
+    <xs:attributeGroup ref="AbstractUndoRedoCommandAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="WedgeTreeLayout">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="WedgeTreeLayoutAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="WedgeTreeLayoutAttributes">
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="VGGrid">
+    <xs:annotation>
+      <xs:documentation>
+        Vector Grafik based grid
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VGGridAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="VGGridAttributes">
+
+    <xs:attributeGroup ref="VGComponentAttributes"/>
+
+    <xs:attribute name="color"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="VGGroup">
+    <xs:annotation>
+      <xs:documentation>
+        Vector grafic group object. Use this for composite symbols.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VGGroupAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="VGGroupAttributes">
+
+    <xs:attributeGroup ref="VGComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="VGImage">
+    <xs:annotation>
+      <xs:documentation>
+        This class represents an Vector Graphic image.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VGImageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="VGImageAttributes">
+
+    <xs:attributeGroup ref="VGComponentAttributes"/>
+
+    <xs:attribute name="uri"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          String
+          -
+          Convienience method to set the image uri of this VGImage.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="VGSelection">
+    <xs:annotation>
+      <xs:documentation>
+        Adds a selection wireframe around multiple nodes that can then be dragged with the mouse.
+        Nodes can be added to and removed from the selection as needed.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VGSelectionAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="VGSelectionAttributes">
+
+    <xs:attributeGroup ref="AbstractSelectionAttributes"/>
+
+    <xs:attribute name="onchange"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when nodes are added to and removed from the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmovestart"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when user starts dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onmoveend"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Fired when user has finished dragging the selection</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="VGSymbol">
+    <xs:annotation>
+      <xs:documentation>
+        General base class for vector graphic symbols.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="VGSymbolAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="VGSymbolAttributes">
+
+    <xs:attributeGroup ref="VGComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportComponentConstructor">
+    <xs:annotation>
+      <xs:documentation>
+        Node constructor holder for InfiViewNode.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportComponentConstructorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportComponentConstructorAttributes">
+
+    <xs:attributeGroup ref="ComponentConstructorAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportMarqueeSelector">
+    <xs:annotation>
+      <xs:documentation>
+        This component can be used as a wireframe for selecting components
+        from a ViewportModel. Add this to the Viewport and on the mousedown
+        event call startSelection(e) passing the infiview.MouseEvent object
+        from the mousedown event handler as the parameter e.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportMarqueeSelectorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportMarqueeSelectorAttributes">
+
+    <xs:attributeGroup ref="MarqueeSelectorAttributes"/>
+
+    <xs:attribute name="onselectionprogress"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.SelectionEvent Fires continually during the resizing of the wireframe</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onselectionend"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.SelectionEvent This is fired when the user releases the mouse button to signal
+          that the selection is complete.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onselectionstart"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>.Event This is fired before the selection is starts. To prevent the
+          wireframe from being displayed call
+          preventDefault
+          on the event object.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportNavigator">
+    <xs:annotation>
+      <xs:documentation>
+        This class implements the basic viewport navigator.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportNavigatorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportNavigatorAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+    <xs:attribute name="cursorColor"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          String
+          -
+          Sets the color of the cursor.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportNavigatorCursor">
+    <xs:annotation>
+      <xs:documentation>
+        TODO: Document class.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportNavigatorCursorAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportNavigatorCursorAttributes">
+
+    <xs:attributeGroup ref="bi:ComponentAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ViewportRectangle">
+    <xs:annotation>
+      <xs:documentation>
+        Helping class for describing a bounding rectangle in viewports.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ViewportRectangleAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ViewportRectangleAttributes">
+
+    <xs:attributeGroup ref="bi:EventTargetAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomableButton">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomableButtonAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomableButtonAttributes">
+
+    <xs:attributeGroup ref="bi:ButtonAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomableImage">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomableImageAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomableImageAttributes">
+
+    <xs:attributeGroup ref="bi:ImageAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomableLabel">
+    <xs:annotation>
+      <xs:documentation>
+        This class is a zoomable version of a BiLabel.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomableLabelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomableLabelAttributes">
+
+    <xs:attributeGroup ref="bi:LabelAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomableViewport">
+    <xs:annotation>
+      <xs:documentation>
+        Implemented viewport for handling zoomable components.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomableViewportAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomableViewportAttributes">
+
+    <xs:attributeGroup ref="AbstractViewportAttributes"/>
+
+    <xs:attribute name="zoomFactorDependantNodeRep"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          EDIT_THIS
+          -
+          EDIT_THIS
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomableViewportModel">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.ZoomableViewport is an abstract class representing a model containing zoomable objects.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomableViewportModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomableViewportModelAttributes">
+
+    <xs:attributeGroup ref="AbstractViewportModelAttributes"/>
+
+    <xs:attribute name="nearestZoomFactor"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          Number
+          -
+          Set nearest available zoom factor
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="nearestLowerZoomFactor"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          Number
+          -
+          Set nearest lower available zoom factor
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="zoomFactorModel"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>
+          Type:
+          infiview.ZoomFactorModel
+          -
+          Set the zoom factor model.
+        </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onresetzoom"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Dispatched when zoom factor is set to 1.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="onzoomfactorchange"
+                  type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Dispatched when the zoom level changes.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomDependentGroupNode">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.InfiViewNode is the light weight representation of an node residing
+        in a InfiView using infiview.InfiViewViewport.
+
+        This class can be inherit for adding och changing features of adding and dipsosing visual nodes in a InfiView.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomDependentGroupNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomDependentGroupNodeAttributes">
+
+    <xs:attributeGroup ref="InfiViewNodeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomFactorModel">
+    <xs:annotation>
+      <xs:documentation>
+        EDIT_THIS
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomFactorModelAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomFactorModelAttributes">
+
+    <xs:attributeGroup ref="bi:ObjectAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomGroupNode">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.InfiViewNode is the light weight representation of an node residing
+        in a InfiView using infiview.InfiViewViewport.
+
+        This class can be inherit for adding och changing features of adding and dipsosing visual nodes in a InfiView.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomGroupNodeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomGroupNodeAttributes">
+
+    <xs:attributeGroup ref="AbstractGroupNodeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:element name="ZoomGroupNodeType">
+    <xs:annotation>
+      <xs:documentation>
+        infiview.ZoomGroupNodeType acts as a template for nodes that are zoom factor dependant groups.
+      </xs:documentation>
+    </xs:annotation>
+
+    <xs:complexType>
+      <xs:choice>
+        <xs:group ref="InfiViewComponentsGroup" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:choice>
+      <xs:attributeGroup ref="ZoomGroupNodeTypeAttributes"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:attributeGroup name="ZoomGroupNodeTypeAttributes">
+
+    <xs:attributeGroup ref="AbstractGroupNodeTypeAttributes"/>
+
+
+  </xs:attributeGroup>
+
+  <xs:group name="InfiViewComponentsGroup">
+    <xs:choice>
+      <xs:group ref="bi:BindowsComponentsGroup"/>
+
+      <xs:element ref="AbstractNodeRepAdapter" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ComponentNodeRepAdapter" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InteractiveGraphNodeRepAdapter" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InfiViewNodeRepAdapter" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GoogleMapsNodeRepAdapter" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AbstractSelection" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Selection" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Selection2" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="VGSelection" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AbstractUndoRedoCommand" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="UndoRedoAddOrRemoveEdgeCommand" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="UndoRedoNodeCommand" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="UndoRedoAddOrRemoveNodeCommand" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="UndoRedoChangeBoundsCommand" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AbstractViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomableViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ComponentViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GraphViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InteractiveGraphViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InfiViewViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GoogleMapsViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InfiViewBackEndViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="MapViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AbstractViewportModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomableViewportModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ComponentViewportModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GraphViewportModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InteractiveGraphViewportModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InfiViewViewportModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InfiViewBackEndViewportModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="MapViewportModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Actions" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AnchorPoints" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="BalloonTreeLayout" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="BiconnectedComponentLayout.BiconnectedComponent" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="BiconnectedComponentLayout.BlockCutpointVertex" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="BiconnectedComponentLayout.Cutpoint" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="BiconnectedComponentLayout" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ComponentConstructor" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ViewportComponentConstructor" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ContextMenu" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ContextMenus" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="CornerStitchArea" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="DrawAnchor" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Edge" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="EdgeContainer" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="EdgeManager" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="EventListener" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="EventListeners" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Grid" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ImageBasedNodeImage" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InfiViewType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="EdgeType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GradientEdgeType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="NodeType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AbstractGroupNodeType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GroupNodeType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomGroupNodeType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GoogleMapsNodeType" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="LayerPane" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="LineRouterManager" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="MapZoomLevelDefinition" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="MarqueeSelector" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ViewportMarqueeSelector" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="MinPriorityQueue" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="MoveEvent" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="NodeAnimation" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="NodeTypeViewport" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Perspective" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Perspectives" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="PerspectiveTitle" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="PreviewImage" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="PriorityQueue" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="PriorityQueueNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="PropertyForm" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="PropertyForms" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ResizeEvent" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Resources" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="RTree" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="SelectionEvent" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="State" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="States" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ToolGroup" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="Tools" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="TreeLayout" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="TypeTable" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="EdgeTypes" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="NodeTypes" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="UndoRedo" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="VGGrid" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="VGGroup" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="VGImage" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ExpandCollapseImage" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="VGSymbol" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="DefaultSymbol" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="DiamondSymbol" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="DocSymbol" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="EllipseSymbol" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="RectSymbol" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="RoundrectSymbol" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ImageBasedNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="RoundRectImageSymbol" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ViewportNavigator" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="DynamicPreviewViewportNavigator" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="DynamicViewportNavigator" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ViewportNavigatorCursor" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ViewportRectangle" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AbstractDataContainer" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ComponentDataContainer" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GraphDataContainer" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InteractiveGraphDataContainer" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InfiViewComponentDataContainer" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AbstractNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ComponentNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GraphNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InteractiveGraphNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="InfiViewNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="AbstractGroupNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GroupNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomGroupNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="GoogleMapsNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomDependentGroupNode" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="WedgeTreeLayout" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomableButton" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomableImage" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomableLabel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ZoomFactorModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="DoubleZoomFactorModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="ListZoomFactorModel" minOccurs="0"
+                  maxOccurs="unbounded"/>
+
+      <xs:element ref="DefaultSelectionDefinition" minOccurs="0" maxOccurs="unbounded"/>
+
+      <xs:element ref="Layout" minOccurs="0" maxOccurs="unbounded"/>
+
+    </xs:choice>
+  </xs:group>
+
+</xs:schema>
+
+
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation2.xml b/xml/tests/testData/xml/ComplexSchemaValidation2.xml
new file mode 100644
index 000000000000..fb6989f3b0cb
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation2.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="windows-1252"?>
+
+<jdo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="jdo_2_0.xsd">
+    <package name="foo">
+        <class name="foo">
+            <datastore-identity>
+                <column/>
+            </datastore-identity>
+            <inheritance strategy="foo">
+                <discriminator>
+                    <column/>
+                </discriminator>
+                <join>
+                    <column/>
+                </join>
+            </inheritance>
+            <version>
+                <column/>
+            </version>
+            <field name="foo">
+                <collection>
+                    <extension vendor-name="foo"/>
+                </collection>
+                <<error>map</error>>
+                    <extension vendor-name="foo"/>
+                </<error>map</error>>
+                <array/>
+                <column/>
+                <join>
+                    <column/>
+                </join>
+                <element>
+                    <column/>
+                </element>
+                <key>
+                    <column/>
+                </key>
+                <value>
+                    <column/>
+                </value>
+                <order>
+                    <column/>
+                </order>
+                <index/>
+                <foreign-key>
+                    <extension vendor-name="foo"/>
+                </foreign-key>
+                <extension vendor-name="foo"/>
+            </field>
+            <fetch-group name="foo"/>
+            <<error>query</error>/>
+            <extension vendor-name="foo"/>
+        </class>
+        <extension vendor-name="foo"/>
+    </package>
+</jdo>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation20.xml b/xml/tests/testData/xml/ComplexSchemaValidation20.xml
new file mode 100644
index 000000000000..7a433b9abc9f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation20.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<simple xmlns="http://test/xsd/test1/test1"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns:test2="http://test/xsd/test1/test2"
+        xsi:schemaLocation="http://test/xsd/test1/test1 ComplexSchemaValidation20.xsd
+                            http://test/xsd/test1/test2 ComplexSchemaValidation20_2.xsd">
+    <simple/>
+    <test2:alpha/>
+</simple>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation20.xsd b/xml/tests/testData/xml/ComplexSchemaValidation20.xsd
new file mode 100644
index 000000000000..6e1eff81536f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation20.xsd
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://test/xsd/test1/test1"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:test2="http://test/xsd/test1/test2"
+            targetNamespace="http://test/xsd/test1/test1"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:import namespace="http://test/xsd/test1/test2" schemaLocation="ComplexSchemaValidation20_2.xsd"/>
+
+    <xsd:element name="simple">
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="simpleType"/>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:complexType name="simpleType">
+        <xsd:complexContent>
+            <xsd:extension base="empty">
+                <xsd:sequence maxOccurs="unbounded">
+                    <xsd:choice>
+                        <!--<xsd:any namespace="##targetNamespace"/>-->
+                        <!--<xsd:group ref="localTypes"/>-->
+                        <xsd:group ref="test2:alphaGroup"/>
+                    </xsd:choice>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="empty" abstract="true"/>
+
+    <xsd:group name="localTypes">
+        <xsd:choice>
+            <xsd:element ref="simple"/>
+        </xsd:choice>
+    </xsd:group>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation20_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation20_2.xsd
new file mode 100644
index 000000000000..629fe4fcb704
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation20_2.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://test/xsd/test1/test2"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://test/xsd/test1/test2"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:group name="alphaGroup">
+        <xsd:sequence>
+            <xsd:choice>
+                <xsd:element ref="alpha"/>
+                <xsd:any namespace="##other" processContents="strict" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:element name="alpha"/>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3.xml b/xml/tests/testData/xml/ComplexSchemaValidation3.xml
new file mode 100644
index 000000000000..e652a7230220
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module xmlns="http://schemas.niku.com/2002/web"
+        xmlns:sec="http://schemas.niku.com/2002/security"
+        xmlns:srv="http://schemas.niku.com/2002/service"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://schemas.niku.com/2002/web web-2002-02.xsd
+          http://www.w3.org/2001/XInclude xinclude.xsd
+          http://schemas.niku.com/2002/security security-2002-02.xsd
+          http://schemas.niku.com/2002/service service-2002-02.xsd
+          ">
+  <page id="calendar.actionitemProperties" space="calendar.organizerHome" template="union.appPage">
+    <xi:include href="<error>portlets</error>/<error>actionitemTOC.xml</error>"/>
+    <portlet id="calendar.actionitemProperties" view="actionitem/actionitemProperties.xsl"/>
+    <pageAction id="calendar.actionitemProperties" policyId="">
+      <retrieveService type="xbl" componentId="calendar" description="actionitem/actionitemProperties.xbl" portletId="calendar.actionitemProperties"/>
+    </pageAction>
+    <processAction id="calendar.actionitemPropertyUpdate" policyId="" redirect="true" nextAction="calendar.actionitemList" errorAction="calendar.actionitemProperties">
+      <processService type="odfUpdate" componentId="calendar" description="actionitem" dynamicValidation="odf.actionitem.update"/>
+      <paramSet>
+        <param name="odf_pk" source="request" value="odf_pk"/>
+        <param name="odf_view" source="request" value="odf_view"/>
+      </paramSet>
+    </processAction>
+  </page>
+</module>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/WMD-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/WMD-2002-02.xsd
new file mode 100644
index 000000000000..c49df109372b
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/WMD-2002-02.xsd
@@ -0,0 +1,1384 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/web"
+    xmlns:srv="http://schemas.niku.com/2002/service"
+    xmlns:sec="http://schemas.niku.com/2002/security"
+    xmlns="http://schemas.niku.com/2002/web"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    <!-- Import security policy schema -->
+    <xsd:import namespace="http://schemas.niku.com/2002/security"
+        schemaLocation="security-2002-02.xsd" />
+    <!-- Import service schema -->
+    <xsd:import namespace="http://schemas.niku.com/2002/service"
+        schemaLocation="service-2002-02.xsd" />
+    <xsd:simpleType name="PageTypes">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="template" />
+            <xsd:enumeration value="page" />
+            <xsd:enumeration value="layer" />
+            <xsd:enumeration value="container" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="SkinTypes">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="evolution1">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">
+                        Niku 6.1.x UI look and feel with 2001 view XML.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:enumeration>
+            <xsd:enumeration value="evolution2">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">
+                        Niku 6.1.x UI look and feel with 2002 view XML.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:enumeration>
+            <xsd:enumeration value="evolution3">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">
+                        Clarity 8.0 UI look and feel with 2002 view XML.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:enumeration>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="PortletTypes">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="header" />
+            <xsd:enumeration value="footer" />
+            <xsd:enumeration value="toc" />
+            <xsd:enumeration value="tabs" />
+            <xsd:enumeration value="body" />
+            <xsd:enumeration value="pageContext" />
+            <xsd:enumeration value="pageToolbar" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="ViewTypes">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="vxsl" />
+            <xsd:enumeration value="vxml" />
+            <xsd:enumeration value="html" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="ColTypes">
+        <xsd:restriction base="xsd:integer">
+            <xsd:enumeration value="0" />
+            <xsd:enumeration value="1" />
+            <xsd:enumeration value="2" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="StateTypes">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="normal" />
+            <xsd:enumeration value="minimized" />
+            <xsd:enumeration value="maximized" />
+            <xsd:enumeration value="hidden" />
+            <xsd:enumeration value="inactive" />
+            <xsd:enumeration value="fullscreen" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="ScopeTypes">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="request" />
+            <xsd:enumeration value="session" />
+            <xsd:enumeration value="application" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="ModeTypes">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="edit" />
+            <xsd:enumeration value="admin" />
+            <xsd:enumeration value="max" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:simpleType name="ImportTypes">
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="js" />
+            <xsd:enumeration value="css" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:element name="module">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Web module is a collection of Web page elements that
+                define the component's Web site. Each application
+                component defines a set of web pages for the application
+                module in a separate WMD XML file located under the
+                src/META-INF/component/wmd directory. All web pages
+                should be grouped into separate WMD XML files or web
+                modules based on features. WMD XML files use embedded
+                XML elements from Security XML schema
+                (security-2002-02.xsd) for specifying security
+                restrictions, and XInclude element for XML InfoSet
+                reuse. In order to use elements from external XML
+                schemas, the appropriate XML namespaces (xmlns:sec and
+                xmlns:xi) should be specified for the root element of
+                the instance document to ensure that the structure of
+                WMD XML document can be properly validated. The WMD XML
+                schema location should also be specified in the instance
+                document. WMD XML instance documents located in union
+                should use the following WMD XML schema location
+                declaration:
+                xsi:schemaLocation="http://schemas.niku.com/2002/web
+                ../xsd/web-2002-02.xsd". All other components should use
+                the following WMD XML schema location declaration:
+                xsi:schemaLocation="http://schemas.niku.com/2002/web
+                ../../union/xsd/web-2002-02.xsd".
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:sequence id="ModuleSequence">
+                <xsd:element name="moduleRef" type="ModuleRefType"
+                    minOccurs="0" maxOccurs="unbounded" />
+                <xsd:element name="page" type="PageType"
+                    maxOccurs="unbounded" />
+                <xsd:element name="processAction"
+                    type="ProcessActionType" minOccurs="0"
+                    maxOccurs="unbounded" />
+                <xsd:element name="portlet" type="PortletType"
+                    minOccurs="0" maxOccurs="unbounded" />
+            </xsd:sequence>
+            <xsd:attribute name="schemaLocation" type="xsd:string"
+                use="optional" />
+            <xsd:attribute name="id" type="xsd:string" use="optional">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">
+                        Defines web module id to reference web modules
+                        from other modules via moduleRef element. Module
+                        id attribute value should be unique for the
+                        whole web application. This attribute must use
+                        component’s name prefix to avoid name
+                        collisions. Module id is used by the moduleRef
+                        element to importing all web modules for the
+                        component into one WMD XML file and registering
+                        it for the component in properties.xml
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+            <xsd:attribute name="feature" type="xsd:string"
+                use="optional">
+                <xsd:annotation>
+                    <xsd:documentation xml:lang="en">
+                        Defines a web module feature id to classify web
+                        modules and contained pages into application
+                        features. If page space attribute is not
+                        defined, module feature id will be used insted
+                        to relate a page to the corrsponding application
+                        feature. This attribute must use component’s
+                        name prefix to avoid name collisions, and
+                        normally defines a link to the entry page for
+                        the whole feature.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:attribute>
+        </xsd:complexType>
+    </xsd:element>
+    <xsd:complexType name="ModuleRefType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Complex type for referencing and including other web
+                modules via module id. This element is a part of the
+                future enhancements for WMD XML. Its purpose is to
+                replace component descriptor file and to allow
+                registering of a single WMD XML file for the component
+                in properties.xml. The registred WMD XML file will use
+                moduleRef to import all other WMD XML files for the
+                component. Similar solution could be achieved with
+                XInclude.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Unique module id for the whole Web application.
+                    Component namespace should be used for this
+                    identifier to avoid name collissions.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:complexType name="PageType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Page element contains all the information about a web
+                page required to retrieve or produce page content and
+                display the page. This includes page and process web
+                actions for the page, optional list of imported web
+                resources (e.g. CSS and JavaScript), portlets, security
+                restrictions, and services associated with the portlets
+                or the whole page, in case of process action and POST
+                requests.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence id="PageSequence">
+            <xsd:element name="import" type="ImportType" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element ref="sec:policy" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element ref="sec:condition" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element ref="sec:acl" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element name="portletRef" type="PortletRefType"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="portlet" type="PortletType" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element name="pageAction" type="PageActionType"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="processActionRef"
+                type="ProcessActionRefType" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element name="processAction" type="ProcessActionType"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="paramSet" type="ParamSetType"
+                minOccurs="0" />
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Page id attribute value should be unique for a
+                    component. This attribute must use component’s name
+                    prefix followed by a dot and the actual unique
+                    component page id to avoid name collisions. For
+                    example, union.testPage contains component’s name
+                    followed by unique page id for the component. Page
+                    id is used for caching web page metadata, and
+                    linking a web page to the corresponding
+                    context-sensitive help topic.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="title" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional page title dynamically set for customized
+                    pages. This attribute should not be defined in
+                    static WMD XML files because this metadata is not
+                    localized! Runtime only page property.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="componentId" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Component id is an optional attribute that specifies
+                    id of the component to which a web page belongs. If
+                    not specified, the system will populate this value
+                    during initialization based on information specified
+                    in config/properties.xml file and the corresponding
+                    component descriptor XML file. Valid component id is
+                    a value of id attribute from one of the component
+                    elements specified in config/properties.xml.
+                    Component id is used to construct the file paths and
+                    navigate component directory structure for locating
+                    web resources (all component-specific XML files used
+                    by WMD).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="help" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Help is an optional attribute to specify an
+                    alternative context-sensitive help topic for the web
+                    page. By default page id is used to locate the
+                    corresponding context-sensitive help topic. In cases
+                    when multiple Web pages use the same help topic,
+                    help attribute with the name of the help topic
+                    should be used instead. This attribute should also
+                    use component prefix to avoid name collisions.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="space" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Identifies the space/module to which this web page
+                    belongs. When this attribute is specified and the
+                    header or left navigation used for the page contains
+                    an action element with actionId=space, the
+                    corresponding space will be highlighted when the
+                    page is displayed.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="authenticate" type="xsd:boolean"
+            default="true">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies whether or not user authentication is
+                    required prior to displaying this page. The default
+                    authenticate attribute value is true, meaning that
+                    authentication is required for all web pages by
+                    default. Therefore, there is no need to set
+                    authenticate=”true” explicitly. An attempt to
+                    navigate to such web page without proper login will
+                    always result in a redirect to the login web page.
+                    If the authenticate attribute is explicitly set to
+                    false, certain web pages can be exposed to external
+                    users bypassing the proper login procedure.
+                    Marketplace web pages fall into this category.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="personalize" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Identifies personalizable Web pages. All portlets
+                    for a personalized Web page are processed by the
+                    PortletPersonalizer, and portlets are oredered and
+                    displayed based on the user preferrences.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="portal" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Identifies portal pages.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pageType" default="page"
+            type="PageTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Pages are categorized into different types as
+                    specified by the type attribute. This information is
+                    used by the PortletController. Page templates are
+                    abstract pages that other pages reference via the
+                    template atribute for including standard portlets in
+                    a page, such as header, footer and left navigation.
+                    Page layers represent page tabs. All page layers
+                    must use the same page template, and include a
+                    reusable tabs portlet, but can use different page
+                    layouts.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="instanceType" type="xsd:string"
+            default="SYSTEM">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Pages may be of specific types, these are only set
+                    from the database
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="parent" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional parent page reference attribute to specify
+                    the parent/container page for a page layer (tab).
+                    This attribute is required for all page layers, and
+                    ignored for other page types.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pageBuilder" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies Web page builder class responsible for
+                    content preparation. Page builder produces final
+                    page content by: 1) storing portlet content in the
+                    content map if layout template is defined, and
+                    forwarding the request with the content map to the
+                    corresponding template, or 2) it can directly
+                    produce the final page content via aggregation of
+                    portlet content and other UI properties.There is no
+                    need to specify pageBuilder attribute for the page
+                    element explicitly because only one page builder
+                    (JSPPageBuilder) is available at this time for NDE.
+                    Moreover, not specifying it keeps the migration
+                    options open when client side XML transformations
+                    will be integrated into the application.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="serializer" type="xsd:string"
+            use="optional" default="html">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies the content output serializer for this
+                    request as defined in properties.xml.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="template" type="xsd:string" use="optional"
+            default="union.appPage">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional attribute to specify alternative page
+                    template for the Web page. Page template defines
+                    standard portlet collection to be used for page
+                    rendering. Standard page portlets are: header,
+                    footer and left navigation. The available page
+                    templates are: union.appPage, union.adminPage,
+                    union.popup . Each page template includes different
+                    header and/or left navigation for rendering a page.
+                    The default value references page template common
+                    for all application pages. Administration pages and
+                    popups need to explicitly specify the appropriate
+                    page template reference.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="layout" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional attribute to specify alternative page
+                    layout template for the Web page.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="skin" use="optional" type="SkinTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional attribute to assign an alternative skin or
+                    UI Look and Feel to be used for rendering content of
+                    the whole web page.
+                </xsd:documentation>
+            </xsd:annotation>
+
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:element name="portlet" type="PortletType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Global portlet element for defining reusable portlets in
+                separate WMD XML files and importing them with XInclude.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="PortletType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Defines a single portlet for the web page and represents
+                a visible section of the rendered page. Portlet can
+                contain security restrictions to evaluate for the view,
+                a list of import elements for including web resources,
+                and different attributes for personalization, content
+                aggregation, caching, and security.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence id="PortletSequence">
+            <xsd:element name="import" type="ImportType" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element ref="sec:policy" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element ref="sec:condition" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element ref="sec:acl" minOccurs="0"
+                maxOccurs="unbounded" />
+            <xsd:element name="viewMode" type="ViewModeType"
+                minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="retrieveService"
+                type="RetrieveServiceType" minOccurs="0"
+                maxOccurs="unbounded" />
+        </xsd:sequence>
+        <xsd:attribute name="schemaLocation" type="xsd:string"
+            use="optional" />
+        <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Portlet id is a unique portlet identifier for the
+                    whole web application. As with the page id,
+                    component namespace should be used for this
+                    identifier to avoid name collisions. Portlet id is
+                    used as part of the key to cache portlet content and
+                    associate portlets with retrieve services for each
+                    web page action.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="instanceId" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Portlet instance id used by page personalization
+                    features to display mulitple instances of the same
+                    portlet on a single page.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="instanceType" type="xsd:string"
+            default="SYSTEM">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Portlet instance type used by page personalization
+                    features.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="templateId" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Portlet template id defines portlet instance id of
+                    the system page portlet from which this portlet
+                    instance was created.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="componentId" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Component id is required for reusable portlets and
+                    specifies the component name in which the portlet is
+                    defined. It is used to construct the location path
+                    for view XSL file and rendering portlet content.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="title" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional portlet title dynamically set for portlets
+                    included by a user for personalized pages. This
+                    attribute should not be defined in static WMD XML
+                    files because this metadata is not localized!
+                    Runtime only portlet property.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="collection" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional portlet collection name to specify for
+                    custom page templates and JSP tags to layout and
+                    agregate portlet content. For most pages and
+                    existing page templates porltetType, col, and row
+                    attributes should be used to classify portlets and
+                    define their position on the page. Portlet
+                    collections are only for the remaining 1% of the
+                    pages that require custom layout. All custom page
+                    templates should still be defined in
+                    webroot/WEB-INF/union/templates directory in union
+                    for easy maintenance.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="portletType" default="body"
+            type="PortletTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Portlets are categorized into different types as
+                    specified by the type attribute. This information is
+                    used by the page layout manager during content
+                    aggregation and allows changing web page layout for
+                    the whole application by modifying only page layout
+                    template code (JSP or XSLT). Additional standard
+                    portlet types could be identified in the future and
+                    added to this list.
+                </xsd:documentation>
+            </xsd:annotation>
+
+        </xsd:attribute>
+        <xsd:attribute name="viewType" default="vxsl"
+            type="ViewTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    The portlet may process data using a VXSL, or the
+                    data may be a VXML, or even straight HTML
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="view" type="xsd:string" use="optional"
+            default="">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Relative location of the view XML or XSLT template
+                    used to generate view XML from data XML received as
+                    a result of the service call for the portlet. View
+                    XML and XSL files are located under
+                    /src/META-INF/component/vxsl directory. Each portlet
+                    must use a separate view XSL template. Static
+                    portlets that don’t display dynamic data can
+                    reference view XML file directly via the view
+                    attribute. This allows bypassing the data XML
+                    transformation with view XSL when the content of a
+                    portlet contains only presentation elements.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="ui" type="xsd:string" default="view">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional name of the UI XSLT template to specify
+                    alternative UI XSLT used for transforming view XML
+                    content of the portlet into web agent specific
+                    markup format, such as XHTML or SVG. This attribute
+                    should be specified only in rare occasions when
+                    custom UI XSLT templates are used. The default and
+                    most common top-level UI XSLT template used for most
+                    of the portlets in NDE is called “view”. It includes
+                    other UI XSLT templates for rendering such common UI
+                    widgets as buttons, links, toolbars, tabs, list
+                    tables, attribute tables, and trees. View is the
+                    default UI XSL template and it does not need to be
+                    specified explicitly.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="col" default="1" type="ColTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    The row and col attributes can be used to specify a
+                    position of the body type portlet content for a
+                    rendered web page. All layout managers use grid
+                    layout with rows and columns to position the content
+                    of body type portlets during content aggregation.
+                    The default values for row and col portlet
+                    attributes are 0 (first row) and 1(second column –
+                    center column). All portlets should be listed as
+                    children of a page in an increasing order of their
+                    assigned row and column. Portlets are layed out on
+                    the page in at most 3 columns, where each column
+                    represents a separate stack or a bucket. If no row
+                    is assigned, portlets are laid out in the order they
+                    are listed in web metadata and according to their
+                    column assignments. Column indexes start with 0,
+                    with 1 being the default wide center column. Web
+                    page layout template is responsible for spanning the
+                    content of portlets if the number of portlet columns
+                    is less than 3.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="row" type="xsd:integer" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    The row and col attributes can be used to specify a
+                    position of the body type portlet content for a
+                    rendered web page. All layout managers use grid
+                    layout with rows and columns to position the content
+                    of body type portlets during content aggregation.
+                    The default values for row and col portlet
+                    attributes are 0 (first row) and 1(second column –
+                    center column). All portlets should be listed as
+                    children of a page in an increasing order of their
+                    assigned row and column. Portlets are layed out on
+                    the page in at most 3 columns, where each column
+                    represents a separate stack or a bucket. If no row
+                    is assigned, portlets are laid out in the order they
+                    are listed in web metadata and according to their
+                    column assignments. Column indexes start with 0,
+                    with 1 being the default wide center column. Web
+                    page layout template is responsible for spanning the
+                    content of portlets if the number of portlet columns
+                    is less than 3.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="narrow" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Denotes wheter or not this portlet can be placed in
+                    the narrow (left or right) column of the Web page
+                    grid layout.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="span" type="xsd:boolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Denotes whether or not the content of the first
+                    portlet for the web page should span across the
+                    whole page horizontally, ignoring multiple column
+                    grid layout for the page.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="required" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Denotes a required portlet for a Web page. The
+                    content of required portlet is always displayed
+                    independent of user preferences for a personalized
+                    page. This can be used for building personalized
+                    pages for companies that require their employees to
+                    read company news feeds.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="default" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Denotes a default portlet for a Web page. The
+                    content of default portlet is displayed initially
+                    for a personalized web page, prior or until a user
+                    modifies personal settings. As such, this portlet
+                    will be displayed when a user first hits the
+                    personal page, but the portlet is not required and
+                    can be removed by changing personal settings for the
+                    page.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pageEvents" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Denotes a portlet that contains page level events
+                    defined in view XML. Such portlet view XML is
+                    queried with XPath to retrieve and transform
+                    declared page events. Page events, such as onLoad,
+                    are then passed to page template to be included in
+                    page body tag.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pageToolbar" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Denotes a portlet that contains page level toolbar
+                    defined in view XML. Such portlet view XML is
+                    queried with XPath to retrieve and transform
+                    declared page toolbar links. Rendered page toolbar
+                    that normally contains Personalize or Customize
+                    links will be included in the page title section of
+                    the rendered page.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="state" default="normal"
+            type="StateTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Defines portlet state for the portlet window.
+                </xsd:documentation>
+            </xsd:annotation>
+
+        </xsd:attribute>
+        <xsd:attribute name="cacheable" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Determines whether or not the portlet content can be
+                    cached.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="scope" default="request"
+            type="ScopeTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Determines the scope for the portlet content caching
+                    mechanism. The available scopes are: application
+                    scope - portlet content with application scope is
+                    cached based on the user locale. The content is
+                    generated only once and doesn’t expire. Application
+                    level cache is cleared only upon application restart
+                    or refresh of the application settings. Session
+                    session – portlet content with the session scope is
+                    cached based on the user session id and locale. Any
+                    portlet content that requires user right checking in
+                    addition to locale sensitivity should use this
+                    setting. Session level cache is cleared whenever
+                    user session expires or when a user logs off.
+                    Request scope – portlet content with the request
+                    scope is cached based on the user locale and
+                    expiration time setting. This content is cached for
+                    a single request based on the action id and is used
+                    for all users with the same locale. Note that
+                    content with session or user specific information
+                    should not use request scope caching.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="expires" type="xsd:long" default="0">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Defines expiration time in seconds for the portlet
+                    content cached in request scope. The default value
+                    (0) identifies time sensitive content that can't be
+                    cached.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="policyId" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies security policy id to check user
+                    entitlement information for viewing the content of
+                    this portlet. This is a reference to one of the
+                    security restriction elements defined for a web
+                    page.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:complexType name="ViewModeType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Defines a portlet view mode. The supported portlet view
+                modes are: edit, max and admin. Other modes can be
+                defined. Portlet definition itself difines the default
+                display mode (normal). View modes define actions to use
+                for portlet management, such as portlet customization
+                and administration. The WMD processor looksup view modes
+                to generate proper links for portlet Edit and Customize
+                links in the portlet title bar.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="modeType" use="required"
+            type="ModeTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies portlet view mode type: edit, admin, max
+                    etc.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="action" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies the link for the portlet view mode type
+                    for portlet management and customization.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:complexType name="ActionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Abstract type used for defining WebReadAction and
+                WebWriteAction.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="paramSet" type="ParamSetType"
+                minOccurs="0" />
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Unique action identifier that maps HTTP GET and POST
+                    actions via the predefined "action" parameter to
+                    this web action. It is used to locate and invoke a
+                    processAction or a pageAction, and render the web
+                    page and its content. The value for this attribute
+                    should use component namespace to avoid name
+                    collisions.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="authenticate" type="xsd:boolean"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies whether or not user authentication is
+                    required prior to invoking this action
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="alias" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Unique action identifier alias that maps HTTP GET
+                    and POST actions via the predefined "action"
+                    parameter to this web action. It is used to locate
+                    and invoke a processAction or a pageAction, and
+                    render the web page and its content. The value for
+                    this attribute should use component namespace to
+                    avoid name collisions.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="componentId" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies id of the component for this action. If
+                    not specified, the system will populate this value
+                    during initialization based on information specified
+                    in properties.xml file and the corresponding
+                    component descriptor XML file. Valid component id is
+                    a value of id attribute from one of the component
+                    elements specified in properties.xml. Component id
+                    is used to construct the file paths and navigate
+                    component directory structure for locating web
+                    resources (all component-specific XML files used by
+                    WMD).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="active" type="xsd:boolean" use="optional"
+            default="true">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Active flag for marking enabled/disabled actions.
+                    Requesting a page or a process action with an action
+                    id whose active flag is set to false will result in
+                    an error page that notifies an end-user that the
+                    action or page has been temporarly disabled. The
+                    error page is Service Unavailable with the http
+                    error code 503.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="policyId" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies security policy id to check user
+                    entitlement information for invoking this web
+                    action. This is a reference to one of the security
+                    restriction elements defined for a web page.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="binding" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Optional location of the binding file for HTTP to
+                    XML marshalling. If not specified, the default
+                    generated binding file with that name that matches
+                    action id is used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="useSsl" type="xsd:boolean"
+            default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Deprecated. Use ssl attribute instead.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="ssl" type="xsd:boolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Denotes wether or not to use SSL for the data
+                    transmission that is the result of this action.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="compress" type="xsd:boolean"
+            default="true">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Denotes wether to use gzip for the data transmission
+                    that is the result of this action.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="pageId" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Option attribute to give reference to the parent of
+                    the action id. This is loaded if it is not filled
+                    in.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="inheritParamSet" type="xsd:boolean"
+            use="optional" default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies whether to inherit the paramset defined
+                    for the containing page.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:complexType name="PageActionType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Page action is used to trigger the display of a web
+                page. Normally, a page action is a result of HTTP GET
+                request that triggers multiple service calls, one per
+                each portlet, to retrieve content for each portlet. Each
+                web page must contain at least one page action that will
+                trigger loading of a web page. To request a page action
+                via HTTP GET request, its id attribute must match the
+                value of reserved HTTP parameter (“action”).
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="ActionType">
+                <xsd:sequence id="ActionSequence">
+                    <xsd:element name="portlet" type="PortletType"
+                        minOccurs="0" maxOccurs="unbounded" />
+                    <xsd:element name="retrieveService"
+                        type="RetrieveServiceType" minOccurs="0"
+                        maxOccurs="unbounded" />
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="RetrieveServiceType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Specifies the service to call that will generate content
+                for a portlet when page action is triggered. Retrieve
+                service is linked to the corresponding portlet via
+                portlet id. Page action might have one or more retrieve
+                services.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="srv:retrieveService">
+                <xsd:attribute name="portletId" type="xsd:string"
+                    use="required">
+                    <xsd:annotation>
+                        <xsd:documentation xml:lang="en">
+                            Unique portlet identifier that links this
+                            service to one of the portlets defined for a
+                            web page.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ProcessActionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Defines a web action that submits page data to the
+                backend and modifies the underlying data store in any
+                way. Processing of a process action doesn't result in a
+                web page display, and is always followed by processing
+                of the next web page action. Process actions should be
+                used for all requests that perform insert, update, or
+                delete operations on the data store or modify the data
+                store in any other way. Process action element contains
+                additional attributes for performing such operations.
+                Next action attribute specifies the action id of the
+                next page action to process, to trigger loading of a
+                confirmation web page upon successful completion of the
+                update operation. Error action attribute specifies the
+                action id of the next page action to process, to trigger
+                loading of the appropriate error page if the operation
+                fails. Most of the time, this will be an action id of
+                the page action used to display a web page from which
+                the information is posted to perform an update. This
+                will trigger redisplay, or refresh of the page with the
+                error message displayed, and erroneous information
+                fields marked on the page.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="ActionType">
+                <xsd:sequence id="ProcessActionSequence">
+                    <xsd:element name="processService"
+                        type="ProcessServiceType" maxOccurs="unbounded" />
+                    <xsd:element name="redirectCondition"
+                        type="RedirectConditionType" minOccurs="0"
+                        maxOccurs="unbounded" />
+                </xsd:sequence>
+                <xsd:attribute name="nextAction" type="xsd:string"
+                    use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation xml:lang="en">
+                            Next page action id to invoke that triggers
+                            rendering of the response web page.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="errorAction" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation xml:lang="en">
+                            Fallbackt error action id used if this
+                            request fails.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="redirect" type="xsd:boolean"
+                    default="false">
+                    <xsd:annotation>
+                        <xsd:documentation xml:lang="en">
+                            Determines whether or not a redirect is
+                            required after this web action has been
+                            processed. In case of redirect=true, the
+                            nextAction attribute value will be appended
+                            to the redirect url to specify what web
+                            action will be invoked next. If additional
+                            parameters are required for the redirect
+                            url, they can be specified via an optional
+                            webRedirect element and a list of webParams.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="dynamicErrorAction"
+                    type="xsd:string" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="ProcessServiceType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Specifies the type and description of a service to call
+                that will process an update operation for a process
+                action and further request redirect or forward. The
+                resulting output is used as an input for the next or
+                error page action in case of request forwarding. When
+                redirect is used, additional redirect URL parameters can
+                be specified via paramSet element. The redirect
+                parameters can query the original HTTP request or the
+                output of the process service with XPath.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="srv:processService" />
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="RedirectConditionType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Defines a redirect condition evaluated by action
+                controller prior to request forwarding or redirect.
+                Redirect conditions are optional and are evaluated only
+                when the process action redirect attribute is set to
+                true. If no redirect conditions are specified, depending
+                on the status of process action executaion, the request
+                will be redirected or forwarded to the next or error
+                action.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence id="RedirectConditionSequence">
+            <xsd:element name="paramSet" type="ParamSetType"
+                minOccurs="0" />
+        </xsd:sequence>
+        <xsd:attribute name="inheritParamSet" type="xsd:boolean"
+            use="optional" default="false">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies whether to inherit the paramset defined
+                    for the process action.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="source" type="sourceTypes" use="optional"
+            default="response">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies the source from which the expression
+                    matching parameter and destination URL is retreived.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="parameter" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies the parameter name to use for expression
+                    matching, if the source is other than the response
+                    data XML document.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="expression" type="xsd:string"
+            use="optional" default=".">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Regular expression or an XPath expression for
+                    redirect condition. The XPath expression is used to
+                    query process action data XML response document, if
+                    the source attribute is set to response. Otherwise,
+                    the reqular expression matching is used on the
+                    specified source parameter value to determine a
+                    match.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="action" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Action id of the next action to execute if redirect
+                    condition is met. This is used as a fallback action
+                    if destination expresssion parsing fails.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="destination" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    XPath expression or parameter name for the redirect
+                    condition to retrieve redirect URL from data XML
+                    response document or other sources. This attribute
+                    overwrites static action specified for redirect.
+                    Mostly used by personalization engine and portal
+                    framework.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="destinationAction" type="xsd:string"
+            use="optional">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    XPath expression or parameter name for the redirect
+                    condition to retrieve redirect action from data XML
+                    response document or other sources. This attribute
+                    overwrites static action specified for redirect.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:simpleType name="sourceTypes">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Specifies the source from which the parameter value is
+                retreived: request - http request, or response - service
+                call response.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="constant" />
+            <xsd:enumeration value="request" />
+            <xsd:enumeration value="response" />
+            <xsd:enumeration value="xml" />
+            <xsd:enumeration value="session" />
+            <xsd:enumeration value="cookie" />
+            <xsd:enumeration value="header" />
+            <xsd:enumeration value="config" />
+        </xsd:restriction>
+    </xsd:simpleType>
+    <xsd:complexType name="ParamSetType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Defines a list parameters to be used for constructing a
+                redirect url query string when performing a redirect for
+                a web action to another web page.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element name="param" type="ParamType"
+                maxOccurs="unbounded" />
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="ParamType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Defines a single parameter for a redirect URL query
+                string. If source=”request”, the HTTP request parameter
+                name specified in the value attribute will be used to
+                retrieve the parameter value. If source=”response”, the
+                XPath expression specified in the value attribute will
+                be used to retrieve the parameter value from data XML
+                response of the process action service call.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="name" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies the parameter name.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="source" type="sourceTypes" use="optional"
+            default="constant">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies the source from which the parameter value
+                    is retreived.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="value" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Specifies how the value of the parameter is
+                    retrieved. If source=request, the name of the http
+                    parameter needs to be specified in the value
+                    attribute. If source=response, the value parameter
+                    will be an XPath expression to query the service
+                    response XML for the parameter value.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:complexType name="ImportType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Defines a web resource to include during content
+                aggregation. Different web pages depending on their
+                content and features require different web resources to
+                be included. Typically, web resources represent external
+                files that are used to render page content and provide
+                additional presentation styles and client-side dynamic
+                behavior for a page. Currently, such web resources
+                include CSS and JavaScript files from UI toolkit. Web
+                page builder or a page layout manager will generate a
+                proper reference to the imported web resource file from
+                UI toolkit based on the resource name as the specified
+                by the href attribute, its type attribute, and the UI
+                skin assigned to a web page.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="href" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    The name of the web resource to import.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="type" use="optional" default="js"
+            type="ImportTypes">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Identifies web resource type: js - JavaScript, css -
+                    CSS file.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <!-- Element Reference Types for reuse -->
+    <xsd:complexType name="PortletRefType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Complex type for referensing reusable portlets that are
+                standalone or defined in other web pages. This element
+                is part of the future enhancements for WMD and is not
+                supported yet. This solution will require less memory at
+                runtime when WMD XML files are loaded and cached for
+                request processing.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Unique portlet id for the whole Web application.
+                    Component namespace should be used for this
+                    identifier to avoid name collissions. Portlet id is
+                    used as part of the key to cache portlet content and
+                    to associate portlets with retreive services for
+                    each web page action.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:complexType name="ProcessActionRefType">
+        <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+                Complex type for referensing reusable process actions
+                that are standalone or defined in other WMD XML files.
+                This element is part of the future enhancements for the
+                WMD and is not supported yet. Its purpose is to replace
+                existing XInclude solution. This solution will require
+                less memory at runtime when WMD XML files are loaded and
+                cached for request processing.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                    Unique process action id for the whole Web
+                    application. Component namespace should be used for
+                    this identifier to avoid name collissions.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/common-2003-09.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/common-2003-09.xsd
new file mode 100644
index 000000000000..bd22ecc545ee
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/common-2003-09.xsd
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--W3C Schema generated by XML Spy v4.0 NT beta 2 build Jul 26 2001 (http://www.xmlspy.com)-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xsd:complexType name="NlsType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A generic type used to hold any name/description pair of localizable text</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="description" type="xsd:string"/>
+    <xsd:attribute name="languageCode" type="xsd:string" use="required"/>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="ImageType">
+    <xsd:annotation>
+      <xsd:documentation>Specifies an image type. An image is similar to an nls except it can have its own tool tip.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="toolTip" type="NlsType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:simpleType name="MacroType">
+    <xsd:annotation>
+      <xsd:documentation>Macros that will be evaluated at runtime for their actual value. At present all these macros may be limited
+    to date datatype. In future we could additional ones if required.
+          </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="date_timestamp"/>
+      <xsd:enumeration value="date_today"/>
+      <xsd:enumeration value="date_yesterday"/>
+      <xsd:enumeration value="date_tomorrow"/>
+      <xsd:enumeration value="date_startofcurrentyear"/>
+      <xsd:enumeration value="date_startofcurrentquarter"/>
+      <xsd:enumeration value="date_startofcurrentmonth"/>
+      <xsd:enumeration value="date_startofcurrentweek"/>
+      <xsd:enumeration value="date_startofpreviousyear"/>
+      <xsd:enumeration value="date_startofpreviousquarter"/>
+      <xsd:enumeration value="date_startofpreviousmonth"/>
+      <xsd:enumeration value="date_startofpreviousweek"/>
+      <xsd:enumeration value="date_startofnextyear"/>
+      <xsd:enumeration value="date_startofnextquarter"/>
+      <xsd:enumeration value="date_startofnextmonth"/>
+      <xsd:enumeration value="date_startofnextweek"/>
+      <xsd:enumeration value="date_endofcurrentyear"/>
+      <xsd:enumeration value="date_endofcurrentquarter"/>
+      <xsd:enumeration value="date_endofcurrentmonth"/>
+      <xsd:enumeration value="date_endofcurrentweek"/>
+      <xsd:enumeration value="date_endofpreviousyear"/>
+      <xsd:enumeration value="date_endofpreviousquarter"/>
+      <xsd:enumeration value="date_endofpreviousmonth"/>
+      <xsd:enumeration value="date_endofpreviousweek"/>
+      <xsd:enumeration value="date_endofnextyear"/>
+      <xsd:enumeration value="date_endofnextquarter"/>
+      <xsd:enumeration value="date_endofnextmonth"/>
+      <xsd:enumeration value="date_endofnextweek"/>
+      <xsd:enumeration value="userId"/>
+      <xsd:enumeration value="language"/>
+      <xsd:enumeration value="locale"/>
+      <xsd:enumeration value="sessionId"/>
+      <xsd:enumeration value="userName"/>
+      <xsd:enumeration value="timestamp"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ExtendedWidgetType">
+    <xsd:annotation>
+      <xsd:documentation>Specifies additional information to aid in rendering a display mapping field in a property and filter view. 
+    Property view will use icon, description, icondescription values to determine rendering of a field
+    as a text, text + icon, or text + icon + description or text + description.
+          Filter view will use colorlookup and mappinglookup values to determine which lookup type to be used
+          for rendering the pull-down.      
+          </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="icon"/>
+      <xsd:enumeration value="description"/>
+      <xsd:enumeration value="icondescription"/>
+      <xsd:enumeration value="mappinglookup"/>
+      <xsd:enumeration value="colorlookup"/>
+      <xsd:enumeration value="dependentLookup"/>
+      <xsd:enumeration value="url"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  
+  <xsd:complexType name="DocumentType">
+    <xsd:complexContent>
+      <xsd:extension base="DocumentBaseType">
+        <xsd:sequence>
+          <xsd:element name="Version" minOccurs="1" maxOccurs="unbounded">
+            <xsd:complexType>
+              <xsd:complexContent>
+                <xsd:extension base="DocumentVersionType">
+                  <xsd:attribute name="isLatest" type="xsd:boolean" use="required"/>
+                </xsd:extension>
+              </xsd:complexContent>
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long" use="required"/>
+        <xsd:attribute name="mimeType" type="xsd:string"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  
+  <xsd:complexType name="DocumentBaseType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Base set of attributes for a document</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="description" type="xsd:string"/>
+    <xsd:attribute name="versioningEnabled" type="xsd:boolean" default="true"/>
+    <xsd:attribute name="numCheckoutDays" type="xsd:int" default="1"/>
+    <xsd:attribute name="hasAllParticipants" type="xsd:boolean" default="true"/>
+    <xsd:attribute name="allowNonParticipants" type="xsd:boolean"/>
+    <xsd:attribute name="language" type="xsd:string"/>
+    <xsd:attribute name="fileCreatedDate" type="xsd:dateTime"/>
+    <xsd:attribute name="status" type="xsd:string"/>
+  </xsd:complexType>
+  
+  <xsd:complexType name="DocumentVersionType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The document version representation</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:long" use="required"/>
+    <xsd:attribute name="versionNumber" type="xsd:nonNegativeInteger" use="required"/>
+    <xsd:attribute name="checkInComment" type="xsd:string"/>
+    <xsd:attribute name="status" type="xsd:string"/>
+  </xsd:complexType>
+  
+  <xsd:simpleType name="DBVendorType">
+    <xsd:annotation>
+      <xsd:documentation>Identifies a particular db vendor.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="all"/>
+      <xsd:enumeration value="oracle"/>
+      <xsd:enumeration value="mssql"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="AttributeType">
+    <xsd:annotation>
+      <xsd:documentation>This represents an attribute. Report, Jobs, Graph, Grids and Business Object - all have attributes. However each of these entities refer to attributes with a different name. Reports and Jobs have "parameters". Graphs, Grids and Browse pages have "filters" and "searchResultColumns". Parameters, Filters, SearchResultColumns - essentially they all share some common information. This commonality is captured by this type.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType" maxOccurs="unbounded"/>
+      <xsd:element name="obsBrowseValue" type="ObsBrowseValueType" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>If a particular attribute is a OBS browse, then this element will capture the default values for this OBS browse.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="timeBrowseValue" type="TimeBrowseValueType" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>If a particular attribute is a time browse, then this element will capture the default values for this time browse.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+    <xsd:attribute name="dataType" type="DataTypeType" use="optional"/>
+    <xsd:attribute name="widgetType" type="WidgetType" use="optional"/>
+    <xsd:attribute name="defaultValue" type="xsd:string" use="optional"/>
+    <xsd:attribute name="status" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="readOnly" type="xsd:boolean" use="optional" default="false"/>
+    <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+    <xsd:attribute name="system" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="lookupCode" type="xsd:string" use="optional"/>
+    <xsd:attribute name="lookupCardinality" type="xsd:int" use="optional"/>
+    <xsd:attribute name="order" type="xsd:int" use="optional"/>
+  </xsd:complexType>
+  <xsd:simpleType name="DataTypeType">
+    <xsd:annotation>
+      <xsd:documentation>Possible data types of an attribute.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="string"/>
+      <xsd:enumeration value="boolean"/>
+      <xsd:enumeration value="numeric"/>
+      <xsd:enumeration value="datetime"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="WidgetType">
+    <xsd:annotation>
+      <xsd:documentation>
+      List of UI widgets used in Niku 6 application.
+      
+      textexact - Used for NSQL parameters when there can only be one value.  So, the attribute cannot be multivalued and cannot have a wildcard.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="hidden"/>
+      <xsd:enumeration value="checkbox"/>
+      <xsd:enumeration value="select"/>
+      <xsd:enumeration value="text"/>
+      <xsd:enumeration value="textarea"/>
+      <xsd:enumeration value="datepicker"/>
+      <xsd:enumeration value="datetime"/>
+      <xsd:enumeration value="browse"/>
+      <xsd:enumeration value="daterange"/>
+      <xsd:enumeration value="numericrange"/>
+      <xsd:enumeration value="textexact"/>
+      <xsd:enumeration value="numeric"/>
+      <xsd:enumeration value="icon"/>
+      <xsd:enumeration value="stoplight"/>
+      <xsd:enumeration value="datetext"/>
+      <xsd:enumeration value="datetimetext"/>
+      <xsd:enumeration value="progressBar"/>
+      <xsd:enumeration value="attachment"/>
+      <xsd:enumeration value="clob"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="ObsBrowseValueType">
+    <xsd:annotation>
+      <xsd:documentation>A complex type to represent the value of a OBS browse attribute.  This specifies the additional information (meta data) required to render and register this special type of attribute.
+addOption = For a Dimension OBS Browse, it could be any of the following:
+ - specific_units, subunits_of_specific_units, all_units_within_level.
+For Filter OBS browses it could be any of the following:
+- selected_unit_only, selected_unit_and_below, selected_unit_and_above.
+typeId = Obs Type Id
+levelId = Id of the selected OBS level
+depth = The depth of the unit or level
+    </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="unitId" type="xsd:long" use="optional"/>
+    <xsd:attribute name="unitName" type="xsd:string" use="optional"/>
+    <xsd:attribute name="addOption" type="ObsAddOptionType" use="required">
+      <xsd:annotation>
+        <xsd:documentation>For a Dimension OBS Browse, this can be any of the following:
+ - specific_units, subunits_of_specific_units, all_units_within_level.
+For Filter OBS browses this can be any of the following:
+- selected_unit_only, selected_unit_and_below, selected_unit_and_above.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="typeId" type="xsd:long" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>OBS Type Id</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="levelId" type="xsd:long" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>Id of the selected OBS level</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="typeName" type="xsd:string" use="optional"/>
+    <xsd:attribute name="depth" type="xsd:int" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="TimeBrowseValueType">
+    <xsd:annotation>
+      <xsd:documentation>A complex type to represent the value of a Time Browse attribute.  This specifies the additional information (meta data) required to render and register this special type of attribute.
+timeLevel = What kind of time level?
+setTimeBy = Indicates the style of the macro - specific date or a rolling window.
+closestFromDate = Date value; use this when the setTimeBy is set to closest_periods_specific_date_range.
+closestToDate = Date value; use this when the the setTimeBy is set to closest_periods_specific_date_range.
+rangeMacro  = Use this when setTimeBye is set to rolling_window.
+timePeriods = Number of time periods.
+offset = Time period offset.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="period" minOccurs="0" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:attribute name="key" type="xsd:string" use="optional"/>
+          <xsd:attribute name="label" type="xsd:string" use="optional"/>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="timeLevel" type="TimeLevelType" use="required">
+      <xsd:annotation>
+        <xsd:documentation>What kind of time level?</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="setTimeBy" type="SetTimeByType" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>Indicates the style of the macro - specific date or a rolling window</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="closestFromDate" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>Date value; use this when the setTimeBy is set to closest_periods_specific_date_range</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="closestToDate" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>Date value; use this when the the setTimeBy is set to closest_periods_specific_date_range</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="rangeMacro" type="TimeRangeType" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>Use this when setTimeBye is set to rolling_window</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="timePeriods" type="xsd:int" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>timePeriods = Number of time periods</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="offset" type="xsd:int" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>Time period offset</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="label" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:simpleType name="ObsAddOptionType">
+    <xsd:annotation>
+      <xsd:documentation>Different options that one can specify the association/filter for a OBS browse attribute.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="selected_unit_only"/>
+      <xsd:enumeration value="selected_unit_and_below"/>
+      <xsd:enumeration value="selected_unit_and_above"/>
+      <xsd:enumeration value="specific_units"/>
+      <xsd:enumeration value="subunits_of_specific_units"/>
+      <xsd:enumeration value="all_units_within_level"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="TimeLevelType">
+    <xsd:annotation>
+      <xsd:documentation>List of time levels.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="TL_YEAR"/>
+      <xsd:enumeration value="TL_QUARTER"/>
+      <xsd:enumeration value="TL_MONTH"/>
+      <xsd:enumeration value="TL_PERIOD"/>
+      <xsd:enumeration value="TL_WEEK"/>
+      <xsd:enumeration value="TL_DAY"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="SetTimeByType">
+    <xsd:annotation>
+      <xsd:documentation>Possible options for indicating the time period.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="closest_periods_to_daterange"/>
+      <xsd:enumeration value="rolling_window"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="DataProviderType">
+    <xsd:annotation>
+      <xsd:documentation>Possible data providers that could be used to get the Object metadata for list/filter/property views.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="nsql"/>
+      <xsd:enumeration value="object"/>
+      <xsd:enumeration value="system"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="TimeRangeType">
+    <xsd:annotation>
+      <xsd:documentation>List of time macros.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="TODAY"/>
+      <xsd:enumeration value="CURRENT_YEAR"/>
+      <xsd:enumeration value="CURRENT_QUARTER"/>
+      <xsd:enumeration value="CURRENT_MONTH"/>
+      <xsd:enumeration value="CURRENT_WEEK"/>
+      <xsd:enumeration value="CURRENT_PERIOD"/>
+      <xsd:enumeration value="NEXT_YEAR"/>
+      <xsd:enumeration value="NEXT_QUARTER"/>
+      <xsd:enumeration value="NEXT_MONTH"/>
+      <xsd:enumeration value="NEXT_WEEK"/>
+      <xsd:enumeration value="NEXT_PERIOD"/>
+      <xsd:enumeration value="PREVIOUS_YEAR"/>
+      <xsd:enumeration value="PREVIOUS_QUARTER"/>
+      <xsd:enumeration value="PREVIOUS_MONTH"/>
+      <xsd:enumeration value="PREVIOUS_WEEK"/>
+      <xsd:enumeration value="PREVIOUS_PERIOD"/>
+      <xsd:enumeration value="YEAR_TO_DATE"/>
+      <xsd:enumeration value="QUARTER_TO_DATE"/>
+      <xsd:enumeration value="MOMTH_TO_DATE"/>
+      <xsd:enumeration value="WEEK_TO_DATE"/>
+      <xsd:enumeration value="PERIOD_TO_DATE"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="LinkParamType">
+    <xsd:sequence>
+      <xsd:element name="nls"       type="NlsType"  minOccurs="0"  maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="paramCode" type="xsd:string" use="required"/>
+    <xsd:attribute name="dataRef" type="xsd:string" use="required"/>
+    <xsd:attribute name="dataSource" type="LinkDataSourceType" use="required"/>
+  </xsd:complexType>
+  <xsd:simpleType name="LinkDataSourceType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Used to specify what source to use for resolving the dataRef attribute.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="data">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">dataRef specifes an attribute (in case of an ODF object) or a column (in case of NSQL) to use to resolve that value to pass</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="input">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">dataRef specifes an XPath in the input document to use for the value</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="static">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">dataRef is the actual value</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="ExpressionType">
+    <xsd:annotation>
+      <xsd:documentation>
+        The expression for the filter or portfolio include if there is one.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="value" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+          The expression value
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="uiValue" type="xsd:string" use="optional"/>
+    <xsd:attribute name="whereClause" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/componentDescriptor-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/componentDescriptor-2002-02.xsd
new file mode 100644
index 000000000000..89f95326acb6
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/componentDescriptor-2002-02.xsd
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:srv="http://schemas.niku.com/2002/service" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xsd:import namespace="http://schemas.niku.com/2002/service" schemaLocation="service-2002-02.xsd"/>
+  <xsd:include schemaLocation="common-2003-09.xsd"/>
+  <xsd:complexType name="metaDataType">
+    <xsd:attribute name="fileName" type="xsd:string" use="required"/>
+    <xsd:attribute name="version" type="xsd:string" use="optional" default="old"/>
+  </xsd:complexType>
+  <xsd:element name="componentDescriptor">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="web" type="webType" minOccurs="0"/>
+        <xsd:element name="persistence" type="persistenceType" minOccurs="0"/>
+        <xsd:element name="objects" type="objectsType" minOccurs="0"/>
+        <xsd:element name="serverListener" type="serverListenerType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="sessionInitializer" type="sessionInitializerType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="sessionDestroyer" type="sessionDestroyerType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="resourceBundle" type="resourceBundleType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="dataProviders" type="dataProvidersType" minOccurs="0"/>
+        <xsd:element name="customViews" type="customViewsType" minOccurs="0"/>
+        <xsd:element name="events" type="eventsType" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">All the eventListeners file for the component</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:complexType name="persistenceType">
+    <xsd:sequence>
+      <xsd:element name="metaData" type="metaDataType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="webType">
+    <xsd:sequence>
+      <xsd:element name="metaData" type="metaDataType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="serverListenerType">
+    <xsd:attribute name="id" type="xsd:string" use="required"/>
+    <xsd:attribute name="classname" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="sessionInitializerType">
+    <xsd:attribute name="id" type="xsd:string" use="required"/>
+    <xsd:attribute name="classname" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="sessionDestroyerType">
+    <xsd:attribute name="id" type="xsd:string" use="required"/>
+    <xsd:attribute name="classname" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="propertyType">
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="value" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="resourceBundleType">
+    <xsd:attribute name="id" type="xsd:string" use="required"/>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="objectsType">
+    <xsd:sequence>
+      <xsd:element name="object" type="objectType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="objectType">
+    <xsd:attribute name="code" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:maxLength value="20"/>
+          <xsd:pattern value="[a-z,A-Z,0-9,_]+"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="fileName" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="dataProvidersType">
+    <xsd:sequence>
+      <xsd:element name="dataProvider" minOccurs="0" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:complexContent>
+            <xsd:extension base="srv:retrieveService">
+              <xsd:attribute name="id" type="xsd:string" use="required">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">A unique identifier for the data provider.  This must be unique across all Niku components and must be preserved or migrated from Niku release to release as customers may create Studio portlets based on this id.</xsd:documentation>
+                </xsd:annotation>
+              </xsd:attribute>
+              <xsd:attribute name="isNewPortletProvider" type="xsd:boolean" default="true">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">When false, the data provider will not show up on the data provider browse popup window for creation of new portlets</xsd:documentation>
+                </xsd:annotation>
+              </xsd:attribute>
+            </xsd:extension>
+          </xsd:complexContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="viewType">
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+    <xsd:attribute name="location" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="baseViewType">
+    <xsd:sequence>
+      <xsd:element name="view" type="viewType" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="objectCode" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="updateViewType">
+    <xsd:sequence>
+      <xsd:element name="view" type="viewType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="nls" type="NlsType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="allowSubPages" type="xsd:boolean" default="true" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="propertyViewSetType">
+    <xsd:sequence>
+      <xsd:element name="create" type="viewType" minOccurs="0"/>
+      <xsd:element name="update" type="updateViewType" minOccurs="0"/>
+      <xsd:element name="nls" type="NlsType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="objectCode" type="xsd:string" use="required"/>
+    <xsd:attribute name="partitionCode" type="xsd:string" use="optional" default="NIKU.ROOT">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The partitionCode of the view set.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="customViewsType">
+    <xsd:sequence>
+      <xsd:element name="listView" type="baseViewType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="propertyView" type="baseViewType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="propertySet" type="propertyViewSetType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="eventsType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The type definition for a list of events the component "owns"</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="event" type="eventType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="eventType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The type definition of a event</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="listener" type="srv:processService" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">A listener that is registered to receive the event when it occurs.  Listeners listed here will be invoked in document order.  Only xbl types are supported currently.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The unique identifier of the event.  Must be unique across all events in the application.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/contentPack-2005-01.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/contentPack-2005-01.xsd
new file mode 100644
index 000000000000..2db1e15c98bd
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/contentPack-2005-01.xsd
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+  targetNamespace="http://schemas.niku.com/2005/contentPack"
+  xmlns="http://schemas.niku.com/2005/contentPack"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified">
+
+  <xsd:include schemaLocation="common-2003-09.xsd"/>
+
+  <xsd:element name="contentPack">
+    <xsd:annotation>
+      <xsd:documentation>
+       The definition of a registered content pack.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:choice maxOccurs="unbounded">
+        <xsd:element ref="nls"/>
+        <xsd:element ref="database"/>
+        <xsd:element ref="xogFile"/>
+        <xsd:element ref="demo"/>
+      </xsd:choice>
+      <xsd:attribute name="id" type="xsd:string" use="required">
+        <xsd:annotation>
+          <xsd:documentation>
+            The id for this content pack. 
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
+      <xsd:attribute name="hasReports" type="xsd:boolean" use="optional">
+        <xsd:annotation>
+          <xsd:documentation>
+            Set if this content pack includes Actuate Reports. 
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
+      <xsd:attribute name="hasObjects" type="xsd:boolean" use="optional">
+        <xsd:annotation>
+          <xsd:documentation>
+            Set if this content pack includes Studio Objects, either new or custom attributes. 
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
+      <xsd:attribute name="revision" type="xsd:integer" default="100">
+        <xsd:annotation>
+          <xsd:documentation>
+            The current revision of this content pack.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="nls" type="NlsType"/>
+  <xsd:element name="database" type="PackDatabaseType"/>
+  <xsd:element name="xogFile" type="PackXogType"/>
+  <xsd:element name="demo" type="PackDemoType"/>
+
+  <xsd:complexType name="PackDatabaseType">
+    <xsd:annotation>
+      <xsd:documentation>
+      A registered content pack. Listed by id.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="schemaDir" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+          The folder used for the database schema files, this will usually be the same as the
+          pack id. 
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="driver" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+          The name of the driver file, this is usually driver.xml.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute> 
+  </xsd:complexType>
+
+  <xsd:complexType name="PackXogType">
+    <xsd:annotation>
+      <xsd:documentation>
+      A registered content pack. Listed by id.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="preGenerated" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The XOG driver file for XOG data that must be imported prior to the generated sequence. 
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="driver" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The XOG driver file for generated XOG dependencies, always xogDriver.xml if it exists.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="postGenerated" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The XOG driver file for XOG data that must be imported after the generated sequence. 
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+
+  <xsd:complexType name="PackDemoType">
+    <xsd:annotation>
+      <xsd:documentation>
+        If the content pack has data to be used for demonstration purposes only then this element
+        specifies the location of the file describing this.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="fileName" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+          The definition file for the demo data for the content pack.  The file also uses this schema. 
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/cview-2003-09.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/cview-2003-09.xsd
new file mode 100644
index 000000000000..41f46620f1cd
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/cview-2003-09.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xsd:include schemaLocation="cview-types-2003-09.xsd"/>
+  <xsd:element name="customView" type="CustomViewType"/>
+  <xsd:complexType name="CustomViewType">
+    <xsd:sequence>
+      <xsd:element name="property" type="PropertyViewType" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="filter" type="FilterViewType" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="customizable" type="xsd:boolean" default="true" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>If configurable is false, it means this view is static, and should not be editable, configurable, etc.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:element name="property" type="PropertyViewType">
+    <xsd:annotation>
+      <xsd:documentation>This element is present here so that we can generate the castor beans of this schema.</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:element name="filter" type="FilterViewType">
+    <xsd:annotation>
+      <xsd:documentation>This element is present here so that we can generate the castor beans of this schema.</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/cview-types-2003-09.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/cview-types-2003-09.xsd
new file mode 100644
index 000000000000..6c90ebf81ea3
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/cview-types-2003-09.xsd
@@ -0,0 +1,922 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xsd:include schemaLocation="common-2003-09.xsd"/>
+  <xsd:simpleType name="SectionState">
+    <xsd:annotation>
+      <xsd:documentation>Specifies the current state of the section - it could be either collapsed or expanded. At present mainly
+               used by filter specific section.
+            </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="collapsed"/>
+      <xsd:enumeration value="expanded"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="LookupMode">
+    <xsd:annotation>
+      <xsd:documentation>
+        The mode to filter on.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="item_only"/>
+      <xsd:enumeration value="item_and_descendents"/>
+      <xsd:enumeration value="item_and_ancestors"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="AvailUnitType">
+    <xsd:annotation>
+      <xsd:documentation>
+        For the availablity browse value, the type of units.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="percent"/>
+      <xsd:enumeration value="hour"/>
+      <xsd:enumeration value="day"/>
+      <xsd:enumeration value="fte"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="DataServiceType">
+    <xsd:annotation>
+      <xsd:documentation>Defines an optional DataService for a view</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="type" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+               Specifies the type of data service for the view. Data services can be java classes or XBL files. In each case
+               the name must be fully qualified: classes prefixed by package, XBL files prefixed with component.
+            </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="java"/>
+          <xsd:enumeration value="xbl"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ViewFieldDescriptorType">
+    <xsd:annotation>
+      <xsd:documentation>
+            An attribute that is displayed on a form. The attribute may map to a field in a database or it may be a calculated field.
+            The attribute contains the rendering information about the field including its name, type, special instructions to help the
+            user fill out the field, formatting information, and column location.
+         </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType" maxOccurs="unbounded"/>
+      <xsd:element name="instruction" type="NlsType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="toolTip" type="NlsType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="select" type="SelectType" minOccurs="0"/>
+      <xsd:element name="link" type="ViewLinkType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="image" type="ImageType" minOccurs="0"/>
+      <xsd:element name="param" type="ParamType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="defaultValue" type="DefaultValueType" minOccurs="0"/>
+      <xsd:element name="obsBrowseValue" type="ObsBrowseValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="skillBrowseValue" type="SkillBrowseValueType" minOccurs="0"/>
+      <xsd:element name="availBrowseValue" type="AvailBrowseValueType" minOccurs="0"/>
+      <xsd:element name="timeBrowseValue" type="TimeBrowseValueType" minOccurs="0"/>
+      <xsd:element name="description" type="NlsType" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>
+            Used to hold display mapping description text for property pages.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="attributeCode" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+               The internal name of the attribute. Must match the name of the attribute in the corresponding data document fragment to associate a value with
+               the attribute on the form.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+               The id of this field in the database. Used by the admin pages to get and save individual fields.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="labelPkId" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+               The label_pk_id of this field in the database. Used by the admin pages to get and save individual fields.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="widgetType" type="WidgetType" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+               The type of the attribute. Different types use different controls during rendering.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="required" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+               Determines whether the form displays the required icon next to the attribute. Used to show visual cues to the
+               user that the attribute value must be provided upon submission.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="presenceRequired" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+               Determines whether the attribute must be present on all forms.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="width" type="xsd:integer">
+      <xsd:annotation>
+        <xsd:documentation>
+               Specifies how long to make the control. This does not limit the amount of data that can be entered in the
+               control, just how big to make the control on the form. Limitations on the amount of data are taken from the
+               data document fragment.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="unique" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+               Determines whether the form displays the unique icon next to the attribute. Used to show visual cues to the
+               user that the attribute value must be unique upon submission.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="virtual" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+               Specifies whether the attribute resides in the database or not. If set to true the attribute is a calculated
+               field.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="hidden" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+               Specifies that the attribute is hidden. Causes the attribute to be rendered with the "hidden" attribute.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="midnightDate" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+               Specifies whether the field (a date field) should be treated as a finish date for the purpose of rolling back the day
+               precision to the previous day when calculating durations.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="readOnly" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+               Specifies that the attribute is read only and that the control should be rendered disabled on the form.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="locked" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Specifies that the attribute is currently locked for editing for some reason. Most likely because a running process has locked it for a given instance.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="enterOnce" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+               Determines whether the form displays the enter once icon next to the attribute. Used to show visual cues to the
+               user that the attribute value must be entered only once upon submission.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="extType">
+      <xsd:annotation>
+        <xsd:documentation>
+               Allows for more granular specification of a type as well as providing formatting hints. An attribute of widgetType="datepicker" may
+               have an extType of timestamp to indicate the value should be formatted with time precision. Also, an attribute of widgetType="numeric"
+               may have an extType="percent" to indicate the value should be formatted as a percent.
+            </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="enum"/>
+          <xsd:enumeration value="timestamp"/>
+          <xsd:enumeration value="money"/>
+          <xsd:enumeration value="percent"/>
+          <xsd:enumeration value="boolean"/>
+          <xsd:enumeration value="double"/>
+          <xsd:enumeration value="skill_browse"/>
+          <xsd:enumeration value="avail_browse"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="decimals" type="xsd:integer">
+      <xsd:annotation>
+        <xsd:documentation>
+               Used for formatting doubles, percent, money fields. Specifies the number of decimal places to render.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dataSize" type="xsd:integer">
+      <xsd:annotation>
+        <xsd:documentation>
+              The size of the database field to limit the amount of input a user can enter.
+           </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="maxValue" type="xsd:string" use="optional"/>
+    <xsd:attribute name="minValue" type="xsd:string" use="optional"/>
+    <xsd:attribute name="numRows" type="xsd:integer" use="optional"/>
+    <xsd:attribute name="numCols" type="xsd:integer" use="optional"/>
+    <xsd:attribute name="lookupType" type="xsd:string" use="optional"/>
+    <xsd:attribute name="multiValued" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="currencyAttribute" type="xsd:string" use="optional"/>
+    <xsd:attribute name="currencyConnected" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="fixedWidget" type="xsd:boolean" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+                     Specifies if the widget type of this attribute is fixed, ie not even the administrator
+                     can change it.  Its intended for use within the DefaultDisplayType element, and may have
+                     no effect inside a section element.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="extendedWidgetType" type="ExtendedWidgetType" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          Specifies additional information to aid in rendering. Used primarily for display mappings
+          to indicate if an attribute is to rendered as a text, text + icon, or text + icon + description or text + description.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dependentEntry" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+               If the lookup is a dependent lookup, then this is the lookup type that the browse can not go above.  For example when
+               there is Country/State/City, if the dependentEntry was Country, then the browse would look over all the whole tree.
+
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dependentExit" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+               If the lookup is a dependent lookup, then this is the lookup type that is returned  For example when
+               there is Country/State/City, if the dependentExit was Country, then the browse would return a City.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dependentParentLookup" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+              If the lookup is a dependent lookup, then this is the optional parent node that is allowed to be searched over.  So in the
+              dependentEntry example below if you set the dependentParentLookup to USA you would only search over USA states
+              and cities.  NOTE:  The dependentParentLookup must be a parent lookup of the dependentEntry.  So, you could not pick
+              USA as the parentLookup and Country as the entry.  The entry must be state for USA.
+           </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="xpathExpression" type="xsd:string" use="optional"/>
+    <xsd:attribute name="notEqualXPath" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+               Used with the xpath expression.  If this is set to true, then the query will build a not equals expression
+               against the value found in the xpath expression.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="aggregate" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+           Used for NSQL parameters only.  This is when parameters are part of the @HAVING_FILTER@ NSQL
+           construct.  When the NSQL is converted to an object and a attribute is part of the HAVING_FILTER
+           then this flag is true.  This flag is used by the expression builder which will ignore these
+           types of attributes.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="forceLocalize" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+          Used by developers to tell the view loaders that a virtual custom field defined
+          in the cview is subject to localization processing. This is not stored in the database
+          and is not subject to XOG.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="showValue" type="xsd:boolean" use="optional" default="true">
+      <xsd:annotation>
+        <xsd:documentation>
+          Used by to determine whether to show the value for a formula field or not. Customizable
+          in the admin UI using the Value checkbox.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="modeEnabledLookup" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+          Used by to determine whether to show the lookupmode pulldown for filter panes.  This attribute
+          is populated from the lookup, so it is virtual.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="active" type="xsd:boolean" use="optional" default="true">
+      <xsd:annotation>
+        <xsd:documentation>
+          From the object attribute.  If the attribute is active or not.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="isMVLookup" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+          Used by to determine whether to attribute is stored as a multi-valued lookup or not.  The isMultiValued above
+          determines if the Select Widget can handle multiple options, but it does not differentiate between a object attribute
+          types Lookup and MVLookup.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ViewColumnType">
+    <xsd:annotation>
+      <xsd:documentation>
+         A property or filter view is broken up by columns or sections. The attributes are placed in a column
+         by their column number stored with the view attribute in the database.
+       </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="viewFieldDescriptor" type="ViewFieldDescriptorType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="sequence" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The order of the column in the section or view. Used during XOG to set the COLUMN field in ODF_VIEW_ATTRIUBTES.
+          If absent the order of the column elements in the XML document determines the sequence.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="DefaultDisplayType">
+    <xsd:annotation>
+      <xsd:documentation>
+         For the object this is the set of attributes for which the display type overrides the default.
+         This would be used in a list view, where there is a numeric attribute and it is to be displayed
+         as a stoplight.
+       </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="viewFieldDescriptor" type="ViewFieldDescriptorType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="sequence" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The order of the column in the section or view. Used during XOG to set the COLUMN field in ODF_VIEW_ATTRIUBTES.
+          If absent the order of the column elements in the XML document determines the sequence.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ViewSectionType">
+    <xsd:annotation>
+      <xsd:documentation>
+            Specifies the section for the property view. A property view can be broken into sections, e.g., the General, Management, Financial, Opportunity, and Custom
+            sections for the project properties. Each section can have a list of attributes associated with it.
+         </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="column" type="ViewColumnType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="nls" type="NlsType" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>
+             Specifies the name of the section for display purposes.
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="sequence" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+               The order the section displays on the page. Sections can be re-ordered in the administration UI.
+               Used by XOGs to set the DISPLAY_ORDER in the ODF_VIEW_SECTIONS table. If absent the order of the
+               section elements in the XML document determines the sequence.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="collapsed" type="xsd:boolean" use="optional" default="true"/>
+    <xsd:attribute name="filterByExpression" type="xsd:boolean" use="optional" default="true"/>
+    <xsd:attribute name="currentState" type="SectionState" use="optional" default="collapsed"/>
+    <xsd:attribute name="id" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+               The id of this section in the database. Used by the admin pages to get and save individual sections.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="PropertyViewType">
+    <xsd:annotation>
+      <xsd:documentation>
+            The root element of an odf property view document fragment. The odf property view document describes the layout of
+            a property view of an odf object or odf property view that spans multiple odf objects.
+         </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="column" type="ViewColumnType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="section" type="ViewSectionType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="nls" type="NlsType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="defaultDisplay" type="DefaultDisplayType" minOccurs="0"/>
+      <xsd:element name="expression" type="ExpressionType" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:integer">
+      <xsd:annotation>
+        <xsd:documentation>
+                  The id of this view. This is used to save this view in the database.
+                </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="code" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+                  The name of this view. This is used to identify this view for administration purposes.
+                </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="type" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+                    The type of this view. Property views can be of type:
+                        default (used as both an update and a create property page or default filter)
+                        update  (specialized update view)
+                        create  (specialized create view)
+                </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="default"/>
+          <xsd:enumeration value="update"/>
+          <xsd:enumeration value="create"/>
+          <xsd:enumeration value="filter"/>
+          <xsd:enumeration value="fieldList"/>
+          <xsd:enumeration value="master"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="objectCode" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+                    The associated object for this view. It is optional because it applies only to the simple case where the
+                    view can be associated with a single object, i.e., properties for Project. In a more complex case where
+                    the view may be associated with multiple objects a data service would be used to provide the object meta-data
+                    and this attribute would not be used.
+                </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="sequence" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The order of the view. For update properties pages this determines the order
+          of the sub pages.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="componentId" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The component this view belongs to. Used by the administration pages to find objects, etc.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="partitionCode" type="xsd:string" default="NIKU.ROOT">
+      <xsd:annotation>
+        <xsd:documentation>
+          The partition this view is for.  The partition model of the object is used to determine
+          the unique partition.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="isSystem" type="xsd:boolean" default="true">
+      <xsd:annotation>
+        <xsd:documentation>
+          Indicates whether this view is a seeded (system) view.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="isCustomized" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+          Indicates whether this view is customized.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="readOnly" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+          Indicates whether this view is read only.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="linkCode" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The link code that corresponds to this subpage, only used for update pages.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="isSecure" type="xsd:boolean" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          Indicates whether this view is subject to security NAVIGATE and EDIT
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="SelectType">
+    <xsd:annotation>
+      <xsd:documentation>
+            Groups the options displayed in a selection drop down for a widgetType="select" attribute.
+         </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:annotation>
+        <xsd:documentation>
+          List of options to display in the selection drop down.
+        </xsd:documentation>
+      </xsd:annotation>
+      <xsd:element name="option" type="OptionType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="OptionType">
+    <xsd:annotation>
+      <xsd:documentation>
+        Describes the option values displayed in a selection drop down for a widgetType="select" attribute.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="value" type="xsd:string" use="required"/>
+    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+    <xsd:attribute name="defaultSelection" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+          Denotes the selection that should show as the default.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ViewLinkType">
+    <xsd:annotation>
+      <xsd:documentation>
+            Specifies the attribute is an html link. Sub-elements of the link represent the parameter names and values for the link.
+         </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="param" type="ParamType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+           Specifies the code of the link. Used by XOG to store the link codes in odf_view_attributes.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="action" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>
+               The action invoked when the link is clicked.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ParamType">
+    <xsd:annotation>
+      <xsd:documentation>
+            Describes the parameter names and values for a link.
+         </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="ref" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+               The reference for the parameter - can be an attribute in the object, a static value, or a reference into the document.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="source" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+               The determines where to get the parameters (can be static, input, or data).
+            </xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="static"/>
+          <xsd:enumeration value="data"/>
+          <xsd:enumeration value="input"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="code" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>
+               The code of the parameter - usually corresponds to the name of the parameter,
+               however can be special values of ~target~ or ~actionSuffix~.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="name" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+               The name of the parameter - as used for progress bar, has values like stageName.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="LookupValueType">
+    <xsd:annotation>
+      <xsd:documentation>Filter value that contains one or more lookup values.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="code" type="xsd:string" use="optional"/>
+    <xsd:attribute name="value" type="xsd:string" use="optional"/>
+    <xsd:attribute name="lookupType" type="xsd:string" use="optional"/>
+    <xsd:attribute name="mode" type="LookupMode" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="FilterValueType">
+    <xsd:annotation>
+      <xsd:documentation>A filter value that is part of a saved filter set.
+
+If the filter is a display mapping field then it will have a child displayMappingValue element. This will specify the WHERE clause required to execute the query.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="obsBrowseValue" type="ObsBrowseValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="skillBrowseValue" type="SkillBrowseValueType" minOccurs="0"/>
+      <xsd:element name="availBrowseValue" type="AvailBrowseValueType" minOccurs="0"/>
+      <xsd:element name="timeBrowseValue" type="TimeBrowseValueType" minOccurs="0"/>
+      <xsd:element name="lookupValue" type="LookupValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="displayMappingValue" type="ExpressionType" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:int" use="optional"/>
+    <xsd:attribute name="code" type="xsd:string" use="optional"/>
+    <xsd:attribute name="value" type="xsd:string" use="optional"/>
+    <xsd:attribute name="pmdParamName" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="FilterValueSetType">
+    <xsd:annotation>
+      <xsd:documentation>A named, saved filter set. </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="filterValue" type="FilterValueType" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>A key-value pair. It gives the value for each attribute in a attribute set.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:int" use="optional"/>
+    <xsd:attribute name="userId" type="xsd:string" use="optional"/>
+    <xsd:attribute name="default" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="name" type="xsd:string" use="optional"/>
+    <xsd:attribute name="description" type="xsd:string" use="optional"/>
+    <xsd:attribute name="objectId" type="xsd:int" use="optional"/>
+    <xsd:attribute name="objectInstanceId" type="xsd:int" use="optional"/>
+    <xsd:attribute name="system" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="sessionId" type="xsd:string" use="optional"/>
+    <xsd:attribute name="instanceId" type="xsd:int" use="optional"/>
+    <xsd:attribute name="selected" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="hasUserSubmitted" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>true when a user has submitted a value set, i.e. clicked on the Filter or Show All button</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="objectCode" type="xsd:string" use="optional"/>
+    <xsd:attribute name="viewCode" type="xsd:string" use="optional"/>
+    <xsd:attribute name="portletInstanceCode" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="FilterViewType">
+    <xsd:annotation>
+      <xsd:documentation>Definition of a filter view. A filter view can contain zero or one section. It may not have a section - specifically when there are no filter fields are defined then there won't be any section.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="section" type="ViewSectionType" minOccurs="0"/>
+      <xsd:element name="filterValueSet" type="FilterValueSetType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="defaultDisplay" type="DefaultDisplayType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="expression" type="ExpressionType" minOccurs="0"/>
+      <xsd:element name="subObject" type="SubObjectType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+    <xsd:attribute name="objectCode" type="xsd:string" use="optional"/>
+    <xsd:attribute name="parentObjectCode" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          If there is an object associated with the view and it has a parent, this is the parent object code.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="componentCode" type="xsd:string" use="optional"/>
+    <xsd:attribute name="dataProviderType" type="DataProviderType" use="optional" default="object">
+      <xsd:annotation>
+        <xsd:documentation>
+               Specifies the type of data service for the view. Data services can be either object or system.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dataProviderId" type="xsd:string" use="optional"/>
+    <xsd:attribute name="id" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+                  The id of this view. This is used to save this view in the database.
+                </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="obsTableNameKey" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          Gets loaded from the object when the object is obs enabled.  The value of the obsTableNameKey is the
+          corresponding value in column TABLE_NAME from the PRJ_OBS_ASSOCIATIONS table.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="partitionCode" type="xsd:string" default="NIKU.ROOT">
+      <xsd:annotation>
+        <xsd:documentation>
+          The partition this view is for.  The partition model of the object is used to determine
+          the unique partition.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="isCustomized" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+          Indicates if this view has been customized or not.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="DefaultValueType">
+    <xsd:annotation>
+      <xsd:documentation>Describes the default values for a viewFieldDescriptor.
+
+If it's a obs, time or a multi-select browse field then one can specify default values using the child elements.
+
+For all other simple fields (string,numeric, boolean and date) one will specify values using the value attribute of this element.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="obsBrowseValue" type="ObsBrowseValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="skillBrowseValue" type="SkillBrowseValueType" minOccurs="0"/>
+      <xsd:element name="availBrowseValue" type="AvailBrowseValueType" minOccurs="0"/>
+      <xsd:element name="timeBrowseValue" type="TimeBrowseValueType" minOccurs="0"/>
+      <xsd:element name="lookupValue" type="LookupValueType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="document" type="DocumentType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="value" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The default value
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="replace" type="MacroType" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="SkillBrowseValueType">
+    <xsd:annotation>
+      <xsd:documentation>
+        A complex type to represent the value of a Skill browse attribute.
+        This specifies the additional information (meta data) required to render
+        and register this special type of attribute.
+        minimumMatch - The minimum percent of skills that that should be returned for filtering.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="skillValue" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>
+            Each skill that is selected
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="value" type="xsd:string" use="optional">
+            <xsd:annotation>
+              <xsd:documentation>
+                The complete value that is displayed in the browse box.  This is not stored in the database, but created in the service and returned to the vxsl.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="skillId" type="xsd:long" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The primary key of the skill.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="skillCode" type="xsd:string">
+            <xsd:annotation>
+              <xsd:documentation>
+                The skill code of the skill. Used only in XOG.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="weight" type="xsd:long" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The weight of the skill.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="proficiencyLevel" type="xsd:long" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The proficiency of the skill.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="interestLevel" type="xsd:long" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The interest of the skill.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="minimumMatch" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The minimum percent of skills that that should be returned for filtering.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="AvailBrowseValueType">
+    <xsd:annotation>
+      <xsd:documentation>
+        A complex type to represent the value of a availablity browse attribute.
+        This specifies the additional information (meta data) required to render
+        and register this special type of attribute.
+        minimumMatch - The minimum percent of availablity that that should be returned for filtering.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="availValue" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>
+            Each Availablity that is selected
+          </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="value" type="xsd:string" use="optional">
+            <xsd:annotation>
+              <xsd:documentation>
+                The complete value that is displayed in the browse box.  This is not stored in the database, but created in the service and returned to the vxsl.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="unitType" type="AvailUnitType" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The type of availablity needed.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="quantity" type="xsd:double" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The amount availablity needed.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="startDate" type="xsd:date" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The start of the availablity segment.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="endDate" type="xsd:date" use="required">
+            <xsd:annotation>
+              <xsd:documentation>
+                The end of the availablity segment.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="minimumMatch" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>
+          The minimum percent of availablity that that should be returned for filtering.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="includeSoftBooking" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+          Flag to determine if softbooking segments are okay or not.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="SubObjectType">
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataProvider-2003-09.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataProvider-2003-09.xsd
new file mode 100644
index 000000000000..3ff7f37be1f8
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataProvider-2003-09.xsd
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2003/dataProvider" xmlns="http://schemas.niku.com/2003/dataProvider" xmlns:srv="http://schemas.niku.com/2002/service" xmlns:object="http://schemas.niku.com/2002/objectTypes" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xsd:import namespace="http://schemas.niku.com/2002/service" schemaLocation="service-2002-02.xsd"/>
+  <xsd:import namespace="http://schemas.niku.com/2002/objectTypes" schemaLocation="object-types-2003-09.xsd"/>
+  <xsd:element name="dataProvider" type="DataProviderType">
+    <xsd:annotation>
+      <xsd:documentation>The root element of a data provider.  This metadata follows the structure of a multi-dimensional OLAP cube.</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:complexType name="DataProviderType">
+    <xsd:annotation>
+      <xsd:documentation>A complex type that describes the structural metadata of a data provider.  This structure follows the model of a OLAP cube.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="retrieveService" type="srv:retrieveService" minOccurs="0"/>
+      <xsd:element name="dimension" type="DimensionType" maxOccurs="unbounded"/>
+      <xsd:element name="metric" type="PropertyType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="parameter" type="PropertyType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="links" type="object:LinksType" minOccurs="0"/>
+      <xsd:element name="object" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>An object used by the data provider.  If an data provider aggregates or "wraps" an object, this element "publishes" such objects as being used by the provider.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="code" type="xsd:string" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The object code</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="id" type="xsd:integer" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The object code</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>The internal code</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="name" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>The UI displayable name</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="obsTableNameKey" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="DimensionType">
+    <xsd:annotation>
+      <xsd:documentation>A dimension of the cube.  Dimensions are a structural attribute of a cube which are organized into a hierarchical set of categories that describe metrics from a fact table.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="nls" type="object:NlsType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="property" type="PropertyType" maxOccurs="unbounded"/>
+      <xsd:element name="level" minOccurs="0" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:annotation>
+            <xsd:documentation>A level within a dimension</xsd:documentation>
+          </xsd:annotation>
+          <xsd:attribute name="name" type="xsd:string" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The name of the level</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="key" type="xsd:string" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The name of the property that is the key of the level</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>The internal code</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="name" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>The ui displayable name</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="location" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>When the data provider returns the data in XML form, this attribute specifies the XPath location of the root node of the dimension.  For lists, this node can repeat.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="PropertyType">
+    <xsd:annotation>
+      <xsd:documentation>A complex type that describes a Property (aka Field or Attribute)</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="nls" type="object:NlsType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="readExpression" type="object:AugmentSQLType" minOccurs="0" maxOccurs="2"/>
+      <xsd:element name="displayMapping" type="object:DisplayMappingType" minOccurs="0"/>
+      <xsd:element name="uomConversion" minOccurs="0" maxOccurs="1">
+        <xsd:annotation>
+          <xsd:documentation>A unit of measure conversion supported by the data provider.</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:attribute name="code" type="xsd:string" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The unit of measure conversion code</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>The internal code</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="name" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>The name of the property for the UI</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="key" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>The name of the property that is the key of the level</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="custom" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+             Indicates that the field is a custom field. Used during submission to save data to the satellite
+             tables for custom data.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dataType" type="object:DataType">
+      <xsd:annotation>
+        <xsd:documentation>
+             The data type of the property
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="extDataType" type="object:ExtendedType">
+      <xsd:annotation>
+        <xsd:documentation>
+             The extended data type of the property
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="scale" type="xsd:int">
+      <xsd:annotation>
+        <xsd:documentation>
+             The scale of the property, i.e. number of decimal places
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="timeScalable" type="object:TimeScaleType">
+      <xsd:annotation>
+        <xsd:documentation>
+             Determines the time scalable capabilities of the property
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="length" type="xsd:integer">
+      <xsd:annotation>
+        <xsd:documentation>
+            The size of the data. Used by the view engines to limit input on forms.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="sortable" type="xsd:boolean" default="true">
+      <xsd:annotation>
+        <xsd:documentation>When true, this property can be sorted on.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="required" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+            Indicates that the field is required when updating the object to the persistence layer.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="unique" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+            Indicates that the field must be unique when updating the object to the persistence layer.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="readonly" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+            Indicates that the field cannot be updated during submission of the object to the persistence layer.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="enterOnce" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+            Indicates that the field cannot be updated more than once when the object is updated to the persistence layer.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="virtual" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+            Indicates that the field is calculated and doesn't reside in the database.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="active" type="xsd:boolean" default="true"/>
+    <xsd:attribute name="private" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+            Indicates that the field is generated by the system.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="lookupType" type="xsd:string"/>
+    <xsd:attribute name="multiValued" type="xsd:boolean"/>
+    <xsd:attribute name="currencyAttribute" type="xsd:string"/>
+    <xsd:attribute name="currencyConnected" type="xsd:boolean"/>
+    <xsd:attribute name="dependentEntry" type="xsd:string"/>
+    <xsd:attribute name="dependentExit" type="xsd:string"/>
+    <xsd:attribute name="dependentParentLookup" type="xsd:string"/>
+    <xsd:attribute name="exact" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+               Used for NSQL parameters when there can only be one value.  So, the attribute cannot be multivalued and cannot
+               have a wildcard.  This does value does not need to be persisted to the database because it is only for NSQL.  The
+               reason it is in the schema is because the NSQL gets converted to and Object for ODF.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="gridEditable" type="xsd:boolean">
+      <xsd:annotation>
+        <xsd:documentation>
+            Indicates that the field is editable within a grid.
+          </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataValidation-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataValidation-2002-02.xsd
new file mode 100644
index 000000000000..9f00e03670ca
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataValidation-2002-02.xsd
@@ -0,0 +1,964 @@
+<?xml version="1.0"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/dvml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.niku.com/2002/dvml" elementFormDefault="qualified">
+  <xsd:annotation>
+    <xsd:documentation>
+      This schema defines a set of complex validation rules against a single attribute within an data XML file or several attributes such as attributes
+      containing begin and end dates.
+    </xsd:documentation>
+  </xsd:annotation>
+  <xsd:simpleType name="operatorType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">
+        The operator to check the count of the fields against
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="equals"/>
+      <xsd:enumeration value="notEquals"/>
+      <xsd:enumeration value="greaterThan"/>
+      <xsd:enumeration value="lessThan"/>
+      <xsd:enumeration value="greaterEquals"/>
+      <xsd:enumeration value="lessEquals"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="typeType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="integer"/>
+      <xsd:enumeration value="double"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:element name="dataValidation">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="singleField" minOccurs="0" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation/>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="checkRequired" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The input field specified must be present and not null.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkSoftRequired" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The input field specified must be not-null if present. This is different than checkRequired in that if the attribute wasn't submitted at all it's not raised as an exception. This will be used in the case where there are multple views of an object and the valdation is generated for the entire object. In this case the absense of the attribute just means that it wasn't present on the age in the first place.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkDateFormat" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en"/>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.dateNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="pmMinDateErrorCode" type="xsd:string" use="optional" default="validation.finishDateLessThanMinimum">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="minDateErrorCode" type="xsd:string" use="optional" default="validation.startDateLessThanMinimum">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="pmMaxDateErrorCode" type="xsd:string" use="optional" default="validation.finishDateExceedsMaximum">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="maxDateErrorCode" type="xsd:string" use="optional" default="validation.startDateExceedsMaximum">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="pm" type="xsd:boolean" use="optional" default="false">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkTimeFormat" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en"/>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.timeNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkDateTimeFormat" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en"/>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.dateTimeNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkNumberFormat" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks that the field is a number
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="decimalPlaces" type="xsd:integer">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkCurrencyFormat" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks that the field is a number
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.currencyNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="decimalPlaces" type="xsd:integer">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkNumberRange" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks a number is within the (hard coded) range specified.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="start" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="end" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Valid types are integer or double (default)
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="decimalPlaces" type="xsd:integer">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="rangeErrorCode" type="xsd:string" use="optional" default="validation.numberNotWithinRange">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkPercentRange" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks a number is within the (hard coded) range specified.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="start" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="end" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Valid types are int or double (default)
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="rangeErrorCode" type="xsd:string" use="optional" default="validation.numberNotWithinRange">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkCurrencyRange" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks a number is within the (hard coded) range specified.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="start" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="end" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="rangeErrorCode" type="xsd:string" use="optional" default="validation.numberNotWithinRange">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="decimalPlaces" type="xsd:integer">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkDateValueRange" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks a date is within the (hard coded) range specified. Not to be confused with the multi-field checkDateRange.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="start" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="end" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="minute" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="hour" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="rangeErrorCode" type="xsd:string" use="optional" default="validation.numberNotWithinRange">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="rangeFormatErrorCode" type="xsd:string" use="optional" default="validation.rangeFormatNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkPositive" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks if a number is positive.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="includeZero" type="xsd:boolean" use="optional" default="false">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Allows you to specify whether to include 0 as a positive value for greater than or equal to 0 comparisions.
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Valid types are int or double (default)
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="positiveErrorCode" type="xsd:string" use="optional" default="validation.numberNotGreaterThan">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkNegative" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks if a number is negative.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="includeZero" type="xsd:boolean" use="optional" default="false">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Allows you to specify whether to include 0 as a positive value for less than or equal to 0 comparisions.
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Valid types are int or double (default)
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="negativeErrorCode" type="xsd:string" use="optional" default="validation.numberNotGreaterThan">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkGreaterThan" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks a number is greater than the (hard coded) compare to value specified.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="compareTo" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Valid types are int or double (default)
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="greaterThanErrorCode" type="xsd:string" use="optional" default="validation.numberNotGreaterThan">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkLessThan" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks a number is less than the (hard coded) compare to value specified.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="compareTo" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Valid types are int or double (default)
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="lessThanErrorCode" type="xsd:string" use="optional" default="validation.numberNotLessThan">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkPercentFormat" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks the field is a percent format
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="decimalPlaces" type="xsd:integer">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="type" type="typeType" use="optional" default="double">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.percentNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkDataSize" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                     Checks the size of the data in a field
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="errorInfo" minOccurs="0">
+                      <xsd:complexType>
+                        <xsd:sequence>
+                          <xsd:element name="param" maxOccurs="unbounded">
+                            <xsd:complexType>
+                              <xsd:attribute name="key" type="xsd:string" use="optional">
+                                <xsd:annotation>
+                                  <xsd:documentation xml:lang="en"/>
+                                </xsd:annotation>
+                              </xsd:attribute>
+                              <xsd:attribute name="value" type="xsd:string" use="optional">
+                                <xsd:annotation>
+                                  <xsd:documentation xml:lang="en"/>
+                                </xsd:annotation>
+                              </xsd:attribute>
+                            </xsd:complexType>
+                          </xsd:element>
+                        </xsd:sequence>
+                        <xsd:attribute name="bundle" type="xsd:string" use="optional">
+                          <xsd:annotation>
+                            <xsd:documentation xml:lang="en"/>
+                          </xsd:annotation>
+                        </xsd:attribute>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute name="minSize" type="xsd:integer" use="optional" default="0">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="maxSize" type="xsd:integer" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="minSizeErrorCode" type="xsd:string" use="optional" default="validation.dataNotMinSize">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="maxSizeErrorCode" type="xsd:string" use="optional" default="validation.dataNotMaxSize">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkNotAllowed" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The input field specified must NOT be present or be null.  If a compareValue is specified.  This will
+                    check to make sure the value isn't the same as the one specified.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.notAllowed">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="compareValue" type="xsd:string" use="optional">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        If the compareValue is specified, then the value is not allowed to match the compareValue.
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkRegExp" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The input field specified must match a Reg Exp format.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.regexp">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="expression" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        The regular expression that is being used to compare the value to.
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="matches" type="xsd:boolean" use="optional" default="true">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Flag to determine if you want an error if there is a match (matches=true),
+                        or if you want an error if thre is NOT a match (matches=false).
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="case" use="optional" default="mixed">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        What case to do the match in, can be set to lower, upper or mixed (ie don't change).
+                      </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                      <xsd:restriction base="xsd:string">
+                        <xsd:enumeration value="lower"/>
+                        <xsd:enumeration value="upper"/>
+                        <xsd:enumeration value="mixed"/>
+                      </xsd:restriction>
+                    </xsd:simpleType>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkXPathExp" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    The input field specified will be flagged as error if the XPath does not evaluate to true.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="expression" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        The XPath expression that needs to evaluate to true.
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkAlphaNumeric" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation>
+                    Checks for alphanumericness
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.alphanumeric">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkDateTime" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks a datetime ODF attribute is correct for date, hour and minute.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="minute" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        The attribute in the input document containing the minute value
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="hour" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        The attribute in the input document containing the hour value
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.numberNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+            <xsd:attribute name="name" type="xsd:string" use="required">
+              <xsd:annotation>
+                <xsd:documentation xml:lang="en">
+                  XPath to the attribute to be validated
+                </xsd:documentation>
+              </xsd:annotation>
+            </xsd:attribute>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="multiField" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation/>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="checkRequiredOr" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks that at least one of the values is present
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="requiredField" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:complexType>
+                        <xsd:attribute name="field" type="xsd:string" use="required">
+                          <xsd:annotation>
+                            <xsd:documentation xml:lang="en">
+                              XPath to the field
+                            </xsd:documentation>
+                          </xsd:annotation>
+                        </xsd:attribute>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.atLeastOneRequiredField">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="exclusiveErrorCode" type="xsd:string" use="optional" default="validation.onlyOneRequiredField">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="exclusive" type="xsd:boolean" use="optional" default="false">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        If exclusive is set to true then only one can be filled in.  Otherwise both is okay.
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkRequiredAllOrNone" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                     Checks that all fields are present.  Or that none of the fields are present.
+                     This is valuable if you have an editable grid and you want to make sure people fill out a complete
+                     row of the grid, but they can leave other rows empty.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:sequence>
+                    <xsd:element name="requiredField" minOccurs="0" maxOccurs="unbounded">
+                      <xsd:complexType>
+                        <xsd:attribute name="field" type="xsd:string" use="required">
+                          <xsd:annotation>
+                            <xsd:documentation xml:lang="en">
+                              XPath to the field
+                            </xsd:documentation>
+                          </xsd:annotation>
+                        </xsd:attribute>
+                      </xsd:complexType>
+                    </xsd:element>
+                  </xsd:sequence>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.allOrNoneRequiredField">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkUniqueValue" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks that the two values specified are unique
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="first" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        XPath to first value
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="second" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        XPath to second value
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.valueNotUnique">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkNotSameValue" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks that the two values specified are the same.  Used to confirm values.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="first" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        XPath to first value
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="second" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        XPath to second value
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.valueNotSame">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkCount" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks that there is a certain number of elements passed.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="field" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        XPath to field value
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="count" type="xsd:int" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        The count that is being checked against
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="operator" type="operatorType" use="optional" default="equals"/>
+                  <xsd:attribute name="errorCode" type="xsd:string" use="optional" default="validation.invalidCount">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkDateRange" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    The dates are checked that the start is less than the end, unless the cannotBeEqual
+                    is set to true in which case they can be equal.
+                    The fields need to have been checked as valid dates prior to this
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="start" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Xpath to start value for range check
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="end" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        XPath to end value for range check
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="cannotEqual" type="xsd:boolean" use="optional" default="false">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Set if the two dates cannot be equal
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="cannotEqualErrorCode" type="xsd:string" use="optional" default="validation.datesCannotBeEqual">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="notInRangeErrorCode" type="xsd:string" use="optional" default="validation.datesNotInRange">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.dateNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkShift" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    The times are checked that the start is less than the end, unless the cannotBeEqual
+                    is set to false in which case they can be equal.
+                    The fields need to have been checked as valid times prior to this.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="start" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Xpath to start value for range check
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="startAMPM" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Xpath to start AM/PM indicator for range check
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="end" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        XPath to end value for range check
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="endAMPM" type="xsd:string" use="required">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        XPath to end AM/PM indicator for range check
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="cannotEqual" type="xsd:boolean" use="optional" default="false">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en">
+                        Set if the two times cannot be equal
+                      </xsd:documentation>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="cannotEqualErrorCode" type="xsd:string" use="optional" default="validation.datesCannotBeEqual">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="notInRangeErrorCode" type="xsd:string" use="optional" default="validation.datesNotInRange">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                  <xsd:attribute name="formatErrorCode" type="xsd:string" use="optional" default="validation.dateNotCorrectFormat">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+              <xsd:element name="checkCalendarRequest" minOccurs="0">
+                <xsd:annotation>
+                  <xsd:documentation xml:lang="en">
+                    Checks that a resource calendar edit request contains the required parameters.
+                  </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                  <xsd:attribute name="calendarErrorCode" type="xsd:string" use="optional" default="validation.calendarRequestMissingParameters">
+                    <xsd:annotation>
+                      <xsd:documentation xml:lang="en"/>
+                    </xsd:annotation>
+                  </xsd:attribute>
+                </xsd:complexType>
+              </xsd:element>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataXml-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataXml-2002-02.xsd
new file mode 100644
index 000000000000..149d51843d77
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/dataXml-2002-02.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://schemas.niku.com/2002/data" xmlns="http://schemas.niku.com/2002/data" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xs:element name="data">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="header" type="headerType"/>
+        <xs:any processContents="skip" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:complexType name="headerType">
+    <xs:sequence>
+      <xs:element name="security" type="securityType" minOccurs="0"/>
+      <xs:element name="userSession" type="userSessionType" minOccurs="0"/>
+      <xs:element name="sortInfo" type="sortInfoType" minOccurs="0"/>
+      <xs:element name="pagination" type="paginationType" minOccurs="0"/>
+      <xs:element name="messages" type="messagesType" minOccurs="0"/>
+      <xs:element name="action" minOccurs="0">
+        <xs:complexType>
+          <xs:attribute name="id" type="xs:string" use="required"/>
+          <xs:attribute name="pageId" type="xs:string" use="required"/>
+          <xs:attribute name="url" type="xs:string" use="required"/>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="securityType">
+    <xs:sequence>
+      <xs:element name="authorization" type="authorizationType" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="sessionId" type="xs:string" use="required"/>
+  </xs:complexType>
+  <xs:complexType name="userSessionType">
+    <xs:annotation>
+      <xs:documentation>
+       Contains information of the user who is currently logged in.  Info comes from
+       the SecurityIdentifier.  
+       formattingLocale - The locale that is used for date formatting or sorting for the user.
+       languageLocale - The locale that is used for language (i.e. resource bundles) of the user.
+       timezone - The timezone of the user.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="formattingLocale" type="xs:string" use="optional"/>
+    <xs:attribute name="languageLocale" type="xs:string" use="optional"/>
+    <xs:attribute name="timezone" type="xs:string" use="optional"/>
+  </xs:complexType>
+  <xs:complexType name="authorizationType">
+    <xs:attribute name="id" type="xs:string" use="required"/>
+    <xs:attribute name="value" type="xs:boolean" use="required"/>
+  </xs:complexType>
+  <xs:complexType name="sortInfoType">
+    <xs:attribute name="sortColumn" type="xs:string" use="required"/>
+    <xs:attribute name="sortDirection" type="SortDirectionType" default="asc"/>
+  </xs:complexType>
+  <xs:simpleType name="SortDirectionType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="asc"/>
+      <xs:enumeration value="desc"/>
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="paginationType">
+    <xs:sequence>
+      <xs:element name="sliceInfo" type="sliceInfoType" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="sliceInfoType">
+    <xs:attribute name="collection" type="xs:string" use="required"/>
+    <xs:attribute name="totalNumRows" type="xs:short" use="required"/>
+    <xs:attribute name="slice" type="xs:byte" use="required"/>
+    <xs:attribute name="sliceSize" type="xs:byte" use="required"/>
+  </xs:complexType>
+  <xs:complexType name="messagesType">
+    <xs:sequence>
+      <xs:element name="message" type="messageType" maxOccurs="unbounded"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="messageType">
+    <xs:attribute name="id" type="xs:string" use="required">
+      <xs:annotation>
+        <xs:documentation>Resource bundle Id</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="type" use="required">
+      <xs:simpleType>
+        <xs:restriction base="xs:NMTOKEN">
+          <xs:enumeration value="fatalError"/>
+          <xs:enumeration value="error"/>
+          <xs:enumeration value="warning"/>
+          <xs:enumeration value="info"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="location" type="xs:string" use="required"/>
+    <xs:attribute name="value" type="xs:string"/>
+  </xs:complexType>
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/httpBinding-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/httpBinding-2002-02.xsd
new file mode 100644
index 000000000000..1eeb20b4490a
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/httpBinding-2002-02.xsd
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/httpBinding" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bd="http://schemas.niku.com/2002/httpBinding" elementFormDefault="qualified">
+  <xsd:element name="requestBinding" type="bd:requestBindingType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">requestBinding is a collection of binding elements that describe a binding from HTTP name/value pairs to a XML document</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:complexType name="requestBindingType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A complex type that specifies bindings for HTTP name-value pairs into XML</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="binding" type="bd:bindingType" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- We only update one grid at time right now -->
+      <xsd:element name="gridBinding" type="bd:gridBindingType" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="selector" type="bd:selectorType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="bindAllParams" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">When true, all HTTP parameters will be marshalled regardless if a binding exists for them.  If no binding is found, the "canonical" marshalling algorithm will be used to append the parameter node to the end of the document</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="gridBindingType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">
+        Grid bindings create a special format of the document in order marshal all the updated
+        fields of an editable grid. Since grids may contain more than one object type with multiple fields
+        of the object being updated the gridBinding instructs the HttpMarshaller to create elements in the document
+        of the form:
+        <objects>
+          <object code="object_code">
+            <parameter_name value="parameter_value" original_value="original_parameter_value"/>
+            ...
+          </object>
+          <object code="object_code">
+            <parameter_name value="parameter_value"/>
+          </object>
+        </objects>
+
+        Ex.)
+        An updatable grid based on the investment data provider that updates the Budgeted Cost field
+        on three rows, two of which are project objects and one which is the application object would
+        create a document fragment that looks like:
+        <objects>
+          <object code="project">
+            <budget_cost_total value="5000000" original_value="4000000"/>
+            <odf_pk value="5000001"/>
+          </object>
+          <object code="project">
+            <budget_cost_total value="6000000" original_value="5000000"/>
+            <odf_pk value="5000002"/>
+          </object>
+          <object code="application">
+            <budget_cost_total value="3000000" original_value="3200000"/>
+            <odf_pk value="5000003"/>
+          </object>
+        </objects>
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexContent>
+      <xsd:extension base="bindingType">
+      <!--
+        Bindings are stored in a binding cache (ActionBindingCache). The bindings are
+        placed in a HashMap called a BindingMap and then the BindingMap is stored in the ActionBindingCache.
+        The keys to the BindingMap are built from the binding 'from' element using the from 'id' and the from 'source' attributes.
+        Since gridBindings don't have a 'from' element we need another way to key the grid binding in the
+        BindingMap. The 'id' attribute on the gridBinding element is the mechanism to key the grid binding
+        into the BindingMap.
+      -->
+        <xsd:attribute name="id" type="xsd:string" use="required"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="bindingType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A binding consists of one from entity containing the name of the HTTP parameter and at least one to entity containg the destination location in the XML.  Multiple to elements can be used to bind the parameter to more than one destination in the XML.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="from" type="bd:fromType"/>
+      <xsd:element name="to" type="bd:toType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="selectorType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A selector defines a group of bindings that are logically related by a selector widget.  Selector widgets are typically used in a list table and allow the user to select one or more rows from the table for processing.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="binding" type="bd:bindingType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The id/name of the selector widget as it will appear in the HTTP request.  It must be unique for the entire requestBinding.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="fromType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The from element specifies the name/id of the HTTP parameter. The default atribute can define an optional default value for group of radio buttons or single check boxes.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:string" use="required"/>
+    <xsd:attribute name="source" use="optional" default="request">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the source from which the parameter value is retreived.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType name="sourceTypes">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="request"/>
+          <xsd:enumeration value="session"/>
+          <xsd:enumeration value="cookie"/>
+          <xsd:enumeration value="header"/>
+          <xsd:enumeration value="config"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="parameterType" use="optional" default="httpParameterValue">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the type of parameter. Most parameters are http parameters and are retreived from the incoming set of HTTP parameters. Some parameters however, need to come from other sources like the server name, server protocol, and server port, which come from the HttpServletRequest.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType name="parameterTypes">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="httpParameterValue"/>
+          <xsd:enumeration value="servletRequestValue"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="toType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The to element specifies the destination of the parameter value in the XML</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="destination" use="optional" default="request">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the destination source into which the parameter value is placed.</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType name="destinationTypes">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="request"/>
+          <xsd:enumeration value="session"/>
+          <xsd:enumeration value="cookie"/>
+          <xsd:enumeration value="header"/>
+          <xsd:enumeration value="config"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="location" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The location attribute is destination of the parameter value in the XML in the form of an absolute XPath location path expression</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="repeatingLocation" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The repeatingLocation attribute is used for repeating a binding of one name into multiple destinations in the XML.
+        It is also in the form of an absolute XPath location expression that must be equivalent to or an ancestor of the location attribute.  The last name step of this expression
+        will be repeated in the resulting XML document for each matching name in the HTTP request.  It will never be an attribute, always an element.  This is typcially found in "list" HTML tables where each
+        column of the table has the same name but repeated over numerous rows of data.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="defaultValue" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The default value of the binding.  Will be used when the parameter is not present in the HTTP request.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="selector" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The id/name of the selector widget as it will appear in the HTTP request.  It must be unique for the entire requestBinding.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-2003-09.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-2003-09.xsd
new file mode 100644
index 000000000000..71a660619fad
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-2003-09.xsd
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/objectTypes" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:objectTypes="http://schemas.niku.com/2002/objectTypes" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xsd:include schemaLocation="object-types-2003-09.xsd"/>
+	<xsd:element name="object" type="objectTypes:ObjectType"/>
+</xsd:schema>
+
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-base-types-2003-09.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-base-types-2003-09.xsd
new file mode 100644
index 000000000000..9f67bab7814a
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-base-types-2003-09.xsd
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xsd:include schemaLocation="common-2003-09.xsd"/>
+  <xsd:complexType name="ObjectAttributeType">
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="default" type="DefaultType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="readExpression" type="AugmentSQLType" minOccurs="0" maxOccurs="2"/>
+      <xsd:element name="displayMapping" type="DisplayMappingType" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+    <xsd:attribute name="table" type="xsd:string"/>
+    <xsd:attribute name="partitionCode" type="xsd:string" use="optional" default="NIKU.ROOT"/>
+    <xsd:attribute name="partitionMode" type="PartitionModeType" use="optional" default="PARTITION_AND_ANSTRS_DESDNTS"/>
+    <xsd:attribute name="column" type="xsd:string"/>
+    <xsd:attribute name="dataType" type="DataType" use="required"/>
+    <xsd:attribute name="extendedType" type="ExtendedType"/>
+    <xsd:attribute name="dataSize" type="xsd:int"/>
+    <xsd:attribute name="scale" type="xsd:int"/>
+    <xsd:attribute name="minValue" type="xsd:string"/>
+    <xsd:attribute name="maxValue" type="xsd:string"/>
+    <xsd:attribute name="lookupType" type="xsd:string"/>
+    <xsd:attribute name="currencyAttribute" type="xsd:string"/>
+    <xsd:attribute name="currencyConnected" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="constant" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="required" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="presenceRequired" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="unique" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="editable" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="virtual" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="custom" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="active" type="xsd:boolean" default="true"/>
+    <xsd:attribute name="private" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="multiValued" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="gridEditable" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="timeScalable" type="TimeScaleType">
+      <xsd:annotation>
+        <xsd:documentation>
+            Defines the minimum time scale supported. Must support all higher time scales.
+            E.g. The month time scale must support quarter and year
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="clientFieldVersion" type="xsd:int" default="10">
+      <xsd:annotation>
+        <xsd:documentation>
+               ---- For schedulers use only ----
+               Let's the schedulers code know when a field came into being to aid in  backward compatibility
+                   10 - Field was available to pre 7.0 clients
+                   20 - Field new to 7.0
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="clientFlags" type="xsd:long" default="0">
+      <xsd:annotation>
+        <xsd:documentation>
+               ---- For schedulers use only ----
+               Use by the schedulers code to fine tune the attrbutes for client applications
+                  0x0001 - systemGenerated - Tells schedulers that the field isn't directly editable by the user but the should be sent back to the server
+                  0x0002 - clientReadonly  - User should not be able to edit the field - If true it can override the "editable" attribute
+                  0x0004 - clientHidden - User cannot see the field - If true can override the "private" attribute
+                  0x0008 - lookupReference - Field might be defined as a Lookup for Clarity but client should treat it as a referenced record ID
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dependentEntry" type="xsd:string"/>
+    <xsd:attribute name="dependentExit" type="xsd:string"/>
+    <xsd:attribute name="dependentParentLookup" type="xsd:string"/>
+    <xsd:attribute name="id" type="xsd:int"/>
+    <xsd:attribute name="exact" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+               Used for NSQL parameters when there can only be one value.  So, the attribute cannot be multivalued and cannot
+               have a wildcard.  This does value does not need to be persisted to the database because it is only for NSQL.  The
+               reason it is in the schema is because the NSQL gets converted to and Object for ODF.
+            </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="aggregate" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>
+           Used for NSQL parameters only.  This is when parameters are part of the @HAVING_FILTER@ NSQL
+           construct.  When the NSQL is converted to an object and a attribute is part of the HAVING_FILTER
+           then this flag is true.  This flag is used by the expression builder which will ignore these
+           types of attributes.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="derivedThrough" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>Specified if this attribute represents a derived attribute. If so this is the attribute through which it is derived. I.e. the values for this attribute must represent instances of some object. For now only the parent reference is supported. I.e. the only possible value is the same value specified for parentReferenceAttribute at the object element and consequently refers to instances of the object with code specified by parentCode.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="derivedReference" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>If derivedThrough is specified, this is the attribute that is referenced. It is an error if value specified does not match an attribute of the referenced object type.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="allowDefaultValueOverrides" type="xsd:boolean" default="true">
+      <xsd:annotation>
+        <xsd:documentation>If true, the Object admin UI will allow default values to be changed for this attribute even though it may be a stock attribute with a default value specified by a developer. If false, default values cannot be changed by a customer.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="DefaultType">
+    <xsd:sequence>
+      <xsd:element name="document" type="DocumentType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="replace" type="MacroType" use="optional"/>
+    <xsd:attribute name="value" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="AugmentSQLType">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string">
+        <xsd:attribute name="dbVendor" type="DatabaseVendorType" default="all"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="DisplayMappingType">
+    <xsd:sequence>
+      <xsd:element name="mapping" type="MappingType" maxOccurs="10"/>
+    </xsd:sequence>
+    <xsd:attribute name="defaultTypeCode" type="xsd:string"/>
+    <xsd:attribute name="type" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="color"/>
+          <xsd:enumeration value="image"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="objectCode" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Allows system data providers to specify which object the display mapping belongs to and thus reuse that objects lookups.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="attributeCode" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Used by XOG to import modified display mappings on stock attributes.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="MappingType">
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:long"/>
+    <xsd:attribute name="mappingCode" type="xsd:string" use="required"/>
+    <xsd:attribute name="typeCode" type="xsd:string" use="required"/>
+    <xsd:attribute name="lo" type="xsd:double">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The low value of the mapping range.  Always inclusive.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="hi" type="xsd:double">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The high value of a mapping range.  Always exclusive except when the high and low values are equivalent, e.g. 4 to 4, and when the high value is the max of all high values in the display mapping </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="value" type="xsd:string"/>
+  </xsd:complexType>
+  <xsd:complexType name="LinksType">
+    <xsd:sequence>
+      <xsd:element name="link" type="LinkType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="LinkType">
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType" maxOccurs="unbounded"/>
+      <xsd:element name="linkParam" type="LinkParamType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:int" use="optional"/>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+    <xsd:attribute name="action" type="xsd:string" use="required"/>
+    <xsd:attribute name="objectPropertiesLink" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="system" type="xsd:boolean" default="true"/>
+    <xsd:attribute name="partitionCode" type="xsd:string" use="optional" default="NIKU.ROOT"/>
+    <xsd:attribute name="partitionMode" type="PartitionModeType" use="optional" default="PARTITION_AND_ANSTRS_DESDNTS"/>
+  </xsd:complexType>
+  <xsd:simpleType name="DatabaseVendorType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="mssql"/>
+      <xsd:enumeration value="oracle"/>
+      <xsd:enumeration value="all"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="DirectionType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="IN"/>
+      <xsd:enumeration value="OUT"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="DataType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="string"/>
+      <xsd:enumeration value="number"/>
+      <xsd:enumeration value="date"/>
+      <xsd:enumeration value="binary"/>
+      <xsd:enumeration value="attachment"/>
+      <xsd:enumeration value="clob"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ExtendedType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="lookup"/>
+      <xsd:enumeration value="boolean"/>
+      <xsd:enumeration value="double"/>
+      <xsd:enumeration value="percent"/>
+      <xsd:enumeration value="money"/>
+      <xsd:enumeration value="timestamp"/>
+      <xsd:enumeration value="midnight_date"/>
+      <xsd:enumeration value="url"/>
+      <xsd:enumeration value="formula"/>
+      <xsd:enumeration value="skill_browse"/>
+      <xsd:enumeration value="avail_browse"/>
+      <xsd:enumeration value="attachment"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ProcessType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="processObjectId"/>
+      <xsd:enumeration value="processTemplateId"/>
+      <xsd:enumeration value="processInitiatedBy"/>
+      <xsd:enumeration value="processFromPeriodIndx"/>
+      <xsd:enumeration value="processToPeriodIndx"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="TimeScaleType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="year"/>
+      <xsd:enumeration value="quarter"/>
+      <xsd:enumeration value="month"/>
+      <xsd:enumeration value="week"/>
+      <xsd:enumeration value="day"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="PartitionModeType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="PARTITION_ONLY"/>
+      <xsd:enumeration value="PARTITION_AND_ANCESTORS"/>
+      <xsd:enumeration value="PARTITION_AND_DESCENDANTS"/>
+      <xsd:enumeration value="PARTITION_AND_ANSTRS_DESDNTS"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-types-2003-09.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-types-2003-09.xsd
new file mode 100644
index 000000000000..23b948ffd8d7
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/object-types-2003-09.xsd
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/objectTypes" xmlns:srv="http://schemas.niku.com/2002/service" xmlns:sec="http://schemas.niku.com/2002/security" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.niku.com/2002/objectTypes" elementFormDefault="qualified">
+  <xsd:import namespace="http://schemas.niku.com/2002/service" schemaLocation="service-2002-02.xsd"/>
+  <xsd:import namespace="http://schemas.niku.com/2002/security" schemaLocation="security-2002-02.xsd"/>
+  <xsd:include schemaLocation="object-base-types-2003-09.xsd"/>
+  <xsd:include schemaLocation="common-2003-09.xsd"/>
+  <xsd:complexType name="AttributesType">
+    <xsd:sequence>
+      <xsd:element name="attribute" type="ObjectAttributeType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="ObjectType">
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType" maxOccurs="unbounded"/>
+      <xsd:element name="attributes" type="AttributesType"/>
+      <xsd:element name="tables" type="TablesType" minOccurs="0"/>
+      <xsd:element name="instanceService" type="srv:retrieveService" minOccurs="0"/>
+      <xsd:element name="listService" minOccurs="0">
+        <xsd:complexType>
+          <xsd:attribute name="id" type="xsd:string" use="required">
+            <xsd:annotation>
+              <xsd:documentation xml:lang="en">The id of the system data provider to use as the objects list service</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="insertService" type="srv:processService" minOccurs="0"/>
+      <xsd:element name="updateService" type="srv:processService" minOccurs="0"/>
+      <xsd:element name="deleteService" type="srv:processService" minOccurs="0"/>
+      <xsd:element name="propertyViewService" type="srv:processService" minOccurs="0"/>
+      <xsd:element name="operations" type="OperationsType" minOccurs="0"/>
+      <xsd:element name="events" type="EventsType" minOccurs="0"/>
+      <xsd:element name="links" type="LinksType" minOccurs="0"/>
+      <xsd:element name="changeListeners" type="ChangeListenersType" minOccurs="0"/>
+      <xsd:element name="security" type="SecurityType" minOccurs="0"/>
+      <xsd:element name="subObject" type="SubObjectType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="component" type="xsd:string" use="optional"/>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+    <xsd:attribute name="source" type="xsd:string" use="optional" default="customer"/>
+    <xsd:attribute name="parentCode" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The code of the master object in a master sub relationship</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="topParentCode" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If parentCode is specified, this attribute specifies the code of the top-most object in the hierarchy. If it is a simple parent-child relationship parentCode and topParentCode will be the same. If parentCode is not specified, topParentCode will also not be specified.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="parentReferenceAttribute" type="xsd:string" use="optional" default="odf_parent_id">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If parentCode is specified, this attribute specifies the attribute of this object that points to the parent instance. This attribute means nothing if parentCode is not specified</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="topParentReferenceAttribute" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If parentCode is specified, this attribute specifies a peudo "attribute" that can be used as a filter to filter based on the top most object in an object hierarchy. It is constructed by concatenating (separated by the "-" character) the parentReferenceAttribute values while traversing the tree to the top. In the trivial case (one level) the value will be the same as parentReferenceAttribute. This attribute means nothing if parentCode is not specified</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="customizable" type="xsd:boolean" use="optional" default="false"/>
+    <xsd:attribute name="processEnabled" type="xsd:boolean" use="optional" default="true"/>
+    <xsd:attribute name="raiseEvents" type="xsd:boolean" use="optional" default="true"/>
+    <xsd:attribute name="rightsEnabled" type="xsd:boolean" use="optional" default="false"/>
+    <xsd:attribute name="rightCode" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If specified means that this Object is instance rights-enabled.
+          This is the right_type from cmn_sec_groups.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="obsEnabled" type="xsd:boolean" use="optional" default="false"/>
+    <xsd:attribute name="obsTableNameKey" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If specified means that this Object is OBS-enabled and the key provided matches entries in the PRJ_OBS_* tables.
+          This is the obs_code in odf_objects.  Eventually this should go away in favor of using the object code directly.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="partitionModelCode" type="xsd:string" use="optional"/>
+    <xsd:attribute name="custom" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">True if the object is custom. I.e. it is not shipped with the application. As such this flag must not be used in an OMD object registration file. Objects registered that way are by definition not custom which is the default setting for the flag.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">For internal use only.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="contextAttribute" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The code of the attribute used for displaying the context of instances (think property page context).</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="idAttribute" type="xsd:string" default="code">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The code of the attribute that is the unique ID of instances, ie the unique_name for project or the company_id for comany.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="exportEnabled" type="xsd:boolean" use="optional" default="false"/>
+    <xsd:attribute name="copyEnabled" type="xsd:boolean" use="optional" default="false"/>
+    <xsd:attribute name="viewAllEnabled" type="xsd:boolean" use="optional" default="false"/>
+  </xsd:complexType>
+  <xsd:complexType name="FromSQLType">
+    <xsd:simpleContent>
+      <xsd:extension base="AugmentSQLType">
+        <xsd:attribute name="complete" type="xsd:boolean" default="false"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="SelectSQLType">
+    <xsd:simpleContent>
+      <xsd:extension base="AugmentSQLType">
+        <xsd:attribute name="oracleHint" type="xsd:string"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+  <xsd:complexType name="TableType">
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="isPrimary" type="xsd:boolean"/>
+    <xsd:attribute name="pkColumn" type="xsd:string" use="required"/>
+    <xsd:attribute name="secondaryPkColumn" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">For a non-primary table we allow a secondary column as part of the primary key. The secondaryPkColumn must be referenced in an attribute definition with a constant value. This is to support the principal_id, principal_type use case for a secondary base table (e.g. srm_contacts).</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="TablesType">
+    <xsd:sequence>
+      <xsd:element name="table" type="TableType" maxOccurs="unbounded"/>
+      <xsd:element name="select" type="SelectSQLType" minOccurs="0" maxOccurs="2"/>
+      <xsd:element name="from" type="FromSQLType" minOccurs="0" maxOccurs="2"/>
+      <xsd:element name="where" type="AugmentSQLType" minOccurs="0" maxOccurs="2"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="ListenerType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The fully qualified class name of a class implementing com.niku.union.odf.ObjectChangeListener interface. This class will be called when the Object changes in any way. E.g. a new custom attribute is added, a display mapping is changed...</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="className" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="ChangeListenersType">
+    <xsd:sequence>
+      <xsd:element name="listener" type="ListenerType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="SecurityType">
+    <xsd:sequence>
+      <xsd:element name="viewAll" type="ViewRightType" minOccurs="0"/>
+      <xsd:element name="viewInstance" type="ViewRightType" minOccurs="0"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="SubObjectType">
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="ViewRightType">
+    <xsd:choice>
+      <xsd:element name="policy" type="sec:PolicyBaseType"/>
+      <xsd:element name="query" type="AugmentSQLType" minOccurs="0" maxOccurs="2"/>
+    </xsd:choice>
+  </xsd:complexType>
+  <xsd:complexType name="OperationsType">
+    <xsd:sequence>
+      <xsd:element name="operation" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:complexContent>
+            <xsd:extension base="OperationType"/>
+          </xsd:complexContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="OperationType">
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType"/>
+      <xsd:element name="service" type="srv:processService"/>
+      <xsd:element name="param" type="OperationParamType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+    <xsd:attribute name="isInstance" type="xsd:boolean" default="true"/>
+    <xsd:attribute name="isSystem" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="isTemplate" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="isProcessable" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Flag that determines if the operation can be used to build a Process Engine condition.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="OperationParamType">
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType"/>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+    <xsd:attribute name="dataType" type="DataType" use="required"/>
+    <xsd:attribute name="extendedType" type="ExtendedType"/>
+    <xsd:attribute name="processType" type="ProcessType"/>
+    <xsd:attribute name="lookupType" type="xsd:string"/>
+    <xsd:attribute name="required" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="multiValued" type="xsd:boolean" default="false"/>
+    <xsd:attribute name="direction" type="DirectionType" default="IN"/>
+    <xsd:attribute name="dataLocation" type="xsd:string"/>
+  </xsd:complexType>
+  <xsd:complexType name="EventsType">
+    <xsd:sequence>
+      <xsd:element name="event" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:complexContent>
+            <xsd:extension base="EventType"/>
+          </xsd:complexContent>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="EventType">
+    <xsd:sequence>
+      <xsd:element name="nls" type="NlsType"/>
+    </xsd:sequence>
+    <xsd:attribute name="code" type="xsd:string" use="required"/>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/pageView-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/pageView-2002-02.xsd
new file mode 100644
index 000000000000..043a6480c339
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/pageView-2002-02.xsd
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/pageView" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.niku.com/2002/pageView" xmlns:view="http://schemas.niku.com/2002/view">
+	<xsd:import namespace="http://schemas.niku.com/2002/view" schemaLocation="view-2002-02.xsd"/>
+	<!--Import the view schema.-->
+	<xsd:element name="page">
+		<xsd:annotation>
+			<xsd:documentation xml:lang="en">Root element for the pageView XML file. Page View XML is a result of merging view XML for all the web fragments with some of the view specific information from WMD XML for the page. Pave View XML is generate by the XMLPageBuilder and is used by the XSLT page layout templates for client-side or server-side XML transformations of fragmnet View XML and content aggregation.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType name="PageView">
+			<xsd:sequence>
+				<xsd:element name="import" type="ImportType" minOccurs="0" maxOccurs="unbounded"/>
+				<xsd:element name="portlet" type="PortletType" maxOccurs="unbounded"/>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">Unique web page id used for linking a web page to a help topic.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="space" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">Identifies the space/module to which the content of this web page belongs. When this attribute is specified and the header that this page uses contains an action element with actionId=space, the corresponding space should be highlighted when this page is displayed. </xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="template" type="xsd:string" use="optional" default="default.xsl">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">Specifies the location of the XSLT page layout template that defines content layout and performs fragment content transformation and agregation. </xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="skin" type="xsd:string" default="default">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">Defines the relative location of the UI skin directory.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="sessionId" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">User sessionId used to generate links for applet-based applications, or web clients that don't support cookies. In the later case, session id can be appended to all the links as an extra HTTP parameter (jsession).</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="appPath" type="xsd:string" default="app">
+				<xsd:annotation>
+					<xsd:documentation xml:lang="en">Defines default application path or the mapping of the main application servlet.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	<xsd:complexType name="PortletType">
+		<xsd:annotation>
+			<xsd:documentation xml:lang="en">Defines a single fragment for a page with view specific information form WMD XML and embedded view XML that describes the fragment content. </xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element ref="view:view"/>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation xml:lang="en">Unique fragment id for the whole application.</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="type" default="body">
+			<xsd:annotation>
+				<xsd:documentation xml:lang="en">Specifies the fragment type for standard fragments such as header, footer and leftNav. This information is used by the XSLT page layout template to apply appropriate transformation to each web fragment's view XML InfoSet.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="header"/>
+					<xsd:enumeration value="footer"/>
+					<xsd:enumeration value="toc"/>
+					<xsd:enumeration value="body"/>
+					<xsd:enumeration value="pageContext"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="col" default="1">
+			<xsd:annotation>
+				<xsd:documentation xml:lang="en">Defines column index for assigning location of the fragment in the web page grid layout. Fragments are layed out on the page in at most 3 columns, where each column represents a separate stack or a  bucket.  If no row is assigned, fragments are layed out in the order they are listed in web metadata and according to their column assignments. Note that all fragments are listed in ascending order of their column assignments. Column indexes start with 0, with 1 being the default wide center column. XSLT page layout template is responsible for spanning the content of web fragments if the number of web fragment columns is less than 3.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:integer">
+					<xsd:enumeration value="0"/>
+					<xsd:enumeration value="1"/>
+					<xsd:enumeration value="2"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="row" type="xsd:integer" use="optional">
+			<xsd:annotation>
+				<xsd:documentation xml:lang="en">Defines row index for assigning location of the fragment in the web page grid layout. Fragments are layed out on the page in at most 3 columns, where each column represents a separate stack or bucket. If no row is assigned, fragments are layed out in the order they are listed in web metadata and according to their column assignments. Note that all fragments are always  listed in ascending order of their column assignments. Column indexes start with 0, with 1 being the default wide center column. XSLT layout manager template is responsible for spanning the content of web fragments if the number of web fragment columns is less than 3.</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="narrow" type="xsd:boolean" default="false">
+			<xsd:annotation>
+				<xsd:documentation xml:lang="en">Denotes wheter or not the fragment can be placed in the narrow (left or right) column of the Web page grid layout.</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="span" type="xsd:boolean" default="false">
+			<xsd:annotation>
+				<xsd:documentation xml:lang="en">Denotes whether or not the content of the first web fragment for the web page should span across the whole page horizontally, ignoring multiple column grid layout for the page.</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+	<xsd:complexType name="ImportType">
+		<xsd:annotation>
+			<xsd:documentation xml:lang="en">Defines a web resource to include during content aggregation. Specifically, include is used for including references to such web resources as JavaScript and CSS files into the XHTML header of the final page.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="href" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation xml:lang="en">Specifies the location of the web resource relative to the UI skin directory.</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="type" use="required">
+			<xsd:annotation>
+				<xsd:documentation xml:lang="en">Identifies web resource type: js - JavaScript, css - CSS file.</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:string">
+					<xsd:enumeration value="js"/>
+					<xsd:enumeration value="css"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/pmd-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/pmd-2002-02.xsd
new file mode 100644
index 000000000000..632f6797e8d2
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/pmd-2002-02.xsd
@@ -0,0 +1,682 @@
+<?xml version="1.0"?>
+<!--http://www.w3.org/2001/XMLSchema-->
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/pmd" xmlns="http://schemas.niku.com/2002/pmd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xsd:include schemaLocation="common-2003-09.xsd"/>
+  <xsd:element name="persistMetaData" type="PersistMetaDataType"/>
+  <xsd:complexType name="PersistMetaDataType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Elements of type persistMetaData represents interactions with persistence mechanisms such as database servers and tries to solve two competing goals. 1. Use all the vendor specific capabilities of a given database vendor within the SQL text. 2. Appear to be portable to the application. Vendor specific functionality such as stored procedures, views and resultsets are allowed. Database portability is also facilitated by several notions. E.g. The ability to have different SQL texts per statement per database server vendor and the ability to have different SQL error codes per exception per database server vendor.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:element name="statementSet" type="StatementSetType"/>
+      <xsd:element name="statement" type="StatementType"/>
+      <xsd:element name="sql" type="SqlType"/>
+    </xsd:choice>
+    <xsd:attribute name="schemaLocation" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="StatementSetType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A statementSet describes a logical grouping of database statements. The sub statementRef elements serve as pointers to the statements in question and provides an indirection so that statements can be reused in different contexts and potetnially with different input sources and locations.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:element name="statementRef" type="StatementRefType"/>
+      <xsd:element name="statement" type="StatementType"/>
+    </xsd:choice>
+    <xsd:attribute name="location" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">For internal use only.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="IdType" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The id of the statementSet. Must be unique within the component in which it is specified and must be of the form &lt;component&gt;.ID.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="rootElementName" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">In case the statements defined in this statementSet returns data (e.g. one or more queries) and the client requested XML as output the output will be enclosed in an element specified with the rootElementName. If none is specified the output will not have this root element.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="databaseId" type="xsd:string" use="optional" default="Niku">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The databaseId refers to the specific database instance as defined in the properties.xml file to use.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="requiresLinguisticSort" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If set to true, at least one statement expects to sort something in a linguistic manner. In Oracle this translates to setting the NLS_SORT variable to a value consistent with a users chosen Locale. (NOTE: This will probably change in the next version of the Persistence Implementation to handel both Oracle and SQL Server)</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="SqlRefType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A sqlref is a reference to a sql element identified by it's id. There has to be one and only one sql element with the id of the sqlRef for a given database vendor.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="condition" type="ConditionType" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="IdType" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This is the reference to the sql element to be included.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="StatementRefType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A statementRef is a reference to a statement element identified by it's id. There has to be one and only one statement with the id of the statementRef. There may be more than one statementRef pointing to a statement however.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="staticMap" type="StaticMapType" minOccurs="0"/>
+      <xsd:element name="secondaryInput" type="SecondaryInputType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="outputMapping" type="OutputMappingType" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="IdType" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This is the reference to the statement to be executed.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="defaultSortColumn" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This value specifies the default sort column if none is passed in the data header.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="defaultSortDirection" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This value specifies the default sort direction if none is passed in the data header.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attributeGroup ref="InputAttributeGroup">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Determines the so-called driving input to the statement. Sometimes a statement requires no input in which case you specify "none" as the input source and the statement will be executed exactly once. Sometimes, e.g. in a simple query, you have input necessary to form the where-clause (e.g. an id) and the driving input will contain one node (in case of "xml" input) or one Map (in case of "map" input). While in the case of batch updates you will have more than one row of driving input and the statement will be executed once for every.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attributeGroup>
+    <xsd:attributeGroup ref="SharedStatementAttributeGroup"/>
+  </xsd:complexType>
+  <xsd:attributeGroup name="SharedStatementAttributeGroup">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Specifies attributes shared between elements of type StatementRefType and StatementType when they appear inline.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="sortColumnPath" type="xsd:string" default="/data/header/sortInfo/@sortColumn">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This XPath value specifies the location of the column to sort on. Defaults to the Data XML defined position of the sort column.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="sortDirectionPath" type="xsd:string" default="/data/header/sortInfo/@sortDirection">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This XPath value specifies the location of the sort direction. Defaults to the Data XML defined position of the sort direction.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="slicePath" type="xsd:string" default="/data/header/pagination/sliceInfo/@slice">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This XPath value specifies the location of the slice (aka. page) to get. Defaults to the Data XML defined position of the slice.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="sliceSizePath" type="xsd:string" default="/data/header/pagination/sliceInfo/@sliceSize">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This XPath value specifies the location of the slice size (aka. rows per page) to use. Defaults to the Data XML defined position of the slice size.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="defaultSliceSize" type="xsd:integer" default="20">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This integer value specifies the default slice size (aka. rows per page) to use. Defaults to 20.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="ignoreIfError" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If the call to the persistence layer is done in error mode and this attribute is set to "true" on execution of the statementSet this particular statement will be ignored.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="hideResultSets" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If true, the potential result sets from this statement are only visible within the enclosing statement set. I.e. to be used as input (using inputSource="responseMap") but will not affect the number of result sets returned from executing the complete statement set.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:attributeGroup>
+  <xsd:attributeGroup name="InputAttributeGroup">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Specifies information needed to identify a subset of input as either driving or secondary input.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="inputSource" type="InputSourceType" default="none">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The source of input.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="inputLocation" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">XPath specifying a node set which serves as input. Required if inputSource="xml".</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="inputMapIndex" type="xsd:integer" default="0">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The index of the array of Maps which serves as input. Required if inputSource="map" or inputSource="responseMap".</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:attributeGroup>
+  <xsd:simpleType name="InputSourceType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A call to a PMD statementSet can be issued with no input or one of three input sources. If "none" is specified the statement will be executed exactly once. If "xml" is specified an input document is expected and if "map" input is expected is the form of one or more arrays of maps. If "staticMap" is specified a subelement of type StaticMapType is expected to be provided as input. If "responseMap" is specified input is taken from the potentially partial result created by a statement preceding this statement in the current statementSet.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="none"/>
+      <xsd:enumeration value="xml"/>
+      <xsd:enumeration value="map"/>
+      <xsd:enumeration value="staticMap"/>
+      <xsd:enumeration value="responseMap"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="StaticMapType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a static map specified in a PMD file. I.e. one or more entry elements which map a name to a value.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="entry" type="StaticMapEntryType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="StaticMapEntryType">
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="value" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="SecondaryInputType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">A statement can require input both from the driving input and from some other source. An example could be a master-detail update. One statement would be the master update which would use input from one part of the total set of input data. This update would then be followed by the detail update which would use inout from both the detail (driving) input as well as the master (secondary) input (e.g. the primary key of the master record).</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="staticMap" type="StaticMapType" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="IdType" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This id identifies the secondary input and must be unique within the statementRef. See also the secondaryInputId attribute of ParamType.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="mirrorDrivingInputRows" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Input from secondary input will be taken from the first row only unless this attribute is set to "true". If set to "true", the secondary input is assumed to have the same number of rows as the driving input and when row N from the driving input is processed secondary input will be taken from row N of the secondary input.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attributeGroup ref="InputAttributeGroup">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If the secondary input contains more than one row data will always be taken from the first.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attributeGroup>
+  </xsd:complexType>
+  <xsd:simpleType name="DatabaseVendorType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The persistence implementation currently supports SQL Server 2000 (mssql) and Oracle 8.1.7 (oracle). If the construct specified is identical for both these databases specify "all".</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="mssql"/>
+      <xsd:enumeration value="oracle"/>
+      <xsd:enumeration value="all"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="DataType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="string">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Specifies Unicode strings of any length.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="searchString">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Specifies Unicode strings that will be preprocessed to implement our search string functionality used in a SQL "like" clause. For example, a '*' will be replaced by a '%' and a '%' will be replaced by "\%". This means that all special characters are escaped by a '\' so in a statement the "like" clause will have to contain "ESCAPE '\'" to tell the database that '\' is the escape character.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="int">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Signed integer with 9 digit precision.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="long">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Signed integer with 18 digit precision.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="double">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Signed floating point value with 15 digit precision.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="bigDecimal">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Signed numeric value with aribitrary precision. Note that both SQL Server and Oracle supports at most 38 digits of precision.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="date">
+        <xsd:annotation>
+          <xsd:documentation>Date value including a time component.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="dateNoTime">
+        <xsd:annotation>
+          <xsd:documentation>Date value with no time component.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="blob">
+        <xsd:annotation>
+          <xsd:documentation>Binary large object of arbitrary size.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="clob">
+        <xsd:annotation>
+          <xsd:documentation>Character large object of arbitrary size.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="resultSet">
+        <xsd:annotation>
+          <xsd:documentation>ResultSet (Cursor). Only used for Oracle Stored Procs OUT parameter.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="nullIndicator">
+        <xsd:annotation>
+          <xsd:documentation>An integer value that will evaluate to 1 if the data specified is NULL or 0 otherwise.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="valueIndicator">
+        <xsd:annotation>
+          <xsd:documentation>An integer value that will evaluate to 0 if the data specified is NULL but present (e.g. an empty attribute in "xml" input), 1 if the data specified is present and not NULL and 2 otherwise (i.e. it was not present in the input at all).</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ReplaceType">
+    <xsd:restriction base="MacroType">
+      <xsd:enumeration value="normalized_timestamp">
+        <xsd:annotation>
+          <xsd:documentation>Will evaluate to the current date and time at runtime and use the normalizeDate method on it.  This allows us to get the full day.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="users_timestamp">
+        <xsd:annotation>
+          <xsd:documentation>Will evaluate to the current date and time at runtime in the users timezone.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="rowNum">
+        <xsd:annotation>
+          <xsd:documentation>Will evaluate to the current row number (0-based).</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="dbVendor">
+        <xsd:annotation>
+          <xsd:documentation>Will evaluate to the vendor string of the current statementSet.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="sessionId">
+        <xsd:annotation>
+          <xsd:documentation>Session Id from the SecurityIdentifier. Same as CMN_SESSION.ID</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="resourceId">
+        <xsd:annotation>
+          <xsd:documentation>Resource Id. Same as SRM_RESOURCES.ID</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="resourceCode">
+        <xsd:annotation>
+          <xsd:documentation>Resource Code. Same as SRM_RESOURCES.UNIQUE_NAME</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="DirectionType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="IN">
+        <xsd:annotation>
+          <xsd:documentation>Represents an IN parameter.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="INOUT">
+        <xsd:annotation>
+          <xsd:documentation>Deprecated! Do not use!.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="OUT">
+        <xsd:annotation>
+          <xsd:documentation>Represents an OUT parameter.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="VariationType">
+    <xsd:annotation>
+      <xsd:documentation>Used to dynamically change the text of a statement base on input.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="includeIfNull" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>Determines whether it's the NULLness or the non-NULLness that determines whether to include the variation text.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="includeIfPresent" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>Determines if the presence of the input (rather than the NULLness) that determines whether to include the variation text.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="text" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>If the variation condition is evaluated to true this text will be appended to the current text of the statement.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:simpleType name="SequenceTypeType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="currentValue"/>
+      <xsd:enumeration value="nextValue"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:attributeGroup name="SequenceGroup">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Used to mimic the behavior of Oracle Sequences. The attributes of the SequenceGroup will be passed to the CMN_ID_SP stored procedure for generation of new IDs. If inTransaction=true, the call to CMN_ID_SP will be part of the transaction in question (i.e. no new "System" conection will be used) and only one value will be grabbed. If inTransaction=false (default) CMN_ID_SP is not necessarily called at all since IDs will be cached and when it is called, it will be called outside the transaction of the actual statement (probably an insert statement...). Setting this flag to "true" can help solve some blocks on SQL Server.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="sequenceName" type="xsd:string"/>
+    <xsd:attribute name="tableName" type="xsd:string"/>
+    <xsd:attribute name="sequenceType" type="SequenceTypeType"/>
+    <xsd:attribute name="inTransaction" type="xsd:boolean" default="false"/>
+  </xsd:attributeGroup>
+  <xsd:attributeGroup name="LookupGroup">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Used to improve usablity and performance of statements by removing need to join with lookup tables.  Instead only need to use the know lookup type and code to get the lookup id.  Also helps developers not hard code ids in their SQL.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="lookupCode" type="xsd:string"/>
+    <xsd:attribute name="lookupType" type="xsd:string"/>
+  </xsd:attributeGroup>
+  <xsd:attributeGroup name="SecurityObjectGroup">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Used to improve usablity and performance of statements by removing need to join with CMN_SEC_OBJECT table.  Instead only need to use the know object type, object code, and component to get the object id.  Also helps developers not hard code ids in their SQL.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="objectCode" type="xsd:string"/>
+    <xsd:attribute name="objectType" type="xsd:string"/>
+    <xsd:attribute name="componentCode" type="xsd:string"/>
+  </xsd:attributeGroup>
+  <xsd:complexType name="ParamType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Used to specify a bind variable in the statement. The param elements match the bind variables by sequence. I.e. the first '?' must be matched by the first param element.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="variation" type="VariationType" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">The value specified by this parameter will determine if the statement text will be altered by this variation.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="name" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This is the key of the value in the input (driving or secondary) map. Will not be used in case of "xml" input.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="path" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">This is the relative XPath expression of the value in the input (driving or secondary) node set. Will not be used in case of "map" input.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="secondaryInputId" type="IdType">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If specified, must match a secondaryInput element of the statementRef and then the value specified by name/path will be used in this secondary input instead of the driving input.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="type" type="DataType">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The type of the bind variable. Required unless the the replace attribute or the SequenceGroup attributes or the LookupGroup attributes are specified.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="replace" type="ReplaceType">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">One of the possible replacements will be used to bind the variable.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="direction" type="DirectionType" default="IN">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Determines the direction of the bind variable.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="defaultValue" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies a value to use in case the value otherwise specified turns out to be NULL (or not exist).</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="defaultReplace" type="ReplaceType">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies a replacement macro to use in case the value otherwise specified turns out to be NULL (or not exist).</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="useDefaultIfNullButPresent" type="xsd:boolean" default="true">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Set to true if the defaultValue/defaultReplace should be used even if the value was passed but null. If set to false the defaultValue/defaultReplace will only be used if that value is not present in the input at all</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="constantValue" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies a constant value to use irrespective of the value otherwise specified.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="constantNull" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies that the value should be bound to NULL irrespective of the value otherwise specified.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attributeGroup ref="SequenceGroup"/>
+    <xsd:attributeGroup ref="LookupGroup"/>
+    <xsd:attributeGroup ref="SecurityObjectGroup"/>
+    <xsd:attribute name="scale" type="xsd:integer" default="-1">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">In case of a non-integer numeric value this specifies the scale expected.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="sessionId" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If specified a value corresponding to it will be looked up in the current session and use to bind the variable.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dynamicReplacement" type="ReplacementStringType">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If specified corresponds to a replacement of dynamic SQL. This parameter will be expanded to (or collapsed) based on the parameters passed with the dynamic SQL text passed with the given string.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="expressionListTag" type="ReplacementStringType">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">If specified the parameter is assumed to be an expression list to be used in a SQL in clause. Normal bind variables cannot be used for an expression list so an explicit string replacement will be used at runtime and the value of this attribute is the unique tag in the SQL text where the string replacement will happen. The elements of the list are expected to be of the data type specified. The list of can be passed as a java.lang.String (elements delimited by @expressionListDelimiter), an array of Objects (i.e. Object[]) or a java.util.Collection of Objects. The elements are not expected to be formatted for the list even if passed a string. I.e. string elements should not be enclosed in single quotes and no parentheses should be present. At runtime a proper SQL expression list will be constructed based on the input and the data type specified. Note that much like in the case with Variations only the first row in the driving input will be used to manipulate the SQL with the expression list.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="expressionListDelimiter" type="xsd:string" default=",">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en"/>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="arrayType" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the type of the array parameter passed. This type must be a VARRAY or a nested table type. Array parameters are only supported for Oracle at this time.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="SqlBaseType">
+    <xsd:annotation>
+      <xsd:documentation>Specifies the structure of the actual SQL statement.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="text" type="xsd:string" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>The base text of a segment of the actual SQL statement. This text can be altered by variations.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="param" type="ParamType" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>The parmeters to use for this segment's bind variables.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="SqlType">
+    <xsd:annotation>
+      <xsd:documentation>Specifies the structure of the actual SQL statement.</xsd:documentation>
+    </xsd:annotation>
+		<xsd:complexContent>
+			<xsd:extension base="SqlBaseType">
+        <xsd:sequence>
+          <xsd:element name="condition" type="ConditionType" minOccurs="0" maxOccurs="1"/>
+          <xsd:element name="dynamicDefault" type="DynamicDefaultType" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Default for dynamic replace parameters.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="location" type="xsd:string" use="optional">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">For internal use only.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="id" type="IdType" use="optional">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">The id of the sql element. Must be unique within the component in which it is specified and must be of the form &lt;component&gt;.ID. This is used to reference a sql element in a sqlRef.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="dbVendor" type="DatabaseVendorType" default="all">
+          <xsd:annotation>
+            <xsd:documentation>If the SQL specified is vendor specific specify the corresponding vendor here.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="dbVersion" type="xsd:string" use="optional">
+          <xsd:annotation>
+            <xsd:documentation>If the SQL specified is vendor version specific specify the corresponding version here.
+            Can specify multiple versions using a comma-delimited list, and each version may be prefixed with a
+            traditional operator: !, &gt;, &lt;, &gt;=, or &lt;=.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="xpathCondition" type="xsd:string">
+          <xsd:annotation>
+            <xsd:documentation>An XPath expression that when applied to an input document is used to determine whether to include the SQL snippet or not. I.e. when the result is non-empty, the snippet will be included other it is not.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+			</xsd:extension>
+		</xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="DbErrorType">
+    <xsd:attribute name="dbCode" type="xsd:integer" use="required">
+      <xsd:annotation>
+        <xsd:documentation>The database specific error code (e.g. Oracle unique key violation has an error code of 1) or the code returned from a user supplied excpetion raised in a stored procdure.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dbVendor" type="DatabaseVendorType" use="required">
+      <xsd:annotation>
+        <xsd:documentation>The vendor for which this native error code is valid.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ErrorMappingType">
+    <xsd:annotation>
+      <xsd:documentation>Elements of type errorMapping maps DB specific error codes to Application specific error codes. E.g. Oracle signals a unique key violation with an error code equal to 1 while SQL Server reports the same error with code 2601. To be able to give these errors context you specify mappings between these DB specific codes to something that makes sense in the application.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="dbError" type="DbErrorType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="applicationCode" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>The code you want to be passed to upper layers when the dbCode is returned from the DB of type dbVendor in one of the dbError elements. If the output of the PMD is XML then this application code will be returned in the header element. If the output is of Object type then a PersistenceApplicationException will be thrown with the appropriate information.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="StatementType">
+    <xsd:annotation>
+      <xsd:documentation>A statement element contains the actual SQL text. Statements can be reused across multiple statementSets.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="secondaryInput" type="SecondaryInputType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="errorMapping" type="ErrorMappingType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:choice maxOccurs="unbounded">
+        <xsd:element name="sql" type="SqlType"/>
+        <xsd:element name="sqlRef" type="SqlRefType"/>
+      </xsd:choice>
+      <xsd:element name="outputMapping" type="OutputMappingType" minOccurs="0"/>
+      <xsd:element name="expectedResults" type="ExpectedResultsType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="location" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">For internal use only.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="IdType">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The id of the statement. Must be unique within the component in which it is specified and must be of the form &lt;component&gt;.ID.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="subjectToSorting" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>Set to true if this query is subject to sorting. I.e. an order by will be appended to it at runtime based on an input parameter (sortColum). Note that there must not be an order by clause in the sql text or this will fail.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="subjectToSlicing" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>Set to true if one of the result sets in this statement is subject to slicing. I.e. a slice of a result set should be returned instead of all rows. If set to true the result set to be sliced is specified by the slicedResultSetIndex attribute.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="slicedResultSetIndex" type="xsd:integer" default="0">
+      <xsd:annotation>
+        <xsd:documentation>Specifies the index (0-based) of the result set that should be sliced. Note that only one result set in a statement can be sliced.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="batchable" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation>Set to true if this statement can be executed in batch mode. This should include inserts, updates and calls to stored procedures without OUT parameters. Queries can never be batched.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attributeGroup ref="SharedStatementAttributeGroup"/>
+    <xsd:attributeGroup ref="InputAttributeGroup"/>
+    <xsd:attribute name="rowNumColumn" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>If the statement is supposed to be sliced and the analytic functions row_number() over (order by x) and count(*) over() are used this attribute specifies the alias of the row number column.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="totalRowsColumn" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>If the statement is supposed to be sliced and the analytic functions row_number() over (order by x) and count(*) over() are used this attribute specifies the alias of the total number of rows column (count(*)).</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dynamicOrderByTag" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation>If the statement is supposed to be sliced and the analytic functions row_number() over (order by x) and count(*) over() are used this attribute specifies the dynamic SQL tag specifying the location of the order by clause for row_number() column.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="OutputMappingType">
+    <xsd:annotation>
+      <xsd:documentation>The outputMapping specifies how to structure or name the result set from the database.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="resultSetMap" type="ResultSetMapType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="collectionElementName" type="xsd:string"/>
+    <xsd:attribute name="rowElementName" type="xsd:string"/>
+  </xsd:complexType>
+  <xsd:complexType name="ResultSetMapType">
+    <xsd:attribute name="resultSetId" type="xsd:integer" default="-1"/>
+    <xsd:attribute name="collectionElementName" type="xsd:string"/>
+    <xsd:attribute name="rowElementName" type="xsd:string"/>
+  </xsd:complexType>
+  <xsd:complexType name="ExpectedResultsType">
+    <xsd:attribute name="count" type="xsd:integer" default="1"/>
+    <xsd:attribute name="resultSetIndex" type="xsd:integer" default="0"/>
+    <xsd:attribute name="errorCode" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="ConditionType">
+    <xsd:attributeGroup ref="InputAttributeGroup"/>
+    <xsd:attribute name="not" type="xsd:boolean" use="optional" default="false"/>
+    <xsd:attribute name="count" type="xsd:integer" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="DynamicDefaultType">
+    <xsd:complexContent>
+      <xsd:extension base="SqlBaseType">
+        <xsd:sequence>
+          <xsd:element name="condition" type="ConditionType" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+        <xsd:attribute name="tag" type="xsd:string" use="required"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:simpleType name="ReplacementStringType">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="@[a-z,A-Z,0-9,_]+@"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="IdType">
+    <xsd:restriction base="xsd:string">
+      <xsd:pattern value="[a-z,A-Z,0-9,_,\.,-]+"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/security-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/security-2002-02.xsd
new file mode 100644
index 000000000000..5aa359eb5c0e
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/security-2002-02.xsd
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v3.0.7 NT (http://www.xmlspy.com) by Jake Throgmorton (NIKU) -->
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/security" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.niku.com/2002/security" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xsd:simpleType name="featureType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="NONE"/>
+      <xsd:enumeration value="base"/>
+      <xsd:enumeration value="project"/>
+      <xsd:enumeration value="resource"/>
+      <xsd:enumeration value="financial"/>
+      <xsd:enumeration value="opportunity"/>
+      <xsd:enumeration value="extranet"/>
+      <xsd:enumeration value="studio"/>
+      <xsd:enumeration value="portfolio"/>
+      <xsd:enumeration value="investment"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="componentType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="NONE"/>
+      <xsd:enumeration value="BPM"/>
+      <xsd:enumeration value="SRM"/>
+      <xsd:enumeration value="PAC"/>
+      <xsd:enumeration value="CMN"/>
+      <xsd:enumeration value="WKF"/>
+      <xsd:enumeration value="CLB"/>
+      <xsd:enumeration value="MKT"/>
+      <xsd:enumeration value="BIZ"/>
+      <xsd:enumeration value="RSM"/>
+      <xsd:enumeration value="PRJ"/>
+      <xsd:enumeration value="XDM"/>
+      <xsd:enumeration value="CAL"/>
+      <xsd:enumeration value="NTD"/>
+      <xsd:enumeration value="REQ"/>
+      <xsd:enumeration value="RPT"/>
+      <xsd:enumeration value="XOG"/>
+      <xsd:enumeration value="ADM"/>
+      <xsd:enumeration value="PMA"/>
+      <xsd:enumeration value="TMS"/>
+      <xsd:enumeration value="INV"/>
+      <xsd:enumeration value="IDA"/>
+      <xsd:enumeration value="RIM"/>
+      <xsd:enumeration value="ITL"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="operatorType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="or"/>
+      <xsd:enumeration value="and"/>
+      <xsd:enumeration value="not"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:element name="acl">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Access control list root element for defining multiple policies in an external file for WMD and other XML file types.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="policy" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element ref="condition" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="schemaLocation" type="xsd:string" use="optional"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:complexType name="PolicyBaseType">
+    <xsd:attribute name="access" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The group or right that is associated with the object and users.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="objectType" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">
+        	The type of object (e.g. PAGE, FILE, LINK, etc.), if the string is surrounded by {} then it refers
+        	to an HTTP parameter, rather than being hard coded.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="permission" type="xsd:string" default="READ">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">the permission (e.g. READ, WRITE, DELETE, etc.)</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="component" type="componentType" default="NONE">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">the component the policy belongs to</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="PolicyType">
+    <xsd:attribute name="access" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The group or right that is associated with the object and users.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="objectType" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">
+        	The type of object (e.g. PAGE, FILE, LINK, etc.), if the string is surrounded by {} then it refers
+        	to an HTTP parameter, rather than being hard coded.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="permission" type="xsd:string" default="READ">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">the permission (e.g. READ, WRITE, DELETE, etc.)</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="component" type="componentType" default="NONE">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">the component the policy belongs to</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">identifier for the policy</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="objectId" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">the object instance id (e.g. an instance of a FILE)</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="feature" type="featureType" default="NONE">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">the feature the policy belongs to</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:element name="policy" type="PolicyType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines user policy (permission,object,right/group) for a WMD element. Examples of WMD elements  that  might have a policy defined are: web page, action, and portlet.</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:element name="condition">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The condition is a container for policies that are linked together to make a  complex boolean relationship.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element ref="policy" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element ref="condition" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:sequence>
+      <xsd:attribute name="id" type="xsd:string" use="required">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">identifier for the complex policy</xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
+      <xsd:attribute name="operator" type="operatorType" use="required">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Used to link contained policies.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/service-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/service-2002-02.xsd
new file mode 100644
index 000000000000..06794e858f8f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/service-2002-02.xsd
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/service" xmlns="http://schemas.niku.com/2002/service" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <xsd:simpleType name="typeType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="xbl"/>
+      <xsd:enumeration value="pmd"/>
+      <xsd:enumeration value="wsil"/>
+      <xsd:enumeration value="xmlFile"/>
+      <xsd:enumeration value="java"/>
+      <xsd:enumeration value="data"/>
+      <xsd:enumeration value="xsl"/>
+      <xsd:enumeration value="rss"/>
+      <xsd:enumeration value="htmlData"/>
+      <xsd:enumeration value="nsql"/>
+      <xsd:enumeration value="odf"/>
+      <xsd:enumeration value="odfUpdate"/>
+      <xsd:enumeration value="odfDelete"/>
+      <xsd:enumeration value="jbl"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="stateType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="init"/>
+      <xsd:enumeration value="put"/>
+      <xsd:enumeration value="get"/>
+      <xsd:enumeration value="getMergePut"/>
+      <xsd:enumeration value="merge"/>
+      <xsd:enumeration value="clear"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="transactionType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="none"/>
+      <xsd:enumeration value="dbTransaction"/>
+      <xsd:enumeration value="userTransaction"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="XSDType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en"/>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:any minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="type" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="service" abstract="true">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en"/>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="bindings" type="BindingsType" minOccurs="0"/>
+      <xsd:element name="caches" type="CachesType" minOccurs="0"/>
+      <xsd:element name="sessionHandler" type="SessionHandlerType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="request" type="XSDType" minOccurs="0" maxOccurs="1"/>
+      <xsd:element name="response" type="XSDType" minOccurs="0" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="xsd" type="xsd:string" use="optional"/>
+    <xsd:attribute name="type" type="typeType" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">
+          Identifies the type of namespace being used for this description, e.g.
+          xbl - Niku's XBL files
+          pmd - Niku's PMD files
+          wsil - W3C's WSIL files
+          xmlFile - xml file located on the harddrive
+          java - java class supporting ServiceControlBinding interface
+          data - take the input XML, validate it and then return it to the client.
+          xsl - transform the input XML via  the supplied XSL
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="componentId" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">ComponentId of the service.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>    
+    <xsd:attribute name="description" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Location of the description XML file.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>   
+    <xsd:attribute name="validation" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Location of the Data Validation XML file used for complex field validation.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="dynamicValidation" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en"/>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="resource" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Location of any resource bundles that should be used by the service.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="sessionKey" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Unique session identifier used to retreive the state information for the service.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="sessionId" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Deprecated.  Use sessionKey.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="state" type="stateType" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">
+          Specifies the session state for the services that require state information to persist across multiple service calls.
+          init - is the default state and has no interaction with the cache whatsoever.
+          put - Places the input document within the cache prior to any service processing.
+          get - Retrieves the cached document from the cache and merges it (the body section only, NOT the header section ) into the input document.  Again prior to any service processing.
+          getMergePut - Retrieves the cached document from the cache and merges it (the body section only, NOT the header section ) into the input document and then places the new version
+          of the document back into the cache.  Again prior to any service processing.
+        </xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="retrieveService">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">
+        This is used for services that retrieve XML.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexContent>
+      <xsd:extension base="service">
+        <xsd:attribute name="transaction" type="transactionType" use="optional" default="none">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+              Specifies the transaction state for the services that require transactions.
+              none - no transaction is required.
+              dbTransaction - database transaction is required, e.g. set autoCommit = false on a JDBC connection.
+              userTransaction - JTA/JTS UserTransaction is required.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="processService">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">
+        This is used for services that process XML.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexContent>
+      <xsd:extension base="service">
+        <xsd:attribute name="transaction" type="transactionType" use="optional" default="dbTransaction">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">
+              Specifies the transaction state for the services that require transactions.
+              none - no transaction is required.
+              dbTransaction - database transaction is required, e.g. set autoCommit = false on a JDBC connection.
+              userTransaction - JTA/JTS UserTransaction is required.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="BindingsType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a list of service bindings.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="binding" type="BindingType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="BindingType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a reference to the service binding.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="location" type="xsd:string"/>
+    <xsd:attribute name="componentId" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The component in which the binding file is located.  If not specified, it will default to the componentId of the service</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="CachesType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a list of caches that should be cleared after the service has been executed.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="cache" type="CacheType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CacheType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Specifies a cache or a specific element in a cache to be cleared. If netiher cacheKey nor cacheKeyLocation is specified all caches will be cleared. The location attributes are XPath expressions that point to a Node Set in the output document of the service call.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="cacheKey" type="xsd:string" use="optional"/>
+    <xsd:attribute name="cacheKeyLocation" type="xsd:string" use="optional"/>
+    <xsd:attribute name="key" type="xsd:string" use="optional"/>
+    <xsd:attribute name="keyLocation" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="SessionHandlerType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en"></xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="state" type="stateType" use="required"/>
+    <xsd:attribute name="select" type="xsd:string" use="optional"/>
+    <xsd:attribute name="test" type="xsd:string" use="optional"/>
+    <xsd:attribute name="default" type="xsd:boolean" use="optional"/>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/trait-2005-06.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/trait-2005-06.xsd
new file mode 100644
index 000000000000..a9015db3ed47
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/trait-2005-06.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2005/trait" 
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+        xmlns="http://schemas.niku.com/2005/trait"
+        elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xsd:include schemaLocation="./trait-types-2005-06.xsd"/>
+  
+  <xsd:element name="traits" type="TraitsType"/>
+  
+</xsd:schema>
+
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/view-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/view-2002-02.xsd
new file mode 100644
index 000000000000..0fd082923b7c
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/view-2002-02.xsd
@@ -0,0 +1,1287 @@
+<?xml version="1.0"?>
+<xsd:schema
+  targetNamespace="http://schemas.niku.com/2002/view"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns="http://schemas.niku.com/2002/view"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+  <xsd:include schemaLocation="./commonUI-2005-06.xsd"/>
+  <xsd:annotation>
+    <xsd:documentation>XML schema for defining abstract application data views. This schema contains high-level, GUI-independant, but application UI specific view structures. A valid instance document would use different combinations of elements defined in this schema to describe the content or a view, and is called a view XML document. Regular XSLT stylesheet with proper namespace declarations should be used to generate view XML from a data XML document which serves as a data model for the view. The UI XSL layer transforms view XML instances into final presentation markup for a client agent to display the content of a page or a portlet. Various UI XSL libraries produce different presentation markup for the final page or portlet content, such as HTML, SVG, WML, or any other presentation markup depending on the client agent.     
+    </xsd:documentation>
+  </xsd:annotation>
+  <xsd:element name="view">
+    <xsd:annotation>
+      <xsd:documentation>An abstraction of the user interface consisting of high-level UI structures and metadata to assist in rendering.
+Attributes:
+@id - The value of the html FORM name for the portlet.
+@type - Used to specify alternate processing of the view fragment when a separate portlet is specified for a portion of the page. 
+@disableEnter - When "true"; disables the form submission when user presses the "Enter" key.
+@form - Overrides the default creation of html FORM start and end pair. 
+        "false" - for portlets that do not need a form.
+        "begin" - creates a FORM start tag only. 
+        "end" - creates FORM end tag only.
+@style - applies a css class and/or special formatting of the view
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="events" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Global view events. These events are extracted by the layout manager and appended to the page onLoad event list to be called when the page is loading. Typically these events are used for page/portlet view initialization or page redirect and require portlet pageEvent attribute to be set to true for the page processor to detect, extract, and append such events to the page onLoad event list.</xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="event" type="Event" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="title" type="Text" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Page Title  used to label the contents of a page. Appears once per page and as the HTML (browser) title.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="pageToolbar" type="ActionGroup" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Page toolbar contains a list of actions for defining navigation links that need to be displayed in the page personalization toolbar area (on the right-hand side of the page title panel). For page toolbars to be detected and extracted by the layout manager, each portlet containing such a toolbar definition in its view should also set its pageToolbar attribute to true.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="pageContext" type="CellGroup" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Page context contains a list of actions for defining page context information, such as properties of the object for displayed attributes page, and contextual information for naviagiting to this object/attributes page.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="titlebar" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Titlebar defines a portlet title bar with a portlet title, and optional list of portlet actions for different view modes and personalization.</xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="title" type="Text" minOccurs="0"/>
+              <xsd:element name="action" type="Action" minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="header" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Page header.</xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:complexContent>
+              <xsd:extension base="ActionGroup">
+                <xsd:sequence>
+                  <xsd:element name="cell" type="Cell" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+              </xsd:extension>
+            </xsd:complexContent>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="navigation" type="ActionGroup" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Navigation within a feature; appears within the content portion of the page.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="message" type="Message" minOccurs="0" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation>Error, Alert and message information.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="tabs" type="ActionGroup" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Text Tabs help to organize large areas of functionality into smaller, more manageable units. Always placed at the top of the page, the first item in the Content Header Region, and they may be used in combination with SubTabs and Page Titles. </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="subtabs" type="ActionGroup" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Sub Tabs further organize information into sub-categories below a higher level set of tabs (Icon Tabs or Text Tabs). Sub Tabs can only be used below either Icon Tabs or Text Tabs. Sub Tabs can either be followed by a Tool Bar, Look Here Alert, Action Bar-Page, Secondary Breadcrumb, or Section header.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="toolbar" type="Toolbar" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Toolbars allow for general functionality, associated with a Page or Page Section, which is not well suited to Action Bars or Button Bars. Toolbar buttons are not used for adding, deleting or performing actions on selected list objects.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="buttonbar" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Button Bar offers a set of actions and links which act in some way upon the entire page. Actions appear as buttons, and links are rendered in the standard in-line link style.</xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:complexContent>
+              <xsd:extension base="ActionGroup">
+                <xsd:attribute name="position" use="optional" default="bottom">
+                  <xsd:simpleType>
+                    <xsd:restriction base="xsd:string">
+                      <xsd:enumeration value="top"/>
+                      <xsd:enumeration value="bottom"/>
+                      <xsd:enumeration value="top-bottom"/>
+                    </xsd:restriction>
+                  </xsd:simpleType>
+                </xsd:attribute>
+              </xsd:extension>
+            </xsd:complexContent>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:choice minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Choice of having content navigation or wizard.</xsd:documentation>
+          </xsd:annotation>
+          <xsd:element name="contentNav" type="ActionGroup">
+            <xsd:annotation>
+              <xsd:documentation>Specialized navigation for a sequence of pages. Links can be marked current, available (with and without data), unavailable and finished. </xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="wizard" type="ActionGroup">
+            <xsd:annotation>
+              <xsd:documentation>Specialized navigation for a sequence of pages. Links can be marked current, available (with and without data), unavailable and finished. </xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:choice>
+        <xsd:choice minOccurs="0" maxOccurs="unbounded">
+          <xsd:annotation>
+            <xsd:documentation>Choice of having a section or  a group of sections.</xsd:documentation>
+          </xsd:annotation>
+          <xsd:element name="section" type="Section">
+            <xsd:annotation>
+              <xsd:documentation>A major unit of the page that can contain a title, actions, rows and cells. Can be a attributes (form) table,  list, hierarchy, calendar.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="group" type="SectionGroup">
+            <xsd:annotation>
+              <xsd:documentation>Used to horizontally group sections. Sections contained in a group will stack horizontally rather than vertically.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:choice>
+        <xsd:element name="legends" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Container for view level custom legend, mirroing the section level custom legend</xsd:documentation>
+          </xsd:annotation>
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="legend" type="Text" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                  <xsd:documentation>Custom legend element for view level legends.</xsd:documentation>
+                </xsd:annotation>
+              </xsd:element>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+        <xsd:element name="footer" type="ActionGroup" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Page footer.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+      </xsd:sequence>
+      <xsd:attribute name="id" type="xsd:string" use="required"/>
+      <xsd:attribute name="style" type="xsd:string" use="optional"/>
+      <xsd:attribute name="type" use="required">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="content"/>
+            <xsd:enumeration value="header"/>
+            <xsd:enumeration value="footer"/>
+            <xsd:enumeration value="navigation"/>
+            <xsd:enumeration value="footerLaunch"/>
+            <xsd:enumeration value="footerLogin"/>
+            <xsd:enumeration value="wizard"/>
+            <xsd:enumeration value="breadcrumbs"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:attribute>
+      <xsd:attribute name="disableEnter" type="xsd:boolean" use="optional" default="false"/>
+      <xsd:attribute name="pageType" use="optional">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="property"/>
+            <xsd:enumeration value="filter"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:attribute>
+      <xsd:attribute name="form" use="optional">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string">
+            <xsd:enumeration value="false"/>
+            <xsd:enumeration value="begin"/>
+            <xsd:enumeration value="end"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:attribute>
+    </xsd:complexType>
+  </xsd:element>
+  <!-- end of view element -->
+
+  <xsd:complexType name="Text">
+    <xsd:complexContent>
+      <xsd:extension base="Label">
+        <xsd:sequence>
+          <xsd:element name="sectionContext" type="CellGroup" minOccurs="0">
+            <xsd:annotation>
+              <xsd:documentation>
+                Allows there to be context in the section title.
+              </xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+
+  <xsd:complexType name="Cell">
+    <xsd:annotation>
+      <xsd:documentation>This is the most atomic element in a section.
+Attributes:
+@id - unique identifier for cell. required when the cell represents an HTML form element
+@type - Each type maps to a(n) XSLT template(s) for rendering the related toolkit pattern.
+             indent - used to indent groups of cells
+             hidden - equivalent to html input type="hidden", no display
+              checkbox - equivalent to html input type="checkbox"
+             listbox - equivalent to html select with size > 1          
+             password - equivalent to html input type="password" obscures typed text
+             radio - equivalent to html input type="radio"
+             select - equivalent to html select 
+             text - equivalent to html input type="text"
+             textarea - equivalent to html textarea
+             file - equivalent to html input type="file"
+             vgroup - vertical grouping of cells
+             hgroup - horizontal grouping of cells
+             ptrnDatePicker - pattern for date picker
+             ptrnListBoxSrtRmv - pattern for list box with a sort up/down and remove button
+             ptrnListBoxSrt - pattern for list box with a sort up/down 
+             ptrnPmpy - pattern for Push Me Pull You list boxes (left and right list boxes with arrow buttons to move items from one to the other)
+             ptrnPmpySrt - pattern for sortable Push Me Pull You list boxes (left and right list boxes with arrow buttons to move items from one to the other plus up/down)
+             ptrnRecurring - pattern for recurring date
+             rowHeader - pattern for the start of a row in a grid.  Used in calendar
+             selected - pattern for a selected special cell. Used in calendar.
+             blank - pattern for a blank cells. Used in calendar.
+             selectedBlank - pattern for a selected  blank cells. Used in calendar.
+             gap - used in the priority list pattern
+             overBudget - used in the priority list pattern
+@width - text, password - size attribute of correspondind html element, textarea - # cols, select and listbox - pixel override of width in a style
+@height - select and listbox - the number of options to display, textarea - number of rows 
+@disabled - "true" will render form elements as static value (no form widget, just its current value(s))
+@readOnly - "true" will render form elements as greyed out and uneditable
+@required -  "true" will display the required icon next to a form element
+@unique - "true" will display the unique icon next to a form element
+@enterOnce - "true" will display the enter once icon next to a form element
+@locked - "true" will display the locked icon next to a form element
+@maxDataSize - specifies the maxlength attribute of a text or password form element
+@style - applies a css class and/or special formatting of the cell
+@align - specifies the horizontal alingment of the cell contents
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="label" type="Text" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>For attributes, the label that appears to the left of the attribute table cell.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="hint" type="Text" minOccurs="0"/>
+      <xsd:element name="tip" type="Text" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Provides additional instructions to user about the item. Localized. Can be used for context sensitive help.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="event" type="Event" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Defines an event handler to map a handler function to an event that a client can trigger. (e.g. onFocus)</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="data" type="Data" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Dynamic data from Data XML.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="image" type="Image" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Represents a gif or jpg.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="xhtml" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>allows you to add xhtml to the page</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="action" type="Action" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Navigation or event triggering.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="toolbar" type="Toolbar" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Cell editing toolbar.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="message" type="Message" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="error" type="Message" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Message indicating a processing problem related to the form attribute.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="cell" type="Cell" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Group cells into logical patterns. (e.g. Push-me Pull-you)</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="optional"/>
+    <xsd:attribute name="type" use="optional" default="text">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="indent"/>
+          <xsd:enumeration value="hidden"/>
+          <xsd:enumeration value="checkbox"/>
+          <xsd:enumeration value="listbox"/>
+          <xsd:enumeration value="comboBox"/>
+          <xsd:enumeration value="password"/>
+          <xsd:enumeration value="radio"/>
+          <xsd:enumeration value="select"/>
+          <xsd:enumeration value="text"/>
+          <xsd:enumeration value="textarea"/>
+          <xsd:enumeration value="file"/>
+          <xsd:enumeration value="task"/>
+          <xsd:enumeration value="progress"/>
+          <xsd:enumeration value="vgroup"/>
+          <xsd:enumeration value="hgroup"/>
+          <xsd:enumeration value="selected"/>
+          <xsd:enumeration value="blank"/>
+          <xsd:enumeration value="ptrnDatePicker"/>
+          <xsd:enumeration value="ptrnListBoxSrtRmv"/>
+          <xsd:enumeration value="ptrnListBoxSrt"/>
+          <xsd:enumeration value="ptrnPmpy"/>
+          <xsd:enumeration value="ptrnPmpySrt"/>
+          <xsd:enumeration value="ptrnRecurring"/>
+          <xsd:enumeration value="rowHeader"/>
+          <xsd:enumeration value="selectedBlank"/>
+          <xsd:enumeration value="htmlText"/>
+          <xsd:enumeration value="preText"/>
+          <xsd:enumeration value="gap"/>
+          <xsd:enumeration value="overBudget"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="width" type="xsd:string" use="optional"/>
+    <xsd:attribute name="height" type="xsd:string" use="optional"/>
+    <xsd:attribute name="disabled" type="xsd:boolean" use="optional" default="true"/>
+    <xsd:attribute name="readOnly" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="required" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="unique" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="exact" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="enterOnce" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="locked" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="maxDataSize" type="xsd:integer" use="optional"/>
+    <xsd:attribute name="style" type="xsd:string" use="optional"/>
+    <xsd:attribute name="align" use="optional" default="left">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="left"/>
+          <xsd:enumeration value="center"/>
+          <xsd:enumeration value="right"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="textOnly" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="nowrap" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="noDynHeight" type="xsd:duration" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="Col">
+    <xsd:annotation>
+      <xsd:documentation>Used to define columns in a list table.
+Attributes:
+@id - unique identifier for a column !VERY IMPORTANT! passed as a parameter for currently sorted column
+@actionId - the action that will be followed when a sortable column hyperlink is clicked
+@type - sort - column label will be a hyperlink that navigates with the sort params, noSort - static label, checkAll - Select All icon and javascript, selected - in calendar means is highlighted specially  
+@width - sets the with attribute of the TD for the column header, can be pixels or percentage
+@align - sets the horizontal alignment of the column header (left, center, right)
+@required - displays the Required icon next to the column header label, triggers the display of the legend
+@span - sets the colspan attribute of the TD for the colmn header
+@style - CSS class - alternative action object presentation style
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="label" type="Text" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>For attributes, the label that appears to the left of the attribute cell.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="event" type="Event" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Defines an event handler to map a handler function to an event that a client can trigger. (e.g. onFocus)</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="data" type="Data" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Defines an event handler to map a handler function to an event that a client can trigger. (e.g. onFocus)</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="required"/>
+    <xsd:attribute name="actionId" type="xsd:string" use="optional"/>
+    <xsd:attribute name="type" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="sort"/>
+          <xsd:enumeration value="noSort"/>
+          <xsd:enumeration value="checkAll"/>
+          <xsd:enumeration value="selected"/>
+          <xsd:enumeration value="staticSortAsc"/>
+          <xsd:enumeration value="staticSortDesc"/>
+          <xsd:enumeration value="timePeriod"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="width" type="xsd:string" use="optional"/>
+    <xsd:attribute name="align" use="optional" default="left">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="left"/>
+          <xsd:enumeration value="center"/>
+          <xsd:enumeration value="right"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="required" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="span" type="xsd:string" use="optional"/>
+    <xsd:attribute name="style" type="xsd:string" use="optional"/>
+    <xsd:attribute name="nowrap" type="xsd:boolean" use="optional" default="true"/>
+  </xsd:complexType>
+  <xsd:complexType name="Data">
+    <xsd:annotation>
+      <xsd:documentation>Can represent either placeholders for dynamic data or paramters for JavaScript functions.
+Attributes or Option values in a Select:
+label subElement - When is a option in a select
+event subElement - When using a jumpmenu.
+@id - when specifying JavaScript parameters. 
+  paired with @value to produce javascript:myFunction('idValue=valueValue'); QUOTED
+  @id alone represents a javascript variable or html object (e.g. a form element object), produces javascript:myFunction(_helpID); NO QUOTES
+@value - when contained by a cell it represents a placeholder for dynamic data
+            when specifying JavaScript parmaters.
+            paired with @id attribute to produce javascript:myFunction('idValue=valueValue'); QUOTED
+            @value alone represents a string value, produces javascript:myFunction('valueValue'); QUOTED
+@selected - sets the selected attribute on select and radio form elements and checked on checkbox form elements
+@type - data type, can assist formatting
+          </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="label" type="Text" minOccurs="0"/>
+      <xsd:element name="event" type="Event" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="optional"/>
+    <xsd:attribute name="value" type="xsd:string" use="optional"/>
+    <xsd:attribute name="selected" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="type" use="optional">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="currency"/>
+          <xsd:enumeration value="id"/>
+          <xsd:enumeration value="int"/>
+          <xsd:enumeration value="string"/>
+          <xsd:enumeration value="boolean"/>
+          <xsd:enumeration value="double"/>
+          <xsd:enumeration value="float"/>
+          <xsd:enumeration value="percentage"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:anyAttribute processContents="skip"/>
+  </xsd:complexType>
+  <xsd:complexType name="Image">
+    <xsd:annotation>
+      <xsd:documentation>displays a gif or jpg
+Attributes:
+@url - overrides the @src attribute. specifies an absolute path to an image.
+@width - width in pixels
+@height - height in pixels
+@align - alignment
+@src - image name without the extension
+@type - image extension (gif, jpg)
+@highlight - indicates whether or not the image has mouseover behavior
+@selected - display as selected state
+          </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="tip" type="Text" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Image tool tip and alt text</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="url" type="xsd:string" use="optional"/>
+    <xsd:attribute name="width" type="xsd:string" use="optional"/>
+    <xsd:attribute name="height" type="xsd:string" use="optional"/>
+    <xsd:attribute name="align" type="xsd:string" use="optional"/>
+    <xsd:attribute name="src" type="xsd:string" use="required"/>
+    <xsd:attribute name="type" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="gif"/>
+          <xsd:enumeration value="jpg"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="highlight" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="selected" type="xsd:boolean" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="Event">
+    <xsd:annotation>
+      <xsd:documentation>Defines an event handler to map a handler function to an event that a client can trigger.
+Attributes:
+@id - the id of this event that maps directly to the JavaScript or WMLScript function name or other handler depending on the client.
+@type - the type of the event. If no type is specified the event behaves as an onClick event.
+        </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="data" type="Data" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="required"/>
+    <xsd:attribute name="type" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="onAbort"/>
+          <xsd:enumeration value="onBlur"/>
+          <xsd:enumeration value="onChange"/>
+          <xsd:enumeration value="onClick"/>
+          <xsd:enumeration value="onDblClick"/>
+          <xsd:enumeration value="onDragDrop"/>
+          <xsd:enumeration value="onError"/>
+          <xsd:enumeration value="onFocus"/>
+          <xsd:enumeration value="onKeyDown"/>
+          <xsd:enumeration value="onKeyPress"/>
+          <xsd:enumeration value="onKeyUp"/>
+          <xsd:enumeration value="onLoad"/>
+          <xsd:enumeration value="onMouseDown"/>
+          <xsd:enumeration value="onMouseMove"/>
+          <xsd:enumeration value="onMouseOut"/>
+          <xsd:enumeration value="onMouseOver"/>
+          <xsd:enumeration value="onMouseUp"/>
+          <xsd:enumeration value="onMove"/>
+          <xsd:enumeration value="onReset"/>
+          <xsd:enumeration value="onResize"/>
+          <xsd:enumeration value="onSelect"/>
+          <xsd:enumeration value="onSubmit"/>
+          <xsd:enumeration value="onUnload"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+  </xsd:complexType>
+
+  <xsd:complexType name="Action">
+    <xsd:complexContent>
+      <xsd:extension base="ActionType">
+        <xsd:sequence>
+          <xsd:annotation>
+            <xsd:documentation>Action can have either a label or image</xsd:documentation>
+          </xsd:annotation>
+          <xsd:element name="label" type="Text" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Link label</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="image" type="Image">
+            <xsd:annotation>
+              <xsd:documentation>Link image</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="tip" type="Text" minOccurs="0">
+            <xsd:annotation>
+              <xsd:documentation>Link tip, this overrides the image tip</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="data" type="Data" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Parameters for the JavaScript of the action</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="event" type="Event" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Used to call custom JS events</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="action" type="Action" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Nested action used to group actions under a parent action.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+
+  <xsd:complexType name="TextGroup">
+    <xsd:annotation>
+      <xsd:documentation>Used as a container to group cell elements</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="label" type="Text" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="style" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="CellGroup">
+    <xsd:annotation>
+      <xsd:documentation>Used as a container to group cell elements</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="cell" type="Cell" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="style" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="ColGroup">
+    <xsd:annotation>
+      <xsd:documentation>Used as a container to group column elements</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="label" type="Text" minOccurs="0"/>
+      <xsd:element name="col" type="Col" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="Row">
+    <xsd:annotation>
+      <xsd:documentation>Rows are used for modeling collections and hierarchical structures for list and tree list tables. The optional action element is for overriding tree list row element nodes with an alternative expand/collapse and leaf node actions.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexContent>
+      <xsd:extension base="CellGroup">
+        <xsd:sequence>
+          <xsd:element name="title" type="Text" minOccurs="0">
+            <xsd:annotation>
+              <xsd:documentation>The title for a row</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="action" type="Action" minOccurs="0"/>
+          <xsd:element name="row" type="Row" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="state" use="optional">
+          <xsd:simpleType>
+            <xsd:restriction base="xsd:string">
+              <xsd:enumeration value="collapsed"/>
+              <xsd:enumeration value="expanded"/>
+              <xsd:enumeration value="leaf"/>
+            </xsd:restriction>
+          </xsd:simpleType>
+        </xsd:attribute>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ActionGroup">
+    <xsd:annotation>
+      <xsd:documentation>Defines a multiple set of actions that can be represented by a menu bar, table of contents, a toolbar, etc.  
+Attributes:
+@id - type of the collection.
+@selected - id for the selected action (e.g. the currently selected tab should be disabled and highlighted)
+          </xsd:documentation>
+    </xsd:annotation>
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="action" type="Action"/>
+      <xsd:element name="separator" type="Separator"/>
+    </xsd:choice>
+    <xsd:attribute name="id" type="xsd:string" use="optional"/>
+    <xsd:attribute name="selected" type="xsd:string" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="Separator">
+    <xsd:annotation>
+      <xsd:documentation>Definies a separator for various navigation widgets and actions.</xsd:documentation>
+    </xsd:annotation>
+  </xsd:complexType>
+  <xsd:complexType name="Toolbar">
+    <xsd:annotation>
+      <xsd:documentation>Same as ActionGroup with the addition of optional cells.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence minOccurs="0">
+      <xsd:element name="cell" type="Cell" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="action" type="Action" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="SectionGroup">
+    <xsd:annotation>
+      <xsd:documentation>Used as a container to group section elements</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="section" type="Section" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="Message">
+    <xsd:annotation>
+      <xsd:documentation>Messages are used to convey important information to the user. 
+Attributes:
+@id - unique identifier of message
+@value - message text
+@type - the type of message 
+  error - indicate page processing errors (e.g. incorrect date format)
+  warning - system level waring
+  info - "Look Here"; draws attention to a section of the page (e.g. "Bill has the file checked out")
+  alert - indicate important information (e.g. user successfully added)
+  instruction - "Look Here"; draws attention to a section of the page (e.g. "Bill has the file checked out")
+  fatalError- system critical message (e.g. "No license found")
+xsd:anyAttribute - allows xml:lang attribute on the text element. 
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="cell" type="Cell" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Used when the message is dynamically generated</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="action" type="Action" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="optional"/>
+    <xsd:attribute name="value" type="xsd:string" use="optional"/>
+    <xsd:attribute name="type" use="optional" default="error">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="error"/>
+          <xsd:enumeration value="warning"/>
+          <xsd:enumeration value="info"/>
+          <xsd:enumeration value="alert"/>
+          <xsd:enumeration value="fatalError"/>
+          <xsd:enumeration value="instruction"/>
+          <xsd:enumeration value="noResults"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:anyAttribute processContents="skip"/>
+  </xsd:complexType>
+  <xsd:complexType name="Pagination">
+    <xsd:annotation>
+      <xsd:documentation>Provides the attributes necessary to render the pagination based upon the sliced data
+Attributes:
+@totalNumRows - the number of records in the complete set of data resulting from a query
+@slice - the current subset of the sliced data (0 based index)
+@sliceSize - the number of records contained in each subset of sliced data
+@actionId - the action to follow when a pagination link is clicked      
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+      <xsd:element name="label" type="Text" maxOccurs="unbounded"/>
+      <xsd:element name="action" type="Action" minOccurs="0"/>
+      <xsd:element name="data" type="Data" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="totalNumRows" type="xsd:string" use="required"/>
+    <xsd:attribute name="slice" type="xsd:string" use="required"/>
+    <xsd:attribute name="sliceSize" type="xsd:string" use="required"/>
+    <xsd:attribute name="actionId" type="xsd:string" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="Section">
+    <xsd:annotation>
+      <xsd:documentation>Subdivision of a page.
+Attributes:
+@id - unique identifier of a section
+@type - specifies the XSLT template to transform the section
+  attributes - properties section with pairs of labels and form widgets
+  list - list section with column headings and rows of cells
+  treeList - tree list section
+  collapsedTreeList - collapsed tree list section 
+   image - image section
+   pie - SVG graph
+  funnel - SVG graph
+  bubble - SVG graph
+  bar - SVG graph
+  column - SVG graph
+  line - SVG graph
+  dot - SVG graph
+@style - overrides the CSS class of the section
+@sortColumn - should match the @id attribute of the currently sorted column
+@sortDirection - direction of the sort (asc = ascending A-Z, desc = descending Z-A)
+@mode - Optional qualifier to UI rendering.  Used in attributes section rendering to specify whether label column is present.  Options are 'single' or 'multi' (default).
+          </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="message" type="Message" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Instructional text that appears at the top of the section.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="image" type="Image" minOccurs="0" maxOccurs="unbounded">
+        <xsd:annotation>
+          <xsd:documentation>Image element for sections that only hold images.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:choice minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Choice, of either having title or text tabs</xsd:documentation>
+        </xsd:annotation>
+        <xsd:element name="title" type="Text">
+          <xsd:annotation>
+            <xsd:documentation>Text and optional image contained by a single row table. Sections titles divide pages into useful groupings of information and aide the user to quickly identify relevant areas.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:sequence>
+          <xsd:element name="texttabs" type="ActionGroup">
+            <xsd:annotation>
+              <xsd:documentation>Tab navigation widget. The selected tab appears highlighted andnon-clickable</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="subtabs" type="ActionGroup" minOccurs="0">
+            <xsd:annotation>
+              <xsd:documentation>Used to provide further granularity below higher-level tabs.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:sequence>
+      </xsd:choice>
+      <xsd:element name="toolbar" type="Toolbar" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Similar to page-toolbar, but the actions are relevant to the containing section. Offer added navigation and functionality to the information grouped below.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="buttonbar" type="ActionGroup" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Contains form buttons and/or navigation links. The buttons are specific to the containing section.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="breadcrumbs" type="ActionGroup" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Sub-navigation related to the section. (e.g. a trail of resource names browsed)</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:choice>
+        <xsd:choice minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Attributes</xsd:documentation>
+          </xsd:annotation>
+          <xsd:element name="cell" type="Cell" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Represent form elements or containers for labels, images and hyperlinks</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="group" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Group attributes horizontally. Every group will create a new column of attributes.</xsd:documentation>
+            </xsd:annotation>
+            <xsd:complexType>
+              <xsd:complexContent>
+                <xsd:extension base="CellGroup">
+                  <xsd:attribute name="width" type="xsd:string"/>
+                </xsd:extension>
+              </xsd:complexContent>
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+        <xsd:sequence minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>List</xsd:documentation>
+          </xsd:annotation>
+          <xsd:element name="headerRow" type="ColGroup" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Groups of Colums in a list. The number of cells in each row should a match the total number of cols.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="col" type="Col" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Colums in a list. The number of cells in each row should a match the total number of cols.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="row" type="Row" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>row reperesents each row in a list, a row contains cells</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:sequence>
+        <xsd:sequence minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>Calendar</xsd:documentation>
+          </xsd:annotation>
+          <xsd:element name="col" type="Col" minOccurs="0" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Colums in a list. The number of cells in each row should a match the total number of cols.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="cell" type="Cell" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Represent days or hours or events</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+          <xsd:element name="group" type="CellGroup" maxOccurs="unbounded">
+            <xsd:annotation>
+              <xsd:documentation>Groupings of days or hours.  Represents weeks or hour of events.</xsd:documentation>
+            </xsd:annotation>
+          </xsd:element>
+        </xsd:sequence>
+      </xsd:choice>
+      <xsd:element name="pagination" type="Pagination" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Pagination related to the list of data.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="graphInfo" type="GraphInfo" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>If the type attribute=graph, then graphInfo must be present.  This element contains all the metadata the SVG XSL needs to render a graph</xsd:documentation>
+        </xsd:annotation>
+      </xsd:element>
+      <xsd:element name="legends" minOccurs="0">
+        <xsd:annotation>
+          <xsd:documentation>Container for section level custom legend, mirroing the view level custom legend</xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="legend" type="Text" maxOccurs="unbounded">
+              <xsd:annotation>
+                <xsd:documentation>Custom legend element for section level legends</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="optional"/>
+    <xsd:attribute name="type" use="required">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="hidden"/>
+          <xsd:enumeration value="attributes"/>
+          <xsd:enumeration value="list"/>
+          <xsd:enumeration value="treeList"/>
+          <xsd:enumeration value="collapsedTreeList"/>
+          <xsd:enumeration value="image"/>
+          <xsd:enumeration value="nugget"/>
+          <xsd:enumeration value="graph"/>
+          <xsd:enumeration value="hierarchy"/>
+          <xsd:enumeration value="flatHierarchy"/>
+          <xsd:enumeration value="day"/>
+          <xsd:enumeration value="week"/>
+          <xsd:enumeration value="month"/>
+          <xsd:enumeration value="nuggetDay"/>
+          <xsd:enumeration value="nuggetWeek"/>
+          <xsd:enumeration value="nuggetMonth"/>
+          <xsd:enumeration value="availability"/>
+          <xsd:enumeration value="priorityListChart"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="style" use="optional">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="highlight"/>
+          <xsd:enumeration value="noHighlight"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="size" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>If a graph section, this is the default size of the graph</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="small"/>
+          <xsd:enumeration value="medium"/>
+          <xsd:enumeration value="large"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="sortColumn" type="xsd:string" use="optional"/>
+    <xsd:attribute name="sortDirection" use="optional" default="asc">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="asc"/>
+          <xsd:enumeration value="desc"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="mode" use="optional" default="multi">
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="single"/>
+          <xsd:enumeration value="multi"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="columns" type="xsd:integer">
+      <xsd:annotation>
+        <xsd:documentation>For use in attributes sections to provide automatic flow layout of cells into columns</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="GraphInfo">
+    <xsd:annotation>
+      <xsd:documentation>A complex type for all the graph metatdata</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="dataSeries" maxOccurs="unbounded">
+        <xsd:complexType>
+          <xsd:attribute name="numDataPoints" type="xsd:integer" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The number of data points in the series</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="numValuesPerDataPoint" type="xsd:integer" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The number of values per datapoint in the series</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+      <xsd:element name="axis" minOccurs="0" maxOccurs="2">
+        <xsd:complexType>
+          <xsd:annotation>
+            <xsd:documentation>A axis of the graph</xsd:documentation>
+          </xsd:annotation>
+          <xsd:sequence>
+            <xsd:element name="label" type="Text">
+              <xsd:annotation>
+                <xsd:documentation>The axis label</xsd:documentation>
+              </xsd:annotation>
+            </xsd:element>
+          </xsd:sequence>
+          <xsd:attribute name="name" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The name of the axis</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="x"/>
+                <xsd:enumeration value="y"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="isCategory" use="required">
+            <xsd:annotation>
+              <xsd:documentation>True if the axis is a category axis</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="true"/>
+                <xsd:enumeration value="false"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="minValue" type="xsd:double" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The minimum value of the axis</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="maxValue" type="xsd:double" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The maximum value of the axis</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="majorUnit" type="xsd:double" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The value of the major incremental unit</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="minorUnit" type="xsd:double" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The value of the minor incremental unit</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="crossesAt" type="xsd:double" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The value on the opposite axis that determines where this axis crosses the opposite axis</xsd:documentation>
+            </xsd:annotation>
+          </xsd:attribute>
+          <xsd:attribute name="labelAngle" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The angle of rotation for the tick labels</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:integer">
+                <xsd:maxInclusive value="90"/>
+                <xsd:minExclusive value="-90"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="numDigitsAfterDec" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The value on the opposite axis that determines where this axis crosses the opposite axis</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:integer">
+                <xsd:minExclusive value="0"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="isLabelGrouped" use="required">
+            <xsd:annotation>
+              <xsd:documentation>True if grouping should be used when rendering tick labels</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="true"/>
+                <xsd:enumeration value="false"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="majorTick" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The code for the type of major ticks to render</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="none"/>
+                <xsd:enumeration value="cross"/>
+                <xsd:enumeration value="inside"/>
+                <xsd:enumeration value="outside"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="minorTick" use="required">
+            <xsd:annotation>
+              <xsd:documentation>The code for the type of minor ticks to render</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="none"/>
+                <xsd:enumeration value="cross"/>
+                <xsd:enumeration value="inside"/>
+                <xsd:enumeration value="outside"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="showAxis" use="required">
+            <xsd:annotation>
+              <xsd:documentation>True if the axis, ticks, and labels should be rendered</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="true"/>
+                <xsd:enumeration value="false"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="showTickLabels" use="required">
+            <xsd:annotation>
+              <xsd:documentation>True if the tick labels should be rendered</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="true"/>
+                <xsd:enumeration value="false"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="showMajorLines" use="required">
+            <xsd:annotation>
+              <xsd:documentation>True if the major grid lines should be rendered</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="true"/>
+                <xsd:enumeration value="false"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+          <xsd:attribute name="showMinorLines" use="required">
+            <xsd:annotation>
+              <xsd:documentation>True if the minor grid lines should be rendered</xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+              <xsd:restriction base="xsd:string">
+                <xsd:enumeration value="true"/>
+                <xsd:enumeration value="false"/>
+              </xsd:restriction>
+            </xsd:simpleType>
+          </xsd:attribute>
+        </xsd:complexType>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="type" use="required">
+      <xsd:annotation>
+        <xsd:documentation>The graph type</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="bar"/>
+          <xsd:enumeration value="column"/>
+          <xsd:enumeration value="funnel"/>
+          <xsd:enumeration value="line"/>
+          <xsd:enumeration value="pie"/>
+          <xsd:enumeration value="bubble"/>
+          <xsd:enumeration value="scatterplot"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="actionId" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation>When the graph is rendered as SVG content in the browser, this is the actionId the SVG plugin should use to retrieve the SVG content</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="showLegend" use="required">
+      <xsd:annotation>
+        <xsd:documentation>Show or hide the legend</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="true"/>
+          <xsd:enumeration value="false"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="showTitle" use="required">
+      <xsd:annotation>
+        <xsd:documentation>Show or hide the title</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="true"/>
+          <xsd:enumeration value="false"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="showLines" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>Show or hide the lines of a line graph</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="true"/>
+          <xsd:enumeration value="false"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="showLineMarkers" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation>Show or hide the datapoint markers on the lines of a line graph</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="true"/>
+          <xsd:enumeration value="false"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="isStacked" use="required">
+      <xsd:annotation>
+        <xsd:documentation>Bar and column graphs can be stacked.  Should be false for all other graph types</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="true"/>
+          <xsd:enumeration value="false"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="dataLabels" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>The code for the displayed value of the datapoint labels</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="none"/>
+          <xsd:enumeration value="value"/>
+          <xsd:enumeration value="percent"/>
+          <xsd:enumeration value="label"/>
+          <xsd:enumeration value="labelpercent"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="tooltipLabels" use="optional">
+      <xsd:annotation>
+        <xsd:documentation>The code for the displayed value of the mouseover labels</xsd:documentation>
+      </xsd:annotation>
+      <xsd:simpleType>
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="none"/>
+          <xsd:enumeration value="value"/>
+          <xsd:enumeration value="percent"/>
+          <xsd:enumeration value="label"/>
+          <xsd:enumeration value="labelpercent"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+    </xsd:attribute>
+    <xsd:attribute name="maxCategoryItemChars" type="xsd:integer" use="required">
+      <xsd:annotation>
+        <xsd:documentation>The number of characters in the category item with the most characters.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="maxSeriesItemChars" type="xsd:integer" use="required">
+      <xsd:annotation>
+        <xsd:documentation>The number of characters in the series item with the most characters.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/viewL10nConfig-2002-07.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/viewL10nConfig-2002-07.xsd
new file mode 100644
index 000000000000..b906bfaaba9b
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/viewL10nConfig-2002-07.xsd
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/viewL10nConfig" xmlns="http://schemas.niku.com/2002/viewL10nConfig" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+  <xsd:element name="viewL10nConfig" type="viewL10nConfigType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The root element for the configuration data</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:complexType name="viewL10nConfigType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The type definition for the root element of the configuration data</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="namespace" type="namespaceType" maxOccurs="unbounded"/>
+      <xsd:element name="element" type="elementType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="defaultLocation" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the default location of the value to localize for any non-standard element.  Usually the name of an attribute.  The special value, #content, signifies the element content.  If the defaultLocation is a name of an attribute and that attribute is not found, the element content will be localized.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="namespaceType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The type definition of a XML namespace for the configuration of the l10n tools.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The id of the namespace.  Must be unique within a instance document of this schema.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="uri" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The URI that uniquely identifies the namespace.  Must exactly match the URI of the namespace of the element in a VXSL file.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="elementType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">The type definition for an element for the configuration of the l10n tools.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The name of the element.  Must exactly match the local name of the element in the VXSL.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="namespace" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The id of the namespace the element belongs to.  Must exactly match the id of a previously defined namespace in this configuration file.   See the namespaceType</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="location" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The location of the localizable value.  Usually this is a name of a attribute of the element that contains the localizable value.  The special value, #content, can be used to signify the element content.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/web-2002-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/web-2002-02.xsd
new file mode 100644
index 000000000000..c8613fda1fe7
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/web-2002-02.xsd
@@ -0,0 +1,881 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://schemas.niku.com/2002/web" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns="http://schemas.niku.com/2002/web" xmlns:sec="http://schemas.niku.com/2002/security"
+            xmlns:srv="http://schemas.niku.com/2002/service" xmlns:xi="http://www.w3.org/2001/XInclude"
+            elementFormDefault="qualified">
+  <!-- import XInclude schema -->
+  <xsd:import namespace="http://www.w3.org/2001/XInclude" schemaLocation="xinclude.xsd"/>
+  <!-- Import security policy schema -->
+  <xsd:import namespace="http://schemas.niku.com/2002/security" schemaLocation="security-2002-02.xsd"/>
+  <!-- Import service schema -->
+  <xsd:import namespace="http://schemas.niku.com/2002/service" schemaLocation="service-2002-02.xsd"/>
+  <xsd:element name="module" type="moduleType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Web module is a collection of Web page elements that define the component's Web
+        site. Each application component defines a set of web pages for the application module in a separate WMD XML
+        file located under the src/META-INF/component/wmd directory. All web pages should be grouped into separate WMD
+        XML files or web modules based on features. WMD XML files use embedded XML elements from Security XML schema
+        (security-2002-02.xsd) for specifying security restrictions, and XInclude element for XML InfoSet reuse. In
+        order to use elements from external XML schemas, the appropriate XML namespaces (xmlns:sec and xmlns:xi) should
+        be specified for the root element of the instance document to ensure that the structure of WMD XML document can
+        be properly validated. The WMD XML schema location should also be specified in the instance document. WMD XML
+        instance documents located in union should use the following WMD XML schema location declaration:
+        xsi:schemaLocation="http://schemas.niku.com/2002/web ../xsd/web-2002-02.xsd". All other components should use
+        the following WMD XML schema location declaration: xsi:schemaLocation="http://schemas.niku.com/2002/web
+        ../../union/xsd/web-2002-02.xsd".</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:complexType name="moduleType">
+    <xsd:choice maxOccurs="unbounded">
+      <xsd:element ref="xi:include" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="moduleRef" type="ModuleRefType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="page" type="PageType" maxOccurs="unbounded"/>
+      <xsd:element name="processAction" type="ProcessActionType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="portlet" type="PortletType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:choice>
+    <xsd:attribute name="schemaLocation" type="xsd:string" use="optional"/>
+    <xsd:attribute name="id" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Defines web module id to reference web modules from other modules via moduleRef
+          element. Module id attribute value should be unique for the whole web application. This attribute must use
+          component’s name prefix to avoid name collisions. Module id is used by the moduleRef element to importing all
+          web modules for the component into one WMD XML file and registering it for the component in
+          properties.xml</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="feature" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Defines a web module feature id to classify web modules and contained pages
+          into application features. If page space attribute is not defined, module feature id will be used insted to
+          relate a page to the corrsponding application feature. This attribute must use component’s name prefix to
+          avoid name collisions, and normally defines a link to the entry page for the whole
+          feature.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ModuleRefType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Complex type for referencing and including other web modules via module id. This
+        element is a part of the future enhancements for WMD XML. Its purpose is to replace component descriptor file
+        and to allow registering of a single WMD XML file for the component in properties.xml. The registred WMD XML
+        file will use moduleRef to import all other WMD XML files for the component. Similar solution could be achieved
+        with XInclude.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Unique module id for the whole Web application. Component namespace should be
+          used for this identifier to avoid name collissions.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="PageType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Page element contains all the information about a web page required to retrieve
+        or produce page content and display the page. This includes page and process web actions for the page, optional
+        list of imported web resources (e.g. CSS and JavaScript), portlets, security restrictions, and services
+        associated with the portlets or the whole page, in case of process action and POST requests.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence id="PageSequence">
+      <xsd:choice id="IncludeChoice" minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="xi:include" minOccurs="0"/>
+        <xsd:element name="import" type="ImportType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+      <xsd:choice id="PagePolicyChoice" minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="xi:include" minOccurs="0"/>
+        <xsd:element ref="sec:policy" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element ref="sec:condition" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element ref="sec:acl" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+      <xsd:choice id="PortletChoice" maxOccurs="unbounded">
+        <xsd:element ref="xi:include" minOccurs="0"/>
+        <xsd:element name="portletRef" type="PortletRefType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="portlet" type="PortletType" maxOccurs="unbounded"/>
+      </xsd:choice>
+      <xsd:element name="pageAction" type="PageActionType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:choice id="ProcessActionChoice" minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="xi:include" minOccurs="0"/>
+        <xsd:element name="processActionRef" type="ProcessActionRefType" minOccurs="0" maxOccurs="unbounded"/>
+        <xsd:element name="processAction" type="ProcessActionType" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+      <xsd:element name="paramSet" type="ParamSetType" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Page id attribute value should be unique for a component. This attribute must
+          use component’s name prefix followed by a dot and the actual unique component page id to avoid name
+          collisions. For example, union.testPage contains component’s name followed by unique page id for the
+          component. Page id is used for caching web page metadata, and linking a web page to the corresponding
+          context-sensitive help topic.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="title" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional page title dynamically set for customized pages. This attribute should
+          not be defined in static WMD XML files because this metadata is not localized! Runtime only page
+          property.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="componentId" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Component id is an optional attribute that specifies id of the component to
+          which a web page belongs. If not specified, the system will populate this value during initialization based on
+          information specified in config/properties.xml file and the corresponding component descriptor XML file. Valid
+          component id is a value of id attribute from one of the component elements specified in config/properties.xml.
+          Component id is used to construct the file paths and navigate component directory structure for locating web
+          resources (all component-specific XML files used by WMD).</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="help" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Help is an optional attribute to specify an alternative context-sensitive help
+          topic for the web page. By default page id is used to locate the corresponding context-sensitive help topic.
+          In cases when multiple Web pages use the same help topic, help attribute with the name of the help topic
+          should be used instead. This attribute should also use component prefix to avoid name
+          collisions.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="space" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Identifies the space/module to which this web page belongs. When this attribute
+          is specified and the header or left navigation used for the page contains an action element with
+          actionId=space, the corresponding space will be highlighted when the page is displayed.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="authenticate" type="xsd:boolean" default="true">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies whether or not user authentication is required prior to displaying
+          this page. The default authenticate attribute value is true, meaning that authentication is required for all
+          web pages by default. Therefore, there is no need to set authenticate=”true” explicitly. An attempt to
+          navigate to such web page without proper login will always result in a redirect to the login web page.
+          If the authenticate attribute is explicitly set to false, certain web pages can be exposed to external users
+          bypassing the proper login procedure. Marketplace web pages fall into this category.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="personalize" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Identifies whether or not a Web page is personalizable. All portlets for a
+          personalized Web page are processed by the PortletPersonalizer, and portlets are oredered and displayed based
+          on the user preferrences.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="pageType" default="page" type="pageTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Pages are categorized into different types as specified by the type attribute.
+          This information is used by the PortletController. Page templates are abstract pages that other pages
+          reference via the template atribute for including standard portlets in a page, such as header, footer and left
+          navigation. Page layers represent page tabs. All page layers must use the same page template, and include a
+          reusable tabs portlet, but can use different page layouts.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="instanceType" type="xsd:string" default="SYSTEM">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Pages may be of specific types, these are only set from the
+          database</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="parent" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional parent page reference attribute to specify the parent/container page
+          for a page layer (tab). This attribute is required for all page layers, and ignored for other page
+          types.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="pageBuilder" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies Web page builder class responsible for content preparation. Page
+          builder produces final page content by: 1) storing portlet content in the content map if layout template is
+          defined, and forwarding the request with the content map to the corresponding template, or 2) it can directly
+          produce the final page content via aggregation of portlet content and other UI properties.There is no need to
+          specify pageBuilder attribute for the page element explicitly because only one page builder (JSPPageBuilder)
+          is available at this time for NDE. Moreover, not specifying it keeps the migration options open when client
+          side XML transformations will be integrated into the application.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="serializer" type="xsd:string" use="optional" default="html">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the content output serializer for this request as defined in
+          properties.xml.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="template" type="xsd:string" use="optional" default="union.appPage">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional attribute to specify alternative page template for the Web page. Page
+          template defines standard portlet collection to be used for page rendering. Standard page portlets are:
+          header, footer and left navigation. The available page templates are: union.appPage, union.adminPage,
+          union.popup . Each page template includes different header and/or left navigation for rendering a page. The
+          default value references page template common for all application pages. Administration pages and popups need
+          to explicitly specify the appropriate page template reference.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="layout" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional attribute to specify alternative page layout template for the Web
+          page.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="skin" use="optional" type="skinTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional attribute to assign an alternative skin or UI Look and Feel to be used
+          for rendering content of the whole web page.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:element name="portlet" type="PortletType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Global portlet element for defining reusable portlets in separate WMD XML files
+        and importing them with XInclude.</xsd:documentation>
+    </xsd:annotation>
+  </xsd:element>
+  <xsd:complexType name="PortletType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a single portlet for the web page and represents a visible section of the
+        rendered page. Portlet can contain security restrictions to evaluate for the view, a list of import elements for
+        including web resources, and different attributes for personalization, content aggregation, caching, and
+        security.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence id="PortletSequence">
+      <xsd:element name="import" type="ImportType" minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:choice id="PortletPolicyChoice" minOccurs="0" maxOccurs="unbounded">
+        <xsd:element ref="xi:include" minOccurs="0"/>
+        <xsd:element ref="sec:acl" minOccurs="0"/>
+        <xsd:element ref="sec:condition" minOccurs="0"/>
+        <xsd:element ref="sec:policy" minOccurs="0"/>
+        <xsd:element name="viewMode" type="ViewModeTypes" minOccurs="0" maxOccurs="unbounded"/>
+      </xsd:choice>
+      <xsd:element name="retrieveService" type="RetrieveServiceType" minOccurs="0" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="schemaLocation" type="xsd:string" use="optional"/>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Portlet id is a unique portlet identifier for the whole web application. As
+          with the page id, component namespace should be used for this identifier to avoid name collisions. Portlet id
+          is used as part of the key to cache portlet content and associate portlets with retrieve services for each web
+          page action.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="instanceId" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Portlet instance id used by page personalization features to display mulitple
+          instances of the same portlet on a single page.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="instanceType" type="xsd:string" default="SYSTEM">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Portlet instance type used by page personalization
+          features.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="templateId" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Portlet template id defines portlet instance id of the system page portlet from
+          which this portlet instance was created.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="componentId" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Component id is required for reusable portlets and specifies the component name
+          in which the portlet is defined. It is used to construct the location path for view XSL file and rendering
+          portlet content.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="title" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional portlet title dynamically set for portlets included by a user for
+          personalized pages. This attribute should not be defined in static WMD XML files because this metadata is not
+          localized! Runtime only portlet property.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="collection" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional portlet collection name to specify for custom page templates and JSP
+          tags to layout and agregate portlet content. For most pages and existing page templates porltetType, col, and
+          row attributes should be used to classify portlets and define their position on the page. Portlet collections
+          are only for the remaining 1% of the pages that require custom layout. All custom page templates should still
+          be defined in webroot/WEB-INF/union/templates directory in union for easy maintenance.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="portletType" default="body" type="portletTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Portlets are categorized into different types as specified by the type
+          attribute. This information is used by the page layout manager during content aggregation and allows changing
+          web page layout for the whole application by modifying only page layout template code (JSP or XSLT).
+          Additional standard portlet types could be identified in the future and added to this
+          list.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="viewType" default="vxsl" type="viewTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The portlet may process data using a VXSL, or the data may be a VXML, or even
+          straight HTML</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="view" type="xsd:string" use="optional" default="">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Relative location of the view XML or XSLT template used to generate view XML
+          from data XML received as a result of the service call for the portlet. View XML and XSL files are located
+          under /src/META-INF/component/vxsl directory. Each portlet must use a separate view XSL template. Static
+          portlets that don’t display dynamic data can reference view XML file directly via the view attribute. This
+          allows bypassing the data XML transformation with view XSL when the content of a portlet contains only
+          presentation elements.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="ui" type="xsd:string" default="view">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional name of the UI XSLT template to specify alternative UI XSLT used for
+          transforming view XML content of the portlet into web agent specific markup format, such as XHTML or SVG. This
+          attribute should be specified only in rare occasions when custom UI XSLT templates are used. The default and
+          most common top-level UI XSLT template used for most of the portlets in NDE is called “view”. It includes
+          other UI XSLT templates for rendering such common UI widgets as buttons, links, toolbars, tabs, list tables,
+          attribute tables, and trees. View is the default UI XSL template and it does not need to be specified
+          explicitly.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="col" default="1" type="colTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The row and col attributes can be used to specify a position of the body type
+          portlet content for a rendered web page. All layout managers use grid layout with rows and columns to position
+          the content of body type portlets during content aggregation. The default values for row and col portlet
+          attributes are 0 (first row) and 1(second column – center column). All portlets should be listed as children
+          of a page in an increasing order of their assigned row and column. Portlets are layed out on the page in at
+          most 3 columns, where each column represents a separate stack or a bucket. If no row is assigned, portlets are
+          laid out in the order they are listed in web metadata and according to their column assignments. Column
+          indexes start with 0, with 1 being the default wide center column. Web page layout template is responsible for
+          spanning the content of portlets if the number of portlet columns is less than 3.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="row" type="xsd:integer" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The row and col attributes can be used to specify a position of the body type
+          portlet content for a rendered web page. All layout managers use grid layout with rows and columns to position
+          the content of body type portlets during content aggregation. The default values for row and col portlet
+          attributes are 0 (first row) and 1(second column – center column). All portlets should be listed as children
+          of a page in an increasing order of their assigned row and column. Portlets are layed out on the page in at
+          most 3 columns, where each column represents a separate stack or a bucket. If no row is assigned, portlets are
+          laid out in the order they are listed in web metadata and according to their column assignments. Column
+          indexes start with 0, with 1 being the default wide center column. Web page layout template is responsible for
+          spanning the content of portlets if the number of portlet columns is less than 3.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="narrow" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Denotes wheter or not this portlet can be placed in the narrow (left or right)
+          column of the Web page grid layout.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="span" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Denotes whether or not the content of the first portlet for the web page should
+          span across the whole page horizontally, ignoring multiple column grid layout for the
+          page.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="required" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Denotes a required portlet for a Web page. The content of required portlet is
+          always displayed independent of user preferences for a personalized page. This can be used for building
+          personalized pages for companies that require their employees to read company news feeds.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="default" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Denotes a default portlet for a Web page. The content of default portlet is
+          displayed initially for a personalized web page, prior or until a user modifies personal settings. As such,
+          this portlet will be displayed when a user first hits the personal page, but the portlet is not required and
+          can be removed by changing personal settings for the page.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="pageEvents" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Denotes a portlet that contains page level events defined in view XML. Such
+          portlet view XML is queried with XPath to retrieve and transform declared page events. Page events, such as
+          onLoad, are then passed to page template to be included in page body tag.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="pageToolbar" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Denotes a portlet that contains page level toolbar defined in view XML. Such
+          portlet view XML is queried with XPath to retrieve and transform declared page toolbar links. Rendered page
+          toolbar that normally contains Personalize or Customize links will be included in the page title section of
+          the rendered page.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="state" default="normal" type="stateTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Defines portlet state for the portlet window.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="cacheable" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Determines whether or not the portlet content can be
+          cached.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="scope" default="request" type="scopeTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Determines the scope for the portlet content caching mechanism. The available
+          scopes are: application scope - portlet content with application scope is cached based on the user locale. The
+          content is generated only once and doesn’t expire. Application level cache is cleared only upon application
+          restart or refresh of the application settings. Session session – portlet content with the session scope is
+          cached based on the user session id and locale. Any portlet content that requires user right checking in
+          addition to locale sensitivity should use this setting. Session level cache is cleared whenever user session
+          expires or when a user logs off. Request scope – portlet content with the request scope is cached based on the
+          user locale and expiration time setting. This content is cached for a single request based on the action id
+          and is used for all users with the same locale. Note that content with session or user specific information
+          should not use request scope caching.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="expires" type="xsd:long" default="0">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Defines expiration time in seconds for the portlet content cached in request
+          scope. The default value (0) identifies time sensitive content that can't be cached.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="policyId" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies security policy id to check user entitlement information for viewing
+          the content of this portlet. This is a reference to one of the security restriction elements defined for a web
+          page.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ViewModeTypes">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a portlet view mode. The supported portlet view modes are: edit, max and
+        admin. Other modes can be defined. Portlet definition itself difines the default display mode (normal). View
+        modes define actions to use for portlet management, such as portlet customization and administration. The WMD
+        processor looksup view modes to generate proper links for portlet Edit and Customize links in the portlet title
+        bar.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="modeType" use="required" type="modeTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies portlet view mode type: edit, admin, max etc.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="action" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the link for the portlet view mode type for portlet management and
+          customization.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ActionType">
+    <xsd:annotation>
+      <xsd:documentation>Abstract type used for defining PageAction and ProcessAction.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Unique action identifier that maps HTTP GET and POST actions via the predefined
+          "action" parameter to this web action. It is used to locate and invoke a processAction or a pageAction, and
+          render the web page and its content. The value for this attribute should use component namespace to avoid name
+          collisions.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="authenticate" type="xsd:boolean" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies whether or not user authentication is required to invoke this
+          action.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="alias" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Unique action identifier alias that maps HTTP GET and POST actions via the
+          predefined "action" parameter to this web action. It is used to locate and invoke a processAction or a
+          pageAction, and render the web page and its content. The value for this attribute should use component
+          namespace to avoid name collisions.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="componentId" type="xsd:string">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies id of the component for this action. If not specified, the system
+          will populate this value during initialization based on information specified in properties.xml file and the
+          corresponding component descriptor XML file. Valid component id is a value of id attribute from one of the
+          component elements specified in properties.xml. Component id is used to construct the file paths and navigate
+          component directory structure for locating web resources (all component-specific XML files used by
+          WMD).</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="active" type="xsd:boolean" use="optional" default="true">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Active flag for marking enabled/disabled actions. Requesting a page or a
+          process action with an action id whose active flag is set to false will result in an error page that notifies
+          an end-user that the action or page has been temporarly disabled. The error page is Service Unavailable with
+          the http error code 503.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="policyId" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies security policy id to check user entitlement information for invoking
+          this web action. This is a reference to one of the web security restriction elements defined for a web
+          page.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="binding" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Optional location of the binding file for HTTP to XML marshalling. If not
+          specified, the default generated binding file with that name that matches action id is used. Binding files are
+          located under /src/META-INF/component/bind directory.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="useSsl" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Deprecated. Use ssl attribute instead.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="ssl" type="xsd:boolean" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Denotes wether or not to use SSL for the data transmission that is the result
+          of this action.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="compress" type="xsd:boolean" default="true">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Denotes wether to use gzip for the data transmission that is the result of this
+          action.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="inheritParamSet" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies whether to inherit the paramset defined for the process
+          action.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="PageActionType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Page action is used to trigger the display of a web page. Normally, a page action
+        is a result of HTTP GET request that triggers multiple service calls, one per each portlet, to retrieve content
+        for each portlet. Each web page must contain at least one page action that will trigger loading of a web page.
+        To request a page action via HTTP GET request, its id attribute must match the value of reserved HTTP parameter
+        (“action”).</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexContent>
+      <xsd:extension base="ActionType">
+        <xsd:sequence id="ActionSequence">
+          <xsd:element name="portlet" type="PortletType" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="retrieveService" type="RetrieveServiceType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="RetrieveServiceType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Specifies the service to call that will generate content for a portlet when page
+        action is triggered. Retrieve service is linked to the corresponding portlet via portlet id. Page action might
+        have one or more retrieve services.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexContent>
+      <xsd:extension base="srv:retrieveService">
+        <xsd:attribute name="portletId" type="xsd:string" use="required">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">Unique portlet identifier that links this service to one of the portlets
+              defined for a web page.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ProcessActionType">
+    <xsd:annotation>
+      <xsd:documentation>Defines a web action that submits page data to the backend and modifies the underlying data
+        store in any way. Processing of a process action doesn't result in a web page display, and is always followed by
+        processing of the next web page action. Process actions should be used for all requests that perform insert,
+        update, or delete operations on the data store or modify the data store in any other way. Process action element
+        contains additional attributes for performing such operations. Next action attribute specifies the action id of
+        the next page action to process, to trigger loading of a confirmation web page upon successful completion of the
+        update operation. Error action attribute specifies the action id of the next page action to process, to trigger
+        loading of the appropriate error page if the operation fails. Most of the time, this will be an action id of the
+        page action used to display a web page from which the information is posted to perform an update. This will
+        trigger redisplay, or refresh of the page with the error message displayed, and erroneous information fields
+        marked on the page.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexContent>
+      <xsd:extension base="ActionType">
+        <xsd:sequence id="ProcessActionSequence">
+          <xsd:element name="processService" type="ProcessServiceType"/>
+          <xsd:element name="redirectCondition" type="RedirectConditionType" minOccurs="0" maxOccurs="unbounded"/>
+          <xsd:element name="paramSet" type="ParamSetType" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute name="nextAction" type="xsd:string" use="optional">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">Next page action id to invoke that triggers rendering of the response web
+              page.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="errorAction" type="xsd:string">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">Fallback error action id used if the request processing
+              fails.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="redirect" type="xsd:boolean" default="false">
+          <xsd:annotation>
+            <xsd:documentation xml:lang="en">Determines whether or not a redirect is required after this web action has
+              been processed. In case of redirect=true, the nextAction attribute value will be appended to the redirect
+              url to specify what web action will be invoked next. If additional parameters are required for the
+              redirect url, they can be specified via an optional paramSet element and a list of
+              params.</xsd:documentation>
+          </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="dynamicErrorAction" type="xsd:string"/>
+      </xsd:extension>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="ProcessServiceType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Specifies the type and description of a service to call that will process an
+        update operation for a process action and further request redirect or forward. The resulting output is used as
+        an input for the next or error page action in case of request forwarding. When redirect is used, additional
+        redirect URL parameters can be specified via paramSet element. The redirect parameters can query the original
+        HTTP request or the output of the process service with XPath.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexContent>
+      <xsd:extension base="srv:processService"/>
+    </xsd:complexContent>
+  </xsd:complexType>
+  <xsd:complexType name="RedirectConditionType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a redirect condition evaluated by action controller prior to request
+        forwarding or redirect. Redirect conditions are optional and are evaluated only when the process action redirect
+        attribute is set to true. If no redirect conditions are specified, depending on the status of process action
+        executaion, the request will be redirected or forwarded to the next or error action.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence id="RedirectConditionSequence">
+      <xsd:element name="paramSet" type="ParamSetType" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="inheritParamSet" type="xsd:boolean" use="optional" default="false">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies whether to inherit the paramset defined for the process
+          action.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="source" type="sourceTypes" use="optional" default="response">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the source from which the expression matching parameter and
+          destination URL is retreived.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="parameter" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the parameter name to use for expression matching, if the source is
+          other than the response data XML document.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="expression" type="xsd:string" use="optional" default=".">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Regular expression or an XPath expression for redirect condition. The XPath
+          expression is used to query process action data XML response document, if the source attribute is set to
+          response. Otherwise, the reqular expression matching is used on the specified source parameter value to
+          determine a match.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="action" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Action id of the next action to execute if the redirect condition is met. This
+          is used as a fallback action if destination expresssion parsing fails.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="destination" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">XPath expression or parameter name for the redirect condition to retrieve
+          dynamic redirect URL from data XML response document or other sources. This attribute overwrites static action
+          specified for redirect.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="destinationAction" type="xsd:string" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">XPath expression or parameter name for the redirect condition to retrieve
+          redirect action from data XML response document or other sources. This attribute overwrites static action
+          specified for redirect.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:simpleType name="sourceTypes">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Specifies the source from which the parameter value is retreived: request - http
+        request, or response - service call response.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="constant"/>
+      <xsd:enumeration value="request"/>
+      <xsd:enumeration value="response"/>
+      <xsd:enumeration value="xml"/>
+      <xsd:enumeration value="session"/>
+      <xsd:enumeration value="cookie"/>
+      <xsd:enumeration value="header"/>
+      <xsd:enumeration value="config"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="ParamSetType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a list parameters to be used for constructing a redirect url query string
+        when performing a redirect for a web action to another web page.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="param" type="ParamType" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="ParamType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a single parameter for a redirect URL query string. If source=”request”,
+        the HTTP request parameter name specified in the value attribute will be used to retrieve the parameter value.
+        If source=”response”, the XPath expression specified in the value attribute will be used to retrieve the
+        parameter value from data XML response of the process action service call.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="name" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the parameter name.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="source" type="sourceTypes" use="optional">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies the source from which the parameter value is
+          retreived.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="value" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Specifies how the value of the parameter is retrieved. If source=request, the
+          name of the http parameter needs to be specified in the value attribute. If source=response, the value
+          parameter will be an XPath expression to query the service response XML for the parameter
+          value.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ImportType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Defines a web resource to include during content aggregation. Different web pages
+        depending on their content and features require different web resources to be included. Typically, web resources
+        represent external files that are used to render page content and provide additional presentation styles and
+        client-side dynamic behavior for a page. Currently, such web resources include CSS and JavaScript files from UI
+        toolkit. Web page builder or a page layout manager will generate a proper reference to the imported web resource
+        file from UI toolkit based on the resource name as the specified by the href attribute, its type attribute, and
+        the UI skin assigned to a web page.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="href" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">The name of the web resource to import.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+    <xsd:attribute name="type" use="optional" default="js" type="importTypes">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Identifies web resource type: js - JavaScript, css - CSS
+          file.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <!-- Element Reference Types for reuse -->
+  <xsd:complexType name="PortletRefType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Complex type for referensing reusable portlets that are standalone or defined in
+        other web pages. This element is part of the future enhancements for WMD and is not supported yet. This solution
+        will require less memory at runtime when WMD XML files are loaded and cached for request
+        processing.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Unique portlet id for the whole Web application. Component namespace should be
+          used for this identifier to avoid name collissions. Portlet id is used as part of the key to cache portlet
+          content and to associate portlets with retreive services for each web page action.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+  <xsd:complexType name="ProcessActionRefType">
+    <xsd:annotation>
+      <xsd:documentation xml:lang="en">Complex type for referensing reusable process actions that are standalone or
+        defined in other WMD XML files. This element is part of the future enhancements for the WMD and is not supported
+        yet. Its purpose is to replace existing XInclude solution. This solution will require less memory at runtime
+        when WMD XML files are loaded and cached for request processing.</xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:string" use="required">
+      <xsd:annotation>
+        <xsd:documentation xml:lang="en">Unique process action id for the whole Web application. Component namespace
+          should be used for this identifier to avoid name collissions.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
+  </xsd:complexType>
+
+  <xsd:simpleType name="pageTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="template"/>
+      <xsd:enumeration value="page"/>
+      <xsd:enumeration value="layer"/>
+      <xsd:enumeration value="container"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="skinTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="evolution1">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Niku 6.1.x UI look and feel with 2001 view XML.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+      <xsd:enumeration value="evolution2">
+        <xsd:annotation>
+          <xsd:documentation xml:lang="en">Niku 6.1.x UI look and feel with 2002 view XML.</xsd:documentation>
+        </xsd:annotation>
+      </xsd:enumeration>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="portletTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="header"/>
+      <xsd:enumeration value="footer"/>
+      <xsd:enumeration value="toc"/>
+      <xsd:enumeration value="tabs"/>
+      <xsd:enumeration value="body"/>
+      <xsd:enumeration value="pageContext"/>
+      <xsd:enumeration value="pageToolbar"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="viewTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="vxsl"/>
+      <xsd:enumeration value="vxml"/>
+      <xsd:enumeration value="html"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="colTypes">
+    <xsd:restriction base="xsd:integer">
+      <xsd:enumeration value="0"/>
+      <xsd:enumeration value="1"/>
+      <xsd:enumeration value="2"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="stateTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="normal"/>
+      <xsd:enumeration value="minimized"/>
+      <xsd:enumeration value="maximized"/>
+      <xsd:enumeration value="hidden"/>
+      <xsd:enumeration value="inactive"/>
+      <xsd:enumeration value="fullscreen"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="scopeTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="request"/>
+      <xsd:enumeration value="session"/>
+      <xsd:enumeration value="application"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="modeTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="edit"/>
+      <xsd:enumeration value="admin"/>
+      <xsd:enumeration value="max"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+  <xsd:simpleType name="importTypes">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="js"/>
+      <xsd:enumeration value="css"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xbl-2003-02.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xbl-2003-02.xsd
new file mode 100644
index 000000000000..1bde37e89085
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xbl-2003-02.xsd
@@ -0,0 +1,410 @@
+<?xml version="1.0"?>
+<!--
+
+This is the Niku XBL schema. This version complies with the
+current W3C XML Schema recommendation. To use this schema,
+start your XBL document with:
+
+    <xbl:template xmlns:xbl="http://schemas.niku.com/xbl"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://schemas.niku.com/xbl ../../union/xsd/xbl-2003-02.xsd">
+-->
+<schema targetNamespace="http://schemas.niku.com/xbl" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xpath="http://www.w3.org/TR/2001/WD-xptr-20010108/" xmlns:xbl="http://schemas.niku.com/xbl" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" blockDefault="#all" xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd">
+  <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <import namespace="http://www.w3.org/2001/XMLSchema"/>
+  <!-- 	There are three ways that you can construct a
+      schema for XSLT stylesheets that create instances of a
+      particular result structure
+
+      (a)	Declare all your result elements as a member of
+        xbl:result-element substitution group
+
+      (b) Redefine model group xbl:result-element to accomodate
+        the desired structure
+
+      (c)	Do nothing. This schema is designed to allow any element node
+        or nodes if they have any namespace other than the XSLT
+        namespace or not namespace qualified
+
+      I recommend (a) or (b)
+
+      In addition, I added a an attributeGroup util, 'result-element'
+      for your convenience
+  -->
+  <element name="result-element" type="anyType" abstract="true"/>
+  <attributeGroup name="result-element">
+    <anyAttribute namespace="##other" processContents="skip"/>
+  </attributeGroup>
+  <group name="result-element">
+    <choice>
+      <element ref="xbl:result-element"/>
+      <any namespace="##other" processContents="skip"/>
+    </choice>
+  </group>
+  <!-- *** Style Sheet Elements *** -->
+  <!-- *** 					  *** -->
+  <element name="template" type="xbl:wrapper"/>
+  <complexType name="wrapper">
+    <complexContent>
+      <extension base="xbl:anyType">
+        <sequence>
+          <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="xbl:top-level-element"/>
+            <element ref="xbl:top-level-element-and-char-instruction"/>
+            <element ref="xbl:variable"/>
+            <element ref="xbl:instruction"/>
+            <group ref="xbl:result-element"/>
+            <any namespace="##other" processContents="skip"/>
+            <!-- weaker than XSLT 1.0 -->
+          </choice>
+        </sequence>
+        <attribute ref="xml:space"/>
+      </extension>
+    </complexContent>
+  </complexType>
+  <!-- *** top level elements *** -->
+  <!-- ***					*** -->
+  <element name="top-level-element" type="xbl:anyType" abstract="true"/>
+  <element name="top-level-element-and-char-instruction" type="xbl:anyType" abstract="true"/>
+  <!-- *** top level elements and char instructions *** -->
+  <!-- ***										  *** -->
+  <element name="variable" type="xbl:variable" substitutionGroup="xbl:char-instruction"/>
+  <element name="instruction" type="xbl:anyType" abstract="true"/>
+  <element name="char-instruction" type="xbl:anyType" abstract="true" substitutionGroup="xbl:instruction"/>
+  <element name="attribute" substitutionGroup="xbl:instruction">
+    <complexType>
+      <attribute name="name" type="string" use="required"/>
+      <attribute name="value" type="string" use="optional"/>
+    </complexType>
+  </element>
+  <element name="include" substitutionGroup="xbl:instruction">
+    <complexType>
+      <complexContent>
+        <extension base="xbl:anyType">
+          <attribute name="href" type="anyURI" use="required"/>
+          <attribute name="componentId" type="xbl:expression" use="optional"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="call" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <complexContent>
+        <extension base="xbl:anyType">
+          <sequence minOccurs="0" maxOccurs="unbounded">
+            <element ref="xbl:call-param"/>
+          </sequence>
+          <attribute name="href" type="anyURI" use="required"/>
+          <attribute name="componentId" type="xbl:expression" use="optional"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="parameter">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <group ref="xbl:template" minOccurs="0" maxOccurs="unbounded"/>
+          <attribute name="name" type="xbl:QName" use="required"/>
+          <attribute name="type" type="string"/>
+          <attribute name="value" type="string"/>
+          <attribute name="position" type="string"/>
+          <attribute name="dynamicSql" type="string"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="execute" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <complexContent>
+        <extension base="xbl:anyType">
+          <sequence minOccurs="0" maxOccurs="unbounded">
+            <element ref="xbl:parameter"/>
+          </sequence>
+          <attribute name="name" type="xbl:QName" use="optional"/>
+          <attribute name="source" type="string" use="required"/>
+          <attribute name="value" type="string" use="required"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="query" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <complexContent>
+        <extension base="xbl:anyType">
+          <sequence minOccurs="0" maxOccurs="unbounded">
+            <element ref="xbl:parameter"/>
+          </sequence>
+          <attribute name="name" type="xbl:QName" use="required"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="custom" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <attribute name="name" type="string" use="required"/>
+      <attribute name="class" type="string" use="required"/>
+    </complexType>
+  </element>
+  <element name="function" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <attribute name="name" type="string" use="required"/>
+      <attribute name="class" type="string" use="required"/>
+    </complexType>
+  </element>
+  <element name="invoke" substitutionGroup="xbl:char-instruction">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <sequence>
+            <choice minOccurs="0" maxOccurs="unbounded">
+              <element ref="xbl:top-level-element-and-char-instruction"/>
+              <element ref="xbl:instruction"/>
+              <group ref="xbl:result-element"/>
+            </choice>
+          </sequence>
+          <attribute name="name" type="string" use="required"/>
+          <attribute name="class" type="string" use="optional"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="attributes" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <attribute name="select" type="xbl:expression" use="optional"/>
+    </complexType>
+  </element>
+  <element name="pagination" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <attribute name="objectSet" type="xbl:expression" use="optional"/>
+      <attribute name="page" type="xbl:expression" use="optional"/>
+      <attribute name="count" type="xbl:expression" use="optional"/>
+      <attribute name="pageSize" type="xbl:expression" use="optional"/>
+      <attribute name="pageSize" type="xbl:expression" use="optional"/>
+    </complexType>
+  </element>
+  <element name="choose" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <complexContent>
+        <extension base="xbl:anyType">
+          <sequence>
+            <element ref="xbl:when" maxOccurs="unbounded"/>
+            <element ref="xbl:otherwise" minOccurs="0"/>
+          </sequence>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="match" substitutionGroup="xbl:char-instruction">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <sequence>
+            <choice minOccurs="0" maxOccurs="unbounded">
+              <element ref="xbl:top-level-element-and-char-instruction"/>
+              <element ref="xbl:instruction"/>
+              <group ref="xbl:result-element"/>
+            </choice>
+            <element ref="xbl:else" minOccurs="0"/>
+          </sequence>
+          <attribute name="select" type="xbl:expression" use="required"/>
+          <attribute name="filter" type="string" use="optional"/>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="for-each" substitutionGroup="xbl:char-instruction">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <sequence>
+            <element ref="xbl:sort" minOccurs="0" maxOccurs="unbounded"/>
+            <choice minOccurs="0" maxOccurs="unbounded">
+              <element ref="xbl:top-level-element-and-char-instruction"/>
+              <element ref="xbl:instruction"/>
+              <group ref="xbl:result-element"/>
+            </choice>
+          </sequence>
+          <attribute name="select" type="xbl:expression" use="required"/>
+          <attribute name="filter" type="string" use="optional"/>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="if" substitutionGroup="xbl:char-instruction">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <sequence>
+            <choice minOccurs="0" maxOccurs="unbounded">
+              <element ref="xbl:top-level-element-and-char-instruction"/>
+              <element ref="xbl:instruction"/>
+              <group ref="xbl:result-element"/>
+            </choice>
+            <element ref="xbl:else" minOccurs="0"/>
+          </sequence>
+          <attribute name="test" type="xbl:expression" use="required"/>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="try" substitutionGroup="xbl:char-instruction">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <sequence>
+            <choice minOccurs="0" maxOccurs="unbounded">
+              <element ref="xbl:top-level-element-and-char-instruction"/>
+              <element ref="xbl:instruction"/>
+              <group ref="xbl:result-element"/>
+            </choice>
+            <element ref="xbl:catch" maxOccurs="unbounded"/>
+          </sequence>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="throw" substitutionGroup="xbl:char-instruction">
+    <complexType>
+      <sequence>
+        <element ref="xbl:message"/>
+      </sequence>
+    </complexType>
+  </element>
+  <element name="sort" substitutionGroup="xbl:instruction">
+    <complexType>
+      <attribute name="select" type="xbl:expression" use="optional"/>
+      <attribute name="field" type="xbl:expression" use="optional"/>
+      <attribute name="ascending" type="xbl:boolean" use="optional" default="false"/>
+      <attribute name="descending" type="xbl:boolean" use="optional" default="true"/>
+    </complexType>
+  </element>
+  <element name="message" substitutionGroup="xbl:instruction">
+    <complexType>
+      <attribute name="id" type="string" use="required"/>
+      <attribute name="type" type="string" use="optional"/>
+      <attribute name="location" type="string" use="optional"/>
+    </complexType>
+  </element>
+  <element name="log" substitutionGroup="xbl:char-instruction">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <attribute name="value" type="string" use="optional"/>
+          <attribute name="level" type="string" use="optional"/>
+          <attribute name="exception" type="string" use="optional"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <!-- *** orphans *** -->
+  <!-- *** 		 *** -->
+  <element name="otherwise">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <group ref="xbl:template" minOccurs="0" maxOccurs="unbounded"/>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="else">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <group ref="xbl:template" minOccurs="0" maxOccurs="unbounded"/>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="catch">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <group ref="xbl:template" minOccurs="0" maxOccurs="unbounded"/>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="when">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:anyType">
+          <group ref="xbl:template" minOccurs="0" maxOccurs="unbounded"/>
+          <attribute name="test" type="xbl:expression" use="required"/>
+          <attribute ref="xml:space"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <element name="call-param">
+    <complexType mixed="true">
+      <complexContent mixed="true">
+        <extension base="xbl:variable">
+          <attribute name="type" type="string"/>
+        </extension>
+      </complexContent>
+    </complexType>
+  </element>
+  <!-- *** utils - internal types and groups *** -->
+  <!-- *** not for public use                *** -->
+  <simpleType name="boolean">
+    <restriction base="string">
+      <enumeration value="true"/>
+      <enumeration value="false"/>
+    </restriction>
+  </simpleType>
+  <simpleType name="QNames">
+    <list itemType="xbl:QName"/>
+  </simpleType>
+  <group name="template">
+    <choice>
+      <element ref="xbl:top-level-element-and-char-instruction"/>
+      <element ref="xbl:instruction"/>
+      <group ref="xbl:result-element"/>
+    </choice>
+  </group>
+  <simpleType name="QName">
+    <union memberTypes="NCName QName"/>
+  </simpleType>
+  <simpleType name="element-names">
+    <list>
+      <simpleType>
+        <union memberTypes="QName">
+          <simpleType>
+            <restriction base="string">
+              <pattern value="\*"/>
+              <pattern value="\i\c*:\*"/>
+            </restriction>
+          </simpleType>
+        </union>
+      </simpleType>
+    </list>
+  </simpleType>
+  <complexType name="variable" mixed="true">
+    <complexContent mixed="true">
+      <extension base="xbl:anyType">
+        <group ref="xbl:template" minOccurs="0" maxOccurs="unbounded"/>
+        <attribute name="name" type="xbl:QName" use="required"/>
+        <attribute name="value" type="xbl:expression"/>
+      </extension>
+    </complexContent>
+  </complexType>
+  <simpleType name="expr-avt">
+    <restriction base="string"/>
+  </simpleType>
+  <simpleType name="expression">
+    <restriction base="string"/>
+  </simpleType>
+  <complexType name="anyType">
+    <anyAttribute namespace="##other" processContents="skip"/>
+  </complexType>
+</schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xinclude.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xinclude.xsd
new file mode 100644
index 000000000000..9b79b971c7d6
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xinclude.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://www.w3.org/2001/XInclude" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="include">
+		<xs:complexType mixed="true">
+			<xs:attribute name="href" type="xs:anyURI" use="required"/>
+			<xs:attribute name="parse">
+				<xs:simpleType>
+					<xs:restriction base="xs:string">
+						<xs:enumeration value="xml"/>
+						<xs:enumeration value="text"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="encoding" type="xs:string"/>
+			<xs:anyAttribute/>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xlink.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xlink.xsd
new file mode 100644
index 000000000000..764df930367b
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xlink.xsd
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema">
+	<annotation>
+		<documentation xml:lang="en">This schema provides the XLink attributes for general use.  Obtained from http://www.cs.rpi.edu/~puninj/XGMML/xlinks-2001.xsd which is a updated version of http://www.opengis.net/namespaces/gml/core/xlinks.xsd</documentation>
+	</annotation>
+	<attribute name="href" type="anyURI"/>
+	<attribute name="role" type="anyURI"/>
+	<attribute name="arcrole" type="anyURI"/>
+	<attribute name="title" type="string"/>
+	<attribute name="show">
+		<annotation>
+			<documentation>
+        The 'show' attribute is used to communicate the desired presentation 
+        of the ending resource on traversal from the starting resource; it's 
+        value should be treated as follows: 
+        new - load ending resource in a new window, frame, pane, or other 
+              presentation context
+        replace - load the resource in the same window, frame, pane, or 
+                  other presentation context
+        embed - load ending resource in place of the presentation of the 
+                starting resource
+        other - behavior is unconstrained; examine other markup in the 
+                link for hints 
+        none - behavior is unconstrained 
+               </documentation>
+		</annotation>
+		<simpleType>
+			<restriction base="string">
+				<enumeration value="new"/>
+				<enumeration value="replace"/>
+				<enumeration value="embed"/>
+				<enumeration value="other"/>
+				<enumeration value="none"/>
+			</restriction>
+		</simpleType>
+	</attribute>
+	<attribute name="actuate">
+		<annotation>
+			<documentation>
+        The 'actuate' attribute is used to communicate the desired timing 
+        of traversal from the starting resource to the ending resource; 
+        it's value should be treated as follows:
+        onLoad - traverse to the ending resource immediately on loading 
+                 the starting resource 
+        onRequest - traverse from the starting resource to the ending 
+                    resource only on a post-loading event triggered for 
+                    this purpose 
+        other - behavior is unconstrained; examine other markup in link 
+                for hints 
+        none - behavior is unconstrained
+      </documentation>
+		</annotation>
+		<simpleType>
+			<restriction base="string">
+				<enumeration value="onLoad"/>
+				<enumeration value="onRequest"/>
+				<enumeration value="other"/>
+				<enumeration value="none"/>
+			</restriction>
+		</simpleType>
+	</attribute>
+	<attribute name="label" type="string"/>
+	<attribute name="from" type="string"/>
+	<attribute name="to" type="string"/>
+	<!-- ==============================================================
+       Attributes grouped by XLink type, as specified in the W3C 
+       Recommendation (dated 2000-06-27)
+  =================================================================== -->
+	<attributeGroup name="simpleLink">
+		<attribute name="type" type="string" fixed="simple" form="qualified"/>
+		<attribute ref="xlink:href" use="optional"/>
+		<attribute ref="xlink:role" use="optional"/>
+		<attribute ref="xlink:arcrole" use="optional"/>
+		<attribute ref="xlink:title" use="optional"/>
+		<attribute ref="xlink:show" use="optional"/>
+		<attribute ref="xlink:actuate" use="optional"/>
+	</attributeGroup>
+	<attributeGroup name="extendedLink">
+		<attribute name="type" type="string" fixed="extended" form="qualified"/>
+		<attribute ref="xlink:role" use="optional"/>
+		<attribute ref="xlink:title" use="optional"/>
+	</attributeGroup>
+	<attributeGroup name="locatorLink">
+		<attribute name="type" type="string" fixed="locator" form="qualified"/>
+		<attribute ref="xlink:href" use="required"/>
+		<attribute ref="xlink:role" use="optional"/>
+		<attribute ref="xlink:title" use="optional"/>
+		<attribute ref="xlink:label" use="optional"/>
+	</attributeGroup>
+	<attributeGroup name="arcLink">
+		<attribute name="type" type="string" fixed="arc" form="qualified"/>
+		<attribute ref="xlink:arcrole" use="optional"/>
+		<attribute ref="xlink:title" use="optional"/>
+		<attribute ref="xlink:show" use="optional"/>
+		<attribute ref="xlink:actuate" use="optional"/>
+		<attribute ref="xlink:from" use="optional"/>
+		<attribute ref="xlink:to" use="optional"/>
+	</attributeGroup>
+	<attributeGroup name="resourceLink">
+		<attribute name="type" type="string" fixed="resource" form="qualified"/>
+		<attribute ref="xlink:role" use="optional"/>
+		<attribute ref="xlink:title" use="optional"/>
+		<attribute ref="xlink:label" use="optional"/>
+	</attributeGroup>
+	<attributeGroup name="titleLink">
+		<attribute name="type" type="string" fixed="title" form="qualified"/>
+	</attributeGroup>
+	<attributeGroup name="emptyLink">
+		<attribute name="type" type="string" fixed="none" form="qualified"/>
+	</attributeGroup>
+</schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xsl-1.0-1999.xsd b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xsl-1.0-1999.xsd
new file mode 100644
index 000000000000..3ab1c562d250
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation3Schemas/xsl-1.0-1999.xsd
@@ -0,0 +1,2323 @@
+<?xml version="1.0" ?>
+
+
+
+<!--
+
+
+
+
+
+
+
+This free of charge Software is provided on an "AS IS" basis, without
+
+warranty of any kind. The entire risk as to the quality and performance of
+
+the software is borne by you. Should the software prove defective, you and
+
+only you assume the entire cost of any service and repair.
+
+
+
+WEBMETHODS DOES NOT MAKE ANY EXPRESS OR IMPLIED WARRANTIES OF ANY KIND
+
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF TITLE, MERCHANTABILITY OR
+
+FITNESS FOR A PARTICULAR PURPOSE, OR WARRANTIES ARISING BY STATUTE, COURSE
+
+OF DEALING, CUSTOM OR USAGE, TRADE PRACTICE OR OTHERWISE.
+
+
+
+IN NO EVENT WILL WEBMETHODS BE LIABLE FOR ANY LOST REVENUES, PROFITS,
+
+BUSINESS OR INTERRUPTION OF BUSINESS OR OTHER SPECIAL, INDIRECT, INCIDENTAL
+
+OR CONSEQUENTIAL DAMAGES, EVEN IF WEBMETHODS HAS BEEN ADVISED OF THE
+
+POSSIBILITY OF SUCH DAMAGES, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL
+
+PURPOSE OF ANY LIMITED REMEDY OF ANY KIND, HOWEVER CAUSED AND UNDER ANY
+
+THEORY OF LIABILITY.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Schema for XSLT 1.0 Recommendation, http://www.w3.org/TR/1999/REC-xslt-19991116
+
+Using XML Schema CR Drafts, 
+
+
+
+- Part 1, http://www.w3.org/TR/2000/CR-xmlschema-1-20001024/
+
+- Part 2, http://www.w3.org/TR/2000/CR-xmlschema-2-20001024/
+
+	
+
+Author: Asir S Vedamuthu
+
+Member, XML Schema WG representing webMethods, Inc.
+
+Member, XML Schema Processor design and implementation team at webMethods
+
+
+
+webMethods, Inc.
+
+3930 Pender Drive
+
+Fairfax VA 22030
+
+
+
+(703) 450-2500
+
+
+
+Date - February 28th, 2001
+
+Version - 0.4
+
+
+
+This work is a product of the W3C XML Schema WG Task Force for authoring schema 
+
+for W3C Recommendations as an illustration of the XML Schema Language. This schema
+
+is illustrative and non-normative. Internal names created by this schema follows the
+
+same convention used by XSLT 1.0 specification.
+
+
+
+Comments were stolen from the XSLT 1.0 specification, 
+
+	http://www.w3.org/TR/1999/REC-xslt-19991116#element-syntax-summary
+
+
+
+Asir intends to update this schema as the XML Schema drafts advance from CR to 
+
+PR and then REC. Expected changes are,
+
+
+
+[1] XML Schema Namespace URI
+
+[2] Change attribute declaration syntax
+
+
+
+
+
+KNOWN ISSUES,
+
+
+
+(a) XML Schema Definition Language cannot capture a unique wild card expression in XSLT: "In addition, the xsl:stylesheet element may contain any element not from the XSLT namespace, provided that the expanded-name of the element has a non-null namespace URI" - http://www.w3.org/TR/1999/REC-xslt-19991116#stylesheet-element (This will not be an issue as per XML Schema PR)
+
+
+
+
+
+Revision History
+
+
+
+0.1 - Created
+
+0.2 - Fixed minor typos
+
+0.3 - Implemented suggestions and added fragments from James Clark
+
+0.4 - Fixed a minor typo
+
+
+
+Acknowledgement
+
+
+
+The following have contributed material to this draft:
+
+
+
+- James Clark, jjc@jclark.com
+
+
+
+
+
+Please send your comments and suggestions to asirv@webmethods.com
+
+
+
+
+
+-->
+
+
+
+
+
+<schema xmlns="http://www.w3.org/2000/10/XMLSchema"
+
+        targetNamespace="http://www.w3.org/1999/XSL/Transform"
+
+        elementFormDefault="qualified"
+
+        
+
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+
+        xmlns:xpath="http://www.w3.org/TR/2001/WD-xptr-20010108/" blockDefault="#all">
+
+        
+
+        
+
+        <import namespace="http://www.w3.org/XML/1998/namespace" 
+
+        	schemaLocation="http://www.w3.org/2000/10/xml.xsd"/>
+
+        
+
+        
+
+        
+
+       	<!-- *** import schema for xpath
+
+       		authored by C. M. Sperberg-McQueen [cmsmcq@acm.org]
+
+       		Chair, XML Schema WG   		
+
+       	  	
+
+        <import namespace="http://www.w3.org/TR/2001/WD-xptr-20010108/" 
+
+        	schemaLocation="xpath.xsd"/>
+
+		--> 
+
+	
+
+	
+
+		<!-- *** result elements *** -->
+
+		<!-- *** 				 *** -->
+
+
+
+		<!-- 	There are three ways that you can construct a 
+
+				schema for XSLT stylesheets that create instances of a 
+
+				particular result structure
+
+
+
+				(a)	Declare all your result elements as a member of 
+
+					xsl:result-element substitution group
+
+
+
+				(b) Redefine model group xsl:result-element to accomodate
+
+					the desired structure
+
+
+
+				(c)	Do nothing. This schema is designed to allow any element node
+
+					or nodes if they have any namespace other than the XSLT 
+
+					namespace or not namespace qualified
+
+
+
+				I recommend (a) or (b)
+
+
+
+				In addition, I added a an attributeGroup util, 'result-element' 
+
+				for your convenience
+
+
+
+		-->
+
+
+
+		<element name="result-element" abstract="true" type="anyType"/>
+
+
+
+
+
+		<attributeGroup name="result-element">
+
+			<attribute name="extension-element-prefixes" form="qualified" type="string"/>
+
+			<attribute name="exclude-result-prefixes" form="qualified" type="string"/>
+
+			<attribute name="use-attribute-sets" form="qualified" type="xsl:QNames"/>
+
+			<attribute name="version" form="qualified" type="NMTOKEN"/>
+
+			<anyAttribute namespace="##other" processContents="skip"/>
+
+		</attributeGroup>
+
+
+
+
+
+		<group name="result-element">
+
+			<choice>
+
+				<element ref="xsl:result-element"/>
+
+				<any namespace="##other" processContents="skip"/>
+
+			</choice>
+
+        </group>
+
+	
+
+	
+
+	
+
+	
+
+	
+
+		<!-- *** Style Sheet Elements *** -->
+
+		<!-- *** 					  *** -->
+
+		
+
+		
+
+		<element name="stylesheet" type="xsl:wrapper"/>
+
+		<element name="transform" type="xsl:wrapper"/>
+
+	
+
+		<complexType name="wrapper">
+
+			<complexContent>
+
+				<extension base="xsl:anyType">
+
+					<sequence>
+
+						<element ref="xsl:import" minOccurs="0" maxOccurs="unbounded"/>
+
+						<choice  minOccurs="0" maxOccurs="unbounded">
+
+							<element ref="xsl:top-level-element"/>
+
+							<element ref="xsl:variable"/>
+
+							<any namespace="##other" processContents="skip"/> <!-- weaker than XSLT 1.0 -->
+
+						</choice>
+
+					</sequence>
+
+					<attribute name="id" type="ID"/>
+
+					<attribute name="extension-element-prefixes" type="xsl:tokens"/>
+
+					<attribute name="exclude-result-prefixes" type="xsl:tokens"/>
+
+					<attribute name="version" type="decimal" use="required"/>
+
+					<attribute ref="xml:space"/>
+
+				</extension>
+
+			</complexContent>
+
+		</complexType>
+
+		
+
+		
+
+		
+
+		
+
+		
+
+		
+
+		<!-- *** top level elements *** -->
+
+		<!-- ***					*** -->
+
+		
+
+		
+
+		<element name="top-level-element" type="xsl:anyType" abstract="true"/>
+
+		<element name="top-level-element-and-char-instruction" type="xsl:anyType" abstract="true"/>
+
+        
+
+        <element name="attribute-set" substitutionGroup="xsl:top-level-element">
+
+				        
+
+			<!-- ***
+
+
+
+			<xsl:attribute-set 
+
+			  name = qname 
+
+			  use-attribute-sets = qnames>
+
+			  Content: xsl:attribute* 
+
+			</xsl:attribute-set> 
+
+
+
+			-->
+
+
+
+			<complexType>
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<sequence minOccurs="0" maxOccurs="unbounded">
+
+							<element ref="xsl:attribute"/>
+
+						</sequence>
+
+						<attributeGroup ref="xsl:name"/>
+
+						<attributeGroup ref="xsl:use-attribute-sets"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+				        	
+
+        </element>
+
+        
+
+        
+
+        <element name="decimal-format" substitutionGroup="xsl:top-level-element">
+
+        
+
+        	<!-- ***
+
+        	
+
+        	<xsl:decimal-format 
+
+			  name = qname 
+
+			  decimal-separator = char 
+
+			  grouping-separator = char 
+
+			  infinity = string 
+
+			  minus-sign = char 
+
+			  NaN = string 
+
+			  percent = char 
+
+			  per-mille = char 
+
+			  zero-digit = char 
+
+			  digit = char 
+
+			  pattern-separator = char /> 
+
+ 
+
+ 			-->
+
+ 			
+
+ 			<complexType>
+
+ 				<complexContent>
+
+ 					<extension base="xsl:anyType">
+
+						<attribute name="name" type="xsl:QName"/>
+
+						<attribute name="decimal-separator" type="string" use="default" value="."/>
+
+						<attribute name="grouping-separator" type="string" use="default" value=","/>
+
+						<attribute name="infinity" type="string" use="default" value="Infinity"/>
+
+						<attribute name="minus-sign" type="string" use="default" value="-"/>
+
+						<attribute name="NaN" type="string" use="default" value="NaN"/>
+
+						<attribute name="percent" type="string" use="default" value="%"/>
+
+						<attribute name="per-mille" type="string" use="default" value="&#x2030;"/>
+
+						<attribute name="zero-digit" type="string" use="default" value="0"/>
+
+						<attribute name="digit" type="string" use="default" value="#"/>
+
+						<attribute name="pattern-separator" type="string" use="default" value=";"/>
+
+					</extension>
+
+				</complexContent>
+
+ 			</complexType>
+
+ 			
+
+        </element>
+
+        
+
+        
+
+        <element name="include" substitutionGroup="xsl:top-level-element" type="xsl:combine-stylesheets">
+
+        
+
+        	<!-- ***
+
+        	
+
+        		<xsl:include 
+
+  				href = uri-reference />
+
+  				
+
+        	-->
+
+        	
+
+        </element>
+
+        
+
+        
+
+        <element name="key" substitutionGroup="xsl:top-level-element">
+
+        
+
+        	<!-- ***
+
+        	
+
+        		<xsl:key 
+
+				  name = qname 
+
+				  match = pattern 
+
+  				  use = expression />
+
+        		
+
+        	-->
+
+        	
+
+        	<complexType>
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<attributeGroup ref="xsl:name"/>
+
+						<attribute name="match" type="xsl:pattern" use="required"/>
+
+						<attribute name="use" type="xsl:expression" use="required"/>
+
+					</extension>
+
+				</complexContent>
+
+        	</complexType>
+
+        
+
+        </element>
+
+        
+
+        
+
+        <element name="namespace-alias" substitutionGroup="xsl:top-level-element">
+
+        
+
+        	<!-- ***
+
+        	
+
+        	-->
+
+        	
+
+        	<complexType>
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<attribute name="stylesheet-prefix" type="xsl:prefix" use="required"/>
+
+						<attribute name="result-prefix" type="xsl:prefix" use="required"/>
+
+					</extension>
+
+				</complexContent>
+
+        	</complexType>
+
+        	
+
+        </element>
+
+        
+
+        
+
+        <element name="output" substitutionGroup="xsl:top-level-element">
+
+        
+
+        	<!-- ***
+
+        	  		
+
+        		<xsl:output
+
+				  method = "xml" | "html" | "text" | qname-but-not-ncname 
+
+				  version = nmtoken 
+
+				  encoding = string 
+
+				  omit-xml-declaration = "yes" | "no"
+
+				  standalone = "yes" | "no"
+
+				  doctype-public = string 
+
+				  doctype-system = string 
+
+				  cdata-section-elements = qnames 
+
+				  indent = "yes" | "no"
+
+				  media-type = string /> 
+
+
+
+        	-->
+
+        	
+
+        	<complexType>
+
+        		
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<attribute name="method">
+
+							<simpleType>
+
+								<union>
+
+									<simpleType>
+
+										<restriction base="string">
+
+											<enumeration value="xml"/>
+
+											<enumeration value="html"/>
+
+											<enumeration value="text"/>
+
+										</restriction>
+
+									</simpleType>
+
+									<simpleType>
+
+										<restriction base="xsl:QName">
+
+											<pattern value="\c*:\c*"/>
+
+										</restriction>
+
+									</simpleType>
+
+								</union>
+
+							</simpleType>
+
+						</attribute>
+
+
+
+						<attribute name="version" type="NMTOKEN"/>
+
+						<attribute name="encoding" type="string"/>
+
+						<attribute name="omit-xml-declaration" type="xsl:YesOrNo"/>
+
+						<attribute name="standalone" type="xsl:YesOrNo"/>
+
+						<attribute name="doctype-public" type="string"/>
+
+						<attribute name="doctype-system" type="string"/>
+
+						<attribute name="cdata-section-elements" type="xsl:QNames"/>
+
+						<attribute name="indent" type="xsl:YesOrNo"/>
+
+						<attribute name="media-type" type="string"/>
+
+					</extension>
+
+				</complexContent>
+
+				
+
+        	</complexType>
+
+        
+
+        </element>
+
+
+
+		
+
+		<element name="param" substitutionGroup="xsl:top-level-element" type="xsl:variable">
+
+		
+
+			<!-- ***
+
+			
+
+				<xsl:param
+
+				  name = qname 
+
+				  select = expression>
+
+				  Content: template
+
+				</xsl:param> 
+
+				
+
+			-->
+
+        	
+
+		</element>
+
+		
+
+		
+
+        <element name="preserve-space" substitutionGroup="xsl:top-level-element">
+
+        
+
+        	<!-- ***
+
+        	
+
+        		<xsl:preserve-space
+
+				  elements = tokens /> 
+
+        	
+
+        	-->
+
+        
+
+        	<complexType>
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+        				<attribute name="elements" type="xsl:element-names" use="required"/>
+
+        			</extension>
+
+        		</complexContent>
+
+        	</complexType>
+
+        	
+
+        </element>
+
+        
+
+        <element name="strip-space" substitutionGroup="xsl:preserve-space"/>
+
+        
+
+        
+
+        <element name="template" substitutionGroup="xsl:top-level-element">
+
+        
+
+        	<!-- ***
+
+        		
+
+        		<xsl:template
+
+				  match = pattern 
+
+				  name = qname 
+
+				  priority = number 
+
+				  mode = qname>
+
+				  Content: (xsl:param*, template)
+
+				</xsl:template> 
+
+
+
+        	-->
+
+        	
+
+        	<complexType mixed="true">
+
+        	
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+        				<sequence>
+
+        					<element ref="xsl:param" minOccurs="0" maxOccurs="unbounded"/>
+
+							<choice minOccurs="0" maxOccurs="unbounded">
+
+								<element ref="xsl:top-level-element-and-char-instruction"/>
+
+								<element ref="xsl:instruction"/>
+
+								<group ref="xsl:result-element"/>
+
+							</choice>
+
+						</sequence>
+
+						<attribute name="match" type="xsl:pattern"/>
+
+						<attribute name="name" type="xsl:QName"/>
+
+						<attribute name="priority" type="decimal"/>
+
+						<attribute name="mode" type="xsl:QName"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+				
+
+        	</complexType>
+
+        	
+
+        </element>
+
+        
+
+        
+
+        <!-- *** top level elements and char instructions *** -->
+
+        <!-- ***										  *** -->
+
+        
+
+        
+
+        <element name="variable" type="xsl:variable" substitutionGroup="xsl:char-instruction">
+
+        
+
+        	<!-- ***
+
+        	
+
+        		<xsl:variable
+
+				  name = qname 
+
+				  select = expression>
+
+				  Content: template
+
+				</xsl:variable>
+
+				
+
+        	-->
+
+        
+
+        </element>
+
+        
+
+        
+
+        
+
+        
+
+        <!-- *** instructions *** -->
+
+        <!-- *** 			  *** -->
+
+        
+
+              
+
+        <element name="instruction" type="xsl:anyType" abstract="true"/>
+
+        
+
+        <element name="char-instruction" type="xsl:anyType" abstract="true"
+
+        	substitutionGroup="xsl:instruction"/>
+
+        
+
+        <element name="apply-imports" type="xsl:anyType" substitutionGroup="xsl:char-instruction">
+
+        
+
+        	<!-- ***
+
+        	
+
+        		<xsl:apply-imports />
+
+        	
+
+        	-->
+
+			
+
+		</element>
+
+        
+
+        
+
+        <element name="apply-templates" substitutionGroup="xsl:char-instruction">
+
+        	
+
+        	
+
+        	<!-- ***
+
+
+
+        	<xsl:apply-templates
+
+			  select = node-set-expression 
+
+			  mode = qname>
+
+			  Content: (xsl:sort | xsl:with-param)*
+
+			</xsl:apply-templates> 
+
+
+
+        	-->
+
+        	
+
+        	<complexType>
+
+        	
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<choice minOccurs="0" maxOccurs="unbounded">
+
+							<element ref="xsl:sort"/>
+
+							<element ref="xsl:with-param"/>
+
+						</choice>
+
+						<attribute name="select" type="xsl:expression" use="default" value="node()"/>
+
+						<attribute name="mode" type="xsl:QName"/>
+
+					</extension>
+
+				</complexContent>
+
+				
+
+        	</complexType>
+
+        
+
+        </element>
+
+        
+
+        
+
+        <element name="attribute" type="xsl:attribute-type" substitutionGroup="xsl:instruction"/>
+
+        
+
+        
+
+        <element name="call-template" substitutionGroup="xsl:char-instruction">
+
+        	
+
+        	<!-- ***
+
+        	
+
+        	<xsl:call-template
+
+			  name = qname>
+
+			  Content: xsl:with-param*
+
+			</xsl:call-template> 
+
+			
+
+			-->
+
+        	
+
+        	<complexType>
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<sequence minOccurs="0" maxOccurs="unbounded">
+
+							<element ref="xsl:with-param"/>
+
+						</sequence>
+
+						<attributeGroup ref="xsl:name"/>
+
+					</extension>
+
+				</complexContent>
+
+        	</complexType>
+
+        	
+
+        </element>
+
+        
+
+        
+
+        <element name="choose" substitutionGroup="xsl:char-instruction">
+
+        
+
+        	
+
+        	<!-- ***
+
+        	
+
+        		<xsl:choose>
+
+				  Content: (xsl:when+, xsl:otherwise?) 
+
+				</xsl:choose> 
+
+
+
+        	-->
+
+        	
+
+        	<complexType>
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<sequence>
+
+							<element ref="xsl:when" minOccurs="1" maxOccurs="unbounded"/>
+
+							<element ref="xsl:otherwise" minOccurs="0"/>
+
+						</sequence>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+        	</complexType>
+
+        	
+
+        </element>
+
+        
+
+        <element name="comment" substitutionGroup="xsl:instruction">
+
+        	
+
+        	<!-- ***
+
+        		
+
+        		<xsl:comment>
+
+				  Content: template
+
+				</xsl:comment> 
+
+
+
+        	-->
+
+        	
+
+        	<complexType mixed="true">
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<choice minOccurs="0" maxOccurs="unbounded">
+
+							<element ref="xsl:char-instruction"/>
+
+							<element ref="xsl:top-level-element-and-char-instruction"/>
+
+						</choice>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+        	</complexType>
+
+        	
+
+        </element>
+
+        
+
+        
+
+        <element name="copy" substitutionGroup="xsl:char-instruction">
+
+        
+
+        	<!-- ***
+
+        	
+
+        	<xsl:copy
+
+			  use-attribute-sets = qnames>
+
+			  Content: template
+
+			</xsl:copy> 
+
+			
+
+			-->
+
+        	
+
+        	<complexType mixed="true">
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<group ref="xsl:template" minOccurs="0" maxOccurs="unbounded"/>
+
+						<attribute ref="xml:space"/>
+
+						<attributeGroup ref="xsl:use-attribute-sets"/>
+
+					</extension>
+
+				</complexContent>
+
+        	</complexType>
+
+        
+
+        </element>
+
+        
+
+        
+
+        <element name="copy-of" substitutionGroup="xsl:char-instruction">
+
+        
+
+        	<!-- ***
+
+        	
+
+        		<xsl:copy-of
+
+				  select = expression /> 
+
+
+
+        	-->
+
+        	
+
+        	<complexType mixed="true">
+
+        		<complexContent>
+
+        			<extension base="xsl:anyType">
+
+						<attributeGroup ref="xsl:select-required"/>
+
+					</extension>
+
+				</complexContent>
+
+        	</complexType>
+
+        
+
+        </element>
+
+        
+
+        
+
+        <element name="element" substitutionGroup="xsl:instruction">
+
+        
+
+        	<!-- ***
+
+        	
+
+        		<xsl:element 
+
+				  name = { qname }
+
+				  namespace = { uri-reference }
+
+				  use-attribute-sets = qnames>
+
+				  Content: template
+
+				</xsl:element>
+
+			-->
+
+			
+
+			<complexType mixed="true">
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<group ref="xsl:template" minOccurs="0" maxOccurs="unbounded"/>
+
+						<attributeGroup ref="xsl:name-avt"/>
+
+						<attribute name="namespace" type="xsl:expr-avt"/>
+
+						<attributeGroup ref="xsl:use-attribute-sets"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+			
+
+        </element>
+
+        
+
+        
+
+        <element name="fallback" substitutionGroup="xsl:char-instruction">
+
+        
+
+        	<!-- ***
+
+        		
+
+        		<xsl:fallback>
+
+				  Content: template
+
+				</xsl:fallback>
+
+				
+
+			-->
+
+			
+
+			<complexType mixed="true">
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<group ref="xsl:template" minOccurs="0" maxOccurs="unbounded"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+		
+
+		</element>
+
+        
+
+        
+
+        <element name="for-each" substitutionGroup="xsl:char-instruction">
+
+        
+
+        	<!-- ***
+
+        	
+
+        		<xsl:for-each 
+
+				  select = node-set-expression>
+
+				  Content: (xsl:sort*, template)
+
+				</xsl:for-each> 
+
+
+
+			-->
+
+		
+
+			<complexType mixed="true">
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<sequence>
+
+							<element ref="xsl:sort" minOccurs="0" maxOccurs="unbounded"/>
+
+							<choice minOccurs="0" maxOccurs="unbounded">
+
+								<element ref="xsl:top-level-element-and-char-instruction"/>
+
+								<element ref="xsl:instruction"/>
+
+								<group ref="xsl:result-element"/>
+
+							</choice>
+
+						</sequence>
+
+						<attributeGroup ref="xsl:select-required"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+			
+
+		</element>
+
+		
+
+		<element name="if" substitutionGroup="xsl:char-instruction">
+
+			
+
+			<!-- ***
+
+			
+
+				<xsl:if 
+
+				  test = boolean-expression>
+
+				  Content: template
+
+				</xsl:if> 
+
+
+
+			-->
+
+			
+
+			<complexType mixed="true">
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<group ref="xsl:template" minOccurs="0" maxOccurs="unbounded"/>
+
+						<attribute name="test" type="xsl:expression" use="required"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+			
+
+		</element>
+
+		
+
+		
+
+		<element name="message" substitutionGroup="xsl:char-instruction">
+
+			
+
+			<!-- ***
+
+			
+
+				<xsl:message 
+
+				  terminate = "yes" | "no">
+
+				  Content: template
+
+				</xsl:message> 
+
+			
+
+			-->
+
+		
+
+			<complexType mixed="true">
+
+				
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<group ref="xsl:template" minOccurs="0" maxOccurs="unbounded"/>
+
+						<attribute ref="xml:space"/>
+
+						<attribute name="terminate" use="default" value="no" type="xsl:YesOrNo"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+			
+
+		</element>
+
+		
+
+		
+
+		<element name="number" substitutionGroup="xsl:char-instruction">
+
+		
+
+			<!-- ***
+
+			
+
+				<xsl:number 
+
+				  level = "single" | "multiple" | "any"
+
+				  count = pattern 
+
+				  from = pattern 
+
+				  value = number-expression 
+
+				  format = { string }
+
+				  lang = { nmtoken }
+
+				  letter-value = { "alphabetic" | "traditional" }
+
+				  grouping-separator = { char }
+
+  				  grouping-size = { number } />
+
+			
+
+			-->
+
+			
+
+			<complexType>
+
+				
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<attribute name="level" use="default" value="single">
+
+							<simpleType>
+
+								<restriction base="NMTOKEN">
+
+									<enumeration value="single"/>
+
+									<enumeration value="multiple"/>
+
+									<enumeration value="any"/>
+
+								</restriction>
+
+							</simpleType>
+
+						</attribute>
+
+
+
+						<attribute name="count" type="xsl:pattern"/>
+
+						<attribute name="from" type="xsl:pattern"/>
+
+						<attribute name="value" type="xsl:expression"/>
+
+						<attribute name="format" type="xsl:expr-avt" use="default" value="1"/>
+
+						<attribute name="lang" type="xsl:expr-avt"/>
+
+						<attribute name="letter-value" type="xsl:expr-avt"/>
+
+						<attribute name="grouping-separator" type="xsl:expr-avt"/>
+
+						<attribute name="grouping-size" type="xsl:expr-avt"/>
+
+					</extension>
+
+				</complexContent>
+
+				
+
+			</complexType>
+
+		
+
+		</element>
+
+		
+
+		
+
+		<element name="processing-instruction" substitutionGroup="xsl:instruction">
+
+		
+
+			<!-- ***
+
+			
+
+				<xsl:processing-instruction
+
+				  name = { ncname }>
+
+				  Content: template
+
+				</xsl:processing-instruction>
+
+				
+
+			-->
+
+		
+
+			<complexType mixed="true">
+
+		
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<choice minOccurs="0" maxOccurs="unbounded">
+
+							<element ref="xsl:char-instruction"/>
+
+							<element ref="xsl:top-level-element-and-char-instruction"/>
+
+						</choice>
+
+						<attributeGroup ref="xsl:name-avt"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+		
+
+		</element>
+
+		
+
+		
+
+		<element name="text" substitutionGroup="xsl:char-instruction">
+
+		
+
+			<!-- ***
+
+			
+
+				<xsl:text
+
+				  disable-output-escaping = "yes" | "no">
+
+				  Content: #PCDATA
+
+				</xsl:text> 
+
+			
+
+			-->
+
+			
+
+			<complexType mixed="true">
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<attributeGroup ref="xsl:disable-output-escaping"/>
+
+						<attribute ref="xml:lang"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+		
+
+		</element>
+
+		
+
+		
+
+		<element name="value-of" substitutionGroup="xsl:char-instruction">
+
+		
+
+			<!-- ***
+
+			
+
+				<xsl:value-of
+
+				  select = string-expression 
+
+				  disable-output-escaping = "yes" | "no" /> 
+
+			
+
+			-->
+
+			
+
+			<complexType>
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<attributeGroup ref="xsl:select-required"/>
+
+						<attributeGroup ref="xsl:disable-output-escaping"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+			
+
+		</element>
+
+		
+
+		
+
+		
+
+		<!-- *** orphans *** -->
+
+		<!-- *** 		 *** -->
+
+		
+
+		<element name="import" type="xsl:combine-stylesheets">
+
+			
+
+			<!-- ***
+
+			
+
+				<xsl:import
+
+  					href = uri-reference /> 
+
+  			-->
+
+			
+
+		</element>
+
+		
+
+		
+
+		<element name="otherwise">
+
+		
+
+			<!-- ***
+
+			
+
+				<xsl:otherwise>
+
+				  Content: template 
+
+				</xsl:otherwise>
+
+			
+
+			-->
+
+			
+
+				<complexType mixed="true">
+
+					<complexContent>
+
+						<extension base="xsl:anyType">
+
+							<group ref="xsl:template" minOccurs="0" maxOccurs="unbounded"/>
+
+							<attribute ref="xml:space"/>
+
+						</extension>
+
+					</complexContent>
+
+				</complexType>
+
+		
+
+		</element>
+
+		
+
+		
+
+		<element name="sort">
+
+		
+
+			<!-- ***
+
+			
+
+				xsl:sort
+
+				  select = string-expression 
+
+				  lang = { nmtoken }
+
+				  data-type = { "text" | "number" | qname-but-not-ncname }
+
+				  order = { "ascending" | "descending" }
+
+				  case-order = { "upper-first" | "lower-first" } /> 
+
+
+
+			-->
+
+			
+
+			<complexType>
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<attribute name="select" type="xsl:expression" use="default" value="."/>	
+
+						<attribute name="lang" type="xsl:expr-avt"/>				
+
+						<attribute name="data-type" type="xsl:expr-avt" use="default" value="text"/>				
+
+						<attribute name="order" type="xsl:expr-avt" use="default" value="ascending"/>				
+
+						<attribute name="case-order" type="xsl:expr-avt"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+		
+
+		</element>
+
+		
+
+		
+
+		<element name="when">
+
+		
+
+			<!-- ***
+
+				<xsl:when
+
+				  test = boolean-expression>
+
+				  Content: template
+
+				</xsl:when>
+
+			-->
+
+			
+
+			<complexType mixed="true">
+
+				<complexContent>
+
+					<extension base="xsl:anyType">
+
+						<group ref="xsl:template" minOccurs="0" maxOccurs="unbounded"/>
+
+						<attribute name="test" type="xsl:expression" use="required"/>
+
+						<attribute ref="xml:space"/>
+
+					</extension>
+
+				</complexContent>
+
+			</complexType>
+
+			
+
+		</element>
+
+		
+
+		
+
+		<element name="with-param" type="xsl:variable">
+
+		
+
+			<!-- ***
+
+			
+
+				<xsl:with-param
+
+				  name = qname 
+
+				  select = expression>
+
+				  Content: template
+
+				</xsl:with-param> 
+
+			-->
+
+			
+
+		</element>
+
+		
+
+		
+
+		
+
+		
+
+		
+
+		
+
+        <!-- *** utils - internal types and groups *** -->
+
+		<!-- *** not for public use                *** -->
+
+        <!-- ***								   *** -->
+
+        
+
+        <complexType name="attribute-type" mixed="true">
+
+        
+
+        	<!-- ***
+
+        	
+
+			 <xsl:attribute
+
+			   name = { qname }
+
+			   namespace = { uri-reference }>
+
+			   Content: template
+
+			 </xsl:attribute> 
+
+
+
+        	-->
+
+        	<complexContent>
+
+        		<extension base="xsl:anyType">
+
+					<choice minOccurs="0" maxOccurs="unbounded">
+
+						<element ref="xsl:char-instruction"/>
+
+						<element ref="xsl:top-level-element-and-char-instruction"/>
+
+					</choice>
+
+
+
+					<attributeGroup ref="xsl:name-avt"/>
+
+					<attribute name="namespace" type="xsl:expr-avt"/>
+
+					<attribute ref="xml:space"/>
+
+				</extension>
+
+			</complexContent>
+
+			
+
+        </complexType>
+
+        
+
+        
+
+        <simpleType name="tokens">
+
+        	<list itemType="token"/>
+
+        </simpleType>
+
+        
+
+        <simpleType name="QNames">
+
+        	<list itemType="xsl:QName"/>
+
+        </simpleType>
+
+        
+
+        <attributeGroup name="name">
+
+        	<attribute name="name" type="xsl:QName" use="required"/>
+
+        </attributeGroup>
+
+        
+
+        <attributeGroup name="name-avt">
+
+        	<attribute name="name" type="xsl:expr-avt" use="required"/>
+
+        </attributeGroup>
+
+        
+
+        <attributeGroup name="select-optional">
+
+        	<attribute name="select" type="xsl:expression"/>
+
+        </attributeGroup>
+
+        
+
+        <attributeGroup name="select-required">
+
+		    <attribute name="select" type="xsl:expression" use="required"/>
+
+        </attributeGroup>
+
+        
+
+        <attributeGroup name="use-attribute-sets">
+
+        	<attribute name="use-attribute-sets" type="xsl:QNames"/>
+
+        </attributeGroup>
+
+        
+
+        
+
+        
+
+        
+
+        <group name="template">
+
+			<choice>
+
+				<element ref="xsl:top-level-element-and-char-instruction"/>
+
+				<element ref="xsl:instruction"/>
+
+				<group ref="xsl:result-element"/>
+
+			</choice>
+
+        </group>
+
+        
+
+        <complexType name="combine-stylesheets">
+
+        	<complexContent>
+
+        		<extension base="xsl:anyType">
+
+        			<attribute name="href" type="uriReference" use="required"/>
+
+        		</extension>
+
+        	</complexContent>
+
+        </complexType>
+
+        
+
+		<simpleType name="YesOrNo">
+
+			<restriction base="string">
+
+				<enumeration value="yes"/>
+
+				<enumeration value="no"/>
+
+			</restriction>
+
+		</simpleType>
+
+		
+
+		<simpleType name="QName">
+
+			<union memberTypes="NCName QName"/>
+
+		</simpleType>
+
+		
+
+		<simpleType name="element-names">
+
+			<list>
+
+				<simpleType>
+
+					<union memberTypes="QName">
+
+						<simpleType>
+
+							<restriction base="CDATA">
+
+								<pattern value="\*"/>
+
+								<pattern value="\i\c*:\*"/>
+
+							</restriction>
+
+						</simpleType>
+
+					</union>
+
+				</simpleType>
+
+			</list>
+
+		</simpleType>
+
+		
+
+		<attributeGroup name="disable-output-escaping">
+
+			<attribute name="disable-output-escaping" type="xsl:YesOrNo"
+
+							use="default" value="no"/>
+
+		</attributeGroup>
+
+		
+
+		<complexType name="variable" mixed="true">
+
+			<complexContent>
+
+				<extension base="xsl:anyType">
+
+					<group ref="xsl:template" minOccurs="0" maxOccurs="unbounded"/>
+
+					<attributeGroup ref="xsl:name"/>
+
+					<attributeGroup ref="xsl:select-optional"/>
+
+				</extension>
+
+			</complexContent>
+
+		</complexType>
+
+		
+
+		
+
+		<simpleType name="expr-avt">
+
+		   <restriction base="string">
+
+		      <!-- <pattern
+
+		value="([^\{\}]|\{\{|\}\})*\{([^&quot;'\{\}]|&quot;[^&quot;]*&quot;|'[^']*')+\}([^\{\}]|\{\{|\}\}|\{([^&quot;'\{\}]|&quot;[^&quot;]*&quot;|'[^']*')+\})*"/> -->
+
+		   </restriction>
+
+		</simpleType>
+
+		
+
+		<simpleType name="expression">
+
+			<restriction base="string">
+
+				<!-- ****
+
+				
+
+					patterns go here 
+
+					
+
+					-->
+
+			</restriction>
+
+		</simpleType>
+
+		
+
+		<simpleType name="pattern">
+
+			<restriction base="string">
+
+				<!-- ***
+
+				
+
+					patterns go here
+
+					
+
+					-->
+
+			</restriction>
+
+		</simpleType>
+
+		
+
+		<simpleType name="prefix">
+
+			<union memberTypes="NCName">
+
+				<simpleType>
+
+					<restriction base="string">
+
+						<enumeration value="#default"/>
+
+					</restriction>
+
+				</simpleType>
+
+			</union>
+
+		</simpleType>
+
+		
+
+		
+
+		<complexType name="anyType">
+
+			<anyAttribute namespace="##other" processContents="skip"/>
+
+		</complexType>
+
+</schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation4.xml b/xml/tests/testData/xml/ComplexSchemaValidation4.xml
new file mode 100644
index 000000000000..aacc334187af
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation4.xml
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DeclareSalary
+        xmlns="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationServiceTypes"
+        xmlns:ct="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationContainer"
+        xmlns:sd="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+
+    <!--
+    status: propsal20050???
+    business-view  = OK    (20050830;ero+ab)
+    technical-view = workaround: namespace 'st' in 'DeclareSalary' - Axis Error    (20050727;ifl)
+    -->    
+    <ct:RequestContext>
+        <ct:UserAgent>
+            <ct:Producer>itServe AG</ct:Producer>
+            <ct:Name>Test</ct:Name>
+            <ct:Version>0.1</ct:Version>
+            <ct:Certificate>None</ct:Certificate>
+        </ct:UserAgent>
+        <ct:CompanyName>
+            <sd:HR-RC-Name>String</sd:HR-RC-Name>
+        </ct:CompanyName>
+        <ct:TransmissionDate>2001-12-17T09:30:47.0Z</ct:TransmissionDate>
+        <ct:RequestID>reqId</ct:RequestID>
+        <ct:LanguageCode>de</ct:LanguageCode>
+        <ct:MonitoringID>tester</ct:MonitoringID>
+    </ct:RequestContext>
+    <ct:Job>
+        <ct:Addressees>
+            <ct:AHV-AVS>
+                <ct:ProcessByDistributor>false</ct:ProcessByDistributor>
+            </ct:AHV-AVS>
+            <ct:UVG-LAA InstitutionIDRef="#Suva">
+                <ct:ProcessByDistributor>true</ct:ProcessByDistributor>
+            </ct:UVG-LAA>
+            <ct:UVGZ-LAAC InstitutionIDRef="#Backwork">
+                <ct:ProcessByDistributor>true</ct:ProcessByDistributor>
+            </ct:UVGZ-LAAC>
+            <ct:KTG-AMC InstitutionIDRef="#Backwork">
+                <ct:ProcessByDistributor>true</ct:ProcessByDistributor>
+                <ct:CCAddressee>
+                    <ct:Name>Broker und Treuhang AG</ct:Name>
+                    <ct:Street>Kopie-Strasse</ct:Street>
+                    <ct:ZIP-Code>3000</ct:ZIP-Code>
+                    <ct:City>Bern</ct:City>
+                </ct:CCAddressee>
+            </ct:KTG-AMC>
+            <ct:BVG-LPP InstitutionIDRef="#Oldsoft">
+                <ct:ProcessByDistributor>true</ct:ProcessByDistributor>
+            </ct:BVG-LPP>
+            <ct:FAK-CAF InstitutionIDRef="#005.000">
+                <ct:ProcessByDistributor>false</ct:ProcessByDistributor>
+            </ct:FAK-CAF>
+            <ct:CantonalTaxAdministration>
+                <ct:ProcessByDistributor>true</ct:ProcessByDistributor>
+            </ct:CantonalTaxAdministration>
+            <ct:SwissFederalStatisticalOffice>
+                <ct:ProcessByDistributor>true</ct:ProcessByDistributor>
+            </ct:SwissFederalStatisticalOffice>
+        </ct:Addressees>
+    </ct:Job>
+    <ct:SalaryDeclaration schemaVersion="0.0"
+                          xmlns="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration"
+                          xmlns:ct="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationContainer">
+        <!--
+            not direct necessary in version 2
+            xmlns:iso3166="http://www.unece.org/etrades/unedocs/repository/codelists/xml/CountryCode.xsd">
+        -->
+        <Company>
+            <CompanyDescription>
+                <Name>
+                    <HR-RC-Name>ICHAG</HR-RC-Name>
+                </Name>
+                <Address>
+                    <Street>Länggassstrasse 26</Street>
+                    <Postbox>690</Postbox>
+                    <ZIP-Code>3000</ZIP-Code>
+                    <City>Bern 9</City>
+                </Address>
+                <BUR-REE-Number>123435</BUR-REE-Number>
+            </CompanyDescription>
+            <!-- ===================================== -->
+            <!-- staffs -->
+            <!-- ===================================== -->
+            <Staff>
+                <Person>
+                    <Particulars>
+                        <Social-InsuranceIdentification>
+                            <AHV-AVS-Number>123.45.178.128</AHV-AVS-Number>
+                        </Social-InsuranceIdentification>
+                        <EmployeeNumber>0100</EmployeeNumber>
+                        <Lastname>Balmer</Lastname>
+                        <Firstname>Fredi</Firstname>
+                        <Sex>M</Sex>
+                        <DateOfBirth>1945-03-16</DateOfBirth>
+                        <Nationality>
+                            <ISOCode>CH</ISOCode>
+                        </Nationality>
+                        <CivilStatus>married</CivilStatus>
+                        <!-- new tax -->
+                        <Address>
+                            <Street>Länggassstrasse 26</Street>
+                            <Postbox>690</Postbox>
+                            <ZIP-Code>3000</ZIP-Code>
+                            <City>Bern 9</City>
+                        </Address>
+                        <ResidenceCanton>ZG</ResidenceCanton>
+                    </Particulars>
+                    <Work>
+                        <ActivityRate>99</ActivityRate>
+                        <WorkplaceCanton>BE</WorkplaceCanton>
+                    </Work>
+                    <AHV-AVS-Salaries>
+                        <AHV-AVS-Salary>
+                            <AccountingTime>
+                                <from>2004-01-01</from>
+                                <until>2004-12-31</until>
+                            </AccountingTime>
+                            <AHV-AVS-Income>65000.00</AHV-AVS-Income>
+                            <AHV-AVS-Open>0.00</AHV-AVS-Open>
+                            <ALV-AC-Income>65000.00</ALV-AC-Income>
+                            <ALVZ-ACS-Income>0.00</ALVZ-ACS-Income>
+                            <ALV-AC-Open>0.00</ALV-AC-Open>
+                        </AHV-AVS-Salary>
+                    </AHV-AVS-Salaries>
+                    <UVG-LAA-Salaries>
+                        <UVG-LAA-Salary InstitutionIDRef="#Suva">
+                            <AccountingTime>
+                                <from>2004-01-01</from>
+                                <until>2004-12-31</until>
+                            </AccountingTime>
+                            <UVG-LAA-Code>A1</UVG-LAA-Code>
+                            <UVG-LAA-GrossSalary>71960.00</UVG-LAA-GrossSalary>
+                            <UVG-LAA-BaseSalary>65000.00</UVG-LAA-BaseSalary>
+                            <UVG-LAA-ContributorySalary>65000.00</UVG-LAA-ContributorySalary>
+                        </UVG-LAA-Salary>
+                    </UVG-LAA-Salaries>
+                    <UVGZ-LAAC-Salaries>
+                        <UVGZ-LAAC-Salary InstitutionIDRef="#Backwork">
+                            <AccountingTime>
+                                <from>2004-01-01</from>
+                                <until>2004-12-31</until>
+                            </AccountingTime>
+                            <UVGZ-LAAC-Code>9Z</UVGZ-LAAC-Code>
+                            <UVGZ-LAAC-BaseSalary>65000.00</UVGZ-LAAC-BaseSalary>
+                            <UVGZ-LAAC-ContributorySalary>65000.00</UVGZ-LAAC-ContributorySalary>
+                        </UVGZ-LAAC-Salary>
+                    </UVGZ-LAAC-Salaries>
+                    <KTG-AMC-Salaries>
+                        <KTG-AMC-Salary InstitutionIDRef="#Backwork">
+                            <AccountingTime>
+                                <from>2004-01-01</from>
+                                <until>2004-12-31</until>
+                            </AccountingTime>
+                            <KTG-AMC-Code>X7</KTG-AMC-Code>
+                            <Reference-AHV-AVS-Salary>65000.00</Reference-AHV-AVS-Salary>
+                            <KTG-AMC-ContributorySalary>65000.00</KTG-AMC-ContributorySalary>
+                        </KTG-AMC-Salary>
+                    </KTG-AMC-Salaries>
+                    <BVG-LPP-Salaries>
+                        <BVG-LPP-Salary InstitutionIDRef="#Oldsoft">
+                            <AccountingTime>
+                                <from>2004-01-01</from>
+                                <until>2004-12-31</until>
+                            </AccountingTime>
+                            <BVG-LPP-Code>MM</BVG-LPP-Code>
+                            <BVG-LPP-AHV-AVS-Salary>65000.00</BVG-LPP-AHV-AVS-Salary>
+                        </BVG-LPP-Salary>
+                    </BVG-LPP-Salaries>
+                    <FAK-CAF-Salaries>
+                        <FAK-CAF-Salary>
+                            <FAK-CAF-Period>
+                                <from>2004-01-01</from>
+                                <until>2004-12-31</until>
+                            </FAK-CAF-Period>
+                            <FAK-CAF-ContributorySalary>65000.00</FAK-CAF-ContributorySalary>
+                            <FAK-CAF-FamilyIncomeSupplement>1800.00</FAK-CAF-FamilyIncomeSupplement>
+                            <FAK-CAF-WorkplaceCanton>BE</FAK-CAF-WorkplaceCanton>
+                        </FAK-CAF-Salary>
+                    </FAK-CAF-Salaries>
+                    <TaxSalaries>
+                        <TaxSalary>
+                            <Period>
+                                <from>2004-01-01</from>
+                                <until>2004-12-31</until>
+                            </Period>
+                            <FreeTransport/>
+                            <CanteenLunchCheck/>
+                            <Income>48118.70</Income>
+                            <FringeBenefits>
+                                <FoodLodging>1000.00</FoodLodging>
+                                <CompanyCar>5160.00</CompanyCar>
+                                <Other>
+                                    <Text>Verbilligung Mietwohnung, Geldwerter Vorteil</Text>
+                                    <Sum>2400.00</Sum>
+                                </Other>
+                            </FringeBenefits>
+                            <SporadicBenefits>
+                                <Text>Gratifikation, Gewinnbeteiligung</Text>
+                                <Sum>5000.00</Sum>
+                            </SporadicBenefits>
+                            <CapitalPayment>
+                                <Text>Abgangsentschädigung</Text>
+                                <Sum>3000.00</Sum>
+                            </CapitalPayment>
+                            <OwnershipRight>300.00</OwnershipRight>
+                            <BoardOfDirectorsRemuneration>2000.00</BoardOfDirectorsRemuneration>
+                            <OtherBenefits>
+                                <Text>Arbeitgeberanteil AHV/IV/EO/ALV</Text>
+                                <Sum>1021.30</Sum>
+                            </OtherBenefits>
+                            <GrossIncome>68000.00</GrossIncome>
+                            <AHV-ALV-NBUV-AVS-AC-AANP-Contribution>3657.00</AHV-ALV-NBUV-AVS-AC-AANP-Contribution>
+                            <BVG-LPP-Contribution>
+                                <Regular>6500.00</Regular>
+                                <Purchase>1500.00</Purchase>
+                            </BVG-LPP-Contribution>
+                            <NetIncome>56343.00</NetIncome>
+                            <DeductionAtSource>3647.55</DeductionAtSource>
+                            <ChargesRule>
+                                <WithRegulation>
+                                    <Allowed>2004-01-01</Allowed>
+                                    <Canton>BE</Canton>
+                                </WithRegulation>
+                            </ChargesRule>
+                            <Charges>
+                                <Effective>
+                                    <Other>
+                                        <!-- variante mit Spesenreglement und ohne Betrag -->
+                                        <Text>effektive Spesen Expatriate</Text>
+                                        <!-- <Sum>7500.00</Sum> -->
+                                    </Other>
+                                </Effective>
+                                <LumpSum>
+                                    <Representation>3000.00</Representation>
+                                    <Car>500.00</Car>
+                                    <Other>
+                                        <Text>Übrige Pauschalspesen</Text>
+                                        <Sum>1500.00</Sum>
+                                    </Other>
+                                </LumpSum>
+                                <Education>12001.00</Education>
+                            </Charges>
+                            <OtherFringeBenefits>Übermässige Vergünstigung auf
+                                Versicherungsprämien</OtherFringeBenefits>
+                            <StandardRemark>
+                                <StaffShareThirdCompany>IKEA und H+M</StaffShareThirdCompany>
+                                <ChildAllowancePerAHV-AVS/>
+                                <RelocationCosts>5000.00</RelocationCosts>
+                                <StaffShareMarketValue>
+                                    <Allowed>2004-01-01</Allowed>
+                                    <Canton>ZG</Canton>
+                                </StaffShareMarketValue>
+                                <StaffShareWithoutTaxableIncome>diverse Gründe!!</StaffShareWithoutTaxableIncome>
+                            </StandardRemark>
+                            <Remark>
+                                Ein erster Testfall (noch kontrollieren)!!
+                            </Remark>
+                        </TaxSalary>
+                    </TaxSalaries>
+                    <StatisticSalaries>
+                        <StatisticSalary>
+                            <Period>
+                                <from>2004-01-01</from>
+                                <until>2004-12-31</until>
+                            </Period>
+                            <TotalHoursOfWork>42.00</TotalHoursOfWork>
+                            <GrossEarnings>48160.00</GrossEarnings>
+                            <SocialContributions>11657.00</SocialContributions>
+                            <Allowances>2850.00</Allowances>
+                            <Overtime>2368.70</Overtime>
+                            <Earnings13th>3300.00</Earnings13th>
+                            <SpecialPayments>5000.00</SpecialPayments>
+                            <PaymentsByThird>2160.00</PaymentsByThird>
+                            <LaborCost>4800.00</LaborCost>
+                            <ExtendedBenefits>1321.30</ExtendedBenefits>
+                            <Education>enterpriseEducation</Education>
+                            <Skill>qualified</Skill>
+                            <Position>highestCadre</Position>
+                            <Activity>21</Activity>
+                            <WageForm>timeWages</WageForm>
+                        </StatisticSalary>
+                    </StatisticSalaries>
+                </Person>
+            </Staff>
+            <!-- ===================================== -->
+            <!-- Insurances -->
+            <!-- ===================================== -->
+            <Insurances>
+                <AHV-AVS>
+                    <AK-CC-BranchNumber>003.000</AK-CC-BranchNumber>
+                    <AK-CC-CustomerNumber>100-9976.9</AK-CC-CustomerNumber>
+                    <SalaryDeclarationIsComplete>true</SalaryDeclarationIsComplete>
+                </AHV-AVS>
+                <UVG-LAA>
+                    <Suva InstitutionID="#Suva">
+                        <SuvaCustomerNumber>302-15096.6</SuvaCustomerNumber>
+                        <SuvaSubNumber>01</SuvaSubNumber>
+                        <SalaryDeclarationIsComplete>true</SalaryDeclarationIsComplete>
+                    </Suva>
+                </UVG-LAA>
+                <UVGZ-LAAC InstitutionID="#Backwork">
+                    <InsuranceID>2345.88 1</InsuranceID>
+                    <InsuranceCompanyName>Backwork Versicherungen</InsuranceCompanyName>
+                    <CustomerIdentity>7651-873.1</CustomerIdentity>
+                    <ContractIdentity>4566-4</ContractIdentity>
+                    <SalaryDeclarationIsComplete>true</SalaryDeclarationIsComplete>
+                </UVGZ-LAAC>
+                <KTG-AMC InstitutionID="#Backwork">
+                    <InsuranceID>2345.88 1</InsuranceID>
+                    <InsuranceCompanyName>Backwork Versicherungen</InsuranceCompanyName>
+                    <CustomerIdentity>7651-873.1</CustomerIdentity>
+                    <ContractIdentity>4567-4</ContractIdentity>
+                    <SalaryDeclarationIsComplete>true</SalaryDeclarationIsComplete>
+                </KTG-AMC>
+                <BVG-LPP InstitutionID="#Oldsoft">
+                    <InsuranceID>2600.88 1</InsuranceID>
+                    <InsuranceCompanyName>Pensionskasse Oldsoft</InsuranceCompanyName>
+                    <CustomerIdentity>1099-8777.1</CustomerIdentity>
+                    <ContractIdentity>4500-0</ContractIdentity>
+                    <SalaryDeclarationIsComplete>true</SalaryDeclarationIsComplete>
+                </BVG-LPP>
+                <FAK-CAF InstitutionID="#005.000">
+                    <FAK-CAF-BranchNumber>005.000</FAK-CAF-BranchNumber>
+                    <FAK-CAF-CustomerNumber>100-9934.8</FAK-CAF-CustomerNumber>
+                    <SalaryDeclarationIsComplete>true</SalaryDeclarationIsComplete>
+                </FAK-CAF>
+            </Insurances>
+            <!-- ===================================== -->
+            <!-- SalaryTotals -->
+            <!-- ===================================== -->
+            <SalaryTotals>
+                <AHV-AVS-Totals>
+                    <Total-AHV-AVS-Incomes>65000.00</Total-AHV-AVS-Incomes>
+                    <Total-AHV-AVS-Open>0.00</Total-AHV-AVS-Open>
+                    <Total-ALV-AC-Incomes>65000.00</Total-ALV-AC-Incomes>
+                    <Total-ALVZ-ACS-Incomes>0.00</Total-ALVZ-ACS-Incomes>
+                    <Total-ALV-AC-Open>0.00</Total-ALV-AC-Open>
+                </AHV-AVS-Totals>
+                <UVG-LAA-Totals InstitutionIDRef="#Suva">
+                    <UVG-LAA-BranchTotals>
+                        <UVG-LAA-BranchTotal>
+                            <BranchIdentifier>A</BranchIdentifier>
+                            <NBU-BU-ANP-AP-Total>65000.00</NBU-BU-ANP-AP-Total>
+                            <BU-AP-Total>0.00</BU-AP-Total>
+                        </UVG-LAA-BranchTotal>
+                    </UVG-LAA-BranchTotals>
+                    <UVG-LAA-MasterTotal>65000.00</UVG-LAA-MasterTotal>
+                    <NumberOfFemalePersons>0</NumberOfFemalePersons>
+                    <NumberOfMalePersons>1</NumberOfMalePersons>
+                </UVG-LAA-Totals>
+                <UVGZ-LAAC-Totals InstitutionIDRef="#Backwork">
+                    <UVGZ-LAAC-CategoryTotals>
+                        <UVGZ-LAAC-CategoryTotal>
+                            <CategoryCode>01</CategoryCode>
+                            <Female-Total>0.00</Female-Total>
+                            <Male-Total>65000.00</Male-Total>
+                        </UVGZ-LAAC-CategoryTotal>
+                    </UVGZ-LAAC-CategoryTotals>
+                    <UVGZ-LAAC-MasterTotal>65000.00</UVGZ-LAAC-MasterTotal>
+                </UVGZ-LAAC-Totals>
+                <KTG-AMC-Totals InstitutionIDRef="#Backwork">
+                    <KTG-AMC-CategoryTotals>
+                        <KTG-AMC-CategoryTotal>
+                            <CategoryCode>02</CategoryCode>
+                            <Female-Total>0.00</Female-Total>
+                            <Male-Total>65000.00</Male-Total>
+                        </KTG-AMC-CategoryTotal>
+                    </KTG-AMC-CategoryTotals>
+                    <KTG-AMC-MasterTotal>65000.00</KTG-AMC-MasterTotal>
+                </KTG-AMC-Totals>
+                <FAK-CAF-FLG-LFA-Totals>
+                    <Total-FAK-CAF-IncomesPerCanton>
+                        <Total-FAK-CAF-Incomes>65000.00</Total-FAK-CAF-Incomes>
+                        <Canton>BE</Canton>
+                    </Total-FAK-CAF-IncomesPerCanton>
+                </FAK-CAF-FLG-LFA-Totals>
+            </SalaryTotals>
+            <SalaryCounters>
+                <NumberOf-AHV-AVS-Salary-Tags>1</NumberOf-AHV-AVS-Salary-Tags>
+                <NumberOf-UVG-LAA-Salary-Tags>1</NumberOf-UVG-LAA-Salary-Tags>
+                <NumberOf-UVGZ-LAAC-Salary-Tags>1</NumberOf-UVGZ-LAAC-Salary-Tags>
+                <NumberOf-KTG-AMC-Salary-Tags>1</NumberOf-KTG-AMC-Salary-Tags>
+                <NumberOf-BVG-LPP-Salary-Tags>1</NumberOf-BVG-LPP-Salary-Tags>
+                <NumberOf-FAK-CAF-Salary-Tags>1</NumberOf-FAK-CAF-Salary-Tags>
+                <NumberOf-TaxAnnuity-Tags>0</NumberOf-TaxAnnuity-Tags>
+                <NumberOf-TaxSalary-Tags>1</NumberOf-TaxSalary-Tags>
+                <NumberOf-StatisticSalaries-Tags>1</NumberOf-StatisticSalaries-Tags>
+            </SalaryCounters>
+            <Statistic>
+                <CompanyWorkingTime>
+                    <WeeklyHours>42.00</WeeklyHours>
+                </CompanyWorkingTime>
+                <PayAgreement>individualContract</PayAgreement>
+            </Statistic>
+        </Company>
+        <GeneralSalaryDeclarationDescription>
+            <CreationDate>2004-09-04T14:14:00</CreationDate>
+            <AccountingPeriod>2004</AccountingPeriod>
+            <ContactPerson>
+                <Name>Marcel René Müller</Name>
+                <EmailAddress>ichag@xxxxx.ch</EmailAddress>
+                <PhoneNumber>031 345 23 87</PhoneNumber>
+            </ContactPerson>
+            <Comments>Bitte senden Sie eine Suva-Apotheke an hôtel-garçon in genève
+            </Comments>
+        </GeneralSalaryDeclarationDescription>
+    </ct:SalaryDeclaration>
+</DeclareSalary>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/CountryCode.xsd b/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/CountryCode.xsd
new file mode 100644
index 000000000000..318d308ebd67
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/CountryCode.xsd
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- File: CountryCode.xsd  -->
+<!-- File Structure Version: 0.3 -->
+<!-- Code List Version: UN/CCCodes R02-1.0 Database Location:http://www.unece.org/cefact/download/downmain.htm#country  -->
+<!-- Copyright: www.UNeDocs.org United Nations ECE -->
+<!-- Copyright Note and disclaimers: http://www.unece.org/etrades/uncopyright.htm -->
+<!-- Comment: This file contains  ISO 3166-1 ISO 2 digit country codes and names, UN Recommendation 3 -->
+<!-- Author: trademaster@unece.org -->
+
+<schema
+	targetNamespace="http://www.unece.org/etrades/unedocs/repository/codelists/xml/CountryCode.xsd"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:un.ece.unedocs.cl.iso3166="http://www.unece.org/etrades/unedocs/repository/codelists/xml/CountryCode.xsd"
+	elementFormDefault="unqualified"
+	attributeFormDefault="unqualified">
+	<complexType name="CountryCodeType"><!-- based on UBL Naming Convention TBA -->
+ 		<annotation>
+ 		 <documentation>
+			CountryCodeType - Type declaration to be used by other schema's
+		 </documentation>
+		</annotation>
+		<simpleContent>
+			<extension base="un.ece.unedocs.cl.iso3166:CountryCoded">
+				<attributeGroup ref="un.ece.unedocs.cl.iso3166:Identity"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<simpleType name="CountryCoded"><!-- based on UNeDocs Naming Convention -->
+		<restriction base="xs:token">
+		  <enumeration value="AF" /> 
+		  <enumeration value="AL" /> 
+		  <enumeration value="DZ" /> 
+		  <enumeration value="AS" /> 
+		  <enumeration value="AD" /> 
+		  <enumeration value="AO" /> 
+		  <enumeration value="AI" /> 
+		  <enumeration value="AQ" /> 
+		  <enumeration value="AG" /> 
+		  <enumeration value="AR" /> 
+		  <enumeration value="AM" /> 
+		  <enumeration value="AW" /> 
+		  <enumeration value="AU" /> 
+		  <enumeration value="AT" /> 
+		  <enumeration value="AZ" /> 
+		  <enumeration value="BS" /> 
+		  <enumeration value="BH" /> 
+		  <enumeration value="BD" /> 
+		  <enumeration value="BB" /> 
+		  <enumeration value="BY" /> 
+		  <enumeration value="BE" /> 
+		  <enumeration value="BZ" /> 
+		  <enumeration value="BJ" /> 
+		  <enumeration value="BM" /> 
+		  <enumeration value="BT" /> 
+		  <enumeration value="BO" /> 
+		  <enumeration value="BA" /> 
+		  <enumeration value="BW" /> 
+		  <enumeration value="BV" /> 
+		  <enumeration value="BR" /> 
+		  <enumeration value="IO" /> 
+		  <enumeration value="BN" /> 
+		  <enumeration value="BG" /> 
+		  <enumeration value="BF" /> 
+		  <enumeration value="BI" /> 
+		  <enumeration value="KH" /> 
+		  <enumeration value="CM" /> 
+		  <enumeration value="CA" /> 
+		  <enumeration value="CV" /> 
+		  <enumeration value="KY" /> 
+		  <enumeration value="CF" /> 
+		  <enumeration value="TD" /> 
+		  <enumeration value="CL" /> 
+		  <enumeration value="CN" /> 
+		  <enumeration value="CX" /> 
+		  <enumeration value="CC" /> 
+		  <enumeration value="CO" /> 
+		  <enumeration value="KM" /> 
+		  <enumeration value="CG" /> 
+		  <enumeration value="CD" /> 
+		  <enumeration value="CK" /> 
+		  <enumeration value="CR" /> 
+		  <enumeration value="CI" /> 
+		  <enumeration value="HR" /> 
+		  <enumeration value="CU" /> 
+		  <enumeration value="CY" /> 
+		  <enumeration value="CZ" /> 
+		  <enumeration value="DK" /> 
+		  <enumeration value="DJ" /> 
+		  <enumeration value="DM" /> 
+		  <enumeration value="DO" /> 
+		  <enumeration value="TP" /> 
+		  <enumeration value="EC" /> 
+		  <enumeration value="EG" /> 
+		  <enumeration value="SV" /> 
+		  <enumeration value="GQ" /> 
+		  <enumeration value="ER" /> 
+		  <enumeration value="EE" /> 
+		  <enumeration value="ET" /> 
+		  <enumeration value="FK" /> 
+		  <enumeration value="FO" /> 
+		  <enumeration value="FJ" /> 
+		  <enumeration value="FI" /> 
+		  <enumeration value="FR" /> 
+		  <enumeration value="GF" /> 
+		  <enumeration value="PF" /> 
+		  <enumeration value="TF" /> 
+		  <enumeration value="GA" /> 
+		  <enumeration value="GM" /> 
+		  <enumeration value="GE" /> 
+		  <enumeration value="DE" /> 
+		  <enumeration value="GH" /> 
+		  <enumeration value="GI" /> 
+		  <enumeration value="GR" /> 
+		  <enumeration value="GL" /> 
+		  <enumeration value="GD" /> 
+		  <enumeration value="GP" /> 
+		  <enumeration value="GU" /> 
+		  <enumeration value="GT" /> 
+		  <enumeration value="GN" /> 
+		  <enumeration value="GW" /> 
+		  <enumeration value="GY" /> 
+		  <enumeration value="HT" /> 
+		  <enumeration value="HM" /> 
+		  <enumeration value="VA" /> 
+		  <enumeration value="HN" /> 
+		  <enumeration value="HK" /> 
+		  <enumeration value="HU" /> 
+		  <enumeration value="IS" /> 
+		  <enumeration value="IN" /> 
+		  <enumeration value="ID" /> 
+		  <enumeration value="IR" /> 
+		  <enumeration value="IQ" /> 
+		  <enumeration value="IE" /> 
+		  <enumeration value="IL" /> 
+		  <enumeration value="IT" /> 
+		  <enumeration value="JM" /> 
+		  <enumeration value="JP" /> 
+		  <enumeration value="JO" /> 
+		  <enumeration value="KZ" /> 
+		  <enumeration value="KE" /> 
+		  <enumeration value="KI" /> 
+		  <enumeration value="KP" /> 
+		  <enumeration value="KR" /> 
+		  <enumeration value="KW" /> 
+		  <enumeration value="KG" /> 
+		  <enumeration value="LA" /> 
+		  <enumeration value="LV" /> 
+		  <enumeration value="LB" /> 
+		  <enumeration value="LS" /> 
+		  <enumeration value="LR" /> 
+		  <enumeration value="LY" /> 
+		  <enumeration value="LI" /> 
+		  <enumeration value="LT" /> 
+		  <enumeration value="LU" /> 
+		  <enumeration value="MO" /> 
+		  <enumeration value="MK" /> 
+		  <enumeration value="MG" /> 
+		  <enumeration value="MW" /> 
+		  <enumeration value="MY" /> 
+		  <enumeration value="MV" /> 
+		  <enumeration value="ML" /> 
+		  <enumeration value="MT" /> 
+		  <enumeration value="MH" /> 
+		  <enumeration value="MQ" /> 
+		  <enumeration value="MR" /> 
+		  <enumeration value="MU" /> 
+		  <enumeration value="YT" /> 
+		  <enumeration value="MX" /> 
+		  <enumeration value="FM" /> 
+		  <enumeration value="MD" /> 
+		  <enumeration value="MC" /> 
+		  <enumeration value="MN" /> 
+		  <enumeration value="MS" /> 
+		  <enumeration value="MA" /> 
+		  <enumeration value="MZ" /> 
+		  <enumeration value="MM" /> 
+		  <enumeration value="NA" /> 
+		  <enumeration value="NR" /> 
+		  <enumeration value="NP" /> 
+		  <enumeration value="NL" /> 
+		  <enumeration value="AN" /> 
+		  <enumeration value="NC" /> 
+		  <enumeration value="NZ" /> 
+		  <enumeration value="NI" /> 
+		  <enumeration value="NE" /> 
+		  <enumeration value="NG" /> 
+		  <enumeration value="NU" /> 
+		  <enumeration value="NF" /> 
+		  <enumeration value="MP" /> 
+		  <enumeration value="NO" /> 
+		  <enumeration value="OM" /> 
+		  <enumeration value="PK" /> 
+		  <enumeration value="PW" /> 
+		  <enumeration value="PS" /> 
+		  <enumeration value="PA" /> 
+		  <enumeration value="PG" /> 
+		  <enumeration value="PY" /> 
+		  <enumeration value="PE" /> 
+		  <enumeration value="PH" /> 
+		  <enumeration value="PN" /> 
+		  <enumeration value="PL" /> 
+		  <enumeration value="PT" /> 
+		  <enumeration value="PR" /> 
+		  <enumeration value="QA" /> 
+		  <enumeration value="RE" /> 
+		  <enumeration value="RO" /> 
+		  <enumeration value="RU" /> 
+		  <enumeration value="RW" /> 
+		  <enumeration value="SH" /> 
+		  <enumeration value="KN" /> 
+		  <enumeration value="LC" /> 
+		  <enumeration value="PM" /> 
+		  <enumeration value="VC" /> 
+		  <enumeration value="WS" /> 
+		  <enumeration value="SM" /> 
+		  <enumeration value="ST" /> 
+		  <enumeration value="SA" /> 
+		  <enumeration value="SN" /> 
+		  <enumeration value="SC" /> 
+		  <enumeration value="SL" /> 
+		  <enumeration value="SG" /> 
+		  <enumeration value="SK" /> 
+		  <enumeration value="SI" /> 
+		  <enumeration value="SB" /> 
+		  <enumeration value="SO" /> 
+		  <enumeration value="ZA" /> 
+		  <enumeration value="GS" /> 
+		  <enumeration value="ES" /> 
+		  <enumeration value="LK" /> 
+		  <enumeration value="SD" /> 
+		  <enumeration value="SR" /> 
+		  <enumeration value="SJ" /> 
+		  <enumeration value="SZ" /> 
+		  <enumeration value="SE" /> 
+		  <enumeration value="CH" /> 
+		  <enumeration value="SY" /> 
+		  <enumeration value="TW" /> 
+		  <enumeration value="TJ" /> 
+		  <enumeration value="TZ" /> 
+		  <enumeration value="TH" /> 
+		  <enumeration value="TG" /> 
+		  <enumeration value="TK" /> 
+		  <enumeration value="TO" /> 
+		  <enumeration value="TT" /> 
+		  <enumeration value="TN" /> 
+		  <enumeration value="TR" /> 
+		  <enumeration value="TM" /> 
+		  <enumeration value="TC" /> 
+		  <enumeration value="TV" /> 
+		  <enumeration value="UG" /> 
+		  <enumeration value="UA" /> 
+		  <enumeration value="AE" /> 
+		  <enumeration value="GB" /> 
+		  <enumeration value="US" /> 
+		  <enumeration value="UM" /> 
+		  <enumeration value="UY" /> 
+		  <enumeration value="UZ" /> 
+		  <enumeration value="VU" /> 
+		  <enumeration value="VE" /> 
+		  <enumeration value="VN" /> 
+		  <enumeration value="VG" /> 
+		  <enumeration value="VI" /> 
+		  <enumeration value="WF" /> 
+		  <enumeration value="EH" /> 
+		  <enumeration value="YE" /> 
+		  <enumeration value="YU" /> 
+		  <enumeration value="ZM" /> 
+		  <enumeration value="ZW" /> 
+		</restriction>
+	</simpleType>
+	<attributeGroup name="Identity">
+		<attribute name="ID" type="xs:token" fixed="ISO 3166" >
+		<annotation><documentation>Code List Identifier - ISO 3166</documentation></annotation>
+		</attribute>
+		<attribute name="agencyID" type="xs:token" fixed="6">
+		<annotation><documentation>Code List Agency UN/ECE</documentation></annotation>
+		</attribute>
+		<attribute name="versionID" type="xs:string" fixed="0.3">
+		<annotation><documentation>Code List Version - 0.3</documentation></annotation>
+		</attribute>
+	</attributeGroup>
+</schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclaration.xsd b/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclaration.xsd
new file mode 100644
index 000000000000..15e63ee32c2a
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclaration.xsd
@@ -0,0 +1,4143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema
+        targetNamespace="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration"
+        xmlns:tns="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        xmlns:un.ece.unedocs.cl.iso3166="http://www.unece.org/etrades/unedocs/repository/codelists/xml/CountryCode.xsd"
+        elementFormDefault="qualified"
+        attributeFormDefault="unqualified"
+        version="0.0">
+
+    <!-- state of standardisation: draft20050404 (AHV, UVG, Stv und BfS) -->
+    <!-- last modified $Date: 2005/09/15 15:36:10 $Author: boehm $ -->
+
+
+    <!--
+    Status 2005.09.15
+        -   fuer alle domaenen IO (AHV, UVG, UVGZ, KTG, BVG, FAK, Tax und Statistic)
+    -->
+
+    <!-- imports -->
+    <xs:import
+            namespace="http://www.unece.org/etrades/unedocs/repository/codelists/xml/CountryCode.xsd"
+            schemaLocation="CountryCode.xsd"/>
+
+    <!-- elements -->
+    <xs:complexType name="SalaryDeclarationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Lohnmeldung</translation>
+                <description>
+                    <short>
+                        Die Lohnmeldung enthält sämtliche Daten für eine Deklaration einer Unternehmung.
+                        (ELM = einheitliches Lohnmeldeverfahren / Fachinhalt)
+                    </short>
+                    <domain>
+                        Die Lohmeldung enthält sämtliche Informationen und Löhne in folgenden Domänen
+                        1) AHV/ALV
+                        2) UVG
+                        3) UVGZ
+                        4) KTG
+                        5) BVG
+                        6) FAK
+                        7) Tax, Lohnausweis für die Steuerverwaltungen
+                        8) Statistic, Lohnstrukturerhebung (LSE) für das BfS
+                        In den Domänen 2)UVG bis 6)FAK können einzelne Institutionen wie z.B. Suva mit Attributen
+                        verknüpft werden
+                    </domain>
+                    <technical>
+                        In derLohnmeldung können nur noch die Daten eines Unternehmens abgebildet werden.
+                        Ein Unternehmen kann in mehrere "Lohnbereiche" bzw. Mandanten aufgeteilt sein. In diesem Fall
+                        muss pro Lohnbereich eine seperate Meldung erzeugt und übermittelt werden. Die Aufteilung
+                        muss mit den entsprechenden Empfängern (Institutionen) abgesprochen sein, d.h.
+                        organisatorische Lösung mit seperaten Kundennummern pro Mandant und für alle Domänen
+                        muss die gleiche Aufteilung gelten.
+                        Die Verknüpfung von einer oder mehreren Institutionen innerhalb der Domänen 2)UVG bis 6)FAK
+                        muss mittels Attribute "verlinkt" werden:
+                        SalaryDeclarationContainer Job/Addressee und JobState
+                        SalaryDeclaration Person/Salaries/Salary, SalaryTotals und Insurances/[Domäne]
+                    </technical>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Company" type="tns:CompanyType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Unternehmen</translation>
+                        <description>
+                            <short>
+                                Das Unternehmen (Firma, Betrieb) welches die Daten erstellt.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:key name="UVG-LAA-ID-Key">
+                    <xs:selector xpath="tns:Insurances/tns:UVG-LAA/tns:Suva|tns:Insurances/tns:UVG-LAA/tns:Other"/>
+                    <xs:field xpath="@InstitutionID"/>
+                </xs:key>
+                <xs:keyref name="UVG-LAA-ID-Ref" refer="tns:UVG-LAA-ID-Key">
+                    <xs:selector
+                            xpath="tns:Staff/tns:Person/tns:UVG-LAA-Salaries/tns:UVG-LAA-Salary|tns:SalaryTotals/tns:UVG-LAA-Totals"/>
+                    <xs:field xpath="@InstitutionIDRef"/>
+                </xs:keyref>
+                <xs:key name="UVGZ-LAAC-ID-Key">
+                    <xs:selector xpath="tns:Insurances/tns:UVGZ-LAAC"/>
+                    <xs:field xpath="@InstitutionID"/>
+                </xs:key>
+                <xs:keyref name="UVGZ-LAAC-ID-Ref" refer="tns:UVGZ-LAAC-ID-Key">
+                    <xs:selector
+                            xpath="tns:Staff/tns:Person/tns:UVGZ-LAAC-Salaries/tns:UVGZ-LAAC-Salary|tns:SalaryTotals/tns:UVGZ-LAAC-Totals"/>
+                    <xs:field xpath="@InstitutionIDRef"/>
+                </xs:keyref>
+                <xs:key name="KTG-AMC-ID-Key">
+                    <xs:selector xpath="tns:Insurances/tns:KTG-AMC"/>
+                    <xs:field xpath="@InstitutionID"/>
+                </xs:key>
+                <xs:keyref name="KTG-AMC-ID-Ref" refer="tns:KTG-AMC-ID-Key">
+                    <xs:selector
+                            xpath="tns:Staff/tns:Person/tns:KTG-AMC-Salaries/tns:KTG-AMC-Salary|tns:SalaryTotals/tns:KTG-AMC-Totals"/>
+                    <xs:field xpath="@InstitutionIDRef"/>
+                </xs:keyref>
+                <xs:key name="BVG-LPP-ID-Key">
+                    <xs:selector xpath="tns:Insurances/tns:BVG-LPP"/>
+                    <xs:field xpath="@InstitutionID"/>
+                </xs:key>
+                <xs:keyref name="BVG-LPP-ID-Ref" refer="tns:BVG-LPP-ID-Key">
+                    <xs:selector
+                            xpath="tns:Staff/tns:Person/tns:BVG-LPP-Salaries/tns:BVG-LPP-Salary|tns:SalaryTotals/tns:BVG-LPP-Totals"/>
+                    <xs:field xpath="@InstitutionIDRef"/>
+                </xs:keyref>
+            </xs:element>
+            <xs:element name="GeneralSalaryDeclarationDescription" type="tns:GeneralSalaryDeclarationDescriptionType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Allgemeine Beschreibung der Meldung</translation>
+                        <description>
+                            <short>
+                                Hier befinden sich Informationen, welche bei der Erstellung der Meldung durch den
+                                Ersteller bzw. Absender ergänzt werden.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="schemaVersion" type="tns:SupportedMinorSchemaVersionAttributeType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>Schemaversion</translation>
+                    <description>
+                        <short>
+                            Die XML Schema Instanz muss mit dem "schemaVersion" Attribut angeben mit welcher
+                            Schemaversion sie konform ist.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <!-- attribute-character from SalaryDeclarationType  -->
+    <xs:complexType name="ContactPersonType">
+        <xs:sequence>
+            <xs:element name="Name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Name</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="EmailAddress" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>EmailAdresse</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PhoneNumber" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Telefonnummer</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GeneralSalaryDeclarationDescriptionType">
+        <xs:sequence>
+            <xs:element name="CreationDate" type="xs:dateTime">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Erstellungsdatum</translation>
+                        <description>
+                            <short>
+                                Datum und Zeit, der Meldungserstellung bei dem Unternehmen.
+                            </short>
+                            <domain>
+                                Dieses Datum kann für die Berechnung von Verzugszinsen NICHT verwendet werden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AccountingPeriod" type="xs:gYear">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Abrechnungsperiode</translation>
+                        <description>
+                            <short>
+                                Abrechnungsperiode der Meldung
+                            </short>
+                            <domain>
+                                Die Abrechnungsperiode umfasst das Kalenderjahr für welches die Beiträge oder Prämien
+                                aufgrund der Lohnmeldung ermittelt werden sollen.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ContactPerson" type="tns:ContactPersonType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Kontaktperson</translation>
+                        <description>
+                            <short>
+                                Kontaktperson für Rückfragen zur Meldung
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Comments" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Bemerkungen</translation>
+                        <description>
+                            <short>
+                                Bemerkungen von der Kontaktperson zur Meldung
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!--
+
+        kernel: Company
+    -->
+    <xs:complexType name="CompanyType">
+        <xs:sequence>
+            <xs:element name="CompanyDescription" type="tns:CompanyDescriptionType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Unternehmensbeschreibung</translation>
+                        <description>
+                            <short>
+                                Diverse Angaben zum Unternehmen
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Staff" type="tns:PersonsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beschäftigte</translation>
+                        <description>
+                            <short>
+                                Beschäftigte (Mitarbeiter) des Unternehmens
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Insurances" type="tns:CustomerIdentificationType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Versicherungen</translation>
+                        <description>
+                            <short>
+                                Enthält alle Beziehungen zu den Versicherungen des Unternehmens, an welche
+                                die Meldung gerichtet ist
+                            </short>
+                            <domain>
+                                Das Element "Versicherungen" beinhaltet die Beziehung des Unternehmens
+                                zu allen Versicherungen an welche die Lohnmeldung gerichtet ist.
+                                Dabei werden folgende Domänen beschrieben:
+                                1) AHV/ALV
+                                2) UVG
+                                3) UVGZ
+                                4) KTG
+                                5) BVG
+                                6) FAK
+                                In den Domänen 2)UVG bis 6)FAK können einzelne Institutionen wie z.B. Suva mit
+                                Attributen
+                                verknüpft werden
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SalaryTotals" type="tns:SalaryTotalsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Lohnmeldungstotale</translation>
+                        <description>
+                            <short>
+                                Diese Betrags-Totale sind redundant und können jederzeit aus den Einzeldaten gerechnet
+                                werden.
+                                Dabei werden folgende Domänen beschrieben:
+                                1) AHV/ALV
+                                2) UVG
+                                3) UVGZ
+                                4) KTG
+                                5) BVG
+                                6) FAK
+                                In den Domänen 2)UVG bis 6)FAK können einzelne Institutionen wie z.B. Suva mit
+                                Attributen
+                                verknüpft werden
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:unique name="UVG-LAA-Totals-Ctrl">
+                    <xs:selector xpath="tns:UVG-LAA-Totals"/>
+                    <xs:field xpath="@IDRef"/>
+                </xs:unique>
+            </xs:element>
+            <xs:element name="SalaryCounters" type="tns:SalaryCountersType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>LohnZähler</translation>
+                        <description>
+                            <short>
+                                Diese LohnZähler enthalten die Anzahl der Tags von Löhnen/Zulagen pro Domäne.
+                            </short>
+                            <domain>
+                                Diese LohnZähler enthalten die Anzahl der Tags von Löhnen/Zulagen.
+                                Dabei werden für die folgenden Domänen die Tags gezählt:
+                                1) AHV/ALV
+                                2) UVG
+                                3) UVGZ
+                                4) KTG
+                                5) BVG
+                                6) FAK
+                                Die Attribute der Institutionen werden dabei nicht berücksichtigt.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Statistic" type="tns:StatisticType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Unternehmensweite Statistikangaben</translation>
+                        <description>
+                            <short>
+                                Unternehmensweite Statistikangaben
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CompanyDescriptionType">
+        <xs:sequence>
+            <xs:element name="Name" type="tns:CompanyNameType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Name</translation>
+                        <description>
+                            <short>
+                                Name des Unternehmens
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Owner" type="tns:CompanyOwnerType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Inhaber</translation>
+                        <description>
+                            <short>
+                                Inhaber des Unternehmens
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Address" type="tns:AddressType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Adresse</translation>
+                        <description>
+                            <short>
+                                Vollständige und exakte Anschrift des Geschäftsdomizils.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UID-EHRA" type="tns:UID-EHRAType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Unternehmensidentifikation</translation>
+                        <description>
+                            <short>
+                                Unternehmensidentifikation nach Eidgenössischem Amt für das Handelsregister (EHRA)
+                            </short>
+                            <domain>
+                                Schweizweite eindeutige Unternehmensnummer nach Eidgenössischem Amt für das
+                                Handelsregister (EHRA)
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BUR-REE-Number" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>BUR-Nummer</translation>
+                        <description>
+                            <short>
+                                Betriebs- und Unternehmensregisternummer der Unternehmen
+                            </short>
+                            <domain>
+                                Betriebs- und Unternehmensregisternummer des Bundes. Kann bei der Verarbeitung
+                                von CO2-Abgaben etc. durch Ausgleichskassen wichtig werden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- attribute-character: CompanyType  -->
+    <xs:complexType name="CompanyOwnerType">
+        <xs:sequence>
+            <xs:element name="Firstname" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Vorname</translation>
+                        <description>
+                            <short>
+                                Vorname des Inhabers
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Lastname" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Nachname</translation>
+                        <description>
+                            <short>
+                                Nachname des Inhabers
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CompanyNameType">
+        <xs:sequence>
+            <xs:element name="HR-RC-Name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Name im Handelsregister</translation>
+                        <description>
+                            <short>
+                                Im Handelsregister eingetragener Name des Unternehmens
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ComplementaryLine" type="xs:string" minOccurs="0" maxOccurs="2">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Zusatzzeile</translation>
+                        <description>
+                            <short>
+                                Zusatzzeilen für Abteilungsnamen, Filialbezeichnungen usw.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- statistic -->
+    <xs:complexType name="StatisticType">
+        <xs:sequence>
+            <xs:element name="CompanyWorkingTime" type="tns:CompanyWorkingTimeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Arbeitszeit</translation>
+                        <description>
+                            <short>
+                                Betriebsübliche wöchentliche Arbeitszeit
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PayAgreement" type="tns:PayAgreementType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Lohnvereinbarung</translation>
+                        <description>
+                            <short>
+                                Lohnvereinbarung im Unternehmen
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CompanyWorkingTimeType">
+        <xs:choice>
+            <xs:element name="WeeklyHours" type="tns:WeeklyHoursType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Wöchentliche Arbeitszeit</translation>
+                        <description>
+                            <short>Betriebsübliche wöchentliche Arbeitszeit</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="WeeklyLessons" type="tns:WeeklyLessonsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Wöchentliche Arbeitslektionen</translation>
+                        <description>
+                            <short>Betriebsübliche wöchentliche Arbeitslektioenen</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="WeeklyHoursAndLessons" type="tns:WeeklyHoursAndLessonsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Wöchentliche Arbeits Stunden/Lektionen</translation>
+                        <description>
+                            <short>Betriebsübliche wöchentliche Arbeitslektioenen</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="WeeklyHoursAndLessonsType">
+        <xs:sequence>
+            <xs:element name="WeeklyHours" type="tns:WeeklyHoursType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Wöchentliche Arbeitszeit</translation>
+                        <description>
+                            <short>Betriebsübliche wöchentliche Arbeitszeit</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="WeeklyLessons" type="tns:WeeklyLessonsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Wöchentliche Arbeitslektionen</translation>
+                        <description>
+                            <short>Betriebsübliche wöchentliche Arbeitslektioenen</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!--
+
+        kernel: Person
+    -->
+    <xs:complexType name="PersonsType">
+        <xs:sequence>
+            <xs:element name="Person" type="tns:PersonType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Person</translation>
+                        <description>
+                            <short>
+                                Die versicherten Personen, welche im Unternehmen beschäftigt werden.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="PersonType">
+        <xs:sequence>
+            <xs:element name="Particulars" type="tns:ParticularsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Personalien</translation>
+                        <description>
+                            <short>
+                                Personalien der Person
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Work" type="tns:WorkType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Arbeitsdaten</translation>
+                        <description>
+                            <short>
+                                Arbeitsplatz Informationen
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AHV-AVS-Salaries" type="tns:AHV-AVS-SalariesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV-Löhne</translation>
+                        <description>
+                            <short>AHV-Löhne der Person</short>
+                            <domain>
+                                Bei mehreren Beitragsdauern während eines Jahres, sind die dazugehörenden Einkommen
+                                aufzuschlüsseln.
+                                Für Versicherte, die während der Abrechnungsperiode das Rentenalter erreichen und
+                                weiterarbeiten, ist das Einkommen vor und nach dem Erreichen des Rentenalters auf die
+                                entsprechende Beitragsdauer zuzuordnen.
+                                Periodenfremde Einkommen:
+                                Bei Einkommen, welche für eine Vorjahresperiode bestimmt sind, ist die Beitragsdauer
+                                der Bestimmungsperiode anzugeben
+                                z.B. Nachzahlung Bonus oder Versicherungsleistungen für eine Person, welche im
+                                Vorjahr ausgetreten ist (kein aktiver Mitarbeiter im Meldungsjahr)
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA-Salaries" type="tns:UVG-LAA-SalariesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG-Löhne</translation>
+                        <description>
+                            <short>UVG-Löhne der Person</short>
+                            <domain>
+                                Beitragspflichtiger Lohn, der aufgrund der UVG-Basis für die versicherten Personen unter
+                                der Berücksichtigung des Höchstlohnes berechnet wird. Bei mehreren Beitragsdauern
+                                (Einritt/Austritt oder UVG-Code-Wechsel) während eines Jahres, sind die dazugehörenden
+                                Einkommen aufzuschlüsseln
+                                Periodenfremde Einkommen:
+                                Bei Einkommen, welche für eine Vorjahresperiode bestimmt sind, ist die Beitragsdauer
+                                der Bestimmungsperiode anzugeben
+                                z.B. Nachzahlung Bonus oder Versicherungsleistungen für eine Person, welche im
+                                Vorjahr ausgetreten ist (kein aktiver Mitarbeiter im Meldungsjahr)
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC-Salaries" type="tns:UVGZ-LAAC-SalariesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ-Löhne</translation>
+                        <description>
+                            <short>UVGZ-Löhne der Person</short>
+                            <domain>
+                                Beitragspflichtiger Lohn, der aufgrund der UVGZ-Basis für die versicherten Personen
+                                unter der Berücksichtigung der Versicherungskategorie berechnet wird. Bei mehreren
+                                Beitragsdauern (Einritt/Austritt oder UVGZ-Kategorie-Code-Wechsel) während eines Jahres,
+                                sind die dazugehörenden Einkommen aufzuschlüsseln.
+                                Periodenfremde Einkommen:
+                                Bei Einkommen, welche für eine Vorjahresperiode bestimmt sind, ist die Beitragsdauer
+                                der Bestimmungsperiode anzugeben
+                                z.B. Nachzahlung Bonus oder Versicherungsleistungen für eine Person, welche im
+                                Vorjahr ausgetreten ist (kein aktiver Mitarbeiter im Meldungsjahr)
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KTG-AMC-Salaries" type="tns:KTG-AMC-SalariesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>KTG-Löhne</translation>
+                        <description>
+                            <short>KTG-Löhne der Person</short>
+                            <domain>
+                                Beitragspflichtiger Lohn, der aufgrund der KTG-Basis für die versicherten Personen unter
+                                der Berücksichtigung der Versicherungskategorie berechnet wird. Bei mehreren
+                                Beitragsdauern
+                                (Einritt/Austritt oder KTG-Kategorie-Code-Wechsel) während eines Jahres, sind die
+                                dazugehörenden Einkommen aufzuschlüsseln
+                                Periodenfremde Einkommen:
+                                Bei Einkommen, welche für eine Vorjahresperiode bestimmt sind, ist die Beitragsdauer
+                                der Bestimmungsperiode anzugeben
+                                z.B. Nachzahlung Bonus oder Versicherungsleistungen für eine Person, welche im
+                                Vorjahr ausgetreten ist (kein aktiver Mitarbeiter im Meldungsjahr)
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BVG-LPP-Salaries" type="tns:BVG-LPP-SalariesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>BVG-Löhne</translation>
+                        <description>
+                            <short>BVG-Löhne der Person</short>
+                            <domain>
+                                Beitragspflichtiger Lohn, der aufgrund des AHV-Lohnes für die versicherten Personen
+                                unter der Berücksichtigung der Versicherungskategorie berechnet wird. Bei mehreren
+                                Beitragsdauern
+                                (Einritt/Austritt oder BVG-Kategorie-Code-Wechsel) während eines Jahres, sind die
+                                dazugehörenden Einkommen aufzuschlüsseln
+                                Periodenfremde Einkommen:
+                                Bei Einkommen, welche für eine Vorjahresperiode bestimmt sind, ist die Beitragsdauer
+                                der Bestimmungsperiode anzugeben
+                                z.B. Nachzahlung Bonus oder Versicherungsleistungen für eine Person, welche im
+                                Vorjahr ausgetreten ist (kein aktiver Mitarbeiter im Meldungsjahr)
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+
+            <xs:element name="FAK-CAF-Salaries" type="tns:FAK-CAF-SalariesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-Löhne</translation>
+                        <description>
+                            <short>FAK-Löhne der Person</short>
+                            <domain>
+                                Es sind alle FAK-relevanten Summen pro Versicherten auszuweisen.
+                                Periodenfremde Einkommen:
+                                Bei Einkommen, welche für eine Vorjahresperiode bestimmt sind, ist die Beitragsdauer
+                                der Bestimmungsperiode anzugeben
+                                z.B. Nachzahlung Bonus oder Versicherungsleistungen für eine Person, welche im
+                                Vorjahr ausgetreten ist (kein aktiver Mitarbeiter im Meldungsjahr)
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="TaxSalaries" type="tns:TaxSalariesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Steuer-Löhne</translation>
+                        <description>
+                            <short>Steuer-Löhne der Person</short>
+                            <domain>
+                                Informatioinen und Löhne gemäss Lohnausweis der Steuerverwaltungen
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="StatisticSalaries" type="tns:StatisticSalariesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Statistik Lohndaten</translation>
+                        <description>
+                            <short>LSE Informationen und Lohndaten</short>
+                            <domain>
+                                Informationen und Lohndaten für die Lohnstrukturerhebung (LSE) des BfS
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ParticularsType">
+        <xs:sequence>
+            <xs:element name="Social-InsuranceIdentification" type="tns:Social-InsuranceIdentificationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Sozialversicherungsidentifikation</translation>
+                        <description>
+                            <short>
+                                Von der Sozialversicherung zugeteilte Soziallversicherungsidentifikation (eindeutige
+                                Indentifikation von Versicherten).
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="EmployeeNumber" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Personalnummer</translation>
+                        <description>
+                            <short>
+                                Personalnummer der Person (frei nach den Bedürfnissen des Unternehmens)
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Lastname" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Nachname</translation>
+                        <description>
+                            <short>
+                                Vollständiger Familienname der Person
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Firstname" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Vorname</translation>
+                        <description>
+                            <short>
+                                Vorname(n) der Person
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Sex" type="tns:SexType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Geschlecht</translation>
+                        <description>
+                            <short>
+                                Geschlecht der Person
+                            </short>
+                            <domain>
+                                Die Unterscheidung zwischen männlichen und weiblichen Mitarbeitern ist notwendig, weil
+                                das
+                                unterschiedliche AHV-Rentenalter Einfluss auf die Berechnung des AHV-Freibetrages hat.
+                                Ausserdem werden vom Arbeitgeber statistische Angaben über die Anzahl Männer und Frauen
+                                verlangt.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DateOfBirth" type="xs:date">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Geburtsdatum</translation>
+                        <description>
+                            <short>
+                                Geburtsdatum der Person
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <!-- todo -->
+            <xs:element name="Nationality" type="tns:NationalityType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Nationalität</translation>
+                        <description>
+                            <short>
+                                Nationalität 2-stellig nach ISO 3166 Erweitert
+                            </short>
+                            <technical>
+                                Erweiterung
+                                11= unbekannt
+                                22= staatenlos
+                                In der Qualitätsstufe Plausibilität wird gegen die ISO 31666 Codes geprüft und
+                                evtl. eine Warninig angezeigt
+                                http://www.unece.org/etrades/unedocs/repository/codelists/xml/CountryCode.xsd
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CivilStatus" type="tns:CivilStatusType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Zivilstand</translation>
+                        <description>
+                            <short>
+                                Zivilstand der Person
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SingleParent" type="tns:SimpleBooleanType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Alleinerziehend</translation>
+                        <description>
+                            <short>
+                                Bezeichnung von alleinerziehenden Versicherten
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Address" type="tns:AddressType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Adresse</translation>
+                        <description>
+                            <short>
+                                Vollständige und exakte Anschrift der Person.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ResidenceCanton" type="tns:CantonType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Wohnkanton</translation>
+                        <description>
+                            <short>Wohnkanton</short>
+                            <domain>
+                                Wohnkanton am Stichtag 31.12 oder beim Austritt. Dieser ist massgebend
+                                für den Lohnausweis.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ResidenceCategory" type="tns:ResidenceCategoryType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Aufenthaltskategorien</translation>
+                        <description>
+                            <short>Aufenthaltskategorien</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DegreeOfRelationship" type="tns:DegreeOfRelationshipType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Verwandtschaftsgrad</translation>
+                        <description>
+                            <short>Verwandtschaftsgrad zum Inhaber</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="WorkType">
+        <xs:sequence>
+            <xs:element name="WorkingTime" type="tns:WorkingTimeType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Arbeitszeit</translation>
+                        <description>
+                            <short>Individuelle Arbeitszeit</short>
+                            <domain>
+                                Individuell vereinbarte wöchentliche Arbeitszeit
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ActivityRate" type="tns:ActivityRateType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beschäftigungsgrad</translation>
+                        <description>
+                            <short>Beschäftigungsgrad in Prozent</short>
+                            <domain>
+                                Bezeichnung des Beschäftigungsgrades pro Beitragsdauer in Prozent bei regelmässiger
+                                (Teilzeit) Arbeit (von 1 bis 100 Prozent).
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="YearsOfService" type="tns:YearsOfServiceType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Dienstjahre</translation>
+                        <description>
+                            <short>Dienstjahre</short>
+                            <domain>
+                                Hier wird die Dauer der Unternehmenszugehörigkeit in Jahre verlangt
+                                Wenn diese weniger als ein Jahr beträgt, ist eine 0 einzutragen
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="WithdrawalDate" type="xs:date" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Austrittsdatum</translation>
+                        <description>
+                            <short>
+                                Genaues Datum des Austrittes bei Beendigung des Arbeitsverhältnisses
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="WorkplaceCanton" type="tns:CantonType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Arbeitsplatzkanton</translation>
+                        <description>
+                            <short>Arbeitsplatzkanton</short>
+                            <domain>
+                                Der Arbeitsplatzkanton dient als Grundlage für die Zuteilung zur
+                                Familienausgleichskasse.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AgriculturalEmployee" type="tns:EmptyType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Landwirtschaftlicher Angestellter</translation>
+                        <description>
+                            <short>
+                                Bezeichnung von Beschäftigten in landwirtschaftlichen Betrieben (Unterstellung FLG)
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Apprentice" type="tns:EmptyType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Lehrling</translation>
+                        <description>
+                            <short>
+                                Kennzeichnung eines Lehrlings
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="Social-InsuranceIdentificationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Sozialversicherungsidentifikations-Typ</translation>
+                <description>
+                    <short>
+                        Die Sozialversicherungen verwenden eine Sozialversicherungsidentifikation zur eindeutigen
+                        Indentifikation von Personen (Versicherten).
+                    </short>
+                    <domain>
+                        Für Personen die sowohl SV-Nummer als auch AHV-Nummer besitzen, müssen beide Nummern angegeben
+                        werden (nicht alle Sozialwerke werden gleichzeitig auf die SV-Nummer umstellen und sind
+                        deshalb auf die "alte" AHV-Nummer angewiesen).
+                        Für Personen die entweder AHV- oder SV-Nummer besitzen muss die vorhandene Nummer angegeben
+                        werden.
+                        Für Personen die keine AHV- und SV-Nummer besitzen (noch nicht zugeteilt) wird das Element
+                        "unbekannt" verwendet.
+                    </domain>
+                    <technical>
+                        Für das Inhaltsmodell muss der Fall mit beiden Nummern speziell definiert werden (SV-AS-Number
+                        und AHV-AVS-Number), damit keine Probleme mit der UPA (unique praticle attribution rule)
+                        entstehen
+                    </technical>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:choice>
+            <xs:element name="SV-AS-AHV-AVS-Number" type="tns:SV-AS-AHV-AVS-NumberType"/>
+            <xs:element name="AHV-AVS-Number" type="tns:AHV-AVS-NumberType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV-Nummer</translation>
+                        <description>
+                            <short>
+                                AHV-Nummer der Person
+                            </short>
+                            <domain>
+                                Es ist die 11-stellige AHV-Nummer des Mitarbeiters vollständig abzubilden. Diese ist
+                                hier zu erfassen bis zur Einführung der Sozialversicherungsnummer.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SV-AS-Number" type="tns:SV-AS-NumberType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Sozialversicherungsnummer</translation>
+                        <description>
+                            <short>
+                                Von der Zentrale-Ausgleichsstelle (ZAS) zugeteilte Sozialversicherungsnummer
+                            </short>
+                            <domain>
+                                Ab Einführung ist die 13-stellige Sozialversicherungsnummer zu erfassen.
+                                Diese wird von der Zentralen Ausgleichsstelle zugeteilt.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="unknown" type="tns:EmptyType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>unbekannt</translation>
+                        <description>
+                            <short>
+                                Die AHV-Nummer und die Sozialversicherungsnummer sind unbekannt.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="SV-AS-AHV-AVS-NumberType">
+        <xs:sequence>
+            <xs:element name="SV-AS-Number" type="tns:SV-AS-NumberType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Sozialversicherungsnummer</translation>
+                        <description>
+                            <short>
+                                Von der Zentrale-Ausgleichsstelle (ZAS) zugeteilte Sozialversicherungsnummer
+                            </short>
+                            <domain>
+                                Ab Einführung ist die 13-stellige Sozialversicherungsnummer zusätzlich zur AHV-Nummer
+                                (falls vorhanden) zu erfassen.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AHV-AVS-Number" type="tns:AHV-AVS-NumberType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV-Nummer</translation>
+                        <description>
+                            <short>
+                                AHV-Nummer der Person
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="WorkingTimeType">
+        <xs:choice>
+            <xs:element name="WeeklyHours" type="tns:WeeklyHoursType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Wöchentliche Arbeitszeit</translation>
+                        <description>
+                            <short>Wöchentliche Arbeitszeit</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="WeeklyLessons" type="tns:WeeklyLessonsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Wöchentliche Arbeitslektionen</translation>
+                        <description>
+                            <short>Wöchentliche Arbeitslektionen</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:complexType>
+    <!--
+
+        kernel: Person-Salary
+    -->
+    <xs:complexType name="AHV-AVS-SalariesType">
+        <xs:sequence>
+            <xs:element name="AHV-AVS-Salary" type="tns:AHV-AVS-SalaryType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV-Lohn</translation>
+                        <description>
+                            <short>Der massgebende Lohn für die AHV</short>
+                            <domain>
+                                Bei mehreren Beitragsdauern (Einritt/Austritt oder Wechsel in der AHV-Pflicht)
+                                während eines Jahres, sind die dazugehörenden Einkommen periodengerecht aufzuschlüsseln.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AHV-AVS-SalaryType">
+        <xs:sequence>
+            <xs:element name="AccountingTime" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beitragsdauer</translation>
+                        <description>
+                            <short>Die Beitragsdauer des Versicherten</short>
+                            <domain>
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten begonnen hat (1. Arbeitstag
+                                im Kalenderjahr für unterjährigen Arbeitsbeginn, bzw. 1. Januar für ganzjährig
+                                Beschäftigte).
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten aufgehört hat (letzter
+                                Arbeitstag im Kalenderjahr für unterjährigen Austritt des Mitarbeitenden, bzw. 31.
+                                Dezember für ganzjährig Beschäftigte).
+                                Lohn ausserhalb der Abrechnungsperiode:
+                                Wenn der beitragspflichtige Lohn für eine andere Periode als das Kalenderjahr
+                                (GeneralSalaryDeclarationDescriptionType/AccountingPeriod) gilt, dann muss die
+                                Beitragsadauer für das Bestimmungsjahr angegeben werden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AHV-AVS-Income" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV-Einkommen</translation>
+                        <description>
+                            <short>Das AHV-Einkommen der Beitragsdauer</short>
+                            <domain>
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AHV-AVS-Open" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV-frei</translation>
+                        <description>
+                            <short>Das AHV-frei Einkommen der Beitragsdauer</short>
+                            <domain>
+                                Nicht Versicherte oder nicht beitragspflichtige Personen und Lohnsummen
+                                (Jugendliche mit nichtvollendetem 17 Altersjahr, Altersrentner und Sonderfälle)
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ALV-AC-Income" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>ALV-Einkommen</translation>
+                        <description>
+                            <short>Das ALV-Einkommen der Beitragsdauer</short>
+                            <domain>
+                                Als massgebendes Einkommen für ALV gilt das Einkommen bis zum Grenzbetrag (Höchstlohn)
+                                pro Jahr.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ALVZ-ACS-Income" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>ALVZ-Einkommen</translation>
+                        <description>
+                            <short>Das ALVZ-Einkommen der Beitragsdauer</short>
+                            <domain>
+                                Ab 2004 ist ALVZ nicht mehr in Kraft, kann jedoch jederzeit wieder eingeführt werden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ALV-AC-Open" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>ALV frei</translation>
+                        <description>
+                            <short>Das ALV freie Einkommen der Beitragsdauer</short>
+                            <domain>
+                                Als massgebendes Einkommen für ALV frei gilt das den oberen Grenzbetrag pro Jahr
+                                übersteigende Entgelt.
+                                Zusätzlich wird das ALV freie Einkommen von nicht versicherten Personen (z.B.
+                                Jugendliche, Rentner, mitarbeitende Familienmitglieder in der Landwirtschaft)
+                                ausgewiesen.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="UVG-LAA-SalariesType">
+        <xs:sequence>
+            <xs:element name="UVG-LAA-Salary" type="tns:UVG-LAA-SalaryType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG-Lohn</translation>
+                        <description>
+                            <short>UVG-Lohn der Person</short>
+                            <domain>
+                                Bei mehreren Beitragsdauern (Einritt/Austritt oder Code-Wechsel)
+                                während eines Jahres, sind die dazugehörenden Einkommen periodengerecht aufzuschlüsseln.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="UVG-LAA-SalaryType">
+        <xs:sequence>
+            <xs:element name="AccountingTime" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beitragsdauer</translation>
+                        <description>
+                            <short>Die Beitragsdauer des Versicherten</short>
+                            <domain>
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten begonnen hat (1. Arbeitstag
+                                im Kalenderjahr für unterjährigen Arbeitsbeginn, bzw. 1. Januar für ganzjährig
+                                Beschäftigte).
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten aufgehört hat (letzter
+                                Arbeitstag im Kalenderjahr für unterjährigen Austritt des Mitarbeitenden, bzw. 31.
+                                Dezember für ganzjährig Beschäftigte).
+                                Lohn ausserhalb der Abrechnungsperiode:
+                                Wenn der beitragspflichtige Lohn für eine andere Periode als das Kalenderjahr
+                                (GeneralSalaryDeclarationDescriptionType/AccountingPeriod) gilt, dann muss die
+                                Beitragsadauer für das Bestimmungsjahr angegeben werden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA-Code" type="tns:UVG-LAA-CodeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG-Code</translation>
+                        <description>
+                            <short>UVG-Code</short>
+                            <domain>
+                                Mit dem zweistelligen UVG-Code (alphanumerisch) wird angegeben, in welchem
+                                Betriebsteil der Mitarbeiter beschäftigt ist. Er weist auf die Art der Versicherung hin.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA-GrossSalary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG-Bruttolohn</translation>
+                        <description>
+                            <short>Der UVG-Bruttolohn ist die Summe aller aufbauenden Lohnarten</short>
+                            <domain>
+                                Der Bruttolohn ist in der Regel die Summe aller aufbauenden Lohnarten sowie allfälliger
+                                Korrekturen.
+                                Die Grösse ist bei der Revision für den Summenvergleich notwendig.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA-BaseSalary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG-Basislohn</translation>
+                        <description>
+                            <short>Die UVG-Basis enthält die Summe aller UVG-pflichtigen Lohnarten</short>
+                            <domain>
+                                Enthält die Summe aller UVG-pflichtigen Lohnarten, ohne Rücksicht auf den versicherten
+                                Höchstlohn und den UVG-Code.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA-ContributorySalary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beitragspflichtiger UVG Lohn</translation>
+                        <description>
+                            <short>Der beitragspflichtige UVG Lohn aufgrund der UVG-Basis</short>
+                            <domain>
+                                Beitragspflichtiger Lohn, der aufgrund der UVG-Basis für die versicherten Personen unter
+                                der Berücksichtigung des Höchstlohnes berechnet wird.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionIDRef" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="UVGZ-LAAC-SalariesType">
+        <xs:sequence>
+            <xs:element name="UVGZ-LAAC-Salary" type="tns:UVGZ-LAAC-SalaryType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ-Lohn</translation>
+                        <description>
+                            <short>UVGZ-Lohn der Person</short>
+                            <domain>
+                                Bei mehreren Beitragsdauern (Einritt/Austritt oder Code-Wechsel)
+                                während eines Jahres, sind die dazugehörenden Einkommen periodengerecht aufzuschlüsseln.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="UVGZ-LAAC-SalaryType">
+        <xs:sequence>
+            <xs:element name="AccountingTime" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beitragsdauer</translation>
+                        <description>
+                            <short>Die Beitragsdauer des Versicherten</short>
+                            <domain>
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten begonnen hat (1. Arbeitstag
+                                im Kalenderjahr für unterjährigen Arbeitsbeginn, bzw. 1. Januar für ganzjährig
+                                Beschäftigte).
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten aufgehört hat (letzter
+                                Arbeitstag im Kalenderjahr für unterjährigen Austritt des Mitarbeitenden, bzw. 31.
+                                Dezember für ganzjährig Beschäftigte).
+                                Lohn ausserhalb der Abrechnungsperiode:
+                                Wenn der beitragspflichtige Lohn für eine andere Periode als das Kalenderjahr
+                                (GeneralSalaryDeclarationDescriptionType/AccountingPeriod) gilt, dann muss die
+                                Beitragsadauer für das Bestimmungsjahr angegeben werden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC-Code" type="tns:AssuranceCategoryCodeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ-Code</translation>
+                        <description>
+                            <short>UVGZ-Code</short>
+                            <domain>
+                                Mit dem UVGZ-Code wird angegeben, welcher Versicherungskategorie
+                                der Mitarbeiter zugeteilt wurde. Er weist auf die Art der Versicherungslösung hin.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC-BaseSalary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ-Basislohn</translation>
+                        <description>
+                            <short>Die UVGZ-Basis enthält die Summe aller UVGZ-pflichtigen Lohnarten</short>
+                            <domain>
+                                Enthält die Summe aller UVGZ-pflichtigen Lohnarten, ohne Rücksicht auf den versicherten
+                                Höchstlohn und den UVGZ-Code.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC-ContributorySalary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beitragspflichtiger UVGZ Lohn</translation>
+                        <description>
+                            <short>Der beitragspflichtige UVGZ Lohn aufgrund der UVGZ-Basis</short>
+                            <domain>
+                                Beitragspflichtiger Lohn, der aufgrund der UVGZ-Basis für die versicherten Personen
+                                unter der Berücksichtigung des Höchstlohnes berechnet wird.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionIDRef" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="KTG-AMC-SalariesType">
+        <xs:sequence>
+            <xs:element name="KTG-AMC-Salary" type="tns:KTG-AMC-SalaryType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>KTG-Lohn</translation>
+                        <description>
+                            <short>KTG-Lohn der Person</short>
+                            <domain>
+                                Bei mehreren Beitragsdauern (Einritt/Austritt oder Code-Wechsel)
+                                während eines Jahres, sind die dazugehörenden Einkommen periodengerecht aufzuschlüsseln.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="KTG-AMC-SalaryType">
+        <xs:sequence>
+            <xs:element name="AccountingTime" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beitragsdauer</translation>
+                        <description>
+                            <short>Die Beitragsdauer des Versicherten</short>
+                            <domain>
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten begonnen hat (1. Arbeitstag
+                                im Kalenderjahr für unterjährigen Arbeitsbeginn, bzw. 1. Januar für ganzjährig
+                                Beschäftigte).
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten aufgehört hat (letzter
+                                Arbeitstag im Kalenderjahr für unterjährigen Austritt des Mitarbeitenden, bzw. 31.
+                                Dezember für ganzjährig Beschäftigte).
+                                Lohn ausserhalb der Abrechnungsperiode:
+                                Wenn der beitragspflichtige Lohn für eine andere Periode als das Kalenderjahr
+                                (GeneralSalaryDeclarationDescriptionType/AccountingPeriod) gilt, dann muss die
+                                Beitragsadauer für das Bestimmungsjahr angegeben werden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KTG-AMC-Code" type="tns:AssuranceCategoryCodeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>KTG-Code</translation>
+                        <description>
+                            <short>KTG-Code</short>
+                            <domain>
+                                Mit dem KTG-Code wird angegeben, welcher Versicherungskategorie
+                                der Mitarbeiter zugeteilt wurde. Er weist auf die Art der Versicherungslösung hin.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Reference-AHV-AVS-Salary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Referenz AHV-Lohn</translation>
+                        <description>
+                            <short>Referenz zum AHV-Lohn</short>
+                            <domain>
+                                Enthält den AHV-Lohn.
+                                Bei den meisten Krankentaggeld-Lösungen entspricht der AHV-Lohn auch dem KTG pflichtigen
+                                Lohn.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KTG-AMC-ContributorySalary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beitragspflichtiger KTG Lohn</translation>
+                        <description>
+                            <short>Der beitragspflichtige KTG Lohn aufgrund der KTG-Basis</short>
+                            <domain>
+                                Beitragspflichtiger Lohn, der aufgrund der KTG-Basis für die versicherten Personen unter
+                                der Berücksichtigung des Höchstlohnes berechnet wird.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionIDRef" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="BVG-LPP-SalariesType">
+        <xs:sequence>
+            <xs:element name="BVG-LPP-Salary" type="tns:BVG-LPP-SalaryType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>BVG-Lohn</translation>
+                        <description>
+                            <short>BVG-Lohn der Person</short>
+                            <domain>
+                                Bei mehreren Beitragsdauern (Einritt/Austritt oder Code-Wechsel)
+                                während eines Jahres, sind die dazugehörenden Einkommen periodengerecht aufzuschlüsseln.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="BVG-LPP-SalaryType">
+        <xs:sequence>
+            <xs:element name="AccountingTime" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beitragsdauer</translation>
+                        <description>
+                            <short>Die Beitragsdauer des Versicherten</short>
+                            <domain>
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten begonnen hat (1. Arbeitstag
+                                im Kalenderjahr für unterjährigen Arbeitsbeginn, bzw. 1. Januar für ganzjährig
+                                Beschäftigte).
+                                Genaues Datum, an dem die Beitragsdauer für den Versicherten aufgehört hat (letzter
+                                Arbeitstag im Kalenderjahr für unterjährigen Austritt des Mitarbeitenden, bzw. 31.
+                                Dezember für ganzjährig Beschäftigte).
+                                Lohn ausserhalb der Abrechnungsperiode:
+                                Wenn der beitragspflichtige Lohn für eine andere Periode als das Kalenderjahr
+                                (GeneralSalaryDeclarationDescriptionType/AccountingPeriod) gilt, dann muss die
+                                Beitragsadauer für das Bestimmungsjahr angegeben werden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BVG-LPP-Code" type="tns:AssuranceCategoryCodeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>BVG-Code</translation>
+                        <description>
+                            <short>BVG-Code</short>
+                            <domain>
+                                Mit dem BVG-Code wird angegeben, welcher Versicherungskategorie
+                                der Mitarbeiter zugeteilt wurde. Er weist auf die Art der Versicherungslösung hin.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BVG-LPP-AHV-AVS-Salary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>BVG-AHV-Lohn</translation>
+                        <description>
+                            <short>BVG pflichtiger AHV-Lohn</short>
+                            <domain>
+                                Enthält den BVG pflichtigen AHV-Lohn.
+                                Aufgrund des BVG pflichtigen AHV-Lohnes ermittelt die Vorsorgeeinrichtung unter
+                                Berücksichtigung des maximalen Lohnes und dem Koordinationsabzug den BVG
+                                versicherten Lohn.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionIDRef" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="FAK-CAF-SalariesType">
+        <xs:sequence>
+            <xs:element name="FAK-CAF-Salary" type="tns:FAK-CAF-SalaryType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-Zulage pro Person (Angestellter) und Periode</translation>
+                        <description>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FAK-CAF-SalaryType">
+        <xs:sequence>
+            <xs:element name="FAK-CAF-Period" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-Periode</translation>
+                        <description>
+                            <short>
+                                FAK-Periode
+                            </short>
+                            <domain>
+                                Beginn des Zulagenanspruches. Bei ganzjährig 01.01.JJJJ und sonst das Geburtsdatum bei
+                                unterjährigem Beginn.
+                                Ende des Zulagenanspruches. Bei ganzjährig 31.12.JJJJ und sonst das Datum
+                                des unterjährigen Endes.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF-ContributorySalary" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-Lohn</translation>
+                        <description>
+                            <short>
+                                FAK-pflichtiger Lohn pro Versicherte
+                            </short>
+                            <domain>
+                                Normalerweise entspricht der FAK-pflichtige Lohn dem AHV-pflichtigen Einkommen
+                                Bei mehreren Beitragsdauern (Einritt/Austritt oder Wechsel des Arbeitsplatz-Kantones)
+                                während eines Jahres, sind die dazugehörenden Einkommen periodengerecht aufzuschlüsseln.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF-FamilyIncomeSupplement" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-Familienzulagen</translation>
+                        <description>
+                            <short>
+                                Summe der ausbezahlten Familienzulagen pro Versicherte
+                            </short>
+                            <domain>
+                                Es ist die Summe der ausbezahlten Familienzulagen (ohne Geburtszulagen
+                                und ohne Nachzahlungen für andere Jahre) pro Versicherter (pro Person) auszuweisen,
+                                welche von einer Familienausgleichskasse an die Unternehmen verrechnet wurde.
+                                An die Angestellten ausbezahlten Beträge werden hier positiv dargestellt.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF-WorkplaceCanton" type="tns:CantonType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-Kanton</translation>
+                        <description>
+                            <short>FAK-Kanton der Betriebsstätte des Versicherten</short>
+                            <domain>
+                                Zu übermitteln ist der Domizilkanton der Betriebsstätte, in welcher der Versicherte
+                                tätig ist.
+                                Bei allfälligen Ausnahmebewilligungen ist der vereinbarte Kanton und bei FAK-Befreiung
+                                oder anerkannter eigener FAK-Kasse entsprechend zu melden.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- tax -->
+    <xs:complexType name="TaxSalariesType">
+        <!-- choice xor ?? -->
+        <xs:sequence>
+            <xs:element name="TaxAnnuity" type="tns:TaxAnnuityType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Steuerbare Rente (B)</translation>
+                        <description>
+                            <short>Rente gemäss Rentenbescheinigung</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="TaxSalary" type="tns:TaxSalaryType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Steuerbares Einkommen (A)</translation>
+                        <description>
+                            <short>Einkommen gemäss Lohnausweis</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- statistic -->
+    <xs:complexType name="StatisticSalariesType">
+        <xs:sequence>
+            <xs:element name="StatisticSalary" type="tns:StatisticSalaryType" minOccurs="1" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Statistik Lohn</translation>
+                        <description>
+                            <short>Statistik Lohn</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- attribute-character: Person-Salary  -->
+    <!-- tax -->
+    <xs:complexType name="TaxAnnuityType">
+        <xs:sequence>
+            <xs:element name="Period" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Rentenperiode (E)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Income" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Rente (z1)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="GrossIncome" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Bruttolohn STV (z8)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NetIncome" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Nettolohn STV (z11)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TaxSalaryType">
+        <xs:sequence>
+            <xs:element name="Period" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Lohnperiode (E)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FreeTransport" type="tns:EmptyType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Unentgeltliche Beförderung (F)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CanteenLunchCheck" type="tns:EmptyType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Kantinenverpflegung / Lunch-Checks (G)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Income" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Lohn (z1)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FringeBenefits" type="tns:FringeBenefitsType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Gehaltsnebenleistungen (z2)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SporadicBenefits" type="tns:SortSumType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Unregelmässige Leistungen (z3)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CapitalPayment" type="tns:SortSumType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Kapitalleistungen (z4)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="OwnershipRight" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beteiligungsrechte (z5)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BoardOfDirectorsRemuneration" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Verwaltungsratsentschädigungen (z6)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="OtherBenefits" type="tns:SortSumType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Andere Leistungen (z7)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="GrossIncome" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Bruttolohn STV (z8)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AHV-ALV-NBUV-AVS-AC-AANP-Contribution" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV-IV-EO-ALV-NBUV Beiträge (z9)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BVG-LPP-Contribution" type="tns:BVG-LPP-ContributionType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Berufliche Vorsorge (z10)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NetIncome" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Nettolohn STV (z11)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DeductionAtSource" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Quellensteuerabzug (z12)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ChargesRule" type="tns:ChargesRuleType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Spesenregelung</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Charges" type="tns:ChargesType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Spesenvergütung (z13)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="OtherFringeBenefits" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Weitere Gehaltsnebenleistungen (z14)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="StandardRemark" type="tns:StandardRemarkType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Standard Bemerkungen (z15)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Remark" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Bemerkungen (z15)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FringeBenefitsType">
+        <xs:sequence>
+            <xs:element name="FoodLodging" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Verpflegung Unterkunft (z2.1)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CompanyCar" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Privatanteil Geschäftswagen (z2.2)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Other" type="tns:SortSumType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Andere (z2.3)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="BVG-LPP-ContributionType">
+        <xs:sequence>
+            <xs:element name="Regular" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Ordentliche Beiträge (z10.1)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Purchase" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beiträge für den Einkauf (z10.2)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ChargesRuleType">
+        <xs:choice>
+            <xs:element name="WithRegulation" type="tns:GrantType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Spesenreglement(z15/rz55,56,65)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Guidance" type="tns:EmptyType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Kreuz Spesenregelung gemäss (z13.1.1-X/rz52,56)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="ChargesType">
+        <xs:sequence>
+            <xs:element name="Effective" type="tns:EffectiveType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Effektive Spesen (z13.1)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="LumpSum" type="tns:LumpSumType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Pauschalspesen (z13.2)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Education" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Beiträge an Weiterbildung (z13.3)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="EffectiveType">
+        <xs:sequence>
+            <xs:element name="TravelFoodAccommodation" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Reise, Verpflegung, Übernachtung (z13.1.1)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Other" type="tns:SortSumOptinalType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Andere (z13.1.2)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="LumpSumType">
+        <xs:sequence>
+            <xs:element name="Representation" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Repräsentation (z13.2.1)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Car" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Auto (z13.2.2)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Other" type="tns:SortSumType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Übrige (z13.2.3)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SortSumType">
+        <xs:sequence>
+            <xs:element name="Text" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Text (,-separiert)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Sum" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Summe</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SortSumOptinalType">
+        <xs:sequence>
+            <xs:element name="Text" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Text (,-separiert)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Sum" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Summe</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="StandardRemarkType">
+        <xs:sequence>
+            <xs:element name="StaffShareThirdCompany" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Mitarbeiterbeteiligung durch Drittgesellschaft (z15/rz70)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ChildAllowancePerAHV-AVS" type="tns:EmptyType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Kinderzulagen durch die Ausgleichkasse bezahlt (z15/rz15)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="RelocationCosts" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Umzugskosten durch Arbeitgeber(z15/rz71)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="StaffShareMarketValue" type="tns:GrantType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Mitarbeiterbeteilgung-Verkehrswert (rz68)</translation>
+                        <description>
+                            <short>
+                                Ein genehmigter Verkehrswert der Mitarbeiterbeteiligung
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="StaffShareWithoutTaxableIncome" type="tns:ReasonType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Mitarbeiterbeteilgung ohne steuerbares Einkommen (rz69)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PrivatePartCompanyCar" type="tns:GrantType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Privatanteil Geschäftswagen (rz21)</translation>
+                        <description>
+                            <short>
+                                Ein genehmigter Privatanteil für den Geschäftswagen
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CompanyCarClarify" type="tns:EmptyType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Auto priv.anteil im Veranlagungsverfahren abklären (rz22)</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GrantType">
+        <xs:sequence>
+            <xs:element name="Allowed" type="xs:date">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Genehmigt-Datum</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Canton" type="tns:CantonType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Genehmigungs-Kanton</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- statistic -->
+    <xs:complexType name="StatisticSalaryType">
+        <xs:sequence>
+            <xs:element name="Period" type="tns:TimePeriodType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Dauer</translation>
+                        <description>
+                            <short>Dauer der Beschäftigung Statistik</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="TotalHoursOfWork" type="tns:TotalHoursOfWorkType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total Stunden</translation>
+                        <description>
+                            <short>Total der Stunden Statistik (STD)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="TotalLessonsOfWork" type="tns:TotalLessonsOfWorkType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total Lektionen</translation>
+                        <description>
+                            <short>Total der Lektionen Statistik (LEK)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="GrossEarnings" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Bruttolohn</translation>
+                        <description>
+                            <short>Bruttolohn Statistik (BS)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SocialContributions" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Sozialabgaben</translation>
+                        <description>
+                            <short>Sozialabgaben Statistik (SA)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Allowances" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Zulagen</translation>
+                        <description>
+                            <short>Zulagen Statistik (ZU)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Overtime" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Überstunden</translation>
+                        <description>
+                            <short>Überstunden Statistik (US)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Earnings13th" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>13ter Monatslohn</translation>
+                        <description>
+                            <short>13ter Monatslohn Statistik (ZML)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SpecialPayments" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Sonderzulagen</translation>
+                        <description>
+                            <short>Sonderzulagen Statistik (SO)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PaymentsByThird" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Drittleistungen</translation>
+                        <description>
+                            <short>Drittleistungen Statistik (DL)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="LaborCost" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Arbeitskosten</translation>
+                        <description>
+                            <short>Arbeitskosten Statistik (AK)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ExtendedBenefits" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Zusatzleistungen</translation>
+                        <description>
+                            <short>Zusatzleistungen Statistik (ZL)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Education" type="tns:EducationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Ausbildung</translation>
+                        <description>
+                            <short>Ausbildung</short>
+                            <domain>
+                                Ausbildung des Arbeitnehmers
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Skill" type="tns:SkillType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anforderungsniveau</translation>
+                        <description>
+                            <short>Anforderungsniveau</short>
+                            <domain>
+                                Anforderungsniveau des Arbeitsplatzes
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Position" type="tns:PositionType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Berufliche Stellung</translation>
+                        <description>
+                            <short>Berufliche Stellung</short>
+                            <domain>
+                                Berufliche Stellung des Arbeitnehmers
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Activity" type="tns:ActivityType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Tätigkeit</translation>
+                        <description>
+                            <short>Tätigkeit</short>
+                            <domain>
+                                effektive Tätigkeit des Arbeitnehmers
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="WageForm" type="tns:WageFormType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Lohnform</translation>
+                        <description>
+                            <short>Lohnform</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!--
+
+        kernel: Social-Insurance
+    -->
+    <xs:complexType name="CustomerIdentificationType">
+        <xs:sequence>
+            <xs:element name="AHV-AVS" type="tns:AHV-AVS-CustomerIdentificationType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Enthält AHV Kunden Identifikation aus Sicht der Ausgleichskasse
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA" type="tns:UVG-LAA-CustomerIdentificationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Enthält UVG Kunden Identifikation aus Sicht der Versicherung
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC" type="tns:GenericCustomerIdentificationMultiType" minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Enthält UVGZ Kunden Identifikation
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KTG-AMC" type="tns:GenericCustomerIdentificationMultiType" minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>KTG Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Enthält KTG Kunden Identifikation
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BVG-LPP" type="tns:GenericCustomerIdentificationMultiType" minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>BVG Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Enthält BVG Kunden Identifikation
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF" type="tns:FAK-CAF-CustomerIdentificationType" minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Enthält FAK Kunden Identifikation aus Sicht der Familien Ausgleichskasse
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AHV-AVS-CustomerIdentificationType">
+        <xs:sequence>
+            <xs:element name="AK-CC-BranchNumber" type="tns:AK-CC-NumberType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AK-Nummer</translation>
+                        <description>
+                            <short>
+                                Nummer der Ausgleichskasse, bei der das Mitglied (die Unternehmen)
+                                angeschlossen ist
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AK-CC-CustomerNumber" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AK-Mitgliednummer</translation>
+                        <description>
+                            <short>
+                                Von der Ausgleichskasse zugeteilte Mitglied- oder Abrechnungsnummer, die zur eindeutigen
+                                Identifikation des Mitgliedes (der Unternehmen) dient.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AK-CC-SubNumber" type="tns:SubNumberType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AK-SubNummer</translation>
+                        <description>
+                            <short>
+                                Ein Kunde kann in der Kundennummer mehrere Subnummern für separate Abrechnungen
+                                wünschen.
+                                Diese werden z.B. für Tochtergesellschaften, Kaderlöhne usw. verwendet
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SalaryDeclarationIsComplete" type="tns:SimpleBooleanType">
+                <xs:annotation>
+                    <xs:documentation>Lohndeklaration ist vollständig</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="UVG-LAA-CustomerIdentificationType">
+        <xs:sequence>
+            <xs:element name="Suva" type="tns:SuvaCustomerIdentityType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Suva Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Enthält Kunden Identifikation aus Sicht der Suva
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Other" type="tns:GenericCustomerIdentificationMultiType" minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Andere Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Enthält Kunden Identifikation aus Sicht einer Versicherung
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FAK-CAF-CustomerIdentificationType">
+        <xs:sequence>
+            <xs:element name="FAK-CAF-BranchNumber" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-Nummer</translation>
+                        <description>
+                            <short>
+                                Nummer der Familienausgleichskasse, bei der das Mitglied (die Unternehmen)
+                                angeschlossen ist.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF-CustomerNumber" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-Mitgliednummer</translation>
+                        <description>
+                            <short>
+                                Von der Familienausgleichskasse zugeteilte Mitglied- oder Abrechnungsnummer, die zur
+                                eindeutigen
+                                Identifikation des Mitgliedes (der Unternehmen) dient.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF-SubNumber" type="tns:SubNumberType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK-SubNummer</translation>
+                        <description>
+                            <short>
+                                Ein Kunde kann in der Kundennummer mehrere Subnummern für separate Abrechnungen
+                                wünschen.
+                                Diese werden z.B. für Tochtergesellschaften, Kaderlöhne usw. verwendet
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SalaryDeclarationIsComplete" type="tns:SimpleBooleanType">
+                <xs:annotation>
+                    <xs:documentation>Lohndeklaration ist vollständig</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionID" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die ID der Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <!-- attribute-character: Social-Insurance  -->
+    <xs:complexType name="SuvaCustomerIdentityType">
+        <xs:sequence>
+            <xs:element name="SuvaCustomerNumber" type="tns:SuvaCustomerNumberType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Suva Kundennummer</translation>
+                        <description>
+                            <short>
+                                Von der Suva zugeteilte Kunden-Nummer, die zur eindeutigen Identifikation des Betriebes
+                                (der Unternehmen) dient.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SuvaSubNumber" type="tns:SubNumberType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Suva Subnummer</translation>
+                        <description>
+                            <short>
+                                Ein Kunde kann in der Kundennummer mehrere Subnummern für separate Abrechnungen
+                                wünschen.
+                                Diese werden z.B. für Tochtergesellschaften, Kaderlöhne usw. verwendet
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SalaryDeclarationIsComplete" type="tns:SimpleBooleanType">
+                <xs:annotation>
+                    <xs:documentation>Lohndeklaration ist vollständig</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionID" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="GenericCustomerIdentificationMultiType">
+        <xs:sequence>
+            <xs:element name="InsuranceID" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Versicherungsidentifikation</translation>
+                        <description>
+                            <short>Versicherungsidentifikation gemäss seperater Liste</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="InsuranceCompanyName" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Versicherungsname</translation>
+                        <description>
+                            <short>
+                                Name der Sozialversicherung
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CustomerIdentity" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Versicherungs Kunden Identifikation</translation>
+                        <description>
+                            <short>
+                                Von der Versicherung zugeteilte Kunden-Identifikation, die zur eindeutigen
+                                Identifikation des Betriebes
+                                (der Unternehmen) dient.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ContractIdentity" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Vertragsidentifikation</translation>
+                        <description>
+                            <short>
+                                Von der Versicherung zugeteilte Vertrags-Identifikation.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SalaryDeclarationIsComplete" type="tns:SimpleBooleanType">
+                <xs:annotation>
+                    <xs:documentation>Lohndeklaration ist vollständig</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionID" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <!--
+
+        kernel: SalaryTotals
+    -->
+    <xs:complexType name="SalaryTotalsType">
+        <xs:sequence>
+            <xs:element name="AHV-AVS-Totals" type="tns:AHV-AVS-TotalsType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>AHV Lohntotale</translation>
+                        <description>
+                            <short>
+                                Alle AHV Lohntotale
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA-Totals" type="tns:UVG-LAA-TotalsType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG Lohntotale</translation>
+                        <description>
+                            <short>
+                                Alle UVG Lohntotale
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC-Totals" type="tns:UVGZ-LAAC-TotalsType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ Lohntotale</translation>
+                        <description>
+                            <short>Alle UVGZ Lohntotale</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KTG-AMC-Totals" type="tns:KTG-AMC-TotalsType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>KTG Lohntotale</translation>
+                        <description>
+                            <short>Alle KTG Lohntotale</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF-FLG-LFA-Totals" type="tns:FAK-CAF-FLG-LFA-TotalsType" minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>FAK FLG Lohntotale</translation>
+                        <description>
+                            <short>Alle FAK und FLG Lohntotale</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AHV-AVS-TotalsType">
+        <xs:sequence>
+            <xs:element name="Total-AHV-AVS-Incomes" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total AHV-Löhne</translation>
+                        <description>
+                            <short>Summe aller AHV-Löhne</short>
+                            <domain>
+                                Es sind die massgebenden Einkommen der gesamten Unternehmen
+                                für AHV/IV/EO zu addieren und auszuweisen.
+                            </domain>
+                            <technical>
+                                Redundante Information
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Total-AHV-AVS-Open" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total AHV-freien Löhne</translation>
+                        <description>
+                            <short>Summe aller AHV-freien Löhne</short>
+                            <domain>
+                                Es sind die AHV-freien Beträge zu addieren und auszuweisen.
+                            </domain>
+                            <technical>
+                                Redundante Information
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Total-ALV-AC-Incomes" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total ALV-Löhne</translation>
+                        <description>
+                            <short>Summe aller ALV-Löhne</short>
+                            <domain>
+                                Es sind die massgebenden Einkommen für ALV zu addieren und auszuweisen.
+                            </domain>
+                            <technical>
+                                Redundante Information
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Total-ALVZ-ACS-Incomes" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total ALVZ-Löhne</translation>
+                        <description>
+                            <short>Summe aller ALVZ-Löhne</short>
+                            <domain>
+                                Ab 2004 ist ALVZ nicht mehr in Kraft, kann jedoch jederzeit wieder eingeführt werden.
+                            </domain>
+                            <technical>
+                                Redundante Information
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Total-ALV-AC-Open" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total ALV-freien Löhne</translation>
+                        <description>
+                            <short>Summe aller ALV-freien Löhne</short>
+                            <domain>
+                                Es sind die ALV-freien Beträge zu addieren und auszuweisen.
+                            </domain>
+                            <technical>
+                                Redundante Information
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="UVG-LAA-TotalsType">
+        <xs:sequence>
+            <xs:element name="UVG-LAA-BranchTotals" type="tns:UVG-LAA-BranchTotalsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG Betriebsteil-Totale</translation>
+                        <description>
+                            <short>
+                                Totale pro Betriebsteil einer Unternehmen
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA-MasterTotal" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG Gesamttotal</translation>
+                        <description>
+                            <short>
+                                Es sind die massgebenden Einkommen für UVG zu addieren und auszuweisen.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOfFemalePersons" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl weiblicher Personen</translation>
+                        <description>
+                            <short>
+                                Anzahl weiblicher Personen (Versicherte) per 30.9. des Jahres
+                            </short>
+                            <domain>
+                                Es ist die Anzahl der voll und teilzeit beschäftigten, versicherten weiblichen Personen
+                                per 30.9. des Jahres auszuweisen.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOfMalePersons" type="xs:nonNegativeInteger">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl männlicher Personen</translation>
+                        <description>
+                            <short>
+                                Anzahl männlicher Personen (Versicherte) per 30.9. des Jahres
+                            </short>
+                            <domain>
+                                Es ist die Anzahl der voll und teilzeit beschäftigten, versicherten männlichen Personen
+                                per 30.9. des Jahres auszuweisen.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionIDRef" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="UVGZ-LAAC-TotalsType">
+        <xs:sequence>
+            <xs:element name="UVGZ-LAAC-CategoryTotals" type="tns:UVGZ-LAAC-CategoryTotalsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ Kategory-Totale</translation>
+                        <description>
+                            <short>
+                                Totale pro Versicherungskategorie einer Unternehmen
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC-MasterTotal" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ Gesamttotal</translation>
+                        <description>
+                            <short>
+                                Es sind die massgebenden Einkommen für UVGZ zu addieren und auszuweisen.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionIDRef" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="KTG-AMC-TotalsType">
+        <xs:sequence>
+            <xs:element name="KTG-AMC-CategoryTotals" type="tns:KTG-AMC-CategoryTotalsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>KTG Kategory-Totale</translation>
+                        <description>
+                            <short>
+                                Totale pro Versicherungskategorie einer Unternehmen
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KTG-AMC-MasterTotal" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>KTG Gesamttotal</translation>
+                        <description>
+                            <short>
+                                Es sind die massgebenden Einkommen für KTG zu addieren und auszuweisen.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="InstitutionIDRef" type="tns:InstitutionIDType" use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="de">
+                    <translation>InstitutionIDReferenz</translation>
+                    <description>
+                        <short>
+                            Hier wird die Referenz auf die entsprechende Institution innerhalb einer Domäne angegeben.
+                        </short>
+                    </description>
+                </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="FAK-CAF-FLG-LFA-TotalsType">
+        <xs:sequence>
+            <xs:element name="Total-FAK-CAF-IncomesPerCanton" type="tns:Total-FAK-CAF-IncomesPerCantonType"
+                        minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total FAK-Löhne pro Kanton</translation>
+                        <description>
+                            <short>Summe aller FAK-Löhne pro Kanton</short>
+                            <domain>
+                                Es sind die massgebenden Einkommen der gesamten Unternehmen
+                                für die FAK pro Kanton zu addieren und auszuweisen.
+                                Normalerweise entspricht der FAK-pflichtige Lohn dem AHV-pflichtigen Einkommen
+                            </domain>
+                            <technical>
+                                Redundante Information
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Total-FLG-LFA-Incomes" type="tns:SalaryAmountType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total FLG-Löhne</translation>
+                        <description>
+                            <short>Summe aller FLG Löhne</short>
+                            <domain>
+                                Es sind die massgebenden Löhne für FLG von allen Versicherten zu addieren und
+                                auszuweisen.
+                                Für FLG massgebend sind ausschliesslich in der Landwirtschaft generierte Löhne.
+                            </domain>
+                            <technical>
+                                NICHT redundante Information
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- attribute-character: UVG-SalaryTotals  -->
+    <xs:complexType name="UVG-LAA-BranchTotalsType">
+        <xs:sequence>
+            <xs:element name="UVG-LAA-BranchTotal" type="tns:UVG-LAA-BranchTotalType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVG Betriebsteil Lohntotal</translation>
+                        <description>
+                            <short>
+                                Das UVG Lohntotal eines Betriebsteils
+                            </short>
+                            <domain>
+                                Enthält die UVG Lohntotale eines Betriebsteils einer Unternehmen. Die Lohnmeldung muss
+                                für jeden in der Lohnmeldung enthaltenen Betriebsteil (siehe UVG-LohnType) die Totale
+                                enthalten.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="UVG-LAA-BranchTotalType">
+        <xs:sequence>
+            <xs:element name="BranchIdentifier" type="tns:BranchIdentifierType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Betriebsteil Identifikation</translation>
+                        <description>
+                            <short>
+                                Name des Betriebsteils. Dieser Wert ist identisch mit der 1. Stelle des UVG-Codes.
+                            </short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NBU-BU-ANP-AP-Total" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>NBU-BU Lohntotal</translation>
+                        <description>
+                            <short>
+                                Das NBU-BU Lohntotal eines Betriebsteils.
+                            </short>
+                            <domain>
+                                Summe der BUV und NBUV versicherten Löhne (alle Löhne mit UVG-Codes die mit 1 oder 2
+                                enden)
+                                eines Betriebsteils
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BU-AP-Total" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>BU Lohntotal</translation>
+                        <description>
+                            <short>
+                                Das BU Lohntotal eines Betriebsteils.
+                            </short>
+                            <domain>
+                                Summe der BUV versicherten Löhne (alle Löhne mit UVG-Codes die mit 3 enden)
+                                eines Betriebsteils
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="UVGZ-LAAC-CategoryTotalsType">
+        <xs:sequence>
+            <xs:element name="UVGZ-LAAC-CategoryTotal" type="tns:GenericCategoryTotalType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>UVGZ Kategorie Lohntotal</translation>
+                        <description>
+                            <short>Das UVGZ Lohntotal einer Versicherungskategorie</short>
+                            <domain>
+                                Enthält die UVGZ Lohntotale einer Versicherungskategorie der Unternehmen.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="KTG-AMC-CategoryTotalsType">
+        <xs:sequence>
+            <xs:element name="KTG-AMC-CategoryTotal" type="tns:GenericCategoryTotalType" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>KTG Kategorie Lohntotal</translation>
+                        <description>
+                            <short>Das KTG Lohntotal einer Versicherungskategorie</short>
+                            <domain>
+                                Enthält die KTG Lohntotale einer Versicherungskategorie der Unternehmen.
+                            </domain>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GenericCategoryTotalType">
+        <xs:sequence>
+            <xs:element name="CategoryCode" type="tns:AssuranceCategoryCodeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Kategorie-Code</translation>
+                        <description>
+                            <short>Versicherungskategorie Code.</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Female-Total" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Weibliches Lohntotal</translation>
+                        <description>
+                            <short>Das Lohntotal einer Kategorie aller Frauen.</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Male-Total" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Männliches Lohntotal</translation>
+                        <description>
+                            <short>Das Lohntotal einer Kategorie aller Männer.</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- attribute-character: FAK-SalaryTotals  -->
+    <xs:complexType name="Total-FAK-CAF-IncomesPerCantonType">
+        <xs:sequence>
+            <xs:element name="Total-FAK-CAF-Incomes" type="tns:SalaryAmountType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Total FAK-Löhne</translation>
+                        <description>
+                            <short>Summe aller FAK-Löhne pro Kanton</short>
+                            <domain>
+                                Es sind die massgebenden Einkommen der gesamten Unternehmen
+                                für die FAK pro Kanton zu addieren und auszuweisen.
+                                Normalerweise entspricht der FAK-pflichtige Lohn dem AHV-pflichtigen Einkommen
+                            </domain>
+                            <technical>
+                                Redundante Information
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Canton" type="tns:CantonType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Kanton</translation>
+                        <description>
+                            <short>Kanton für die Summe</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!--
+
+        kernel: SalaryCounters
+    -->
+    <xs:complexType name="SalaryCountersType">
+        <xs:sequence>
+            <xs:element name="NumberOf-AHV-AVS-Salary-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl AHV-Löhne Tags</translation>
+                        <description>
+                            <short>Anzahl deklarierter AHV-Löhne Tags</short>
+                            <technical>
+                                Anzahl deklarierter AHV-Löhne aller Personen einer Lohnerklärung entspricht
+                                der Anzahl "AHV-Lohn" (AHV-AVS-Salary) Tags innerhalb eines "SalaryDeclaration" Elements
+                                im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOf-UVG-LAA-Salary-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl UVG-Löhne Tags</translation>
+                        <description>
+                            <short>Anzahl deklarierter UVG-Löhne Tags</short>
+                            <technical>
+                                Anzahl deklarierter UVG-Löhne aller Personen einer Lohnerklärung entspricht
+                                der Anzahl "UVG-Lohn" (UVG-LAA-Salary) Tags innerhalb eines "SalaryDeclaration" Elements
+                                im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOf-UVGZ-LAAC-Salary-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl UVGZ-Löhne Tags</translation>
+                        <description>
+                            <short>Anzahl deklarierter UVGZ-Löhne Tags</short>
+                            <technical>
+                                Anzahl deklarierter UVGZ-Löhne aller Personen einer Lohnmeldung entspricht
+                                der Anzahl "UVGZ-Lohn" (UVGZ-LAAC-Salary) Tags innerhalb eines "SalaryDeclaration"
+                                Elements
+                                im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOf-KTG-AMC-Salary-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl KTG-Löhne Tags</translation>
+                        <description>
+                            <short>Anzahl deklarierter KTG-Löhne Tags</short>
+                            <technical>
+                                Anzahl deklarierter KTG-Löhne aller Personen einer Lohnmeldung entspricht
+                                der Anzahl "KTG-Lohn" (KTG-AMC-Salary) Tags innerhalb eines "SalaryDeclaration" Elements
+                                im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOf-BVG-LPP-Salary-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl BVG-Löhne Tags</translation>
+                        <description>
+                            <short>Anzahl deklarierter BVG-Löhne Tags</short>
+                            <technical>
+                                Anzahl deklarierter BVG-Löhne aller Personen einer Lohnmeldung entspricht
+                                der Anzahl "BVG-Lohn" (BVG-LPP-Salary) Tags innerhalb eines "SalaryDeclaration" Elements
+                                im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOf-FAK-CAF-Salary-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl FAK-Löhne Tags</translation>
+                        <description>
+                            <short>Anzahl deklarierter FAK-Löhne Tags</short>
+                            <technical>
+                                Anzahl deklarierter FAK-Löhne aller Personen einer Lohnmeldung entspricht
+                                der Anzahl "FAK-Lohn" (FAK-CAF-Salary) Tags innerhalb eines "SalaryDeclaration" Elements
+                                im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOf-TaxAnnuity-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl Rentenbescheinigung Tags</translation>
+                        <description>
+                            <short>Anzahl deklarierter steuerbare Renten Tags</short>
+                            <technical>
+                                Anzahl Rentenbescheinigung-Löhne aller Personen. Entspricht
+                                der Anzahl aller "Rentenbescheinigung Lohn" (TaxAnnuity) Tags innerhalb der gesamten
+                                Lohnmeldung "SalaryDeclaration" im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOf-TaxSalary-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl Lohnausweis Tags</translation>
+                        <description>
+                            <short>Anzahl deklarierter steuerbare Einkommen Tags</short>
+                            <technical>
+                                Anzahl Lohnausweis-Löhne aller Personen. Entspricht
+                                der Anzahl aller "Lohnausweis Lohn" (TaxSalary) Tags innerhalb der gesamten
+                                Lohnmeldung "SalaryDeclaration" im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NumberOf-StatisticSalaries-Tags" type="xs:unsignedInt" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Anzahl Statistik Lohn Tags</translation>
+                        <description>
+                            <short>Anzahl Statistik Lohn der LSE Tags</short>
+                            <technical>
+                                Anzahl Statistik-Löhne aller Personen einer Lohnstrukturerhebung (LSE). Entspricht
+                                der Anzahl aller "Statistik Lohn" (StatisticSalary) Tags innerhalb der gesamten
+                                Lohnmeldung "SalaryDeclaration" im XML Instanz Dokument.
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!--
+
+        shared-character
+    -->
+    <xs:complexType name="AddressType">
+        <xs:sequence>
+            <xs:element name="ComplementaryLine" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Zusatzzeile</translation>
+                        <description>
+                            <short>Zusatzzeile für Postadresse (2. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Street" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Strasse</translation>
+                        <description>
+                            <short>Strasse und Hausnummer (3. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Postbox" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Postfach</translation>
+                        <description>
+                            <short>Postfach (4. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <!-- Postaddressee line 5 -->
+            <xs:element name="ZIP-Code" type="tns:ZIP-CodeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Postleitzahl (PLZ)</translation>
+                        <description>
+                            <short>Postleitzahl (5. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="City" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Ort</translation>
+                        <description>
+                            <short>Ort (5. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <!-- Postaddressee line 6 -->
+            <xs:element name="Country" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Land</translation>
+                        <description>
+                            <short>Land für Postversand (6. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="EmptyType"/>
+    <xs:complexType name="NationalityType">
+        <xs:sequence>
+            <!--
+            <xs:element name="ISOCode" type="un.ece.unedocs.cl.iso3166:CountryCodeType">
+            -->
+            <xs:element name="ISOCode">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Nationalität</translation>
+                        <description>
+                            <short>
+                                Nationalität 2-stellig nach ISO 3166 Erweitert
+                            </short>
+                            <technical>
+                                Erweiterung
+                                11= unbekannt
+                                22= staatenlos
+                                In der Qualitätsstufe Plausibilität wird gegen die ISO 31666 Codes geprüft und
+                                evtl. eine Warninig angezeigt
+                                http://www.unece.org/etrades/unedocs/repository/codelists/xml/CountryCode.xsd
+                            </technical>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:pattern value="[A-Z][A-Z]|11|22"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="TimePeriodType">
+        <xs:sequence>
+            <xs:element name="from" type="xs:date">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>von</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="until" type="xs:date">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>bis</translation>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <!--
+
+        simpleTypes (arranged alphabetically)
+    -->
+    <xs:simpleType name="ActivityRateType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>BeschäftigungsgradTyp</translation>
+                <description>
+                    <short>BeschäftigungsgradTyp in %</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="1"/>
+            <xs:maxInclusive value="100"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ActivityType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Tätigkeit</translation>
+                <description>
+                    <short>Tätigkeit</short>
+                    <domain>
+                        Mögliche Werte:
+                        sep. Liste !!!
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="10"/>
+            <xs:maxInclusive value="99"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="AHV-AVS-NumberType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>AHV-Nummer Typ</translation>
+                <description>
+                    <short>AHV-Nummer Typ</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:pattern value="[1-9][0-9]{2}\.[0-9]{2}\.[1-8][0-9]{2}\.[0-9]{3}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="AK-CC-NumberType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>AK-Nummer Typ</translation>
+                <description>
+                    <short>Ausgleichskasse Nummer Typ</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:pattern value="[0-9]{3}|[0-9]{3}\.[0-9]{3}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="BranchIdentifierType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Betriebsteil-Identifikations Typ</translation>
+                <description>
+                    <short>Betriebsteil-Identifikations Typ</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:pattern value="[A-Z]"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="CantonType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>KantonsTyp</translation>
+                <description>
+                    <short>KantonsTyp der Schweiz</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="AG"/>
+            <xs:enumeration value="AI"/>
+            <xs:enumeration value="AR"/>
+            <xs:enumeration value="BE"/>
+            <xs:enumeration value="BL"/>
+            <xs:enumeration value="BS"/>
+            <xs:enumeration value="FR"/>
+            <xs:enumeration value="GE"/>
+            <xs:enumeration value="GL"/>
+            <xs:enumeration value="GR"/>
+            <xs:enumeration value="JU"/>
+            <xs:enumeration value="LU"/>
+            <xs:enumeration value="NE"/>
+            <xs:enumeration value="NW"/>
+            <xs:enumeration value="OW"/>
+            <xs:enumeration value="SG"/>
+            <xs:enumeration value="SH"/>
+            <xs:enumeration value="SO"/>
+            <xs:enumeration value="SZ"/>
+            <xs:enumeration value="TG"/>
+            <xs:enumeration value="TI"/>
+            <xs:enumeration value="UR"/>
+            <xs:enumeration value="VD"/>
+            <xs:enumeration value="VS"/>
+            <xs:enumeration value="ZG"/>
+            <xs:enumeration value="ZH"/>
+            <!-- Expatriates d.h. in keinem Kanton -->
+            <xs:enumeration value="EX"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="AssuranceCategoryCodeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Versicherungskategorie-Code Typ</translation>
+                <description>
+                    <short>Versicherungskategorie-Code Typ</short>
+                    <domain>
+                        Für jede Versicherungslösung wird vom Versicherer eine Versicherungskategorie codiert.
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:pattern value="[A-Z0-9]{1,2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="CivilStatusType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>ZivilstandsTyp</translation>
+                <description>
+                    <short>ZivilstandsTyp</short>
+                    <domain>
+                        Mögliche Werte:
+                        unknown = unbekannt;
+                        single = ledig;
+                        married = verheiratet;
+                        widowed = verwitwet;
+                        divorced = geschieden;
+                        separated = getrennt;
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="unknown"/>
+            <xs:enumeration value="single"/>
+            <xs:enumeration value="married"/>
+            <xs:enumeration value="widowed"/>
+            <xs:enumeration value="divorced"/>
+            <xs:enumeration value="separated"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="DegreeOfRelationshipType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Verwandtschaftsgrad</translation>
+                <description>
+                    <short>Verwandtschaftsgrad zum Inhaber</short>
+                    <domain>
+                        Kennzeichnung von mitarbeitenden Familienmitgliedern, die in folgendem Verwandtschaftsgrad
+                        zum Firmeninhaber (nur Personengesellschaften) stehen:
+                        Ehefrau des Inhabers, Ehemann des Inhabers, Blutsverwandte in auf- und absteigender Linie
+                        des Betriebsinhabers (oder dessen Ehepartner) sowie deren Ehepartnerinnen und
+                        Ehepartner, Geschwister des Betriebsinhabers, Adoptivkinder des Inhabers, Pflegekinder des
+                        Inhabers.
+                        Mögliche Werte:
+                        unknown = unbekannt ;
+                        unrelated = nichtVerwandt;
+                        OwnerWife = InhaberEhefrau;
+                        OwnerHusband = InhaberEhemann;
+                        OwnerBloodRelation = InhaberBlutsverwandter
+                        OwnerSiblings = InhaberGeschwister;
+                        OwnerAdoptedChild = InhaberAdaptivkind;
+                        OwnerFosterChild = InhaberPflegekind;
+                        (Hinweis für die verarbeitenden SVU: alle Abrechnungen mit mitarbeitenden Familienmitgliedern
+                        sollten auf eine Nachbearbeitungsliste ausgesondert werden, damit die Fragen bezüglich
+                        Globallohn etc. richtig geklärt werden können).
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="unknown"/>
+            <xs:enumeration value="unrelated"/>
+            <xs:enumeration value="OwnerWife"/>
+            <xs:enumeration value="OwnerHusband"/>
+            <xs:enumeration value="OwnerBloodRelation"/>
+            <xs:enumeration value="OwnerSiblings"/>
+            <xs:enumeration value="OwnerAdoptedChild"/>
+            <xs:enumeration value="OwnerFosterChild"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EducationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Ausbildung</translation>
+                <description>
+                    <short>Ausbildungsart</short>
+                    <domain>
+                        Mögliche Werte:
+                        university = Uni/ETH ;
+                        higherEducation = Fachhochschule ;
+                        higherVocEducation = Höhere Berufsbildung ;
+                        teacherCertificate = Lehrerpatent ;
+                        universityEntranceCertificate = Matura ;
+                        vocEducationCompl = Abgeschlossene Berufsausbildung ;
+                        enterpriseEducation = nur unternehmensinterne Berufsausbildung ;
+                        mandatorySchoolOnly = nur obligatorische Schule ;
+                        other = andere Ausbildung ;
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="university"/>
+            <xs:enumeration value="higherEducation"/>
+            <xs:enumeration value="higherVocEducation"/>
+            <xs:enumeration value="teacherCertificate"/>
+            <xs:enumeration value="universityEntranceCertificate"/>
+            <xs:enumeration value="vocEducationCompl"/>
+            <xs:enumeration value="enterpriseEducation"/>
+            <xs:enumeration value="mandatorySchoolOnly"/>
+            <xs:enumeration value="other"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PositionType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Berufliche Stellung</translation>
+                <description>
+                    <short>Berufliche Stellung</short>
+                    <domain>
+                        Mögliche Werte:
+                        highestCadre = Oberstes Kader ;
+                        middleCadre = Mittleres Kader ;
+                        lowerCadre = Unteres Kader ;
+                        lowestCadre = Unterstes Kader ;
+                        noCadre = ohne Kaderfunktion ;
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="highestCadre"/>
+            <xs:enumeration value="middleCadre"/>
+            <xs:enumeration value="lowerCadre"/>
+            <xs:enumeration value="lowestCadre"/>
+            <xs:enumeration value="noCadre"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PayAgreementType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Lohnvereinbarungsarten</translation>
+                <description>
+                    <short>Lohnvereinbarungsarten</short>
+                    <domain>
+                        Mögliche Werte:
+                        collectivePayAgreementAssociation = Verbandsvertrag ;
+                        collectivePayAgreementEnterprise = Firmen- oder Hausvertrag ;
+                        agreementUnderPublicLaw = Regelung im öffentlich-rechtlichen Bereich ;
+                        individualContract = Einzelarbeitsvertrag ;
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="collectivePayAgreementAssociation"/>
+            <xs:enumeration value="collectivePayAgreementEnterprise"/>
+            <xs:enumeration value="agreementUnderPublicLaw"/>
+            <xs:enumeration value="individualContract"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ReasonType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Gründe</translation>
+                <description>
+                    <short>Gründe</short>
+                    <domain>
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:minLength value="3"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ResidenceCategoryType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Aufenthaltskategorien</translation>
+                <description>
+                    <short>Aufenthaltskategorien für Ausländer</short>
+                    <domain>
+                        Mögliche Werte:
+                        shortTerm = Kurzaufenthalter (L) ;
+                        annual = Jahresaufenthalter (B) ;
+                        settled = Niedergelassene (C) ;
+                        crossBorder = Grenzgänger (G) ;
+                        othersNotSwiss = Andere ;
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="shortTerm"/>
+            <xs:enumeration value="annual"/>
+            <xs:enumeration value="settled"/>
+            <xs:enumeration value="crossBorder"/>
+            <xs:enumeration value="othersNotSwiss"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SalaryAmountType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>LohnbetragsTyp</translation>
+                <description>
+                    <short>LohnbetragsTyp</short>
+                    <technical></technical>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:decimal">
+            <xs:fractionDigits value="2"/>
+            <xs:pattern value="[\-]?[0-9]+\.[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SexType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Geschlechts Typ</translation>
+                <description>
+                    <short>F weiblich; M männlich</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="F"/>
+            <xs:enumeration value="M"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SimpleBooleanType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>SimpleBoolean</translation>
+                <description>
+                    <short>Boolean</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:boolean">
+            <xs:pattern value="true"/>
+            <xs:pattern value="false"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SkillType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Anforderungsniveau</translation>
+                <description>
+                    <short>Anforderungsniveau</short>
+                    <domain>
+                        Mögliche Werte:
+                        mostDemanding = höchst anspruchsvoll ;
+                        qualified = selbständiges u. qualifiziertes Arbeiten bedingt ;
+                        specialized = Berufs- und Fachkentinisse bedingt ;
+                        simple = einfach, repetitiv ;
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="mostDemanding"/>
+            <xs:enumeration value="qualified"/>
+            <xs:enumeration value="specialized"/>
+            <xs:enumeration value="simple"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SubNumberType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>SubNummer Typ</translation>
+                <description>
+                    <short>SubNummer Typ für separate Abrechnungen</short>
+                    <domain>
+                        Ein Suva Kunde kann in der Kundennummer mehrere Subnummern für separate
+                        Abrechnungen wünschen. Diese werden z.B. für Tochtergesellschaften, Kaderlöhne usw.
+                        verwendet
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:pattern value="[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SuvaCustomerNumberType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>SuvaKundenNummer Typ</translation>
+                <description>
+                    <short>Suva Kunden Nummer Typ</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:pattern value="[0-9]{1,4}\-[0-9]{1,5}\.[0-9]"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SV-AS-NumberType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>SV-Nummer Typ</translation>
+                <description>
+                    <short>Sozialversicherungs Nummer Typ</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <!--
+                pattern not defined
+            <xs:pattern value="[0-9]{3}\.[0-9]{4}\.[0-9]{4}\.[0-9]{1,2}"/>
+            -->
+            <xs:maxLength value="16"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="TotalHoursOfWorkType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Total Stunden Typ</translation>
+                <description>max: 8760 = 24 x 365
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:decimal">
+            <xs:minInclusive value="1.00"/>
+            <xs:maxInclusive value="8760.00"/>
+            <xs:fractionDigits value="2"/>
+            <xs:pattern value="[0-9]+\.[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="TotalLessonsOfWorkType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Total Lektionen Typ</translation>
+                <description>max: 8760 = 24 x 365
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="1"/>
+            <xs:maxInclusive value="8760"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UID-EHRAType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Unternehmensidentifikation Typ</translation>
+                <description>
+                    <short>Unternehmensidentifikation Typ</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:pattern value="CH[0-9]{11}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UVG-LAA-CodeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>UVG-Code Typ</translation>
+                <description>
+                    <short>UVG-Code Typ zur Betriebsteilbezeichnung</short>
+                    <domain>
+                        Die erste Stelle (A bis Z) des UVG Codes (ehemals Suva Code) ist die Betriebsteilbezeichnung.
+                        Damit wird
+                        angegeben in Betriebsteil (welcher Risikogruppe) der Mitarbeiter
+                        beschäftigt ist.
+                        Die zweite Stelle gibt die Art der Versicherung an (nicht Suva versichert,
+                        BUV, NBUV)
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:pattern value="[A-Z][0-3]"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="WageFormType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Lohnform</translation>
+                <description>
+                    <short>Lohnformarten</short>
+                    <domain>
+                        Mögliche Werte:
+                        timeWages = Zeitlohn ;
+                        premiumWage = Prämienlohn ;
+                        wagesCommission = Lohn mit Provsionsanteil ;
+                        pieceWorkWage = Akkordlohn ;
+                    </domain>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="timeWages"/>
+            <xs:enumeration value="premiumWage"/>
+            <xs:enumeration value="wagesCommission"/>
+            <xs:enumeration value="pieceWorkWage"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="WeeklyHoursType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Wöchentliche Beschäftigungszeit Typ</translation>
+                <description>
+                    <short>Wöchentliche Beschäftigungszeit</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:decimal">
+            <xs:minInclusive value="1.00"/>
+            <xs:maxInclusive value="99.00"/>
+            <xs:fractionDigits value="2"/>
+            <xs:pattern value="[0-9]+\.[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="WeeklyLessonsType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Wöchentliche Beschäftigungslektionen Typ</translation>
+                <description>
+                    <short>Wöchentliche Beschäftigungslektionen</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="1"/>
+            <xs:maxInclusive value="99"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="YearsOfServiceType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Dienstjahre Typ</translation>
+                <description>
+                    <short>Anzahle der vollen Dienstjahre</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <xs:minInclusive value="0"/>
+            <xs:maxInclusive value="99"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ZIP-CodeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>PLZ Typ</translation>
+                <description>
+                    <short>Postleitzahl</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:minLength value="4"/>
+            <xs:maxLength value="6"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <!--
+
+        supported minor version (only to validate)
+        attribute schemaVersion
+    -->
+    <xs:simpleType name="SupportedMinorSchemaVersionAttributeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>Unterstützte Minor Schema Versionen</translation>
+                <description>
+                    <short>Hier werden die kompatiblen Minor Versionen aufgeliestet</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:decimal">
+            <xs:enumeration value="0.0"/>
+            <!-- sample           -->
+            <!-- <xs:enumeration value="0.1"/> -->
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="InstitutionIDType">
+        <xs:annotation>
+            <xs:documentation>Institution ID</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="#.*"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclarationContainer.xsd b/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclarationContainer.xsd
new file mode 100644
index 000000000000..927e23448b6c
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclarationContainer.xsd
@@ -0,0 +1,717 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema
+    targetNamespace="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationContainer"
+    xmlns:tns="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationContainer"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:sd="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="0.0">
+
+    <!-- state of standardisation: draft20050404 (AHV, UVG, Stv und BfS) -->
+    <!-- last modified $Date: 2005/09/15 13:03:25 $Author: boehm $ -->
+
+    <!--
+    Status 2005.08.23
+        -   uvgz, ktg und bvg neu integriert
+
+    -->
+
+    <!-- imports -->
+    <xs:import namespace="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration" schemaLocation="SalaryDeclaration.xsd"/>
+
+    <!-- complex types -->
+    <!-- request
+    -->
+    <xs:complexType name="RequestContextType">
+        <xs:sequence>
+            <!-- UserAgent: contains information about the transmitter application -->
+            <xs:element name="UserAgent" type="tns:UserAgentType"/>
+            <!-- LanguageCode -->
+            <xs:element name="CompanyName" type="sd:CompanyNameType"/>
+            <xs:element name="TransmissionDate" type="xs:dateTime">
+                <xs:annotation>
+                    <xs:documentation>Übertragungszeitpunkt</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="RequestID" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>RequestID</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="LanguageCode" type="tns:LanguageCodeType"/>
+            <!-- Company: same structure and content as the element
+SalaryDeclarations/SalaryDeclaration/Company in SalaryDeclaration.xsd -->
+            <!-- date and time of transmission -->
+            <!-- MonitoringID: acts as identyfier for writing and accessing
+monitoring informations in/from a reference application
+(related to testing and certification) -->
+            <xs:element name="TestCase" type="tns:EmptyType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Testfall</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="MonitoringID" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>MonitoringID</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Comments" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Bemerkungen</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SalaryDeclarationRequestType">
+        <xs:sequence>
+            <xs:element name="RequestContext" type="tns:RequestContextType">
+                <xs:annotation>
+                    <xs:documentation>Basisdaten</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Job" type="tns:JobType">
+                <xs:annotation>
+                    <xs:documentation>Auftrag</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <!-- Comments: notes related to transmission-->
+            <!--
+TransmissionMode: contains information about a repeated declaration
+(reason: only substitution in case of acceptence )
+            -->
+            <xs:element name="Substitution" type="tns:SubstitutionType" minOccurs="0"/>
+            <!-- Test: marks a test case without processing by the receiver.
+The response contains a special info -->
+            <!-- SalaryDeclarations: defines the core data structure of a salary
+declartion (without transmission information)-->
+            <xs:element name="SalaryDeclaration" type="sd:SalaryDeclarationType">
+                <xs:annotation>
+                    <xs:documentation>Lohnmeldung</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <!-- the concatination of UserAgent, RequestID und Company are used as unique key -->
+    </xs:complexType>
+    <xs:complexType name="GetStatusFromDeferredDeclarationType">
+        <xs:sequence>
+            <!-- UserAgent: contains information about the transmitter application -->
+            <xs:element name="RequestContext" type="tns:RequestContextType">
+                <xs:annotation>
+                    <xs:documentation>Basisdaten</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="JobKey" type="tns:JobKeyType">
+                <xs:annotation>
+                    <xs:documentation>Eindeutiger Bezeichner für den Job</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="JobType">
+        <xs:annotation>
+            <xs:documentation>Aufgabearten</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Addressees" type="tns:AddresseeType">
+                <xs:unique name="UVG-LAA-Ctrl">
+                    <xs:selector xpath="tns:UVG-LAA"/>
+                    <xs:field xpath="@InstitutionIDRef"/>
+                </xs:unique>
+            </xs:element>
+            <xs:element name="EndUserNotification" type="tns:UserNotificationType" minOccurs="0"/>
+            <xs:element name="Comments" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Bemerkungen</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AddresseeType">
+        <xs:annotation>
+            <xs:documentation>bekannte Empfängerdaten</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="AHV-AVS" type="tns:ControlsType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>AHV-AVS</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA" type="tns:ControlsMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>UVG-LAA</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC" type="tns:ControlsMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>UVGZ-LAAC</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KTG-AMC" type="tns:ControlsMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>KTG-AMC</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BVG-LPP" type="tns:ControlsMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>BVG-LPP</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF" type="tns:ControlsMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>FAK-CAF</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CantonalTaxAdministration" type="tns:ControlsType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Kantonale Steuerverwaltung</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SwissFederalStatisticalOffice" type="tns:ControlsType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>BfS</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ControlsType">
+        <xs:sequence>
+            <xs:element name="ProcessByDistributor" type="sd:SimpleBooleanType">
+                <xs:annotation>
+                    <xs:documentation>Verarbeitung durch Distributor</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CCAddressee" type="tns:CarbonCopyAddresseeType" minOccurs="0" maxOccurs="unbounded"  >
+                <xs:annotation>
+                    <xs:documentation>Verarbeitung durch Distributor</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ControlsMultiType">
+        <xs:complexContent>
+            <xs:extension base="tns:ControlsType">
+                <xs:attribute name="InstitutionIDRef" type="sd:InstitutionIDType" use="required"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="UserNotificationType">
+        <xs:annotation>
+            <xs:documentation>EndBenutzer Benachrichtigung</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Name</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="EmailAddress" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>EmailAdresse</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PhoneNumber" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation>Telefonnummer</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SubstitutionType">
+        <xs:annotation>
+            <xs:documentation>Ersatzlieferung</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <!-- replaces prior salary declaration transmission -->
+            <xs:element name="PredecessorRequestID" type="xs:string"/>
+            <xs:element name="PredecessorResponseIDWithAcceptedState" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CarbonCopyAddresseeType">
+        <xs:sequence>
+            <xs:element name="PartnerID" type="xs:string" minOccurs="0" >
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Partneridentifikation</translation>
+                        <description>
+                            <short>Partneridentifikation gemäss seperater Liste</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Name" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Name</translation>
+                        <description>
+                            <short>Name (1. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ComplementaryLine" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Zusatzzeile</translation>
+                        <description>
+                            <short>Zusatzzeile für Postadresse (2. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Street" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Strasse</translation>
+                        <description>
+                            <short>Strasse und Hausnummer (3. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Postbox" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Postfach</translation>
+                        <description>
+                            <short>Postfach (4. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ZIP-Code" type="tns:ZIP-CodeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Postleitzahl (PLZ)</translation>
+                        <description>
+                            <short>Postleitzahl (5. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="City" type="xs:string">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Ort</translation>
+                        <description>
+                            <short>Ort (5. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Country" type="xs:string" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="de">
+                        <translation>Land</translation>
+                        <description>
+                            <short>Land für Postversand (6. Zeile)</short>
+                        </description>
+                    </xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="ZIP-CodeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="de">
+                <translation>PLZ Typ</translation>
+                <description>
+                    <short>Postleitzahl</short>
+                </description>
+            </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:minLength value="4"/>
+            <xs:maxLength value="6"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <!-- response
+    -->
+    <xs:complexType name="ResponseContextType">
+        <xs:sequence>
+            <!-- UserAgent: contains information about the receiver application -->
+            <xs:element name="UserAgent" type="tns:UserAgentType"/>
+            <!-- Social-Insurance-Name: human readable name of the receiving social insurance entity -->
+            <xs:element name="InstitutionName" type="xs:string"/>
+            <!-- date and time of transmission -->
+            <xs:element name="TransmissionDate" type="xs:dateTime"/>
+            <!-- ResponseID: a unique case number associated with a response (generated by receiver) -->
+            <xs:element name="ResponseID" type="xs:string"/>
+            <!-- RequestID: a unique case number associated with a request (generated by transmitter) -->
+            <xs:element name="RequestID" type="xs:string"/>
+            <!-- Completion: contains access information needed to lookup detailled process-information -->
+            <xs:element name="Information" type="tns:AccessInformationType" minOccurs="0"/>
+            <!-- Test: marks a test case without processing by the receiver the response contains a special info -->
+            <xs:element name="TestCase" type="tns:EmptyType" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AddresseeContextType">
+        <xs:sequence>
+            <!-- UserAgent: contains information about the receiver application -->
+            <xs:element name="UserAgent" type="tns:UserAgentType"/>
+            <!-- Social-Insurance-Name: human readable name of the receiving social insurance entity -->
+            <xs:element name="InstitutionName" type="xs:string"/>
+            <!-- date and time of transmission -->
+            <xs:element name="TransmissionDate" type="xs:dateTime"/>
+            <!-- ResponseID: a unique case number associated with a response (generated by receiver) -->
+            <xs:element name="ResponseID" type="xs:string"/>
+            <!-- RequestID: a unique case number associated with a request (generated by transmitter) -->
+            <xs:element name="RequestID" type="xs:string"/>
+            <!-- Completion: contains access information needed to complete or edit a transmitted salary declaration -->
+            <xs:element name="Completion" type="tns:AccessInformationType" minOccurs="0"/>
+            <!-- Test: marks a test case without processing by the receiver the response contains a special info -->
+            <xs:element name="TestCase" type="tns:EmptyType" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FaultContextType">
+        <xs:sequence>
+            <!-- UserAgent: contains information about the receiver application -->
+            <xs:element name="UserAgent" type="tns:UserAgentType"/>
+            <!-- Social-Insurance-Name: human readable name of the receiving social insurance entity -->
+            <xs:element name="InstitutionName" type="xs:string"/>
+            <!-- date and time of transmission -->
+            <xs:element name="TransmissionDate" type="xs:dateTime"/>
+            <!-- ResponseID: a unique case number associated with a response (generated by receiver) -->
+            <xs:element name="ResponseID" type="xs:string"/>
+            <!-- RequestID: a unique case number associated with a request (generated by transmitter) -->
+            <xs:element name="RequestID" type="xs:string"/>
+            <!-- Test: marks a test case without processing by the receiver the response contains a special info -->
+            <xs:element name="TestCase" type="tns:EmptyType" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SalaryDeclarationFaultType">
+        <xs:sequence>
+            <xs:element name="FaultContext" type="tns:FaultContextType"/>
+            <xs:element name="FaultState" type="tns:FaultStateType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="DeclareSalaryDeferredResponseType">
+        <xs:sequence>
+            <xs:element name="ResponseContext" type="tns:ResponseContextType"/>
+            <xs:element name="JobKey" type="tns:JobKeyType">
+                <xs:annotation>
+                    <xs:documentation>Eindeutiger Bezeichner für den Job</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SalaryDeclarationStatusResponseType">
+        <xs:sequence>
+            <xs:element name="ResponseContext" type="tns:ResponseContextType"/>
+            <xs:element name="PlausibilityState" type="tns:PlausibilityStateType"/>
+            <xs:element name="JobFinished" type="sd:SimpleBooleanType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="JobStateType">
+        <xs:annotation>
+            <xs:documentation>Empfängerantworten</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="AHV-AVS" type="tns:WorkingStateType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>AK-Nummer</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVG-LAA" type="tns:WorkingStateMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>UVG-LAA</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="UVGZ-LAAC" type="tns:WorkingStateMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>UVGZ-LAAC</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KTG-AMC" type="tns:WorkingStateMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>KTG-AMC</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BVG-LPP" type="tns:WorkingStateMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>BVG-LPP</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FAK-CAF" type="tns:WorkingStateMultiType" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation>FAK-CAF</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CantonalTaxAdministration" type="tns:WorkingStateType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Kantonale Steuerverwaltung</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="SwissFederalStatisticalOffice" type="tns:WorkingStateType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>BfS</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="WorkingStateType">
+        <xs:annotation>
+            <xs:documentation>Arbeitszustandsdetail</xs:documentation>
+        </xs:annotation>
+        <xs:choice>
+            <xs:element name="Processing" type="tns:EmptyType">
+                <xs:annotation>
+                    <xs:documentation>in verarbeitung</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Delayed" type="tns:DelayedResponseType">
+                <xs:annotation>
+                    <xs:documentation>verarbeitung momentan nicht möglich</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Success" type="tns:SuccessResponseType">
+                <xs:annotation>
+                    <xs:documentation>verbeitung erfolgreich beendet</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Ignored" type="tns:EmptyType">
+                <xs:annotation>
+                    <xs:documentation>Adresse ignoriert</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Error" type="tns:ErrorResponseType">
+                <xs:annotation>
+                    <xs:documentation>verarbeitung ist fehlgeschlagen da empfänger einen fehler gemeldet hat</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="WorkingStateMultiType">
+        <xs:annotation>
+            <xs:documentation>Arbeitszustandsdetail</xs:documentation>
+        </xs:annotation>
+        <xs:complexContent>
+            <xs:extension base="tns:WorkingStateType">
+                <xs:attribute name="InstitutionIDRef" type="sd:InstitutionIDType" use="required"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:complexType name="ErrorResponseType">
+        <xs:annotation>
+            <xs:documentation>Info</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="EndUserInformation" type="xs:string"/>
+            <xs:element name="DetailInformation" type="xs:string" minOccurs="0"/>
+            <xs:element name="FaultInformation" type="tns:SalaryDeclarationFaultType" minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation>Fehlermeldung des Endempfängers</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="DelayedResponseType">
+        <xs:annotation>
+            <xs:documentation>Info</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="EndUserInformation" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="SuccessResponseType">
+        <xs:annotation>
+            <xs:documentation>Allgemeine Antwort</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="AddresseeContext" type="tns:AddresseeContextType"/>
+            <xs:element name="ResponseState" type="tns:ResponseStateType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ResponseStateType">
+        <xs:annotation>
+            <xs:documentation>Status</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <!-- Code: quality rating code related to a transmitted salary declaration-->
+            <xs:element name="Code" type="tns:ResponseCodeType"/>
+            <!-- Warning: defines the data structure to notify warning messages -->
+            <xs:element name="Warning" type="tns:NotificationsType" minOccurs="0"/>
+            <!-- Info: defines the data structure to notify general messages -->
+            <xs:element name="Info" type="tns:NotificationsType" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="FaultStateType">
+        <xs:annotation>
+            <xs:documentation>Status</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <!-- Code: quality rating code related to a transmitted salary declaration-->
+            <xs:element name="Code" type="tns:FaultCodeType"/>
+            <!-- Error: defines the data structure to notify error messages -->
+            <xs:element name="Error" type="tns:NotificationsType" minOccurs="0"/>
+            <!-- Warning: defines the data structure to notify warning messages -->
+            <xs:element name="Warning" type="tns:NotificationsType" minOccurs="0"/>
+            <!-- Info: defines the data structure to notify general messages -->
+            <xs:element name="Info" type="tns:NotificationsType" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AccessInformationType">
+        <xs:annotation>
+            <xs:documentation>Zugangsinformationen</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <!-- Url: access url -->
+            <xs:element name="Url" type="xs:string"/>
+            <!-- Key: authentication key -->
+            <xs:element name="Key" type="xs:string"/>
+            <!-- Password: authentication password -->
+            <xs:element name="Password" type="xs:string"/>
+            <!-- ExpiryDate: expiry date of access information -->
+            <xs:element name="ExpiryDate" type="xs:dateTime"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="NotificationsType">
+        <xs:annotation>
+            <xs:documentation>Hinweise</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <!-- Notification: data structure to define messages as
+errors, warnings or general information -->
+            <xs:element name="Notification" type="tns:NotificationType" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="NotificationType">
+        <xs:annotation>
+            <xs:documentation>Hinweise</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <!-- QualityLevel: used to relate a notification to quality levels
+as validation, plausibilisation or acceptance -->
+            <xs:element name="QualityLevel" type="tns:QualityLevelType"/>
+            <!-- DescriptionCode: numerical code related to declared types of
+notifications (errors, warnings, infos) -->
+            <xs:element name="DescriptionCode" type="tns:DescriptionCodeType"/>
+            <!-- Description: human readable content of the notification -->
+            <xs:element name="Description" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- response distributor-part -->
+    <xs:complexType name="PlausibilityStateType">
+        <xs:annotation>
+            <xs:documentation>Ditributorzustand</xs:documentation>
+        </xs:annotation>
+        <xs:choice>
+            <xs:element name="ValidityPlausibilityChecking" type="tns:EmptyType">
+                <xs:annotation>
+                    <xs:documentation>Der Distributorhat die Validitäts- und Plausibilitätsprüfung noch nicht abgeschlossen</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Plausible" type="tns:PlausibleNotificationsType">
+                <xs:annotation>
+                    <xs:documentation>Das übertragene Dokument ist plausibel</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="PlausibleNotificationsType">
+        <xs:sequence>
+            <!-- Warning: defines the data structure to notify warning messages -->
+            <xs:element name="Warning" type="tns:NotificationsType" minOccurs="0"/>
+            <!-- Info: defines the data structure to notify general messages -->
+            <xs:element name="Info" type="tns:NotificationsType" minOccurs="0"/>
+            <xs:element name="JobState" type="tns:JobStateType"/>
+        </xs:sequence>
+    </xs:complexType>
+    <!-- shared types -->
+    <xs:complexType name="UserAgentType">
+        <xs:annotation>
+            <xs:documentation>Benutzeragent</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <!-- Producer:  manufacturer of the used application (transmitter or receiver) -->
+            <xs:element name="Producer" type="xs:string"/>
+            <!-- Name: name of the used application -->
+            <xs:element name="Name" type="xs:string"/>
+            <!-- Version: version of the used application -->
+            <xs:element name="Version" type="xs:string"/>
+            <!-- Certificate: certificate of the used application -->
+            <xs:element name="Certificate" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="EmptyType"/>
+    <!-- simple types -->
+    <xs:simpleType name="QualityLevelType">
+        <xs:annotation>
+            <xs:documentation>Gütestufen</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="Validity"/>
+            <xs:enumeration value="Plausibility"/>
+            <xs:enumeration value="Acceptance"/>
+            <!-- Validity:      first level check -->
+            <!-- Plausibility:  second level check -->
+            <!-- Acceptance:    third level check -->
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ResponseCodeType">
+        <xs:annotation>
+            <xs:documentation>Antwortcode</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="accepted"/>
+            <xs:enumeration value="acceptedWithWarning"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="FaultCodeType">
+        <xs:annotation>
+            <xs:documentation>Fehlercode</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="NOT_accepted"/>
+            <xs:enumeration value="NOT_plausible"/>
+            <xs:enumeration value="NOT_valid"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="DescriptionCodeType">
+        <xs:annotation>
+            <xs:documentation>Beschreibungscode</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:nonNegativeInteger">
+            <xs:totalDigits value="7"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="LanguageCodeType">
+        <xs:annotation>
+            <xs:documentation>Sprachcode</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="de"/>
+            <xs:enumeration value="fr"/>
+            <xs:enumeration value="it"/>
+            <xs:enumeration value="en"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="UVG-LAANameType">
+        <xs:annotation>
+            <xs:documentation>UVG Versicherungsname</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="Suva"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="GovernmentNameType">
+        <xs:annotation>
+            <xs:documentation>Name der Verwaltung</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:NMTOKEN">
+            <xs:enumeration value="CantonalTaxAdministration"/>
+            <xs:enumeration value="SwissFederalStatisticalOffice"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="JobKeyType">
+        <xs:annotation>
+            <xs:documentation>Eindeutiger Bezeichner für den Job</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:minLength value="10"/>
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclarationServiceTypes.xsd b/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclarationServiceTypes.xsd
new file mode 100644
index 000000000000..a0853e8160f6
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation4Schemas/SalaryDeclarationServiceTypes.xsd
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    targetNamespace="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationServiceTypes"
+    xmlns:tns="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationServiceTypes"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:sd="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration"
+    xmlns:ct="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationContainer">
+
+    <!-- last modified $Date: 2005/09/05 14:15:30 $Author: boehm $ -->
+    
+    <!-- imports -->
+    <xs:import
+        namespace="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclaration"
+        schemaLocation="SalaryDeclaration.xsd"/>
+
+    <xs:import
+        namespace="http://www.swissdec.ch/schema/sd/20050902/SalaryDeclarationContainer"
+        schemaLocation="SalaryDeclarationContainer.xsd"/>
+
+    <!-- definitions Ping -->
+
+    <xs:element name="Ping" type="tns:PingType"/>
+    <xs:element name="PingResponse" type="tns:PingType"/>
+
+    <xs:complexType name="PingType">
+        <xs:sequence>
+            <xs:element name="Echo" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- definitions CheckInteroperability -->
+    <xs:element name="CheckInteroperability" type="tns:CheckInteroperabilityType"/>
+    <xs:element name="CheckInteroperabilityResponse" type="tns:CheckInteroperabilityResponseType"/>
+
+    <xs:complexType name="CheckInteroperabilityType">
+        <xs:sequence>
+            <!-- use following UmlautString: ÄËÖÜÁÉÓÚÀÈÒÙÂÊÔÛ -->
+            <xs:element name="UmlautString" type="xs:string"/>
+            <!-- use following value for the FirstOperand: 999000000000.00 (999 milliards)-->
+            <!-- verwende folgenden Wert als FirstOperand: 999000000000.00 (999 Milliarden)-->
+            <xs:element name="FirstOperand" type="sd:SalaryAmountType"/>
+            <xs:element name="SecondOperand" type="sd:SalaryAmountType"/>
+            <xs:element name="SystemDateTime" type="xs:dateTime"/>
+            <!-- MonitoringID: acts as identyfier for writing and accessing
+            monitoring informations in/from a reference application
+            (related to testing and certification) -->
+            <xs:element name="MonitoringID" type="xs:string" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CheckInteroperabilityResponseType">
+        <xs:sequence>
+            <!-- we expect following string as value of UmlautString: äëöüáéóúàèòùâêôû -->
+            <xs:element name="UmlautStringIsCorrect" type="sd:SimpleBooleanType"/>
+            <!-- expected are 999000000000.00 (999 billions) -->
+            <!-- erwartet werden 999000000000.00 (999 Milliarden) -->
+            <xs:element name="FirstOperandIsCorrect" type="sd:SimpleBooleanType"/>
+            <xs:element name="UmlautString" type="xs:string"/>
+            <xs:element name="AdditionResult" type="sd:SalaryAmountType"/>
+            <xs:element name="SubtractionResult" type="sd:SalaryAmountType"/>
+            <xs:element name="SystemDateTime" type="xs:dateTime"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- definitions DeclareSalary -->
+    <xs:element name="DeclareSalary" type="ct:SalaryDeclarationRequestType">
+        <xs:annotation>
+            <xs:documentation>SalaryDeclarationRequest</xs:documentation>
+        </xs:annotation>
+        <xs:unique name="UVG-LAA-ID-Key2">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:UVG-LAA/sd:Suva | ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:UVG-LAA/sd:Other"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="UVG-LAA-ID-Ref2" refer="tns:UVG-LAA-ID-Key2">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:UVG-LAA"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+        <xs:unique name="UVGZ-LAAC-ID-Key2">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:UVGZ-LAAC"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="UVGZ-LAAC-ID-Ref2" refer="tns:UVGZ-LAAC-ID-Key2">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:UVGZ-LAAC"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+        <xs:unique name="KTG-AMC-ID-Key2">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:KTG-AMC"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="KTG-AMC-ID-Ref2" refer="tns:KTG-AMC-ID-Key2">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:KTG-AMC"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+        <xs:unique name="BVG-LPP-ID-Key2">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:BVG-LPP"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="BVG-LPP-ID-Ref2" refer="tns:BVG-LPP-ID-Key2">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:BVG-LPP"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+        <xs:unique name="FAK-CAF-ID-Key2">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:FAK-CAF"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="FAK-CAF-ID-Ref2" refer="tns:FAK-CAF-ID-Key2">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:FAK-CAF"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+    </xs:element>
+    <xs:element name="DeclareSalaryResponse" type="ct:SalaryDeclarationStatusResponseType">
+        <xs:annotation>
+            <xs:documentation>GetSalaryDeclarationResponse</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+
+    <!-- definitions DeclareSalaryDeferred -->
+    <xs:element name="DeclareSalaryDeferred" type="ct:SalaryDeclarationRequestType">
+        <xs:annotation>
+            <xs:documentation>SalaryDeclarationRequest</xs:documentation>
+        </xs:annotation>
+        <xs:unique name="UVG-LAA-ID-Key3">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:UVG-LAA/sd:Suva | ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:UVG-LAA/sd:Other"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="UVG-LAA-ID-Ref3" refer="tns:UVG-LAA-ID-Key3">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:UVG-LAA"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+        <xs:unique name="UVGZ-LAAC-ID-Key3">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:UVGZ-LAAC"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="UVGZ-LAAC-ID-Ref3" refer="tns:UVGZ-LAAC-ID-Key3">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:UVGZ-LAAC"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+        <xs:unique name="KTG-AMC-ID-Key3">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:KTG-AMC"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="KTG-AMC-ID-Ref3" refer="tns:KTG-AMC-ID-Key3">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:KTG-AMC"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+        <xs:unique name="BVG-LPP-ID-Key3">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:BVG-LPP"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="BVG-LPP-ID-Ref3" refer="tns:BVG-LPP-ID-Key3">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:BVG-LPP"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+        <xs:unique name="FAK-CAF-ID-Key3">
+            <xs:selector xpath="ct:SalaryDeclaration/sd:Company/sd:Insurances/sd:FAK-CAF"/>
+            <xs:field xpath="@InstitutionID"/>
+        </xs:unique>
+        <xs:keyref name="FAK-CAF-ID-Ref3" refer="tns:FAK-CAF-ID-Key3">
+            <xs:selector xpath="ct:Job/ct:Addressees/ct:FAK-CAF"/>
+            <xs:field xpath="@InstitutionIDRef"/>
+        </xs:keyref>
+    </xs:element>
+    <xs:element name="DeclareSalaryDeferredResponse" type="ct:DeclareSalaryDeferredResponseType">
+        <xs:annotation>
+            <xs:documentation>SalaryDeclarationResponse</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+
+    <!-- definitions GetStatusFromDeferredDeclaration -->
+    <xs:element name="GetStatusFromDeferredDeclaration" type="ct:GetStatusFromDeferredDeclarationType">
+        <xs:annotation>
+            <xs:documentation>GetSalaryDeclarationRequest</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+    <xs:element name="GetStatusFromDeferredDeclarationResponse" type="ct:SalaryDeclarationStatusResponseType">
+        <xs:annotation>
+            <xs:documentation>GetSalaryDeclarationResponse</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+
+    <!-- definition SalaryDeclarationFault -->
+    <xs:element name="SalaryDeclarationFault" type="ct:SalaryDeclarationFaultType">
+        <xs:annotation>
+            <xs:documentation>SalaryDeclarationFault</xs:documentation>
+        </xs:annotation>
+    </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation5.xml b/xml/tests/testData/xml/ComplexSchemaValidation5.xml
new file mode 100644
index 000000000000..bd3c5ed0d5f0
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation5.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<test:Test
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xmlns:test="http://www.etas.com/TELEGY/Test"
+	xsi:schemaLocation="http://www.etas.com/TELEGY/Test ComplexSchemaValidation5.xsd">
+	<FilePropertySet>
+		<FileProperties fpId="200">
+			<FileExtn>.his</FileExtn> 
+		</FileProperties>
+	</FilePropertySet>
+</test:Test>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation5.xsd b/xml/tests/testData/xml/ComplexSchemaValidation5.xsd
new file mode 100644
index 000000000000..5e7ed18acf1a
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation5.xsd
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+            xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:test="http://www.etas.com/TELEGY/Test"
+            targetNamespace="http://www.etas.com/TELEGY/Test"
+            elementFormDefault="unqualified" attributeFormDefault="unqualified">
+  <!-- Defn for the file properties to be used by the Data config object-->
+  <xsd:complexType name="FileProperties">
+    <xsd:sequence>
+      <xsd:element name="FileExtn">
+        <xsd:simpleType>
+          <xsd:restriction base="xsd:string">
+            <xsd:pattern value="\.{1}[a-zA-Z0-9]{3}"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+      </xsd:element>
+      <!-- Things like close rules, size restrictions could be put here -->
+    </xsd:sequence>
+    <xsd:attribute name="fpId" type="xsd:positiveInteger" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="FilePropertySet">
+    <xsd:sequence>
+      <xsd:element name="FileProperties" type="test:FileProperties"
+                   maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:element name="Test">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="FilePropertySet" type="test:FilePropertySet"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation6.xml b/xml/tests/testData/xml/ComplexSchemaValidation6.xml
new file mode 100644
index 000000000000..c671e8d0aa0f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation6.xml
@@ -0,0 +1 @@
+<pg:table xmlns:pg="http://abcde/pg.html" pg:name="aaa" />
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation6.xsd b/xml/tests/testData/xml/ComplexSchemaValidation6.xsd
new file mode 100644
index 000000000000..82903b3a9dc4
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation6.xsd
@@ -0,0 +1,12 @@
+<xsd:schema
+    xmlns:pg="http://abcde/pg.html"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://abcde/pg.html"
+    elementFormDefault="qualified"
+    attributeFormDefault="qualified"
+    >
+   <xsd:complexType name="tableType">
+        <xsd:attribute name="name" type="xsd:string" use="required"/>
+    </xsd:complexType>
+   <xsd:element name="table" type="pg:tableType"/>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7.xml b/xml/tests/testData/xml/ComplexSchemaValidation7.xml
new file mode 100644
index 000000000000..3cea3d3e200d
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7.xml
@@ -0,0 +1,413 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions  xmlns:tns="http://tempuri.org/"
+  xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns="http://schemas.xmlsoap.org/wsdl/"
+  targetNamespace="http://tempuri.org/">
+ <types>
+  <xsd:schema    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:stns="java:com.bea.medrec.webservices"
+    elementFormDefault="qualified"
+    attributeFormDefault="qualified"
+    targetNamespace="java:com.bea.medrec.webservices">
+   <xsd:import     namespace="http://schemas.xmlsoap.org/soap/encoding/">
+   </xsd:import>
+   <xsd:complexType     name="AddressWS">
+    <xsd:sequence>
+     <xsd:element       type="xsd:string"
+       name="city"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+
+    </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType     name="ArrayOfPatientWS">
+    <xsd:complexContent>
+     <xsd:restriction       xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+       base="soapenc:Array">
+      <xsd:attribute        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        ref="soapenc:arrayType"
+        wsdl:arrayType="stns:PatientWS[]">
+      </xsd:attribute>
+     </xsd:restriction>
+    </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType     name="ArrayOfPrescriptionWS">
+    <xsd:complexContent>
+     <xsd:restriction       xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+       base="soapenc:Array">
+      <xsd:attribute        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        ref="soapenc:arrayType"
+        wsdl:arrayType="stns:PrescriptionWS[]">
+      </xsd:attribute>
+     </xsd:restriction>
+    </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType     name="ArrayOfRecordWS">
+    <xsd:complexContent>
+     <xsd:restriction       xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+       base="soapenc:Array">
+      <xsd:attribute        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        ref="soapenc:arrayType"
+        wsdl:arrayType="stns:RecordWS[]">
+      </xsd:attribute>
+     </xsd:restriction>
+    </xsd:complexContent>
+   </xsd:complexType>
+   <xsd:complexType     name="PatientWS">
+    <xsd:sequence>
+     <xsd:element       type="stns:AddressWS"
+       name="addressWS"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:string"
+       name="dateOfBirth"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:string"
+       name="email"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:string"
+       name="firstName"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:string"
+       name="gender"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:int"
+       name="id"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:string"
+       name="lastName"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:string"
+       name="middleName"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:string"
+       name="phone"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="xsd:string"
+       name="ssn"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+    </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType     name="PrescriptionWS">
+    <xsd:sequence>
+     <xsd:element       type="xsd:string"
+       name="datePrescribed"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+    </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType     name="RecordWS">
+    <xsd:sequence>
+     <xsd:element       type="xsd:string"
+       name="date"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+
+     <xsd:element       type="stns:ArrayOfPrescriptionWS"
+       name="prescriptions"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="stns:VitalSignsWS"
+       name="vitalSigns"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+    </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType     name="RecordsSummaryWS">
+    <xsd:sequence>
+     <xsd:element       type="stns:ArrayOfPrescriptionWS"
+       name="prescriptions"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+     <xsd:element       type="stns:ArrayOfRecordWS"
+       name="records"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+    </xsd:sequence>
+   </xsd:complexType>
+   <xsd:complexType     name="VitalSignsWS">
+    <xsd:sequence>
+     <xsd:element       type="xsd:string"
+       name="bloodPressure"
+       minOccurs="1"
+       nillable="true"
+       maxOccurs="1">
+     </xsd:element>
+    </xsd:sequence>
+   </xsd:complexType>
+  </xsd:schema>
+ </types>
+ <message   name="addRecord">
+  <part    xmlns:partns="java:com.bea.medrec.webservices"
+    type="partns:RecordWS"
+    name="record">
+  </part>
+ </message>
+ <message   name="addRecordResponse">
+ </message>
+ <message   name="getRecord">
+  <part    xmlns:partns="http://www.w3.org/2001/XMLSchema"
+    type="partns:int"
+    name="id">
+  </part>
+ </message>
+ <message   name="getRecordResponse">
+  <part    xmlns:partns="java:com.bea.medrec.webservices"
+    type="partns:RecordWS"
+    name="result">
+  </part>
+ </message>
+ <message   name="getRecordsSummary">
+  <part    xmlns:partns="http://www.w3.org/2001/XMLSchema"
+    type="partns:int"
+    name="id">
+  </part>
+ </message>
+ <message   name="getRecordsSummaryResponse">
+  <part    xmlns:partns="java:com.bea.medrec.webservices"
+    type="partns:RecordsSummaryWS"
+    name="result">
+  </part>
+ </message>
+ <message   name="findPatientByLastNameWild">
+  <part    xmlns:partns="http://www.w3.org/2001/XMLSchema"
+    type="partns:string"
+    name="lastName">
+  </part>
+ </message>
+ <message   name="findPatientByLastNameWildResponse">
+  <part    xmlns:partns="java:com.bea.medrec.webservices"
+    type="partns:ArrayOfPatientWS"
+    name="result">
+  </part>
+ </message>
+ <message   name="findPatientBySsn">
+  <part    xmlns:partns="http://www.w3.org/2001/XMLSchema"
+    type="partns:string"
+    name="id">
+  </part>
+ </message>
+ <message   name="findPatientBySsnResponse">
+  <part    xmlns:partns="java:com.bea.medrec.webservices"
+    type="partns:PatientWS"
+    name="result">
+  </part>
+ </message>
+ <message   name="registerPatient">
+  <part    xmlns:partns="java:com.bea.medrec.webservices"
+    type="partns:PatientWS"
+    name="patient">
+  </part>
+  <part    xmlns:partns="http://www.w3.org/2001/XMLSchema"
+    type="partns:string"
+    name="password">
+  </part>
+ </message>
+ <message   name="registerPatientResponse">
+ </message>
+ <message   name="updatePatient">
+  <part    xmlns:partns="java:com.bea.medrec.webservices"
+    type="partns:PatientWS"
+    name="patient">
+  </part>
+ </message>
+ <message   name="updatePatientResponse">
+ </message>
+ <portType   name="MedRecWebServicesPort">
+  <operation    name="addRecord">
+   <input     message="tns:addRecord">
+   </input>
+   <output     message="tns:addRecordResponse">
+   </output>
+  </operation>
+  <operation    name="getRecord">
+   <input     message="tns:getRecord">
+   </input>
+   <output     message="tns:getRecordResponse">
+   </output>
+  </operation>
+  <operation    name="getRecordsSummary">
+   <input     message="tns:getRecordsSummary">
+   </input>
+   <output     message="tns:getRecordsSummaryResponse">
+   </output>
+  </operation>
+  <operation    name="findPatientByLastNameWild">
+   <input     message="tns:findPatientByLastNameWild">
+   </input>
+   <output     message="tns:findPatientByLastNameWildResponse">
+   </output>
+  </operation>
+  <operation    name="findPatientBySsn">
+   <input     message="tns:findPatientBySsn">
+   </input>
+   <output     message="tns:findPatientBySsnResponse">
+   </output>
+  </operation>
+  <operation    name="registerPatient">
+   <input     message="tns:registerPatient">
+   </input>
+   <output     message="tns:registerPatientResponse">
+   </output>
+  </operation>
+  <operation    name="updatePatient">
+   <input     message="tns:updatePatient">
+   </input>
+   <output     message="tns:updatePatientResponse">
+   </output>
+  </operation>
+ </portType>
+ <binding   type="tns:MedRecWebServicesPort"
+   name="MedRecWebServicesPort">
+  <soap:binding    style="rpc"
+    transport="http://schemas.xmlsoap.org/soap/http"/>
+  <operation    name="addRecord">
+   <soap:operation     style="rpc"
+     soapAction=""/>
+   <input>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </input>
+   <output>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </output>
+  </operation>
+  <operation    name="getRecord">
+   <soap:operation     style="rpc"
+     soapAction=""/>
+   <input>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </input>
+   <output>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </output>
+  </operation>
+  <operation    name="getRecordsSummary">
+   <soap:operation     style="rpc"
+     soapAction=""/>
+   <input>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </input>
+   <output>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </output>
+  </operation>
+  <operation    name="findPatientByLastNameWild">
+   <soap:operation     style="rpc"
+     soapAction=""/>
+   <input>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </input>
+   <output>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </output>
+  </operation>
+  <operation    name="findPatientBySsn">
+   <soap:operation     style="rpc"
+     soapAction=""/>
+   <input>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </input>
+   <output>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </output>
+  </operation>
+  <operation    name="registerPatient">
+   <soap:operation     style="rpc"
+     soapAction=""/>
+   <input>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </input>
+   <output>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </output>
+  </operation>
+  <operation    name="updatePatient">
+   <soap:operation     style="rpc"
+     soapAction=""/>
+   <input>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </input>
+   <output>
+    <soap:body      namespace="http://tempuri.org/"
+      encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+      use="encoded"/>
+   </output>
+  </operation>
+ </binding>
+ <service   name="MedRecWebServices">
+  <port    name="MedRecWebServicesPort"
+    binding="tns:MedRecWebServicesPort">
+   <soap:address     location="http://pls.set.the.end.point.address/"/>
+  </port>
+ </service>
+</definitions>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/encoding.xsd b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/encoding.xsd
new file mode 100644
index 000000000000..7f12da695985
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/encoding.xsd
@@ -0,0 +1,536 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 encoding
+
+Portions � 2001 DevelopMentor.
+� 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
+
+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
+By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
+
+Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
+
+1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+
+2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright � 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
+
+3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+Original W3C files; http://www.w3.org/2001/06/soap-encoding
+Changes made:
+     - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
+     - reverted root to only allow 0 and 1 as lexical values
+	 - removed default value from root attribute declaration
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://schemas.xmlsoap.org/soap/encoding/"
+           targetNamespace="http://schemas.xmlsoap.org/soap/encoding/" >
+
+ <xs:attribute name="root" >
+   <xs:annotation>
+     <xs:documentation>
+	   'root' can be used to distinguish serialization roots from other
+       elements that are present in a serialization but are not roots of
+       a serialized value graph
+	 </xs:documentation>
+   </xs:annotation>
+   <xs:simpleType>
+     <xs:restriction base='xs:boolean'>
+	   <xs:pattern value='0|1' />
+	 </xs:restriction>
+   </xs:simpleType>
+ </xs:attribute>
+
+  <xs:attributeGroup name="commonAttributes" >
+    <xs:annotation>
+	  <xs:documentation>
+	    Attributes common to all elements that function as accessors or
+        represent independent (multi-ref) values.  The href attribute is
+        intended to be used in a manner like CONREF.  That is, the element
+        content should be empty iff the href attribute appears
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:attribute name="id" type="xs:ID" />
+    <xs:attribute name="href" type="xs:anyURI" />
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:attributeGroup>
+
+  <!-- Global Attributes.  The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
+
+  <!-- Array attributes. Needed to give the type and dimensions of an array's contents, and the offset for partially-transmitted arrays. -->
+
+  <xs:simpleType name="arrayCoordinate" >
+    <xs:restriction base="xs:string" />
+  </xs:simpleType>
+
+  <xs:attribute name="arrayType" type="xs:string" />
+  <xs:attribute name="offset" type="tns:arrayCoordinate" />
+
+  <xs:attributeGroup name="arrayAttributes" >
+    <xs:attribute ref="tns:arrayType" />
+    <xs:attribute ref="tns:offset" />
+  </xs:attributeGroup>
+
+  <xs:attribute name="position" type="tns:arrayCoordinate" />
+
+  <xs:attributeGroup name="arrayMemberAttributes" >
+    <xs:attribute ref="tns:position" />
+  </xs:attributeGroup>
+
+  <xs:group name="Array" >
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+	</xs:sequence>
+  </xs:group>
+
+  <xs:element name="Array" type="tns:Array" />
+  <xs:complexType name="Array" >
+    <xs:annotation>
+	  <xs:documentation>
+	   'Array' is a complex type for accessors identified by position
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:group ref="tns:Array" minOccurs="0" />
+    <xs:attributeGroup ref="tns:arrayAttributes" />
+    <xs:attributeGroup ref="tns:commonAttributes" />
+  </xs:complexType>
+
+  <!-- 'Struct' is a complex type for accessors identified by name.
+       Constraint: No element may be have the same name as any other,
+       nor may any element have a maxOccurs > 1. -->
+
+  <xs:element name="Struct" type="tns:Struct" />
+
+  <xs:group name="Struct" >
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+	</xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="Struct" >
+    <xs:group ref="tns:Struct" minOccurs="0" />
+    <xs:attributeGroup ref="tns:commonAttributes"/>
+  </xs:complexType>
+
+  <!-- 'Base64' can be used to serialize binary data using base64 encoding
+       as defined in RFC2045 but without the MIME line length limitation. -->
+
+  <xs:simpleType name="base64" >
+    <xs:restriction base="xs:base64Binary" />
+  </xs:simpleType>
+
+ <!-- Element declarations corresponding to each of the simple types in the
+      XML Schemas Specification. -->
+
+  <xs:element name="duration" type="tns:duration" />
+  <xs:complexType name="duration" >
+    <xs:simpleContent>
+      <xs:extension base="xs:duration" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="dateTime" type="tns:dateTime" />
+  <xs:complexType name="dateTime" >
+    <xs:simpleContent>
+      <xs:extension base="xs:dateTime" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+
+
+  <xs:element name="NOTATION" type="tns:NOTATION" />
+  <xs:complexType name="NOTATION" >
+    <xs:simpleContent>
+      <xs:extension base="xs:QName" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+
+  <xs:element name="time" type="tns:time" />
+  <xs:complexType name="time" >
+    <xs:simpleContent>
+      <xs:extension base="xs:time" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="date" type="tns:date" />
+  <xs:complexType name="date" >
+    <xs:simpleContent>
+      <xs:extension base="xs:date" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gYearMonth" type="tns:gYearMonth" />
+  <xs:complexType name="gYearMonth" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gYearMonth" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gYear" type="tns:gYear" />
+  <xs:complexType name="gYear" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gYear" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gMonthDay" type="tns:gMonthDay" />
+  <xs:complexType name="gMonthDay" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gMonthDay" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gDay" type="tns:gDay" />
+  <xs:complexType name="gDay" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gDay" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gMonth" type="tns:gMonth" />
+  <xs:complexType name="gMonth" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gMonth" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="boolean" type="tns:boolean" />
+  <xs:complexType name="boolean" >
+    <xs:simpleContent>
+      <xs:extension base="xs:boolean" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="base64Binary" type="tns:base64Binary" />
+  <xs:complexType name="base64Binary" >
+    <xs:simpleContent>
+      <xs:extension base="xs:base64Binary" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="hexBinary" type="tns:hexBinary" />
+  <xs:complexType name="hexBinary" >
+    <xs:simpleContent>
+     <xs:extension base="xs:hexBinary" >
+       <xs:attributeGroup ref="tns:commonAttributes" />
+     </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="float" type="tns:float" />
+  <xs:complexType name="float" >
+    <xs:simpleContent>
+      <xs:extension base="xs:float" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="double" type="tns:double" />
+  <xs:complexType name="double" >
+    <xs:simpleContent>
+      <xs:extension base="xs:double" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="anyURI" type="tns:anyURI" />
+  <xs:complexType name="anyURI" >
+    <xs:simpleContent>
+      <xs:extension base="xs:anyURI" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="QName" type="tns:QName" />
+  <xs:complexType name="QName" >
+    <xs:simpleContent>
+      <xs:extension base="xs:QName" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+
+  <xs:element name="string" type="tns:string" />
+  <xs:complexType name="string" >
+    <xs:simpleContent>
+      <xs:extension base="xs:string" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="normalizedString" type="tns:normalizedString" />
+  <xs:complexType name="normalizedString" >
+    <xs:simpleContent>
+      <xs:extension base="xs:normalizedString" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="token" type="tns:token" />
+  <xs:complexType name="token" >
+    <xs:simpleContent>
+      <xs:extension base="xs:token" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="language" type="tns:language" />
+  <xs:complexType name="language" >
+    <xs:simpleContent>
+      <xs:extension base="xs:language" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="Name" type="tns:Name" />
+  <xs:complexType name="Name" >
+    <xs:simpleContent>
+      <xs:extension base="xs:Name" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="NMTOKEN" type="tns:NMTOKEN" />
+  <xs:complexType name="NMTOKEN" >
+    <xs:simpleContent>
+      <xs:extension base="xs:NMTOKEN" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="NCName" type="tns:NCName" />
+  <xs:complexType name="NCName" >
+    <xs:simpleContent>
+      <xs:extension base="xs:NCName" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="NMTOKENS" type="tns:NMTOKENS" />
+  <xs:complexType name="NMTOKENS" >
+    <xs:simpleContent>
+      <xs:extension base="xs:NMTOKENS" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="ID" type="tns:ID" />
+  <xs:complexType name="ID" >
+    <xs:simpleContent>
+      <xs:extension base="xs:ID" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="IDREF" type="tns:IDREF" />
+  <xs:complexType name="IDREF" >
+    <xs:simpleContent>
+      <xs:extension base="xs:IDREF" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="ENTITY" type="tns:ENTITY" />
+  <xs:complexType name="ENTITY" >
+    <xs:simpleContent>
+      <xs:extension base="xs:ENTITY" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="IDREFS" type="tns:IDREFS" />
+  <xs:complexType name="IDREFS" >
+    <xs:simpleContent>
+      <xs:extension base="xs:IDREFS" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="ENTITIES" type="tns:ENTITIES" />
+  <xs:complexType name="ENTITIES" >
+    <xs:simpleContent>
+      <xs:extension base="xs:ENTITIES" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="decimal" type="tns:decimal" />
+  <xs:complexType name="decimal" >
+    <xs:simpleContent>
+      <xs:extension base="xs:decimal" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="integer" type="tns:integer" />
+  <xs:complexType name="integer" >
+    <xs:simpleContent>
+      <xs:extension base="xs:integer" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="nonPositiveInteger" type="tns:nonPositiveInteger" />
+  <xs:complexType name="nonPositiveInteger" >
+    <xs:simpleContent>
+      <xs:extension base="xs:nonPositiveInteger" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="negativeInteger" type="tns:negativeInteger" />
+  <xs:complexType name="negativeInteger" >
+    <xs:simpleContent>
+      <xs:extension base="xs:negativeInteger" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="long" type="tns:long" />
+  <xs:complexType name="long" >
+    <xs:simpleContent>
+      <xs:extension base="xs:long" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="int" type="tns:int" />
+  <xs:complexType name="int" >
+    <xs:simpleContent>
+      <xs:extension base="xs:int" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="short" type="tns:short" />
+  <xs:complexType name="short" >
+    <xs:simpleContent>
+      <xs:extension base="xs:short" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="byte" type="tns:byte" />
+  <xs:complexType name="byte" >
+    <xs:simpleContent>
+      <xs:extension base="xs:byte" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="nonNegativeInteger" type="tns:nonNegativeInteger" />
+  <xs:complexType name="nonNegativeInteger" >
+    <xs:simpleContent>
+      <xs:extension base="xs:nonNegativeInteger" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="unsignedLong" type="tns:unsignedLong" />
+  <xs:complexType name="unsignedLong" >
+    <xs:simpleContent>
+      <xs:extension base="xs:unsignedLong" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="unsignedInt" type="tns:unsignedInt" />
+  <xs:complexType name="unsignedInt" >
+    <xs:simpleContent>
+      <xs:extension base="xs:unsignedInt" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="unsignedShort" type="tns:unsignedShort" />
+  <xs:complexType name="unsignedShort" >
+    <xs:simpleContent>
+      <xs:extension base="xs:unsignedShort" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="unsignedByte" type="tns:unsignedByte" />
+  <xs:complexType name="unsignedByte" >
+    <xs:simpleContent>
+      <xs:extension base="xs:unsignedByte" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="positiveInteger" type="tns:positiveInteger" />
+  <xs:complexType name="positiveInteger" >
+    <xs:simpleContent>
+      <xs:extension base="xs:positiveInteger" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="anyType" />
+</xs:schema>
+
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/http.xsd b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/http.xsd
new file mode 100644
index 000000000000..702f76da1d85
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/http.xsd
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL Schema Files
+
+The Authors grant permission to copy and distribute the WSDL Schema
+Files in any medium without fee or royalty as long as this notice and
+license are distributed with them.  The originals of these files can
+be located at:
+
+http://schemas.xmlsoap.org/wsdl/http/wsdl-http.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
+RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to these files or any program
+or service that uses these files, written prior permission.  Title to copyright
+in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+
+  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        targetNamespace="http://schemas.xmlsoap.org/wsdl/http/">
+
+	<import namespace = "http://schemas.xmlsoap.org/wsdl/"/>
+
+   	<element name="address" type="http:addressType"/>
+
+   	<complexType name="addressType">
+		<complexContent>
+		<extension base="wsdl:tExtensibilityElement">
+			<sequence/>
+   			<attribute name="location" type="anyURI" use="required"/>
+		</extension>
+		</complexContent>
+   	</complexType>
+
+   	<element name="binding" type="http:bindingType"/>
+   	<complexType name="bindingType">
+		<complexContent>
+		<extension base="wsdl:tExtensibilityElement">
+			<sequence/>
+	      		<attribute name="verb" type="NMTOKEN" use="required"/>
+		</extension>
+		</complexContent>
+   	</complexType>
+
+   	<element name="operation" type="http:operationType"/>
+   	<complexType name="operationType">
+		<complexContent>
+		<extension base="wsdl:tExtensibilityElement">
+			<sequence/>
+	      		<attribute name="location" type="anyURI" use="required"/>
+		</extension>
+		</complexContent>
+	</complexType>
+
+   	<element name="urlEncoded">
+      		<complexType/>
+   	</element>
+   	<element name="urlReplacement">
+      		<complexType/>
+     	</element>
+</schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/mime.xsd b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/mime.xsd
new file mode 100644
index 000000000000..18bbd1526edb
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/mime.xsd
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+Copyright 2001-2005, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL Schema Files
+
+The Authors grant permission to copy and distribute the WSDL Schema
+Files in any medium without fee or royalty as long as this notice and
+license are distributed with them.  The originals of these files can
+be located at:
+
+http://schemas.xmlsoap.org/wsdl/mime/2002-01-29.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
+RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to these files or any program
+or service that uses these files, written prior permission.  Title to copyright
+in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+  -->
+<schema  targetNamespace="http://schemas.xmlsoap.org/wsdl/mime/"
+         xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+	 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+         xmlns="http://www.w3.org/2001/XMLSchema">
+
+	<import namespace = "http://schemas.xmlsoap.org/wsdl/"/>
+   	<element name="content" type="mime:contentType"/>
+   	<complexType name="contentType">
+		<complexContent>
+		<extension base="wsdl:tExtensibilityElement">
+			<sequence/>
+      			<attribute name="type" type="string" use="optional"/>
+	      		<attribute name="part" type="NMTOKEN" use="optional"/>
+		</extension>
+		</complexContent>
+   	</complexType>
+   	<element name="multipartRelated" type="mime:multipartRelatedType"/>
+   	<complexType name="multipartRelatedType">
+		<complexContent>
+		<extension base="wsdl:tExtensibilityElement">
+			<sequence>
+		      		<element name = "part" type = "mime:tPart" minOccurs="0" maxOccurs="unbounded"/>
+			</sequence>
+		</extension>
+		</complexContent>
+   	</complexType>
+      	<complexType name="tPart">
+		<sequence>
+	      		<any namespace="##targetNamespace" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+        	<attribute name="name" type="NMTOKEN" use="required"/>
+   	</complexType>
+   	<element name="mimeXml" type = "mime:tMimeXml"/>
+   	<complexType name="tMimeXml">
+		<complexContent>
+		<extension base="wsdl:tExtensibilityElement">
+			<sequence/>
+			<attribute name="part" type="NMTOKEN" use="optional"/>
+		</extension>
+		</complexContent>
+   	</complexType>
+</schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/soap.xsd b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/soap.xsd
new file mode 100644
index 000000000000..da303ebf2115
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/soap.xsd
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL Schema Files
+
+The Authors grant permission to copy and distribute the WSDL Schema
+Files in any medium without fee or royalty as long as this notice and
+license are distributed with them.  The originals of these files can
+be located at:
+
+http://schemas.xmlsoap.org/wsdl/soap/2003-02-11.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
+RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to these files or any program
+or service that uses these files, written prior permission.  Title to copyright
+in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+           targetNamespace="http://schemas.xmlsoap.org/wsdl/soap/" >
+
+  <xs:import namespace = "http://schemas.xmlsoap.org/wsdl/" />
+
+  <xs:simpleType name="encodingStyle" >
+    <xs:annotation>
+      <xs:documentation>
+      "encodingStyle" indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value "http://schemas.xmlsoap.org/soap/encoding/" indicates the pattern described in SOAP specification
+      </xs:documentation>
+    </xs:annotation>
+    <xs:list itemType="xs:anyURI" />
+  </xs:simpleType>
+
+  <xs:element name="binding" type="soap:tBinding" />
+  <xs:complexType name="tBinding" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:attribute name="transport" type="xs:anyURI" use="required" />
+        <xs:attribute name="style" type="soap:tStyleChoice" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="tStyleChoice" >
+    <xs:restriction base="xs:string" >
+      <xs:enumeration value="rpc" />
+      <xs:enumeration value="document" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="operation" type="soap:tOperation" />
+  <xs:complexType name="tOperation" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:attribute name="soapAction" type="xs:anyURI" use="optional" />
+        <xs:attribute name="style" type="soap:tStyleChoice" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="body" type="soap:tBody" />
+  <xs:attributeGroup name="tBodyAttributes" >
+    <xs:attribute name="encodingStyle" type="soap:encodingStyle" use="optional" />
+    <xs:attribute name="use" type="soap:useChoice" use="optional" />
+    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
+  </xs:attributeGroup>
+  <xs:complexType name="tBody" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:attribute name="parts" type="xs:NMTOKENS" use="optional" />
+        <xs:attributeGroup ref = "soap:tBodyAttributes" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="useChoice" >
+    <xs:restriction base="xs:string" >
+      <xs:enumeration value="literal" />
+      <xs:enumeration value="encoded" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="fault" type="soap:tFault" />
+  <xs:complexType name="tFaultRes" abstract="true" >
+    <xs:complexContent>
+      <xs:restriction base="soap:tBody" >
+	    <xs:attribute ref="wsdl:required" use="optional" />
+        <xs:attribute name="parts" type="xs:NMTOKENS" use="prohibited" />
+		<xs:attributeGroup ref="soap:tBodyAttributes" />
+      </xs:restriction>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="tFault" >
+    <xs:complexContent>
+      <xs:extension base="soap:tFaultRes">
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+
+  <xs:element name="header" type="soap:tHeader" />
+  <xs:attributeGroup name="tHeaderAttributes" >
+    <xs:attribute name="message" type="xs:QName" use="required" />
+    <xs:attribute name="part" type="xs:NMTOKEN" use="required" />
+    <xs:attribute name="use" type="soap:useChoice" use="required" />
+    <xs:attribute name="encodingStyle" type="soap:encodingStyle" use="optional" />
+    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
+  </xs:attributeGroup>
+  <xs:complexType name="tHeader" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:sequence>
+          <xs:element ref="soap:headerfault" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+		<xs:attributeGroup ref="soap:tHeaderAttributes" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="headerfault" type="soap:tHeaderFault" />
+  <xs:complexType name="tHeaderFault" >
+	<xs:attributeGroup ref="soap:tHeaderAttributes" />
+  </xs:complexType>
+
+  <xs:element name="address" type="soap:tAddress" />
+  <xs:complexType name="tAddress" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:attribute name="location" type="xs:anyURI" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/wsdl.xsd b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/wsdl.xsd
new file mode 100644
index 000000000000..5d6593d4a5f6
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7Schemas/wsdl.xsd
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL Schema Files
+
+The Authors grant permission to copy and distribute the WSDL Schema
+Files in any medium without fee or royalty as long as this notice and
+license are distributed with them.  The originals of these files can
+be located at:
+
+http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT,
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR
+RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to these files or any program
+or service that uses these files, written prior permission.  Title to copyright
+in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
+           elementFormDefault="qualified" >
+
+  <xs:complexType mixed="true" name="tDocumentation" >
+    <xs:sequence>
+      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="tDocumented" >
+    <xs:annotation>
+      <xs:documentation>
+      This type is extended by  component types to allow them to be documented
+      </xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tDocumented" >
+        <xs:annotation>
+          <xs:documentation>
+          This type is extended by component types to allow attributes from other namespaces to be added.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tExtensibleDocumented" abstract="true" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tDocumented" >
+        <xs:annotation>
+          <xs:documentation>
+          This type is extended by component types to allow elements from other namespaces to be added.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="definitions" type="wsdl:tDefinitions" >
+    <xs:key name="message" >
+      <xs:selector xpath="wsdl:message" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="portType" >
+      <xs:selector xpath="wsdl:portType" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="binding" >
+      <xs:selector xpath="wsdl:binding" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="service" >
+      <xs:selector xpath="wsdl:service" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="import" >
+      <xs:selector xpath="wsdl:import" />
+      <xs:field xpath="@namespace" />
+    </xs:key>
+  </xs:element>
+
+  <xs:group name="anyTopLevelOptionalElement" >
+    <xs:annotation>
+      <xs:documentation>
+      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice>
+      <xs:element name="import" type="wsdl:tImport" />
+      <xs:element name="types" type="wsdl:tTypes" />
+      <xs:element name="message"  type="wsdl:tMessage" >
+        <xs:unique name="part" >
+          <xs:selector xpath="wsdl:part" />
+          <xs:field xpath="@name" />
+        </xs:unique>
+      </xs:element>
+      <xs:element name="portType" type="wsdl:tPortType" />
+      <xs:element name="binding"  type="wsdl:tBinding" />
+      <xs:element name="service"  type="wsdl:tService" >
+        <xs:unique name="port" >
+          <xs:selector xpath="wsdl:port" />
+          <xs:field xpath="@name" />
+        </xs:unique>
+	  </xs:element>
+    </xs:choice>
+  </xs:group>
+
+  <xs:complexType name="tDefinitions" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:group ref="wsdl:anyTopLevelOptionalElement"  minOccurs="0"   maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional" />
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tImport" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
+        <xs:attribute name="location" type="xs:anyURI" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tTypes" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" />
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tMessage" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tPart" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="element" type="xs:QName" use="optional" />
+        <xs:attribute name="type" type="xs:QName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tPortType" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:sequence>
+          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tOperation" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+	    <xs:sequence>
+          <xs:choice>
+            <xs:group ref="wsdl:request-response-or-one-way-operation" />
+            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
+          </xs:choice>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:group name="request-response-or-one-way-operation" >
+    <xs:sequence>
+      <xs:element name="input" type="wsdl:tParam" />
+	  <xs:sequence minOccurs='0' >
+	    <xs:element name="output" type="wsdl:tParam" />
+		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:group name="solicit-response-or-notification-operation" >
+    <xs:sequence>
+      <xs:element name="output" type="wsdl:tParam" />
+	  <xs:sequence minOccurs='0' >
+	    <xs:element name="input" type="wsdl:tParam" />
+		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+	  </xs:sequence>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="tParam" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+        <xs:attribute name="message" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tFault" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName"  use="required" />
+        <xs:attribute name="message" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tBinding" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="type" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tBindingOperationMessage" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tBindingOperationFault" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tBindingOperation" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
+          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
+          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tService" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tPort" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="binding" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:attribute name="arrayType" type="xs:string" />
+  <xs:attribute name="required" type="xs:boolean" />
+  <xs:complexType name="tExtensibilityElement" abstract="true" >
+    <xs:attribute ref="wsdl:required" use="optional" />
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7_.xml b/xml/tests/testData/xml/ComplexSchemaValidation7_.xml
new file mode 100644
index 000000000000..65ac258efb25
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7_.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="http://any.company.com/bsaiptv"
+                  xmlns:tns="http://any.company.com/bsaiptv"
+                  xmlns:aia="http://any.company.com/adapter"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://any.company.com/adapter ComplexSchemaValidation7_.xsd">
+
+    <wsdl:import namespace="http://any.company.com/adapter" location="ComplexSchemaValidation7_.xsd"/>
+
+    <!-- execute -->
+    <wsdl:message name="executeServicesRequest">
+        <wsdl:part element="aia:executeServicesRequest" name="parameters"/>
+    </wsdl:message>
+    <wsdl:message name="executeServicesResponse">
+        <wsdl:part element="aia:executeServicesResponse" name="parameters"/>
+    </wsdl:message>
+    <wsdl:message name="executeServicesException">
+        <wsdl:part element="aia:executeServicesException" name="parameters"/>
+    </wsdl:message>
+
+    <wsdl:portType name="BsaIpTvPortType">
+        <!-- execute -->
+        <wsdl:operation name="executeServices" parameterOrder="executeServicesRequest">
+            <wsdl:input message="tns:executeServicesRequest" name="executeServicesRequest"/>
+            <wsdl:output message="tns:executeServicesResponse" name="executeServicesResponse"/>
+            <wsdl:fault message="tns:executeServicesException" name="executeServicesException"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+
+    <wsdl:binding name="BsaIpTvBinding" type="tns:BsaIpTvPortType">
+
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+        <!-- execute -->
+        <wsdl:operation name="executeServices">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="executeServicesRequest">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="executeServicesResponse">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="executeServicesException">
+                <wsdlsoap:fault name="executeServicesException" use="literal"/>
+            </wsdl:fault>
+        </wsdl:operation>
+    </wsdl:binding>
+
+    <wsdl:service name="BsaIpTvService">
+        <wsdl:port binding="tns:BsaIpTvBinding" name="BsaIpTvPortType">
+            <wsdlsoap:address location="http://localhost:8080/bsa-iptv/services/BsaIpTvService"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7_.xsd b/xml/tests/testData/xml/ComplexSchemaValidation7_.xsd
new file mode 100644
index 000000000000..c5808586ae99
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7_.xsd
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:aia="http://any.company.com/adapter"
+        targetNamespace="http://any.company.com/adapter"
+        elementFormDefault="qualified"
+        version="v1-0">
+
+    <element name="executeServicesRequest">
+        <complexType>
+            <sequence>
+                <element name="description" type="string" nillable="true" minOccurs="0"/>
+                <element name="command" type="string" nillable="true"/>
+                <element name="refId" type="string" nillable="true"/>
+            </sequence>
+        </complexType>
+    </element>
+    <element name="executeServicesResponse">
+        <complexType>
+            <sequence/>
+        </complexType>
+    </element>
+    <element name="executeServicesException">
+        <complexType>
+            <choice>
+                <element name="executeException" type="aia:ExecuteException"/>
+            </choice>
+        </complexType>
+    </element>
+    <complexType name="ExecuteException">
+        <sequence>
+            <element name="message" type="string">
+            </element>
+        </sequence>
+    </complexType>
+</schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation7_2.xml b/xml/tests/testData/xml/ComplexSchemaValidation7_2.xml
new file mode 100644
index 000000000000..3063863cd00f
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation7_2.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions
+	xmlns:tns="http://www.themindelectric.com/wsdl/Country/"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
+	xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:mxsmisc="http://www.themindelectric.com/package/com.marketxs.soap.misc/"
+	xmlns:mxsutil="http://www.themindelectric.com/package/com.marketxs.soap.util/"
+	name="Country" targetNamespace="http://www.themindelectric.com/wsdl/Country/">
+    <wsdl:documentation>
+        The Country service provides access to all countries and regions. Each country is connected to one region.
+    </wsdl:documentation>
+  <wsdl:types>
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.themindelectric.com/package/com.marketxs.soap.util/">
+      <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+      <xsd:complexType name="DataWrapper" abstract="true">
+        <xsd:sequence/>
+      </xsd:complexType>
+    </xsd:schema>
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.themindelectric.com/package/com.marketxs.soap.misc/">
+      <xsd:import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+      <xsd:import namespace="http://www.themindelectric.com/package/com.marketxs.soap.util/"/>
+        <xsd:complexType name="RegionData">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Data object representing a region, such as a continent.
+                </xsd:documentation>
+            </xsd:annotation>
+          <xsd:complexContent>
+            <xsd:extension base="mxsutil:DataWrapper">
+              <xsd:sequence>
+                <xsd:element name="regionId" type="xsd:long"/>
+                <xsd:element name="regionName" nillable="true" type="xsd:string"/>
+              </xsd:sequence>
+            </xsd:extension>
+          </xsd:complexContent>
+        </xsd:complexType>
+      <xsd:complexType name="CountryData">
+          <xsd:annotation>
+              <xsd:documentation>
+                  Data object representing a country.
+              </xsd:documentation>
+          </xsd:annotation>
+        <xsd:complexContent>
+          <xsd:extension base="mxsmisc:RegionData">
+            <xsd:sequence>
+              <xsd:element name="currencyId" type="xsd:long"/>
+              <xsd:element name="countryId" type="xsd:long"/>
+              <xsd:element name="countryName" nillable="true" type="xsd:string"/>
+              <xsd:element name="isoCode" nillable="true" type="xsd:string"/>
+            </xsd:sequence>
+          </xsd:extension>
+        </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="ArrayOfCountryData">
+        <xsd:complexContent>
+          <xsd:restriction base="soapenc:Array">
+            <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="mxsmisc:CountryData[]"/>
+          </xsd:restriction>
+        </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="ArrayOfRegionData">
+        <xsd:complexContent>
+          <xsd:restriction base="soapenc:Array">
+            <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="mxsmisc:RegionData[]"/>
+          </xsd:restriction>
+        </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="CountryException">
+          <xsd:sequence>
+              <xsd:element name="message" nillable="true" type="xsd:string"/>
+          </xsd:sequence>
+      </xsd:complexType>
+    </xsd:schema>
+  </wsdl:types>
+    <wsdl:message name="CountryException">
+        <wsdl:part name="fault" type="mxsmisc:CountryException"/>
+    </wsdl:message>
+  <wsdl:message name="getCountry0In">
+      <wsdl:documentation>org0 countryId the country's primary key.</wsdl:documentation>
+    <wsdl:part name="arg0" type="xsd:long"/>
+  </wsdl:message>
+  <wsdl:message name="getCountry0Out">
+    <wsdl:part name="Result" type="mxsmisc:CountryData"/>
+  </wsdl:message>
+  <wsdl:message name="getCountries1In"/>
+  <wsdl:message name="getCountries1Out">
+    <wsdl:part name="Result" type="mxsmisc:ArrayOfCountryData"/>
+  </wsdl:message>
+  <wsdl:message name="getRegion2In">
+      <wsdl:documentation>arg0 regionId the region's primary key.</wsdl:documentation>
+    <wsdl:part name="arg0" type="xsd:long"/>
+  </wsdl:message>
+  <wsdl:message name="getRegion2Out">
+    <wsdl:part name="Result" type="mxsmisc:RegionData"/>
+  </wsdl:message>
+  <wsdl:message name="getRegions3In"/>
+  <wsdl:message name="getRegions3Out">
+    <wsdl:part name="Result" type="mxsmisc:ArrayOfRegionData"/>
+  </wsdl:message>
+  <wsdl:portType name="Country">
+    <wsdl:operation name="getCountry" parameterOrder="arg0">
+        <wsdl:documentation>Get a country by its primary key.</wsdl:documentation>
+      <wsdl:input name="getCountry0In" message="tns:getCountry0In"/>
+      <wsdl:output name="getCountry0Out" message="tns:getCountry0Out"/>
+        <wsdl:fault name="CountryException" message="tns:CountryException"/>
+    </wsdl:operation>
+    <wsdl:operation name="getCountries" parameterOrder="argv0">
+        <wsdl:documentation>Get all available countries.</wsdl:documentation>
+      <wsdl:input name="getCountries1In" message="tns:getCountries1In"/>
+      <wsdl:output name="getCountries1Out" message="tns:getCountries1Out"/>
+        <wsdl:fault name="CountryException" message="tns:CountryException"/>
+    </wsdl:operation>
+    <wsdl:operation name="getRegion" parameterOrder="arg0">
+        <wsdl:documentation>Get a region by its primary key.</wsdl:documentation>
+      <wsdl:input name="getRegion2In" message="tns:getRegion2In"/>
+      <wsdl:output name="getRegion2Out" message="tns:getRegion2Out"/>
+        <wsdl:fault name="CountryException" message="tns:CountryException"/>
+    </wsdl:operation>
+    <wsdl:operation name="getRegions" parameterOrder="argv0">
+        <wsdl:documentation>Get all available regions.</wsdl:documentation>
+      <wsdl:input name="getRegions3In" message="tns:getRegions3In"/>
+      <wsdl:output name="getRegions3Out" message="tns:getRegions3Out"/>
+        <wsdl:fault name="CountryException" message="tns:CountryException"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="Country" type="tns:Country">
+    <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="getCountry">
+      <soap:operation soapAction="getCountry" style="rpc"/>
+      <wsdl:input name="getCountry0In">
+        <soap:body use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </wsdl:input>
+      <wsdl:output name="getCountry0Out">
+        <soap:body use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </wsdl:output>
+        <wsdl:fault name="CountryException">
+            <soap:fault name="CountryException" use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </wsdl:fault>
+    </wsdl:operation>
+    <wsdl:operation name="getCountries">
+      <soap:operation soapAction="getCountries" style="rpc"/>
+      <wsdl:input name="getCountries1In">
+        <soap:body use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </wsdl:input>
+      <wsdl:output name="getCountries1Out">
+        <soap:body use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </wsdl:output>
+        <wsdl:fault name="CountryException">
+            <soap:fault name="CountryException" use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </wsdl:fault>
+    </wsdl:operation>
+    <wsdl:operation name="getRegion">
+      <soap:operation soapAction="getRegion" style="rpc"/>
+      <wsdl:input name="getRegion2In">
+        <soap:body use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </wsdl:input>
+      <wsdl:output name="getRegion2Out">
+        <soap:body use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </wsdl:output>
+        <wsdl:fault name="CountryException">
+            <soap:fault name="CountryException" use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </wsdl:fault>
+    </wsdl:operation>
+    <wsdl:operation name="getRegions">
+      <soap:operation soapAction="getRegions" style="rpc"/>
+      <wsdl:input name="getRegions3In">
+        <soap:body use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </wsdl:input>
+      <wsdl:output name="getRegions3Out">
+        <soap:body use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+      </wsdl:output>
+        <wsdl:fault name="CountryException">
+            <soap:fault name="CountryException" use="encoded" namespace="http://tempuri.org/com.marketxs.soap.misc.CountryImpl" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+        </wsdl:fault>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="Country">
+    <wsdl:documentation>Country service</wsdl:documentation>
+    <wsdl:port name="Country" binding="tns:Country">
+      <soap:address location="http://@soap.cluster@/Country"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation8.xml b/xml/tests/testData/xml/ComplexSchemaValidation8.xml
new file mode 100644
index 000000000000..a7422fe009d9
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation8.xml
@@ -0,0 +1,32 @@
+<rule-set name="Resource Authorization Ruleset"
+    xmlns="http://drools.org/rules"
+    xmlns:g="http://drools.org/semantics/groovy">
+
+    <import>com.safenetinc.policyengine.model.*</import>
+    <import>test.*</import>
+
+    <rule name="Create authorized resource set">
+        <parameter identifier="loginAuthorizationEvent">
+            <class>com.safenetinc.policyengine.model.LoginAuthorizationEvent</class>
+        </parameter>
+        <g:consequence>
+            drools.assertObject(new AuthorizedResourceList(loginAuthorizationEvent.user))
+        </g:consequence>
+    </rule>
+
+    <rule name="Add authorized resources">
+        <parameter identifier="authorizedResources">
+            <class>com.safenetinc.policyengine.model.AuthorizedResourceList</class>
+        </parameter>
+        <parameter identifier="group">
+            <class>com.safenetinc.policyengine.model.Group</class>
+        </parameter>
+        <parameter identifier="resource">
+            <class>com.safenetinc.policyengine.model.Resource</class>
+        </parameter>
+        <g:condition>authorizedResources.user.groups.contains(group)</g:condition>
+        <g:condition>group.assignedResources.contains(resource)</g:condition>
+        <g:consequence>authorizedResources.authorizedResources.add(resource)</g:consequence>
+    </rule>
+
+</rule-set>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation8.xsd b/xml/tests/testData/xml/ComplexSchemaValidation8.xsd
new file mode 100644
index 000000000000..ba9a59157331
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation8.xsd
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:rules="http://drools.org/rules" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+           targetNamespace="http://drools.org/rules">
+
+  <xs:element name="rule-set">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="rules:abstractImport"/>
+
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="rules:application-data"/>
+
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="rules:abstractFunctions"/>
+
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="rules:rule"/>
+      </xs:sequence>
+
+      <xs:attribute name="name" type="xs:string" use="required"/>
+      <xs:attribute name="description" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="rule">
+    <xs:complexType>
+      <xs:sequence>
+
+        <xs:element maxOccurs="unbounded" minOccurs="0" name="parameter">
+          <xs:complexType>
+            <xs:choice>
+              <xs:element ref="rules:abstractClass"/>
+              <xs:element ref="rules:class-field"/>
+              <xs:element ref="rules:semaphore"/>
+            </xs:choice>
+            <xs:attribute name="identifier" type="xs:string" use="required"/>
+          </xs:complexType>
+        </xs:element>
+
+        <xs:element maxOccurs="unbounded" minOccurs="0" ref="rules:abstractCondition"/>
+
+        <xs:element minOccurs="0" name="duration">
+          <xs:complexType>
+            <xs:attribute name="days" type="xs:nonNegativeInteger"/>
+            <xs:attribute name="hours" type="xs:nonNegativeInteger"/>
+            <xs:attribute name="minutes" type="xs:nonNegativeInteger"/>
+            <xs:attribute name="seconds" type="xs:nonNegativeInteger"/>
+          </xs:complexType>
+        </xs:element>
+
+      <xs:element ref="rules:abstractConsequence"/>
+
+      </xs:sequence>
+      <xs:attribute name="name" type="xs:string" use="required"/>
+      <xs:attribute name="salience" type="xs:integer"/>
+      <xs:attribute name="no-loop" type="xs:boolean"/>
+      <xs:attribute name="xor-group" type="xs:string"/>
+      <xs:attribute name="description" type="xs:string"/>
+    </xs:complexType>
+
+    <!-- All rules must have unique names -->
+    <xs:key name="ruleName">
+      <xs:selector xpath="rules:rule"/>
+      <xs:field xpath="@name"/>
+    </xs:key>
+  </xs:element>
+
+  <xs:element name="class" substitutionGroup="rules:abstractClass" type="xs:string"/>
+
+  <xs:element name="class-field">
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base="xs:string">
+          <xs:attribute name="field" type="xs:string" use="required"/>
+          <xs:attribute name="value" type="xs:string" use="required"/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="import" substitutionGroup="rules:abstractImport" type="xs:string"/>
+
+
+  <xs:element name="semaphore">
+    <xs:complexType>
+          <xs:attribute name="type" use="required">
+			<xs:simpleType>
+			  <xs:restriction base="xs:string">
+			    <xs:enumeration value="String"/>
+			    <xs:enumeration value="Integer"/>
+			    <xs:enumeration value="Long"/>
+			    <xs:enumeration value="Boolean"/>
+			    <xs:enumeration value="Char"/>
+			    <xs:enumeration value="Short"/>
+			    <xs:enumeration value="Float"/>
+			    <xs:enumeration value="Double"/>
+                <xs:enumeration value="List"/>
+                <xs:enumeration value="Map"/>
+                <xs:enumeration value="Set"/>
+			  </xs:restriction>
+			</xs:simpleType>
+          </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="application-data">
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base="xs:string">
+          <xs:attribute name="identifier" type="xs:string" use="required"/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- Abstract Definitions for sementic to create concrete implementations -->
+
+  <xs:element abstract="true" name="abstractImport" type="xs:anyType"/>
+
+  <xs:element abstract="true" name="abstractFunctions" type="xs:anyType"/>
+
+  <xs:element abstract="true" name="abstractClass" type="xs:anyType"/>
+
+  <xs:element abstract="true" name="abstractClassField" type="xs:anyType"/>
+
+  <xs:element abstract="true" name="abstractCondition" type="xs:anyType"/>
+
+  <xs:element abstract="true" name="abstractConsequence" type="xs:anyType"/>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation8_2.xsd b/xml/tests/testData/xml/ComplexSchemaValidation8_2.xsd
new file mode 100644
index 000000000000..ae8823fa1676
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation8_2.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://drools.org/semantics/groovy"
+           elementFormDefault="qualified"
+           xmlns:groovy="http://drools.org/semantics/groovy"
+           xmlns:rules="http://drools.org/rules">
+
+  <xs:import namespace="http://drools.org/rules" schemaLocation="ComplexSchemaValidation8.xsd"/>
+
+  <xs:element name="import"      type="xs:string" substitutionGroup="rules:abstractImport"/>
+
+  <xs:element name="functions"   type="xs:string" substitutionGroup="rules:abstractFunctions"/>
+
+  <xs:element name="class"       type="xs:string" substitutionGroup="rules:abstractClass"/>
+
+  <xs:element name="condition"   type="xs:string" substitutionGroup="rules:abstractCondition"/>
+
+  <xs:element name="consequence" type="xs:string" substitutionGroup="rules:abstractConsequence"/>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation9.xml b/xml/tests/testData/xml/ComplexSchemaValidation9.xml
new file mode 100644
index 000000000000..fe57829e965e
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation9.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ComplexSchemaValidation9.xsd">
+  <aValidTag/>
+</root>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ComplexSchemaValidation9.xsd b/xml/tests/testData/xml/ComplexSchemaValidation9.xsd
new file mode 100644
index 000000000000..eb9e71d7727b
--- /dev/null
+++ b/xml/tests/testData/xml/ComplexSchemaValidation9.xsd
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <xs:element name="root">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/CorrectGeneratedDtdUpdate.xml b/xml/tests/testData/xml/CorrectGeneratedDtdUpdate.xml
new file mode 100644
index 000000000000..f8836e3d620d
--- /dev/null
+++ b/xml/tests/testData/xml/CorrectGeneratedDtdUpdate.xml
@@ -0,0 +1,367 @@
+<ideaplugin version="2" use-idea-classloader="true">
+  <name>HTML Designer</name>
+  <id>com.intellij.htmlDesigner</id>
+  <version>1.0</version>
+  <vendor logo="/general/ijLogo.png">JetBrains</vendor>
+  <idea-version min="5.0" max="5.0"/>
+
+  <selection><</selection>extensionPoints>
+    <extensionPoint name="editorDnDHandler" beanClass="com.intellij.designer.editor.dnd.EditorDnDHandlerConfiguration"/>
+    <extensionPoint name="beanCreateInfo" beanClass="com.intellij.openapi.designer.beans.BeanCreateInfo"/>
+  </extensionPoints>
+
+  <extensions xmlns="com.intellij">
+    <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
+  </extensions>
+
+  <extensions xmlns="com.intellij.htmlDesigner">
+
+    <editorDnDHandler activeStates="DESIGN">
+       <newInstance>com.intellij.designer.editor.dnd.TagDnDHandler</newInstance>
+       <types>
+         <type>com.intellij.psi.xml.XmlTag</type>
+       </types>
+     </editorDnDHandler>
+
+    <editorDnDHandler>
+      <newInstance>com.intellij.designer.impl.palette.BeanCreateInfoDnDHandler</newInstance>
+      <types>
+        <type>com.intellij.designer.impl.palette.BeanCreateInfoDnDObject</type>
+      </types>
+    </editorDnDHandler>
+
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.ABeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.DivBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.DdBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.DlBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.DtBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.HrBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.ImgBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.LiBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.OlBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.SpanBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.TableBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.TdBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.TrBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.html.UlBeanInfo"/>
+
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlCommandButtonBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlDataTableBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlInputTextBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlOutputTextBeanInfo"/>
+
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlSelectBooleanCheckboxBeanInfo"/>
+
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlCommandLinkBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlInputHiddenBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlInputSecretBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlInputTextareaBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlMessageBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlMessagesBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlOutputFormatBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlOutputLabelBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlOutputLinkBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlSelectManyCheckboxBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlSelectManyListboxBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlSelectManyMenuBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlSelectOneListboxBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlSelectOneMenuBeanInfo"/>
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.HtmlSelectOneRadioBeanInfo"/>
+
+    <beanCreateInfo implementation="com.intellij.designer.dt.jsf.UIColumnBeanInfo"/>
+
+  </extensions>
+
+  <project-components>
+    <component>
+      <implementation-class>com.intellij.designer.impl.dt.DesignBeanManager</implementation-class>
+    </component>
+  </project-components>
+
+  <application-components>
+    <component>
+      <implementation-class>com.intellij.designer.impl.HtmlEditorProvider</implementation-class>
+    </component>
+    <component>
+      <implementation-class>com.intellij.designer.impl.dt.EditorsRegistrar</implementation-class>
+    </component>
+    <component>
+      <implementation-class>com.intellij.designer.impl.dt.JbdtDataManager</implementation-class>
+    </component>
+  </application-components>
+
+  <module-components>
+    <component>
+      <interface-class>com.intellij.designer.impl.palette.BeanCreateInfoManager</interface-class>
+      <implementation-class>com.intellij.designer.impl.palette.BeanCreateInfoManagerImpl</implementation-class>
+    </component>
+    <component>
+      <implementation-class>com.intellij.designer.impl.dt.JbdtDataManager</implementation-class>
+    </component>
+  </module-components>
+  <actions>
+    <!-- Designer actions -->
+    <group id="DesignerActions" text="Designer Actions">
+
+      <action id="Designer.QuickEdit" class="com.intellij.designer.editor.impl.action.action.QuickEditAction" text="Quick Edit">
+        <keyboard-shortcut first-keystroke="alt control T" keymap="$default"/>
+      </action>
+      <action id="Designer.InsertTable" class="com.intellij.designer.editor.impl.action.action.InsertTableAction"
+              text="Insert Table"/>
+      <!--<action id="Designer.InsertImage" class="com.intellij.designer.editor.impl.action.action.InsertImageAction" text="Insert Image"/>-->
+      <action id="Designer.ViewNormal" class="com.intellij.designer.editor.impl.action.action.ViewNormalAction" text="View Normal"/>
+      <action id="Designer.ViewTags" class="com.intellij.designer.editor.impl.action.action.ViewTagsAction" text="View Tags"/>
+      <action id="Designer.ReplaceTagWithContent" class="com.intellij.designer.editor.impl.action.action.ReplaceTagWithContentAction"
+              text="Replace Tag With Content"/>
+
+      <action id="Designer.Delete" class="com.intellij.designer.editor.impl.action.action.DeleteAction" text="Delete"
+              use-shortcut-of="EditorDelete"/>
+      <action id="Designer.Backspace" class="com.intellij.designer.editor.impl.action.action.BackspaceAction" text="Backspace"
+              use-shortcut-of="EditorBackSpace"/>
+      <action id="Designer.Enter" class="com.intellij.designer.editor.impl.action.action.EnterAction" text="Enter"
+              use-shortcut-of="EditorEnter"/>
+      <action id="Designer.Left" class="com.intellij.designer.editor.impl.action.action.navigation.LeftAction" text="Left"
+              use-shortcut-of="EditorLeft"/>
+      <action id="Designer.Right" class="com.intellij.designer.editor.impl.action.action.navigation.RightAction" text="Right"
+              use-shortcut-of="EditorRight"/>
+      <action id="Designer.Up" class="com.intellij.designer.editor.impl.action.action.navigation.UpAction" text="Up"
+              use-shortcut-of="EditorUp"/>
+      <action id="Designer.Down" class="com.intellij.designer.editor.impl.action.action.navigation.DownAction" text="Down"
+              use-shortcut-of="EditorDown"/>
+      <action id="Designer.Home" class="com.intellij.designer.editor.impl.action.action.navigation.HomeAction" text="Home"
+              use-shortcut-of="EditorLineStart"/>
+      <action id="Designer.End" class="com.intellij.designer.editor.impl.action.action.navigation.EndAction" text="End"
+              use-shortcut-of="EditorLineEnd"/>
+      <action id="Designer.PageUp" class="com.intellij.designer.editor.impl.action.action.navigation.PageUpAction" text="Page Up"
+              use-shortcut-of="EditorPageUp"/>
+      <action id="Designer.PageDown" class="com.intellij.designer.editor.impl.action.action.navigation.PageDownAction"
+              text="Page Down" use-shortcut-of="EditorPageDown"/>
+      <action id="Designer.Tab" class="com.intellij.designer.editor.impl.action.action.TabAction" text="Tab"
+              use-shortcut-of="EditorTab"/>
+      <action id="Designer.Escape" class="com.intellij.designer.editor.impl.action.action.EscapeAction" text="Escape"
+              use-shortcut-of="EditorEscape"/>
+      <action id="Designer.ShiftEnter" class="com.intellij.designer.editor.impl.action.action.ShiftEnterAction" text="New Line"
+              use-shortcut-of="EditorStartNewLine"/>
+      <action id="Designer.ShiftLeft" class="com.intellij.designer.editor.impl.action.action.navigation.ShiftLeftAction"
+              text="ShiftLeft" use-shortcut-of="EditorLeftWithSelection"/>
+      <action id="Designer.ShiftRight" class="com.intellij.designer.editor.impl.action.action.navigation.ShiftRightAction"
+              text="ShiftRight" use-shortcut-of="EditorRightWithSelection"/>
+      <action id="Designer.ShiftUp" class="com.intellij.designer.editor.impl.action.action.navigation.ShiftUpAction" text="ShiftUp"
+              use-shortcut-of="EditorUpWithSelection"/>
+      <action id="Designer.ShiftDown" class="com.intellij.designer.editor.impl.action.action.navigation.ShiftDownAction"
+              text="ShiftDown" use-shortcut-of="EditorDownWithSelection"/>
+      <action id="Designer.ShiftHome" class="com.intellij.designer.editor.impl.action.action.navigation.ShiftHomeAction"
+              text="ShiftHome" use-shortcut-of="EditorLineStartWithSelection"/>
+      <action id="Designer.ShiftEnd" class="com.intellij.designer.editor.impl.action.action.navigation.ShiftEndAction" text="ShiftEnd"
+              use-shortcut-of="EditorLineEndWithSelection"/>
+      <action id="Designer.CtrlHome" class="com.intellij.designer.editor.impl.action.action.navigation.CtrlHomeAction" text="CtrlHome"
+              use-shortcut-of="EditorTextStart"/>
+      <action id="Designer.CtrlEnd" class="com.intellij.designer.editor.impl.action.action.navigation.CtrlEndAction" text="CtrlEnd"
+              use-shortcut-of="EditorTextEnd"/>
+      <action id="Designer.SelectAll" class="com.intellij.designer.editor.impl.action.action.navigation.SelectAllAction"
+              text="Select All" use-shortcut-of="$SelectAll"/>
+      <action id="Designer.CtrlLeft" class="com.intellij.designer.editor.impl.action.action.navigation.CtrlLeftAction"
+              text="Word Left" use-shortcut-of="EditorPreviousWord"/>
+      <action id="Designer.CtrlRight" class="com.intellij.designer.editor.impl.action.action.navigation.CtrlRightAction"
+              text="Word Right" use-shortcut-of="EditorNextWord"/>
+      <action id="Designer.SelectBlockTag" class="com.intellij.designer.editor.impl.action.action.navigation.SelectBlockTagAction"
+              text="Select Tag">
+        <keyboard-shortcut first-keystroke="control alt T" keymap="$default"/>
+      </action>
+      <!--<action id="Designer.Undo" class="com.intellij.designer.editor.impl.action.action.XhtmlUndoAction" text="Undo"/>-->
+      <action id="Designer.CtrlShiftHome" class="com.intellij.designer.editor.impl.action.action.navigation.CtrlShiftHomeAction"
+              text="CtrlShiftHome" use-shortcut-of="EditorTextStartWithSelection"/>
+      <action id="Designer.CtrlShiftEnd" class="com.intellij.designer.editor.impl.action.action.navigation.CtrlShiftEndAction"
+              text="CtrlShiftEnd" use-shortcut-of="EditorTextEndWithSelection"/>
+      <action id="Designer.CtrlShiftLeft" class="com.intellij.designer.editor.impl.action.action.navigation.CtrlShiftLeftAction"
+              text="CtrlShiftLeft" use-shortcut-of="EditorPreviousWordWithSelection"/>
+      <action id="Designer.CtrlShiftRight" class="com.intellij.designer.editor.impl.action.action.navigation.CtrlShiftRightAction"
+              text="CtrlShiftRight" use-shortcut-of="EditorNextWordWithSelection"/>
+      <action id="Designer.ClearWidth" class="com.intellij.designer.editor.impl.action.action.ClearWidthAction" text="Clear Width"/>
+      <action id="Designer.ClearHeight" class="com.intellij.designer.editor.impl.action.action.ClearHeightAction"
+              text="Clear Height"/>
+      <action id="Designer.CopyAttributes" class="com.intellij.designer.editor.impl.action.action.CopyAttributesAction"
+              text="Copy Attributes"/>
+      <action id="Designer.PasteAttributes" class="com.intellij.designer.editor.impl.action.action.PasteAttributesAction"
+              text="Paste Attributes"/>
+      <action id="Designer.MakeStatic" class="com.intellij.designer.editor.impl.action.action.MakeStaticAction" text="Make Static"/>
+      <action id="Designer.MakeAbsolute" class="com.intellij.designer.editor.impl.action.action.MakeAbsoluteAction"
+              text="Make Absolute"/>
+      <action id="Designer.MakeRelative" class="com.intellij.designer.editor.impl.action.action.MakeRelativeAction"
+              text="Make Relative"/>
+      <action id="Designer.MakeFloatLeft" class="com.intellij.designer.editor.impl.action.action.MakeFloatLeftAction"
+              text="Make Float Left"/>
+      <action id="Designer.MakeFloatRight" class="com.intellij.designer.editor.impl.action.action.MakeFloatRightAction"
+              text="Make Float Right"/>
+      <action id="Designer.MakeFloatNone" class="com.intellij.designer.editor.impl.action.action.MakeFloatNoneAction"
+              text="Remove Float"/>
+      <action id="Designer.Settings" class="com.intellij.designer.editor.impl.action.action.SettingsAction" text="Settings..."/>
+
+      <!-- Table related actions -->
+      <group id="Designer.TableActions" text="Table" popup="true">
+        <action id="Designer.SelectTable" class="com.intellij.designer.editor.impl.action.action.table.SelectTableAction"
+                text="Select Table"/>
+        <separator/>
+        <action id="Designer.InsertRow" class="com.intellij.designer.editor.impl.action.action.table.InsertRowAction"
+                text="Insert Row">
+          <keyboard-shortcut first-keystroke="control M" keymap="$default"/>
+        </action>
+        <action id="Designer.InsertColumn" class="com.intellij.designer.editor.impl.action.action.table.InsertColumnAction"
+                text="Insert Column">
+          <keyboard-shortcut first-keystroke="control shift A" keymap="$default"/>
+        </action>
+        <separator/>
+        <action id="Designer.DeleteRow" class="com.intellij.designer.editor.impl.action.action.table.DeleteTableRowAction"
+                text="Delete Row">
+          <keyboard-shortcut first-keystroke="control shift M" keymap="$default"/>
+        </action>
+        <action id="Designer.DeleteColumn" class="com.intellij.designer.editor.impl.action.action.table.DeleteTableColumnAction"
+                text="Delete Column" >
+          <keyboard-shortcut first-keystroke="control shift MINUS" keymap="$default"/>
+        </action>
+        <separator/>
+        <action id="Designer.MergeTableCells" class="com.intellij.designer.editor.impl.action.action.table.MergeCellsAction"
+                text="Merge Selected Cells"/>
+        <action id="Designer.IncreaseRowSpan" class="com.intellij.designer.editor.impl.action.action.table.IncreaseRowSpanAction"
+                text="Increase Row Span"/>
+        <action id="Designer.IncreaseColumnSpan"
+                class="com.intellij.designer.editor.impl.action.action.table.IncreaseColumnSpanAction" text="Increase Column Span">
+          <keyboard-shortcut first-keystroke="control shift CLOSE_BRACKET" keymap="$default"/>
+        </action>
+        <action id="Designer.DecreaseRowSpan" class="com.intellij.designer.editor.impl.action.action.table.DecreaseRowSpanAction"
+                text="Decrease Row Span"/>
+        <action id="Designer.DecreaseColumnSpan"
+                class="com.intellij.designer.editor.impl.action.action.table.DecreaseColumnSpanAction" text="Decrease Column Span">
+          <keyboard-shortcut first-keystroke="control shift OPEN_BRACKET" keymap="$default"/>
+        </action>
+        <action id="Designer.SplitCellHorizontally"
+                class="com.intellij.designer.editor.impl.action.action.table.SplitCellHorizontallyAction" text="Split Cell Horizontally">
+        </action>
+        <action id="Designer.SplitCellVertically"
+                class="com.intellij.designer.editor.impl.action.action.table.SplitCellVerticallyAction" text="Split Cell Vertically">
+        </action>
+      </group>
+
+      <group id="Designer.VisualAids">
+
+        <action id="Designer.ShowGrid" class="com.intellij.designer.editor.impl.action.action.grid.ShowGridAction" text="Show Grid">
+          <keyboard-shortcut first-keystroke="control alt G" keymap="$default"/>
+        </action>
+        <action id="Designer.SnapToGrid" class="com.intellij.designer.editor.impl.action.action.grid.SnapToGridAction"
+                text="Snap To Grid">
+          <keyboard-shortcut first-keystroke="control alt shift G" keymap="$default"/>
+        </action>
+        <action id="Designer.ViewRulers" class="com.intellij.designer.impl.actions.ViewRulersAction" text="Show Rulers"/>
+        <separator/>
+        <reference ref="Designer.ViewTags"/>
+        <reference ref="Designer.ViewNormal"/>
+        <separator/>
+        <action id="Designer.HighlightTagBounds" class="com.intellij.designer.impl.actions.HighlightTagBoundsAction" text="Hightlight Tag Bounds"/>
+        <separator/>
+        <action id="Designer.ShowHiddenFields" class="com.intellij.designer.impl.actions.RenderHiddenFieldsAction" text="Show Hidden Fields"/>
+        <separator/>
+        <action id="Designer.GridSettings" class="com.intellij.designer.editor.impl.action.action.grid.GridSettingsAction"
+                text="Grid Settings..."/>
+      </group>
+
+      <group id="Designer.Outlines">
+        <action id="Designer.OutlineBlockElements" class="com.intellij.designer.impl.actions.OutlineBlockElementsAction" text="Outline Block Elements"/>
+        <action id="Designer.OutlineTables" class="com.intellij.designer.impl.actions.OutlineTablesAction" text="Outline Tables"/>
+        <action id="Designer.OutlineTableCells" class="com.intellij.designer.impl.actions.OutlineTableCellsAction" text="Outline Table Cells"/>
+      </group>
+
+      <group id="Designer.DefaultPopup">
+        <action id="Designer.DumpFrame" class="com.intellij.designer.impl.actions.DumpFrameAction" text="Dump"/>
+        <separator/>
+        <reference ref="CutCopyPasteGroup"/>
+        <separator/>
+          <group id="Designer.Facets" class="com.intellij.designer.jsf.impl.actions.FacetsActionGroup" popup="true" text="Facets"/>
+        <separator/>
+        <group popup="true" text="Insert">
+          <reference ref="Designer.InsertTable"/>
+        </group>
+        <reference ref="Designer.QuickEdit"/>
+        <separator/>
+      </group>
+    </group>
+
+    <group id="InspectorActions" text="InspectorActions">
+      <group id="PropertyInspector.CommonActions">
+        <action id="PropertyInspector.AddProperty" class="com.intellij.designer.inspector.impl.actions.AddPropertyAction" text="Add Property" use-shortcut-of="Generate"/>
+        <action id="PropertyInspector.RemoveProperty" class="com.intellij.designer.inspector.impl.actions.RemovePropertyAction" text="Remove Property" use-shortcut-of="EditorDelete"/>
+      </group>
+
+      <action id="PropertyInspector.EditValue" class="com.intellij.designer.inspector.impl.actions.EditPropertyAction" text="Edit Property">
+        <keyboard-shortcut first-keystroke="ENTER" keymap="$default"/>
+      </action>
+    </group>
+
+    <group id="CssInspectorActions" text="CssInspectorActions">
+      <action id="CssInspector.Go2Decalaration" class="com.intellij.designer.cssInspector.actions.Navigate2SourceAction" text="Navigate To Source" use-shortcut-of="EditSource"/>
+    </group>
+
+    <group id="InstantAction" text="InstantActions">
+      <group id="InstantAction.TextSelection" text="TextSelectionActions">
+        <group id="FirstRow" text="FirstRow">
+          <action id="TextSelection.WrapInSpan" class="com.intellij.designer.editor.impl.action.action.text.WrapInSpanAction" text="Wrap in SPAN"
+            />
+          <action id="TextSelection.WrapInDiv" class="com.intellij.designer.editor.impl.action.action.text.WrapInDivAction" text="Wrap in DIV"
+            />
+          <action id="TextSelection.MakeLink" class="com.intellij.designer.editor.impl.action.action.text.MakeLinkAction" text="Make Link"
+            />
+        </group>
+        <group id="SecondRow" text="FirstRow">
+        </group>
+      </group>
+
+      <group id="InstantAction.InlineTagSelection" text="InlineTagSelection">
+        <action id="Designer.QuickEdit1" class="com.intellij.designer.editor.impl.action.action.text.InlineQuickEditAction" text="Quick Edit"
+           />
+      </group>
+
+      <group id="InstantActionGroup.default">
+        <group id="1FirstRow">
+          <group id="Position">
+            <action id="1Designer.MakeStatic" class="com.intellij.designer.editor.impl.action.action.MakeStaticAction" text="Make Static"
+                    />
+            <action id="1Designer.MakeAbsolute" class="com.intellij.designer.editor.impl.action.action.MakeAbsoluteAction"
+                    text="Make Absolute" />
+            <action id="1Designer.MakeRelative" class="com.intellij.designer.editor.impl.action.action.MakeRelativeAction"
+                    text="Make Relative"  />
+          </group>
+          <group id="Float">
+            <action id="1Designer.MakeFloatLeft" class="com.intellij.designer.editor.impl.action.action.MakeFloatLeftAction"
+                    text="Make Float Left"  />
+            <action id="1Designer.MakeFloatRight" class="com.intellij.designer.editor.impl.action.action.MakeFloatRightAction"
+                    text="Make Float Right" />
+            <action id="1Designer.MakeFloatNone" class="com.intellij.designer.editor.impl.action.action.MakeFloatNoneAction"
+                    text="Remove Float"  />
+          </group>
+        </group>
+        <group id="2SecondRow">
+          <group id="Clear">
+            <action id="1Designer.ClearWidth" class="com.intellij.designer.editor.impl.action.action.ClearWidthAction" text="Clear Width"
+                    />
+            <action id="1Designer.ClearHeight" class="com.intellij.designer.editor.impl.action.action.ClearHeightAction"
+                    text="Clear Height" />
+          </group>
+          <group id="1QuickEdit">
+            <action id="1Designer.QuickEdit" class="com.intellij.designer.editor.impl.action.action.QuickEditAction" text="Quick Edit"
+                    >
+              <keyboard-shortcut first-keystroke="alt control T" keymap="$default"/>
+            </action>
+          </group>
+          <group id="1ReplaceTag">
+            <action id="1Designer.ReplaceTagWithContent" class="com.intellij.designer.editor.impl.action.action.ReplaceTagWithContentAction"
+                    text="Replace Tag With Content"/>
+          </group>
+        </group>
+
+      </group>
+
+    </group>
+
+  </actions>
+
+
+</ideaplugin>
diff --git a/xml/tests/testData/xml/DefaultAndFixedInSchema.xsd b/xml/tests/testData/xml/DefaultAndFixedInSchema.xsd
new file mode 100644
index 000000000000..263864ef2621
--- /dev/null
+++ b/xml/tests/testData/xml/DefaultAndFixedInSchema.xsd
@@ -0,0 +1,10 @@
+<xsd:schema xmlns="http://www.foo.org/test"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://www.foo.org/test"
+            elementFormDefault="qualified" attributeFormDefault="unqualified">
+  <<error>xsd:element</error>>
+    <xsd:complexType>
+      <<error>xsd:attribute</error> <error>default="aaa"</error> <error>fixed="bbb"</error> />
+    </xsd:complexType>
+  </<error>xsd:element</error>>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DocBook5.xml b/xml/tests/testData/xml/DocBook5.xml
new file mode 100644
index 000000000000..d00d1464e9c6
--- /dev/null
+++ b/xml/tests/testData/xml/DocBook5.xml
@@ -0,0 +1,13 @@
+<book lang="de"
+      xmlns="http://docbook.org/ns/docbook"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      xsi:schemaLocation="http://docbook.org/ns/docbook http://www.docbook.org/xml/5.0/xsd/docbook.xsd
+                          http://www.w3.org/1999/xlink http://www.w3.org/1999/xlink.xsd">
+
+    <title>
+        <link xlink:href="http://www.web.de">linklabel</link>
+
+    </title>
+
+</book>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DocBookHighlighting.xml b/xml/tests/testData/xml/DocBookHighlighting.xml
new file mode 100644
index 000000000000..641d1439ae7d
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+
+
+<chapter id="chUserGuide">
+	<title>User Guide</title>
+
+	<?dbhtml filename="userguide.html"?>
+ 	<para>The User Guide provides an in-depth guide to working with Polarion. This "book" is mainly oriented to the tasks and operations that you perform while using Polarion.
+     The first section introduces the major components of the user interface. This is followed by a section that covers the most common things most people need to do when
+     working with projects. Later you will find "specialized" sections oriented toward the common tasks of specific types of users: Project Managers and Developers, for
+     example. You can browse through the Table of Contents to see the organization of the various topics covered in the guide.</para>
+
+    <sect1 id="ug_tour">
+        <title>Quick Tour</title>
+        <?dbhtml filename="ug_quicktour.html"?>
+        <para>This section of the User Guide provides a quick overview of the Polarion user interface.</para>
+        <figure id="gs-ui_project_dashbd">
+			<title>Polarion User Interface</title>
+			<screenshot>
+				<mediaobject>
+					<imageobject>
+						<imagedata fileref="help_home/screenshots/ui_projects_dashboard.png" format="PNG"/>
+					</imageobject>
+					<textobject>
+						<phrase>The Polarion application (running in MS Internet Explorer)</phrase>
+					</textobject>
+					<caption>
+						<para>Polarion User Interface (Projects perspective, Dashboard topic)</para>
+					</caption>
+				</mediaobject>
+			</screenshot>
+		</figure>
+		<para>Please refer to the above figure for the following sections.</para>
+
+        <sect2 id="ug_tour_main_navpanel">
+            <title>Main Navigation Panel</title>
+            <para>This panel occupies the left side of the Polarion application. It provides the first
+			level of navigation of the Polarion system. The panel has main types of components:</para>
+			<itemizedlist mark="bullet">
+				<listitem>
+					<para><emphasis role="bold">Navigation Portlets</emphasis>: Subsections of a panel or screen, portlets prevent some formatted view of data or information.
+					In the case of the Main Navigation Panel, navigation portlets provide clickable links that help you access specific information in the system.
+					The actual portlets that appear in the panel vary according to which perspective is current.</para>
+				</listitem>
+				<listitem>
+					<para><emphasis role="bold">Perspective Selectors</emphasis>: Polarion uses the concept of <emphasis>perspectives</emphasis>,
+					similar to Microsoft Outlook. One or more perspectives are visible to you depending on permissions granted by the system administrator. For
+					example, if you do not have Administrator rights (either global or project level), there will be no selector for the <guilabel>Administration</guilabel>
+					perspective and that perspective will not be accessible for you.</para>
+				</listitem>
+			</itemizedlist>
+        </sect2>
+
+        <sect2 id="ug_tour_work_area">
+            <title>The Working Area</title>
+            <para>As the name implies, this is the area where you will do most of your work in Polarion. The
+			content of this area depends of a number of factors, including current perspective and selections in the
+			<link linkend="ug_tour_main_navpanel">Main Navigation Panel</link> such as Project and Topic, and the view tab selection.</para>
+
+            <sect3 id="ug_tour_work_area_views">
+				<title>View tabs</title>
+				<para>The Working Area provides several Views which are accessed by clicking one of the tabs that appear at the top.</para>
+				<figure id="ug_tour_work_area_views_shot1">
+					<title>View Tabs</title>
+					<screenshot>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="help_home/screenshots/getstart/wi_view_tabs.png" format="PNG"/>
+							</imageobject>
+							<textobject>
+								<phrase>Shows the selector tabs for Working Area Views</phrase>
+							</textobject>
+							<caption>
+								<para>Working Area View tabs</para>
+							</caption>
+						</mediaobject>
+					</screenshot>
+				</figure>
+			</sect3>
+			<sect3 id="ug_tour_work_area_views_search">
+				<title>Search Bar</title>
+				<para>What you see in the Working Area is the result of some system query, whether predefined and automated, or manually
+				defined and executed by you. Each of the View tabs displays the Search bar (see figure above). This bar displays the search query criteria
+				that provide the view you are currently seeing. There are controls in the bar for changing the various criteria and executing
+					the revised query, thus obtaining different information in the View.</para>
+				<para>Depending on the View that is current, the Search Bar may contain other controls such as a button or action list.</para>
+			</sect3>
+			<sect3 id="ug_tour_work_area_views_sel_det">
+				<title>Work Item Selection and Detail panes</title>
+				<para>Please refer to the following figure for the next sections:</para>
+				<figure id="ug_tour_work_area_views_sel_det_shot1">
+					<title>Work Item Selections</title>
+					<screenshot>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="help_home/screenshots/getstart/wi_sel_detail.png" format="PNG"/>
+							</imageobject>
+							<textobject>
+								<phrase>Shows the Work Item selection pane and the Work Item detail pane of the Working Area.</phrase>
+							</textobject>
+							<caption>
+								<para>Work Item Selection and Detail panes in the Working Area of the Polarion application</para>
+							</caption>
+						</mediaobject>
+					</screenshot>
+				</figure>
+				<sect4 id="ug_tour_work_area_views_sel_det_wisel">
+					<title>Work Item Selection pane</title>
+					<para>This pane enables you to select a Work Item for reading, editing or some other applicable operation (Print, for example).
+					Depending on the current View, you may be able to select multiple Work Items (as in Bulk Edit, for example). The
+					layout of this area (Table, Tree, <inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> Matrix, ect.)	varies according to the current View tab. </para>
+				</sect4>
+				<sect4 id="ug_tour_work_area_views_sel_det_widet">
+					<title>Work Item Detail pane</title>
+					<para>Here you have access to all information about the selected Work Item(s). You need to scroll the pane to browse all
+					available information. The pane provides a summary of the Work Item at the top. Scrolling down reveals a number of portlets
+					that provide specific kinds of information and data.</para>
+					<para>The toolbar for this pane provides buttons for a number of common operations you can perform on the selected item(s)
+					Edit or Watch, for example. Other buttons provide quick jumps to commonly needed detail portlets such as Comments, Links,
+					and Attachments.</para>
+					<note>
+						<title>A note about editing</title>
+						<para>The Detail pane is where you can edit the selected item. (<inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/>
+						In Polarion Enterprise Edition you can edit multiple items in Multi-edit view). Your ability to edit Work Items depends
+						on the role and access rights assigned you by the system administrator. If you do not have write access privileges, the buttons
+						and links that trigger edit mode do not appear, or are disabled in the interface.</para>
+					</note>
+				</sect4>
+			</sect3>
+        </sect2>
+    </sect1>
+
+    <sect1 id="ug_getstart_projects">
+        <title>Getting Started with Projects</title> <!-- TODO Check for redundancy with Admin Guide. Maybe move content and just link from here. -->
+        <?dbhtml filename="ug_getstart_projects.html"?>
+        <para>This section will give you the basics about creating and accessing Projects in Polarion.</para>
+
+        <sect2 id="ug_gsproject_creating">
+            <title>Creating Projects</title>
+            <para>To create a new project you must have global Administrator rights. The information in this section assumes that you already have
+				a Subversion repository in which you can create a new folder for the new Project.</para>
+			<para>There are 2 basic scenarios for creating a Project:</para>
+			<itemizedlist mark="bullet">
+				<listitem>
+					<para>Create a new empty Project from a Project Template. This creates a new folder in your repository.</para>
+				</listitem>
+				<listitem>
+					<para>Mark an existing repository folder as a Project. </para>
+				</listitem>
+			</itemizedlist>
+			<sect3 id="ug_gsproject_creating_new_empty">
+				<title>Creating a new Project from a template</title>
+				<para>Polarion comes with a default Project Template <systemitem>Empty Project</systemitem>. You can
+				create copies of this template and customize them to create new projects templates, but for now let's concentrate on the
+				default a new project based on the <systemitem>Empty Project</systemitem> template.	<!-- NEED THE LOCATION OF XML FILE --></para>
+				<para><emphasis>To create a new Empty Project:</emphasis></para>
+				<orderedlist spacing="compact">
+					<listitem>
+						<para>Log into Polarion and click <guilabel>Administration</guilabel> in the perspective selector (bottom of
+							the left navigation).</para>
+					</listitem>
+					<listitem>
+						<para>In the <guilabel>Projects</guilabel> portlet, click <guilabel>Repository</guilabel>.</para>
+					</listitem>
+					<listitem>
+						<para>In the <guilabel>Topics</guilabel> portlet, expand the <guilabel>Projects</guilabel> node and click the
+						<guilabel>Projects</guilabel>sub-node. A table of currently defined Projects loads in the Working Area.</para>
+					</listitem>
+					<listitem>
+						<para>Go to the <guilabel>Projects</guilabel> table displayed in the	Working Area and click the <guibutton>Create New Project</guibutton> button.</para>
+						<para>The following controls appear in the Working Area:</para>
+
+						<figure id="ug_gsproject_creating_new_empty_shot1">
+							<title>New Project</title>
+							<screenshot>
+								<mediaobject>
+									<imageobject>
+										<imagedata fileref="help_home/screenshots/getstart/new_project_spec.png" format="PNG"/>
+									</imageobject>
+									<textobject>
+										<phrase>View of the new project wizard screen for a new empty project</phrase>
+									</textobject>
+									<caption>
+										<para>New empty project specification</para>
+									</caption>
+								</mediaobject>
+							</screenshot>
+						</figure>
+					</listitem>
+					<listitem>
+						<para>Fill in the fields as follows:</para>
+						<itemizedlist mark="bullet">
+							<listitem>
+								<para><guilabel>Project ID</guilabel>: Enter a unique identifier for the project. This value identifies the new Project
+								in the Polarion project database. <!-- TO DO: acceptable characters --></para>
+							</listitem>
+							<listitem>
+								<para><guilabel>Template</guilabel>: Select the desired template in the drop-down list. By default, there will be only
+									the <guilabel>Empty Project</guilabel> template available. If your administrator has added other project templates
+								to the system, these will appear in the drop-down list.</para>
+							</listitem>
+							<listitem>
+								<para><guilabel>Path</guilabel>: Enter a name for the root folder of the new project. <!-- TODO: What means project ID will be attached? --></para>
+							</listitem>
+						</itemizedlist>
+					</listitem>
+					<listitem>
+						<para>Click the <guibutton>Next</guibutton> button. The following appears in the Working Area:</para>
+						<figure id="ug_gsproject_creating_new_empty_shot2">
+							<title>New Project</title>
+							<screenshot>
+								<mediaobject>
+									<imageobject>
+										<imagedata fileref="help_home/screenshots/getstart/new_project_go.png" format="PNG"/>
+									</imageobject>
+									<textobject>
+										<phrase>View of the new project wizard screen for a new empty project</phrase>
+									</textobject>
+									<caption>
+										<para>Final project creation step</para>
+									</caption>
+								</mediaobject>
+							</screenshot>
+						</figure>
+					</listitem>
+					<listitem>
+						<para>In the <guilabel>Project Name</guilabel> field, enter a name for the new Project. This is the name that will appear
+						in the list of projects in the <guilabel>Projects</guilabel></para>
+					</listitem>
+					<listitem>
+						<para>Click the <guibutton>Create</guibutton> button to finish the operation and create the new Project and empty project folder in the repository.</para>
+					</listitem>
+				</orderedlist>
+			</sect3>
+
+			<sect3 id="ug_gsproject_creating_new_mark">
+				<title>Creating a new project by marking an existing repository folder</title>
+				<para>You many not always want to create a new Project in Polarion &quot;from scratch&quot;.
+				For example, you may have an existing folder structure in your Subversion repository that you want to start managing
+				with Polarion. In this case, you need to specify the root folder and tell Polarion
+				to &quot;mark&quot; it as a project folder.</para>
+
+				<para><emphasis>To create a new Project from an existing repository folder tree:</emphasis></para>
+				<orderedlist spacing="compact">
+					<listitem>
+						<para>Log into Polarion and click <guilabel>Administration</guilabel> in the perspective selector (bottom of
+						the left navigation. Recall that you must have global Administrator rights to access the Administration perspective.)</para>
+					</listitem>
+					<listitem>
+						<para>In the <guilabel>Projects</guilabel> portlet, click <guilabel>Repository</guilabel>.</para>
+					</listitem>
+					<listitem>
+						<para>In the <guilabel>Topics</guilabel> portlet, expand the <guilabel>Projects</guilabel> node and click the
+							<guilabel>Projects</guilabel>sub-node. A table of currently defined Projects loads in the Working Area.</para>
+					</listitem>
+					<listitem>
+						<para>Go to the <guilabel>Projects</guilabel> table displayed in the	Working Area and click the <guibutton>Mark Folder as Project</guibutton> button.</para>
+						<para>The following controls appear in the Working Area:</para>
+
+						<figure id="ug_gsproject_creating_new_mark_shot1">
+							<title>New Project</title>
+							<screenshot>
+								<mediaobject>
+									<imageobject>
+										<imagedata fileref="help_home/screenshots/getstart/new_project_mark.png" format="PNG"/>
+									</imageobject>
+									<textobject>
+										<phrase>View of the new project wizard screen for a new project based on an existing folder</phrase>
+									</textobject>
+									<caption>
+										<para>New project specification: specify the existing folder to mark as Project</para>
+									</caption>
+								</mediaobject>
+							</screenshot>
+						</figure>
+						</listitem>
+					<listitem>
+						<para>The repository root path appears to the left of an edit box. In the edit box, type the repository path to the folder you want to
+						mark as being a Project folder. Use forward slashes (/) to separate subfolders.</para>
+						<example>
+							<title>Repository Root Path</title>
+							<para>Given a repository root path of <filename>http://ourdomain.com/repos/</filename>, and an existing subfolder
+							<filename>projects/java/someproject</filename>, your entry would look something like:</para>
+							<para><literal>http://ourdomain.com/repos/</literal>[<userinput>projects/java/someproject</userinput>].</para>
+						</example>
+					</listitem>
+					<listitem>
+						<para>Click the <guibutton>Mark</guibutton> button to create the project based on the specified root folder.</para>
+					</listitem>
+				</orderedlist>
+			</sect3>
+        </sect2>
+
+        <sect2 id="ug_gsproject_accessing">
+            <title>Accessing Projects</title>
+            <para>All users have read access to Projects in Polarion. You may have write (change) as
+			well depending on your role on your team.</para>
+
+            <para><emphasis>To access a Project</emphasis></para>
+
+            <orderedlist numeration="arabic">
+				<listitem>
+					<para>Log in to Polarion.</para>
+				</listitem>
+				<listitem>
+					<para>If you are not already in the <guilabel>Projects</guilabel> perspective, click the <guimenuitem>Projects</guimenuitem>
+					perspective selector.</para>
+				</listitem>
+				<listitem>
+					<para>Select the Project you want to access in the <guilabel>Projects</guilabel> portlet.</para>
+				</listitem>
+			</orderedlist>
+
+            <para>If you have just logged in, you will be taken to the <guilabel>Dashboard</guilabel> Topic and the Project's Dashboards will load
+				in the Working Area. If you change Projects, the newly selected Project opens with the same Topic (e.g. Dashboard). </para>
+
+            <sect3 id="ug_gsproject_accessing_docs">
+				<title>Accessing Project documents</title>
+				<para>To access documents of the current project, expand the relevant Project node in the <guilabel>Projects</guilabel>
+				portlet and select the <guilabel>documents</guilabel> folder. The repository URL to the documents folder appears in the
+				Working Area. You can use this URL with the SVN command line or a SVN client to checkout the documents folder. If
+				documents exist in the <guilabel>documents</guilabel> folder, a table listing them appears beneath the URL in the
+				Working Area.</para>
+				<figure id="shot_project_docs">
+					<title>Documents Overview</title>
+					<screenshot>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="help_home/screenshots/proj_documents_oview.png" format="PNG"/>
+							</imageobject>
+							<textobject>
+								<phrase>Project documents overview</phrase>
+							</textobject>
+							<caption>
+								<para>Project documents overview</para>
+							</caption>
+						</mediaobject>
+					</screenshot>
+				</figure>
+				<note>
+					<title>Enterprise Edition Note</title>
+					<para><inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> While you can store documents in the project
+					repository in all Polarion editions, you can only edit them "live" in Polarion Enterprise Edition. For more information see
+					<link linkend="ug_reqmgmt_inception_livedocs">Working with Live Documents</link>.</para>
+				</note>
+			</sect3>
+
+            <sect3 id="ug_gsproject_accessing_wis">
+				<title>Accessing Project Work Items</title>
+				<para>"Work Item" is a general term applied to anything that needs to be worked on. Work Items include Requirements, Tasks,
+				Change Requests, Tests, and Defects.</para>
+				<para>For basic access to Work Items, click the <guilabel>Work Items</guilabel> topic in the <guilabel>Topics</guilabel> portlet
+				when the relevant Project is selected in the <guibutton>Projects</guibutton> portlet.</para>
+
+					<sect4 id="ug_gsproject_accessing-wis_views">
+					<title>Work Item Views</title>
+					<para>The Working Area presents several views on Work Items. These appear as a tab set:</para>
+					<figure id="gs-projects-access-wi_views_shot1">
+						<title>Work Items</title>
+						<screenshot>
+							<mediaobject>
+								<imageobject>
+									<imagedata fileref="help_home/screenshots/getstart/wi_view_tabs.png" format="PNG"/>
+								</imageobject>
+								<textobject>
+									<phrase>Shows the Work Item view tabs in the Working Area</phrase>
+								</textobject>
+								<caption>
+									<para>Work Item view tabs in the Working Area</para>
+								</caption>
+							</mediaobject>
+						</screenshot>
+					</figure>
+					<para>The names of the tabs describe the format or functionality of the views.</para>
+					<itemizedlist mark="bullet">
+						<listitem>
+							<para><emphasis role="bold">Table</emphasis>: Displays a table of Work Items accessed by the current navigation selection and/pr query.</para>
+						</listitem>
+						<listitem>
+							<para><emphasis role="bold">Tree</emphasis>: Displays a table of Work Items accessed by the current navigation selection and/or Search query in a tree
+							structure that shows related Work Items up to 10 levels deep.</para>
+						</listitem>
+						<listitem>
+							<para><emphasis role="bold">Live Plan</emphasis>: Presents a Live Plan of just the Work Items accessed by the current navigation selection and/or search query.
+							You can select a Work Item in the chart and edit it in the detail area.</para>
+						</listitem>
+						<listitem>
+							<para><emphasis role="bold">Road Map</emphasis>: Presents a table of Work Items selected by the current navigation and/or search query. You can
+							further filter the selection according to Time Point.</para>
+						</listitem>
+						<listitem>
+							<para><inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> <emphasis role="bold">Matrix</emphasis>: Enables you to trace links between Work Items. You create two system queries:
+							one for Rows and one for Columns of the matrix. With the search results you can specify the relationship you want to see
+							in the results: dependency, duplication, relativity, etc.</para>
+						</listitem>
+						<listitem>
+							<para><emphasis role="bold">Multi Edit</emphasis>: Places all Work Items in the current navigation or query selection into edit mode in which
+							the main data fields can be edited.</para> <!-- TO DO: Link -->
+						</listitem>
+						<listitem>
+							<para><emphasis role="bold">Bulk Edit</emphasis>: Presents a single editor pane in which you can edit Work Item fields and apply your changes
+							to all the work items currently selected by the current navigation or search query.</para>
+						</listitem>
+					</itemizedlist>
+				</sect4>
+
+				<sect4 id="ug_gsproject_accessing_wis_filter">
+					<title>Using queries and shortcuts</title>
+					<para>You can use queries and Shortcuts to filter the list of Work Items.</para>
+					<itemizedlist mark="bullet">
+						<listitem>
+							<para>You can filter the Work Item view for a particular type of Work Item by clicking on the one of the sub-topics
+							of the <guilabel>Work Items</guilabel> topic ( in the <guilabel>Topics</guilabel> portlet).</para>
+						</listitem>
+						<listitem>
+							<para>You can use certain Shortcuts in the <guilabel>Shortcuts</guilabel> portlet to filter the list of Work Items. For
+							example, the <guilabel>My Work Items</guilabel> shortcut limits the display to only Work Items assigned to you.</para>
+						</listitem>
+						<listitem>
+							<para>You can further refine any view with a query. The parameters of the current query are always shown beneath the
+							view tabs. You can use any of the controls to customize the current query to further filter the Work Items shown.</para>
+						</listitem>
+					</itemizedlist>
+					<tip>
+						<para>You can save the results of any query and the current state of a view as a Shortcut by clicking the <guiicon>Save As Shortcut</guiicon>
+						icon in the Search bar of the Working Area.</para>
+						<para>Saving a shortct stores the selected view tab, all query parts, table columns, and table sorting.</para>
+						<para>You can customize existing shortcuts with the <guiicon>Customize</guiicon> icon located on the title bar of the
+						<guilabel>Shortcuts</guilabel> portlet.</para>
+					</tip>
+				</sect4>
+			</sect3>
+        </sect2>
+
+        <sect2 id="ug_gsproject_export">
+            <title>Exporting to MS Project</title>
+            <para><inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> Microsoft Project Export is a feature of Polarion Enterprise Edition only.</para>
+			<para>You can export an entire Project, or any subset of the Work Items comprising it, to various Microsoft formats, including
+			MS Office Word, MS Office Excel, and Microsoft Project.</para>
+			<figure id="ug_gsproject_export_shot1">
+				<title>Export</title>
+				<screenshot>
+					<mediaobject>
+						<imageobject>
+							<imagedata fileref="help_home/screenshots/getstart/ms_project_export.png" format="PNG"/>
+						</imageobject>
+						<textobject>
+							<phrase>Shows the interaction and result of export to MS Project.</phrase>
+						</textobject>
+						<caption>
+							<para>Exporting a Project to Microsoft Project</para>
+						</caption>
+					</mediaobject>
+				</screenshot>
+			</figure>
+			<para><emphasis>To export a Project:</emphasis></para>
+			<orderedlist numeration="arabic">
+				<listitem>
+					<para>Be sure you are working in the Project you want to export it should be selected in the <guilabel>Projects</guilabel> portlet
+					in the left Main Navigation panel.</para>
+				</listitem>
+				<listitem>
+					<para>If you want to export the entire Project, select the <guilabel>Work Items</guilabel> node in the <guilabel>Topics</guilabel> portlet.
+					If you want to export a subset of the Project, select an appropriate Shortcut in the <guilabel>Topics</guilabel> portlet or execute an appropriate
+					saved query or custom query built with the Query Builder (accessed in the Working Area's Search bar).</para>
+				</listitem>
+				<listitem>
+					<para>Click the <guibutton>Operations</guibutton> action button and select <guimenuitem>Export</guimenuitem> in the action menu.
+					A browser popup window appears.</para>
+				</listitem>
+				<listitem>
+					<para>Select the desired target format, character set, and use the checkboxes in the data columnns list to choose which data you want to export.</para>
+				</listitem>
+				<listitem>
+					<para>Click the <guibutton>Download</guibutton> button and choose the location to save the data file on your local system.
+					The selected data is saved in an appropriate XML format which you can subsequently open in the relevant Microsoft application.</para>
+				</listitem>
+			</orderedlist>
+			<sect3 id="ug_gsproject_export_opening_exported">
+				<title>Opening the exported file in MS Project</title>
+				<para>The xml file that is created as a result of the <guimenuitem>Export to MS Project</guimenuitem> action should <emphasis role="bold">not</emphasis> be renamed
+				with a .mpp extension before opening it in MS Project.</para>
+				<para>There are 2 ways to open the exported file in MS Project:</para>
+				<itemizedlist mark="bullet">
+					<listitem>
+						<para>Using Windows Explorer context menu</para>
+					</listitem>
+					<listitem>
+						<para>Using MS Project File menu</para>
+					</listitem>
+					<listitem>
+						<para></para>
+					</listitem>
+				</itemizedlist>
+				<para><emphasis>To open the exported file using Windows Explorer:</emphasis></para>
+				<orderedlist numeration="arabic">
+					<listitem>
+						<para>Selecting the exported file in Windows Explorer</para>
+					</listitem>
+					<listitem>
+						<para>Right-click on the file and choose <guimenuitem>Open in</guimenuitem> on the context menu, followed by <guimenuitem>MS Project</guimenuitem> on the submenu;</para>
+					</listitem>
+				</orderedlist>
+				<para>To open the exported file from MS Project:</para>
+				<orderedlist numeration="arabic">
+					<listitem>
+						<para>Open MS Project.</para>
+					</listitem>
+					<listitem>
+						<para>Open the Open File dialog.</para>
+					</listitem>
+					<listitem>
+						<para>Choose <guimenuitem>xml format</guimenuitem>, select the xml file, and click <guibutton>Open</guibutton>.</para>
+					</listitem>
+					<listitem>
+						<para>Choose the <guilabel>As new project</guilabel> option.</para>
+					</listitem>
+				</orderedlist>
+			</sect3>
+        </sect2>
+    </sect1>
+
+    <!--
+            WORK ITEMS TOPICS:
+    -->
+
+    <sect1 id="ug_wi_basics">
+        <title>Work Item Basics</title>
+        <?dbhtml filename="ug_workitem_basics.html"?>
+        <para>This section provides and introduction to the basics of handling Work Items in Polarion.</para>
+
+        <sect2 id="ug_wibasics_witypes">
+            <title>Work Item Types</title>
+            <para>A Work Item is the Polarion term for an artifact of the development process that is waiting to be implemented, is
+                in progress, or has been implemented.
+                The default types of Work Items are:</para>
+            <itemizedlist mark="bullet">
+                <listitem>
+                    <para>Requirement</para>
+                </listitem>
+                <listitem>
+                    <para>Task</para>
+                </listitem>
+                <listitem>
+                    <para>Change Request</para>
+                </listitem>
+                <listitem>
+                    <para>Defect</para>
+                </listitem>
+            </itemizedlist>
+
+            <para>Work Item types are user defined. The default types can be changed and/or new types can be defined by an Administrator.
+                For more information, see Configuring Enumerations in the
+                Administrator's Guide.</para>
+
+            <para>Using the respective data fields for the purpose, a Work Item can be assigned to someone, and incorporated into Project planning and tracking..</para>
+        </sect2>
+
+        <sect2 id="ug_wibasics_browse_search">
+            <title>Browsing and Searching Work Items</title>
+            <para>Every Work Item is part of a Project, and is planned and tracked with the Project. If a Work Item has dependencies with another project, it is possible
+			to show this using the Link feature.</para>
+			<para>You can browse the Work Items in any project in different Views (tabs) in the Working Area: Table, Tree, Live Plan, <inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> Matrix, etc.
+			Some Views are mainly just listings while others show relationships to time (Live Plan) or other items (Tree, <inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> Matrix).</para>
+			<para>To browse Work Items, select the Project in the <guilabel>Projects</guilabel> list of the <guilabel>Projects</guilabel>
+			perspective, the select the tab for the desired view in the Working Area.</para>
+			<para>When you select a Work Item, its detail appears in the lower half of the Working Area and different portlets in that
+			pane display information about the Work Item such as priority, status, who it's assigned to, when it is (or was) started, when it will be (or was)
+			completed, etc.</para>
+			<sect3 id="ug_wibasics_browse_search_searching">
+				<title>Searching</title>
+                <para>Polarion provides robust query-based searching. Every View and every data display is actually the result of some
+				underlying query. There are a number of predefined queries that you can use to quickly locate and isolate a subset of all the Work Items in a
+				Project. These are saved as <link linkend="ug_gsproject_accessing_wis_filter"><emphasis>Shortcuts</emphasis></link>, which appear in the <guilabel>Shortcuts</guilabel>
+				portlet (main Navigation panel). Shortcuts are unique in that they are a combination of a View and a query. For example, a Shortcut
+				might access a set up Work Items and show them in the Tree view. You can create your own Search queries and
+				<link linkend="ug_gsproject_accessing_wis_filter">save them as Shortcuts</link>.</para>
+
+				<para>Each View tab in the Working displays a <guilabel>Search</guilabel> bar that you can use to create Search queries to locate the
+				Work Items you want to see. An example is shown in the following figure:</para>
+				<figure id="ug_wibasics_browse_search_shot1">
+					<title>Search Bar</title>
+					<screenshot>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="help_home/screenshots/getstart/wi_view_tabs.png" format="PNG"/>
+							</imageobject>
+							<textobject>
+								<phrase>Shows the Search bar in the Tree view of the Working Area.</phrase>
+							</textobject>
+							<caption>
+								<para>Search bar (as it appears in the Tree view)</para>
+							</caption>
+						</mediaobject>
+					</screenshot>
+				</figure>
+				<sect4 id="ug_wibasics_browse_search_querybuilder">
+					<title>Using the Query Builder</title>
+					<para>Search queries can range from simple to complex depending on what subset of Work Items you want to find. If you
+					need something that is not provided by the default Views and Shortcuts, you can create a custom Search query using the Query Builder
+					feature which enables you to build complex queries visually.</para><!-- TO DO Section on Query Builder + screenshot -->
+					<para>You can access the Query Builder from the <guilabel>and</guilabel> field of the Search bar. Drop down the list and select
+					the <guimenuitem>Query Builder</guimenuitem> item in the list.</para>
+					<figure id="ug_wibasics_browse_search_querybuilder_shot1">
+						<title>Query Builder</title>
+						<screenshot>
+							<mediaobject>
+								<imageobject>
+									<imagedata fileref="help_home/screenshots/getstart/query_builder_access.png" format="PNG"/>
+								</imageobject>
+								<textobject>
+									<phrase>Shows how to access the Query Builder.</phrase>
+								</textobject>
+								<caption>
+									<para>How to access the Query Builder</para>
+								</caption>
+							</mediaobject>
+						</screenshot>
+					</figure>
+				</sect4>
+			</sect3>
+            <sect3 id="gs-workitems_ops_stored_queries">
+				<title>Stored and shared queries</title>
+				<para>Queries are what fetches the Work Items that display in the Work Item tables and other views. Useful queries can be saved
+				and reused in several ways. As mentioned in <link linkend="ug_gsproject_accessing_wis_filter">Shortcuts</link>, your
+				most commonly reused queries can be saved as Shortcuts to make them accessible from the <guilabel>Shortcuts</guilabel>
+				portlet. But you can store and share other queries which are accessible from the Search bar's <guilabel>and</guilabel> field.
+				Queries can be global in scope or limited to the scope of one Project or even just yourself as a user.</para>
+				<sect4 id="gs-workitems_ops_stored_queries_access">
+					<title>Accessing stored/shared queries</title>
+					<para>The drop-down list in the Search bar's <guilabel>and</guilabel> field provides access to all currently saved/shared queries.</para>
+					<figure id="gs-workitems-stored-queries_ss">
+						<title>Stored Queeries</title>
+						<screenshot>
+							<mediaobject>
+								<imageobject>
+									<imagedata fileref="help_home/screenshots/getstart/queries_saved_shared.png" format="PNG"/>
+								</imageobject>
+								<textobject>
+									<phrase>Shows the access to stored/shared queries for all scopes.</phrase>
+								</textobject>
+								<caption>
+									<para>Accessing stored/shared queries</para>
+								</caption>
+							</mediaobject>
+						</screenshot>
+					</figure>
+				</sect4>
+            </sect3>
+        </sect2>
+
+        <sect2 id="ug_wibasics_create_edit">
+            <title>Creating and Editing Work Items</title>
+            <para>This section provides a quick overview on how to create a new Work Item and how to edit an existing Work Item.</para>
+			<sect3 id="ug_wibasics_create_edit_creating">
+				<title>Creating New Work Items</title>
+				<para>Work Items can be created in the system in two ways:</para>
+				<itemizedlist mark="bullet">
+					<listitem>
+						<para>Manually</para>
+					</listitem>
+					<listitem>
+						<para>Using Live Documents</para>
+					</listitem>
+				</itemizedlist>
+				<para>This section discusses manual creation. For information about Live Documents see <link linkend="ug_reqmgmt_inception_livedoc_new">Working with Live Documents</link>.</para>
+				<para><emphasis>To create a new Work Item</emphasis></para>
+				<orderedlist numeration="arabic">
+					<listitem>
+						<para>Make sure you are working in the <guilabel>Projects</guilabel> perspective, and have selected the Project the new Work Item
+						should belong to in the <guilabel>Projects</guilabel> portlet.</para>
+					</listitem>
+					<listitem>
+						<para>In the <guilabel>Topics</guilabel> portlet, click the <userinput>Work Items</userinput> node.</para>
+					</listitem>
+					<listitem>
+						<para>In the Working Area, select the <guilabel>Table</guilabel> view. A table of the currently existing Work Items in this Project
+						appears in the upper half of the Working Area.</para>
+					</listitem>
+					<listitem>
+						<para>In the Working Area, click the <guilabel>Create</guilabel> action button, and select the type of Work Item you want to create from
+						the drop-down menu. <!-- TO DO: Check this interaction for accuracy --></para>
+					</listitem>
+					<listitem>
+						<para>Follow the next sequence of screens (similar to a "wizard") to create the new Work Item.</para>
+					</listitem>
+				</orderedlist>
+			</sect3>
+			<sect3 id="ug_wibasics_create_edit_editing">
+				<title>Editing Work Items</title>
+				<para>You can edit existing Work Items either singly or several at a time (Bulk Edit). The latter is useful for such tasks as assigning
+				multiple Work Items to the same person, or setting the same status, priority, or start/end date for several items. </para>
+				<sect4 id="ug_wibasics_create_edit_editing_bulk">
+					<title>Editing multiple Work Items at once</title>
+					<para>The <guilabel>Bulk Edit</guilabel>	view tab in the Working Area enables you to select multiple Work Items and
+					edit them as a unit. When you save the changes, the  field values are applied to all selected Work Items.</para>
+					<para>The Work Items that appear in the Bulk Edit view vary according to the current system query. You can use Shortcuts,
+					saved or custom Search queries to isolate or narrow the subset of Work Items you want to edit all at once.</para>
+					<para><emphasis>To selected and edit multiple Work Items:</emphasis></para>
+					<orderedlist numeration="arabic">
+						<listitem>
+							<para>Make sure you are working in the correct Project, and in the <guilabel>Work Items</guilabel> topic in that project.</para>
+						</listitem>
+						<listitem>
+							<para>Select the <guilabel>Bulk Edit</guilabel> view tab in the Work Area. A table of Work Items appears in the upper pane. The list
+							of Work Items Depends on the current system query.</para>
+						</listitem>
+						<listitem>
+							<para>Use shortcuts or the Search feature (including the Query Builder if needed) so that the results contain all the Work Items you
+							want to edit.</para>
+						</listitem>
+						<listitem>
+							<para>The leftmost columnn of Work Items table now contains a checkbox. Check this box for
+							each Work Item you want to edit.</para>
+							<tip>
+								<para>You can select or deselect all the items in the table by checking or clearing the checkbox in the header
+								of this columnn.</para>
+							</tip>
+						</listitem>
+						<listitem>
+							<para>Go to the Work Item detail pane (lower half of the Working Area). Check the box next to each field you
+							want to edit, then change the field value as desired. If the field is not available for Bulk Edit, the checkbox next
+							to the field is disabled and you will not be able to change the field value.</para>
+						</listitem>
+						<listitem>
+							<para>Click the <guibutton>Submit</guibutton> button to save your changes and apply them to all the selected Work Items.</para>
+						</listitem>
+					</orderedlist>
+					<figure id="ug_wibasics_create_edit_editing_bulk_shot1">
+						<title>Bulk Edit</title>
+						<screenshot>
+							<mediaobject>
+								<imageobject>
+									<imagedata fileref="help_home/screenshots/getstart/wi_bulk_edit.png" format="PNG"/>
+								</imageobject>
+								<textobject>
+									<phrase>Shows the Work Item selection for Bulk Edit, and the single editor for all selected items.</phrase>
+								</textobject>
+								<caption>
+									<para>Bulk Editing multiple Work Items</para>
+								</caption>
+							</mediaobject>
+						</screenshot>
+					</figure>
+					<note>
+						<para>Linked Work Items do not appear in the list of items in Bulk Edit, but you still can use Bulk Edit to remove linked
+						Work Items by entering the ID of a linked Work Item in the input field of the <guilabel>Linked Work Items</guilabel> portlet
+						and clicking on the <guiicon>-</guiicon> (minus) icon. You can use the "Workitem Picker" (by pressing [select]) to find the
+						Work Item if you don't remember its ID.</para>
+					</note>
+				</sect4>
+				<sect4 id="gs-workitems_editing_multiedit">
+					<title>Using Multi Edit View</title>
+					<para>The <guilabel>Multi Edit</guilabel> view also enable you to edit multiple work items, but it differs from <guilabel>Bulk Edit</guilabel>.
+					With <guilabel>Bulk Edit</guilabel>, you have a single editor pane and changes are applied to multiple Work Items. With Multi Edit,
+					all Work Items accessed by the current system query are editable in a single editor space in the Work Area. You edit a single Work Item at
+					a time, but all items are editable and changes to multiple items can be saved all at once. You can edit the
+					main data fields in this view, but not everything. For example, you can't create links or edit watchers.</para>
+                    <para><inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> Multi Edit is a feature of
+                     Polarion for Subversion Enterprise Edition.</para>
+                </sect4>
+			</sect3>
+        </sect2>
+
+        <sect2 id="ug_wibasics_common_ops">
+            <title>Common Operations with Work Items</title>
+            <para>This section covers several common things that people need to do with Work Items.</para>
+
+            <sect3 id="ug_wibasics_commonops_assign">
+                <title>Assigning a Work Item</title>
+                <para>You assign a Work Item to a person using the <guilabel>Assignee</guilabel> field in the Work Item detail. This field
+				presents a drop-down list of all Polarion users. You assign the selected Work Item (or Items, if
+				working in Bulk Edit view) by selecting the user's name from the list. Note that the assignee must have an account on your
+				Polarion system in order to appear in the <guilabel>Assignee</guilabel> list. (It can be easy to omit setting up accounts
+                for e.g. a domain expert who is not on the engineering team but who needs to be assigned a Requirement.)</para>
+            </sect3>
+
+            <sect3 id="ug_wibasics_commonops_status">
+                <title>Changing a Work Item's status</title>
+                <para>You can initiate a change of status for a selected Work Item directly in the detail pane without entering Edit mode. The
+				<guilabel>Status</guilabel> field has a drop-down list that displays a choice of <systemitem>Workflow Actions</systemitem>.
+				These are configured by the Polarion administrator and are what actually changes the status value of the item according to the
+                configured status and status transition definitions. (See Administrator's Guide: Workflow)
+                for	more information.</para>
+
+				<para>Selecting a new Workflow Action (<guimenuitem>Resolve and Close</guimenuitem>, for example), triggers Edit mode, where you
+				can add a comment, set a value for <guilabel>Resolution</guilabel>, edit linked Work Items, etc. When you click the
+				<guibutton>Update</guibutton>, the Workflow Action sets the appropriate status value which subsequently appears in the user interface. </para>
+            </sect3>
+
+            <sect3 id="ug_wibasics_commonops_commenting">
+                <title>Adding Comments to a Work Item</title>
+                <para>[PLACEHOLDER]</para>
+            </sect3>
+
+            <sect3 id="ug_wibasics_commonops_attach">
+                <title>Attaching files to a Work Item</title>
+                <para>[PLACEHOLDER]</para>
+            </sect3>
+
+            <sect3 id="ug_wibasics_commonops_vote">
+                <title>Voting</title>
+                <para>[PLACEHOLDER]</para>
+            </sect3>
+
+            <!-- PLANNING CONSTRAINTS -->
+            <!-- TODO Check if this is OK here or needs to move to Project Manager section -->
+            <!--  This appears at this point in 2.0 docs that's why it's here for now. -->
+            <sect3 id="ug_wibasics_commonops_plan_constraints">
+                <title>Setting Planning Constraints</title>
+                <para>The <guilabel>Planning constraint</guilabel> field enables you to fix the planned start or end date for a Work Item. The
+					date you specify is reflected in the Live Plan.</para> <!-- TODO Check if need a link to Live Plan info -->
+				<figure id="ug_wibasics_commonops_plan_constraints_shot1">
+					<title>Setting Planning Constraints</title>
+					<screenshot>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="help_home/screenshots/getstart/wi_planning_const.png" format="PNG"/>
+							</imageobject>
+							<textobject>
+								<phrase>Shows the Planning Constraint field and popup date picker</phrase>
+							</textobject>
+							<caption>
+								<para>Planning constraint field and popup date picker</para>
+							</caption>
+						</mediaobject>
+					</screenshot>
+				</figure>
+				<important>
+					<para>You will not see relevant planning results for unassigned and unestimated Work Items.</para>
+				</important>
+				<sect4 id="ug_wibasics_commonops_plan_constraints_liveplan">
+					<title>Planned items in the Live Plan</title>
+					<para>When the <guilabel role="label">Planning Constraint</guilabel> and <guilabel role="label">Due Date</guilabel> fields are
+					set, the Work Item spans the defined time period in the Live Plan view. The popup detail (when you click on the Work Item in the
+					Live Plan view) includes Planned Start Date and Planned End Date and Remaining Information.</para>
+				</sect4>
+            </sect3>
+
+            <!--  PRINTING -->
+            <sect3 id="ug_wibasics_commonops_printing">
+                <title>Printing a Work Item</title>
+                <para>You can print one or multiple selected Work Items to any printer to which your computer has access.  You can select a single Work Item
+					for printing in the Table, Tree, Live Plan, or Road Map views. You can select multiple Work Items for print in the Bulk Edit view.</para>
+				<para><emphasis>To print Work Items:</emphasis></para>
+				<orderedlist numeration="arabic">
+					<listitem>
+						<para>Select the Work Item(s) you want to print in the appropriate view.</para>
+					</listitem>
+					<listitem>
+						<para>Locate the action button labeled <guilabel>Operations</guilabel> and click it to drop down a menu of actions.</para>
+					</listitem>
+					<listitem>
+						<para>Choose <guimenuitem>Print</guimenuitem> in the <guilabel>Operations</guilabel> action list.</para>
+					</listitem>
+					<listitem>
+						<para>Your system print dialog appears. Choose the target printer in this dialog, set desired print job properties if your
+						print dialog provides this functionality, and launch the print job.</para>
+					</listitem>
+				</orderedlist>
+            </sect3>
+        </sect2>
+
+        <!-- LINKING -->
+        <sect2 id="ug_wibasics_linking">
+            <title>Linking Work Items</title>
+            <para>Linking Work Items is the key to being able to take advantage of <inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/>
+            Polarion Enterprise Edition's  Traceability 	and Impact Analysis features. Your team should plan and follow a process of linking Work Items from the outset.</para>
+            <para>Generally speaking, you want to create links from Requirements to the Tasks and/or Change Requests that fulfill them,
+            and also links from Tasks/Change Requests to the repository revision in which they are implemented. By doing this, your
+            team will have several key advantages with Polarion:</para>
+            <itemizedlist mark="bullet">
+                <listitem>
+                    <para>Possibility to trace from Requirements to the Work Items and code that fulfill them</para>
+                </listitem>
+                <listitem>
+                    <para>Possibility to backtrace from e.g. defective code (in a repository revision) to the Tasks/Change Requests that implemented
+                    the defective code, and from those to the Requirement that called for the functionality.</para>
+                </listitem>
+                <listitem>
+                    <para>Possibility to assess the impact (and by extension, the cost) of a changed Requirement by seeing all the artifacts
+                    that would be affected by the change.</para>
+                </listitem>
+                <listitem>
+                    <para>Possibility to view and analyze various relationships between Work Items such as dependency, relatedness, parent-child,
+                        duplication, and follow-up.</para>
+                </listitem>
+            </itemizedlist>
+            <para>This section describes the basic techniques for creating Links. There are basically 3 ways to do it:</para>
+            <orderedlist numeration="arabic" spacing="compact">
+                <listitem>
+                    <para>Create links while editing an <link linkend="gs-workitems_linking_indiv">individual Work Item</link>.</para>
+                </listitem>
+                <listitem>
+                    <para>Create links for <link linkend="gs-workitems_linking_bulk">multiple Work Items</link> at once using Bulk Edit.</para>
+                </listitem>
+                <listitem>
+                    <para>Create links using the <inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> <link linkend="gs-workitems_linking_matrix">Matrix View</link>.</para>
+                </listitem>
+            </orderedlist>
+			<sect3 id="gs-workitems_linking_indiv">
+                <title>Linking individual Work Items</title>
+                <para>In the Work Item detail pane you can click the <guibutton>Links</guibutton> button to auto-scroll the view to the
+                link portlets: <guilabel>Linked Repository Revisions</guilabel> and <guilabel>Linked Work Items</guilabel>. Use the
+                small <guibutton>Add</guibutton> in either or these portlets to open the link editor in which you can select the revision
+                or Work Item you want to link to the current Work Item.</para>
+                <figure id="shot1">
+                    <title>Link Portlets</title>
+                    <screenshot>
+                        <mediaobject>
+                            <imageobject>
+                                <imagedata fileref="help_home/screenshots/getstart/wi_link_create.png" format="PNG"/>
+                            </imageobject>
+                            <textobject>
+                                <phrase>Shows the portlets for link creation in read and edit modes</phrase>
+                            </textobject>
+                            <caption>
+                                <para>Link portlets in read mode and edit mode.</para>
+                            </caption>
+                        </mediaobject>
+                    </screenshot>
+                </figure>
+            </sect3>
+            <sect3 id="gs-workitems_linking_bulk">
+                <title>Linking multiple Work Items at once</title>
+                <para>The technique in Bulk Edit is the same as for single Work Items (see previous screenshot). The same portlets exist in the
+                bulk editor. The difference is that you can create the same link(s) to multiple selected Work Items in a single operation.</para>
+            </sect3>
+            <sect3 id="gs-workitems_linking_matrix">
+                <title>Using the Matrix view to create and browse links</title>
+                <para><inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> Traceability Analysis is a feature of Polarion Enterprise Edition only.</para>
+                <para>The Matrix view provides a robust way to both create and browse links. The matrix is populated with 2 subsets of
+                Work Items, one for matrix rows, and one for columnns. Each subset is built with a query in the special dual version of
+                the Search bar. Each query can access either Work Items or repository revisions, so the matrix can show links between
+                Work Items only, or between Work Items and repository revisions. Work Item queries can also filter for link Role-
+                "depends on" or "related to", for example.</para>
+                <para>When the matrix has been populated, the intersection of each row and columnn shows if there is an existing link
+                between the items in that row/column, and provides the possibility to create one if none currently exists. Existing
+                links show and arrow in the intersection indicating the direction of the link. Clicking on the intersection pops up
+                details about the link.</para>
+
+                <figure id="gs-workitems_linking_matrix_shot1">
+                    <title>Matrix View Search</title>
+                    <screenshot>
+                        <mediaobject>
+                            <imageobject>
+                                <imagedata fileref="help_home/screenshots/matrix_queries_link_details.png" format="PNG"/>
+                            </imageobject>
+                            <textobject>
+                                <phrase>Shows the Matrix view with dual Search queries and link details.</phrase>
+                            </textobject>
+                            <caption>
+                                <para>Matrix view showing dual Search queries and popup link details</para>
+                            </caption>
+                        </mediaobject>
+                    </screenshot>
+                </figure>
+
+				<para>Refer to the screenshot below when following the procedure to create a link using the Matrix view:</para>
+				<figure id="gs-workitems_linking_matrix_shot2">
+					<title>Matrix View Toolbar</title>
+					<screenshot>
+						<mediaobject>
+							<imageobject>
+								<imagedata fileref="help_home/screenshots/matrix_create_link.png" format="PNG"/>
+							</imageobject>
+							<textobject>
+								<phrase>Shows the toolbar and matrix in mode for link creation</phrase>
+							</textobject>
+							<caption>
+								<para>Matrix toolbar in link creation mode</para>
+							</caption>
+						</mediaobject>
+					</screenshot>
+				</figure>
+				<para><emphasis>To create a link in the Matrix view:</emphasis></para>
+				<orderedlist numeration="arabic">
+					<listitem>
+						<para>Populate the rows and columnns of the matrix by building queries that will display the source and target Work Items
+						(or Work Items and repository revisions) in the matrix rows and columnns.</para>
+					</listitem>
+					<listitem>
+						<para>Toggle Link mode by clicking the Link Mode button in the toolbar (see screenshot).</para>
+					</listitem>
+					<listitem>
+						<para>In the <guilabel>Role</guilabel> combobox, select a role for the link.</para>
+					</listitem>
+					<listitem>
+						<para>Select the directionality of the link using the <guilabel>Direction</guilabel> buttons.</para>
+						<tip>
+							<para>You can do this step either before or after creating the link in the matrix (see next step).</para>
+						</tip>
+					</listitem>
+					<listitem>
+						<para>Locate the intersection of the Work Items you want to link (or the Work Item and the repository revision you want to
+							link, and click on that cell. A green arrow appears in the cell showing the directionality of the link. The actual link is not yet created.</para>
+					</listitem>
+					<listitem>
+						<para>Click the <guibutton>Submit</guibutton> to create the link. The green arrow in the cell changes to black.</para>
+					</listitem>
+				</orderedlist>
+            </sect3>
+
+            <sect3 id="wi_planning_links">
+                <title>How Links are handled in Live Plan</title>
+                <para>There are 2 kinds of links recognized by the Live Plan feature: <systemitem>depends</systemitem> and <systemitem>parent</systemitem>. The <filename>planning.xml</filename>
+                file in Administration assigns existing Work Item link roles to these two categories. (Links with roles which are of neither the <systemitem>depends</systemitem> nor the
+                <systemitem>parent</systemitem> kind are ignored by Live Plan).</para>
+                <sect4 id="wi_planning_depend">
+                    <title>Dependencies</title>
+                    <para>The dependent Work Item always links to the one it depends on. For example, if A depends on B, then A holds the link: B &lt;-- A. This kind of link ensures
+                    that A does not start before B ends. However, this does not influence the planning of B. Consider the situation when High priority task A depends on Low priority task B.
+                    Task A will be planned after task B.</para>
+                </sect4>
+                <sect4 id="wi_planning_parent">
+                    <title>Parents</title>
+                    <para>Children always link to the parent.  Therefore the 'contains' link role should not be used; the 'parent' role with the opposite direction should be used instead.
+                    The Live Plan always shows only the leaf nodes of the containment hierarchy. for example, if Requirement has child Tasks, then just the Tasks are shown, not the
+                    Requirement. The parent's planned start/end are calculated as the minimum/maximum of its children's planned starts/ends values. The Remaining/Initial Estimate value
+                    of the parent are not taken into account in this case.</para>
+               </sect4>
+            </sect3>
+        </sect2>
+
+        <sect2 id="ug_wibasics_export">
+				<title>Exporting Work Items</title>
+				<para>You can export one or multiple selected Work Items to an office document (MS Word or MS Excel).  You can select a single Work Item
+				for export in the Table, Tree, Live Plan, or Road Map views. You can select multiple Work Items for export in the Bulk Edit view.</para>
+				<para><emphasis>To export Work Items to a document:</emphasis></para>
+				<orderedlist numeration="arabic">
+					<listitem>
+						<para>Select the Work Item(s) you want to export in the appropriate view.</para>
+					</listitem>
+					<listitem>
+						<para>Locate the action button labeled <guilabel>Operations</guilabel> and click it to drop down a menu of actions.</para>
+					</listitem>
+					<listitem>
+						<para>Choose <guimenuitem>Export</guimenuitem> in the <guilabel>Operations</guilabel> action list.</para>
+					</listitem>
+					<listitem>
+						<para>Specify the type of document and the local path for saving it</para>
+					</listitem>
+				</orderedlist>
+				<note>
+					<title>Note about exported documents</title>
+					<para>Documents created by export are not <link linkend="ug_reqmgmt_inception_livedocs">Live Documents</link>, nor are they automatically added to
+					the repository- they are just documents stored on your local system. You cannot edit exported documents in Polarion
+					or track and manage them in Polarion unless you explicitly add them to a Subversion repository managed with Polarion.</para>
+				</note>
+			</sect2>
+    </sect1>
+
+    <sect1 id="ug_reqts_mgmt">
+        <title>Managing Requirements</title>
+        <?dbhtml filename="ug_reqts_mgmt.html"?>
+        <para>This chapter covers Polarion's Requirements Management features and functionality, including the exclusive
+        <emphasis>Live Documents</emphasis> feature.</para>
+
+        <sect2 id="ug_reqts_mgmt_overview">
+            <title>Overview of Capabilities</title>
+            <para>Polarion supports the 3 typical phases of the Requirements engineering process:</para>
+            <itemizedlist mark="bullet">
+                <listitem>
+                    <para>Inception</para>
+                </listitem>
+                <listitem>
+                    <para>Discussion/revision</para>
+                </listitem>
+                <listitem>
+                    <para>Approval</para>
+                </listitem>
+            </itemizedlist>
+            <para>Typically, managers and domain experts who define requirements prefer to work from the basis of office documents
+            such as <trademark>Microsoft Word</trademark> documents or <trademark>Microsoft Excel</trademark> worksheets. However,
+            the Engineering side needs a database-driven solution to be able to manage the complexity of their work. Traditionally,
+            one or the other, or both of these equally essential team components were forced to compromise for a less-than-optional
+            solution. Either domain experts were forced to learn an unfamiliar software system which did not support their mental
+            model in order to write up Requirements, or engineers were forced to deal with document-based requirements and the
+            resulting inefficiencies (for them).</para>
+
+            <para>Polarion provides a workable compromise for both sets of stakeholders through its
+            unique <emphasis>Live Document</emphasis> technology. Managers and other domain experts can, at their option, work
+            with familiar office documents to author requirements. Using special Live Document templates provided with
+            Polarion, authors' Requirements are automatically recognized by Polarion,
+            and relevant Work Items are created in the system. The Engineering side can use all the features of Polarion
+            to track and manage the Work Items. Any changes made to the Work Items are automatically reflected in the relevant
+            Live Document. This facilitates the review/approval process, as the Requirements authors, managers, domain experts, etc.
+            can review the Live Document (which they can download and read locally). If they in turn make changes to the Requirements,
+            by checking the Live Document in to Polarion, new Work Items are created, and existing Work
+            Items are updated automatically. In this way, all stakeholders in the Requirements Engineering and Management process
+            can work with the tools and in the environments that make them most productive.</para>
+        </sect2>
+
+        <sect2 id="ug_reqtsmgmt_inception">
+            <title>Inception Phase</title>
+            <para>This phase will typically involve 2 main activities:</para>
+            <itemizedlist mark="bullet">
+                <listitem>
+                    <para>Creating a new Requirement in the system</para>
+                </listitem>
+                <listitem>
+                    <para>Creating and editing Live Documents</para>
+                </listitem>
+            </itemizedlist>
+
+            <sect3 id="ug_reqmgmt_inception_newReq">
+                <title>Creating a New Requirement in the System</title>
+                <para>The starting point of the Requirement process is to create a new Requirement in the relevant Project of
+                  your Polarion syste. Once defines, you can creae Work Items either manually in the system, or by updloading
+                  a Live Document based on a Live Document template.</para>
+
+                <para>To create and edit Requirements, you need to be working in the <guilabel>Projects</guilabel> perspective.
+                    Select the relevant Project in the <guilabel>Projects</guilabel> portlet. </para>
+
+                <para><emphasis>To create a new Requirement:</emphasis></para>
+
+
+                <orderedlist numeration="arabic" spacing="normal">
+                    <listitem>
+                        <para>If necessary, select the tab for the <guilabel>Table</guilabel> view in the work area.</para>
+                    </listitem>
+                    <listitem>
+                        <para>Click the <guibutton>Create</guibutton> and select <guimenuitem>Requirement</guimenuitem> in the
+                        drop-down menu.</para> <!-- SCREENSHOT -->
+                        <para>The work item editor opens in the lower part of the work area with the fields for a new Requirement.</para>
+                    </listitem>
+                    <listitem>
+                        <para>Enter relevant information in the fields. Note that only <guilabel>Title</guilabel>,
+                            <guilabel>Priority</guilabel>, and <guilabel>Severity</guilabel> are required. <guilabel>Description</guilabel>
+                            is recommended for clarity.</para>
+                            <tip><para>Your system configuration may have other required fields. Required fields are marked with a
+                            red asterisk (*) next to the field label.
+                            </para></tip>
+                    </listitem>
+                    <listitem>
+                        <para>In the work item editor Toolbar, click the <guibutton>Create</guibutton> button to </para> <!-- SCREENSHOT -->
+                    </listitem>
+                </orderedlist>
+
+                <sect4 id="ug_reqmgmt_inception_newReq_wis">
+                    <title>Creating Work Items for a New Requirement</title>
+                    <para>After creating a new Requirement, there are 2 ways to create Work Items that relate to it.</para>
+
+                    <itemizedlist mark="bullet">
+				        <listitem>
+					    <para>Work Items can be created individually in the Polarion system. Link new Work Items to the relevant Requirement either singly,
+                            or all at once using the Bulk Edit feature.</para> <!-- TODO: Link to Bulk Edit -->
+				        </listitem>
+				        <listitem>
+					        <para>Work Items can be created automatically from a Live Document attached to the Requirement. Working with Live Documents is covered in the next section.</para>
+				        </listitem>
+			        </itemizedlist>
+			    </sect4>
+            </sect3>
+
+            <sect3 id="ug_reqmgmt_inception_livedocs">
+                <title>Working with Live Documents</title>
+                <para><inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> Live Document is a feature of
+                    Polarion Enterprise Edition only.</para>
+
+                <para><productname>Polarion's</productname> <emphasis>Live Document</emphasis> technology enables those team members
+                who prefer to work with office documents to define requirements using <productname>MS Word</productname> and/or
+                <productname>MS Excel</productname> with special Live Document templates provided with Polarion.
+                When attached to a Requirement in the Polarion system, Work Items are automatically
+                created from the Live Document(s). Revisions to Work Items automatically propagate back to the relevant Live
+                Document, and revisions to a Live Document automatically create new Work Items or update existing ones.</para>
+
+                <para>Live Document templates are provided in the Polarion system installation on
+                the server. There is one template for MS Word and one for MS Excel. This section explains the basic process for
+                creating, editing, and saving Live Documents built with Live Document templates.</para>
+
+                <note>
+                    <title>Required Version of Microsoft Office</title>
+                    <para>The Live Documents feature works only with Microsoft Office 2003 <emphasis>Professional</emphasis>.
+                    Earlier versions of Microsoft Office, and MS Office 2003 <emphasis>Basic</emphasis> do NOT work with
+                    <productname>Polarion's</productname> Live Documents feature.</para>
+                </note>
+
+                <sect4 id="ug_reqmgmt_inception_livedoc_new">
+                    <title>Creating a New Live Document</title>
+                    <para>In order to create a Live Document, a folder named <guilabel>documents</guilabel> must exist in the Project.
+                    This folder should be created by the user who has administration permissions for creating Projects. Once you
+                    have a Project containing the <guilabel>documents</guilabel> folder, it is simple to create a new Live Document.</para>
+                    <para><emphasis>To create a new Live Document:</emphasis></para>
+                    <orderedlist numeration="arabic" spacing="normal">
+                        <listitem>
+                            <para>Select the <guilabel>documents</guilabel> folder in the <guilabel>Projects</guilabel> portlet. The
+                            work area displays the repository URL of the folder and a list of existing documents, if any.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Click the <guibutton>New Document</guibutton> button in the work area. The work area displays headers
+                            for two options:</para>
+                            <itemizedlist mark="bullet">
+                                <listitem>
+                                    <para><guilabel>Create new document from template</guilabel></para>
+                                </listitem>
+                                <listitem>
+                                    <para><guilabel>Or upload new document</guilabel></para>
+                                </listitem>
+                            </itemizedlist>
+                        </listitem>
+                        <listitem>
+                            <para>To create a new document from a template, enter a name in the <guilabel>Document Name</guilabel> field,
+                            and choose a template in the <guilabel>Template</guilabel> list.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Click the <guibutton>Submit</guibutton> button to create the new document. in the system (i.e.
+                            <emphasis>not</emphasis> locally.</para>
+                        </listitem>
+                    </orderedlist>
+                </sect4>
+
+                <sect4 id="ug_reqmgmt_inception_livedoc_view">
+                    <title>Viewing the New Live Document</title>
+                    <para>After creating a new Live Document, you can select it in the <guilabel>documents</guilabel> folder. (Click
+				    the Refresh icon in the <guilabel>Projects</guilabel> portlet's title bar if you don't immediately see the
+				    new Live Document.)</para>
+
+                    <para>When selected, two topics in the <guilabel>Topics</guilabel> portlet: <guilabel>Overview</guilabel>, and
+			        <guilabel>Work Items</guilabel>. The <guilabel>Overview</guilabel> topic is selected automatically by default.</para>
+			        <!-- TODO SCREENSHOT ?? -->
+                </sect4>
+
+                <sect4 id="ug_reqmgmt_inception_livedoc_edit">
+                    <title>Opening a New Live Document for Editing</title>
+                    <para>You can either edit the new Live Document directly from the repository, or download a copy to your local
+			        repository and edit locally. If you are constantly connected, the direct method is simplest.</para>
+                    <para><emphasis>To open and edit a Live Document directly:</emphasis></para>
+                    <orderedlist numeration="arabic" spacing="normal">
+                        <listitem>
+                            <para>Select the document in the <guilabel>documents</guilabel> folder.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Select the <guilabel>Overview</guilabel> topic in the <guilabel>Topics</guilabel> portlet.</para>
+                        </listitem>
+                        <listitem>
+                            <para>In the work area, click the <guibutton>Edit in Word</guibutton> or <guibutton>Edit in Excel</guibutton>
+                            button, depending on which type of document the selected Live Document is. You will be prompted for your
+                            login details to authorize opening of the document.</para>
+                        </listitem>
+                    </orderedlist>
+
+                    <para>The Live Document opens in the relevant MS Office application in a new instance of your browser. You can
+                    edit the document and save changes just as if you were editing a local copy. Changes will be reflected in the
+                    Polarion system after you close the document.</para>
+
+                    <para><emphasis>To edit a New Live document locally:</emphasis></para>
+                    <orderedlist numeration="arabic" spacing="normal">
+                        <listitem>
+                            <para>Select the document in the <guilabel>documents</guilabel> folder.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Select the <guilabel>Overview</guilabel> topic in the <guilabel>Topics</guilabel> portlet.</para>
+                        </listitem>
+                        <listitem>
+                            <para>In the work area, the document's repository URL displays in the <guilabel>URL</guilabel> field.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Use your Subversion client program, or the Subversion command line interface to checkout the document
+                            at the displayed URL. This will obtain a local copy of the document.</para>
+                        </listitem>
+                        <listitem>
+                            <para>Open the local copy in the relevant MS Office application and edit as you would any document.</para>
+                        </listitem>
+                    </orderedlist>
+                </sect4>
+            </sect3>
+        </sect2>
+
+        <sect2 id="ug_reqtsmgmt_revision">
+            <title>Revision Phase</title>
+            <para>Once Requirements have been defined and relevant Work Items created initially, there is typically a phase of
+		    review, discussion, and revision of Requirements with stakeholders from both domain experts and engineering involved.
+		    Polarion supports this process with its Live Document technology. As in the initial definition
+		    phase, stakeholders can modify requirements in their preferred environment: an office document, or the Polarion
+		    repository. This section explains how to modify existing Requirements in both ways.</para>
+
+            <sect3 id="ug_reqmgmt_revision_revise_livedocs">
+                <title>Revising requirements using Live Documents</title>
+                <para>To modify Requirements using an office document, it is necessary to locate the relevant Live Document in
+			    the Polarion system, check it out of the repository, change the document, and
+			    check the changed document in to the repository. On check-in, any new Work Items defined in the document are
+			    automatically created in Polarion, and existing Work Items are updated with any
+			    changes in the document.</para>
+
+                <sect4 id="ug_reqmgmt_revision_livedoc_locating">
+                    <title>Locating the Live Document</title>
+                    <para><emphasis>To locate a Live Document to be modified:</emphasis></para>
+
+                    <orderedlist numeration="arabic" spacing="normal">
+                    <listitem>
+                        <para>In the Polarion web interface, make sure you are working in the
+                        <guilabel>Projects</guilabel> perspective. Switch to this perspective if necessary.</para>
+                    </listitem>
+                    <listitem>
+                        <para>Using the <guilabel>Projects</guilabel> portlet, locate the Project for which the desired Live
+                            Document contains Requirements.</para>
+                    </listitem>
+                    <listitem>
+                        <para>Expand the Project node (click <guilabel>[+]</guilabel> and select the <guilabel>documents</guilabel> folder.
+                            A list of documents for this Project loads in the work area. The list should contain the Live Document
+                            with the Requirements you want to modify. Nodes for each document appear as children of the
+                            <guilabel>documents</guilabel> folder in the <guilabel>Projects</guilabel> portlet.</para>
+                    </listitem>
+                        <listitem>
+                            <para>In the <guilabel>Projects</guilabel> portlet, select the Live Document you want to modify. Details
+                            for the document appear in the work area.</para>
+                        </listitem>
+                   </orderedlist>
+
+                    <tip>
+                        <para>You can compare document versions by clicking on the Revisions table in the document Overview page.</para>
+                   </tip>
+                </sect4>
+
+                <sect4 id="ug_reqmgmt_revision_livedoc_checkout">
+                    <title>Checking out a Live Document for Editing</title>
+                    <para>If you are working on line, the checkout process is as simple as clicking the <guibutton>Edit in Word</guibutton>
+				    or the <guibutton>Edit in Excel</guibutton> button in the work area above the details of the selected Live
+				    Document. Polarion Polarion automatically handles the repository checkout process
+				    and displays the document in the relevant office application running in a new instance of your web browser.
+			        You can work on the document normally.</para>
+				    <important>
+					    <para>In order for this feature to work, you must set your <productname>Internet Explorer</productname> browser
+					    settings to initialize and	script ActiveX controls	not marked as safe (more below).</para>
+					    <para><emphasis>To set this option in Internet Explorer:</emphasis></para>
+                        <orderedlist>
+                            <listitem>
+                                <para>On the Internet Explorer main menu, choose <guimenuitem>Tools</guimenuitem> | <guimenuitem>Internet Options</guimenuitem>. </para>
+                            </listitem>
+                            <listitem>
+                                <para>Click the <guilabel>Security</guilabel> tab.</para>
+                            </listitem>
+                            <listitem>
+                                <para>Click the <guiicon>Trusted Sites</guiicon> icon. The <guibutton>Sites</guibutton> button is enabled.</para>
+                            </listitem>
+                            <listitem>
+                                <para>Click the <guibutton>Sites</guibutton> button. In the field <guilabel>Add this Web site to the Zone</guilabel>,
+                                enter the URL of the root of your Polarion system. For example, the root of the Polarion
+                                    hosted version is: <ulink url="http://powerversion.com/polarion/portal">http://powerversion.com/polarion/portal</ulink>.
+                                </para>
+                            </listitem>
+                            <listitem>
+                                <para>Click the <guibutton>Add</guibutton> to add the URL to the list of Trusted Sites.</para>
+                            </listitem>
+                            <listitem>
+                                <para>If you do not access your Polarion system with <code>https:</code> protocol,
+                                and if the checkbox <option>Require server verification (https:) for all sites in this zone</option> is checked,
+                                uncheck it. If you have other sites in this zone and you want to require https: for all sites, click <guibutton>Cancel</guibutton>,
+                                skip the rest of these steps and see the Note below.</para>
+                            </listitem>
+                            <listitem>
+                                <para>Click <guibutton>OK</guibutton> to close the <guibutton>Trusted Sites dialog.</guibutton></para>
+                            </listitem>
+                            <listitem>
+                                <para>In the <guilabel>Internet Options</guilabel> dialog, click <guibutton>Custom Level</guibutton>.</para>
+                            </listitem>
+                            <listitem>
+                                <para>Scroll down the list of options until you locate <option>Initialize and script ActiveX controls not marked as safe</option>.</para>
+                            </listitem>
+                            <listitem>
+                                <para>If you are setting this option for the Trusted Sites zone, you can choose the <option>Enable</option> option if you
+                                don't want to be prompted whenever you edit a Live Document, or the <option>Prompt</option> option if you prefer a prompt. </para>
+                            </listitem>
+                            <listitem>
+                                <para>Click <guibutton>OK</guibutton> to close the <guilabel>Security Settings</guilabel> dialog, and again in
+                                the <guilabel>Internet Options</guilabel> dialog.</para>
+                            </listitem>
+                        </orderedlist>
+				    </important>
+				    <note>
+                        <title>If you require https: in your Trusted Zone</title>
+                        <para>If you require https: for all sites in your Trusted Zone, and you do not access your Polarion
+                        system via the internet using https: protocol, then you can locate the option in the <guilabel>Security Settings</guilabel>
+                        dialog and choose the <option>Prompt</option> option. You will then get a prompt whenever you edit Live Documents from the
+                        Polarion web interface, in which case you should allow the initialization and scripting of the ActiveX.</para>
+				    </note>
+                    <para>If you need to work on the document off line, you need to checkout the document from the Subversion
+                    repository. Use a Subversion client such as TortoiseSVN, or the Subversion command line interface according
+                    to your preference or your organization's established procedure. The URL of the Live Document is shown in the
+                    work area in the <guilabel>URL</guilabel> field when the Live Document is selected in the <guilabel>documents</guilabel>
+                    folder.</para>
+                </sect4>
+
+                <sect4 id="ug_reqmgmt_revision_livedoc_checkin">
+                    <title>Checking In an Edited Live Document</title>
+                   <para>If editing the document on line in the office application running in your browser, simply save your
+				   changes and close the document. <!-- TODO VERIFY! --> Polarion takes care of the repository
+				   checkin process.</para>
+                    <para>If you have edited a checked out local copy of the Live Document, use your Subversion client or the
+				    Subversion command line interface to check the document in to the repository.</para>
+				    <para>In both cases, Polarion will create Work Items in the system if the checked in
+				    document defines new Requirements, and it will update existing Work Items if the relevant Requirement has been
+					modified in the Live Document.</para>
+				    <note>
+					    <para>if you change only one Work Item in a Live Document, all Work Items from that document will have their
+					    Last Update field changed to the date of the update of the single item.</para>
+				    </note>
+				<!-- TODO What else is needed to mention? Creating IDs or smth like that? -->
+                </sect4>
+            </sect3>
+        </sect2>
+
+        <sect2 id="ug_reqtsmgmt_approval">
+            <title>Approval Phase</title>
+            <para>Polarion supports a process of approval for Requirements. Work Itemspertaining to Requirements are approved/disapproved using Polarion (i.e. not in
+			a Live Document). Each Work Item can be marked as Awaiting Approval, Approved, or Disapproved (either singly, or in aggregate using the Bulk Edit feature),
+            and assigned one or more "approver(s)" - user(s) having	responsibility for reviewing and approving or disapproving the Work Item(s). Approvers can quickly
+            access all the Work Items assigned to them for approval using a special pre-defined filter named <emphasis>Awaiting my approval</emphasis>.</para>
+
+			<tip>
+                <para>Project managers should make sure that approvers who may not have user accounts in the Polarion system as a result of the Requirements
+                definition/modification process are set up with accounts for the approval phase so they can access the Work Items they must review.</para>
+            </tip>
+
+            <sect3 id="ug_reqtsmgmt_approval_assign">
+                <title>Assigning Approver(s) to Work Items</title>
+                <para>One or more approvers can be assigned to each Work Item of a Requirement any time after the Work Item is
+				created in the Polarion system. Be sure that everyone in the organization who must review/approve requirements
+                has a user account before assigning approvers to Work Items.</para>
+
+                <para><emphasis>To assign approver(s) to a Work Item:</emphasis></para>
+
+                <orderedlist numeration="arabic" spacing="normal">
+					<listitem>
+						<para>Select a Work Item in the Work Items table in the upper part of the work area. The Work Item detail
+						editor loads in the lower part of the work area.</para>
+					</listitem>
+					<listitem>
+						<para>Scroll the detail pane until you locate the <guilabel>Approvers</guilabel> section. Initially there
+						is one approver line present in the section which has no assignment attributes set.</para>
+					</listitem>
+					<listitem>
+						<para>In the first <guilabel>Approvers</guilabel> line, select <guimenuitem>Awaiting Approval</guimenuitem>
+						in the <guilabel>Status</guilabel> drop-down list. This marks the start of the approval process for this
+						Work Item.</para>
+					</listitem>
+					<listitem>
+						<para>Assign the item to an approver by selecting a user name from the <guimenuitem>User</guimenuitem>
+						drop-down list.</para>
+					</listitem>
+					<listitem>
+						<para>If you wish to assign another approver to this Work Item, click the green plus sign at the right side
+						of the current line. Another line is added to the <guilabel>Approvers</guilabel> section below the
+						previous line.</para>
+					</listitem>
+					<listitem>
+						<para>Repeat the foregoing steps for this and any more approvers you want to assign to the current Work Item.</para>
+					</listitem>
+				</orderedlist>
+
+                <tip>
+                    <para>Use the Bulk Edit feature to assign the same approver(s) to multiple Work Items at once. The steps
+				    are essentially the same as just described, only the edit is applied to all selected Work Items.</para>
+                </tip>
+            </sect3>
+
+            <sect3 id="ug_reqtsmgmt_approval_marking">
+                <title>Approving or Disapproving Work Items</title>
+                <para>If you are assigned review/approval responsibility for Requirements, you need to use the Polarion
+				system to mark Work Items as approved or disapproved. You can review the Work Items in a
+				<link linkend="ug_reqmgmt_inception_livedoc_new">Live Document</link> but you need to use Polarion to
+				mark Work Items as approved or disapproved.</para>
+
+                <sect4 id="ug_reqtsmgmt_approval_marking_locate">
+                    <title>Locating the Work Items You Must Review</title>
+                    <para>Locating the Work Items for which you are assigned as an approver is quick and easy. There is a
+					pre-defined filter named <guilabel>Awaiting my approval</guilabel> that will aggregate all the relevant
+					Work Items for a selected Requirement.</para>
+
+                    <para><emphasis>To locate Work Items awaiting your approval:</emphasis></para>
+
+                    <orderedlist numeration="arabic" spacing="normal">
+						<listitem>
+							<para>Navigate to the Requirement item or document in the relevant Project and select it. A list of
+							all pertinent Work Items appears in the Work Items table at the top of the work area.</para>
+						</listitem>
+						<listitem>
+							<para>Select the Tree view (tab in the top part of the work area)</para>
+						</listitem>
+						<listitem>
+							<para>In the Search bar set the selection criteria as follows:</para>
+							<para><guilabel>Search</guilabel> <userinput>Open</userinput> <guilabel>and</guilabel> <userinput>Awaiting my Approval</userinput> <guilabel>in</guilabel> <userinput>Project</userinput></para>
+						</listitem>
+					</orderedlist>
+
+                    <para>The list of Work Items updates to contain only those Work Items assigned to you for approval.</para>
+                </sect4>
+
+                <sect4 id="ug_reqtsmgmt_approval_marking_markit">
+                    <title>Marking a Work Item as Approved or Disapproved</title>
+                    <para>When a Work Item is selected in the Work Items table, the detail appears in the lower part
+					of the work area. Click the <guibutton>Edit</guibutton> button to enter Edit mode. You can now edit all fields in the Work Item detail.</para>
+
+                    <para>Scroll the detail area until you find the <guilabel>Approvers</guilabel> section, which should contain at least one line displaying your
+					Polarion user name.</para>
+
+                    <para>To mark this Work Item as approved or disapproved, select the relevant value in the <guilabel>Status</guilabel>
+					drop-down list. If there are multiple lines for different approvers, be sure you set the status on the
+					line containing your user name.</para>
+
+                    <tip>
+						<para><inlinegraphic fileref="help_home/images/enterprise_sm.gif" format="GIF" valign="middle" width="17"/> With Polarion Enterprise Edition you
+						can use the Multi Edit view to set the same status value for multiple Work Items assigned to a selected user all at the same time.</para>
+					</tip> <!-- TODO This maybe needs to be more detailed -->
+                </sect4>
+            </sect3>
+        </sect2>
+
+        <sect2 id="ug_reqtsmgmt_livedoc_templates">
+            <title>About Live Document Templates</title>
+            <para>Polarion comes with one pre-defined Requirements template for MS Word and one
+			for MS Excel. It is possible to customize these templates, or, probably better, create customized copies of the
+			original templates provided with by installation.</para>
+
+            <para> Templates are stored in the Subversion repository folder: <code>/.polarion/tracker/document_templates</code>.</para>
+			<para>To modify or create copies of the templates, you should checkout the repository folder to your local system.
+			Edit template files using the relevant MS Office application and commit new/changed files to the repository.
+			Any new templates will appear in the <guilabel>Template</guilabel> list during the process of
+			<link linkend="ug_reqmgmt_inception_livedoc_new">creating a new Live Document</link>.</para>
+
+            <sect3 id="ug_reqtsmgmt_livedoc_templates_localfiles">
+                <title>Working with Local Files</title>
+                <para>It is possible to save local copies of Requirements templates and create new local Requirements documents
+			  	off line that are based on a local template file. Then, when <link linkend="ug_reqmgmt_inception_livedoc_new">creating a new Live Document</link>	in Polarion,
+                instead of choosing the option to create a new live document from a template,you choose instead the option to upload a file. Use the
+                <guibutton>Browse</guibutton> button to locate the local file to be uploaded into the Polarion system. After uploading a new document created locally,
+                you will need to use the button <guibutton>Assign IDs</guibutton> to cause the Work Items in the document to be assigned system IDs in Polarion so that
+                they will be searchable, etc. in the system.</para>
+
+                <para>You can save documents either with the office application's file extension (<filename>.doc</filename> or <filename>.xls</filename>,
+                or the extension <filename>.xml</filename>.</para>
+
+                <para>As with documents created using the on line interface, Work Items are created from the document content after
+			  	upload. (In the case of modified documents, existing Work Items are updated.)</para>
+            </sect3>
+        </sect2>
+    </sect1>
+
+    <sect1 id="ug_project_mgmt">
+        <title>Polarion for Project Managers</title>
+        <?dbhtml filename="ug_project_mgmt.html"?>
+        <para>[PLACEHOLDER]</para>
+
+        <sect2 id="ug_projectmgmt_planning">
+            <title>Project Planning</title>
+            <para>[PLACEHOLDER]</para>
+        </sect2>
+
+        <sect2 id="ug_projectmgmt_dashboards">
+            <title>Using Project Dashboards</title>
+            <para>[PLACEHOLDER]</para>
+        </sect2>
+
+        <sect2 id="ug_projectmgmt_metrics">
+            <title>Reviewing Project Metrics</title>
+            <para>[PLACEHOLDER]</para>
+        </sect2>
+
+        <sect2 id="ug_projectmgmt_reports">
+            <title>Generating Reports</title>
+            <para>[PLACEHOLDER]</para>
+        </sect2>
+    </sect1>
+
+    <sect1 id="ug_developers">
+        <title>Polarion for Developers</title>
+        <?dbhtml filename="ug_developer_guidet.html"?>
+        <para>[PLACEHOLDER]</para>
+
+        <sect2 id="ug_devguide_proj_access">
+            <title>Accessing Projects</title>
+            <para>[PLACEHOLDER]</para>
+        </sect2>
+
+        <sect2 id="ug_devguide_find_wi">
+            <title>Locating your Work Items</title>
+            <para>[PLACEHOLDER]</para>
+        </sect2>
+
+        <sect2 id="ug_devguide_common_ops">
+            <title>Common Tasks and Operations</title>
+            <para>[PLACEHOLDER]</para>
+
+            <sect3 id="ug_devguide_ops_editing">
+                <title>Viewing and Editing a Work Item</title>
+                <para>[PLACEHOLDER]</para>
+            </sect3>
+
+           <sect3 id="ug_devguide_ops_estimate">
+                <title>Estimating Work Item Time</title>
+                <para>[PLACEHOLDER]</para>
+            </sect3>
+
+            <sect3 id="ug_devguide_ops_comments">
+                <title>Work Item Discussion and Comments</title>
+                <para>[PLACEHOLDER]</para>
+            </sect3>
+
+            <sect3 id="ug_devguide_ops_resolving">
+                <title>Resolving or Closing a Work Item</title>
+                <para>[PLACEHOLDER]</para>
+
+                <sect4 id="ug_devguide_ops_resolving_reposlnk">
+                    <title>Linking a Resolved Item to a Repository Revision</title>
+                    <para>[PLACEHOLDER]</para>
+                </sect4>
+            </sect3>
+
+           <sect3 id="ug_devguide_builds">
+                <title>Working with Builds</title>
+                <para>[PLACEHOLDER]</para>
+           </sect3>
+
+            <sect3 id="ug_devguide_tests">
+                <title>Working with Tests</title>
+                <para>[PLACEHOLDER]</para>
+            </sect3>
+
+            <sect3 id="ug_devguide_javadoc">
+                <title>Accessing documentation</title>
+                <para>[PLACEHOLDER]</para>
+            </sect3>
+        </sect2>
+    </sect1>
+</chapter>
diff --git a/xml/tests/testData/xml/DocBookHighlighting/calstblx.dtd b/xml/tests/testData/xml/DocBookHighlighting/calstblx.dtd
new file mode 100644
index 000000000000..aa3642896293
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/calstblx.dtd
@@ -0,0 +1,205 @@
+<!-- ...................................................................... -->
+<!-- DocBook CALS Table Model V4.4 ........................................ -->
+<!-- File calstblx.mod .................................................... -->
+
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     This DTD is based on the CALS Table Model
+     PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
+
+     $Id: calstblx.dtd,v 1.27 2005/01/27 13:52:00 nwalsh Exp $
+
+     Permission to use, copy, modify and distribute the DocBook DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the definitions for the CALS Table Model
+     converted to XML. It has been modified slightly for use in the
+     combined HTML/CALS models supported by DocBook V4.4.
+-->
+
+<!-- These definitions are not directly related to the table model, but are
+     used in the default CALS table model and are usually defined elsewhere
+     (and prior to the inclusion of this table module) in a CALS DTD. -->
+
+<!ENTITY % bodyatt "">
+<!ENTITY % secur "">
+
+<!-- no if zero(s),
+                                yes if any other digits value -->
+
+<!ENTITY % yesorno 'CDATA'>
+<!ENTITY % titles  'title?'>
+
+<!-- default for use in entry content -->
+
+<!ENTITY % paracon '#PCDATA'>
+
+<!--
+The parameter entities as defined below provide the CALS table model
+as published (as part of the Example DTD) in MIL-HDBK-28001.
+
+These following declarations provide the CALS-compliant default definitions
+for these entities.  However, these entities can and should be redefined
+(by giving the appropriate parameter entity declaration(s) prior to the
+reference to this Table Model declaration set entity) to fit the needs
+of the current application.
+-->
+
+<!ENTITY % tbl.table.name       "(table|chart)">
+<!ENTITY % tbl.table-titles.mdl "%titles;,">
+<!ENTITY % tbl.table-main.mdl   "(tgroup+|graphic+)">
+<!ENTITY % tbl.table.mdl        "%tbl.table-titles.mdl; %tbl.table-main.mdl;">
+<!ENTITY % tbl.table.att        '
+    tabstyle    CDATA           #IMPLIED
+    tocentry    %yesorno;       #IMPLIED
+    shortentry  %yesorno;       #IMPLIED
+    orient      (port|land)     #IMPLIED
+    pgwide      %yesorno;       #IMPLIED '>
+<!ENTITY % tbl.tgroup.mdl       "colspec*,spanspec*,thead?,tfoot?,tbody">
+<!ENTITY % tbl.tgroup.att       '
+    tgroupstyle CDATA           #IMPLIED '>
+<!ENTITY % tbl.hdft.mdl         "colspec*,row+">
+<!ENTITY % tbl.row.mdl          "(entry|entrytbl)+">
+<!ENTITY % tbl.entrytbl.mdl     "colspec*,spanspec*,thead?,tbody">
+<!ENTITY % tbl.entry.mdl        "(para|warning|caution|note|legend|%paracon;)*">
+
+<!ENTITY % tbl.frame.attval     "top|bottom|topbot|all|sides|none">
+<!ENTITY % tbl.tbody.mdl        "row+">
+
+<!-- =====  Element and attribute declarations follow. =====  -->
+
+<!ELEMENT table %ho; (%tbl.table.mdl;)>
+
+<!ATTLIST table
+        frame           (%tbl.frame.attval;)                    #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        %tbl.table.att;
+        %bodyatt;
+        %secur;
+>
+
+<!ELEMENT tgroup %ho; (%tbl.tgroup.mdl;) >
+
+<!ATTLIST tgroup
+        cols            CDATA                                   #REQUIRED
+        %tbl.tgroup.att;
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+        %secur;
+>
+
+<!ELEMENT colspec %ho; EMPTY >
+
+<!ATTLIST colspec
+        colnum          CDATA                                   #IMPLIED
+        colname         CDATA                                   #IMPLIED
+        colwidth        CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+>
+
+<!ELEMENT spanspec %ho; EMPTY >
+
+<!ATTLIST spanspec
+        namest          CDATA                                   #REQUIRED
+        nameend         CDATA                                   #REQUIRED
+        spanname        CDATA                                   #REQUIRED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+>
+
+<!ELEMENT thead %ho; (%tbl.hdft.mdl;)>
+<!ATTLIST thead
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!ELEMENT tfoot %ho; (%tbl.hdft.mdl;)>
+<!ATTLIST tfoot
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!ELEMENT tbody %ho; (%tbl.tbody.mdl;)>
+
+<!ATTLIST tbody
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!ELEMENT row %ho; (%tbl.row.mdl;)>
+
+<!ATTLIST row
+        rowsep          %yesorno;                               #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!ELEMENT entrytbl %ho; (%tbl.entrytbl.mdl;)>
+
+<!ATTLIST entrytbl
+        cols            CDATA                                   #REQUIRED
+        %tbl.tgroup.att;
+        colname         CDATA                                   #IMPLIED
+        spanname        CDATA                                   #IMPLIED
+        namest          CDATA                                   #IMPLIED
+        nameend         CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+        %secur;
+>
+
+<!ELEMENT entry %ho; (%tbl.entry.mdl;)*>
+
+<!ATTLIST entry
+        colname         CDATA                                   #IMPLIED
+        namest          CDATA                                   #IMPLIED
+        nameend         CDATA                                   #IMPLIED
+        spanname        CDATA                                   #IMPLIED
+        morerows        CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+        rotate          %yesorno;                               #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!-- End of DocBook CALS Table Model V4.4 ................................. -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting/dbcentx.mod b/xml/tests/testData/xml/DocBookHighlighting/dbcentx.mod
new file mode 100644
index 000000000000..0e615407e37b
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/dbcentx.mod
@@ -0,0 +1,384 @@
+<!-- ...................................................................... -->
+<!-- DocBook character entities module V4.4 ............................... -->
+<!-- File dbcentx.mod ..................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: dbcentx.mod,v 1.28 2005/01/27 13:52:00 nwalsh Exp $
+
+     Permission to use, copy, modify and distribute the DocBook DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the entity declarations for the standard ISO
+     entity sets used by DocBook.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbcent PUBLIC
+     "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
+     "dbcentx.mod">
+     %dbcent;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+
+<![%sgml.features;[
+
+<!ENTITY % ISOamsa.module "INCLUDE">
+<![ %ISOamsa.module; [
+<!ENTITY % ISOamsa PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN">
+<!--end of ISOamsa.module-->]]>
+
+<!ENTITY % ISOamsb.module "INCLUDE">
+<![ %ISOamsb.module; [
+<!ENTITY % ISOamsb PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN">
+<!--end of ISOamsb.module-->]]>
+
+<!ENTITY % ISOamsc.module "INCLUDE">
+<![ %ISOamsc.module; [
+<!ENTITY % ISOamsc PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN">
+<!--end of ISOamsc.module-->]]>
+
+<!ENTITY % ISOamsn.module "INCLUDE">
+<![ %ISOamsn.module; [
+<!ENTITY % ISOamsn PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN">
+<!--end of ISOamsn.module-->]]>
+
+<!ENTITY % ISOamso.module "INCLUDE">
+<![ %ISOamso.module; [
+<!ENTITY % ISOamso PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN">
+<!--end of ISOamso.module-->]]>
+
+<!ENTITY % ISOamsr.module "INCLUDE">
+<![ %ISOamsr.module; [
+<!ENTITY % ISOamsr PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN">
+<!--end of ISOamsr.module-->]]>
+
+<!ENTITY % ISObox.module "INCLUDE">
+<![ %ISObox.module; [
+<!ENTITY % ISObox PUBLIC
+"ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
+<!--end of ISObox.module-->]]>
+
+<!ENTITY % ISOcyr1.module "INCLUDE">
+<![ %ISOcyr1.module; [
+<!ENTITY % ISOcyr1 PUBLIC
+"ISO 8879:1986//ENTITIES Russian Cyrillic//EN">
+<!--end of ISOcyr1.module-->]]>
+
+<!ENTITY % ISOcyr2.module "INCLUDE">
+<![ %ISOcyr2.module; [
+<!ENTITY % ISOcyr2 PUBLIC
+"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN">
+<!--end of ISOcyr2.module-->]]>
+
+<!ENTITY % ISOdia.module "INCLUDE">
+<![ %ISOdia.module; [
+<!ENTITY % ISOdia PUBLIC
+"ISO 8879:1986//ENTITIES Diacritical Marks//EN">
+<!--end of ISOdia.module-->]]>
+
+<!ENTITY % ISOgrk1.module "INCLUDE">
+<![ %ISOgrk1.module; [
+<!ENTITY % ISOgrk1 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Letters//EN">
+<!--end of ISOgrk1.module-->]]>
+
+<!ENTITY % ISOgrk2.module "INCLUDE">
+<![ %ISOgrk2.module; [
+<!ENTITY % ISOgrk2 PUBLIC
+"ISO 8879:1986//ENTITIES Monotoniko Greek//EN">
+<!--end of ISOgrk2.module-->]]>
+
+<!ENTITY % ISOgrk3.module "INCLUDE">
+<![ %ISOgrk3.module; [
+<!ENTITY % ISOgrk3 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Symbols//EN">
+<!--end of ISOgrk3.module-->]]>
+
+<!ENTITY % ISOgrk4.module "INCLUDE">
+<![ %ISOgrk4.module; [
+<!ENTITY % ISOgrk4 PUBLIC
+"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN">
+<!--end of ISOgrk4.module-->]]>
+
+<!ENTITY % ISOlat1.module "INCLUDE">
+<![ %ISOlat1.module; [
+<!ENTITY % ISOlat1 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 1//EN">
+<!--end of ISOlat1.module-->]]>
+
+<!ENTITY % ISOlat2.module "INCLUDE">
+<![ %ISOlat2.module; [
+<!ENTITY % ISOlat2 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 2//EN">
+<!--end of ISOlat2.module-->]]>
+
+<!ENTITY % ISOnum.module "INCLUDE">
+<![ %ISOnum.module; [
+<!ENTITY % ISOnum PUBLIC
+"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
+<!--end of ISOnum.module-->]]>
+
+<!ENTITY % ISOpub.module "INCLUDE">
+<![ %ISOpub.module; [
+<!ENTITY % ISOpub PUBLIC
+"ISO 8879:1986//ENTITIES Publishing//EN">
+<!--end of ISOpub.module-->]]>
+
+<!ENTITY % ISOtech.module "INCLUDE">
+<![ %ISOtech.module; [
+<!ENTITY % ISOtech PUBLIC
+"ISO 8879:1986//ENTITIES General Technical//EN">
+<!--end of ISOtech.module-->]]>
+
+<!--end of sgml.features-->]]>
+
+<![%xml.features;[
+
+<!ENTITY % ISOamsa.module "INCLUDE">
+<![%ISOamsa.module;[
+<!ENTITY % ISOamsa PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+"ent/isoamsa.ent">
+<!--end of ISOamsa.module-->]]>
+
+<!ENTITY % ISOamsb.module "INCLUDE">
+<![%ISOamsb.module;[
+<!ENTITY % ISOamsb PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+"ent/isoamsb.ent">
+<!--end of ISOamsb.module-->]]>
+
+<!ENTITY % ISOamsc.module "INCLUDE">
+<![%ISOamsc.module;[
+<!ENTITY % ISOamsc PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+"ent/isoamsc.ent">
+<!--end of ISOamsc.module-->]]>
+
+<!ENTITY % ISOamsn.module "INCLUDE">
+<![%ISOamsn.module;[
+<!ENTITY % ISOamsn PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+"ent/isoamsn.ent">
+<!--end of ISOamsn.module-->]]>
+
+<!ENTITY % ISOamso.module "INCLUDE">
+<![%ISOamso.module;[
+<!ENTITY % ISOamso PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+"ent/isoamso.ent">
+<!--end of ISOamso.module-->]]>
+
+<!ENTITY % ISOamsr.module "INCLUDE">
+<![%ISOamsr.module;[
+<!ENTITY % ISOamsr PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+"ent/isoamsr.ent">
+<!--end of ISOamsr.module-->]]>
+
+<!ENTITY % ISObox.module "INCLUDE">
+<![%ISObox.module;[
+<!ENTITY % ISObox PUBLIC
+"ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+"ent/isobox.ent">
+<!--end of ISObox.module-->]]>
+
+<!ENTITY % ISOcyr1.module "INCLUDE">
+<![%ISOcyr1.module;[
+<!ENTITY % ISOcyr1 PUBLIC
+"ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+"ent/isocyr1.ent">
+<!--end of ISOcyr1.module-->]]>
+
+<!ENTITY % ISOcyr2.module "INCLUDE">
+<![%ISOcyr2.module;[
+<!ENTITY % ISOcyr2 PUBLIC
+"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+"ent/isocyr2.ent">
+<!--end of ISOcyr2.module-->]]>
+
+<!ENTITY % ISOdia.module "INCLUDE">
+<![%ISOdia.module;[
+<!ENTITY % ISOdia PUBLIC
+"ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+"ent/isodia.ent">
+<!--end of ISOdia.module-->]]>
+
+<!ENTITY % ISOgrk1.module "INCLUDE">
+<![%ISOgrk1.module;[
+<!ENTITY % ISOgrk1 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+"ent/isogrk1.ent">
+<!--end of ISOgrk1.module-->]]>
+
+<!ENTITY % ISOgrk2.module "INCLUDE">
+<![%ISOgrk2.module;[
+<!ENTITY % ISOgrk2 PUBLIC
+"ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+"ent/isogrk2.ent">
+<!--end of ISOgrk2.module-->]]>
+
+<!ENTITY % ISOgrk3.module "INCLUDE">
+<![%ISOgrk3.module;[
+<!ENTITY % ISOgrk3 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+"ent/isogrk3.ent">
+<!--end of ISOgrk3.module-->]]>
+
+<!ENTITY % ISOgrk4.module "INCLUDE">
+<![%ISOgrk4.module;[
+<!ENTITY % ISOgrk4 PUBLIC
+"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+"ent/isogrk4.ent">
+<!--end of ISOgrk4.module-->]]>
+
+<!ENTITY % ISOlat1.module "INCLUDE">
+<![%ISOlat1.module;[
+<!ENTITY % ISOlat1 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+"ent/isolat1.ent">
+<!--end of ISOlat1.module-->]]>
+
+<!ENTITY % ISOlat2.module "INCLUDE">
+<![%ISOlat2.module;[
+<!ENTITY % ISOlat2 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+"ent/isolat2.ent">
+<!--end of ISOlat2.module-->]]>
+
+<!ENTITY % ISOnum.module "INCLUDE">
+<![%ISOnum.module;[
+<!ENTITY % ISOnum PUBLIC
+"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+"ent/isonum.ent">
+<!--end of ISOnum.module-->]]>
+
+<!ENTITY % ISOpub.module "INCLUDE">
+<![%ISOpub.module;[
+<!ENTITY % ISOpub PUBLIC
+"ISO 8879:1986//ENTITIES Publishing//EN//XML"
+"ent/isopub.ent">
+<!--end of ISOpub.module-->]]>
+
+<!ENTITY % ISOtech.module "INCLUDE">
+<![%ISOtech.module;[
+<!ENTITY % ISOtech PUBLIC
+"ISO 8879:1986//ENTITIES General Technical//EN//XML"
+"ent/isotech.ent">
+<!--end of ISOtech.module-->]]>
+
+<!--end of xml.features-->]]>
+
+<![ %ISOamsa.module; [
+%ISOamsa;
+]]>
+
+<![ %ISOamsb.module; [
+%ISOamsb;
+]]>
+
+<![ %ISOamsc.module; [
+%ISOamsc;
+]]>
+
+<![ %ISOamsn.module; [
+%ISOamsn;
+]]>
+
+<![ %ISOamso.module; [
+%ISOamso;
+]]>
+
+<![ %ISOamsr.module; [
+%ISOamsr;
+]]>
+
+<![ %ISObox.module; [
+%ISObox;
+]]>
+
+<![ %ISOcyr1.module; [
+%ISOcyr1;
+]]>
+
+<![ %ISOcyr2.module; [
+%ISOcyr2;
+]]>
+
+<![ %ISOdia.module; [
+%ISOdia;
+]]>
+
+<![ %ISOgrk1.module; [
+%ISOgrk1;
+]]>
+
+<![ %ISOgrk2.module; [
+%ISOgrk2;
+]]>
+
+<![ %ISOgrk3.module; [
+%ISOgrk3;
+]]>
+
+<![ %ISOgrk4.module; [
+%ISOgrk4;
+]]>
+
+<![ %ISOlat1.module; [
+%ISOlat1;
+]]>
+
+<![ %ISOlat2.module; [
+%ISOlat2;
+]]>
+
+<![ %ISOnum.module; [
+%ISOnum;
+]]>
+
+<![ %ISOpub.module; [
+%ISOpub;
+]]>
+
+<![ %ISOtech.module; [
+%ISOtech;
+]]>
+
+<!-- End of DocBook character entity sets module V4.4 ..................... -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting/dbgenent.mod b/xml/tests/testData/xml/DocBookHighlighting/dbgenent.mod
new file mode 100644
index 000000000000..20f717a2cd89
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/dbgenent.mod
@@ -0,0 +1,41 @@
+<!-- ...................................................................... -->
+<!-- DocBook additional general entities V4.4 ............................. -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbgenent PUBLIC
+     "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
+     "dbgenent.mod">
+     %dbgenent;
+-->
+
+<!-- File dbgenent.mod .................................................... -->
+
+<!-- You can edit this file to add the following:
+
+     o General entity declarations of any kind.  For example:
+
+       <!ENTITY productname "WinWidget">          (small boilerplate)
+       <!ENTITY legal-notice SYSTEM "notice.sgm"> (large boilerplate)
+
+     o Notation declarations.  For example:
+
+       <!NOTATION chicken-scratch SYSTEM>
+
+     o Declarations for and references to external parameter entities
+       containing collections of any of the above.  For example:
+
+       <!ENTITY % all-titles PUBLIC "-//DocTools//ELEMENTS Book Titles//EN"
+           "booktitles.ent">
+       %all-titles;
+-->
+
+<!-- End of DocBook additional general entities V4.4 ...................... -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting/dbhierx.mod b/xml/tests/testData/xml/DocBookHighlighting/dbhierx.mod
new file mode 100644
index 000000000000..7be307ac956d
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/dbhierx.mod
@@ -0,0 +1,2113 @@
+<!-- ...................................................................... -->
+<!-- DocBook document hierarchy module V4.4 ............................... -->
+<!-- File dbhierx.mod ..................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: dbhierx.mod,v 1.38 2005/01/27 13:52:00 nwalsh Exp $
+
+     Permission to use, copy, modify and distribute the DocBook DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the definitions for the overall document
+     hierarchies of DocBook documents.  It covers computer documentation
+     manuals and manual fragments, as well as reference entries (such as
+     man pages) and technical journals or anthologies containing
+     articles.
+
+     This module depends on the DocBook information pool module.  All
+     elements and entities referenced but not defined here are assumed
+     to be defined in the information pool module.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbhier PUBLIC
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
+     "dbhierx.mod">
+     %dbhier;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+<!-- Entities for module inclusions ....................................... -->
+
+<!ENTITY % dbhier.redecl.module		"IGNORE">
+<!ENTITY % dbhier.redecl2.module	"IGNORE">
+
+<!-- ...................................................................... -->
+<!-- Entities for element classes ......................................... -->
+
+<!ENTITY % local.appendix.class "">
+<!ENTITY % appendix.class	"appendix %local.appendix.class;">
+
+<!ENTITY % local.article.class "">
+<!ENTITY % article.class	"article %local.article.class;">
+
+<!ENTITY % local.book.class "">
+<!ENTITY % book.class		"book %local.book.class;">
+
+<!ENTITY % local.chapter.class "">
+<!ENTITY % chapter.class	"chapter %local.chapter.class;">
+
+<!ENTITY % local.index.class "">
+<!ENTITY % index.class		"index|setindex %local.index.class;">
+
+<!ENTITY % local.refentry.class "">
+<!ENTITY % refentry.class	"refentry %local.refentry.class;">
+
+<!ENTITY % local.section.class "">
+<!ENTITY % section.class	"section %local.section.class;">
+
+<!ENTITY % local.nav.class "">
+<!ENTITY % nav.class		"toc|lot|index|glossary|bibliography
+				%local.nav.class;">
+
+<!-- Redeclaration placeholder ............................................ -->
+
+<!-- For redeclaring entities that are declared after this point while
+     retaining their references to the entities that are declared before
+     this point -->
+
+<![%dbhier.redecl.module;[
+<!-- Defining rdbhier here makes some buggy XML parsers happy. -->
+<!ENTITY % rdbhier "">
+%rdbhier;
+<!--end of dbhier.redecl.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Entities for element mixtures ........................................ -->
+
+<!ENTITY % local.divcomponent.mix "">
+<!ENTITY % divcomponent.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|%compound.class;
+		|%genobj.class;		|%descobj.class;
+		|%ndxterm.class;        |beginpage
+                %forms.hook;
+		%local.divcomponent.mix;">
+
+<!ENTITY % local.refcomponent.mix "">
+<!ENTITY % refcomponent.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|%compound.class;
+		|%genobj.class;		|%descobj.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.refcomponent.mix;">
+
+<!ENTITY % local.indexdivcomponent.mix "">
+<!ENTITY % indexdivcomponent.mix
+		"itemizedlist|orderedlist|variablelist|simplelist
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|anchor|remark
+		|%link.char.class;
+ 		                        |beginpage
+		%local.indexdivcomponent.mix;">
+
+<!ENTITY % local.refname.char.mix "">
+<!ENTITY % refname.char.mix
+		"#PCDATA
+		|%tech.char.class;
+		%local.refname.char.mix;">
+
+<!ENTITY % local.partcontent.mix "">
+<!ENTITY % partcontent.mix
+		"%appendix.class;|%chapter.class;|%nav.class;|%article.class;
+		|preface|%refentry.class;|reference %local.partcontent.mix;">
+
+<!ENTITY % local.refinline.char.mix "">
+<!ENTITY % refinline.char.mix
+		"#PCDATA
+		|%xref.char.class;	|%gen.char.class;
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;	|%docinfo.char.class;
+		|%other.char.class;
+		|%ndxterm.class;        |beginpage
+		%local.refinline.char.mix;">
+
+<!ENTITY % local.refclass.char.mix "">
+<!ENTITY % refclass.char.mix
+		"#PCDATA
+		|application
+		%local.refclass.char.mix;">
+
+<!-- Redeclaration placeholder 2 .......................................... -->
+
+<!-- For redeclaring entities that are declared after this point while
+     retaining their references to the entities that are declared before
+     this point -->
+
+<![%dbhier.redecl2.module;[
+<!-- Defining rdbhier2 here makes some buggy XML parsers happy. -->
+<!ENTITY % rdbhier2 "">
+%rdbhier2;
+<!--end of dbhier.redecl2.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Entities for content models .......................................... -->
+
+<!ENTITY % div.title.content
+	"title, subtitle?, titleabbrev?">
+
+<!ENTITY % bookcomponent.title.content
+	"title, subtitle?, titleabbrev?">
+
+<!ENTITY % sect.title.content
+	"title, subtitle?, titleabbrev?">
+
+<!ENTITY % refsect.title.content
+	"title, subtitle?, titleabbrev?">
+
+<!ENTITY % bookcomponent.content
+	"((%divcomponent.mix;)+,
+	(sect1*|(%refentry.class;)*|simplesect*|(%section.class;)*))
+	| (sect1+|(%refentry.class;)+|simplesect+|(%section.class;)+)">
+
+<!-- ...................................................................... -->
+<!-- Set and SetInfo ...................................................... -->
+
+<!ENTITY % set.content.module "INCLUDE">
+<![%set.content.module;[
+<!ENTITY % set.module "INCLUDE">
+<![%set.module;[
+<!ENTITY % local.set.attrib "">
+<!ENTITY % set.role.attrib "%role.attrib;">
+
+<!ENTITY % set.element "INCLUDE">
+<![%set.element;[
+<!ELEMENT set %ho; ((%div.title.content;)?, setinfo?, toc?, (set|%book.class;)+,
+		setindex?)
+		%ubiq.inclusion;>
+<!--end of set.element-->]]>
+
+<!-- FPI: SGML formal public identifier -->
+
+
+<!ENTITY % set.attlist "INCLUDE">
+<![%set.attlist;[
+<!ATTLIST set
+		fpi		CDATA		#IMPLIED
+		%status.attrib;
+		%common.attrib;
+		%set.role.attrib;
+		%local.set.attrib;
+>
+<!--end of set.attlist-->]]>
+<!--end of set.module-->]]>
+
+<!ENTITY % setinfo.module "INCLUDE">
+<![%setinfo.module;[
+<!ENTITY % local.setinfo.attrib "">
+<!ENTITY % setinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % setinfo.element "INCLUDE">
+<![%setinfo.element;[
+<!ELEMENT setinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of setinfo.element-->]]>
+
+<!-- Contents: IDs of the ToC, Books, and SetIndex that comprise
+		the set, in the order of their appearance -->
+
+
+<!ENTITY % setinfo.attlist "INCLUDE">
+<![%setinfo.attlist;[
+<!ATTLIST setinfo
+		contents	IDREFS		#IMPLIED
+		%common.attrib;
+		%setinfo.role.attrib;
+		%local.setinfo.attrib;
+>
+<!--end of setinfo.attlist-->]]>
+<!--end of setinfo.module-->]]>
+<!--end of set.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Book and BookInfo .................................................... -->
+
+<!ENTITY % book.content.module "INCLUDE">
+<![%book.content.module;[
+<!ENTITY % book.module "INCLUDE">
+<![%book.module;[
+
+<!ENTITY % local.book.attrib "">
+<!ENTITY % book.role.attrib "%role.attrib;">
+
+<!ENTITY % book.element "INCLUDE">
+<![%book.element;[
+<!ELEMENT book %ho; ((%div.title.content;)?, bookinfo?,
+ 		(dedication | toc | lot
+ 		| glossary | bibliography | preface
+		| %chapter.class; | reference | part
+		| %article.class;
+ 		| %appendix.class;
+		| %index.class;
+		| colophon)*)
+		%ubiq.inclusion;>
+<!--end of book.element-->]]>
+
+<!-- FPI: SGML formal public identifier -->
+
+
+<!ENTITY % book.attlist "INCLUDE">
+<![%book.attlist;[
+<!ATTLIST book		fpi		CDATA		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%book.role.attrib;
+		%local.book.attrib;
+>
+<!--end of book.attlist-->]]>
+<!--end of book.module-->]]>
+
+<!ENTITY % bookinfo.module "INCLUDE">
+<![%bookinfo.module;[
+<!ENTITY % local.bookinfo.attrib "">
+<!ENTITY % bookinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % bookinfo.element "INCLUDE">
+<![%bookinfo.element;[
+<!ELEMENT bookinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of bookinfo.element-->]]>
+
+<!-- Contents: IDs of the ToC, LoTs, Prefaces, Parts, Chapters,
+		Appendixes, References, GLossary, Bibliography, and indexes
+		comprising the Book, in the order of their appearance -->
+
+
+<!ENTITY % bookinfo.attlist "INCLUDE">
+<![%bookinfo.attlist;[
+<!ATTLIST bookinfo
+		contents	IDREFS		#IMPLIED
+		%common.attrib;
+		%bookinfo.role.attrib;
+		%local.bookinfo.attrib;
+>
+<!--end of bookinfo.attlist-->]]>
+<!--end of bookinfo.module-->]]>
+<!--end of book.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Dedication, ToC, and LoT ............................................. -->
+
+<!ENTITY % dedication.module "INCLUDE">
+<![%dedication.module;[
+<!ENTITY % local.dedication.attrib "">
+<!ENTITY % dedication.role.attrib "%role.attrib;">
+
+<!ENTITY % dedication.element "INCLUDE">
+<![%dedication.element;[
+<!ELEMENT dedication %ho; ((%sect.title.content;)?, (%legalnotice.mix;)+)>
+<!--end of dedication.element-->]]>
+
+<!ENTITY % dedication.attlist "INCLUDE">
+<![%dedication.attlist;[
+<!ATTLIST dedication
+		%status.attrib;
+		%common.attrib;
+		%dedication.role.attrib;
+		%local.dedication.attrib;
+>
+<!--end of dedication.attlist-->]]>
+<!--end of dedication.module-->]]>
+
+<!ENTITY % colophon.module "INCLUDE">
+<![ %colophon.module; [
+<!ENTITY % local.colophon.attrib "">
+<!ENTITY % colophon.role.attrib "%role.attrib;">
+
+<!ENTITY % colophon.element "INCLUDE">
+<![ %colophon.element; [
+<!ELEMENT colophon %ho; ((%sect.title.content;)?, (%textobject.mix;)+)>
+<!--end of colophon.element-->]]>
+
+<!ENTITY % colophon.attlist "INCLUDE">
+<![ %colophon.attlist; [
+<!ATTLIST colophon
+		%status.attrib;
+		%common.attrib;
+		%colophon.role.attrib;
+		%local.colophon.attrib;>
+<!--end of colophon.attlist-->]]>
+<!--end of colophon.module-->]]>
+
+<!ENTITY % toc.content.module "INCLUDE">
+<![%toc.content.module;[
+<!ENTITY % toc.module "INCLUDE">
+<![%toc.module;[
+<!ENTITY % local.toc.attrib "">
+<!ENTITY % toc.role.attrib "%role.attrib;">
+
+<!ENTITY % toc.element "INCLUDE">
+<![%toc.element;[
+<!ELEMENT toc %ho; (beginpage?,
+		(%bookcomponent.title.content;)?,
+		tocfront*,
+		(tocpart | tocchap)*, tocback*)>
+<!--end of toc.element-->]]>
+
+<!ENTITY % toc.attlist "INCLUDE">
+<![%toc.attlist;[
+<!ATTLIST toc
+		%pagenum.attrib;
+		%common.attrib;
+		%toc.role.attrib;
+		%local.toc.attrib;
+>
+<!--end of toc.attlist-->]]>
+<!--end of toc.module-->]]>
+
+<!ENTITY % tocfront.module "INCLUDE">
+<![%tocfront.module;[
+<!ENTITY % local.tocfront.attrib "">
+<!ENTITY % tocfront.role.attrib "%role.attrib;">
+
+<!ENTITY % tocfront.element "INCLUDE">
+<![%tocfront.element;[
+<!ELEMENT tocfront %ho; (%para.char.mix;)*>
+<!--end of tocfront.element-->]]>
+
+<!-- to element that this entry represents -->
+
+
+<!ENTITY % tocfront.attlist "INCLUDE">
+<![%tocfront.attlist;[
+<!ATTLIST tocfront
+		%label.attrib;
+		%linkend.attrib;		%pagenum.attrib;
+		%common.attrib;
+		%tocfront.role.attrib;
+		%local.tocfront.attrib;
+>
+<!--end of tocfront.attlist-->]]>
+<!--end of tocfront.module-->]]>
+
+<!ENTITY % tocentry.module "INCLUDE">
+<![%tocentry.module;[
+<!ENTITY % local.tocentry.attrib "">
+<!ENTITY % tocentry.role.attrib "%role.attrib;">
+
+<!ENTITY % tocentry.element "INCLUDE">
+<![%tocentry.element;[
+<!ELEMENT tocentry %ho; (%para.char.mix;)*>
+<!--end of tocentry.element-->]]>
+
+<!-- to element that this entry represents -->
+
+
+<!ENTITY % tocentry.attlist "INCLUDE">
+<![%tocentry.attlist;[
+<!ATTLIST tocentry
+		%linkend.attrib;		%pagenum.attrib;
+		%common.attrib;
+		%tocentry.role.attrib;
+		%local.tocentry.attrib;
+>
+<!--end of tocentry.attlist-->]]>
+<!--end of tocentry.module-->]]>
+
+<!ENTITY % tocpart.module "INCLUDE">
+<![%tocpart.module;[
+<!ENTITY % local.tocpart.attrib "">
+<!ENTITY % tocpart.role.attrib "%role.attrib;">
+
+<!ENTITY % tocpart.element "INCLUDE">
+<![%tocpart.element;[
+<!ELEMENT tocpart %ho; (tocentry+, tocchap*)>
+<!--end of tocpart.element-->]]>
+
+<!ENTITY % tocpart.attlist "INCLUDE">
+<![%tocpart.attlist;[
+<!ATTLIST tocpart
+		%common.attrib;
+		%tocpart.role.attrib;
+		%local.tocpart.attrib;
+>
+<!--end of tocpart.attlist-->]]>
+<!--end of tocpart.module-->]]>
+
+<!ENTITY % tocchap.module "INCLUDE">
+<![%tocchap.module;[
+<!ENTITY % local.tocchap.attrib "">
+<!ENTITY % tocchap.role.attrib "%role.attrib;">
+
+<!ENTITY % tocchap.element "INCLUDE">
+<![%tocchap.element;[
+<!ELEMENT tocchap %ho; (tocentry+, toclevel1*)>
+<!--end of tocchap.element-->]]>
+
+<!ENTITY % tocchap.attlist "INCLUDE">
+<![%tocchap.attlist;[
+<!ATTLIST tocchap
+		%label.attrib;
+		%common.attrib;
+		%tocchap.role.attrib;
+		%local.tocchap.attrib;
+>
+<!--end of tocchap.attlist-->]]>
+<!--end of tocchap.module-->]]>
+
+<!ENTITY % toclevel1.module "INCLUDE">
+<![%toclevel1.module;[
+<!ENTITY % local.toclevel1.attrib "">
+<!ENTITY % toclevel1.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel1.element "INCLUDE">
+<![%toclevel1.element;[
+<!ELEMENT toclevel1 %ho; (tocentry+, toclevel2*)>
+<!--end of toclevel1.element-->]]>
+
+<!ENTITY % toclevel1.attlist "INCLUDE">
+<![%toclevel1.attlist;[
+<!ATTLIST toclevel1
+		%common.attrib;
+		%toclevel1.role.attrib;
+		%local.toclevel1.attrib;
+>
+<!--end of toclevel1.attlist-->]]>
+<!--end of toclevel1.module-->]]>
+
+<!ENTITY % toclevel2.module "INCLUDE">
+<![%toclevel2.module;[
+<!ENTITY % local.toclevel2.attrib "">
+<!ENTITY % toclevel2.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel2.element "INCLUDE">
+<![%toclevel2.element;[
+<!ELEMENT toclevel2 %ho; (tocentry+, toclevel3*)>
+<!--end of toclevel2.element-->]]>
+
+<!ENTITY % toclevel2.attlist "INCLUDE">
+<![%toclevel2.attlist;[
+<!ATTLIST toclevel2
+		%common.attrib;
+		%toclevel2.role.attrib;
+		%local.toclevel2.attrib;
+>
+<!--end of toclevel2.attlist-->]]>
+<!--end of toclevel2.module-->]]>
+
+<!ENTITY % toclevel3.module "INCLUDE">
+<![%toclevel3.module;[
+<!ENTITY % local.toclevel3.attrib "">
+<!ENTITY % toclevel3.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel3.element "INCLUDE">
+<![%toclevel3.element;[
+<!ELEMENT toclevel3 %ho; (tocentry+, toclevel4*)>
+<!--end of toclevel3.element-->]]>
+
+<!ENTITY % toclevel3.attlist "INCLUDE">
+<![%toclevel3.attlist;[
+<!ATTLIST toclevel3
+		%common.attrib;
+		%toclevel3.role.attrib;
+		%local.toclevel3.attrib;
+>
+<!--end of toclevel3.attlist-->]]>
+<!--end of toclevel3.module-->]]>
+
+<!ENTITY % toclevel4.module "INCLUDE">
+<![%toclevel4.module;[
+<!ENTITY % local.toclevel4.attrib "">
+<!ENTITY % toclevel4.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel4.element "INCLUDE">
+<![%toclevel4.element;[
+<!ELEMENT toclevel4 %ho; (tocentry+, toclevel5*)>
+<!--end of toclevel4.element-->]]>
+
+<!ENTITY % toclevel4.attlist "INCLUDE">
+<![%toclevel4.attlist;[
+<!ATTLIST toclevel4
+		%common.attrib;
+		%toclevel4.role.attrib;
+		%local.toclevel4.attrib;
+>
+<!--end of toclevel4.attlist-->]]>
+<!--end of toclevel4.module-->]]>
+
+<!ENTITY % toclevel5.module "INCLUDE">
+<![%toclevel5.module;[
+<!ENTITY % local.toclevel5.attrib "">
+<!ENTITY % toclevel5.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel5.element "INCLUDE">
+<![%toclevel5.element;[
+<!ELEMENT toclevel5 %ho; (tocentry+)>
+<!--end of toclevel5.element-->]]>
+
+<!ENTITY % toclevel5.attlist "INCLUDE">
+<![%toclevel5.attlist;[
+<!ATTLIST toclevel5
+		%common.attrib;
+		%toclevel5.role.attrib;
+		%local.toclevel5.attrib;
+>
+<!--end of toclevel5.attlist-->]]>
+<!--end of toclevel5.module-->]]>
+
+<!ENTITY % tocback.module "INCLUDE">
+<![%tocback.module;[
+<!ENTITY % local.tocback.attrib "">
+<!ENTITY % tocback.role.attrib "%role.attrib;">
+
+<!ENTITY % tocback.element "INCLUDE">
+<![%tocback.element;[
+<!ELEMENT tocback %ho; (%para.char.mix;)*>
+<!--end of tocback.element-->]]>
+
+<!-- to element that this entry represents -->
+
+
+<!ENTITY % tocback.attlist "INCLUDE">
+<![%tocback.attlist;[
+<!ATTLIST tocback
+		%label.attrib;
+		%linkend.attrib;		%pagenum.attrib;
+		%common.attrib;
+		%tocback.role.attrib;
+		%local.tocback.attrib;
+>
+<!--end of tocback.attlist-->]]>
+<!--end of tocback.module-->]]>
+<!--end of toc.content.module-->]]>
+
+<!ENTITY % lot.content.module "INCLUDE">
+<![%lot.content.module;[
+<!ENTITY % lot.module "INCLUDE">
+<![%lot.module;[
+<!ENTITY % local.lot.attrib "">
+<!ENTITY % lot.role.attrib "%role.attrib;">
+
+<!ENTITY % lot.element "INCLUDE">
+<![%lot.element;[
+<!ELEMENT lot %ho; (beginpage?, (%bookcomponent.title.content;)?, lotentry*)>
+<!--end of lot.element-->]]>
+
+<!ENTITY % lot.attlist "INCLUDE">
+<![%lot.attlist;[
+<!ATTLIST lot
+		%label.attrib;
+		%common.attrib;
+		%lot.role.attrib;
+		%local.lot.attrib;
+>
+<!--end of lot.attlist-->]]>
+<!--end of lot.module-->]]>
+
+<!ENTITY % lotentry.module "INCLUDE">
+<![%lotentry.module;[
+<!ENTITY % local.lotentry.attrib "">
+<!ENTITY % lotentry.role.attrib "%role.attrib;">
+
+<!ENTITY % lotentry.element "INCLUDE">
+<![%lotentry.element;[
+<!ELEMENT lotentry %ho; (%para.char.mix;)*>
+<!--end of lotentry.element-->]]>
+
+<!-- SrcCredit: Information about the source of the entry,
+		as for a list of illustrations -->
+<!-- linkend: to element that this entry represents-->
+<!ENTITY % lotentry.attlist "INCLUDE">
+<![%lotentry.attlist;[
+<!ATTLIST lotentry
+		%linkend.attrib;
+		%pagenum.attrib;
+		srccredit	CDATA		#IMPLIED
+		%common.attrib;
+		%lotentry.role.attrib;
+		%local.lotentry.attrib;
+>
+<!--end of lotentry.attlist-->]]>
+<!--end of lotentry.module-->]]>
+<!--end of lot.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Appendix, Chapter, Part, Preface, Reference, PartIntro ............... -->
+
+<!ENTITY % appendix.module "INCLUDE">
+<![%appendix.module;[
+<!ENTITY % local.appendix.attrib "">
+<!ENTITY % appendix.role.attrib "%role.attrib;">
+
+<!ENTITY % appendix.element "INCLUDE">
+<![%appendix.element;[
+<!ELEMENT appendix %ho; (beginpage?,
+                     appendixinfo?,
+                     (%bookcomponent.title.content;),
+                     (%nav.class;)*,
+                     tocchap?,
+                     (%bookcomponent.content;),
+                     (%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of appendix.element-->]]>
+
+<!ENTITY % appendix.attlist "INCLUDE">
+<![%appendix.attlist;[
+<!ATTLIST appendix
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%appendix.role.attrib;
+		%local.appendix.attrib;
+>
+<!--end of appendix.attlist-->]]>
+<!--end of appendix.module-->]]>
+
+<!ENTITY % chapter.module "INCLUDE">
+<![%chapter.module;[
+<!ENTITY % local.chapter.attrib "">
+<!ENTITY % chapter.role.attrib "%role.attrib;">
+
+<!ENTITY % chapter.element "INCLUDE">
+<![%chapter.element;[
+<!ELEMENT chapter %ho; (beginpage?,
+                    chapterinfo?,
+                    (%bookcomponent.title.content;),
+                    (%nav.class;)*,
+                    tocchap?,
+                    (%bookcomponent.content;),
+                    (%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of chapter.element-->]]>
+
+<!ENTITY % chapter.attlist "INCLUDE">
+<![%chapter.attlist;[
+<!ATTLIST chapter
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%chapter.role.attrib;
+		%local.chapter.attrib;
+>
+<!--end of chapter.attlist-->]]>
+<!--end of chapter.module-->]]>
+
+<!ENTITY % part.module "INCLUDE">
+<![%part.module;[
+
+<!-- Note that Part was to have its content model reduced in V4.4.  This
+change will not be made after all. -->
+
+<!ENTITY % local.part.attrib "">
+<!ENTITY % part.role.attrib "%role.attrib;">
+
+<!ENTITY % part.element "INCLUDE">
+<![%part.element;[
+<!ELEMENT part %ho; (beginpage?,
+                partinfo?, (%bookcomponent.title.content;), partintro?,
+		(%partcontent.mix;)+)
+		%ubiq.inclusion;>
+<!--end of part.element-->]]>
+
+<!ENTITY % part.attlist "INCLUDE">
+<![%part.attlist;[
+<!ATTLIST part
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%part.role.attrib;
+		%local.part.attrib;
+>
+<!--end of part.attlist-->]]>
+<!--ELEMENT PartIntro (defined below)-->
+<!--end of part.module-->]]>
+
+<!ENTITY % preface.module "INCLUDE">
+<![%preface.module;[
+<!ENTITY % local.preface.attrib "">
+<!ENTITY % preface.role.attrib "%role.attrib;">
+
+<!ENTITY % preface.element "INCLUDE">
+<![%preface.element;[
+<!ELEMENT preface %ho; (beginpage?,
+                    prefaceinfo?,
+                    (%bookcomponent.title.content;),
+                    (%nav.class;)*,
+                    tocchap?,
+                    (%bookcomponent.content;),
+                    (%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of preface.element-->]]>
+
+<!ENTITY % preface.attlist "INCLUDE">
+<![%preface.attlist;[
+<!ATTLIST preface
+		%status.attrib;
+		%common.attrib;
+		%preface.role.attrib;
+		%local.preface.attrib;
+>
+<!--end of preface.attlist-->]]>
+<!--end of preface.module-->]]>
+
+<!ENTITY % reference.module "INCLUDE">
+<![%reference.module;[
+<!ENTITY % local.reference.attrib "">
+<!ENTITY % reference.role.attrib "%role.attrib;">
+
+<!ENTITY % reference.element "INCLUDE">
+<![%reference.element;[
+<!ELEMENT reference %ho; (beginpage?,
+                     referenceinfo?,
+                     (%bookcomponent.title.content;), partintro?,
+                     (%refentry.class;)+)
+		%ubiq.inclusion;>
+<!--end of reference.element-->]]>
+
+<!ENTITY % reference.attlist "INCLUDE">
+<![%reference.attlist;[
+<!ATTLIST reference
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%reference.role.attrib;
+		%local.reference.attrib;
+>
+<!--end of reference.attlist-->]]>
+<!--ELEMENT PartIntro (defined below)-->
+<!--end of reference.module-->]]>
+
+<!ENTITY % partintro.module "INCLUDE">
+<![%partintro.module;[
+<!ENTITY % local.partintro.attrib "">
+<!ENTITY % partintro.role.attrib "%role.attrib;">
+
+<!ENTITY % partintro.element "INCLUDE">
+<![%partintro.element;[
+<!ELEMENT partintro %ho; ((%div.title.content;)?, (%bookcomponent.content;))
+		%ubiq.inclusion;>
+<!--end of partintro.element-->]]>
+
+<!ENTITY % partintro.attlist "INCLUDE">
+<![%partintro.attlist;[
+<!ATTLIST partintro
+		%label.attrib;
+		%common.attrib;
+		%partintro.role.attrib;
+		%local.partintro.attrib;
+>
+<!--end of partintro.attlist-->]]>
+<!--end of partintro.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Other Info elements .................................................. -->
+
+<!ENTITY % appendixinfo.module "INCLUDE">
+<![ %appendixinfo.module; [
+<!ENTITY % local.appendixinfo.attrib "">
+<!ENTITY % appendixinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % appendixinfo.element "INCLUDE">
+<![ %appendixinfo.element; [
+<!ELEMENT appendixinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of appendixinfo.element-->]]>
+
+<!ENTITY % appendixinfo.attlist "INCLUDE">
+<![ %appendixinfo.attlist; [
+<!ATTLIST appendixinfo
+		%common.attrib;
+		%appendixinfo.role.attrib;
+		%local.appendixinfo.attrib;
+>
+<!--end of appendixinfo.attlist-->]]>
+<!--end of appendixinfo.module-->]]>
+
+<!ENTITY % bibliographyinfo.module "INCLUDE">
+<![ %bibliographyinfo.module; [
+<!ENTITY % local.bibliographyinfo.attrib "">
+<!ENTITY % bibliographyinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliographyinfo.element "INCLUDE">
+<![ %bibliographyinfo.element; [
+<!ELEMENT bibliographyinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of bibliographyinfo.element-->]]>
+
+<!ENTITY % bibliographyinfo.attlist "INCLUDE">
+<![ %bibliographyinfo.attlist; [
+<!ATTLIST bibliographyinfo
+		%common.attrib;
+		%bibliographyinfo.role.attrib;
+		%local.bibliographyinfo.attrib;
+>
+<!--end of bibliographyinfo.attlist-->]]>
+<!--end of bibliographyinfo.module-->]]>
+
+<!ENTITY % chapterinfo.module "INCLUDE">
+<![ %chapterinfo.module; [
+<!ENTITY % local.chapterinfo.attrib "">
+<!ENTITY % chapterinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % chapterinfo.element "INCLUDE">
+<![ %chapterinfo.element; [
+<!ELEMENT chapterinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of chapterinfo.element-->]]>
+
+<!ENTITY % chapterinfo.attlist "INCLUDE">
+<![ %chapterinfo.attlist; [
+<!ATTLIST chapterinfo
+		%common.attrib;
+		%chapterinfo.role.attrib;
+		%local.chapterinfo.attrib;
+>
+<!--end of chapterinfo.attlist-->]]>
+<!--end of chapterinfo.module-->]]>
+
+<!ENTITY % glossaryinfo.module "INCLUDE">
+<![ %glossaryinfo.module; [
+<!ENTITY % local.glossaryinfo.attrib "">
+<!ENTITY % glossaryinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % glossaryinfo.element "INCLUDE">
+<![ %glossaryinfo.element; [
+<!ELEMENT glossaryinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of glossaryinfo.element-->]]>
+
+<!ENTITY % glossaryinfo.attlist "INCLUDE">
+<![ %glossaryinfo.attlist; [
+<!ATTLIST glossaryinfo
+		%common.attrib;
+		%glossaryinfo.role.attrib;
+		%local.glossaryinfo.attrib;
+>
+<!--end of glossaryinfo.attlist-->]]>
+<!--end of glossaryinfo.module-->]]>
+
+<!ENTITY % indexinfo.module "INCLUDE">
+<![ %indexinfo.module; [
+<!ENTITY % local.indexinfo.attrib "">
+<!ENTITY % indexinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % indexinfo.element "INCLUDE">
+<![ %indexinfo.element; [
+<!ELEMENT indexinfo %ho; ((%info.class;)+)>
+<!--end of indexinfo.element-->]]>
+
+<!ENTITY % indexinfo.attlist "INCLUDE">
+<![ %indexinfo.attlist; [
+<!ATTLIST indexinfo
+		%common.attrib;
+		%indexinfo.role.attrib;
+		%local.indexinfo.attrib;
+>
+<!--end of indexinfo.attlist-->]]>
+<!--end of indexinfo.module-->]]>
+
+<!ENTITY % setindexinfo.module "INCLUDE">
+<![ %setindexinfo.module; [
+<!ENTITY % local.setindexinfo.attrib "">
+<!ENTITY % setindexinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % setindexinfo.element "INCLUDE">
+<![ %setindexinfo.element; [
+<!ELEMENT setindexinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of setindexinfo.element-->]]>
+
+<!ENTITY % setindexinfo.attlist "INCLUDE">
+<![ %setindexinfo.attlist; [
+<!ATTLIST setindexinfo
+		%common.attrib;
+		%setindexinfo.role.attrib;
+		%local.setindexinfo.attrib;
+>
+<!--end of setindexinfo.attlist-->]]>
+<!--end of setindexinfo.module-->]]>
+
+<!ENTITY % partinfo.module "INCLUDE">
+<![ %partinfo.module; [
+<!ENTITY % local.partinfo.attrib "">
+<!ENTITY % partinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % partinfo.element "INCLUDE">
+<![ %partinfo.element; [
+<!ELEMENT partinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of partinfo.element-->]]>
+
+<!ENTITY % partinfo.attlist "INCLUDE">
+<![ %partinfo.attlist; [
+<!ATTLIST partinfo
+		%common.attrib;
+		%partinfo.role.attrib;
+		%local.partinfo.attrib;
+>
+<!--end of partinfo.attlist-->]]>
+<!--end of partinfo.module-->]]>
+
+<!ENTITY % prefaceinfo.module "INCLUDE">
+<![ %prefaceinfo.module; [
+<!ENTITY % local.prefaceinfo.attrib "">
+<!ENTITY % prefaceinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % prefaceinfo.element "INCLUDE">
+<![ %prefaceinfo.element; [
+<!ELEMENT prefaceinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of prefaceinfo.element-->]]>
+
+<!ENTITY % prefaceinfo.attlist "INCLUDE">
+<![ %prefaceinfo.attlist; [
+<!ATTLIST prefaceinfo
+		%common.attrib;
+		%prefaceinfo.role.attrib;
+		%local.prefaceinfo.attrib;
+>
+<!--end of prefaceinfo.attlist-->]]>
+<!--end of prefaceinfo.module-->]]>
+
+<!ENTITY % refentryinfo.module "INCLUDE">
+<![ %refentryinfo.module; [
+<!ENTITY % local.refentryinfo.attrib "">
+<!ENTITY % refentryinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % refentryinfo.element "INCLUDE">
+<![ %refentryinfo.element; [
+<!ELEMENT refentryinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refentryinfo.element-->]]>
+
+<!ENTITY % refentryinfo.attlist "INCLUDE">
+<![ %refentryinfo.attlist; [
+<!ATTLIST refentryinfo
+		%common.attrib;
+		%refentryinfo.role.attrib;
+		%local.refentryinfo.attrib;
+>
+<!--end of refentryinfo.attlist-->]]>
+<!--end of refentryinfo.module-->]]>
+
+<!ENTITY % refsectioninfo.module "INCLUDE">
+<![ %refsectioninfo.module; [
+<!ENTITY % local.refsectioninfo.attrib "">
+<!ENTITY % refsectioninfo.role.attrib "%role.attrib;">
+
+<!ENTITY % refsectioninfo.element "INCLUDE">
+<![ %refsectioninfo.element; [
+<!ELEMENT refsectioninfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsectioninfo.element-->]]>
+
+<!ENTITY % refsectioninfo.attlist "INCLUDE">
+<![ %refsectioninfo.attlist; [
+<!ATTLIST refsectioninfo
+		%common.attrib;
+		%refsectioninfo.role.attrib;
+		%local.refsectioninfo.attrib;
+>
+<!--end of refsectioninfo.attlist-->]]>
+<!--end of refsectioninfo.module-->]]>
+
+<!ENTITY % refsect1info.module "INCLUDE">
+<![ %refsect1info.module; [
+<!ENTITY % local.refsect1info.attrib "">
+<!ENTITY % refsect1info.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect1info.element "INCLUDE">
+<![ %refsect1info.element; [
+<!ELEMENT refsect1info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsect1info.element-->]]>
+
+<!ENTITY % refsect1info.attlist "INCLUDE">
+<![ %refsect1info.attlist; [
+<!ATTLIST refsect1info
+		%common.attrib;
+		%refsect1info.role.attrib;
+		%local.refsect1info.attrib;
+>
+<!--end of refsect1info.attlist-->]]>
+<!--end of refsect1info.module-->]]>
+
+<!ENTITY % refsect2info.module "INCLUDE">
+<![ %refsect2info.module; [
+<!ENTITY % local.refsect2info.attrib "">
+<!ENTITY % refsect2info.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect2info.element "INCLUDE">
+<![ %refsect2info.element; [
+<!ELEMENT refsect2info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsect2info.element-->]]>
+
+<!ENTITY % refsect2info.attlist "INCLUDE">
+<![ %refsect2info.attlist; [
+<!ATTLIST refsect2info
+		%common.attrib;
+		%refsect2info.role.attrib;
+		%local.refsect2info.attrib;
+>
+<!--end of refsect2info.attlist-->]]>
+<!--end of refsect2info.module-->]]>
+
+<!ENTITY % refsect3info.module "INCLUDE">
+<![ %refsect3info.module; [
+<!ENTITY % local.refsect3info.attrib "">
+<!ENTITY % refsect3info.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect3info.element "INCLUDE">
+<![ %refsect3info.element; [
+<!ELEMENT refsect3info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsect3info.element-->]]>
+
+<!ENTITY % refsect3info.attlist "INCLUDE">
+<![ %refsect3info.attlist; [
+<!ATTLIST refsect3info
+		%common.attrib;
+		%refsect3info.role.attrib;
+		%local.refsect3info.attrib;
+>
+<!--end of refsect3info.attlist-->]]>
+<!--end of refsect3info.module-->]]>
+
+<!ENTITY % refsynopsisdivinfo.module "INCLUDE">
+<![ %refsynopsisdivinfo.module; [
+<!ENTITY % local.refsynopsisdivinfo.attrib "">
+<!ENTITY % refsynopsisdivinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % refsynopsisdivinfo.element "INCLUDE">
+<![ %refsynopsisdivinfo.element; [
+<!ELEMENT refsynopsisdivinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsynopsisdivinfo.element-->]]>
+
+<!ENTITY % refsynopsisdivinfo.attlist "INCLUDE">
+<![ %refsynopsisdivinfo.attlist; [
+<!ATTLIST refsynopsisdivinfo
+		%common.attrib;
+		%refsynopsisdivinfo.role.attrib;
+		%local.refsynopsisdivinfo.attrib;
+>
+<!--end of refsynopsisdivinfo.attlist-->]]>
+<!--end of refsynopsisdivinfo.module-->]]>
+
+<!ENTITY % referenceinfo.module "INCLUDE">
+<![ %referenceinfo.module; [
+<!ENTITY % local.referenceinfo.attrib "">
+<!ENTITY % referenceinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % referenceinfo.element "INCLUDE">
+<![ %referenceinfo.element; [
+<!ELEMENT referenceinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of referenceinfo.element-->]]>
+
+<!ENTITY % referenceinfo.attlist "INCLUDE">
+<![ %referenceinfo.attlist; [
+<!ATTLIST referenceinfo
+		%common.attrib;
+		%referenceinfo.role.attrib;
+		%local.referenceinfo.attrib;
+>
+<!--end of referenceinfo.attlist-->]]>
+<!--end of referenceinfo.module-->]]>
+
+<!ENTITY % local.sect1info.attrib "">
+<!ENTITY % sect1info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect1info.element "INCLUDE">
+<![%sect1info.element;[
+<!ELEMENT sect1info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect1info.element-->]]>
+
+<!ENTITY % sect1info.attlist "INCLUDE">
+<![%sect1info.attlist;[
+<!ATTLIST sect1info
+		%common.attrib;
+		%sect1info.role.attrib;
+		%local.sect1info.attrib;
+>
+<!--end of sect1info.attlist-->]]>
+
+<!ENTITY % local.sect2info.attrib "">
+<!ENTITY % sect2info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect2info.element "INCLUDE">
+<![%sect2info.element;[
+<!ELEMENT sect2info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect2info.element-->]]>
+
+<!ENTITY % sect2info.attlist "INCLUDE">
+<![%sect2info.attlist;[
+<!ATTLIST sect2info
+		%common.attrib;
+		%sect2info.role.attrib;
+		%local.sect2info.attrib;
+>
+<!--end of sect2info.attlist-->]]>
+
+<!ENTITY % local.sect3info.attrib "">
+<!ENTITY % sect3info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect3info.element "INCLUDE">
+<![%sect3info.element;[
+<!ELEMENT sect3info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect3info.element-->]]>
+
+<!ENTITY % sect3info.attlist "INCLUDE">
+<![%sect3info.attlist;[
+<!ATTLIST sect3info
+		%common.attrib;
+		%sect3info.role.attrib;
+		%local.sect3info.attrib;
+>
+<!--end of sect3info.attlist-->]]>
+
+<!ENTITY % local.sect4info.attrib "">
+<!ENTITY % sect4info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect4info.element "INCLUDE">
+<![%sect4info.element;[
+<!ELEMENT sect4info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect4info.element-->]]>
+
+<!ENTITY % sect4info.attlist "INCLUDE">
+<![%sect4info.attlist;[
+<!ATTLIST sect4info
+		%common.attrib;
+		%sect4info.role.attrib;
+		%local.sect4info.attrib;
+>
+<!--end of sect4info.attlist-->]]>
+
+<!ENTITY % local.sect5info.attrib "">
+<!ENTITY % sect5info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect5info.element "INCLUDE">
+<![%sect5info.element;[
+<!ELEMENT sect5info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect5info.element-->]]>
+
+<!ENTITY % sect5info.attlist "INCLUDE">
+<![%sect5info.attlist;[
+<!ATTLIST sect5info
+		%common.attrib;
+		%sect5info.role.attrib;
+		%local.sect5info.attrib;
+>
+<!--end of sect5info.attlist-->]]>
+
+<!-- ...................................................................... -->
+<!-- Section (parallel to Sect*) ......................................... -->
+
+<!ENTITY % section.content.module "INCLUDE">
+<![ %section.content.module; [
+<!ENTITY % section.module "INCLUDE">
+<![ %section.module; [
+<!ENTITY % local.section.attrib "">
+<!ENTITY % section.role.attrib "%role.attrib;">
+
+<!ENTITY % section.element "INCLUDE">
+<![ %section.element; [
+<!ELEMENT section %ho; (sectioninfo?,
+			(%sect.title.content;),
+			(%nav.class;)*,
+			(((%divcomponent.mix;)+,
+ 			  ((%refentry.class;)*|(%section.class;)*|simplesect*))
+			 | (%refentry.class;)+|(%section.class;)+|simplesect+),
+			(%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of section.element-->]]>
+
+<!ENTITY % section.attlist "INCLUDE">
+<![ %section.attlist; [
+<!ATTLIST section
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%section.role.attrib;
+		%local.section.attrib;
+>
+<!--end of section.attlist-->]]>
+<!--end of section.module-->]]>
+
+<!ENTITY % sectioninfo.module "INCLUDE">
+<![ %sectioninfo.module; [
+<!ENTITY % sectioninfo.role.attrib "%role.attrib;">
+<!ENTITY % local.sectioninfo.attrib "">
+
+<!ENTITY % sectioninfo.element "INCLUDE">
+<![ %sectioninfo.element; [
+<!ELEMENT sectioninfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sectioninfo.element-->]]>
+
+<!ENTITY % sectioninfo.attlist "INCLUDE">
+<![ %sectioninfo.attlist; [
+<!ATTLIST sectioninfo
+		%common.attrib;
+		%sectioninfo.role.attrib;
+		%local.sectioninfo.attrib;
+>
+<!--end of sectioninfo.attlist-->]]>
+<!--end of sectioninfo.module-->]]>
+<!--end of section.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Sect1, Sect2, Sect3, Sect4, Sect5 .................................... -->
+
+<!ENTITY % sect1.module "INCLUDE">
+<![%sect1.module;[
+<!ENTITY % local.sect1.attrib "">
+<!ENTITY % sect1.role.attrib "%role.attrib;">
+
+<!ENTITY % sect1.element "INCLUDE">
+<![%sect1.element;[
+<!ELEMENT sect1 %ho; (sect1info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+,
+		((%refentry.class;)* | sect2* | simplesect*))
+		| (%refentry.class;)+ | sect2+ | simplesect+), (%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of sect1.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect1.attlist "INCLUDE">
+<![%sect1.attlist;[
+<!ATTLIST sect1
+		renderas	(sect2
+				|sect3
+				|sect4
+				|sect5)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect1.role.attrib;
+		%local.sect1.attrib;
+>
+<!--end of sect1.attlist-->]]>
+<!--end of sect1.module-->]]>
+
+<!ENTITY % sect2.module "INCLUDE">
+<![%sect2.module;[
+<!ENTITY % local.sect2.attrib "">
+<!ENTITY % sect2.role.attrib "%role.attrib;">
+
+<!ENTITY % sect2.element "INCLUDE">
+<![%sect2.element;[
+<!ELEMENT sect2 %ho; (sect2info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+,
+		((%refentry.class;)* | sect3* | simplesect*))
+		| (%refentry.class;)+ | sect3+ | simplesect+), (%nav.class;)*)>
+<!--end of sect2.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect2.attlist "INCLUDE">
+<![%sect2.attlist;[
+<!ATTLIST sect2
+		renderas	(sect1
+				|sect3
+				|sect4
+				|sect5)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect2.role.attrib;
+		%local.sect2.attrib;
+>
+<!--end of sect2.attlist-->]]>
+<!--end of sect2.module-->]]>
+
+<!ENTITY % sect3.module "INCLUDE">
+<![%sect3.module;[
+<!ENTITY % local.sect3.attrib "">
+<!ENTITY % sect3.role.attrib "%role.attrib;">
+
+<!ENTITY % sect3.element "INCLUDE">
+<![%sect3.element;[
+<!ELEMENT sect3 %ho; (sect3info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+,
+		((%refentry.class;)* | sect4* | simplesect*))
+		| (%refentry.class;)+ | sect4+ | simplesect+), (%nav.class;)*)>
+<!--end of sect3.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect3.attlist "INCLUDE">
+<![%sect3.attlist;[
+<!ATTLIST sect3
+		renderas	(sect1
+				|sect2
+				|sect4
+				|sect5)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect3.role.attrib;
+		%local.sect3.attrib;
+>
+<!--end of sect3.attlist-->]]>
+<!--end of sect3.module-->]]>
+
+<!ENTITY % sect4.module "INCLUDE">
+<![%sect4.module;[
+<!ENTITY % local.sect4.attrib "">
+<!ENTITY % sect4.role.attrib "%role.attrib;">
+
+<!ENTITY % sect4.element "INCLUDE">
+<![%sect4.element;[
+<!ELEMENT sect4 %ho; (sect4info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+,
+		((%refentry.class;)* | sect5* | simplesect*))
+		| (%refentry.class;)+ | sect5+ | simplesect+), (%nav.class;)*)>
+<!--end of sect4.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect4.attlist "INCLUDE">
+<![%sect4.attlist;[
+<!ATTLIST sect4
+		renderas	(sect1
+				|sect2
+				|sect3
+				|sect5)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect4.role.attrib;
+		%local.sect4.attrib;
+>
+<!--end of sect4.attlist-->]]>
+<!--end of sect4.module-->]]>
+
+<!ENTITY % sect5.module "INCLUDE">
+<![%sect5.module;[
+<!ENTITY % local.sect5.attrib "">
+<!ENTITY % sect5.role.attrib "%role.attrib;">
+
+<!ENTITY % sect5.element "INCLUDE">
+<![%sect5.element;[
+<!ELEMENT sect5 %ho; (sect5info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+, ((%refentry.class;)* | simplesect*))
+		| (%refentry.class;)+ | simplesect+), (%nav.class;)*)>
+<!--end of sect5.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect5.attlist "INCLUDE">
+<![%sect5.attlist;[
+<!ATTLIST sect5
+		renderas	(sect1
+				|sect2
+				|sect3
+				|sect4)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect5.role.attrib;
+		%local.sect5.attrib;
+>
+<!--end of sect5.attlist-->]]>
+<!--end of sect5.module-->]]>
+
+<!ENTITY % simplesect.module "INCLUDE">
+<![%simplesect.module;[
+<!ENTITY % local.simplesect.attrib "">
+<!ENTITY % simplesect.role.attrib "%role.attrib;">
+
+<!ENTITY % simplesect.element "INCLUDE">
+<![%simplesect.element;[
+<!ELEMENT simplesect %ho; ((%sect.title.content;), (%divcomponent.mix;)+)
+		%ubiq.inclusion;>
+<!--end of simplesect.element-->]]>
+
+<!ENTITY % simplesect.attlist "INCLUDE">
+<![%simplesect.attlist;[
+<!ATTLIST simplesect
+		%common.attrib;
+		%simplesect.role.attrib;
+		%local.simplesect.attrib;
+>
+<!--end of simplesect.attlist-->]]>
+<!--end of simplesect.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Bibliography ......................................................... -->
+
+<!ENTITY % bibliography.content.module "INCLUDE">
+<![%bibliography.content.module;[
+<!ENTITY % bibliography.module "INCLUDE">
+<![%bibliography.module;[
+<!ENTITY % local.bibliography.attrib "">
+<!ENTITY % bibliography.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliography.element "INCLUDE">
+<![%bibliography.element;[
+<!ELEMENT bibliography %ho; (bibliographyinfo?,
+                        (%bookcomponent.title.content;)?,
+                        (%component.mix;)*,
+                        (bibliodiv+ | (biblioentry|bibliomixed)+))>
+<!--end of bibliography.element-->]]>
+
+<!ENTITY % bibliography.attlist "INCLUDE">
+<![%bibliography.attlist;[
+<!ATTLIST bibliography
+		%status.attrib;
+		%common.attrib;
+		%bibliography.role.attrib;
+		%local.bibliography.attrib;
+>
+<!--end of bibliography.attlist-->]]>
+<!--end of bibliography.module-->]]>
+
+<!ENTITY % bibliodiv.module "INCLUDE">
+<![%bibliodiv.module;[
+<!ENTITY % local.bibliodiv.attrib "">
+<!ENTITY % bibliodiv.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliodiv.element "INCLUDE">
+<![%bibliodiv.element;[
+<!ELEMENT bibliodiv %ho; ((%sect.title.content;)?, (%component.mix;)*,
+		(biblioentry|bibliomixed)+)>
+<!--end of bibliodiv.element-->]]>
+
+<!ENTITY % bibliodiv.attlist "INCLUDE">
+<![%bibliodiv.attlist;[
+<!ATTLIST bibliodiv
+		%status.attrib;
+		%common.attrib;
+		%bibliodiv.role.attrib;
+		%local.bibliodiv.attrib;
+>
+<!--end of bibliodiv.attlist-->]]>
+<!--end of bibliodiv.module-->]]>
+<!--end of bibliography.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Glossary ............................................................. -->
+
+<!ENTITY % glossary.content.module "INCLUDE">
+<![%glossary.content.module;[
+<!ENTITY % glossary.module "INCLUDE">
+<![%glossary.module;[
+<!ENTITY % local.glossary.attrib "">
+<!ENTITY % glossary.role.attrib "%role.attrib;">
+
+<!ENTITY % glossary.element "INCLUDE">
+<![%glossary.element;[
+<!ELEMENT glossary %ho; (glossaryinfo?,
+                    (%bookcomponent.title.content;)?,
+                    (%component.mix;)*,
+                    (glossdiv+ | glossentry+), bibliography?)>
+<!--end of glossary.element-->]]>
+
+<!ENTITY % glossary.attlist "INCLUDE">
+<![%glossary.attlist;[
+<!ATTLIST glossary
+		%status.attrib;
+		%common.attrib;
+		%glossary.role.attrib;
+		%local.glossary.attrib;
+>
+<!--end of glossary.attlist-->]]>
+<!--end of glossary.module-->]]>
+
+<!ENTITY % glossdiv.module "INCLUDE">
+<![%glossdiv.module;[
+<!ENTITY % local.glossdiv.attrib "">
+<!ENTITY % glossdiv.role.attrib "%role.attrib;">
+
+<!ENTITY % glossdiv.element "INCLUDE">
+<![%glossdiv.element;[
+<!ELEMENT glossdiv %ho; ((%sect.title.content;), (%component.mix;)*,
+		glossentry+)>
+<!--end of glossdiv.element-->]]>
+
+<!ENTITY % glossdiv.attlist "INCLUDE">
+<![%glossdiv.attlist;[
+<!ATTLIST glossdiv
+		%status.attrib;
+		%common.attrib;
+		%glossdiv.role.attrib;
+		%local.glossdiv.attrib;
+>
+<!--end of glossdiv.attlist-->]]>
+<!--end of glossdiv.module-->]]>
+<!--end of glossary.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Index and SetIndex ................................................... -->
+
+<!ENTITY % index.content.module "INCLUDE">
+<![%index.content.module;[
+<!ENTITY % indexes.module "INCLUDE">
+<![%indexes.module;[
+<!ENTITY % local.indexes.attrib "">
+<!ENTITY % indexes.role.attrib "%role.attrib;">
+
+<!ENTITY % index.element "INCLUDE">
+<![%index.element;[
+<!ELEMENT index %ho; (indexinfo?,
+                 (%bookcomponent.title.content;)?,
+                 (%component.mix;)*,
+                 (indexdiv* | indexentry*))
+		%ndxterm.exclusion;>
+<!--end of index.element-->]]>
+
+<!ENTITY % index.attlist "INCLUDE">
+<![%index.attlist;[
+<!ATTLIST index
+		type		CDATA		#IMPLIED
+		%common.attrib;
+		%indexes.role.attrib;
+		%local.indexes.attrib;
+>
+<!--end of index.attlist-->]]>
+
+<!ENTITY % setindex.element "INCLUDE">
+<![%setindex.element;[
+<!ELEMENT setindex %ho; (setindexinfo?,
+                    (%bookcomponent.title.content;)?,
+                    (%component.mix;)*,
+                    (indexdiv* | indexentry*))
+		%ndxterm.exclusion;>
+<!--end of setindex.element-->]]>
+
+<!ENTITY % setindex.attlist "INCLUDE">
+<![%setindex.attlist;[
+<!ATTLIST setindex
+		%common.attrib;
+		%indexes.role.attrib;
+		%local.indexes.attrib;
+>
+<!--end of setindex.attlist-->]]>
+<!--end of indexes.module-->]]>
+
+<!ENTITY % indexdiv.module "INCLUDE">
+<![%indexdiv.module;[
+
+<!-- SegmentedList in this content is useful for marking up permuted
+     indices. -->
+
+<!ENTITY % local.indexdiv.attrib "">
+<!ENTITY % indexdiv.role.attrib "%role.attrib;">
+
+<!ENTITY % indexdiv.element "INCLUDE">
+<![%indexdiv.element;[
+<!ELEMENT indexdiv %ho; ((%sect.title.content;)?, ((%indexdivcomponent.mix;)*,
+		(indexentry+ | segmentedlist)))>
+<!--end of indexdiv.element-->]]>
+
+<!ENTITY % indexdiv.attlist "INCLUDE">
+<![%indexdiv.attlist;[
+<!ATTLIST indexdiv
+		%common.attrib;
+		%indexdiv.role.attrib;
+		%local.indexdiv.attrib;
+>
+<!--end of indexdiv.attlist-->]]>
+<!--end of indexdiv.module-->]]>
+
+<!ENTITY % indexentry.module "INCLUDE">
+<![%indexentry.module;[
+<!-- Index entries appear in the index, not the text. -->
+
+<!ENTITY % local.indexentry.attrib "">
+<!ENTITY % indexentry.role.attrib "%role.attrib;">
+
+<!ENTITY % indexentry.element "INCLUDE">
+<![%indexentry.element;[
+<!ELEMENT indexentry %ho; (primaryie, (seeie|seealsoie)*,
+		(secondaryie, (seeie|seealsoie|tertiaryie)*)*)>
+<!--end of indexentry.element-->]]>
+
+<!ENTITY % indexentry.attlist "INCLUDE">
+<![%indexentry.attlist;[
+<!ATTLIST indexentry
+		%common.attrib;
+		%indexentry.role.attrib;
+		%local.indexentry.attrib;
+>
+<!--end of indexentry.attlist-->]]>
+<!--end of indexentry.module-->]]>
+
+<!ENTITY % primsecterie.module "INCLUDE">
+<![%primsecterie.module;[
+<!ENTITY % local.primsecterie.attrib "">
+<!ENTITY % primsecterie.role.attrib "%role.attrib;">
+
+<!ENTITY % primaryie.element "INCLUDE">
+<![%primaryie.element;[
+<!ELEMENT primaryie %ho; (%ndxterm.char.mix;)*>
+<!--end of primaryie.element-->]]>
+
+<!-- to IndexTerms that these entries represent -->
+
+<!ENTITY % primaryie.attlist "INCLUDE">
+<![%primaryie.attlist;[
+<!ATTLIST primaryie
+		%linkends.attrib;		%common.attrib;
+		%primsecterie.role.attrib;
+		%local.primsecterie.attrib;
+>
+<!--end of primaryie.attlist-->]]>
+
+<!ENTITY % secondaryie.element "INCLUDE">
+<![%secondaryie.element;[
+<!ELEMENT secondaryie %ho; (%ndxterm.char.mix;)*>
+<!--end of secondaryie.element-->]]>
+
+<!-- to IndexTerms that these entries represent -->
+
+<!ENTITY % secondaryie.attlist "INCLUDE">
+<![%secondaryie.attlist;[
+<!ATTLIST secondaryie
+		%linkends.attrib;		%common.attrib;
+		%primsecterie.role.attrib;
+		%local.primsecterie.attrib;
+>
+<!--end of secondaryie.attlist-->]]>
+
+<!ENTITY % tertiaryie.element "INCLUDE">
+<![%tertiaryie.element;[
+<!ELEMENT tertiaryie %ho; (%ndxterm.char.mix;)*>
+<!--end of tertiaryie.element-->]]>
+
+<!-- to IndexTerms that these entries represent -->
+
+<!ENTITY % tertiaryie.attlist "INCLUDE">
+<![%tertiaryie.attlist;[
+<!ATTLIST tertiaryie
+		%linkends.attrib;		%common.attrib;
+		%primsecterie.role.attrib;
+		%local.primsecterie.attrib;
+>
+<!--end of tertiaryie.attlist-->]]>
+
+<!--end of primsecterie.module-->]]>
+
+<!ENTITY % seeie.module "INCLUDE">
+<![%seeie.module;[
+<!ENTITY % local.seeie.attrib "">
+<!ENTITY % seeie.role.attrib "%role.attrib;">
+
+<!ENTITY % seeie.element "INCLUDE">
+<![%seeie.element;[
+<!ELEMENT seeie %ho; (%ndxterm.char.mix;)*>
+<!--end of seeie.element-->]]>
+
+<!-- to IndexEntry to look up -->
+
+
+<!ENTITY % seeie.attlist "INCLUDE">
+<![%seeie.attlist;[
+<!ATTLIST seeie
+		%linkend.attrib;		%common.attrib;
+		%seeie.role.attrib;
+		%local.seeie.attrib;
+>
+<!--end of seeie.attlist-->]]>
+<!--end of seeie.module-->]]>
+
+<!ENTITY % seealsoie.module "INCLUDE">
+<![%seealsoie.module;[
+<!ENTITY % local.seealsoie.attrib "">
+<!ENTITY % seealsoie.role.attrib "%role.attrib;">
+
+<!ENTITY % seealsoie.element "INCLUDE">
+<![%seealsoie.element;[
+<!ELEMENT seealsoie %ho; (%ndxterm.char.mix;)*>
+<!--end of seealsoie.element-->]]>
+
+<!-- to related IndexEntries -->
+
+
+<!ENTITY % seealsoie.attlist "INCLUDE">
+<![%seealsoie.attlist;[
+<!ATTLIST seealsoie
+		%linkends.attrib;		%common.attrib;
+		%seealsoie.role.attrib;
+		%local.seealsoie.attrib;
+>
+<!--end of seealsoie.attlist-->]]>
+<!--end of seealsoie.module-->]]>
+<!--end of index.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- RefEntry ............................................................. -->
+
+<!ENTITY % refentry.content.module "INCLUDE">
+<![%refentry.content.module;[
+<!ENTITY % refentry.module "INCLUDE">
+<![%refentry.module;[
+<!ENTITY % local.refentry.attrib "">
+<!ENTITY % refentry.role.attrib "%role.attrib;">
+
+<!ENTITY % refentry.element "INCLUDE">
+<![%refentry.element;[
+<!ELEMENT refentry %ho; (beginpage?,
+                    (%ndxterm.class;)*,
+                    refentryinfo?, refmeta?, (remark|%link.char.class;)*,
+                    refnamediv+, refsynopsisdiv?, (refsect1+|refsection+))
+		%ubiq.inclusion;>
+<!--end of refentry.element-->]]>
+
+<!ENTITY % refentry.attlist "INCLUDE">
+<![%refentry.attlist;[
+<!ATTLIST refentry
+		%status.attrib;
+		%common.attrib;
+		%refentry.role.attrib;
+		%local.refentry.attrib;
+>
+<!--end of refentry.attlist-->]]>
+<!--end of refentry.module-->]]>
+
+<!ENTITY % refmeta.module "INCLUDE">
+<![%refmeta.module;[
+<!ENTITY % local.refmeta.attrib "">
+<!ENTITY % refmeta.role.attrib "%role.attrib;">
+
+<!ENTITY % refmeta.element "INCLUDE">
+<![%refmeta.element;[
+<!ELEMENT refmeta %ho; ((%ndxterm.class;)*,
+                   refentrytitle, manvolnum?, refmiscinfo*,
+                   (%ndxterm.class;)*)
+		%beginpage.exclusion;>
+<!--end of refmeta.element-->]]>
+
+<!ENTITY % refmeta.attlist "INCLUDE">
+<![%refmeta.attlist;[
+<!ATTLIST refmeta
+		%common.attrib;
+		%refmeta.role.attrib;
+		%local.refmeta.attrib;
+>
+<!--end of refmeta.attlist-->]]>
+<!--end of refmeta.module-->]]>
+
+<!ENTITY % refmiscinfo.module "INCLUDE">
+<![%refmiscinfo.module;[
+<!ENTITY % local.refmiscinfo.attrib "">
+<!ENTITY % refmiscinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % refmiscinfo.element "INCLUDE">
+<![%refmiscinfo.element;[
+<!ELEMENT refmiscinfo %ho; (%docinfo.char.mix;)*>
+<!--end of refmiscinfo.element-->]]>
+
+<!-- Class: Freely assignable parameter; no default -->
+
+
+<!ENTITY % refmiscinfo.attlist "INCLUDE">
+<![%refmiscinfo.attlist;[
+<!ATTLIST refmiscinfo
+		class		CDATA		#IMPLIED
+		%common.attrib;
+		%refmiscinfo.role.attrib;
+		%local.refmiscinfo.attrib;
+>
+<!--end of refmiscinfo.attlist-->]]>
+<!--end of refmiscinfo.module-->]]>
+
+<!ENTITY % refnamediv.module "INCLUDE">
+<![%refnamediv.module;[
+<!ENTITY % local.refnamediv.attrib "">
+<!ENTITY % refnamediv.role.attrib "%role.attrib;">
+
+<!ENTITY % refnamediv.element "INCLUDE">
+<![%refnamediv.element;[
+<!ELEMENT refnamediv %ho; (refdescriptor?, refname+, refpurpose, refclass*,
+		(remark|%link.char.class;)*)>
+<!--end of refnamediv.element-->]]>
+
+<!ENTITY % refnamediv.attlist "INCLUDE">
+<![%refnamediv.attlist;[
+<!ATTLIST refnamediv
+		%common.attrib;
+		%refnamediv.role.attrib;
+		%local.refnamediv.attrib;
+>
+<!--end of refnamediv.attlist-->]]>
+<!--end of refnamediv.module-->]]>
+
+<!ENTITY % refdescriptor.module "INCLUDE">
+<![%refdescriptor.module;[
+<!ENTITY % local.refdescriptor.attrib "">
+<!ENTITY % refdescriptor.role.attrib "%role.attrib;">
+
+<!ENTITY % refdescriptor.element "INCLUDE">
+<![%refdescriptor.element;[
+<!ELEMENT refdescriptor %ho; (%refname.char.mix;)*>
+<!--end of refdescriptor.element-->]]>
+
+<!ENTITY % refdescriptor.attlist "INCLUDE">
+<![%refdescriptor.attlist;[
+<!ATTLIST refdescriptor
+		%common.attrib;
+		%refdescriptor.role.attrib;
+		%local.refdescriptor.attrib;
+>
+<!--end of refdescriptor.attlist-->]]>
+<!--end of refdescriptor.module-->]]>
+
+<!ENTITY % refname.module "INCLUDE">
+<![%refname.module;[
+<!ENTITY % local.refname.attrib "">
+<!ENTITY % refname.role.attrib "%role.attrib;">
+
+<!ENTITY % refname.element "INCLUDE">
+<![%refname.element;[
+<!ELEMENT refname %ho; (%refname.char.mix;)*>
+<!--end of refname.element-->]]>
+
+<!ENTITY % refname.attlist "INCLUDE">
+<![%refname.attlist;[
+<!ATTLIST refname
+		%common.attrib;
+		%refname.role.attrib;
+		%local.refname.attrib;
+>
+<!--end of refname.attlist-->]]>
+<!--end of refname.module-->]]>
+
+<!ENTITY % refpurpose.module "INCLUDE">
+<![%refpurpose.module;[
+<!ENTITY % local.refpurpose.attrib "">
+<!ENTITY % refpurpose.role.attrib "%role.attrib;">
+
+<!ENTITY % refpurpose.element "INCLUDE">
+<![%refpurpose.element;[
+<!ELEMENT refpurpose %ho; (%refinline.char.mix;)*>
+<!--end of refpurpose.element-->]]>
+
+<!ENTITY % refpurpose.attlist "INCLUDE">
+<![%refpurpose.attlist;[
+<!ATTLIST refpurpose
+		%common.attrib;
+		%refpurpose.role.attrib;
+		%local.refpurpose.attrib;
+>
+<!--end of refpurpose.attlist-->]]>
+<!--end of refpurpose.module-->]]>
+
+<!ENTITY % refclass.module "INCLUDE">
+<![%refclass.module;[
+<!ENTITY % local.refclass.attrib "">
+<!ENTITY % refclass.role.attrib "%role.attrib;">
+
+<!ENTITY % refclass.element "INCLUDE">
+<![%refclass.element;[
+<!ELEMENT refclass %ho; (%refclass.char.mix;)*>
+<!--end of refclass.element-->]]>
+
+<!ENTITY % refclass.attlist "INCLUDE">
+<![%refclass.attlist;[
+<!ATTLIST refclass
+		%common.attrib;
+		%refclass.role.attrib;
+		%local.refclass.attrib;
+>
+<!--end of refclass.attlist-->]]>
+<!--end of refclass.module-->]]>
+
+<!ENTITY % refsynopsisdiv.module "INCLUDE">
+<![%refsynopsisdiv.module;[
+<!ENTITY % local.refsynopsisdiv.attrib "">
+<!ENTITY % refsynopsisdiv.role.attrib "%role.attrib;">
+
+<!ENTITY % refsynopsisdiv.element "INCLUDE">
+<![%refsynopsisdiv.element;[
+<!ELEMENT refsynopsisdiv %ho; (refsynopsisdivinfo?, (%refsect.title.content;)?,
+		(((%refcomponent.mix;)+, refsect2*) | (refsect2+)))>
+<!--end of refsynopsisdiv.element-->]]>
+
+<!ENTITY % refsynopsisdiv.attlist "INCLUDE">
+<![%refsynopsisdiv.attlist;[
+<!ATTLIST refsynopsisdiv
+		%common.attrib;
+		%refsynopsisdiv.role.attrib;
+		%local.refsynopsisdiv.attrib;
+>
+<!--end of refsynopsisdiv.attlist-->]]>
+<!--end of refsynopsisdiv.module-->]]>
+
+<!ENTITY % refsection.module "INCLUDE">
+<![%refsection.module;[
+<!ENTITY % local.refsection.attrib "">
+<!ENTITY % refsection.role.attrib "%role.attrib;">
+
+<!ENTITY % refsection.element "INCLUDE">
+<![%refsection.element;[
+<!ELEMENT refsection %ho; (refsectioninfo?, (%refsect.title.content;),
+		(((%refcomponent.mix;)+, refsection*) | refsection+))>
+<!--end of refsection.element-->]]>
+
+<!ENTITY % refsection.attlist "INCLUDE">
+<![%refsection.attlist;[
+<!ATTLIST refsection
+		%status.attrib;
+		%common.attrib;
+		%refsection.role.attrib;
+		%local.refsection.attrib;
+>
+<!--end of refsection.attlist-->]]>
+<!--end of refsection.module-->]]>
+
+<!ENTITY % refsect1.module "INCLUDE">
+<![%refsect1.module;[
+<!ENTITY % local.refsect1.attrib "">
+<!ENTITY % refsect1.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect1.element "INCLUDE">
+<![%refsect1.element;[
+<!ELEMENT refsect1 %ho; (refsect1info?, (%refsect.title.content;),
+		(((%refcomponent.mix;)+, refsect2*) | refsect2+))>
+<!--end of refsect1.element-->]]>
+
+<!ENTITY % refsect1.attlist "INCLUDE">
+<![%refsect1.attlist;[
+<!ATTLIST refsect1
+		%status.attrib;
+		%common.attrib;
+		%refsect1.role.attrib;
+		%local.refsect1.attrib;
+>
+<!--end of refsect1.attlist-->]]>
+<!--end of refsect1.module-->]]>
+
+<!ENTITY % refsect2.module "INCLUDE">
+<![%refsect2.module;[
+<!ENTITY % local.refsect2.attrib "">
+<!ENTITY % refsect2.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect2.element "INCLUDE">
+<![%refsect2.element;[
+<!ELEMENT refsect2 %ho; (refsect2info?, (%refsect.title.content;),
+	(((%refcomponent.mix;)+, refsect3*) | refsect3+))>
+<!--end of refsect2.element-->]]>
+
+<!ENTITY % refsect2.attlist "INCLUDE">
+<![%refsect2.attlist;[
+<!ATTLIST refsect2
+		%status.attrib;
+		%common.attrib;
+		%refsect2.role.attrib;
+		%local.refsect2.attrib;
+>
+<!--end of refsect2.attlist-->]]>
+<!--end of refsect2.module-->]]>
+
+<!ENTITY % refsect3.module "INCLUDE">
+<![%refsect3.module;[
+<!ENTITY % local.refsect3.attrib "">
+<!ENTITY % refsect3.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect3.element "INCLUDE">
+<![%refsect3.element;[
+<!ELEMENT refsect3 %ho; (refsect3info?, (%refsect.title.content;),
+	(%refcomponent.mix;)+)>
+<!--end of refsect3.element-->]]>
+
+<!ENTITY % refsect3.attlist "INCLUDE">
+<![%refsect3.attlist;[
+<!ATTLIST refsect3
+		%status.attrib;
+		%common.attrib;
+		%refsect3.role.attrib;
+		%local.refsect3.attrib;
+>
+<!--end of refsect3.attlist-->]]>
+<!--end of refsect3.module-->]]>
+<!--end of refentry.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Article .............................................................. -->
+
+<!ENTITY % article.module "INCLUDE">
+<![%article.module;[
+<!-- An Article is a chapter-level, stand-alone document that is often,
+     but need not be, collected into a Book. -->
+
+<!ENTITY % local.article.attrib "">
+<!ENTITY % article.role.attrib "%role.attrib;">
+
+<!ENTITY % article.element "INCLUDE">
+<![%article.element;[
+<!ELEMENT article %ho; ((%div.title.content;)?, articleinfo?, tocchap?, lot*,
+			(%bookcomponent.content;),
+			((%nav.class;) | (%appendix.class;) | ackno)*)
+		%ubiq.inclusion;>
+<!--end of article.element-->]]>
+
+<!-- Class: Indicates the type of a particular article;
+		all articles have the same structure and general purpose.
+		No default. -->
+<!-- ParentBook: ID of the enclosing Book -->
+
+
+<!ENTITY % article.attlist "INCLUDE">
+<![%article.attlist;[
+<!ATTLIST article
+		class		(journalarticle
+				|productsheet
+				|whitepaper
+				|techreport
+                                |specification
+				|faq)		#IMPLIED
+		parentbook	IDREF		#IMPLIED
+		%status.attrib;
+		%common.attrib;
+		%article.role.attrib;
+		%local.article.attrib;
+>
+<!--end of article.attlist-->]]>
+<!--end of article.module-->]]>
+
+<!-- End of DocBook document hierarchy module V4.4 ........................ -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting/dbnotnx.mod b/xml/tests/testData/xml/DocBookHighlighting/dbnotnx.mod
new file mode 100644
index 000000000000..f771facbf06f
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/dbnotnx.mod
@@ -0,0 +1,101 @@
+<!-- ...................................................................... -->
+<!-- DocBook notations module V4.4 ........................................ -->
+<!-- File dbnotnx.mod ..................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: dbnotnx.mod,v 1.31 2005/01/27 13:52:00 nwalsh Exp $
+
+     Permission to use, copy, modify and distribute the DocBook DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the notation declarations used by DocBook.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbnotn PUBLIC
+     "-//OASIS//ENTITIES DocBook Notations V4.4//EN"
+     "dbnotnx.mod">
+     %dbnotn;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!ENTITY % local.notation.class "">
+<!ENTITY % notation.class
+		"BMP| CGM-CHAR | CGM-BINARY | CGM-CLEAR | DITROFF | DVI
+		| EPS | EQN | FAX | GIF | GIF87a | GIF89a
+		| JPG | JPEG | IGES | PCX
+		| PIC | PNG | PS | SGML | TBL | TEX | TIFF | WMF | WPG
+                | SVG | PDF | SWF
+		| linespecific
+		%local.notation.class;">
+
+<!NOTATION BMP		PUBLIC
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION Microsoft Windows bitmap//EN">
+<!NOTATION CGM-CHAR	PUBLIC "ISO 8632/2//NOTATION Character encoding//EN">
+<!NOTATION CGM-BINARY	PUBLIC "ISO 8632/3//NOTATION Binary encoding//EN">
+<!NOTATION CGM-CLEAR	PUBLIC "ISO 8632/4//NOTATION Clear text encoding//EN">
+<!NOTATION DITROFF	SYSTEM "DITROFF">
+<!NOTATION DVI		SYSTEM "DVI">
+<!NOTATION EPS		PUBLIC
+"+//ISBN 0-201-18127-4::Adobe//NOTATION PostScript Language Ref. Manual//EN">
+<!NOTATION EQN		SYSTEM "EQN">
+<!NOTATION FAX		PUBLIC
+"-//USA-DOD//NOTATION CCITT Group 4 Facsimile Type 1 Untiled Raster//EN">
+<!NOTATION GIF		SYSTEM "GIF">
+<!NOTATION GIF87a               PUBLIC
+"-//CompuServe//NOTATION Graphics Interchange Format 87a//EN">
+
+<!NOTATION GIF89a               PUBLIC
+"-//CompuServe//NOTATION Graphics Interchange Format 89a//EN">
+<!NOTATION JPG		SYSTEM "JPG">
+<!NOTATION JPEG		SYSTEM "JPG">
+<!NOTATION IGES		PUBLIC
+"-//USA-DOD//NOTATION (ASME/ANSI Y14.26M-1987) Initial Graphics Exchange Specification//EN">
+<!NOTATION PCX		PUBLIC
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION ZSoft PCX bitmap//EN">
+<!NOTATION PIC		SYSTEM "PIC">
+<!NOTATION PNG          SYSTEM "http://www.w3.org/TR/REC-png">
+<!NOTATION PS		SYSTEM "PS">
+<!NOTATION SGML		PUBLIC
+"ISO 8879:1986//NOTATION Standard Generalized Markup Language//EN">
+<!NOTATION TBL		SYSTEM "TBL">
+<!NOTATION TEX		PUBLIC
+"+//ISBN 0-201-13448-9::Knuth//NOTATION The TeXbook//EN">
+<!NOTATION TIFF		SYSTEM "TIFF">
+<!NOTATION WMF		PUBLIC
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION Microsoft Windows Metafile//EN">
+<!NOTATION WPG		SYSTEM "WPG"> <!--WordPerfect Graphic format-->
+<!NOTATION SVG		SYSTEM "http://www.w3.org/TR/SVG/">
+<!NOTATION PDF		SYSTEM "http://www.adobe.com/products/acrobat/adobepdf.html">
+<!NOTATION SWF          SYSTEM "http://www.macromedia.com/software/flash">
+<!NOTATION linespecific	SYSTEM "linespecific">
+
+<!-- End of DocBook notations module V4.4 ................................. -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting/dbpoolx.mod b/xml/tests/testData/xml/DocBookHighlighting/dbpoolx.mod
new file mode 100644
index 000000000000..d76d3dd3f8b7
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/dbpoolx.mod
@@ -0,0 +1,8355 @@
+<!-- ...................................................................... -->
+<!-- DocBook XML information pool module V4.4 ............................. -->
+<!-- File dbpoolx.mod ..................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: dbpoolx.mod,v 1.107 2005/01/27 13:52:00 nwalsh Exp $
+
+     Permission to use, copy, modify and distribute the DocBook XML DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook XML DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the definitions for the objects, inline
+     elements, and so on that are available to be used as the main
+     content of DocBook documents.  Some elements are useful for general
+     publishing, and others are useful specifically for computer
+     documentation.
+
+     This module has the following dependencies on other modules:
+
+     o It assumes that a %notation.class; entity is defined by the
+       driver file or other high-level module.  This entity is
+       referenced in the NOTATION attributes for the graphic-related and
+       ModeSpec elements.
+
+     o It assumes that an appropriately parameterized table module is
+       available for use with the table-related elements.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbpool PUBLIC
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN"
+     "dbpoolx.mod">
+     %dbpool;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+<!-- Forms entities ....................................................... -->
+<!-- These PEs provide the hook by which the forms module can be inserted   -->
+<!-- into the DTD. -->
+<!ENTITY % forminlines.hook "">
+<!ENTITY % forms.hook "">
+
+<!-- ...................................................................... -->
+<!-- General-purpose semantics entities ................................... -->
+
+<!ENTITY % yesorno.attvals	"CDATA">
+
+<!-- ...................................................................... -->
+<!-- Entities for module inclusions ....................................... -->
+
+<!ENTITY % dbpool.redecl.module "IGNORE">
+
+<!-- ...................................................................... -->
+<!-- Entities for element classes and mixtures ............................ -->
+
+<!-- "Ubiquitous" classes: ndxterm.class and beginpage -->
+
+<!ENTITY % local.ndxterm.class "">
+<!ENTITY % ndxterm.class
+		"indexterm %local.ndxterm.class;">
+
+<!-- Object-level classes ................................................. -->
+
+<!ENTITY % local.list.class "">
+<!ENTITY % list.class
+		"calloutlist|glosslist|bibliolist|itemizedlist|orderedlist|segmentedlist
+		|simplelist|variablelist %local.list.class;">
+
+<!ENTITY % local.admon.class "">
+<!ENTITY % admon.class
+		"caution|important|note|tip|warning %local.admon.class;">
+
+<!ENTITY % local.linespecific.class "">
+<!ENTITY % linespecific.class
+		"literallayout|programlisting|programlistingco|screen
+		|screenco|screenshot %local.linespecific.class;">
+
+<!ENTITY % local.method.synop.class "">
+<!ENTITY % method.synop.class
+		"constructorsynopsis
+                 |destructorsynopsis
+                 |methodsynopsis %local.method.synop.class;">
+
+<!ENTITY % local.synop.class "">
+<!ENTITY % synop.class
+		"synopsis|cmdsynopsis|funcsynopsis
+                 |classsynopsis|fieldsynopsis
+                 |%method.synop.class; %local.synop.class;">
+
+<!ENTITY % local.para.class "">
+<!ENTITY % para.class
+		"formalpara|para|simpara %local.para.class;">
+
+<!ENTITY % local.informal.class "">
+<!ENTITY % informal.class
+		"address|blockquote
+                |graphic|graphicco|mediaobject|mediaobjectco
+                |informalequation
+		|informalexample
+                |informalfigure
+                |informaltable %local.informal.class;">
+
+<!ENTITY % local.formal.class "">
+<!ENTITY % formal.class
+		"equation|example|figure|table %local.formal.class;">
+
+<!-- The DocBook TC may produce an official EBNF module for DocBook. -->
+<!-- This PE provides the hook by which it can be inserted into the DTD. -->
+<!ENTITY % ebnf.block.hook "">
+
+<!ENTITY % local.compound.class "">
+<!ENTITY % compound.class
+		"msgset|procedure|sidebar|qandaset|task
+                 %ebnf.block.hook;
+                 %local.compound.class;">
+
+<!ENTITY % local.genobj.class "">
+<!ENTITY % genobj.class
+		"anchor|bridgehead|remark|highlights
+		%local.genobj.class;">
+
+<!ENTITY % local.descobj.class "">
+<!ENTITY % descobj.class
+		"abstract|authorblurb|epigraph
+		%local.descobj.class;">
+
+<!-- Character-level classes .............................................. -->
+
+<!ENTITY % local.xref.char.class "">
+<!ENTITY % xref.char.class
+		"footnoteref|xref|biblioref %local.xref.char.class;">
+
+<!ENTITY % local.gen.char.class "">
+<!ENTITY % gen.char.class
+		"abbrev|acronym|citation|citerefentry|citetitle|emphasis
+		|firstterm|foreignphrase|glossterm|footnote|phrase|orgname
+		|quote|trademark|wordasword|personname %local.gen.char.class;">
+
+<!ENTITY % local.link.char.class "">
+<!ENTITY % link.char.class
+		"link|olink|ulink %local.link.char.class;">
+
+<!-- The DocBook TC may produce an official EBNF module for DocBook. -->
+<!-- This PE provides the hook by which it can be inserted into the DTD. -->
+<!ENTITY % ebnf.inline.hook "">
+
+<!ENTITY % local.tech.char.class "">
+<!ENTITY % tech.char.class
+		"action|application
+                |classname|methodname|interfacename|exceptionname
+                |ooclass|oointerface|ooexception
+                |package
+                |command|computeroutput
+		|database|email|envar|errorcode|errorname|errortype|errortext|filename
+		|function|guibutton|guiicon|guilabel|guimenu|guimenuitem
+		|guisubmenu|hardware|interface|keycap
+		|keycode|keycombo|keysym|literal|code|constant|markup|medialabel
+		|menuchoice|mousebutton|option|optional|parameter
+		|prompt|property|replaceable|returnvalue|sgmltag|structfield
+		|structname|symbol|systemitem|uri|token|type|userinput|varname
+                %ebnf.inline.hook;
+		%local.tech.char.class;">
+
+<!ENTITY % local.base.char.class "">
+<!ENTITY % base.char.class
+		"anchor %local.base.char.class;">
+
+<!ENTITY % local.docinfo.char.class "">
+<!ENTITY % docinfo.char.class
+		"author|authorinitials|corpauthor|corpcredit|modespec|othercredit
+		|productname|productnumber|revhistory
+		%local.docinfo.char.class;">
+
+<!ENTITY % local.other.char.class "">
+<!ENTITY % other.char.class
+		"remark|subscript|superscript %local.other.char.class;">
+
+<!ENTITY % local.inlineobj.char.class "">
+<!ENTITY % inlineobj.char.class
+		"inlinegraphic|inlinemediaobject|inlineequation %local.inlineobj.char.class;">
+
+<!-- ...................................................................... -->
+<!-- Entities for content models .......................................... -->
+
+<!ENTITY % formalobject.title.content "title, titleabbrev?">
+
+<!-- Redeclaration placeholder ............................................ -->
+
+<!-- For redeclaring entities that are declared after this point while
+     retaining their references to the entities that are declared before
+     this point -->
+
+<![%dbpool.redecl.module;[
+<!-- Defining rdbpool here makes some buggy XML parsers happy. -->
+<!ENTITY % rdbpool "">
+%rdbpool;
+<!--end of dbpool.redecl.module-->]]>
+
+<!-- Object-level mixtures ................................................ -->
+
+<!--
+                      list admn line synp para infm form cmpd gen  desc
+Component mixture       X    X    X    X    X    X    X    X    X    X
+Sidebar mixture         X    X    X    X    X    X    X    a    X
+Footnote mixture        X         X    X    X    X
+Example mixture         X         X    X    X    X
+Highlights mixture      X    X              X
+Paragraph mixture       X         X    X         X
+Admonition mixture      X         X    X    X    X    X    b    c
+Figure mixture                    X    X         X
+Table entry mixture     X    X    X         X    d
+Glossary def mixture    X         X    X    X    X         e
+Legal notice mixture    X    X    X         X    f
+
+a. Just Procedure; not Sidebar itself or MsgSet.
+b. No MsgSet.
+c. No Highlights.
+d. Just Graphic; no other informal objects.
+e. No Anchor, BridgeHead, or Highlights.
+f. Just BlockQuote; no other informal objects.
+-->
+
+<!ENTITY % local.component.mix "">
+<!ENTITY % component.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|%compound.class;
+		|%genobj.class;		|%descobj.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.component.mix;">
+
+<!ENTITY % local.sidebar.mix "">
+<!ENTITY % sidebar.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|procedure
+		|%genobj.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.sidebar.mix;">
+
+<!ENTITY % local.qandaset.mix "">
+<!ENTITY % qandaset.mix
+		"%list.class;           |%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|procedure
+		|%genobj.class;
+		|%ndxterm.class;
+		%forms.hook;
+                %local.qandaset.mix;">
+
+<!ENTITY % local.revdescription.mix "">
+<!ENTITY % revdescription.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|procedure
+		|%genobj.class;
+		|%ndxterm.class;
+		%local.revdescription.mix;">
+
+<!ENTITY % local.footnote.mix "">
+<!ENTITY % footnote.mix
+		"%list.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		%local.footnote.mix;">
+
+<!ENTITY % local.example.mix "">
+<!ENTITY % example.mix
+		"%list.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.example.mix;">
+
+<!ENTITY % local.highlights.mix "">
+<!ENTITY % highlights.mix
+		"%list.class;		|%admon.class;
+		|%para.class;
+		|%ndxterm.class;
+		%local.highlights.mix;">
+
+<!-- %formal.class; is explicitly excluded from many contexts in which
+     paragraphs are used -->
+<!ENTITY % local.para.mix "">
+<!ENTITY % para.mix
+		"%list.class;           |%admon.class;
+		|%linespecific.class;
+					|%informal.class;
+		|%formal.class;
+		%local.para.mix;">
+
+<!ENTITY % local.admon.mix "">
+<!ENTITY % admon.mix
+		"%list.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|procedure|sidebar
+		|anchor|bridgehead|remark
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.admon.mix;">
+
+<!ENTITY % local.figure.mix "">
+<!ENTITY % figure.mix
+		"%linespecific.class;	|%synop.class;
+					|%informal.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.figure.mix;">
+
+<!ENTITY % local.tabentry.mix "">
+<!ENTITY % tabentry.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;
+		|%para.class;		|graphic|mediaobject
+		%forms.hook;
+		%local.tabentry.mix;">
+
+<!ENTITY % local.glossdef.mix "">
+<!ENTITY % glossdef.mix
+		"%list.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;
+		|remark
+		|%ndxterm.class;        |beginpage
+		%local.glossdef.mix;">
+
+<!ENTITY % local.legalnotice.mix "">
+<!ENTITY % legalnotice.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;
+		|%para.class;		|blockquote
+		|%ndxterm.class;        |beginpage
+		%local.legalnotice.mix;">
+
+<!ENTITY % local.textobject.mix "">
+<!ENTITY % textobject.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;
+		|%para.class;		|blockquote
+		%local.textobject.mix;">
+
+<!ENTITY % local.mediaobject.mix "">
+<!ENTITY % mediaobject.mix
+		"videoobject|audioobject|imageobject|imageobjectco|textobject %local.mediaobject.mix;">
+
+<!ENTITY % local.listpreamble.mix "">
+<!ENTITY % listpreamble.mix
+		"                  	 %admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%genobj.class;		|%descobj.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.listpreamble.mix;">
+
+<!-- Character-level mixtures ............................................. -->
+
+<![%sgml.features;[
+<!ENTITY % local.ubiq.mix "">
+<!ENTITY % ubiq.mix "%ndxterm.class;|beginpage %local.ubiq.mix;">
+
+<!ENTITY % ubiq.exclusion "-(%ubiq.mix)">
+<!ENTITY % ubiq.inclusion "+(%ubiq.mix)">
+
+<!ENTITY % footnote.exclusion "-(footnote|%formal.class;)">
+<!ENTITY % highlights.exclusion "-(%ubiq.mix;|%formal.class;)">
+<!ENTITY % admon.exclusion "-(%admon.class;)">
+<!ENTITY % formal.exclusion "-(%formal.class;)">
+<!ENTITY % acronym.exclusion "-(acronym)">
+<!ENTITY % beginpage.exclusion "-(beginpage)">
+<!ENTITY % ndxterm.exclusion "-(%ndxterm.class;)">
+<!ENTITY % blockquote.exclusion "-(epigraph)">
+<!ENTITY % remark.exclusion "-(remark|%ubiq.mix;)">
+<!ENTITY % glossterm.exclusion "-(glossterm)">
+<!ENTITY % links.exclusion "-(link|olink|ulink|xref|biblioref)">
+]]><!-- sgml.features -->
+
+<!-- not [sgml.features[ -->
+<!ENTITY % local.ubiq.mix "">
+<!ENTITY % ubiq.mix "">
+
+<!ENTITY % ubiq.exclusion "">
+<!ENTITY % ubiq.inclusion "">
+
+<!ENTITY % footnote.exclusion "">
+<!ENTITY % highlights.exclusion "">
+<!ENTITY % admon.exclusion "">
+<!ENTITY % formal.exclusion "">
+<!ENTITY % acronym.exclusion "">
+<!ENTITY % beginpage.exclusion "">
+<!ENTITY % ndxterm.exclusion "">
+<!ENTITY % blockquote.exclusion "">
+<!ENTITY % remark.exclusion "">
+<!ENTITY % glossterm.exclusion "">
+<!ENTITY % links.exclusion "">
+<!-- ]] not sgml.features -->
+
+<!--
+                    #PCD xref word link cptr base dnfo othr inob (synop)
+para.char.mix         X    X    X    X    X    X    X    X    X
+title.char.mix        X    X    X    X    X    X    X    X    X
+ndxterm.char.mix      X    X    X    X    X    X    X    X    a
+cptr.char.mix         X              X    X    X         X    a
+smallcptr.char.mix    X                   b                   a
+word.char.mix         X         c    X         X         X    a
+docinfo.char.mix      X         d    X    b              X    a
+
+a. Just InlineGraphic; no InlineEquation.
+b. Just Replaceable; no other computer terms.
+c. Just Emphasis and Trademark; no other word elements.
+d. Just Acronym, Emphasis, and Trademark; no other word elements.
+-->
+
+<!ENTITY % local.para.char.mix "">
+<!ENTITY % para.char.mix
+		"#PCDATA
+		|%xref.char.class;	|%gen.char.class;
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;	|%docinfo.char.class;
+		|%other.char.class;	|%inlineobj.char.class;
+		|%synop.class;
+		|%ndxterm.class;        |beginpage
+                %forminlines.hook;
+		%local.para.char.mix;">
+
+<!ENTITY % local.title.char.mix "">
+<!ENTITY % title.char.mix
+		"#PCDATA
+		|%xref.char.class;	|%gen.char.class;
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;	|%docinfo.char.class;
+		|%other.char.class;	|%inlineobj.char.class;
+		|%ndxterm.class;
+		%local.title.char.mix;">
+
+<!ENTITY % local.ndxterm.char.mix "">
+<!ENTITY % ndxterm.char.mix
+		"#PCDATA
+		|%xref.char.class;	|%gen.char.class;
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;	|%docinfo.char.class;
+		|%other.char.class;	|inlinegraphic|inlinemediaobject
+		%local.ndxterm.char.mix;">
+
+<!ENTITY % local.cptr.char.mix "">
+<!ENTITY % cptr.char.mix
+		"#PCDATA
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;
+		|%other.char.class;	|inlinegraphic|inlinemediaobject
+		|%ndxterm.class;        |beginpage
+		%local.cptr.char.mix;">
+
+<!ENTITY % local.smallcptr.char.mix "">
+<!ENTITY % smallcptr.char.mix
+		"#PCDATA
+					|replaceable
+					|inlinegraphic|inlinemediaobject
+		|%ndxterm.class;        |beginpage
+		%local.smallcptr.char.mix;">
+
+<!ENTITY % local.word.char.mix "">
+<!ENTITY % word.char.mix
+		"#PCDATA
+					|acronym|emphasis|trademark
+		|%link.char.class;
+		|%base.char.class;
+		|%other.char.class;	|inlinegraphic|inlinemediaobject
+		|%ndxterm.class;        |beginpage
+		%local.word.char.mix;">
+
+<!ENTITY % local.docinfo.char.mix "">
+<!ENTITY % docinfo.char.mix
+		"#PCDATA
+		|%link.char.class;
+					|emphasis|trademark
+					|replaceable
+		|%other.char.class;	|inlinegraphic|inlinemediaobject
+		|%ndxterm.class;
+		%local.docinfo.char.mix;">
+<!--ENTITY % bibliocomponent.mix (see Bibliographic section, below)-->
+<!--ENTITY % person.ident.mix (see Bibliographic section, below)-->
+
+<!-- ...................................................................... -->
+<!-- Entities for attributes and attribute components ..................... -->
+
+<!-- Effectivity attributes ............................................... -->
+
+
+<!-- Arch: Computer or chip architecture to which element applies; no
+	default -->
+
+<!ENTITY % arch.attrib
+	"arch		CDATA		#IMPLIED">
+
+<!-- Condition: General-purpose effectivity attribute -->
+
+<!ENTITY % condition.attrib
+	"condition	CDATA		#IMPLIED">
+
+<!-- Conformance: Standards conformance characteristics -->
+
+<!ENTITY % conformance.attrib
+	"conformance	NMTOKENS	#IMPLIED">
+
+
+<!-- OS: Operating system to which element applies; no default -->
+
+<!ENTITY % os.attrib
+	"os		CDATA		#IMPLIED">
+
+
+<!-- Revision: Editorial revision to which element belongs; no default -->
+
+<!ENTITY % revision.attrib
+	"revision	CDATA		#IMPLIED">
+
+<!-- Security: Security classification; no default -->
+
+<!ENTITY % security.attrib
+	"security	CDATA		#IMPLIED">
+
+<!-- UserLevel: Level of user experience to which element applies; no
+	default -->
+
+<!ENTITY % userlevel.attrib
+	"userlevel	CDATA		#IMPLIED">
+
+<!-- Vendor: Computer vendor to which element applies; no default -->
+
+<!ENTITY % vendor.attrib
+	"vendor		CDATA		#IMPLIED">
+
+<!-- Wordsize: Computer word size (32 bit, 64 bit, etc.); no default -->
+
+<!ENTITY % wordsize.attrib
+	"wordsize	CDATA		#IMPLIED">
+
+<!ENTITY % local.effectivity.attrib "">
+<!ENTITY % effectivity.attrib
+	"%arch.attrib;
+        %condition.attrib;
+	%conformance.attrib;
+	%os.attrib;
+	%revision.attrib;
+        %security.attrib;
+	%userlevel.attrib;
+	%vendor.attrib;
+	%wordsize.attrib;
+	%local.effectivity.attrib;"
+>
+
+<!-- Common attributes .................................................... -->
+
+
+<!-- Id: Unique identifier of element; no default -->
+
+<!ENTITY % id.attrib
+	"id		ID		#IMPLIED">
+
+
+<!-- Id: Unique identifier of element; a value must be supplied; no
+	default -->
+
+<!ENTITY % idreq.attrib
+	"id		ID		#REQUIRED">
+
+
+<!-- Lang: Indicator of language in which element is written, for
+	translation, character set management, etc.; no default -->
+
+<!ENTITY % lang.attrib
+	"lang		CDATA		#IMPLIED">
+
+
+<!-- Remap: Previous role of element before conversion; no default -->
+
+<!ENTITY % remap.attrib
+	"remap		CDATA		#IMPLIED">
+
+
+<!-- Role: New role of element in local environment; no default -->
+
+<!ENTITY % role.attrib
+	"role		CDATA		#IMPLIED">
+
+
+<!-- XRefLabel: Alternate labeling string for XRef text generation;
+	default is usually title or other appropriate label text already
+	contained in element -->
+
+<!ENTITY % xreflabel.attrib
+	"xreflabel	CDATA		#IMPLIED">
+
+
+<!-- RevisionFlag: Revision status of element; default is that element
+	wasn't revised -->
+
+<!ENTITY % revisionflag.attrib
+	"revisionflag	(changed
+			|added
+			|deleted
+			|off)		#IMPLIED">
+
+<!ENTITY % local.common.attrib "">
+
+<!-- dir: Bidirectional override -->
+
+<!ENTITY % dir.attrib
+	"dir		(ltr
+			|rtl
+			|lro
+			|rlo)		#IMPLIED">
+
+<!-- xml:base: base URI -->
+
+<![%sgml.features;[
+<!ENTITY % xml-base.attrib "">
+]]>
+<!ENTITY % xml-base.attrib
+	"xml:base	CDATA		#IMPLIED">
+
+<!-- Role is included explicitly on each element -->
+
+<!ENTITY % common.attrib
+	"%id.attrib;
+	%lang.attrib;
+	%remap.attrib;
+	%xreflabel.attrib;
+	%revisionflag.attrib;
+	%effectivity.attrib;
+	%dir.attrib;
+	%xml-base.attrib;
+	%local.common.attrib;"
+>
+
+<!-- Role is included explicitly on each element -->
+
+<!ENTITY % idreq.common.attrib
+	"%idreq.attrib;
+	%lang.attrib;
+	%remap.attrib;
+	%xreflabel.attrib;
+	%revisionflag.attrib;
+	%effectivity.attrib;
+	%dir.attrib;
+	%xml-base.attrib;
+	%local.common.attrib;"
+>
+
+<!-- Semi-common attributes and other attribute entities .................. -->
+
+<!ENTITY % local.graphics.attrib "">
+
+<!-- EntityRef: Name of an external entity containing the content
+	of the graphic -->
+<!-- FileRef: Filename, qualified by a pathname if desired,
+	designating the file containing the content of the graphic -->
+<!-- Format: Notation of the element content, if any -->
+<!-- SrcCredit: Information about the source of the Graphic -->
+<!-- Width: Same as CALS reprowid (desired width) -->
+<!-- Depth: Same as CALS reprodep (desired depth) -->
+<!-- Align: Same as CALS hplace with 'none' removed; #IMPLIED means
+	application-specific -->
+<!-- Scale: Conflation of CALS hscale and vscale -->
+<!-- Scalefit: Same as CALS scalefit -->
+
+<!ENTITY % graphics.attrib
+	"
+	entityref	ENTITY		#IMPLIED
+	fileref 	CDATA		#IMPLIED
+	format		(%notation.class;) #IMPLIED
+	srccredit	CDATA		#IMPLIED
+	width		CDATA		#IMPLIED
+	contentwidth	CDATA		#IMPLIED
+	depth		CDATA		#IMPLIED
+	contentdepth	CDATA		#IMPLIED
+	align		(left
+			|right
+			|center)	#IMPLIED
+	valign		(top
+			|middle
+			|bottom)	#IMPLIED
+	scale		CDATA		#IMPLIED
+	scalefit	%yesorno.attvals;
+					#IMPLIED
+	%local.graphics.attrib;"
+>
+
+<!ENTITY % local.keyaction.attrib "">
+
+<!-- Action: Key combination type; default is unspecified if one
+	child element, Simul if there is more than one; if value is
+	Other, the OtherAction attribute must have a nonempty value -->
+<!-- OtherAction: User-defined key combination type -->
+
+<!ENTITY % keyaction.attrib
+	"
+	action		(click
+			|double-click
+			|press
+			|seq
+			|simul
+			|other)		#IMPLIED
+	otheraction	CDATA		#IMPLIED
+	%local.keyaction.attrib;"
+>
+
+
+<!-- Label: Identifying number or string; default is usually the
+	appropriate number or string autogenerated by a formatter -->
+
+<!ENTITY % label.attrib
+	"label		CDATA		#IMPLIED">
+
+
+<!-- xml:space: whitespace treatment -->
+
+<![%sgml.features;[
+<!ENTITY % xml-space.attrib "">
+]]>
+<!ENTITY % xml-space.attrib
+	"xml:space	(preserve)		#IMPLIED">
+
+<!-- Format: whether element is assumed to contain significant white
+	space -->
+
+<!ENTITY % linespecific.attrib
+	"format		NOTATION
+			(linespecific)	'linespecific'
+         %xml-space.attrib;
+         linenumbering	(numbered|unnumbered) 	#IMPLIED
+         continuation	(continues|restarts)	#IMPLIED
+         startinglinenumber	CDATA		#IMPLIED
+         language	CDATA			#IMPLIED">
+
+<!-- Linkend: link to related information; no default -->
+
+<!ENTITY % linkend.attrib
+	"linkend	IDREF		#IMPLIED">
+
+
+<!-- Linkend: required link to related information -->
+
+<!ENTITY % linkendreq.attrib
+	"linkend	IDREF		#REQUIRED">
+
+
+<!-- Linkends: link to one or more sets of related information; no
+	default -->
+
+<!ENTITY % linkends.attrib
+	"linkends	IDREFS		#IMPLIED">
+
+
+<!ENTITY % local.mark.attrib "">
+<!ENTITY % mark.attrib
+	"mark		CDATA		#IMPLIED
+	%local.mark.attrib;"
+>
+
+
+<!-- MoreInfo: whether element's content has an associated RefEntry -->
+
+<!ENTITY % moreinfo.attrib
+	"moreinfo	(refentry|none)	'none'">
+
+
+<!-- Pagenum: number of page on which element appears; no default -->
+
+<!ENTITY % pagenum.attrib
+	"pagenum	CDATA		#IMPLIED">
+
+<!ENTITY % local.status.attrib "">
+
+<!-- Status: Editorial or publication status of the element
+	it applies to, such as "in review" or "approved for distribution" -->
+
+<!ENTITY % status.attrib
+	"status		CDATA		#IMPLIED
+	%local.status.attrib;"
+>
+
+
+<!-- Width: width of the longest line in the element to which it
+	pertains, in number of characters -->
+
+<!ENTITY % width.attrib
+	"width		CDATA		#IMPLIED">
+
+<!-- ...................................................................... -->
+<!-- Title elements ....................................................... -->
+
+<!ENTITY % title.module "INCLUDE">
+<![%title.module;[
+<!ENTITY % local.title.attrib "">
+<!ENTITY % title.role.attrib "%role.attrib;">
+
+<!ENTITY % title.element "INCLUDE">
+<![%title.element;[
+<!ELEMENT title %ho; (%title.char.mix;)*>
+<!--end of title.element-->]]>
+
+<!ENTITY % title.attlist "INCLUDE">
+<![%title.attlist;[
+<!ATTLIST title
+		%pagenum.attrib;
+		%common.attrib;
+		%title.role.attrib;
+		%local.title.attrib;
+>
+<!--end of title.attlist-->]]>
+<!--end of title.module-->]]>
+
+<!ENTITY % titleabbrev.module "INCLUDE">
+<![%titleabbrev.module;[
+<!ENTITY % local.titleabbrev.attrib "">
+<!ENTITY % titleabbrev.role.attrib "%role.attrib;">
+
+<!ENTITY % titleabbrev.element "INCLUDE">
+<![%titleabbrev.element;[
+<!ELEMENT titleabbrev %ho; (%title.char.mix;)*>
+<!--end of titleabbrev.element-->]]>
+
+<!ENTITY % titleabbrev.attlist "INCLUDE">
+<![%titleabbrev.attlist;[
+<!ATTLIST titleabbrev
+		%common.attrib;
+		%titleabbrev.role.attrib;
+		%local.titleabbrev.attrib;
+>
+<!--end of titleabbrev.attlist-->]]>
+<!--end of titleabbrev.module-->]]>
+
+<!ENTITY % subtitle.module "INCLUDE">
+<![%subtitle.module;[
+<!ENTITY % local.subtitle.attrib "">
+<!ENTITY % subtitle.role.attrib "%role.attrib;">
+
+<!ENTITY % subtitle.element "INCLUDE">
+<![%subtitle.element;[
+<!ELEMENT subtitle %ho; (%title.char.mix;)*>
+<!--end of subtitle.element-->]]>
+
+<!ENTITY % subtitle.attlist "INCLUDE">
+<![%subtitle.attlist;[
+<!ATTLIST subtitle
+		%common.attrib;
+		%subtitle.role.attrib;
+		%local.subtitle.attrib;
+>
+<!--end of subtitle.attlist-->]]>
+<!--end of subtitle.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Bibliographic entities and elements .................................. -->
+
+<!-- The bibliographic elements are typically used in the document
+     hierarchy. They do not appear in content models of information
+     pool elements.  See also the document information elements,
+     below. -->
+
+<!ENTITY % local.person.ident.mix "">
+<!ENTITY % person.ident.mix
+		"honorific|firstname|surname|lineage|othername|affiliation
+		|authorblurb|contrib %local.person.ident.mix;">
+
+<!ENTITY % local.bibliocomponent.mix "">
+<!ENTITY % bibliocomponent.mix
+		"abbrev|abstract|address|artpagenums|author
+		|authorgroup|authorinitials|bibliomisc|biblioset
+		|collab|confgroup|contractnum|contractsponsor
+		|copyright|corpauthor|corpname|corpcredit|date|edition
+		|editor|invpartnumber|isbn|issn|issuenum|orgname
+		|biblioid|citebiblioid|bibliosource|bibliorelation|bibliocoverage
+		|othercredit|pagenums|printhistory|productname
+		|productnumber|pubdate|publisher|publishername
+		|pubsnumber|releaseinfo|revhistory|seriesvolnums
+		|subtitle|title|titleabbrev|volumenum|citetitle
+		|personname|%person.ident.mix;
+		|%ndxterm.class;
+		%local.bibliocomponent.mix;">
+
+<!-- I don't think this is well placed, but it needs to be here because of -->
+<!-- the reference to bibliocomponent.mix -->
+<!ENTITY % local.info.class "">
+<!ENTITY % info.class
+		"graphic | mediaobject | legalnotice | modespec
+		 | subjectset | keywordset | itermset | %bibliocomponent.mix;
+                 %local.info.class;">
+
+
+<!-- BiblioList ........................ -->
+
+<!ENTITY % bibliolist.module "INCLUDE">
+<![%bibliolist.module;[
+<!ENTITY % local.bibliolist.attrib "">
+<!ENTITY % bibliolist.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliolist.element "INCLUDE">
+<![%bibliolist.element;[
+<!ELEMENT bibliolist %ho; (blockinfo?, (%formalobject.title.content;)?,
+                           (biblioentry|bibliomixed)+)>
+<!--end of bibliolist.element-->]]>
+
+<!ENTITY % bibliolist.attlist "INCLUDE">
+<![%bibliolist.attlist;[
+<!ATTLIST bibliolist
+		%common.attrib;
+		%bibliolist.role.attrib;
+		%local.bibliolist.attrib;
+>
+<!--end of bibliolist.attlist-->]]>
+<!--end of bibliolist.module-->]]>
+
+<!ENTITY % biblioentry.module "INCLUDE">
+<![%biblioentry.module;[
+<!ENTITY % local.biblioentry.attrib "">
+<!ENTITY % biblioentry.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioentry.element "INCLUDE">
+<![%biblioentry.element;[
+<!ELEMENT biblioentry %ho; ((articleinfo | (%bibliocomponent.mix;))+)
+                      %ubiq.exclusion;>
+<!--end of biblioentry.element-->]]>
+
+<!ENTITY % biblioentry.attlist "INCLUDE">
+<![%biblioentry.attlist;[
+<!ATTLIST biblioentry
+		%common.attrib;
+		%biblioentry.role.attrib;
+		%local.biblioentry.attrib;
+>
+<!--end of biblioentry.attlist-->]]>
+<!--end of biblioentry.module-->]]>
+
+<!ENTITY % bibliomixed.module "INCLUDE">
+<![%bibliomixed.module;[
+<!ENTITY % local.bibliomixed.attrib "">
+<!ENTITY % bibliomixed.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliomixed.element "INCLUDE">
+<![%bibliomixed.element;[
+<!ELEMENT bibliomixed %ho; (#PCDATA | %bibliocomponent.mix; | bibliomset)*
+                      %ubiq.exclusion;>
+<!--end of bibliomixed.element-->]]>
+
+<!ENTITY % bibliomixed.attlist "INCLUDE">
+<![%bibliomixed.attlist;[
+<!ATTLIST bibliomixed
+		%common.attrib;
+		%bibliomixed.role.attrib;
+		%local.bibliomixed.attrib;
+>
+<!--end of bibliomixed.attlist-->]]>
+<!--end of bibliomixed.module-->]]>
+
+<!ENTITY % articleinfo.module "INCLUDE">
+<![%articleinfo.module;[
+<!ENTITY % local.articleinfo.attrib "">
+<!ENTITY % articleinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % articleinfo.element "INCLUDE">
+<![%articleinfo.element;[
+<!ELEMENT articleinfo %ho; ((%info.class;)+)
+	%beginpage.exclusion;>
+<!--end of articleinfo.element-->]]>
+
+<!ENTITY % articleinfo.attlist "INCLUDE">
+<![%articleinfo.attlist;[
+<!ATTLIST articleinfo
+		%common.attrib;
+		%articleinfo.role.attrib;
+		%local.articleinfo.attrib;
+>
+<!--end of articleinfo.attlist-->]]>
+<!--end of articleinfo.module-->]]>
+
+<!ENTITY % biblioset.module "INCLUDE">
+<![%biblioset.module;[
+<!ENTITY % local.biblioset.attrib "">
+<!ENTITY % biblioset.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioset.element "INCLUDE">
+<![%biblioset.element;[
+<!ELEMENT biblioset %ho; ((%bibliocomponent.mix;)+)
+                      %ubiq.exclusion;>
+<!--end of biblioset.element-->]]>
+
+<!-- Relation: Relationship of elements contained within BiblioSet -->
+
+
+<!ENTITY % biblioset.attlist "INCLUDE">
+<![%biblioset.attlist;[
+<!ATTLIST biblioset
+		relation	CDATA		#IMPLIED
+		%common.attrib;
+		%biblioset.role.attrib;
+		%local.biblioset.attrib;
+>
+<!--end of biblioset.attlist-->]]>
+<!--end of biblioset.module-->]]>
+
+<!ENTITY % bibliomset.module "INCLUDE">
+<![%bibliomset.module;[
+<!ENTITY % bibliomset.role.attrib "%role.attrib;">
+<!ENTITY % local.bibliomset.attrib "">
+
+<!ENTITY % bibliomset.element "INCLUDE">
+<![%bibliomset.element;[
+<!ELEMENT bibliomset %ho; (#PCDATA | %bibliocomponent.mix; | bibliomset)*
+                      %ubiq.exclusion;>
+<!--end of bibliomset.element-->]]>
+
+<!-- Relation: Relationship of elements contained within BiblioMSet -->
+
+
+<!ENTITY % bibliomset.attlist "INCLUDE">
+<![%bibliomset.attlist;[
+<!ATTLIST bibliomset
+		relation	CDATA		#IMPLIED
+		%common.attrib;
+		%bibliomset.role.attrib;
+		%local.bibliomset.attrib;
+>
+<!--end of bibliomset.attlist-->]]>
+<!--end of bibliomset.module-->]]>
+
+<!ENTITY % bibliomisc.module "INCLUDE">
+<![%bibliomisc.module;[
+<!ENTITY % local.bibliomisc.attrib "">
+<!ENTITY % bibliomisc.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliomisc.element "INCLUDE">
+<![%bibliomisc.element;[
+<!ELEMENT bibliomisc %ho; (%para.char.mix;)*>
+<!--end of bibliomisc.element-->]]>
+
+<!ENTITY % bibliomisc.attlist "INCLUDE">
+<![%bibliomisc.attlist;[
+<!ATTLIST bibliomisc
+		%common.attrib;
+		%bibliomisc.role.attrib;
+		%local.bibliomisc.attrib;
+>
+<!--end of bibliomisc.attlist-->]]>
+<!--end of bibliomisc.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Subject, Keyword, and ITermSet elements .............................. -->
+
+<!ENTITY % subjectset.content.module "INCLUDE">
+<![%subjectset.content.module;[
+<!ENTITY % subjectset.module "INCLUDE">
+<![%subjectset.module;[
+<!ENTITY % local.subjectset.attrib "">
+<!ENTITY % subjectset.role.attrib "%role.attrib;">
+
+<!ENTITY % subjectset.element "INCLUDE">
+<![%subjectset.element;[
+<!ELEMENT subjectset %ho; (subject+)>
+<!--end of subjectset.element-->]]>
+
+<!-- Scheme: Controlled vocabulary employed in SubjectTerms -->
+
+
+<!ENTITY % subjectset.attlist "INCLUDE">
+<![%subjectset.attlist;[
+<!ATTLIST subjectset
+		scheme		NMTOKEN		#IMPLIED
+		%common.attrib;
+		%subjectset.role.attrib;
+		%local.subjectset.attrib;
+>
+<!--end of subjectset.attlist-->]]>
+<!--end of subjectset.module-->]]>
+
+<!ENTITY % subject.module "INCLUDE">
+<![%subject.module;[
+<!ENTITY % local.subject.attrib "">
+<!ENTITY % subject.role.attrib "%role.attrib;">
+
+<!ENTITY % subject.element "INCLUDE">
+<![%subject.element;[
+<!ELEMENT subject %ho; (subjectterm+)>
+<!--end of subject.element-->]]>
+
+<!-- Weight: Ranking of this group of SubjectTerms relative
+		to others, 0 is low, no highest value specified -->
+
+
+<!ENTITY % subject.attlist "INCLUDE">
+<![%subject.attlist;[
+<!ATTLIST subject
+		weight		CDATA		#IMPLIED
+		%common.attrib;
+		%subject.role.attrib;
+		%local.subject.attrib;
+>
+<!--end of subject.attlist-->]]>
+<!--end of subject.module-->]]>
+
+<!ENTITY % subjectterm.module "INCLUDE">
+<![%subjectterm.module;[
+<!ENTITY % local.subjectterm.attrib "">
+<!ENTITY % subjectterm.role.attrib "%role.attrib;">
+
+<!ENTITY % subjectterm.element "INCLUDE">
+<![%subjectterm.element;[
+<!ELEMENT subjectterm %ho; (#PCDATA)>
+<!--end of subjectterm.element-->]]>
+
+<!ENTITY % subjectterm.attlist "INCLUDE">
+<![%subjectterm.attlist;[
+<!ATTLIST subjectterm
+		%common.attrib;
+		%subjectterm.role.attrib;
+		%local.subjectterm.attrib;
+>
+<!--end of subjectterm.attlist-->]]>
+<!--end of subjectterm.module-->]]>
+<!--end of subjectset.content.module-->]]>
+
+<!ENTITY % keywordset.content.module "INCLUDE">
+<![%keywordset.content.module;[
+<!ENTITY % keywordset.module "INCLUDE">
+<![%keywordset.module;[
+<!ENTITY % local.keywordset.attrib "">
+<!ENTITY % keywordset.role.attrib "%role.attrib;">
+
+<!ENTITY % keywordset.element "INCLUDE">
+<![%keywordset.element;[
+<!ELEMENT keywordset %ho; (keyword+)>
+<!--end of keywordset.element-->]]>
+
+<!ENTITY % keywordset.attlist "INCLUDE">
+<![%keywordset.attlist;[
+<!ATTLIST keywordset
+		%common.attrib;
+		%keywordset.role.attrib;
+		%local.keywordset.attrib;
+>
+<!--end of keywordset.attlist-->]]>
+<!--end of keywordset.module-->]]>
+
+<!ENTITY % keyword.module "INCLUDE">
+<![%keyword.module;[
+<!ENTITY % local.keyword.attrib "">
+<!ENTITY % keyword.role.attrib "%role.attrib;">
+
+<!ENTITY % keyword.element "INCLUDE">
+<![%keyword.element;[
+<!ELEMENT keyword %ho; (#PCDATA)>
+<!--end of keyword.element-->]]>
+
+<!ENTITY % keyword.attlist "INCLUDE">
+<![%keyword.attlist;[
+<!ATTLIST keyword
+		%common.attrib;
+		%keyword.role.attrib;
+		%local.keyword.attrib;
+>
+<!--end of keyword.attlist-->]]>
+<!--end of keyword.module-->]]>
+<!--end of keywordset.content.module-->]]>
+
+<!ENTITY % itermset.module "INCLUDE">
+<![%itermset.module;[
+<!ENTITY % local.itermset.attrib "">
+<!ENTITY % itermset.role.attrib "%role.attrib;">
+
+<!ENTITY % itermset.element "INCLUDE">
+<![%itermset.element;[
+<!ELEMENT itermset %ho; (indexterm+)>
+<!--end of itermset.element-->]]>
+
+<!ENTITY % itermset.attlist "INCLUDE">
+<![%itermset.attlist;[
+<!ATTLIST itermset
+		%common.attrib;
+		%itermset.role.attrib;
+		%local.itermset.attrib;
+>
+<!--end of itermset.attlist-->]]>
+<!--end of itermset.module-->]]>
+
+<!-- Bibliographic info for "blocks" -->
+
+<!ENTITY % blockinfo.module "INCLUDE">
+<![ %blockinfo.module; [
+<!ENTITY % local.blockinfo.attrib "">
+<!ENTITY % blockinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % blockinfo.element "INCLUDE">
+<![ %blockinfo.element; [
+<!ELEMENT blockinfo %ho; ((%info.class;)+)
+	%beginpage.exclusion;>
+<!--end of blockinfo.element-->]]>
+
+<!ENTITY % blockinfo.attlist "INCLUDE">
+<![ %blockinfo.attlist; [
+<!ATTLIST blockinfo
+		%common.attrib;
+		%blockinfo.role.attrib;
+		%local.blockinfo.attrib;
+>
+<!--end of blockinfo.attlist-->]]>
+<!--end of blockinfo.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Compound (section-ish) elements ...................................... -->
+
+<!-- Message set ...................... -->
+
+<!ENTITY % msgset.content.module "INCLUDE">
+<![%msgset.content.module;[
+<!ENTITY % msgset.module "INCLUDE">
+<![%msgset.module;[
+<!ENTITY % local.msgset.attrib "">
+<!ENTITY % msgset.role.attrib "%role.attrib;">
+
+<!ENTITY % msgset.element "INCLUDE">
+<![%msgset.element;[
+<!ELEMENT msgset %ho; (blockinfo?, (%formalobject.title.content;)?,
+                       (msgentry+|simplemsgentry+))>
+<!--end of msgset.element-->]]>
+
+<!ENTITY % msgset.attlist "INCLUDE">
+<![%msgset.attlist;[
+<!ATTLIST msgset
+		%common.attrib;
+		%msgset.role.attrib;
+		%local.msgset.attrib;
+>
+<!--end of msgset.attlist-->]]>
+<!--end of msgset.module-->]]>
+
+<!ENTITY % msgentry.module "INCLUDE">
+<![%msgentry.module;[
+<!ENTITY % local.msgentry.attrib "">
+<!ENTITY % msgentry.role.attrib "%role.attrib;">
+
+<!ENTITY % msgentry.element "INCLUDE">
+<![%msgentry.element;[
+<!ELEMENT msgentry %ho; (msg+, msginfo?, msgexplan*)>
+<!--end of msgentry.element-->]]>
+
+<!ENTITY % msgentry.attlist "INCLUDE">
+<![%msgentry.attlist;[
+<!ATTLIST msgentry
+		%common.attrib;
+		%msgentry.role.attrib;
+		%local.msgentry.attrib;
+>
+<!--end of msgentry.attlist-->]]>
+<!--end of msgentry.module-->]]>
+
+<!ENTITY % simplemsgentry.module "INCLUDE">
+<![ %simplemsgentry.module; [
+<!ENTITY % local.simplemsgentry.attrib "">
+<!ENTITY % simplemsgentry.role.attrib "%role.attrib;">
+
+<!ENTITY % simplemsgentry.element "INCLUDE">
+<![ %simplemsgentry.element; [
+<!ELEMENT simplemsgentry %ho; (msgtext, msgexplan+)>
+<!--end of simplemsgentry.element-->]]>
+
+<!ENTITY % simplemsgentry.attlist "INCLUDE">
+<![ %simplemsgentry.attlist; [
+<!ATTLIST simplemsgentry
+		audience	CDATA	#IMPLIED
+		level		CDATA	#IMPLIED
+		origin		CDATA	#IMPLIED
+		%common.attrib;
+		%simplemsgentry.role.attrib;
+		%local.simplemsgentry.attrib;
+>
+<!--end of simplemsgentry.attlist-->]]>
+<!--end of simplemsgentry.module-->]]>
+
+<!ENTITY % msg.module "INCLUDE">
+<![%msg.module;[
+<!ENTITY % local.msg.attrib "">
+<!ENTITY % msg.role.attrib "%role.attrib;">
+
+<!ENTITY % msg.element "INCLUDE">
+<![%msg.element;[
+<!ELEMENT msg %ho; (title?, msgmain, (msgsub | msgrel)*)>
+<!--end of msg.element-->]]>
+
+<!ENTITY % msg.attlist "INCLUDE">
+<![%msg.attlist;[
+<!ATTLIST msg
+		%common.attrib;
+		%msg.role.attrib;
+		%local.msg.attrib;
+>
+<!--end of msg.attlist-->]]>
+<!--end of msg.module-->]]>
+
+<!ENTITY % msgmain.module "INCLUDE">
+<![%msgmain.module;[
+<!ENTITY % local.msgmain.attrib "">
+<!ENTITY % msgmain.role.attrib "%role.attrib;">
+
+<!ENTITY % msgmain.element "INCLUDE">
+<![%msgmain.element;[
+<!ELEMENT msgmain %ho; (title?, msgtext)>
+<!--end of msgmain.element-->]]>
+
+<!ENTITY % msgmain.attlist "INCLUDE">
+<![%msgmain.attlist;[
+<!ATTLIST msgmain
+		%common.attrib;
+		%msgmain.role.attrib;
+		%local.msgmain.attrib;
+>
+<!--end of msgmain.attlist-->]]>
+<!--end of msgmain.module-->]]>
+
+<!ENTITY % msgsub.module "INCLUDE">
+<![%msgsub.module;[
+<!ENTITY % local.msgsub.attrib "">
+<!ENTITY % msgsub.role.attrib "%role.attrib;">
+
+<!ENTITY % msgsub.element "INCLUDE">
+<![%msgsub.element;[
+<!ELEMENT msgsub %ho; (title?, msgtext)>
+<!--end of msgsub.element-->]]>
+
+<!ENTITY % msgsub.attlist "INCLUDE">
+<![%msgsub.attlist;[
+<!ATTLIST msgsub
+		%common.attrib;
+		%msgsub.role.attrib;
+		%local.msgsub.attrib;
+>
+<!--end of msgsub.attlist-->]]>
+<!--end of msgsub.module-->]]>
+
+<!ENTITY % msgrel.module "INCLUDE">
+<![%msgrel.module;[
+<!ENTITY % local.msgrel.attrib "">
+<!ENTITY % msgrel.role.attrib "%role.attrib;">
+
+<!ENTITY % msgrel.element "INCLUDE">
+<![%msgrel.element;[
+<!ELEMENT msgrel %ho; (title?, msgtext)>
+<!--end of msgrel.element-->]]>
+
+<!ENTITY % msgrel.attlist "INCLUDE">
+<![%msgrel.attlist;[
+<!ATTLIST msgrel
+		%common.attrib;
+		%msgrel.role.attrib;
+		%local.msgrel.attrib;
+>
+<!--end of msgrel.attlist-->]]>
+<!--end of msgrel.module-->]]>
+
+<!-- MsgText (defined in the Inlines section, below)-->
+
+<!ENTITY % msginfo.module "INCLUDE">
+<![%msginfo.module;[
+<!ENTITY % local.msginfo.attrib "">
+<!ENTITY % msginfo.role.attrib "%role.attrib;">
+
+<!ENTITY % msginfo.element "INCLUDE">
+<![%msginfo.element;[
+<!ELEMENT msginfo %ho; ((msglevel | msgorig | msgaud)*)>
+<!--end of msginfo.element-->]]>
+
+<!ENTITY % msginfo.attlist "INCLUDE">
+<![%msginfo.attlist;[
+<!ATTLIST msginfo
+		%common.attrib;
+		%msginfo.role.attrib;
+		%local.msginfo.attrib;
+>
+<!--end of msginfo.attlist-->]]>
+<!--end of msginfo.module-->]]>
+
+<!ENTITY % msglevel.module "INCLUDE">
+<![%msglevel.module;[
+<!ENTITY % local.msglevel.attrib "">
+<!ENTITY % msglevel.role.attrib "%role.attrib;">
+
+<!ENTITY % msglevel.element "INCLUDE">
+<![%msglevel.element;[
+<!ELEMENT msglevel %ho; (%smallcptr.char.mix;)*>
+<!--end of msglevel.element-->]]>
+
+<!ENTITY % msglevel.attlist "INCLUDE">
+<![%msglevel.attlist;[
+<!ATTLIST msglevel
+		%common.attrib;
+		%msglevel.role.attrib;
+		%local.msglevel.attrib;
+>
+<!--end of msglevel.attlist-->]]>
+<!--end of msglevel.module-->]]>
+
+<!ENTITY % msgorig.module "INCLUDE">
+<![%msgorig.module;[
+<!ENTITY % local.msgorig.attrib "">
+<!ENTITY % msgorig.role.attrib "%role.attrib;">
+
+<!ENTITY % msgorig.element "INCLUDE">
+<![%msgorig.element;[
+<!ELEMENT msgorig %ho; (%smallcptr.char.mix;)*>
+<!--end of msgorig.element-->]]>
+
+<!ENTITY % msgorig.attlist "INCLUDE">
+<![%msgorig.attlist;[
+<!ATTLIST msgorig
+		%common.attrib;
+		%msgorig.role.attrib;
+		%local.msgorig.attrib;
+>
+<!--end of msgorig.attlist-->]]>
+<!--end of msgorig.module-->]]>
+
+<!ENTITY % msgaud.module "INCLUDE">
+<![%msgaud.module;[
+<!ENTITY % local.msgaud.attrib "">
+<!ENTITY % msgaud.role.attrib "%role.attrib;">
+
+<!ENTITY % msgaud.element "INCLUDE">
+<![%msgaud.element;[
+<!ELEMENT msgaud %ho; (%para.char.mix;)*>
+<!--end of msgaud.element-->]]>
+
+<!ENTITY % msgaud.attlist "INCLUDE">
+<![%msgaud.attlist;[
+<!ATTLIST msgaud
+		%common.attrib;
+		%msgaud.role.attrib;
+		%local.msgaud.attrib;
+>
+<!--end of msgaud.attlist-->]]>
+<!--end of msgaud.module-->]]>
+
+<!ENTITY % msgexplan.module "INCLUDE">
+<![%msgexplan.module;[
+<!ENTITY % local.msgexplan.attrib "">
+<!ENTITY % msgexplan.role.attrib "%role.attrib;">
+
+<!ENTITY % msgexplan.element "INCLUDE">
+<![%msgexplan.element;[
+<!ELEMENT msgexplan %ho; (title?, (%component.mix;)+)>
+<!--end of msgexplan.element-->]]>
+
+<!ENTITY % msgexplan.attlist "INCLUDE">
+<![%msgexplan.attlist;[
+<!ATTLIST msgexplan
+		%common.attrib;
+		%msgexplan.role.attrib;
+		%local.msgexplan.attrib;
+>
+<!--end of msgexplan.attlist-->]]>
+<!--end of msgexplan.module-->]]>
+<!--end of msgset.content.module-->]]>
+
+<!ENTITY % task.content.module "INCLUDE">
+<![%task.content.module;[
+<!ENTITY % task.module "INCLUDE">
+<![%task.module;[
+<!ENTITY % local.task.attrib "">
+<!ENTITY % task.role.attrib "%role.attrib;">
+
+<!ENTITY % task.element "INCLUDE">
+<![%task.element;[
+<!ELEMENT task %ho; (blockinfo?,(%ndxterm.class;)*,
+                     (%formalobject.title.content;),
+                     tasksummary?,
+                     taskprerequisites?,
+                     procedure,
+                     example*,
+                     taskrelated?)>
+<!--end of task.element-->]]>
+
+<!ENTITY % task.attlist "INCLUDE">
+<![%task.attlist;[
+<!ATTLIST task
+		%common.attrib;
+		%task.role.attrib;
+		%local.task.attrib;
+>
+<!--end of task.attlist-->]]>
+<!--end of task.module-->]]>
+
+<!ENTITY % tasksummary.module "INCLUDE">
+<![%tasksummary.module;[
+<!ENTITY % local.tasksummary.attrib "">
+<!ENTITY % tasksummary.role.attrib "%role.attrib;">
+
+<!ENTITY % tasksummary.element "INCLUDE">
+<![%tasksummary.element;[
+<!ELEMENT tasksummary %ho; (blockinfo?,
+                            (%formalobject.title.content;)?,
+                            (%component.mix;)+)>
+<!--end of tasksummary.element-->]]>
+
+<!ENTITY % tasksummary.attlist "INCLUDE">
+<![%tasksummary.attlist;[
+<!ATTLIST tasksummary
+		%common.attrib;
+		%tasksummary.role.attrib;
+		%local.tasksummary.attrib;
+>
+<!--end of tasksummary.attlist-->]]>
+<!--end of tasksummary.module-->]]>
+
+<!ENTITY % taskprerequisites.module "INCLUDE">
+<![%taskprerequisites.module;[
+<!ENTITY % local.taskprerequisites.attrib "">
+<!ENTITY % taskprerequisites.role.attrib "%role.attrib;">
+
+<!ENTITY % taskprerequisites.element "INCLUDE">
+<![%taskprerequisites.element;[
+<!ELEMENT taskprerequisites %ho; (blockinfo?,
+                                  (%formalobject.title.content;)?,
+                                  (%component.mix;)+)>
+<!--end of taskprerequisites.element-->]]>
+
+<!ENTITY % taskprerequisites.attlist "INCLUDE">
+<![%taskprerequisites.attlist;[
+<!ATTLIST taskprerequisites
+		%common.attrib;
+		%taskprerequisites.role.attrib;
+		%local.taskprerequisites.attrib;
+>
+<!--end of taskprerequisites.attlist-->]]>
+<!--end of taskprerequisites.module-->]]>
+
+<!ENTITY % taskrelated.module "INCLUDE">
+<![%taskrelated.module;[
+<!ENTITY % local.taskrelated.attrib "">
+<!ENTITY % taskrelated.role.attrib "%role.attrib;">
+
+<!ENTITY % taskrelated.element "INCLUDE">
+<![%taskrelated.element;[
+<!ELEMENT taskrelated %ho; (blockinfo?,
+                            (%formalobject.title.content;)?,
+                            (%component.mix;)+)>
+<!--end of taskrelated.element-->]]>
+
+<!ENTITY % taskrelated.attlist "INCLUDE">
+<![%taskrelated.attlist;[
+<!ATTLIST taskrelated
+		%common.attrib;
+		%taskrelated.role.attrib;
+		%local.taskrelated.attrib;
+>
+<!--end of taskrelated.attlist-->]]>
+<!--end of taskrelated.module-->]]>
+<!--end of task.content.module-->]]>
+
+<!-- QandASet ........................ -->
+<!ENTITY % qandaset.content.module "INCLUDE">
+<![ %qandaset.content.module; [
+<!ENTITY % qandaset.module "INCLUDE">
+<![ %qandaset.module; [
+<!ENTITY % local.qandaset.attrib "">
+<!ENTITY % qandaset.role.attrib "%role.attrib;">
+
+<!ENTITY % qandaset.element "INCLUDE">
+<![ %qandaset.element; [
+<!ELEMENT qandaset %ho; (blockinfo?, (%formalobject.title.content;)?,
+			(%qandaset.mix;)*,
+                        (qandadiv+|qandaentry+))>
+<!--end of qandaset.element-->]]>
+
+<!ENTITY % qandaset.attlist "INCLUDE">
+<![ %qandaset.attlist; [
+<!ATTLIST qandaset
+		defaultlabel	(qanda|number|none)       #IMPLIED
+		%common.attrib;
+		%qandaset.role.attrib;
+		%local.qandaset.attrib;>
+<!--end of qandaset.attlist-->]]>
+<!--end of qandaset.module-->]]>
+
+<!ENTITY % qandadiv.module "INCLUDE">
+<![ %qandadiv.module; [
+<!ENTITY % local.qandadiv.attrib "">
+<!ENTITY % qandadiv.role.attrib "%role.attrib;">
+
+<!ENTITY % qandadiv.element "INCLUDE">
+<![ %qandadiv.element; [
+<!ELEMENT qandadiv %ho; (blockinfo?, (%formalobject.title.content;)?,
+			(%qandaset.mix;)*,
+			(qandadiv+|qandaentry+))>
+<!--end of qandadiv.element-->]]>
+
+<!ENTITY % qandadiv.attlist "INCLUDE">
+<![ %qandadiv.attlist; [
+<!ATTLIST qandadiv
+		%common.attrib;
+		%qandadiv.role.attrib;
+		%local.qandadiv.attrib;>
+<!--end of qandadiv.attlist-->]]>
+<!--end of qandadiv.module-->]]>
+
+<!ENTITY % qandaentry.module "INCLUDE">
+<![ %qandaentry.module; [
+<!ENTITY % local.qandaentry.attrib "">
+<!ENTITY % qandaentry.role.attrib "%role.attrib;">
+
+<!ENTITY % qandaentry.element "INCLUDE">
+<![ %qandaentry.element; [
+<!ELEMENT qandaentry %ho; (blockinfo?, revhistory?, question, answer*)>
+<!--end of qandaentry.element-->]]>
+
+<!ENTITY % qandaentry.attlist "INCLUDE">
+<![ %qandaentry.attlist; [
+<!ATTLIST qandaentry
+		%common.attrib;
+		%qandaentry.role.attrib;
+		%local.qandaentry.attrib;>
+<!--end of qandaentry.attlist-->]]>
+<!--end of qandaentry.module-->]]>
+
+<!ENTITY % question.module "INCLUDE">
+<![ %question.module; [
+<!ENTITY % local.question.attrib "">
+<!ENTITY % question.role.attrib "%role.attrib;">
+
+<!ENTITY % question.element "INCLUDE">
+<![ %question.element; [
+<!ELEMENT question %ho; (label?, (%qandaset.mix;)+)>
+<!--end of question.element-->]]>
+
+<!ENTITY % question.attlist "INCLUDE">
+<![ %question.attlist; [
+<!ATTLIST question
+		%common.attrib;
+		%question.role.attrib;
+		%local.question.attrib;
+>
+<!--end of question.attlist-->]]>
+<!--end of question.module-->]]>
+
+<!ENTITY % answer.module "INCLUDE">
+<![ %answer.module; [
+<!ENTITY % local.answer.attrib "">
+<!ENTITY % answer.role.attrib "%role.attrib;">
+
+<!ENTITY % answer.element "INCLUDE">
+<![ %answer.element; [
+<!ELEMENT answer %ho; (label?, (%qandaset.mix;)*, qandaentry*)>
+<!--end of answer.element-->]]>
+
+<!ENTITY % answer.attlist "INCLUDE">
+<![ %answer.attlist; [
+<!ATTLIST answer
+		%common.attrib;
+		%answer.role.attrib;
+		%local.answer.attrib;
+>
+<!--end of answer.attlist-->]]>
+<!--end of answer.module-->]]>
+
+<!ENTITY % label.module "INCLUDE">
+<![ %label.module; [
+<!ENTITY % local.label.attrib "">
+<!ENTITY % label.role.attrib "%role.attrib;">
+
+<!ENTITY % label.element "INCLUDE">
+<![ %label.element; [
+<!ELEMENT label %ho; (%word.char.mix;)*>
+<!--end of label.element-->]]>
+
+<!ENTITY % label.attlist "INCLUDE">
+<![ %label.attlist; [
+<!ATTLIST label
+		%common.attrib;
+		%label.role.attrib;
+		%local.label.attrib;
+>
+<!--end of label.attlist-->]]>
+<!--end of label.module-->]]>
+<!--end of qandaset.content.module-->]]>
+
+<!-- Procedure ........................ -->
+
+<!ENTITY % procedure.content.module "INCLUDE">
+<![%procedure.content.module;[
+<!ENTITY % procedure.module "INCLUDE">
+<![%procedure.module;[
+<!ENTITY % local.procedure.attrib "">
+<!ENTITY % procedure.role.attrib "%role.attrib;">
+
+<!ENTITY % procedure.element "INCLUDE">
+<![%procedure.element;[
+<!ELEMENT procedure %ho; (blockinfo?, (%formalobject.title.content;)?,
+                          (%component.mix;)*, step+)>
+<!--end of procedure.element-->]]>
+
+<!ENTITY % procedure.attlist "INCLUDE">
+<![%procedure.attlist;[
+<!ATTLIST procedure
+		%common.attrib;
+		%procedure.role.attrib;
+		%local.procedure.attrib;
+>
+<!--end of procedure.attlist-->]]>
+<!--end of procedure.module-->]]>
+
+<!ENTITY % step.module "INCLUDE">
+<![%step.module;[
+<!ENTITY % local.step.attrib "">
+<!ENTITY % step.role.attrib "%role.attrib;">
+
+<!ENTITY % step.element "INCLUDE">
+<![%step.element;[
+<!ELEMENT step %ho; (title?, (((%component.mix;)+, ((substeps|stepalternatives), (%component.mix;)*)?)
+                    | ((substeps|stepalternatives), (%component.mix;)*)))>
+<!--end of step.element-->]]>
+
+<!-- Performance: Whether the Step must be performed -->
+<!-- not #REQUIRED! -->
+
+
+<!ENTITY % step.attlist "INCLUDE">
+<![%step.attlist;[
+<!ATTLIST step
+		performance	(optional
+				|required)	"required"
+		%common.attrib;
+		%step.role.attrib;
+		%local.step.attrib;
+>
+<!--end of step.attlist-->]]>
+<!--end of step.module-->]]>
+
+<!ENTITY % substeps.module "INCLUDE">
+<![%substeps.module;[
+<!ENTITY % local.substeps.attrib "">
+<!ENTITY % substeps.role.attrib "%role.attrib;">
+
+<!ENTITY % substeps.element "INCLUDE">
+<![%substeps.element;[
+<!ELEMENT substeps %ho; (step+)>
+<!--end of substeps.element-->]]>
+
+<!-- Performance: whether entire set of substeps must be performed -->
+<!-- not #REQUIRED! -->
+
+<!ENTITY % substeps.attlist "INCLUDE">
+<![%substeps.attlist;[
+<!ATTLIST substeps
+		performance	(optional
+				|required)	"required"
+		%common.attrib;
+		%substeps.role.attrib;
+		%local.substeps.attrib;
+>
+<!--end of substeps.attlist-->]]>
+<!--end of substeps.module-->]]>
+
+<!ENTITY % stepalternatives.module "INCLUDE">
+<![%stepalternatives.module;[
+<!ENTITY % local.stepalternatives.attrib "">
+<!ENTITY % stepalternatives.role.attrib "%role.attrib;">
+
+<!ENTITY % stepalternatives.element "INCLUDE">
+<![%stepalternatives.element;[
+<!ELEMENT stepalternatives %ho; (step+)>
+<!--end of stepalternatives.element-->]]>
+
+<!-- Performance: Whether (one of) the alternatives must be performed -->
+<!-- not #REQUIRED! -->
+
+<!ENTITY % stepalternatives.attlist "INCLUDE">
+<![%stepalternatives.attlist;[
+<!ATTLIST stepalternatives
+		performance	(optional
+				|required)	"required"
+		%common.attrib;
+		%stepalternatives.role.attrib;
+		%local.stepalternatives.attrib;
+>
+<!--end of stepalternatives.attlist-->]]>
+<!--end of stepalternatives.module-->]]>
+<!--end of procedure.content.module-->]]>
+
+<!-- Sidebar .......................... -->
+
+<!ENTITY % sidebar.content.model "INCLUDE">
+<![ %sidebar.content.model; [
+
+<!ENTITY % sidebarinfo.module "INCLUDE">
+<![ %sidebarinfo.module; [
+<!ENTITY % local.sidebarinfo.attrib "">
+<!ENTITY % sidebarinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % sidebarinfo.element "INCLUDE">
+<![ %sidebarinfo.element; [
+<!ELEMENT sidebarinfo %ho; ((%info.class;)+)
+	%beginpage.exclusion;>
+<!--end of sidebarinfo.element-->]]>
+
+<!ENTITY % sidebarinfo.attlist "INCLUDE">
+<![ %sidebarinfo.attlist; [
+<!ATTLIST sidebarinfo
+		%common.attrib;
+		%sidebarinfo.role.attrib;
+		%local.sidebarinfo.attrib;
+>
+<!--end of sidebarinfo.attlist-->]]>
+<!--end of sidebarinfo.module-->]]>
+
+<!ENTITY % sidebar.module "INCLUDE">
+<![%sidebar.module;[
+<!ENTITY % local.sidebar.attrib "">
+<!ENTITY % sidebar.role.attrib "%role.attrib;">
+
+<!ENTITY % sidebar.element "INCLUDE">
+<![%sidebar.element;[
+<!ELEMENT sidebar %ho; (sidebarinfo?,
+                   (%formalobject.title.content;)?,
+                   (%sidebar.mix;)+)>
+<!--end of sidebar.element-->]]>
+
+<!ENTITY % sidebar.attlist "INCLUDE">
+<![%sidebar.attlist;[
+<!ATTLIST sidebar
+		%common.attrib;
+		%sidebar.role.attrib;
+		%local.sidebar.attrib;
+>
+<!--end of sidebar.attlist-->]]>
+<!--end of sidebar.module-->]]>
+<!--end of sidebar.content.model-->]]>
+
+<!-- ...................................................................... -->
+<!-- Paragraph-related elements ........................................... -->
+
+<!ENTITY % abstract.module "INCLUDE">
+<![%abstract.module;[
+<!ENTITY % local.abstract.attrib "">
+<!ENTITY % abstract.role.attrib "%role.attrib;">
+
+<!ENTITY % abstract.element "INCLUDE">
+<![%abstract.element;[
+<!ELEMENT abstract %ho; (title?, (%para.class;)+)>
+<!--end of abstract.element-->]]>
+
+<!ENTITY % abstract.attlist "INCLUDE">
+<![%abstract.attlist;[
+<!ATTLIST abstract
+		%common.attrib;
+		%abstract.role.attrib;
+		%local.abstract.attrib;
+>
+<!--end of abstract.attlist-->]]>
+<!--end of abstract.module-->]]>
+
+<!ENTITY % authorblurb.module "INCLUDE">
+<![%authorblurb.module;[
+<!ENTITY % local.authorblurb.attrib "">
+<!ENTITY % authorblurb.role.attrib "%role.attrib;">
+
+<!ENTITY % authorblurb.element "INCLUDE">
+<![%authorblurb.element;[
+<!ELEMENT authorblurb %ho; (title?, (%para.class;)+)>
+<!--end of authorblurb.element-->]]>
+
+<!ENTITY % authorblurb.attlist "INCLUDE">
+<![%authorblurb.attlist;[
+<!ATTLIST authorblurb
+		%common.attrib;
+		%authorblurb.role.attrib;
+		%local.authorblurb.attrib;
+>
+<!--end of authorblurb.attlist-->]]>
+<!--end of authorblurb.module-->]]>
+
+<!ENTITY % personblurb.module "INCLUDE">
+<![%personblurb.module;[
+<!ENTITY % local.personblurb.attrib "">
+<!ENTITY % personblurb.role.attrib "%role.attrib;">
+
+<!ENTITY % personblurb.element "INCLUDE">
+<![%personblurb.element;[
+<!ELEMENT personblurb %ho; (title?, (%para.class;)+)>
+<!--end of personblurb.element-->]]>
+
+<!ENTITY % personblurb.attlist "INCLUDE">
+<![%personblurb.attlist;[
+<!ATTLIST personblurb
+		%common.attrib;
+		%personblurb.role.attrib;
+		%local.personblurb.attrib;
+>
+<!--end of personblurb.attlist-->]]>
+<!--end of personblurb.module-->]]>
+
+<!ENTITY % blockquote.module "INCLUDE">
+<![%blockquote.module;[
+
+<!ENTITY % local.blockquote.attrib "">
+<!ENTITY % blockquote.role.attrib "%role.attrib;">
+
+<!ENTITY % blockquote.element "INCLUDE">
+<![%blockquote.element;[
+<!ELEMENT blockquote %ho; (blockinfo?, title?, attribution?, (%component.mix;)+)
+                      %blockquote.exclusion;>
+<!--end of blockquote.element-->]]>
+
+<!ENTITY % blockquote.attlist "INCLUDE">
+<![%blockquote.attlist;[
+<!ATTLIST blockquote
+		%common.attrib;
+		%blockquote.role.attrib;
+		%local.blockquote.attrib;
+>
+<!--end of blockquote.attlist-->]]>
+<!--end of blockquote.module-->]]>
+
+<!ENTITY % attribution.module "INCLUDE">
+<![%attribution.module;[
+<!ENTITY % local.attribution.attrib "">
+<!ENTITY % attribution.role.attrib "%role.attrib;">
+
+<!ENTITY % attribution.element "INCLUDE">
+<![%attribution.element;[
+<!ELEMENT attribution %ho; (%para.char.mix;)*>
+<!--end of attribution.element-->]]>
+
+<!ENTITY % attribution.attlist "INCLUDE">
+<![%attribution.attlist;[
+<!ATTLIST attribution
+		%common.attrib;
+		%attribution.role.attrib;
+		%local.attribution.attrib;
+>
+<!--end of attribution.attlist-->]]>
+<!--end of attribution.module-->]]>
+
+<!ENTITY % bridgehead.module "INCLUDE">
+<![%bridgehead.module;[
+<!ENTITY % local.bridgehead.attrib "">
+<!ENTITY % bridgehead.role.attrib "%role.attrib;">
+
+<!ENTITY % bridgehead.element "INCLUDE">
+<![%bridgehead.element;[
+<!ELEMENT bridgehead %ho; (%title.char.mix;)*>
+<!--end of bridgehead.element-->]]>
+
+<!-- Renderas: Indicates the format in which the BridgeHead
+		should appear -->
+
+
+<!ENTITY % bridgehead.attlist "INCLUDE">
+<![%bridgehead.attlist;[
+<!ATTLIST bridgehead
+		renderas	(other
+				|sect1
+				|sect2
+				|sect3
+				|sect4
+				|sect5)		#IMPLIED
+		%common.attrib;
+		%bridgehead.role.attrib;
+		%local.bridgehead.attrib;
+>
+<!--end of bridgehead.attlist-->]]>
+<!--end of bridgehead.module-->]]>
+
+<!ENTITY % remark.module "INCLUDE">
+<![%remark.module;[
+<!ENTITY % local.remark.attrib "">
+<!ENTITY % remark.role.attrib "%role.attrib;">
+
+<!ENTITY % remark.element "INCLUDE">
+<![%remark.element;[
+<!ELEMENT remark %ho; (%para.char.mix;)*
+                      %remark.exclusion;>
+<!--end of remark.element-->]]>
+
+<!ENTITY % remark.attlist "INCLUDE">
+<![%remark.attlist;[
+<!ATTLIST remark
+		%common.attrib;
+		%remark.role.attrib;
+		%local.remark.attrib;
+>
+<!--end of remark.attlist-->]]>
+<!--end of remark.module-->]]>
+
+<!ENTITY % epigraph.module "INCLUDE">
+<![%epigraph.module;[
+<!ENTITY % local.epigraph.attrib "">
+<!ENTITY % epigraph.role.attrib "%role.attrib;">
+
+<!ENTITY % epigraph.element "INCLUDE">
+<![%epigraph.element;[
+<!ELEMENT epigraph %ho; (attribution?, ((%para.class;)|literallayout)+)>
+<!--end of epigraph.element-->]]>
+
+<!ENTITY % epigraph.attlist "INCLUDE">
+<![%epigraph.attlist;[
+<!ATTLIST epigraph
+		%common.attrib;
+		%epigraph.role.attrib;
+		%local.epigraph.attrib;
+>
+<!--end of epigraph.attlist-->]]>
+<!-- Attribution (defined above)-->
+<!--end of epigraph.module-->]]>
+
+<!ENTITY % footnote.module "INCLUDE">
+<![%footnote.module;[
+<!ENTITY % local.footnote.attrib "">
+<!ENTITY % footnote.role.attrib "%role.attrib;">
+
+<!ENTITY % footnote.element "INCLUDE">
+<![%footnote.element;[
+<!ELEMENT footnote %ho; ((%footnote.mix;)+)
+                      %footnote.exclusion;>
+<!--end of footnote.element-->]]>
+
+<!ENTITY % footnote.attlist "INCLUDE">
+<![%footnote.attlist;[
+<!ATTLIST footnote
+		%label.attrib;
+		%common.attrib;
+		%footnote.role.attrib;
+		%local.footnote.attrib;
+>
+<!--end of footnote.attlist-->]]>
+<!--end of footnote.module-->]]>
+
+<!ENTITY % highlights.module "INCLUDE">
+<![%highlights.module;[
+<!ENTITY % local.highlights.attrib "">
+<!ENTITY % highlights.role.attrib "%role.attrib;">
+
+<!ENTITY % highlights.element "INCLUDE">
+<![%highlights.element;[
+<!ELEMENT highlights %ho; ((%highlights.mix;)+)
+                      %highlights.exclusion;>
+<!--end of highlights.element-->]]>
+
+<!ENTITY % highlights.attlist "INCLUDE">
+<![%highlights.attlist;[
+<!ATTLIST highlights
+		%common.attrib;
+		%highlights.role.attrib;
+		%local.highlights.attrib;
+>
+<!--end of highlights.attlist-->]]>
+<!--end of highlights.module-->]]>
+
+<!ENTITY % formalpara.module "INCLUDE">
+<![%formalpara.module;[
+<!ENTITY % local.formalpara.attrib "">
+<!ENTITY % formalpara.role.attrib "%role.attrib;">
+
+<!ENTITY % formalpara.element "INCLUDE">
+<![%formalpara.element;[
+<!ELEMENT formalpara %ho; (title, (%ndxterm.class;)*, para)>
+<!--end of formalpara.element-->]]>
+
+<!ENTITY % formalpara.attlist "INCLUDE">
+<![%formalpara.attlist;[
+<!ATTLIST formalpara
+		%common.attrib;
+		%formalpara.role.attrib;
+		%local.formalpara.attrib;
+>
+<!--end of formalpara.attlist-->]]>
+<!--end of formalpara.module-->]]>
+
+<!ENTITY % para.module "INCLUDE">
+<![%para.module;[
+<!ENTITY % local.para.attrib "">
+<!ENTITY % para.role.attrib "%role.attrib;">
+
+<!ENTITY % para.element "INCLUDE">
+<![%para.element;[
+<!ELEMENT para %ho; (%para.char.mix; | %para.mix;)*>
+<!--end of para.element-->]]>
+
+<!ENTITY % para.attlist "INCLUDE">
+<![%para.attlist;[
+<!ATTLIST para
+		%common.attrib;
+		%para.role.attrib;
+		%local.para.attrib;
+>
+<!--end of para.attlist-->]]>
+<!--end of para.module-->]]>
+
+<!ENTITY % simpara.module "INCLUDE">
+<![%simpara.module;[
+<!ENTITY % local.simpara.attrib "">
+<!ENTITY % simpara.role.attrib "%role.attrib;">
+
+<!ENTITY % simpara.element "INCLUDE">
+<![%simpara.element;[
+<!ELEMENT simpara %ho; (%para.char.mix;)*>
+<!--end of simpara.element-->]]>
+
+<!ENTITY % simpara.attlist "INCLUDE">
+<![%simpara.attlist;[
+<!ATTLIST simpara
+		%common.attrib;
+		%simpara.role.attrib;
+		%local.simpara.attrib;
+>
+<!--end of simpara.attlist-->]]>
+<!--end of simpara.module-->]]>
+
+<!ENTITY % admon.module "INCLUDE">
+<![%admon.module;[
+<!ENTITY % local.admon.attrib "">
+<!ENTITY % admon.role.attrib "%role.attrib;">
+
+
+<!ENTITY % caution.element "INCLUDE">
+<![%caution.element;[
+<!ELEMENT caution %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of caution.element-->]]>
+
+<!ENTITY % caution.attlist "INCLUDE">
+<![%caution.attlist;[
+<!ATTLIST caution
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of caution.attlist-->]]>
+
+
+<!ENTITY % important.element "INCLUDE">
+<![%important.element;[
+<!ELEMENT important %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of important.element-->]]>
+
+<!ENTITY % important.attlist "INCLUDE">
+<![%important.attlist;[
+<!ATTLIST important
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of important.attlist-->]]>
+
+
+<!ENTITY % note.element "INCLUDE">
+<![%note.element;[
+<!ELEMENT note %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of note.element-->]]>
+
+<!ENTITY % note.attlist "INCLUDE">
+<![%note.attlist;[
+<!ATTLIST note
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of note.attlist-->]]>
+
+<!ENTITY % tip.element "INCLUDE">
+<![%tip.element;[
+<!ELEMENT tip %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of tip.element-->]]>
+
+<!ENTITY % tip.attlist "INCLUDE">
+<![%tip.attlist;[
+<!ATTLIST tip
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of tip.attlist-->]]>
+
+
+<!ENTITY % warning.element "INCLUDE">
+<![%warning.element;[
+<!ELEMENT warning %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of warning.element-->]]>
+
+<!ENTITY % warning.attlist "INCLUDE">
+<![%warning.attlist;[
+<!ATTLIST warning
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of warning.attlist-->]]>
+
+<!--end of admon.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Lists ................................................................ -->
+
+<!-- GlossList ........................ -->
+
+<!ENTITY % glosslist.module "INCLUDE">
+<![%glosslist.module;[
+<!ENTITY % local.glosslist.attrib "">
+<!ENTITY % glosslist.role.attrib "%role.attrib;">
+
+<!ENTITY % glosslist.element "INCLUDE">
+<![%glosslist.element;[
+<!ELEMENT glosslist %ho; (blockinfo?, (%formalobject.title.content;)?, glossentry+)>
+<!--end of glosslist.element-->]]>
+
+<!ENTITY % glosslist.attlist "INCLUDE">
+<![%glosslist.attlist;[
+<!ATTLIST glosslist
+		%common.attrib;
+		%glosslist.role.attrib;
+		%local.glosslist.attrib;
+>
+<!--end of glosslist.attlist-->]]>
+<!--end of glosslist.module-->]]>
+
+<!ENTITY % glossentry.content.module "INCLUDE">
+<![%glossentry.content.module;[
+<!ENTITY % glossentry.module "INCLUDE">
+<![%glossentry.module;[
+<!ENTITY % local.glossentry.attrib "">
+<!ENTITY % glossentry.role.attrib "%role.attrib;">
+
+<!ENTITY % glossentry.element "INCLUDE">
+<![%glossentry.element;[
+<!ELEMENT glossentry %ho; (glossterm, acronym?, abbrev?,
+                      (%ndxterm.class;)*,
+                      revhistory?, (glosssee|glossdef+))>
+<!--end of glossentry.element-->]]>
+
+<!-- SortAs: String by which the GlossEntry is to be sorted
+		(alphabetized) in lieu of its proper content -->
+
+
+<!ENTITY % glossentry.attlist "INCLUDE">
+<![%glossentry.attlist;[
+<!ATTLIST glossentry
+		sortas		CDATA		#IMPLIED
+		%common.attrib;
+		%glossentry.role.attrib;
+		%local.glossentry.attrib;
+>
+<!--end of glossentry.attlist-->]]>
+<!--end of glossentry.module-->]]>
+
+<!-- GlossTerm (defined in the Inlines section, below)-->
+<!ENTITY % glossdef.module "INCLUDE">
+<![%glossdef.module;[
+<!ENTITY % local.glossdef.attrib "">
+<!ENTITY % glossdef.role.attrib "%role.attrib;">
+
+<!ENTITY % glossdef.element "INCLUDE">
+<![%glossdef.element;[
+<!ELEMENT glossdef %ho; ((%glossdef.mix;)+, glossseealso*)>
+<!--end of glossdef.element-->]]>
+
+<!-- Subject: List of subjects; keywords for the definition -->
+
+
+<!ENTITY % glossdef.attlist "INCLUDE">
+<![%glossdef.attlist;[
+<!ATTLIST glossdef
+		subject		CDATA		#IMPLIED
+		%common.attrib;
+		%glossdef.role.attrib;
+		%local.glossdef.attrib;
+>
+<!--end of glossdef.attlist-->]]>
+<!--end of glossdef.module-->]]>
+
+<!ENTITY % glosssee.module "INCLUDE">
+<![%glosssee.module;[
+<!ENTITY % local.glosssee.attrib "">
+<!ENTITY % glosssee.role.attrib "%role.attrib;">
+
+<!ENTITY % glosssee.element "INCLUDE">
+<![%glosssee.element;[
+<!ELEMENT glosssee %ho; (%para.char.mix;)*>
+<!--end of glosssee.element-->]]>
+
+<!-- OtherTerm: Reference to the GlossEntry whose GlossTerm
+		should be displayed at the point of the GlossSee -->
+
+
+<!ENTITY % glosssee.attlist "INCLUDE">
+<![%glosssee.attlist;[
+<!ATTLIST glosssee
+		otherterm	IDREF		#IMPLIED
+		%common.attrib;
+		%glosssee.role.attrib;
+		%local.glosssee.attrib;
+>
+<!--end of glosssee.attlist-->]]>
+<!--end of glosssee.module-->]]>
+
+<!ENTITY % glossseealso.module "INCLUDE">
+<![%glossseealso.module;[
+<!ENTITY % local.glossseealso.attrib "">
+<!ENTITY % glossseealso.role.attrib "%role.attrib;">
+
+<!ENTITY % glossseealso.element "INCLUDE">
+<![%glossseealso.element;[
+<!ELEMENT glossseealso %ho; (%para.char.mix;)*>
+<!--end of glossseealso.element-->]]>
+
+<!-- OtherTerm: Reference to the GlossEntry whose GlossTerm
+		should be displayed at the point of the GlossSeeAlso -->
+
+
+<!ENTITY % glossseealso.attlist "INCLUDE">
+<![%glossseealso.attlist;[
+<!ATTLIST glossseealso
+		otherterm	IDREF		#IMPLIED
+		%common.attrib;
+		%glossseealso.role.attrib;
+		%local.glossseealso.attrib;
+>
+<!--end of glossseealso.attlist-->]]>
+<!--end of glossseealso.module-->]]>
+<!--end of glossentry.content.module-->]]>
+
+<!-- ItemizedList and OrderedList ..... -->
+
+<!ENTITY % itemizedlist.module "INCLUDE">
+<![%itemizedlist.module;[
+<!ENTITY % local.itemizedlist.attrib "">
+<!ENTITY % itemizedlist.role.attrib "%role.attrib;">
+
+<!ENTITY % itemizedlist.element "INCLUDE">
+<![%itemizedlist.element;[
+<!ELEMENT itemizedlist %ho; (blockinfo?, (%formalobject.title.content;)?,
+ 			    (%listpreamble.mix;)*, listitem+)>
+
+<!--end of itemizedlist.element-->]]>
+
+<!-- Spacing: Whether the vertical space in the list should be
+		compressed -->
+<!-- Mark: Keyword, e.g., bullet, dash, checkbox, none;
+		list of keywords and defaults are implementation specific -->
+
+
+<!ENTITY % itemizedlist.attlist "INCLUDE">
+<![%itemizedlist.attlist;[
+<!ATTLIST itemizedlist
+		spacing		(normal
+				|compact)	#IMPLIED
+		%mark.attrib;
+		%common.attrib;
+		%itemizedlist.role.attrib;
+		%local.itemizedlist.attrib;
+>
+<!--end of itemizedlist.attlist-->]]>
+<!--end of itemizedlist.module-->]]>
+
+<!ENTITY % orderedlist.module "INCLUDE">
+<![%orderedlist.module;[
+<!ENTITY % local.orderedlist.attrib "">
+<!ENTITY % orderedlist.role.attrib "%role.attrib;">
+
+<!ENTITY % orderedlist.element "INCLUDE">
+<![%orderedlist.element;[
+<!ELEMENT orderedlist %ho; (blockinfo?, (%formalobject.title.content;)?,
+ 			    (%listpreamble.mix;)*, listitem+)>
+
+<!--end of orderedlist.element-->]]>
+
+<!-- Numeration: Style of ListItem numbered; default is expected
+		to be Arabic -->
+<!-- InheritNum: Specifies for a nested list that the numbering
+		of ListItems should include the number of the item
+		within which they are nested (e.g., 1a and 1b within 1,
+		rather than a and b) -->
+<!-- Continuation: Where list numbering begins afresh (Restarts,
+		the default) or continues that of the immediately preceding
+		list (Continues) -->
+<!-- Spacing: Whether the vertical space in the list should be
+		compressed -->
+
+
+<!ENTITY % orderedlist.attlist "INCLUDE">
+<![%orderedlist.attlist;[
+<!ATTLIST orderedlist
+		numeration	(arabic
+				|upperalpha
+				|loweralpha
+				|upperroman
+				|lowerroman)	#IMPLIED
+		inheritnum	(inherit
+				|ignore)	"ignore"
+		continuation	(continues
+				|restarts)	"restarts"
+		spacing		(normal
+				|compact)	#IMPLIED
+		%common.attrib;
+		%orderedlist.role.attrib;
+		%local.orderedlist.attrib;
+>
+<!--end of orderedlist.attlist-->]]>
+<!--end of orderedlist.module-->]]>
+
+<!ENTITY % listitem.module "INCLUDE">
+<![%listitem.module;[
+<!ENTITY % local.listitem.attrib "">
+<!ENTITY % listitem.role.attrib "%role.attrib;">
+
+<!ENTITY % listitem.element "INCLUDE">
+<![%listitem.element;[
+<!ELEMENT listitem %ho; ((%component.mix;)+)>
+<!--end of listitem.element-->]]>
+
+<!-- Override: Indicates the mark to be used for this ListItem
+		instead of the default mark or the mark specified by
+		the Mark attribute on the enclosing ItemizedList -->
+
+
+<!ENTITY % listitem.attlist "INCLUDE">
+<![%listitem.attlist;[
+<!ATTLIST listitem
+		override	CDATA		#IMPLIED
+		%common.attrib;
+		%listitem.role.attrib;
+		%local.listitem.attrib;
+>
+<!--end of listitem.attlist-->]]>
+<!--end of listitem.module-->]]>
+
+<!-- SegmentedList .................... -->
+<!ENTITY % segmentedlist.content.module "INCLUDE">
+<![%segmentedlist.content.module;[
+<!ENTITY % segmentedlist.module "INCLUDE">
+<![%segmentedlist.module;[
+<!ENTITY % local.segmentedlist.attrib "">
+<!ENTITY % segmentedlist.role.attrib "%role.attrib;">
+
+<!ENTITY % segmentedlist.element "INCLUDE">
+<![%segmentedlist.element;[
+<!ELEMENT segmentedlist %ho; ((%formalobject.title.content;)?,
+                         segtitle+,
+                         seglistitem+)>
+<!--end of segmentedlist.element-->]]>
+
+<!ENTITY % segmentedlist.attlist "INCLUDE">
+<![%segmentedlist.attlist;[
+<!ATTLIST segmentedlist
+		%common.attrib;
+		%segmentedlist.role.attrib;
+		%local.segmentedlist.attrib;
+>
+<!--end of segmentedlist.attlist-->]]>
+<!--end of segmentedlist.module-->]]>
+
+<!ENTITY % segtitle.module "INCLUDE">
+<![%segtitle.module;[
+<!ENTITY % local.segtitle.attrib "">
+<!ENTITY % segtitle.role.attrib "%role.attrib;">
+
+<!ENTITY % segtitle.element "INCLUDE">
+<![%segtitle.element;[
+<!ELEMENT segtitle %ho; (%title.char.mix;)*>
+<!--end of segtitle.element-->]]>
+
+<!ENTITY % segtitle.attlist "INCLUDE">
+<![%segtitle.attlist;[
+<!ATTLIST segtitle
+		%common.attrib;
+		%segtitle.role.attrib;
+		%local.segtitle.attrib;
+>
+<!--end of segtitle.attlist-->]]>
+<!--end of segtitle.module-->]]>
+
+<!ENTITY % seglistitem.module "INCLUDE">
+<![%seglistitem.module;[
+<!ENTITY % local.seglistitem.attrib "">
+<!ENTITY % seglistitem.role.attrib "%role.attrib;">
+
+<!ENTITY % seglistitem.element "INCLUDE">
+<![%seglistitem.element;[
+<!ELEMENT seglistitem %ho; (seg+)>
+<!--end of seglistitem.element-->]]>
+
+<!ENTITY % seglistitem.attlist "INCLUDE">
+<![%seglistitem.attlist;[
+<!ATTLIST seglistitem
+		%common.attrib;
+		%seglistitem.role.attrib;
+		%local.seglistitem.attrib;
+>
+<!--end of seglistitem.attlist-->]]>
+<!--end of seglistitem.module-->]]>
+
+<!ENTITY % seg.module "INCLUDE">
+<![%seg.module;[
+<!ENTITY % local.seg.attrib "">
+<!ENTITY % seg.role.attrib "%role.attrib;">
+
+<!ENTITY % seg.element "INCLUDE">
+<![%seg.element;[
+<!ELEMENT seg %ho; (%para.char.mix;)*>
+<!--end of seg.element-->]]>
+
+<!ENTITY % seg.attlist "INCLUDE">
+<![%seg.attlist;[
+<!ATTLIST seg
+		%common.attrib;
+		%seg.role.attrib;
+		%local.seg.attrib;
+>
+<!--end of seg.attlist-->]]>
+<!--end of seg.module-->]]>
+<!--end of segmentedlist.content.module-->]]>
+
+<!-- SimpleList ....................... -->
+
+<!ENTITY % simplelist.content.module "INCLUDE">
+<![%simplelist.content.module;[
+<!ENTITY % simplelist.module "INCLUDE">
+<![%simplelist.module;[
+<!ENTITY % local.simplelist.attrib "">
+<!ENTITY % simplelist.role.attrib "%role.attrib;">
+
+<!ENTITY % simplelist.element "INCLUDE">
+<![%simplelist.element;[
+<!ELEMENT simplelist %ho; (member+)>
+<!--end of simplelist.element-->]]>
+
+<!-- Columns: The number of columns the array should contain -->
+<!-- Type: How the Members of the SimpleList should be
+		formatted: Inline (members separated with commas etc.
+		inline), Vert (top to bottom in n Columns), or Horiz (in
+		the direction of text flow) in n Columns.  If Column
+		is 1 or implied, Type=Vert and Type=Horiz give the same
+		results. -->
+
+
+<!ENTITY % simplelist.attlist "INCLUDE">
+<![%simplelist.attlist;[
+<!ATTLIST simplelist
+		columns		CDATA		#IMPLIED
+		type		(inline
+				|vert
+				|horiz)		"vert"
+		%common.attrib;
+		%simplelist.role.attrib;
+		%local.simplelist.attrib;
+>
+<!--end of simplelist.attlist-->]]>
+<!--end of simplelist.module-->]]>
+
+<!ENTITY % member.module "INCLUDE">
+<![%member.module;[
+<!ENTITY % local.member.attrib "">
+<!ENTITY % member.role.attrib "%role.attrib;">
+
+<!ENTITY % member.element "INCLUDE">
+<![%member.element;[
+<!ELEMENT member %ho; (%para.char.mix;)*>
+<!--end of member.element-->]]>
+
+<!ENTITY % member.attlist "INCLUDE">
+<![%member.attlist;[
+<!ATTLIST member
+		%common.attrib;
+		%member.role.attrib;
+		%local.member.attrib;
+>
+<!--end of member.attlist-->]]>
+<!--end of member.module-->]]>
+<!--end of simplelist.content.module-->]]>
+
+<!-- VariableList ..................... -->
+
+<!ENTITY % variablelist.content.module "INCLUDE">
+<![%variablelist.content.module;[
+<!ENTITY % variablelist.module "INCLUDE">
+<![%variablelist.module;[
+<!ENTITY % local.variablelist.attrib "">
+<!ENTITY % variablelist.role.attrib "%role.attrib;">
+
+<!ENTITY % variablelist.element "INCLUDE">
+<![%variablelist.element;[
+<!ELEMENT variablelist %ho; (blockinfo?, (%formalobject.title.content;)?,
+ 			    (%listpreamble.mix;)*, varlistentry+)>
+<!--end of variablelist.element-->]]>
+
+<!-- TermLength: Length beyond which the presentation engine
+		may consider the Term too long and select an alternate
+		presentation of the Term and, or, its associated ListItem. -->
+
+
+<!ENTITY % variablelist.attlist "INCLUDE">
+<![%variablelist.attlist;[
+<!ATTLIST variablelist
+		termlength	CDATA		#IMPLIED
+		spacing		(normal
+				|compact)	#IMPLIED
+		%common.attrib;
+		%variablelist.role.attrib;
+		%local.variablelist.attrib;
+>
+<!--end of variablelist.attlist-->]]>
+<!--end of variablelist.module-->]]>
+
+<!ENTITY % varlistentry.module "INCLUDE">
+<![%varlistentry.module;[
+<!ENTITY % local.varlistentry.attrib "">
+<!ENTITY % varlistentry.role.attrib "%role.attrib;">
+
+<!ENTITY % varlistentry.element "INCLUDE">
+<![%varlistentry.element;[
+<!ELEMENT varlistentry %ho; (term+, listitem)>
+<!--end of varlistentry.element-->]]>
+
+<!ENTITY % varlistentry.attlist "INCLUDE">
+<![%varlistentry.attlist;[
+<!ATTLIST varlistentry
+		%common.attrib;
+		%varlistentry.role.attrib;
+		%local.varlistentry.attrib;
+>
+<!--end of varlistentry.attlist-->]]>
+<!--end of varlistentry.module-->]]>
+
+<!ENTITY % term.module "INCLUDE">
+<![%term.module;[
+<!ENTITY % local.term.attrib "">
+<!ENTITY % term.role.attrib "%role.attrib;">
+
+<!ENTITY % term.element "INCLUDE">
+<![%term.element;[
+<!ELEMENT term %ho; (%para.char.mix;)*>
+<!--end of term.element-->]]>
+
+<!ENTITY % term.attlist "INCLUDE">
+<![%term.attlist;[
+<!ATTLIST term
+		%common.attrib;
+		%term.role.attrib;
+		%local.term.attrib;
+>
+<!--end of term.attlist-->]]>
+<!--end of term.module-->]]>
+
+<!-- ListItem (defined above)-->
+<!--end of variablelist.content.module-->]]>
+
+<!-- CalloutList ...................... -->
+
+<!ENTITY % calloutlist.content.module "INCLUDE">
+<![%calloutlist.content.module;[
+<!ENTITY % calloutlist.module "INCLUDE">
+<![%calloutlist.module;[
+<!ENTITY % local.calloutlist.attrib "">
+<!ENTITY % calloutlist.role.attrib "%role.attrib;">
+
+<!ENTITY % calloutlist.element "INCLUDE">
+<![%calloutlist.element;[
+<!ELEMENT calloutlist %ho; ((%formalobject.title.content;)?, callout+)>
+<!--end of calloutlist.element-->]]>
+
+<!ENTITY % calloutlist.attlist "INCLUDE">
+<![%calloutlist.attlist;[
+<!ATTLIST calloutlist
+		%common.attrib;
+		%calloutlist.role.attrib;
+		%local.calloutlist.attrib;
+>
+<!--end of calloutlist.attlist-->]]>
+<!--end of calloutlist.module-->]]>
+
+<!ENTITY % callout.module "INCLUDE">
+<![%callout.module;[
+<!ENTITY % local.callout.attrib "">
+<!ENTITY % callout.role.attrib "%role.attrib;">
+
+<!ENTITY % callout.element "INCLUDE">
+<![%callout.element;[
+<!ELEMENT callout %ho; ((%component.mix;)+)>
+<!--end of callout.element-->]]>
+
+<!-- AreaRefs: IDs of one or more Areas or AreaSets described
+		by this Callout -->
+
+
+<!ENTITY % callout.attlist "INCLUDE">
+<![%callout.attlist;[
+<!ATTLIST callout
+		arearefs	IDREFS		#REQUIRED
+		%common.attrib;
+		%callout.role.attrib;
+		%local.callout.attrib;
+>
+<!--end of callout.attlist-->]]>
+<!--end of callout.module-->]]>
+<!--end of calloutlist.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Objects .............................................................. -->
+
+<!-- Examples etc. .................... -->
+
+<!ENTITY % example.module "INCLUDE">
+<![%example.module;[
+<!ENTITY % local.example.attrib "">
+<!ENTITY % example.role.attrib "%role.attrib;">
+
+<!ENTITY % example.element "INCLUDE">
+<![%example.element;[
+<!ELEMENT example %ho; (blockinfo?, (%formalobject.title.content;), (%example.mix;)+)
+		%formal.exclusion;>
+<!--end of example.element-->]]>
+
+<!ENTITY % example.attlist "INCLUDE">
+<![%example.attlist;[
+<!ATTLIST example
+		floatstyle	CDATA			#IMPLIED
+		%label.attrib;
+		%width.attrib;
+		%common.attrib;
+		%example.role.attrib;
+		%local.example.attrib;
+>
+<!--end of example.attlist-->]]>
+<!--end of example.module-->]]>
+
+<!ENTITY % informalexample.module "INCLUDE">
+<![%informalexample.module;[
+<!ENTITY % local.informalexample.attrib "">
+<!ENTITY % informalexample.role.attrib "%role.attrib;">
+
+<!ENTITY % informalexample.element "INCLUDE">
+<![%informalexample.element;[
+<!ELEMENT informalexample %ho; (blockinfo?, (%example.mix;)+)>
+<!--end of informalexample.element-->]]>
+
+<!ENTITY % informalexample.attlist "INCLUDE">
+<![%informalexample.attlist;[
+<!ATTLIST informalexample
+		floatstyle	CDATA			#IMPLIED
+		%width.attrib;
+		%common.attrib;
+		%informalexample.role.attrib;
+		%local.informalexample.attrib;
+>
+<!--end of informalexample.attlist-->]]>
+<!--end of informalexample.module-->]]>
+
+<!ENTITY % programlistingco.module "INCLUDE">
+<![%programlistingco.module;[
+<!ENTITY % local.programlistingco.attrib "">
+<!ENTITY % programlistingco.role.attrib "%role.attrib;">
+
+<!ENTITY % programlistingco.element "INCLUDE">
+<![%programlistingco.element;[
+<!ELEMENT programlistingco %ho; (areaspec, programlisting, calloutlist*)>
+<!--end of programlistingco.element-->]]>
+
+<!ENTITY % programlistingco.attlist "INCLUDE">
+<![%programlistingco.attlist;[
+<!ATTLIST programlistingco
+		%common.attrib;
+		%programlistingco.role.attrib;
+		%local.programlistingco.attrib;
+>
+<!--end of programlistingco.attlist-->]]>
+<!-- CalloutList (defined above in Lists)-->
+<!--end of informalexample.module-->]]>
+
+<!ENTITY % areaspec.content.module "INCLUDE">
+<![%areaspec.content.module;[
+<!ENTITY % areaspec.module "INCLUDE">
+<![%areaspec.module;[
+<!ENTITY % local.areaspec.attrib "">
+<!ENTITY % areaspec.role.attrib "%role.attrib;">
+
+<!ENTITY % areaspec.element "INCLUDE">
+<![%areaspec.element;[
+<!ELEMENT areaspec %ho; ((area|areaset)+)>
+<!--end of areaspec.element-->]]>
+
+<!-- Units: global unit of measure in which coordinates in
+		this spec are expressed:
+
+		- CALSPair "x1,y1 x2,y2": lower-left and upper-right
+		coordinates in a rectangle describing repro area in which
+		graphic is placed, where X and Y dimensions are each some
+		number 0..10000 (taken from CALS graphic attributes)
+
+		- LineColumn "line column": line number and column number
+		at which to start callout text in "linespecific" content
+
+		- LineRange "startline endline": whole lines from startline
+		to endline in "linespecific" content
+
+		- LineColumnPair "line1 col1 line2 col2": starting and ending
+		points of area in "linespecific" content that starts at
+		first position and ends at second position (including the
+		beginnings of any intervening lines)
+
+		- Other: directive to look at value of OtherUnits attribute
+		to get implementation-specific keyword
+
+		The default is implementation-specific; usually dependent on
+		the parent element (GraphicCO gets CALSPair, ProgramListingCO
+		and ScreenCO get LineColumn) -->
+<!-- OtherUnits: User-defined units -->
+
+
+<!ENTITY % areaspec.attlist "INCLUDE">
+<![%areaspec.attlist;[
+<!ATTLIST areaspec
+		units		(calspair
+				|linecolumn
+				|linerange
+				|linecolumnpair
+				|other)		#IMPLIED
+		otherunits	NMTOKEN		#IMPLIED
+		%common.attrib;
+		%areaspec.role.attrib;
+		%local.areaspec.attrib;
+>
+<!--end of areaspec.attlist-->]]>
+<!--end of areaspec.module-->]]>
+
+<!ENTITY % area.module "INCLUDE">
+<![%area.module;[
+<!ENTITY % local.area.attrib "">
+<!ENTITY % area.role.attrib "%role.attrib;">
+
+<!ENTITY % area.element "INCLUDE">
+<![%area.element;[
+<!ELEMENT area %ho; EMPTY>
+<!--end of area.element-->]]>
+
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+<!-- Units: unit of measure in which coordinates in this
+		area are expressed; inherits from AreaSet and AreaSpec -->
+<!-- OtherUnits: User-defined units -->
+
+
+<!ENTITY % area.attlist "INCLUDE">
+<![%area.attlist;[
+<!ATTLIST area
+		%label.attrib;
+		%linkends.attrib;
+		units		(calspair
+				|linecolumn
+				|linerange
+				|linecolumnpair
+				|other)		#IMPLIED
+		otherunits	NMTOKEN		#IMPLIED
+		coords		CDATA		#REQUIRED
+		%idreq.common.attrib;
+		%area.role.attrib;
+		%local.area.attrib;
+>
+<!--end of area.attlist-->]]>
+<!--end of area.module-->]]>
+
+<!ENTITY % areaset.module "INCLUDE">
+<![%areaset.module;[
+<!ENTITY % local.areaset.attrib "">
+<!ENTITY % areaset.role.attrib "%role.attrib;">
+
+<!ENTITY % areaset.element "INCLUDE">
+<![%areaset.element;[
+<!ELEMENT areaset %ho; (area+)>
+<!--end of areaset.element-->]]>
+
+<!-- bug number/symbol override or initialization -->
+<!-- Units: unit of measure in which coordinates in this
+		area are expressed; inherits from AreaSpec -->
+
+
+<!ENTITY % areaset.attlist "INCLUDE">
+<![%areaset.attlist;[
+<!ATTLIST areaset
+		%label.attrib;
+		units		(calspair
+				|linecolumn
+				|linerange
+				|linecolumnpair
+				|other)		#IMPLIED
+		otherunits	NMTOKEN		#IMPLIED
+		coords		CDATA		#REQUIRED
+		%idreq.common.attrib;
+		%areaset.role.attrib;
+		%local.areaset.attrib;
+>
+<!--end of areaset.attlist-->]]>
+<!--end of areaset.module-->]]>
+<!--end of areaspec.content.module-->]]>
+
+<!ENTITY % programlisting.module "INCLUDE">
+<![%programlisting.module;[
+<!ENTITY % local.programlisting.attrib "">
+<!ENTITY % programlisting.role.attrib "%role.attrib;">
+
+<!ENTITY % programlisting.element "INCLUDE">
+<![%programlisting.element;[
+<!ELEMENT programlisting %ho; (%para.char.mix;|co|coref|lineannotation|textobject)*>
+<!--end of programlisting.element-->]]>
+
+<!ENTITY % programlisting.attlist "INCLUDE">
+<![%programlisting.attlist;[
+<!ATTLIST programlisting
+		%width.attrib;
+		%linespecific.attrib;
+		%common.attrib;
+		%programlisting.role.attrib;
+		%local.programlisting.attrib;
+>
+<!--end of programlisting.attlist-->]]>
+<!--end of programlisting.module-->]]>
+
+<!ENTITY % literallayout.module "INCLUDE">
+<![%literallayout.module;[
+<!ENTITY % local.literallayout.attrib "">
+<!ENTITY % literallayout.role.attrib "%role.attrib;">
+
+<!ENTITY % literallayout.element "INCLUDE">
+<![%literallayout.element;[
+<!ELEMENT literallayout %ho; (%para.char.mix;|co|coref|textobject|lineannotation)*>
+<!--end of literallayout.element-->]]>
+
+<!ENTITY % literallayout.attlist "INCLUDE">
+<![%literallayout.attlist;[
+<!ATTLIST literallayout
+		%width.attrib;
+		%linespecific.attrib;
+		class	(monospaced|normal)	"normal"
+		%common.attrib;
+		%literallayout.role.attrib;
+		%local.literallayout.attrib;
+>
+<!--end of literallayout.attlist-->]]>
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!--end of literallayout.module-->]]>
+
+<!ENTITY % screenco.module "INCLUDE">
+<![%screenco.module;[
+<!ENTITY % local.screenco.attrib "">
+<!ENTITY % screenco.role.attrib "%role.attrib;">
+
+<!ENTITY % screenco.element "INCLUDE">
+<![%screenco.element;[
+<!ELEMENT screenco %ho; (areaspec, screen, calloutlist*)>
+<!--end of screenco.element-->]]>
+
+<!ENTITY % screenco.attlist "INCLUDE">
+<![%screenco.attlist;[
+<!ATTLIST screenco
+		%common.attrib;
+		%screenco.role.attrib;
+		%local.screenco.attrib;
+>
+<!--end of screenco.attlist-->]]>
+<!-- AreaSpec (defined above)-->
+<!-- CalloutList (defined above in Lists)-->
+<!--end of screenco.module-->]]>
+
+<!ENTITY % screen.module "INCLUDE">
+<![%screen.module;[
+<!ENTITY % local.screen.attrib "">
+<!ENTITY % screen.role.attrib "%role.attrib;">
+
+<!ENTITY % screen.element "INCLUDE">
+<![%screen.element;[
+<!ELEMENT screen %ho; (%para.char.mix;|co|coref|textobject|lineannotation)*>
+<!--end of screen.element-->]]>
+
+<!ENTITY % screen.attlist "INCLUDE">
+<![%screen.attlist;[
+<!ATTLIST screen
+		%width.attrib;
+		%linespecific.attrib;
+		%common.attrib;
+		%screen.role.attrib;
+		%local.screen.attrib;
+>
+<!--end of screen.attlist-->]]>
+<!--end of screen.module-->]]>
+
+<!ENTITY % screenshot.content.module "INCLUDE">
+<![%screenshot.content.module;[
+<!ENTITY % screenshot.module "INCLUDE">
+<![%screenshot.module;[
+<!ENTITY % local.screenshot.attrib "">
+<!ENTITY % screenshot.role.attrib "%role.attrib;">
+
+<!ENTITY % screenshot.element "INCLUDE">
+<![%screenshot.element;[
+<!ELEMENT screenshot %ho; (screeninfo?,
+                      (graphic|graphicco
+                      |mediaobject|mediaobjectco))>
+<!--end of screenshot.element-->]]>
+
+<!ENTITY % screenshot.attlist "INCLUDE">
+<![%screenshot.attlist;[
+<!ATTLIST screenshot
+		%common.attrib;
+		%screenshot.role.attrib;
+		%local.screenshot.attrib;
+>
+<!--end of screenshot.attlist-->]]>
+<!--end of screenshot.module-->]]>
+
+<!ENTITY % screeninfo.module "INCLUDE">
+<![%screeninfo.module;[
+<!ENTITY % local.screeninfo.attrib "">
+<!ENTITY % screeninfo.role.attrib "%role.attrib;">
+
+<!ENTITY % screeninfo.element "INCLUDE">
+<![%screeninfo.element;[
+<!ELEMENT screeninfo %ho; (%para.char.mix;)*
+		%ubiq.exclusion;>
+<!--end of screeninfo.element-->]]>
+
+<!ENTITY % screeninfo.attlist "INCLUDE">
+<![%screeninfo.attlist;[
+<!ATTLIST screeninfo
+		%common.attrib;
+		%screeninfo.role.attrib;
+		%local.screeninfo.attrib;
+>
+<!--end of screeninfo.attlist-->]]>
+<!--end of screeninfo.module-->]]>
+<!--end of screenshot.content.module-->]]>
+
+<!-- Figures etc. ..................... -->
+
+<!ENTITY % figure.module "INCLUDE">
+<![%figure.module;[
+<!ENTITY % local.figure.attrib "">
+<!ENTITY % figure.role.attrib "%role.attrib;">
+
+<!ENTITY % figure.element "INCLUDE">
+<![%figure.element;[
+<!ELEMENT figure %ho; (blockinfo?, (%formalobject.title.content;),
+                       (%figure.mix; | %link.char.class;)+)>
+<!--end of figure.element-->]]>
+
+<!-- Float: Whether the Figure is supposed to be rendered
+		where convenient (yes (1) value) or at the place it occurs
+		in the text (no (0) value, the default) -->
+
+
+<!ENTITY % figure.attlist "INCLUDE">
+<![%figure.attlist;[
+<!ATTLIST figure
+		float		%yesorno.attvals;	'0'
+		floatstyle	CDATA			#IMPLIED
+		pgwide      	%yesorno.attvals;       #IMPLIED
+		%label.attrib;
+		%common.attrib;
+		%figure.role.attrib;
+		%local.figure.attrib;
+>
+<!--end of figure.attlist-->]]>
+<!--end of figure.module-->]]>
+
+<!ENTITY % informalfigure.module "INCLUDE">
+<![ %informalfigure.module; [
+<!ENTITY % local.informalfigure.attrib "">
+<!ENTITY % informalfigure.role.attrib "%role.attrib;">
+
+<!ENTITY % informalfigure.element "INCLUDE">
+<![ %informalfigure.element; [
+<!ELEMENT informalfigure %ho; (blockinfo?, (%figure.mix; | %link.char.class;)+)>
+<!--end of informalfigure.element-->]]>
+
+<!ENTITY % informalfigure.attlist "INCLUDE">
+<![ %informalfigure.attlist; [
+<!--
+Float: Whether the Figure is supposed to be rendered
+where convenient (yes (1) value) or at the place it occurs
+in the text (no (0) value, the default)
+-->
+<!ATTLIST informalfigure
+		float		%yesorno.attvals;	"0"
+		floatstyle	CDATA			#IMPLIED
+		pgwide      	%yesorno.attvals;       #IMPLIED
+		%label.attrib;
+		%common.attrib;
+		%informalfigure.role.attrib;
+		%local.informalfigure.attrib;
+>
+<!--end of informalfigure.attlist-->]]>
+<!--end of informalfigure.module-->]]>
+
+<!ENTITY % graphicco.module "INCLUDE">
+<![%graphicco.module;[
+<!ENTITY % local.graphicco.attrib "">
+<!ENTITY % graphicco.role.attrib "%role.attrib;">
+
+<!ENTITY % graphicco.element "INCLUDE">
+<![%graphicco.element;[
+<!ELEMENT graphicco %ho; (areaspec, graphic, calloutlist*)>
+<!--end of graphicco.element-->]]>
+
+<!ENTITY % graphicco.attlist "INCLUDE">
+<![%graphicco.attlist;[
+<!ATTLIST graphicco
+		%common.attrib;
+		%graphicco.role.attrib;
+		%local.graphicco.attrib;
+>
+<!--end of graphicco.attlist-->]]>
+<!-- AreaSpec (defined above in Examples)-->
+<!-- CalloutList (defined above in Lists)-->
+<!--end of graphicco.module-->]]>
+
+<!-- Graphical data can be the content of Graphic, or you can reference
+     an external file either as an entity (Entitref) or a filename
+     (Fileref). -->
+
+<!ENTITY % graphic.module "INCLUDE">
+<![%graphic.module;[
+<!ENTITY % local.graphic.attrib "">
+<!ENTITY % graphic.role.attrib "%role.attrib;">
+
+<!ENTITY % graphic.element "INCLUDE">
+<![%graphic.element;[
+<!ELEMENT graphic %ho; EMPTY>
+<!--end of graphic.element-->]]>
+
+<!ENTITY % graphic.attlist "INCLUDE">
+<![%graphic.attlist;[
+<!ATTLIST graphic
+		%graphics.attrib;
+		%common.attrib;
+		%graphic.role.attrib;
+		%local.graphic.attrib;
+>
+<!--end of graphic.attlist-->]]>
+<!--end of graphic.module-->]]>
+
+<!ENTITY % inlinegraphic.module "INCLUDE">
+<![%inlinegraphic.module;[
+<!ENTITY % local.inlinegraphic.attrib "">
+<!ENTITY % inlinegraphic.role.attrib "%role.attrib;">
+
+<!ENTITY % inlinegraphic.element "INCLUDE">
+<![%inlinegraphic.element;[
+<!ELEMENT inlinegraphic %ho; EMPTY>
+<!--end of inlinegraphic.element-->]]>
+
+<!ENTITY % inlinegraphic.attlist "INCLUDE">
+<![%inlinegraphic.attlist;[
+<!ATTLIST inlinegraphic
+		%graphics.attrib;
+		%common.attrib;
+		%inlinegraphic.role.attrib;
+		%local.inlinegraphic.attrib;
+>
+<!--end of inlinegraphic.attlist-->]]>
+<!--end of inlinegraphic.module-->]]>
+
+<!ENTITY % mediaobject.content.module "INCLUDE">
+<![ %mediaobject.content.module; [
+
+<!ENTITY % mediaobject.module "INCLUDE">
+<![ %mediaobject.module; [
+<!ENTITY % local.mediaobject.attrib "">
+<!ENTITY % mediaobject.role.attrib "%role.attrib;">
+
+<!ENTITY % mediaobject.element "INCLUDE">
+<![ %mediaobject.element; [
+<!ELEMENT mediaobject %ho; (objectinfo?,
+                           (%mediaobject.mix;)+,
+			   caption?)>
+<!--end of mediaobject.element-->]]>
+
+<!ENTITY % mediaobject.attlist "INCLUDE">
+<![ %mediaobject.attlist; [
+<!ATTLIST mediaobject
+		%common.attrib;
+		%mediaobject.role.attrib;
+		%local.mediaobject.attrib;
+>
+<!--end of mediaobject.attlist-->]]>
+<!--end of mediaobject.module-->]]>
+
+<!ENTITY % inlinemediaobject.module "INCLUDE">
+<![ %inlinemediaobject.module; [
+<!ENTITY % local.inlinemediaobject.attrib "">
+<!ENTITY % inlinemediaobject.role.attrib "%role.attrib;">
+
+<!ENTITY % inlinemediaobject.element "INCLUDE">
+<![ %inlinemediaobject.element; [
+<!ELEMENT inlinemediaobject %ho; (objectinfo?,
+                	         (%mediaobject.mix;)+)>
+<!--end of inlinemediaobject.element-->]]>
+
+<!ENTITY % inlinemediaobject.attlist "INCLUDE">
+<![ %inlinemediaobject.attlist; [
+<!ATTLIST inlinemediaobject
+		%common.attrib;
+		%inlinemediaobject.role.attrib;
+		%local.inlinemediaobject.attrib;
+>
+<!--end of inlinemediaobject.attlist-->]]>
+<!--end of inlinemediaobject.module-->]]>
+
+<!ENTITY % videoobject.module "INCLUDE">
+<![ %videoobject.module; [
+<!ENTITY % local.videoobject.attrib "">
+<!ENTITY % videoobject.role.attrib "%role.attrib;">
+
+<!ENTITY % videoobject.element "INCLUDE">
+<![ %videoobject.element; [
+<!ELEMENT videoobject %ho; (objectinfo?, videodata)>
+<!--end of videoobject.element-->]]>
+
+<!ENTITY % videoobject.attlist "INCLUDE">
+<![ %videoobject.attlist; [
+<!ATTLIST videoobject
+		%common.attrib;
+		%videoobject.role.attrib;
+		%local.videoobject.attrib;
+>
+<!--end of videoobject.attlist-->]]>
+<!--end of videoobject.module-->]]>
+
+<!ENTITY % audioobject.module "INCLUDE">
+<![ %audioobject.module; [
+<!ENTITY % local.audioobject.attrib "">
+<!ENTITY % audioobject.role.attrib "%role.attrib;">
+
+<!ENTITY % audioobject.element "INCLUDE">
+<![ %audioobject.element; [
+<!ELEMENT audioobject %ho; (objectinfo?, audiodata)>
+<!--end of audioobject.element-->]]>
+
+<!ENTITY % audioobject.attlist "INCLUDE">
+<![ %audioobject.attlist; [
+<!ATTLIST audioobject
+		%common.attrib;
+		%audioobject.role.attrib;
+		%local.audioobject.attrib;
+>
+<!--end of audioobject.attlist-->]]>
+<!--end of audioobject.module-->]]>
+
+<!ENTITY % imageobject.module "INCLUDE">
+<![ %imageobject.module; [
+<!ENTITY % local.imageobject.attrib "">
+<!ENTITY % imageobject.role.attrib "%role.attrib;">
+
+<!ENTITY % imageobject.element "INCLUDE">
+<![ %imageobject.element; [
+<!ELEMENT imageobject %ho; (objectinfo?, imagedata)>
+<!--end of imageobject.element-->]]>
+
+<!ENTITY % imageobject.attlist "INCLUDE">
+<![ %imageobject.attlist; [
+<!ATTLIST imageobject
+		%common.attrib;
+		%imageobject.role.attrib;
+		%local.imageobject.attrib;
+>
+<!--end of imageobject.attlist-->]]>
+<!--end of imageobject.module-->]]>
+
+<!ENTITY % textobject.module "INCLUDE">
+<![ %textobject.module; [
+<!ENTITY % local.textobject.attrib "">
+<!ENTITY % textobject.role.attrib "%role.attrib;">
+
+<!ENTITY % textobject.element "INCLUDE">
+<![ %textobject.element; [
+<!ELEMENT textobject %ho; (objectinfo?, (phrase|textdata|(%textobject.mix;)+))>
+<!--end of textobject.element-->]]>
+
+<!ENTITY % textobject.attlist "INCLUDE">
+<![ %textobject.attlist; [
+<!ATTLIST textobject
+		%common.attrib;
+		%textobject.role.attrib;
+		%local.textobject.attrib;
+>
+<!--end of textobject.attlist-->]]>
+<!--end of textobject.module-->]]>
+
+<!ENTITY % objectinfo.module "INCLUDE">
+<![ %objectinfo.module; [
+<!ENTITY % local.objectinfo.attrib "">
+<!ENTITY % objectinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % objectinfo.element "INCLUDE">
+<![ %objectinfo.element; [
+<!ELEMENT objectinfo %ho; ((%info.class;)+)
+	%beginpage.exclusion;>
+<!--end of objectinfo.element-->]]>
+
+<!ENTITY % objectinfo.attlist "INCLUDE">
+<![ %objectinfo.attlist; [
+<!ATTLIST objectinfo
+		%common.attrib;
+		%objectinfo.role.attrib;
+		%local.objectinfo.attrib;
+>
+<!--end of objectinfo.attlist-->]]>
+<!--end of objectinfo.module-->]]>
+
+<!--EntityRef: Name of an external entity containing the content
+	of the object data-->
+<!--FileRef: Filename, qualified by a pathname if desired,
+	designating the file containing the content of the object data-->
+<!--Format: Notation of the element content, if any-->
+<!--SrcCredit: Information about the source of the image-->
+<!ENTITY % local.objectdata.attrib "">
+<!ENTITY % objectdata.attrib
+	"
+	entityref	ENTITY		#IMPLIED
+	fileref 	CDATA		#IMPLIED
+	format		(%notation.class;)
+					#IMPLIED
+	srccredit	CDATA		#IMPLIED
+	%local.objectdata.attrib;"
+>
+
+<!ENTITY % videodata.module "INCLUDE">
+<![ %videodata.module; [
+<!ENTITY % local.videodata.attrib "">
+<!ENTITY % videodata.role.attrib "%role.attrib;">
+
+<!ENTITY % videodata.element "INCLUDE">
+<![ %videodata.element; [
+<!ELEMENT videodata %ho; EMPTY>
+<!--end of videodata.element-->]]>
+
+<!ENTITY % videodata.attlist "INCLUDE">
+<![ %videodata.attlist; [
+
+<!--Width: Same as CALS reprowid (desired width)-->
+<!--Depth: Same as CALS reprodep (desired depth)-->
+<!--Align: Same as CALS hplace with 'none' removed; #IMPLIED means
+	application-specific-->
+<!--Scale: Conflation of CALS hscale and vscale-->
+<!--Scalefit: Same as CALS scalefit-->
+<!ATTLIST videodata
+	width		CDATA		#IMPLIED
+	contentwidth	CDATA		#IMPLIED
+	depth		CDATA		#IMPLIED
+	contentdepth	CDATA		#IMPLIED
+	align		(left
+			|right
+			|center)	#IMPLIED
+	valign		(top
+			|middle
+			|bottom)	#IMPLIED
+	scale		CDATA		#IMPLIED
+	scalefit	%yesorno.attvals;
+					#IMPLIED
+		%objectdata.attrib;
+		%common.attrib;
+		%videodata.role.attrib;
+		%local.videodata.attrib;
+>
+<!--end of videodata.attlist-->]]>
+<!--end of videodata.module-->]]>
+
+<!ENTITY % audiodata.module "INCLUDE">
+<![ %audiodata.module; [
+<!ENTITY % local.audiodata.attrib "">
+<!ENTITY % audiodata.role.attrib "%role.attrib;">
+
+<!ENTITY % audiodata.element "INCLUDE">
+<![ %audiodata.element; [
+<!ELEMENT audiodata %ho; EMPTY>
+<!--end of audiodata.element-->]]>
+
+<!ENTITY % audiodata.attlist "INCLUDE">
+<![ %audiodata.attlist; [
+<!ATTLIST audiodata
+		%objectdata.attrib;
+		%common.attrib;
+		%audiodata.role.attrib;
+		%local.audiodata.attrib;
+>
+<!--end of audiodata.attlist-->]]>
+<!--end of audiodata.module-->]]>
+
+<!ENTITY % imagedata.module "INCLUDE">
+<![ %imagedata.module; [
+<!ENTITY % local.imagedata.attrib "">
+<!ENTITY % imagedata.role.attrib "%role.attrib;">
+
+<!ENTITY % imagedata.element "INCLUDE">
+<![ %imagedata.element; [
+<!ELEMENT imagedata %ho; EMPTY>
+<!--end of imagedata.element-->]]>
+
+<!ENTITY % imagedata.attlist "INCLUDE">
+<![ %imagedata.attlist; [
+
+<!--Width: Same as CALS reprowid (desired width)-->
+<!--Depth: Same as CALS reprodep (desired depth)-->
+<!--Align: Same as CALS hplace with 'none' removed; #IMPLIED means
+	application-specific-->
+<!--Scale: Conflation of CALS hscale and vscale-->
+<!--Scalefit: Same as CALS scalefit-->
+<!ATTLIST imagedata
+	width		CDATA		#IMPLIED
+	contentwidth	CDATA		#IMPLIED
+	depth		CDATA		#IMPLIED
+	contentdepth	CDATA		#IMPLIED
+	align		(left
+			|right
+			|center)	#IMPLIED
+	valign		(top
+			|middle
+			|bottom)	#IMPLIED
+	scale		CDATA		#IMPLIED
+	scalefit	%yesorno.attvals;
+					#IMPLIED
+		%objectdata.attrib;
+		%common.attrib;
+		%imagedata.role.attrib;
+		%local.imagedata.attrib;
+>
+<!--end of imagedata.attlist-->]]>
+<!--end of imagedata.module-->]]>
+
+<!ENTITY % textdata.module "INCLUDE">
+<![ %textdata.module; [
+<!ENTITY % local.textdata.attrib "">
+<!ENTITY % textdata.role.attrib "%role.attrib;">
+
+<!ENTITY % textdata.element "INCLUDE">
+<![ %textdata.element; [
+<!ELEMENT textdata %ho; EMPTY>
+<!--end of textdata.element-->]]>
+
+<!ENTITY % textdata.attlist "INCLUDE">
+<![ %textdata.attlist; [
+<!ATTLIST textdata
+		encoding	CDATA	#IMPLIED
+		%objectdata.attrib;
+		%common.attrib;
+		%textdata.role.attrib;
+		%local.textdata.attrib;
+>
+<!--end of textdata.attlist-->]]>
+<!--end of textdata.module-->]]>
+
+<!ENTITY % mediaobjectco.module "INCLUDE">
+<![ %mediaobjectco.module; [
+<!ENTITY % local.mediaobjectco.attrib "">
+<!ENTITY % mediaobjectco.role.attrib "%role.attrib;">
+
+<!ENTITY % mediaobjectco.element "INCLUDE">
+<![ %mediaobjectco.element; [
+<!ELEMENT mediaobjectco %ho; (objectinfo?, imageobjectco,
+			   (imageobjectco|textobject)*)>
+<!--end of mediaobjectco.element-->]]>
+
+<!ENTITY % mediaobjectco.attlist "INCLUDE">
+<![ %mediaobjectco.attlist; [
+<!ATTLIST mediaobjectco
+		%common.attrib;
+		%mediaobjectco.role.attrib;
+		%local.mediaobjectco.attrib;
+>
+<!--end of mediaobjectco.attlist-->]]>
+<!--end of mediaobjectco.module-->]]>
+
+<!ENTITY % imageobjectco.module "INCLUDE">
+<![ %imageobjectco.module; [
+<!ENTITY % local.imageobjectco.attrib "">
+<!ENTITY % imageobjectco.role.attrib "%role.attrib;">
+
+<!ENTITY % imageobjectco.element "INCLUDE">
+<![ %imageobjectco.element; [
+<!ELEMENT imageobjectco %ho; (areaspec, imageobject, calloutlist*)>
+<!--end of imageobjectco.element-->]]>
+
+<!ENTITY % imageobjectco.attlist "INCLUDE">
+<![ %imageobjectco.attlist; [
+<!ATTLIST imageobjectco
+		%common.attrib;
+		%imageobjectco.role.attrib;
+		%local.imageobjectco.attrib;
+>
+<!--end of imageobjectco.attlist-->]]>
+<!--end of imageobjectco.module-->]]>
+<!--end of mediaobject.content.module-->]]>
+
+<!-- Equations ........................ -->
+
+<!-- This PE provides a mechanism for replacing equation content, -->
+<!-- perhaps adding a new or different model (e.g., MathML) -->
+<!ENTITY % equation.content "(alt?, (graphic+|mediaobject+))">
+<!ENTITY % inlineequation.content "(alt?, (graphic+|inlinemediaobject+))">
+
+<!ENTITY % equation.module "INCLUDE">
+<![%equation.module;[
+<!ENTITY % local.equation.attrib "">
+<!ENTITY % equation.role.attrib "%role.attrib;">
+
+<!ENTITY % equation.element "INCLUDE">
+<![%equation.element;[
+<!ELEMENT equation %ho; (blockinfo?, (%formalobject.title.content;)?,
+                         (informalequation | %equation.content;))>
+<!--end of equation.element-->]]>
+
+<!ENTITY % equation.attlist "INCLUDE">
+<![%equation.attlist;[
+<!ATTLIST equation
+		floatstyle	CDATA			#IMPLIED
+		%label.attrib;
+	 	%common.attrib;
+		%equation.role.attrib;
+		%local.equation.attrib;
+>
+<!--end of equation.attlist-->]]>
+<!--end of equation.module-->]]>
+
+<!ENTITY % informalequation.module "INCLUDE">
+<![%informalequation.module;[
+<!ENTITY % local.informalequation.attrib "">
+<!ENTITY % informalequation.role.attrib "%role.attrib;">
+
+<!ENTITY % informalequation.element "INCLUDE">
+<![%informalequation.element;[
+<!ELEMENT informalequation %ho; (blockinfo?, %equation.content;) >
+<!--end of informalequation.element-->]]>
+
+<!ENTITY % informalequation.attlist "INCLUDE">
+<![%informalequation.attlist;[
+<!ATTLIST informalequation
+		floatstyle	CDATA			#IMPLIED
+		%common.attrib;
+		%informalequation.role.attrib;
+		%local.informalequation.attrib;
+>
+<!--end of informalequation.attlist-->]]>
+<!--end of informalequation.module-->]]>
+
+<!ENTITY % inlineequation.module "INCLUDE">
+<![%inlineequation.module;[
+<!ENTITY % local.inlineequation.attrib "">
+<!ENTITY % inlineequation.role.attrib "%role.attrib;">
+
+<!ENTITY % inlineequation.element "INCLUDE">
+<![%inlineequation.element;[
+<!ELEMENT inlineequation %ho; (%inlineequation.content;)>
+<!--end of inlineequation.element-->]]>
+
+<!ENTITY % inlineequation.attlist "INCLUDE">
+<![%inlineequation.attlist;[
+<!ATTLIST inlineequation
+		%common.attrib;
+		%inlineequation.role.attrib;
+		%local.inlineequation.attrib;
+>
+<!--end of inlineequation.attlist-->]]>
+<!--end of inlineequation.module-->]]>
+
+<!ENTITY % alt.module "INCLUDE">
+<![%alt.module;[
+<!ENTITY % local.alt.attrib "">
+<!ENTITY % alt.role.attrib "%role.attrib;">
+
+<!ENTITY % alt.element "INCLUDE">
+<![%alt.element;[
+<!ELEMENT alt %ho; (#PCDATA)>
+<!--end of alt.element-->]]>
+
+<!ENTITY % alt.attlist "INCLUDE">
+<![%alt.attlist;[
+<!ATTLIST alt
+		%common.attrib;
+		%alt.role.attrib;
+		%local.alt.attrib;
+>
+<!--end of alt.attlist-->]]>
+<!--end of alt.module-->]]>
+
+<!-- Tables ........................... -->
+
+<!ENTITY % table.module "INCLUDE">
+<![%table.module;[
+
+<!-- Choose a table model. CALS or OASIS XML Exchange -->
+
+<!ENTITY % cals.table.module "INCLUDE">
+<![%cals.table.module;[
+<!ENTITY % exchange.table.module "IGNORE">
+]]>
+<!ENTITY % exchange.table.module "INCLUDE">
+
+<!-- Do we allow the HTML table model as well? -->
+<!ENTITY % allow.html.tables "INCLUDE">
+<![%allow.html.tables;[
+  <!-- ====================================================== -->
+  <!--  xhtmltbl.mod defines HTML tables and sets parameter
+        entities so that, when the CALS table module is read,
+        we end up allowing any table to be CALS or HTML.
+        i.e. This include must come first!                    -->
+  <!-- ====================================================== -->
+
+<!ENTITY % htmltbl
+  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN"
+  "htmltblx.mod">
+%htmltbl;
+<!--end of allow.html.tables-->]]>
+
+<!ENTITY % tables.role.attrib "%role.attrib;">
+
+<![%cals.table.module;[
+<!-- Add label and role attributes to table and informaltable -->
+<!ENTITY % bodyatt "
+		floatstyle	CDATA			#IMPLIED
+		rowheader	(firstcol|norowheader)	#IMPLIED
+                %label.attrib;"
+>
+
+<!-- Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
+     EntryTbl, and Entry (and InformalTable element). -->
+<!ENTITY % secur
+	"%common.attrib;
+	%tables.role.attrib;">
+
+<!ENTITY % common.table.attribs
+	"%bodyatt;
+	%secur;">
+
+<!-- Content model for Table. -->
+<!ENTITY % tbl.table.mdl
+	"(blockinfo?, (%formalobject.title.content;), (%ndxterm.class;)*,
+	  textobject*,
+          (graphic+|mediaobject+|tgroup+))">
+
+<!-- Allow either objects or inlines; beware of REs between elements. -->
+<!ENTITY % tbl.entry.mdl "%para.char.mix; | %tabentry.mix;">
+
+<!-- Reference CALS Table Model -->
+<!ENTITY % tablemodel
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4//EN"
+  "calstblx.dtd">
+]]>
+
+<![%exchange.table.module;[
+<!-- Add common attributes and the Label attribute to Table and -->
+<!-- InformalTable.                                             -->
+<!ENTITY % bodyatt
+	"%common.attrib;
+	rowheader	(firstcol|norowheader)	#IMPLIED
+	%label.attrib;
+	%tables.role.attrib;">
+
+<!ENTITY % common.table.attribs
+	"%bodyatt;">
+
+<!-- Add common attributes to TGroup, ColSpec, TBody, THead, Row, Entry -->
+
+<!ENTITY % tbl.tgroup.att       "%common.attrib;">
+<!ENTITY % tbl.colspec.att      "%common.attrib;">
+<!ENTITY % tbl.tbody.att        "%common.attrib;">
+<!ENTITY % tbl.thead.att        "%common.attrib;">
+<!ENTITY % tbl.row.att          "%common.attrib;">
+<!ENTITY % tbl.entry.att        "%common.attrib;">
+
+<!-- Content model for Table. -->
+<!ENTITY % tbl.table.mdl
+	"(blockinfo?, (%formalobject.title.content;), (%ndxterm.class;)*,
+	  textobject*,
+          (graphic+|mediaobject+|tgroup+))">
+
+<!-- Allow either objects or inlines; beware of REs between elements. -->
+<!ENTITY % tbl.entry.mdl "(%para.char.mix; | %tabentry.mix;)*">
+
+<!-- Reference OASIS Exchange Table Model -->
+<!ENTITY % tablemodel
+  PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+  "soextblx.dtd">
+]]>
+
+%tablemodel;
+
+<!--end of table.module-->]]>
+
+<!ENTITY % informaltable.module "INCLUDE">
+<![%informaltable.module;[
+
+<!-- Note that InformalTable is dependent on some of the entity
+     declarations that customize Table. -->
+
+<!ENTITY % local.informaltable.attrib "">
+
+<!-- the following entity may have been declared by the XHTML table module -->
+<!ENTITY % informal.tbl.table.mdl "textobject*, (graphic+|mediaobject+|tgroup+)">
+
+<!ENTITY % informaltable.element "INCLUDE">
+<![%informaltable.element;[
+<!ELEMENT informaltable %ho; (blockinfo?, (%informal.tbl.table.mdl;))>
+<!--end of informaltable.element-->]]>
+
+<!-- Frame, Colsep, and Rowsep must be repeated because
+		they are not in entities in the table module. -->
+<!-- includes TabStyle, ToCentry, ShortEntry,
+				Orient, PgWide -->
+<!-- includes Label -->
+<!-- includes common attributes -->
+
+<!ENTITY % informaltable.attlist "INCLUDE">
+<![%informaltable.attlist;[
+<!ATTLIST informaltable
+		frame		(%tbl.frame.attval;)	#IMPLIED
+		colsep		%yesorno.attvals;	#IMPLIED
+		rowsep		%yesorno.attvals;	#IMPLIED
+		%common.table.attribs;
+		%tbl.table.att;
+		%local.informaltable.attrib;
+>
+<!--end of informaltable.attlist-->]]>
+<!--end of informaltable.module-->]]>
+
+<!ENTITY % caption.module "INCLUDE">
+<![ %caption.module; [
+<!ENTITY % local.caption.attrib "">
+<!ENTITY % caption.role.attrib "%role.attrib;">
+
+<!ENTITY % caption.element "INCLUDE">
+<![ %caption.element; [
+<!ELEMENT caption %ho; (#PCDATA | %textobject.mix;)*>
+<!--end of caption.element-->]]>
+
+<!ENTITY % caption.attlist "INCLUDE">
+<![ %caption.attlist; [
+<!-- attrs comes from HTML tables ... -->
+
+<![ %allow.html.tables; [
+<!-- common.attrib, but without ID because ID is in attrs -->
+<!ENTITY % caption.attlist.content "
+	%lang.attrib;
+	%remap.attrib;
+	%xreflabel.attrib;
+	%revisionflag.attrib;
+	%effectivity.attrib;
+	%dir.attrib;
+	%xml-base.attrib;
+	%local.common.attrib;
+		%caption.role.attrib;
+		%attrs;
+		align	(top|bottom|left|right)	#IMPLIED
+		%local.caption.attrib;
+">
+]]>
+<!ENTITY % caption.attlist.content "
+		%common.attrib;
+		%caption.role.attrib;
+		%local.caption.attrib;
+">
+
+<!ATTLIST caption %caption.attlist.content;>
+
+<!--end of caption.attlist-->]]>
+<!--end of caption.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Synopses ............................................................. -->
+
+<!-- Synopsis ......................... -->
+
+<!ENTITY % synopsis.module "INCLUDE">
+<![%synopsis.module;[
+<!ENTITY % local.synopsis.attrib "">
+<!ENTITY % synopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % synopsis.element "INCLUDE">
+<![%synopsis.element;[
+<!ELEMENT synopsis %ho; (%para.char.mix;|graphic|mediaobject|co|coref|textobject|lineannotation)*>
+<!--end of synopsis.element-->]]>
+
+<!ENTITY % synopsis.attlist "INCLUDE">
+<![%synopsis.attlist;[
+<!ATTLIST synopsis
+		%label.attrib;
+		%linespecific.attrib;
+		%common.attrib;
+		%synopsis.role.attrib;
+		%local.synopsis.attrib;
+>
+<!--end of synopsis.attlist-->]]>
+
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!--end of synopsis.module-->]]>
+
+<!-- CmdSynopsis ...................... -->
+
+<!ENTITY % cmdsynopsis.content.module "INCLUDE">
+<![%cmdsynopsis.content.module;[
+<!ENTITY % cmdsynopsis.module "INCLUDE">
+<![%cmdsynopsis.module;[
+<!ENTITY % local.cmdsynopsis.attrib "">
+<!ENTITY % cmdsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % cmdsynopsis.element "INCLUDE">
+<![%cmdsynopsis.element;[
+<!ELEMENT cmdsynopsis %ho; ((command | arg | group | sbr)+, synopfragment*)>
+<!--end of cmdsynopsis.element-->]]>
+
+<!-- Sepchar: Character that should separate command and all
+		top-level arguments; alternate value might be e.g., &Delta; -->
+
+
+<!ENTITY % cmdsynopsis.attlist "INCLUDE">
+<![%cmdsynopsis.attlist;[
+<!ATTLIST cmdsynopsis
+		%label.attrib;
+		sepchar		CDATA		" "
+		cmdlength	CDATA		#IMPLIED
+		%common.attrib;
+		%cmdsynopsis.role.attrib;
+		%local.cmdsynopsis.attrib;
+>
+<!--end of cmdsynopsis.attlist-->]]>
+<!--end of cmdsynopsis.module-->]]>
+
+<!ENTITY % arg.module "INCLUDE">
+<![%arg.module;[
+<!ENTITY % local.arg.attrib "">
+<!ENTITY % arg.role.attrib "%role.attrib;">
+
+<!ENTITY % arg.element "INCLUDE">
+<![%arg.element;[
+<!ELEMENT arg %ho; (#PCDATA
+		| arg
+		| group
+		| option
+		| synopfragmentref
+		| replaceable
+		| sbr)*>
+<!--end of arg.element-->]]>
+
+<!-- Choice: Whether Arg must be supplied: Opt (optional to
+		supply, e.g. [arg]; the default), Req (required to supply,
+		e.g. {arg}), or Plain (required to supply, e.g. arg) -->
+<!-- Rep: whether Arg is repeatable: Norepeat (e.g. arg without
+		ellipsis; the default), or Repeat (e.g. arg...) -->
+
+
+<!ENTITY % arg.attlist "INCLUDE">
+<![%arg.attlist;[
+<!ATTLIST arg
+		choice		(opt
+				|req
+				|plain)		'opt'
+		rep		(norepeat
+				|repeat)	'norepeat'
+		%common.attrib;
+		%arg.role.attrib;
+		%local.arg.attrib;
+>
+<!--end of arg.attlist-->]]>
+<!--end of arg.module-->]]>
+
+<!ENTITY % group.module "INCLUDE">
+<![%group.module;[
+
+<!ENTITY % local.group.attrib "">
+<!ENTITY % group.role.attrib "%role.attrib;">
+
+<!ENTITY % group.element "INCLUDE">
+<![%group.element;[
+<!ELEMENT group %ho; ((arg | group | option | synopfragmentref
+		| replaceable | sbr)+)>
+<!--end of group.element-->]]>
+
+<!-- Choice: Whether Group must be supplied: Opt (optional to
+		supply, e.g.  [g1|g2|g3]; the default), Req (required to
+		supply, e.g.  {g1|g2|g3}), Plain (required to supply,
+		e.g.  g1|g2|g3), OptMult (can supply zero or more, e.g.
+		[[g1|g2|g3]]), or ReqMult (must supply one or more, e.g.
+		{{g1|g2|g3}}) -->
+<!-- Rep: whether Group is repeatable: Norepeat (e.g. group
+		without ellipsis; the default), or Repeat (e.g. group...) -->
+
+
+<!ENTITY % group.attlist "INCLUDE">
+<![%group.attlist;[
+<!ATTLIST group
+		choice		(opt
+				|req
+				|plain)         'opt'
+		rep		(norepeat
+				|repeat)	'norepeat'
+		%common.attrib;
+		%group.role.attrib;
+		%local.group.attrib;
+>
+<!--end of group.attlist-->]]>
+<!--end of group.module-->]]>
+
+<!ENTITY % sbr.module "INCLUDE">
+<![%sbr.module;[
+<!ENTITY % local.sbr.attrib "">
+<!-- Synopsis break -->
+<!ENTITY % sbr.role.attrib "%role.attrib;">
+
+<!ENTITY % sbr.element "INCLUDE">
+<![%sbr.element;[
+<!ELEMENT sbr %ho; EMPTY>
+<!--end of sbr.element-->]]>
+
+<!ENTITY % sbr.attlist "INCLUDE">
+<![%sbr.attlist;[
+<!ATTLIST sbr
+		%common.attrib;
+		%sbr.role.attrib;
+		%local.sbr.attrib;
+>
+<!--end of sbr.attlist-->]]>
+<!--end of sbr.module-->]]>
+
+<!ENTITY % synopfragmentref.module "INCLUDE">
+<![%synopfragmentref.module;[
+<!ENTITY % local.synopfragmentref.attrib "">
+<!ENTITY % synopfragmentref.role.attrib "%role.attrib;">
+
+<!ENTITY % synopfragmentref.element "INCLUDE">
+<![%synopfragmentref.element;[
+<!ELEMENT synopfragmentref %ho; (#PCDATA)>
+<!--end of synopfragmentref.element-->]]>
+
+<!-- to SynopFragment of complex synopsis
+			material for separate referencing -->
+
+
+<!ENTITY % synopfragmentref.attlist "INCLUDE">
+<![%synopfragmentref.attlist;[
+<!ATTLIST synopfragmentref
+		%linkendreq.attrib;		%common.attrib;
+		%synopfragmentref.role.attrib;
+		%local.synopfragmentref.attrib;
+>
+<!--end of synopfragmentref.attlist-->]]>
+<!--end of synopfragmentref.module-->]]>
+
+<!ENTITY % synopfragment.module "INCLUDE">
+<![%synopfragment.module;[
+<!ENTITY % local.synopfragment.attrib "">
+<!ENTITY % synopfragment.role.attrib "%role.attrib;">
+
+<!ENTITY % synopfragment.element "INCLUDE">
+<![%synopfragment.element;[
+<!ELEMENT synopfragment %ho; ((arg | group)+)>
+<!--end of synopfragment.element-->]]>
+
+<!ENTITY % synopfragment.attlist "INCLUDE">
+<![%synopfragment.attlist;[
+<!ATTLIST synopfragment
+		%idreq.common.attrib;
+		%synopfragment.role.attrib;
+		%local.synopfragment.attrib;
+>
+<!--end of synopfragment.attlist-->]]>
+<!--end of synopfragment.module-->]]>
+
+<!-- Command (defined in the Inlines section, below)-->
+<!-- Option (defined in the Inlines section, below)-->
+<!-- Replaceable (defined in the Inlines section, below)-->
+<!--end of cmdsynopsis.content.module-->]]>
+
+<!-- FuncSynopsis ..................... -->
+
+<!ENTITY % funcsynopsis.content.module "INCLUDE">
+<![%funcsynopsis.content.module;[
+<!ENTITY % funcsynopsis.module "INCLUDE">
+<![%funcsynopsis.module;[
+
+<!ENTITY % local.funcsynopsis.attrib "">
+<!ENTITY % funcsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % funcsynopsis.element "INCLUDE">
+<![%funcsynopsis.element;[
+<!ELEMENT funcsynopsis %ho; ((funcsynopsisinfo | funcprototype)+)>
+<!--end of funcsynopsis.element-->]]>
+
+<!ENTITY % funcsynopsis.attlist "INCLUDE">
+<![%funcsynopsis.attlist;[
+<!ATTLIST funcsynopsis
+		%label.attrib;
+		%common.attrib;
+		%funcsynopsis.role.attrib;
+		%local.funcsynopsis.attrib;
+>
+<!--end of funcsynopsis.attlist-->]]>
+<!--end of funcsynopsis.module-->]]>
+
+<!ENTITY % funcsynopsisinfo.module "INCLUDE">
+<![%funcsynopsisinfo.module;[
+<!ENTITY % local.funcsynopsisinfo.attrib "">
+<!ENTITY % funcsynopsisinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % funcsynopsisinfo.element "INCLUDE">
+<![%funcsynopsisinfo.element;[
+<!ELEMENT funcsynopsisinfo %ho; (%cptr.char.mix;|textobject|lineannotation)*>
+<!--end of funcsynopsisinfo.element-->]]>
+
+<!ENTITY % funcsynopsisinfo.attlist "INCLUDE">
+<![%funcsynopsisinfo.attlist;[
+<!ATTLIST funcsynopsisinfo
+		%linespecific.attrib;
+		%common.attrib;
+		%funcsynopsisinfo.role.attrib;
+		%local.funcsynopsisinfo.attrib;
+>
+<!--end of funcsynopsisinfo.attlist-->]]>
+<!--end of funcsynopsisinfo.module-->]]>
+
+<!ENTITY % funcprototype.module "INCLUDE">
+<![%funcprototype.module;[
+<!ENTITY % local.funcprototype.attrib "">
+<!ENTITY % funcprototype.role.attrib "%role.attrib;">
+
+<!ENTITY % funcprototype.element "INCLUDE">
+<![%funcprototype.element;[
+<!ELEMENT funcprototype %ho; (modifier*,
+                              funcdef,
+                              (void|varargs|(paramdef+, varargs?)),
+                              modifier*)>
+
+<!--end of funcprototype.element-->]]>
+
+<!ENTITY % funcprototype.attlist "INCLUDE">
+<![%funcprototype.attlist;[
+<!ATTLIST funcprototype
+		%common.attrib;
+		%funcprototype.role.attrib;
+		%local.funcprototype.attrib;
+>
+<!--end of funcprototype.attlist-->]]>
+<!--end of funcprototype.module-->]]>
+
+<!ENTITY % funcdef.module "INCLUDE">
+<![%funcdef.module;[
+<!ENTITY % local.funcdef.attrib "">
+<!ENTITY % funcdef.role.attrib "%role.attrib;">
+
+<!ENTITY % funcdef.element "INCLUDE">
+<![%funcdef.element;[
+<!ELEMENT funcdef %ho; (#PCDATA
+		| type
+		| replaceable
+		| function)*>
+<!--end of funcdef.element-->]]>
+
+<!ENTITY % funcdef.attlist "INCLUDE">
+<![%funcdef.attlist;[
+<!ATTLIST funcdef
+		%common.attrib;
+		%funcdef.role.attrib;
+		%local.funcdef.attrib;
+>
+<!--end of funcdef.attlist-->]]>
+<!--end of funcdef.module-->]]>
+
+<!ENTITY % void.module "INCLUDE">
+<![%void.module;[
+<!ENTITY % local.void.attrib "">
+<!ENTITY % void.role.attrib "%role.attrib;">
+
+<!ENTITY % void.element "INCLUDE">
+<![%void.element;[
+<!ELEMENT void %ho; EMPTY>
+<!--end of void.element-->]]>
+
+<!ENTITY % void.attlist "INCLUDE">
+<![%void.attlist;[
+<!ATTLIST void
+		%common.attrib;
+		%void.role.attrib;
+		%local.void.attrib;
+>
+<!--end of void.attlist-->]]>
+<!--end of void.module-->]]>
+
+<!ENTITY % varargs.module "INCLUDE">
+<![%varargs.module;[
+<!ENTITY % local.varargs.attrib "">
+<!ENTITY % varargs.role.attrib "%role.attrib;">
+
+<!ENTITY % varargs.element "INCLUDE">
+<![%varargs.element;[
+<!ELEMENT varargs %ho; EMPTY>
+<!--end of varargs.element-->]]>
+
+<!ENTITY % varargs.attlist "INCLUDE">
+<![%varargs.attlist;[
+<!ATTLIST varargs
+		%common.attrib;
+		%varargs.role.attrib;
+		%local.varargs.attrib;
+>
+<!--end of varargs.attlist-->]]>
+<!--end of varargs.module-->]]>
+
+<!-- Processing assumes that only one Parameter will appear in a
+     ParamDef, and that FuncParams will be used at most once, for
+     providing information on the "inner parameters" for parameters that
+     are pointers to functions. -->
+
+<!ENTITY % paramdef.module "INCLUDE">
+<![%paramdef.module;[
+<!ENTITY % local.paramdef.attrib "">
+<!ENTITY % paramdef.role.attrib "%role.attrib;">
+
+<!ENTITY % paramdef.element "INCLUDE">
+<![%paramdef.element;[
+<!ELEMENT paramdef %ho; (#PCDATA
+                | initializer
+		| type
+		| replaceable
+		| parameter
+		| funcparams)*>
+<!--end of paramdef.element-->]]>
+
+<!ENTITY % paramdef.attlist "INCLUDE">
+<![%paramdef.attlist;[
+<!ATTLIST paramdef
+		choice		(opt
+				|req)	#IMPLIED
+		%common.attrib;
+		%paramdef.role.attrib;
+		%local.paramdef.attrib;
+>
+<!--end of paramdef.attlist-->]]>
+<!--end of paramdef.module-->]]>
+
+<!ENTITY % funcparams.module "INCLUDE">
+<![%funcparams.module;[
+<!ENTITY % local.funcparams.attrib "">
+<!ENTITY % funcparams.role.attrib "%role.attrib;">
+
+<!ENTITY % funcparams.element "INCLUDE">
+<![%funcparams.element;[
+<!ELEMENT funcparams %ho; (%cptr.char.mix;)*>
+<!--end of funcparams.element-->]]>
+
+<!ENTITY % funcparams.attlist "INCLUDE">
+<![%funcparams.attlist;[
+<!ATTLIST funcparams
+		%common.attrib;
+		%funcparams.role.attrib;
+		%local.funcparams.attrib;
+>
+<!--end of funcparams.attlist-->]]>
+<!--end of funcparams.module-->]]>
+
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!-- Replaceable (defined in the Inlines section, below)-->
+<!-- Function (defined in the Inlines section, below)-->
+<!-- Parameter (defined in the Inlines section, below)-->
+<!--end of funcsynopsis.content.module-->]]>
+
+<!-- ClassSynopsis ..................... -->
+
+<!ENTITY % classsynopsis.content.module "INCLUDE">
+<![%classsynopsis.content.module;[
+
+<!ENTITY % classsynopsis.module "INCLUDE">
+<![%classsynopsis.module;[
+<!ENTITY % local.classsynopsis.attrib "">
+<!ENTITY % classsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % classsynopsis.element "INCLUDE">
+<![%classsynopsis.element;[
+<!ELEMENT classsynopsis %ho; ((ooclass|oointerface|ooexception)+,
+                         (classsynopsisinfo
+                          |fieldsynopsis|%method.synop.class;)*)>
+<!--end of classsynopsis.element-->]]>
+
+<!ENTITY % classsynopsis.attlist "INCLUDE">
+<![%classsynopsis.attlist;[
+<!ATTLIST classsynopsis
+	language	CDATA	#IMPLIED
+	class	(class|interface)	"class"
+	%common.attrib;
+	%classsynopsis.role.attrib;
+	%local.classsynopsis.attrib;
+>
+<!--end of classsynopsis.attlist-->]]>
+<!--end of classsynopsis.module-->]]>
+
+<!ENTITY % classsynopsisinfo.module "INCLUDE">
+<![ %classsynopsisinfo.module; [
+<!ENTITY % local.classsynopsisinfo.attrib "">
+<!ENTITY % classsynopsisinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % classsynopsisinfo.element "INCLUDE">
+<![ %classsynopsisinfo.element; [
+<!ELEMENT classsynopsisinfo %ho; (%cptr.char.mix;|textobject|lineannotation)*>
+<!--end of classsynopsisinfo.element-->]]>
+
+<!ENTITY % classsynopsisinfo.attlist "INCLUDE">
+<![ %classsynopsisinfo.attlist; [
+<!ATTLIST classsynopsisinfo
+		%linespecific.attrib;
+		%common.attrib;
+		%classsynopsisinfo.role.attrib;
+		%local.classsynopsisinfo.attrib;
+>
+<!--end of classsynopsisinfo.attlist-->]]>
+<!--end of classsynopsisinfo.module-->]]>
+
+<!ENTITY % ooclass.module "INCLUDE">
+<![%ooclass.module;[
+<!ENTITY % local.ooclass.attrib "">
+<!ENTITY % ooclass.role.attrib "%role.attrib;">
+
+<!ENTITY % ooclass.element "INCLUDE">
+<![%ooclass.element;[
+<!ELEMENT ooclass %ho; ((modifier|package)*, classname)>
+<!--end of ooclass.element-->]]>
+
+<!ENTITY % ooclass.attlist "INCLUDE">
+<![%ooclass.attlist;[
+<!ATTLIST ooclass
+	%common.attrib;
+	%ooclass.role.attrib;
+	%local.ooclass.attrib;
+>
+<!--end of ooclass.attlist-->]]>
+<!--end of ooclass.module-->]]>
+
+<!ENTITY % oointerface.module "INCLUDE">
+<![%oointerface.module;[
+<!ENTITY % local.oointerface.attrib "">
+<!ENTITY % oointerface.role.attrib "%role.attrib;">
+
+<!ENTITY % oointerface.element "INCLUDE">
+<![%oointerface.element;[
+<!ELEMENT oointerface %ho; ((modifier|package)*, interfacename)>
+<!--end of oointerface.element-->]]>
+
+<!ENTITY % oointerface.attlist "INCLUDE">
+<![%oointerface.attlist;[
+<!ATTLIST oointerface
+	%common.attrib;
+	%oointerface.role.attrib;
+	%local.oointerface.attrib;
+>
+<!--end of oointerface.attlist-->]]>
+<!--end of oointerface.module-->]]>
+
+<!ENTITY % ooexception.module "INCLUDE">
+<![%ooexception.module;[
+<!ENTITY % local.ooexception.attrib "">
+<!ENTITY % ooexception.role.attrib "%role.attrib;">
+
+<!ENTITY % ooexception.element "INCLUDE">
+<![%ooexception.element;[
+<!ELEMENT ooexception %ho; ((modifier|package)*, exceptionname)>
+<!--end of ooexception.element-->]]>
+
+<!ENTITY % ooexception.attlist "INCLUDE">
+<![%ooexception.attlist;[
+<!ATTLIST ooexception
+	%common.attrib;
+	%ooexception.role.attrib;
+	%local.ooexception.attrib;
+>
+<!--end of ooexception.attlist-->]]>
+<!--end of ooexception.module-->]]>
+
+<!ENTITY % modifier.module "INCLUDE">
+<![%modifier.module;[
+<!ENTITY % local.modifier.attrib "">
+<!ENTITY % modifier.role.attrib "%role.attrib;">
+
+<!ENTITY % modifier.element "INCLUDE">
+<![%modifier.element;[
+<!ELEMENT modifier %ho; (%smallcptr.char.mix;)*>
+<!--end of modifier.element-->]]>
+
+<!ENTITY % modifier.attlist "INCLUDE">
+<![%modifier.attlist;[
+<!ATTLIST modifier
+	%common.attrib;
+	%modifier.role.attrib;
+	%local.modifier.attrib;
+>
+<!--end of modifier.attlist-->]]>
+<!--end of modifier.module-->]]>
+
+<!ENTITY % interfacename.module "INCLUDE">
+<![%interfacename.module;[
+<!ENTITY % local.interfacename.attrib "">
+<!ENTITY % interfacename.role.attrib "%role.attrib;">
+
+<!ENTITY % interfacename.element "INCLUDE">
+<![%interfacename.element;[
+<!ELEMENT interfacename %ho; (%cptr.char.mix;)*>
+<!--end of interfacename.element-->]]>
+
+<!ENTITY % interfacename.attlist "INCLUDE">
+<![%interfacename.attlist;[
+<!ATTLIST interfacename
+	%common.attrib;
+	%interfacename.role.attrib;
+	%local.interfacename.attrib;
+>
+<!--end of interfacename.attlist-->]]>
+<!--end of interfacename.module-->]]>
+
+<!ENTITY % exceptionname.module "INCLUDE">
+<![%exceptionname.module;[
+<!ENTITY % local.exceptionname.attrib "">
+<!ENTITY % exceptionname.role.attrib "%role.attrib;">
+
+<!ENTITY % exceptionname.element "INCLUDE">
+<![%exceptionname.element;[
+<!ELEMENT exceptionname %ho; (%smallcptr.char.mix;)*>
+<!--end of exceptionname.element-->]]>
+
+<!ENTITY % exceptionname.attlist "INCLUDE">
+<![%exceptionname.attlist;[
+<!ATTLIST exceptionname
+	%common.attrib;
+	%exceptionname.role.attrib;
+	%local.exceptionname.attrib;
+>
+<!--end of exceptionname.attlist-->]]>
+<!--end of exceptionname.module-->]]>
+
+<!ENTITY % fieldsynopsis.module "INCLUDE">
+<![%fieldsynopsis.module;[
+<!ENTITY % local.fieldsynopsis.attrib "">
+<!ENTITY % fieldsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % fieldsynopsis.element "INCLUDE">
+<![%fieldsynopsis.element;[
+<!ELEMENT fieldsynopsis %ho; (modifier*, type?, varname, initializer?)>
+<!--end of fieldsynopsis.element-->]]>
+
+<!ENTITY % fieldsynopsis.attlist "INCLUDE">
+<![%fieldsynopsis.attlist;[
+<!ATTLIST fieldsynopsis
+	language	CDATA	#IMPLIED
+	%common.attrib;
+	%fieldsynopsis.role.attrib;
+	%local.fieldsynopsis.attrib;
+>
+<!--end of fieldsynopsis.attlist-->]]>
+<!--end of fieldsynopsis.module-->]]>
+
+<!ENTITY % initializer.module "INCLUDE">
+<![%initializer.module;[
+<!ENTITY % local.initializer.attrib "">
+<!ENTITY % initializer.role.attrib "%role.attrib;">
+
+<!ENTITY % initializer.element "INCLUDE">
+<![%initializer.element;[
+<!ELEMENT initializer %ho; (%smallcptr.char.mix;)*>
+<!--end of initializer.element-->]]>
+
+<!ENTITY % initializer.attlist "INCLUDE">
+<![%initializer.attlist;[
+<!ATTLIST initializer
+	%common.attrib;
+	%initializer.role.attrib;
+	%local.initializer.attrib;
+>
+<!--end of initializer.attlist-->]]>
+<!--end of initializer.module-->]]>
+
+<!ENTITY % constructorsynopsis.module "INCLUDE">
+<![%constructorsynopsis.module;[
+<!ENTITY % local.constructorsynopsis.attrib "">
+<!ENTITY % constructorsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % constructorsynopsis.element "INCLUDE">
+<![%constructorsynopsis.element;[
+<!ELEMENT constructorsynopsis %ho; (modifier*,
+                               methodname?,
+                               (methodparam+|void?),
+                               exceptionname*)>
+<!--end of constructorsynopsis.element-->]]>
+
+<!ENTITY % constructorsynopsis.attlist "INCLUDE">
+<![%constructorsynopsis.attlist;[
+<!ATTLIST constructorsynopsis
+	language	CDATA	#IMPLIED
+	%common.attrib;
+	%constructorsynopsis.role.attrib;
+	%local.constructorsynopsis.attrib;
+>
+<!--end of constructorsynopsis.attlist-->]]>
+<!--end of constructorsynopsis.module-->]]>
+
+<!ENTITY % destructorsynopsis.module "INCLUDE">
+<![%destructorsynopsis.module;[
+<!ENTITY % local.destructorsynopsis.attrib "">
+<!ENTITY % destructorsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % destructorsynopsis.element "INCLUDE">
+<![%destructorsynopsis.element;[
+<!ELEMENT destructorsynopsis %ho; (modifier*,
+                              methodname?,
+                              (methodparam+|void?),
+                              exceptionname*)>
+<!--end of destructorsynopsis.element-->]]>
+
+<!ENTITY % destructorsynopsis.attlist "INCLUDE">
+<![%destructorsynopsis.attlist;[
+<!ATTLIST destructorsynopsis
+	language	CDATA	#IMPLIED
+	%common.attrib;
+	%destructorsynopsis.role.attrib;
+	%local.destructorsynopsis.attrib;
+>
+<!--end of destructorsynopsis.attlist-->]]>
+<!--end of destructorsynopsis.module-->]]>
+
+<!ENTITY % methodsynopsis.module "INCLUDE">
+<![%methodsynopsis.module;[
+<!ENTITY % local.methodsynopsis.attrib "">
+<!ENTITY % methodsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % methodsynopsis.element "INCLUDE">
+<![%methodsynopsis.element;[
+<!ELEMENT methodsynopsis %ho; (modifier*,
+                          (type|void)?,
+                          methodname,
+                          (methodparam+|void?),
+                          exceptionname*,
+                          modifier*)>
+<!--end of methodsynopsis.element-->]]>
+
+<!ENTITY % methodsynopsis.attlist "INCLUDE">
+<![%methodsynopsis.attlist;[
+<!ATTLIST methodsynopsis
+	language	CDATA	#IMPLIED
+	%common.attrib;
+	%methodsynopsis.role.attrib;
+	%local.methodsynopsis.attrib;
+>
+<!--end of methodsynopsis.attlist-->]]>
+<!--end of methodsynopsis.module-->]]>
+
+<!ENTITY % methodname.module "INCLUDE">
+<![%methodname.module;[
+<!ENTITY % local.methodname.attrib "">
+<!ENTITY % methodname.role.attrib "%role.attrib;">
+
+<!ENTITY % methodname.element "INCLUDE">
+<![%methodname.element;[
+<!ELEMENT methodname %ho; (%smallcptr.char.mix;)*>
+<!--end of methodname.element-->]]>
+
+<!ENTITY % methodname.attlist "INCLUDE">
+<![%methodname.attlist;[
+<!ATTLIST methodname
+	%common.attrib;
+	%methodname.role.attrib;
+	%local.methodname.attrib;
+>
+<!--end of methodname.attlist-->]]>
+<!--end of methodname.module-->]]>
+
+<!ENTITY % methodparam.module "INCLUDE">
+<![%methodparam.module;[
+<!ENTITY % local.methodparam.attrib "">
+<!ENTITY % methodparam.role.attrib "%role.attrib;">
+
+<!ENTITY % methodparam.element "INCLUDE">
+<![%methodparam.element;[
+<!ELEMENT methodparam %ho; (modifier*,
+                       type?,
+                       ((parameter,initializer?)|funcparams),
+                       modifier*)>
+<!--end of methodparam.element-->]]>
+
+<!ENTITY % methodparam.attlist "INCLUDE">
+<![%methodparam.attlist;[
+<!ATTLIST methodparam
+	choice		(opt
+			|req
+			|plain)		"req"
+	rep		(norepeat
+			|repeat)	"norepeat"
+	%common.attrib;
+	%methodparam.role.attrib;
+	%local.methodparam.attrib;
+>
+<!--end of methodparam.attlist-->]]>
+<!--end of methodparam.module-->]]>
+<!--end of classsynopsis.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Document information entities and elements ........................... -->
+
+<!-- The document information elements include some elements that are
+     currently used only in the document hierarchy module. They are
+     defined here so that they will be available for use in customized
+     document hierarchies. -->
+
+<!-- .................................. -->
+
+<!ENTITY % docinfo.content.module "INCLUDE">
+<![%docinfo.content.module;[
+
+<!-- Ackno ............................ -->
+
+<!ENTITY % ackno.module "INCLUDE">
+<![%ackno.module;[
+<!ENTITY % local.ackno.attrib "">
+<!ENTITY % ackno.role.attrib "%role.attrib;">
+
+<!ENTITY % ackno.element "INCLUDE">
+<![%ackno.element;[
+<!ELEMENT ackno %ho; (%docinfo.char.mix;)*>
+<!--end of ackno.element-->]]>
+
+<!ENTITY % ackno.attlist "INCLUDE">
+<![%ackno.attlist;[
+<!ATTLIST ackno
+		%common.attrib;
+		%ackno.role.attrib;
+		%local.ackno.attrib;
+>
+<!--end of ackno.attlist-->]]>
+<!--end of ackno.module-->]]>
+
+<!-- Address .......................... -->
+
+<!ENTITY % address.content.module "INCLUDE">
+<![%address.content.module;[
+<!ENTITY % address.module "INCLUDE">
+<![%address.module;[
+<!ENTITY % local.address.attrib "">
+<!ENTITY % address.role.attrib "%role.attrib;">
+
+<!ENTITY % address.element "INCLUDE">
+<![%address.element;[
+<!ELEMENT address %ho; (#PCDATA|personname|%person.ident.mix;
+		|street|pob|postcode|city|state|country|phone
+		|fax|email|otheraddr)*>
+<!--end of address.element-->]]>
+
+<!ENTITY % address.attlist "INCLUDE">
+<![%address.attlist;[
+<!ATTLIST address
+		%linespecific.attrib;
+		%common.attrib;
+		%address.role.attrib;
+		%local.address.attrib;
+>
+<!--end of address.attlist-->]]>
+<!--end of address.module-->]]>
+
+  <!ENTITY % street.module "INCLUDE">
+  <![%street.module;[
+ <!ENTITY % local.street.attrib "">
+  <!ENTITY % street.role.attrib "%role.attrib;">
+
+<!ENTITY % street.element "INCLUDE">
+<![%street.element;[
+<!ELEMENT street %ho; (%docinfo.char.mix;)*>
+<!--end of street.element-->]]>
+
+<!ENTITY % street.attlist "INCLUDE">
+<![%street.attlist;[
+<!ATTLIST street
+		%common.attrib;
+		%street.role.attrib;
+		%local.street.attrib;
+>
+<!--end of street.attlist-->]]>
+  <!--end of street.module-->]]>
+
+  <!ENTITY % pob.module "INCLUDE">
+  <![%pob.module;[
+  <!ENTITY % local.pob.attrib "">
+  <!ENTITY % pob.role.attrib "%role.attrib;">
+
+<!ENTITY % pob.element "INCLUDE">
+<![%pob.element;[
+<!ELEMENT pob %ho; (%docinfo.char.mix;)*>
+<!--end of pob.element-->]]>
+
+<!ENTITY % pob.attlist "INCLUDE">
+<![%pob.attlist;[
+<!ATTLIST pob
+		%common.attrib;
+		%pob.role.attrib;
+		%local.pob.attrib;
+>
+<!--end of pob.attlist-->]]>
+  <!--end of pob.module-->]]>
+
+  <!ENTITY % postcode.module "INCLUDE">
+  <![%postcode.module;[
+  <!ENTITY % local.postcode.attrib "">
+  <!ENTITY % postcode.role.attrib "%role.attrib;">
+
+<!ENTITY % postcode.element "INCLUDE">
+<![%postcode.element;[
+<!ELEMENT postcode %ho; (%docinfo.char.mix;)*>
+<!--end of postcode.element-->]]>
+
+<!ENTITY % postcode.attlist "INCLUDE">
+<![%postcode.attlist;[
+<!ATTLIST postcode
+		%common.attrib;
+		%postcode.role.attrib;
+		%local.postcode.attrib;
+>
+<!--end of postcode.attlist-->]]>
+  <!--end of postcode.module-->]]>
+
+  <!ENTITY % city.module "INCLUDE">
+  <![%city.module;[
+  <!ENTITY % local.city.attrib "">
+  <!ENTITY % city.role.attrib "%role.attrib;">
+
+<!ENTITY % city.element "INCLUDE">
+<![%city.element;[
+<!ELEMENT city %ho; (%docinfo.char.mix;)*>
+<!--end of city.element-->]]>
+
+<!ENTITY % city.attlist "INCLUDE">
+<![%city.attlist;[
+<!ATTLIST city
+		%common.attrib;
+		%city.role.attrib;
+		%local.city.attrib;
+>
+<!--end of city.attlist-->]]>
+  <!--end of city.module-->]]>
+
+  <!ENTITY % state.module "INCLUDE">
+  <![%state.module;[
+  <!ENTITY % local.state.attrib "">
+  <!ENTITY % state.role.attrib "%role.attrib;">
+
+<!ENTITY % state.element "INCLUDE">
+<![%state.element;[
+<!ELEMENT state %ho; (%docinfo.char.mix;)*>
+<!--end of state.element-->]]>
+
+<!ENTITY % state.attlist "INCLUDE">
+<![%state.attlist;[
+<!ATTLIST state
+		%common.attrib;
+		%state.role.attrib;
+		%local.state.attrib;
+>
+<!--end of state.attlist-->]]>
+  <!--end of state.module-->]]>
+
+  <!ENTITY % country.module "INCLUDE">
+  <![%country.module;[
+  <!ENTITY % local.country.attrib "">
+  <!ENTITY % country.role.attrib "%role.attrib;">
+
+<!ENTITY % country.element "INCLUDE">
+<![%country.element;[
+<!ELEMENT country %ho; (%docinfo.char.mix;)*>
+<!--end of country.element-->]]>
+
+<!ENTITY % country.attlist "INCLUDE">
+<![%country.attlist;[
+<!ATTLIST country
+		%common.attrib;
+		%country.role.attrib;
+		%local.country.attrib;
+>
+<!--end of country.attlist-->]]>
+  <!--end of country.module-->]]>
+
+  <!ENTITY % phone.module "INCLUDE">
+  <![%phone.module;[
+  <!ENTITY % local.phone.attrib "">
+  <!ENTITY % phone.role.attrib "%role.attrib;">
+
+<!ENTITY % phone.element "INCLUDE">
+<![%phone.element;[
+<!ELEMENT phone %ho; (%docinfo.char.mix;)*>
+<!--end of phone.element-->]]>
+
+<!ENTITY % phone.attlist "INCLUDE">
+<![%phone.attlist;[
+<!ATTLIST phone
+		%common.attrib;
+		%phone.role.attrib;
+		%local.phone.attrib;
+>
+<!--end of phone.attlist-->]]>
+  <!--end of phone.module-->]]>
+
+  <!ENTITY % fax.module "INCLUDE">
+  <![%fax.module;[
+  <!ENTITY % local.fax.attrib "">
+  <!ENTITY % fax.role.attrib "%role.attrib;">
+
+<!ENTITY % fax.element "INCLUDE">
+<![%fax.element;[
+<!ELEMENT fax %ho; (%docinfo.char.mix;)*>
+<!--end of fax.element-->]]>
+
+<!ENTITY % fax.attlist "INCLUDE">
+<![%fax.attlist;[
+<!ATTLIST fax
+		%common.attrib;
+		%fax.role.attrib;
+		%local.fax.attrib;
+>
+<!--end of fax.attlist-->]]>
+  <!--end of fax.module-->]]>
+
+  <!-- Email (defined in the Inlines section, below)-->
+
+  <!ENTITY % otheraddr.module "INCLUDE">
+  <![%otheraddr.module;[
+  <!ENTITY % local.otheraddr.attrib "">
+  <!ENTITY % otheraddr.role.attrib "%role.attrib;">
+
+<!ENTITY % otheraddr.element "INCLUDE">
+<![%otheraddr.element;[
+<!ELEMENT otheraddr %ho; (%docinfo.char.mix;)*>
+<!--end of otheraddr.element-->]]>
+
+<!ENTITY % otheraddr.attlist "INCLUDE">
+<![%otheraddr.attlist;[
+<!ATTLIST otheraddr
+		%common.attrib;
+		%otheraddr.role.attrib;
+		%local.otheraddr.attrib;
+>
+<!--end of otheraddr.attlist-->]]>
+  <!--end of otheraddr.module-->]]>
+<!--end of address.content.module-->]]>
+
+<!-- Affiliation ...................... -->
+
+<!ENTITY % affiliation.content.module "INCLUDE">
+<![%affiliation.content.module;[
+<!ENTITY % affiliation.module "INCLUDE">
+<![%affiliation.module;[
+<!ENTITY % local.affiliation.attrib "">
+<!ENTITY % affiliation.role.attrib "%role.attrib;">
+
+<!ENTITY % affiliation.element "INCLUDE">
+<![%affiliation.element;[
+<!ELEMENT affiliation %ho; (shortaffil?, jobtitle*, orgname?, orgdiv*,
+		address*)>
+<!--end of affiliation.element-->]]>
+
+<!ENTITY % affiliation.attlist "INCLUDE">
+<![%affiliation.attlist;[
+<!ATTLIST affiliation
+		%common.attrib;
+		%affiliation.role.attrib;
+		%local.affiliation.attrib;
+>
+<!--end of affiliation.attlist-->]]>
+<!--end of affiliation.module-->]]>
+
+  <!ENTITY % shortaffil.module "INCLUDE">
+  <![%shortaffil.module;[
+  <!ENTITY % local.shortaffil.attrib "">
+  <!ENTITY % shortaffil.role.attrib "%role.attrib;">
+
+<!ENTITY % shortaffil.element "INCLUDE">
+<![%shortaffil.element;[
+<!ELEMENT shortaffil %ho; (%docinfo.char.mix;)*>
+<!--end of shortaffil.element-->]]>
+
+<!ENTITY % shortaffil.attlist "INCLUDE">
+<![%shortaffil.attlist;[
+<!ATTLIST shortaffil
+		%common.attrib;
+		%shortaffil.role.attrib;
+		%local.shortaffil.attrib;
+>
+<!--end of shortaffil.attlist-->]]>
+  <!--end of shortaffil.module-->]]>
+
+  <!ENTITY % jobtitle.module "INCLUDE">
+  <![%jobtitle.module;[
+  <!ENTITY % local.jobtitle.attrib "">
+  <!ENTITY % jobtitle.role.attrib "%role.attrib;">
+
+<!ENTITY % jobtitle.element "INCLUDE">
+<![%jobtitle.element;[
+<!ELEMENT jobtitle %ho; (%docinfo.char.mix;)*>
+<!--end of jobtitle.element-->]]>
+
+<!ENTITY % jobtitle.attlist "INCLUDE">
+<![%jobtitle.attlist;[
+<!ATTLIST jobtitle
+		%common.attrib;
+		%jobtitle.role.attrib;
+		%local.jobtitle.attrib;
+>
+<!--end of jobtitle.attlist-->]]>
+  <!--end of jobtitle.module-->]]>
+
+  <!-- OrgName (defined elsewhere in this section)-->
+
+  <!ENTITY % orgdiv.module "INCLUDE">
+  <![%orgdiv.module;[
+  <!ENTITY % local.orgdiv.attrib "">
+  <!ENTITY % orgdiv.role.attrib "%role.attrib;">
+
+<!ENTITY % orgdiv.element "INCLUDE">
+<![%orgdiv.element;[
+<!ELEMENT orgdiv %ho; (%docinfo.char.mix;)*>
+<!--end of orgdiv.element-->]]>
+
+<!ENTITY % orgdiv.attlist "INCLUDE">
+<![%orgdiv.attlist;[
+<!ATTLIST orgdiv
+		%common.attrib;
+		%orgdiv.role.attrib;
+		%local.orgdiv.attrib;
+>
+<!--end of orgdiv.attlist-->]]>
+  <!--end of orgdiv.module-->]]>
+
+  <!-- Address (defined elsewhere in this section)-->
+<!--end of affiliation.content.module-->]]>
+
+<!-- ArtPageNums ...................... -->
+
+<!ENTITY % artpagenums.module "INCLUDE">
+<![%artpagenums.module;[
+<!ENTITY % local.artpagenums.attrib "">
+<!ENTITY % artpagenums.role.attrib "%role.attrib;">
+
+<!ENTITY % artpagenums.element "INCLUDE">
+<![%artpagenums.element;[
+<!ELEMENT artpagenums %ho; (%docinfo.char.mix;)*>
+<!--end of artpagenums.element-->]]>
+
+<!ENTITY % artpagenums.attlist "INCLUDE">
+<![%artpagenums.attlist;[
+<!ATTLIST artpagenums
+		%common.attrib;
+		%artpagenums.role.attrib;
+		%local.artpagenums.attrib;
+>
+<!--end of artpagenums.attlist-->]]>
+<!--end of artpagenums.module-->]]>
+
+<!-- PersonName -->
+
+<!ENTITY % personname.module "INCLUDE">
+<![%personname.module;[
+<!ENTITY % local.personname.attrib "">
+<!ENTITY % personname.role.attrib "%role.attrib;">
+
+<!ENTITY % personname.element "INCLUDE">
+<![%personname.element;[
+<!ELEMENT personname %ho; ((honorific|firstname|surname|lineage|othername)+)>
+<!--end of personname.element-->]]>
+
+<!ENTITY % personname.attlist "INCLUDE">
+<![%personname.attlist;[
+<!ATTLIST personname
+		%common.attrib;
+		%personname.role.attrib;
+		%local.personname.attrib;
+>
+<!--end of personname.attlist-->]]>
+<!--end of personname.module-->]]>
+
+<!-- Author ........................... -->
+
+<!ENTITY % author.module "INCLUDE">
+<![%author.module;[
+<!ENTITY % local.author.attrib "">
+<!ENTITY % author.role.attrib "%role.attrib;">
+
+<!ENTITY % author.element "INCLUDE">
+<![%author.element;[
+<!ELEMENT author %ho; ((personname|(%person.ident.mix;)+),(personblurb|email|address)*)>
+<!--end of author.element-->]]>
+
+<!ENTITY % author.attlist "INCLUDE">
+<![%author.attlist;[
+<!ATTLIST author
+		%common.attrib;
+		%author.role.attrib;
+		%local.author.attrib;
+>
+<!--end of author.attlist-->]]>
+<!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of author.module-->]]>
+
+<!-- AuthorGroup ...................... -->
+
+<!ENTITY % authorgroup.content.module "INCLUDE">
+<![%authorgroup.content.module;[
+<!ENTITY % authorgroup.module "INCLUDE">
+<![%authorgroup.module;[
+<!ENTITY % local.authorgroup.attrib "">
+<!ENTITY % authorgroup.role.attrib "%role.attrib;">
+
+<!ENTITY % authorgroup.element "INCLUDE">
+<![%authorgroup.element;[
+<!ELEMENT authorgroup %ho; ((author|editor|collab|corpauthor|corpcredit|othercredit)+)>
+<!--end of authorgroup.element-->]]>
+
+<!ENTITY % authorgroup.attlist "INCLUDE">
+<![%authorgroup.attlist;[
+<!ATTLIST authorgroup
+		%common.attrib;
+		%authorgroup.role.attrib;
+		%local.authorgroup.attrib;
+>
+<!--end of authorgroup.attlist-->]]>
+<!--end of authorgroup.module-->]]>
+
+  <!-- Author (defined elsewhere in this section)-->
+  <!-- Editor (defined elsewhere in this section)-->
+
+  <!ENTITY % collab.content.module "INCLUDE">
+  <![%collab.content.module;[
+  <!ENTITY % collab.module "INCLUDE">
+  <![%collab.module;[
+  <!ENTITY % local.collab.attrib "">
+  <!ENTITY % collab.role.attrib "%role.attrib;">
+
+<!ENTITY % collab.element "INCLUDE">
+<![%collab.element;[
+<!ELEMENT collab %ho; (collabname, affiliation*)>
+<!--end of collab.element-->]]>
+
+<!ENTITY % collab.attlist "INCLUDE">
+<![%collab.attlist;[
+<!ATTLIST collab
+		%common.attrib;
+		%collab.role.attrib;
+		%local.collab.attrib;
+>
+<!--end of collab.attlist-->]]>
+  <!--end of collab.module-->]]>
+
+    <!ENTITY % collabname.module "INCLUDE">
+  <![%collabname.module;[
+  <!ENTITY % local.collabname.attrib "">
+  <!ENTITY % collabname.role.attrib "%role.attrib;">
+
+<!ENTITY % collabname.element "INCLUDE">
+<![%collabname.element;[
+<!ELEMENT collabname %ho; (%docinfo.char.mix;)*>
+<!--end of collabname.element-->]]>
+
+<!ENTITY % collabname.attlist "INCLUDE">
+<![%collabname.attlist;[
+<!ATTLIST collabname
+		%common.attrib;
+		%collabname.role.attrib;
+		%local.collabname.attrib;
+>
+<!--end of collabname.attlist-->]]>
+    <!--end of collabname.module-->]]>
+
+    <!-- Affiliation (defined elsewhere in this section)-->
+  <!--end of collab.content.module-->]]>
+
+  <!-- CorpAuthor (defined elsewhere in this section)-->
+  <!-- OtherCredit (defined elsewhere in this section)-->
+
+<!--end of authorgroup.content.module-->]]>
+
+<!-- AuthorInitials ................... -->
+
+<!ENTITY % authorinitials.module "INCLUDE">
+<![%authorinitials.module;[
+<!ENTITY % local.authorinitials.attrib "">
+<!ENTITY % authorinitials.role.attrib "%role.attrib;">
+
+<!ENTITY % authorinitials.element "INCLUDE">
+<![%authorinitials.element;[
+<!ELEMENT authorinitials %ho; (%docinfo.char.mix;)*>
+<!--end of authorinitials.element-->]]>
+
+<!ENTITY % authorinitials.attlist "INCLUDE">
+<![%authorinitials.attlist;[
+<!ATTLIST authorinitials
+		%common.attrib;
+		%authorinitials.role.attrib;
+		%local.authorinitials.attrib;
+>
+<!--end of authorinitials.attlist-->]]>
+<!--end of authorinitials.module-->]]>
+
+<!-- ConfGroup ........................ -->
+
+<!ENTITY % confgroup.content.module "INCLUDE">
+<![%confgroup.content.module;[
+<!ENTITY % confgroup.module "INCLUDE">
+<![%confgroup.module;[
+<!ENTITY % local.confgroup.attrib "">
+<!ENTITY % confgroup.role.attrib "%role.attrib;">
+
+<!ENTITY % confgroup.element "INCLUDE">
+<![%confgroup.element;[
+<!ELEMENT confgroup %ho; ((confdates|conftitle|confnum|address|confsponsor)*)>
+<!--end of confgroup.element-->]]>
+
+<!ENTITY % confgroup.attlist "INCLUDE">
+<![%confgroup.attlist;[
+<!ATTLIST confgroup
+		%common.attrib;
+		%confgroup.role.attrib;
+		%local.confgroup.attrib;
+>
+<!--end of confgroup.attlist-->]]>
+<!--end of confgroup.module-->]]>
+
+  <!ENTITY % confdates.module "INCLUDE">
+  <![%confdates.module;[
+  <!ENTITY % local.confdates.attrib "">
+  <!ENTITY % confdates.role.attrib "%role.attrib;">
+
+<!ENTITY % confdates.element "INCLUDE">
+<![%confdates.element;[
+<!ELEMENT confdates %ho; (%docinfo.char.mix;)*>
+<!--end of confdates.element-->]]>
+
+<!ENTITY % confdates.attlist "INCLUDE">
+<![%confdates.attlist;[
+<!ATTLIST confdates
+		%common.attrib;
+		%confdates.role.attrib;
+		%local.confdates.attrib;
+>
+<!--end of confdates.attlist-->]]>
+  <!--end of confdates.module-->]]>
+
+  <!ENTITY % conftitle.module "INCLUDE">
+  <![%conftitle.module;[
+  <!ENTITY % local.conftitle.attrib "">
+  <!ENTITY % conftitle.role.attrib "%role.attrib;">
+
+<!ENTITY % conftitle.element "INCLUDE">
+<![%conftitle.element;[
+<!ELEMENT conftitle %ho; (%docinfo.char.mix;)*>
+<!--end of conftitle.element-->]]>
+
+<!ENTITY % conftitle.attlist "INCLUDE">
+<![%conftitle.attlist;[
+<!ATTLIST conftitle
+		%common.attrib;
+		%conftitle.role.attrib;
+		%local.conftitle.attrib;
+>
+<!--end of conftitle.attlist-->]]>
+  <!--end of conftitle.module-->]]>
+
+  <!ENTITY % confnum.module "INCLUDE">
+  <![%confnum.module;[
+  <!ENTITY % local.confnum.attrib "">
+  <!ENTITY % confnum.role.attrib "%role.attrib;">
+
+<!ENTITY % confnum.element "INCLUDE">
+<![%confnum.element;[
+<!ELEMENT confnum %ho; (%docinfo.char.mix;)*>
+<!--end of confnum.element-->]]>
+
+<!ENTITY % confnum.attlist "INCLUDE">
+<![%confnum.attlist;[
+<!ATTLIST confnum
+		%common.attrib;
+		%confnum.role.attrib;
+		%local.confnum.attrib;
+>
+<!--end of confnum.attlist-->]]>
+  <!--end of confnum.module-->]]>
+
+  <!-- Address (defined elsewhere in this section)-->
+
+  <!ENTITY % confsponsor.module "INCLUDE">
+  <![%confsponsor.module;[
+  <!ENTITY % local.confsponsor.attrib "">
+  <!ENTITY % confsponsor.role.attrib "%role.attrib;">
+
+<!ENTITY % confsponsor.element "INCLUDE">
+<![%confsponsor.element;[
+<!ELEMENT confsponsor %ho; (%docinfo.char.mix;)*>
+<!--end of confsponsor.element-->]]>
+
+<!ENTITY % confsponsor.attlist "INCLUDE">
+<![%confsponsor.attlist;[
+<!ATTLIST confsponsor
+		%common.attrib;
+		%confsponsor.role.attrib;
+		%local.confsponsor.attrib;
+>
+<!--end of confsponsor.attlist-->]]>
+  <!--end of confsponsor.module-->]]>
+<!--end of confgroup.content.module-->]]>
+
+<!-- ContractNum ...................... -->
+
+<!ENTITY % contractnum.module "INCLUDE">
+<![%contractnum.module;[
+<!ENTITY % local.contractnum.attrib "">
+<!ENTITY % contractnum.role.attrib "%role.attrib;">
+
+<!ENTITY % contractnum.element "INCLUDE">
+<![%contractnum.element;[
+<!ELEMENT contractnum %ho; (%docinfo.char.mix;)*>
+<!--end of contractnum.element-->]]>
+
+<!ENTITY % contractnum.attlist "INCLUDE">
+<![%contractnum.attlist;[
+<!ATTLIST contractnum
+		%common.attrib;
+		%contractnum.role.attrib;
+		%local.contractnum.attrib;
+>
+<!--end of contractnum.attlist-->]]>
+<!--end of contractnum.module-->]]>
+
+<!-- ContractSponsor .................. -->
+
+<!ENTITY % contractsponsor.module "INCLUDE">
+<![%contractsponsor.module;[
+<!ENTITY % local.contractsponsor.attrib "">
+<!ENTITY % contractsponsor.role.attrib "%role.attrib;">
+
+<!ENTITY % contractsponsor.element "INCLUDE">
+<![%contractsponsor.element;[
+<!ELEMENT contractsponsor %ho; (%docinfo.char.mix;)*>
+<!--end of contractsponsor.element-->]]>
+
+<!ENTITY % contractsponsor.attlist "INCLUDE">
+<![%contractsponsor.attlist;[
+<!ATTLIST contractsponsor
+		%common.attrib;
+		%contractsponsor.role.attrib;
+		%local.contractsponsor.attrib;
+>
+<!--end of contractsponsor.attlist-->]]>
+<!--end of contractsponsor.module-->]]>
+
+<!-- Copyright ........................ -->
+
+<!ENTITY % copyright.content.module "INCLUDE">
+<![%copyright.content.module;[
+<!ENTITY % copyright.module "INCLUDE">
+<![%copyright.module;[
+<!ENTITY % local.copyright.attrib "">
+<!ENTITY % copyright.role.attrib "%role.attrib;">
+
+<!ENTITY % copyright.element "INCLUDE">
+<![%copyright.element;[
+<!ELEMENT copyright %ho; (year+, holder*)>
+<!--end of copyright.element-->]]>
+
+<!ENTITY % copyright.attlist "INCLUDE">
+<![%copyright.attlist;[
+<!ATTLIST copyright
+		%common.attrib;
+		%copyright.role.attrib;
+		%local.copyright.attrib;
+>
+<!--end of copyright.attlist-->]]>
+<!--end of copyright.module-->]]>
+
+  <!ENTITY % year.module "INCLUDE">
+  <![%year.module;[
+  <!ENTITY % local.year.attrib "">
+  <!ENTITY % year.role.attrib "%role.attrib;">
+
+<!ENTITY % year.element "INCLUDE">
+<![%year.element;[
+<!ELEMENT year %ho; (%docinfo.char.mix;)*>
+<!--end of year.element-->]]>
+
+<!ENTITY % year.attlist "INCLUDE">
+<![%year.attlist;[
+<!ATTLIST year
+		%common.attrib;
+		%year.role.attrib;
+		%local.year.attrib;
+>
+<!--end of year.attlist-->]]>
+  <!--end of year.module-->]]>
+
+  <!ENTITY % holder.module "INCLUDE">
+  <![%holder.module;[
+  <!ENTITY % local.holder.attrib "">
+  <!ENTITY % holder.role.attrib "%role.attrib;">
+
+<!ENTITY % holder.element "INCLUDE">
+<![%holder.element;[
+<!ELEMENT holder %ho; (%docinfo.char.mix;)*>
+<!--end of holder.element-->]]>
+
+<!ENTITY % holder.attlist "INCLUDE">
+<![%holder.attlist;[
+<!ATTLIST holder
+		%common.attrib;
+		%holder.role.attrib;
+		%local.holder.attrib;
+>
+<!--end of holder.attlist-->]]>
+  <!--end of holder.module-->]]>
+<!--end of copyright.content.module-->]]>
+
+<!-- CorpAuthor ....................... -->
+
+<!ENTITY % corpauthor.module "INCLUDE">
+<![%corpauthor.module;[
+<!ENTITY % local.corpauthor.attrib "">
+<!ENTITY % corpauthor.role.attrib "%role.attrib;">
+
+<!ENTITY % corpauthor.element "INCLUDE">
+<![%corpauthor.element;[
+<!ELEMENT corpauthor %ho; (%docinfo.char.mix;)*>
+<!--end of corpauthor.element-->]]>
+
+<!ENTITY % corpauthor.attlist "INCLUDE">
+<![%corpauthor.attlist;[
+<!ATTLIST corpauthor
+		%common.attrib;
+		%corpauthor.role.attrib;
+		%local.corpauthor.attrib;
+>
+<!--end of corpauthor.attlist-->]]>
+<!--end of corpauthor.module-->]]>
+
+<!-- CorpCredit ...................... -->
+
+<!ENTITY % corpcredit.module "INCLUDE">
+<![%corpcredit.module;[
+<!ENTITY % local.corpcredit.attrib "">
+<!ENTITY % corpcredit.role.attrib "%role.attrib;">
+
+<!ENTITY % corpcredit.element "INCLUDE">
+<![%corpcredit.element;[
+<!ELEMENT corpcredit %ho; (%docinfo.char.mix;)*>
+<!--end of corpcredit.element-->]]>
+
+<!ENTITY % corpcredit.attlist "INCLUDE">
+<![%corpcredit.attlist;[
+<!ATTLIST corpcredit
+		class	(graphicdesigner
+			|productioneditor
+			|copyeditor
+			|technicaleditor
+			|translator
+			|other)			#IMPLIED
+		%common.attrib;
+		%corpcredit.role.attrib;
+		%local.corpcredit.attrib;
+>
+<!--end of corpcredit.attlist-->]]>
+<!--end of corpcredit.module-->]]>
+
+<!-- CorpName ......................... -->
+
+<!ENTITY % corpname.module "INCLUDE">
+<![%corpname.module;[
+<!ENTITY % local.corpname.attrib "">
+
+<!ENTITY % corpname.element "INCLUDE">
+<![%corpname.element;[
+<!ELEMENT corpname %ho; (%docinfo.char.mix;)*>
+<!--end of corpname.element-->]]>
+<!ENTITY % corpname.role.attrib "%role.attrib;">
+
+<!ENTITY % corpname.attlist "INCLUDE">
+<![%corpname.attlist;[
+<!ATTLIST corpname
+		%common.attrib;
+		%corpname.role.attrib;
+		%local.corpname.attrib;
+>
+<!--end of corpname.attlist-->]]>
+<!--end of corpname.module-->]]>
+
+<!-- Date ............................. -->
+
+<!ENTITY % date.module "INCLUDE">
+<![%date.module;[
+<!ENTITY % local.date.attrib "">
+<!ENTITY % date.role.attrib "%role.attrib;">
+
+<!ENTITY % date.element "INCLUDE">
+<![%date.element;[
+<!ELEMENT date %ho; (%docinfo.char.mix;)*>
+<!--end of date.element-->]]>
+
+<!ENTITY % date.attlist "INCLUDE">
+<![%date.attlist;[
+<!ATTLIST date
+		%common.attrib;
+		%date.role.attrib;
+		%local.date.attrib;
+>
+<!--end of date.attlist-->]]>
+<!--end of date.module-->]]>
+
+<!-- Edition .......................... -->
+
+<!ENTITY % edition.module "INCLUDE">
+<![%edition.module;[
+<!ENTITY % local.edition.attrib "">
+<!ENTITY % edition.role.attrib "%role.attrib;">
+
+<!ENTITY % edition.element "INCLUDE">
+<![%edition.element;[
+<!ELEMENT edition %ho; (%docinfo.char.mix;)*>
+<!--end of edition.element-->]]>
+
+<!ENTITY % edition.attlist "INCLUDE">
+<![%edition.attlist;[
+<!ATTLIST edition
+		%common.attrib;
+		%edition.role.attrib;
+		%local.edition.attrib;
+>
+<!--end of edition.attlist-->]]>
+<!--end of edition.module-->]]>
+
+<!-- Editor ........................... -->
+
+<!ENTITY % editor.module "INCLUDE">
+<![%editor.module;[
+<!ENTITY % local.editor.attrib "">
+<!ENTITY % editor.role.attrib "%role.attrib;">
+
+<!ENTITY % editor.element "INCLUDE">
+<![%editor.element;[
+<!ELEMENT editor %ho; ((personname|(%person.ident.mix;)+),(personblurb|email|address)*)>
+<!--end of editor.element-->]]>
+
+<!ENTITY % editor.attlist "INCLUDE">
+<![%editor.attlist;[
+<!ATTLIST editor
+		%common.attrib;
+		%editor.role.attrib;
+		%local.editor.attrib;
+>
+<!--end of editor.attlist-->]]>
+  <!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of editor.module-->]]>
+
+<!-- ISBN ............................. -->
+
+<!ENTITY % isbn.module "INCLUDE">
+<![%isbn.module;[
+<!ENTITY % local.isbn.attrib "">
+<!ENTITY % isbn.role.attrib "%role.attrib;">
+
+<!ENTITY % isbn.element "INCLUDE">
+<![%isbn.element;[
+<!ELEMENT isbn %ho; (%docinfo.char.mix;)*>
+<!--end of isbn.element-->]]>
+
+<!ENTITY % isbn.attlist "INCLUDE">
+<![%isbn.attlist;[
+<!ATTLIST isbn
+		%common.attrib;
+		%isbn.role.attrib;
+		%local.isbn.attrib;
+>
+<!--end of isbn.attlist-->]]>
+<!--end of isbn.module-->]]>
+
+<!-- ISSN ............................. -->
+
+<!ENTITY % issn.module "INCLUDE">
+<![%issn.module;[
+<!ENTITY % local.issn.attrib "">
+<!ENTITY % issn.role.attrib "%role.attrib;">
+
+<!ENTITY % issn.element "INCLUDE">
+<![%issn.element;[
+<!ELEMENT issn %ho; (%docinfo.char.mix;)*>
+<!--end of issn.element-->]]>
+
+<!ENTITY % issn.attlist "INCLUDE">
+<![%issn.attlist;[
+<!ATTLIST issn
+		%common.attrib;
+		%issn.role.attrib;
+		%local.issn.attrib;
+>
+<!--end of issn.attlist-->]]>
+<!--end of issn.module-->]]>
+
+<!-- BiblioId ................. -->
+<!ENTITY % biblio.class.attrib
+		"class	(uri
+                         |doi
+                         |isbn
+                         |issn
+                         |libraryofcongress
+                         |pubnumber
+                         |other)	#IMPLIED
+		otherclass	CDATA	#IMPLIED"
+>
+
+<!ENTITY % biblioid.module "INCLUDE">
+<![%biblioid.module;[
+<!ENTITY % local.biblioid.attrib "">
+<!ENTITY % biblioid.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioid.element "INCLUDE">
+<![%biblioid.element;[
+<!ELEMENT biblioid %ho; (%docinfo.char.mix;)*>
+<!--end of biblioid.element-->]]>
+
+<!ENTITY % biblioid.attlist "INCLUDE">
+<![%biblioid.attlist;[
+<!ATTLIST biblioid
+		%biblio.class.attrib;
+		%common.attrib;
+		%biblioid.role.attrib;
+		%local.biblioid.attrib;
+>
+<!--end of biblioid.attlist-->]]>
+<!--end of biblioid.module-->]]>
+
+<!-- CiteBiblioId ................. -->
+
+<!ENTITY % citebiblioid.module "INCLUDE">
+<![%citebiblioid.module;[
+<!ENTITY % local.citebiblioid.attrib "">
+<!ENTITY % citebiblioid.role.attrib "%role.attrib;">
+
+<!ENTITY % citebiblioid.element "INCLUDE">
+<![%citebiblioid.element;[
+<!ELEMENT citebiblioid %ho; (%docinfo.char.mix;)*>
+<!--end of citebiblioid.element-->]]>
+
+<!ENTITY % citebiblioid.attlist "INCLUDE">
+<![%citebiblioid.attlist;[
+<!ATTLIST citebiblioid
+		%biblio.class.attrib;
+		%common.attrib;
+		%citebiblioid.role.attrib;
+		%local.citebiblioid.attrib;
+>
+<!--end of citebiblioid.attlist-->]]>
+<!--end of citebiblioid.module-->]]>
+
+<!-- BiblioSource ................. -->
+
+<!ENTITY % bibliosource.module "INCLUDE">
+<![%bibliosource.module;[
+<!ENTITY % local.bibliosource.attrib "">
+<!ENTITY % bibliosource.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliosource.element "INCLUDE">
+<![%bibliosource.element;[
+<!ELEMENT bibliosource %ho; (%docinfo.char.mix;)*>
+<!--end of bibliosource.element-->]]>
+
+<!ENTITY % bibliosource.attlist "INCLUDE">
+<![%bibliosource.attlist;[
+<!ATTLIST bibliosource
+		%biblio.class.attrib;
+		%common.attrib;
+		%bibliosource.role.attrib;
+		%local.bibliosource.attrib;
+>
+<!--end of bibliosource.attlist-->]]>
+<!--end of bibliosource.module-->]]>
+
+<!-- BiblioRelation ................. -->
+
+<!ENTITY % bibliorelation.module "INCLUDE">
+<![%bibliorelation.module;[
+<!ENTITY % local.bibliorelation.attrib "">
+<!ENTITY % local.bibliorelation.types "">
+
+<!ENTITY % bibliorelation.type.attrib
+                "type    (isversionof
+                         |hasversion
+                         |isreplacedby
+                         |replaces
+                         |isrequiredby
+                         |requires
+                         |ispartof
+                         |haspart
+                         |isreferencedby
+                         |references
+                         |isformatof
+                         |hasformat
+                         |othertype
+                         %local.bibliorelation.types;)       #IMPLIED
+		othertype	CDATA	#IMPLIED
+">
+
+<!ENTITY % bibliorelation.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliorelation.element "INCLUDE">
+<![%bibliorelation.element;[
+<!ELEMENT bibliorelation %ho; (%docinfo.char.mix;)*>
+<!--end of bibliorelation.element-->]]>
+
+<!ENTITY % bibliorelation.attlist "INCLUDE">
+<![%bibliorelation.attlist;[
+<!ATTLIST bibliorelation
+		%biblio.class.attrib;
+		%bibliorelation.type.attrib;
+		%common.attrib;
+		%bibliorelation.role.attrib;
+		%local.bibliorelation.attrib;
+>
+<!--end of bibliorelation.attlist-->]]>
+<!--end of bibliorelation.module-->]]>
+
+<!-- BiblioCoverage ................. -->
+
+<!ENTITY % bibliocoverage.module "INCLUDE">
+<![%bibliocoverage.module;[
+<!ENTITY % local.bibliocoverage.attrib "">
+<!ENTITY % bibliocoverage.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliocoverage.element "INCLUDE">
+<![%bibliocoverage.element;[
+<!ELEMENT bibliocoverage %ho; (%docinfo.char.mix;)*>
+<!--end of bibliocoverage.element-->]]>
+
+<!ENTITY % bibliocoverage.attlist "INCLUDE">
+<![%bibliocoverage.attlist;[
+<!ATTLIST bibliocoverage
+		spatial	(dcmipoint|iso3166|dcmibox|tgn|otherspatial)	#IMPLIED
+		otherspatial	CDATA	#IMPLIED
+		temporal (dcmiperiod|w3c-dtf|othertemporal) #IMPLIED
+		othertemporal	CDATA	#IMPLIED
+		%common.attrib;
+		%bibliocoverage.role.attrib;
+		%local.bibliocoverage.attrib;
+>
+<!--end of bibliocoverage.attlist-->]]>
+<!--end of bibliocoverage.module-->]]>
+
+<!-- InvPartNumber .................... -->
+
+<!ENTITY % invpartnumber.module "INCLUDE">
+<![%invpartnumber.module;[
+<!ENTITY % local.invpartnumber.attrib "">
+<!ENTITY % invpartnumber.role.attrib "%role.attrib;">
+
+<!ENTITY % invpartnumber.element "INCLUDE">
+<![%invpartnumber.element;[
+<!ELEMENT invpartnumber %ho; (%docinfo.char.mix;)*>
+<!--end of invpartnumber.element-->]]>
+
+<!ENTITY % invpartnumber.attlist "INCLUDE">
+<![%invpartnumber.attlist;[
+<!ATTLIST invpartnumber
+		%common.attrib;
+		%invpartnumber.role.attrib;
+		%local.invpartnumber.attrib;
+>
+<!--end of invpartnumber.attlist-->]]>
+<!--end of invpartnumber.module-->]]>
+
+<!-- IssueNum ......................... -->
+
+<!ENTITY % issuenum.module "INCLUDE">
+<![%issuenum.module;[
+<!ENTITY % local.issuenum.attrib "">
+<!ENTITY % issuenum.role.attrib "%role.attrib;">
+
+<!ENTITY % issuenum.element "INCLUDE">
+<![%issuenum.element;[
+<!ELEMENT issuenum %ho; (%docinfo.char.mix;)*>
+<!--end of issuenum.element-->]]>
+
+<!ENTITY % issuenum.attlist "INCLUDE">
+<![%issuenum.attlist;[
+<!ATTLIST issuenum
+		%common.attrib;
+		%issuenum.role.attrib;
+		%local.issuenum.attrib;
+>
+<!--end of issuenum.attlist-->]]>
+<!--end of issuenum.module-->]]>
+
+<!-- LegalNotice ...................... -->
+
+<!ENTITY % legalnotice.module "INCLUDE">
+<![%legalnotice.module;[
+<!ENTITY % local.legalnotice.attrib "">
+<!ENTITY % legalnotice.role.attrib "%role.attrib;">
+
+<!ENTITY % legalnotice.element "INCLUDE">
+<![%legalnotice.element;[
+<!ELEMENT legalnotice %ho; (blockinfo?, title?, (%legalnotice.mix;)+)
+		%formal.exclusion;>
+<!--end of legalnotice.element-->]]>
+
+<!ENTITY % legalnotice.attlist "INCLUDE">
+<![%legalnotice.attlist;[
+<!ATTLIST legalnotice
+		%common.attrib;
+		%legalnotice.role.attrib;
+		%local.legalnotice.attrib;
+>
+<!--end of legalnotice.attlist-->]]>
+<!--end of legalnotice.module-->]]>
+
+<!-- ModeSpec ......................... -->
+
+<!ENTITY % modespec.module "INCLUDE">
+<![%modespec.module;[
+<!ENTITY % local.modespec.attrib "">
+<!ENTITY % modespec.role.attrib "%role.attrib;">
+
+<!ENTITY % modespec.element "INCLUDE">
+<![%modespec.element;[
+<!ELEMENT modespec %ho; (%docinfo.char.mix;)*
+		%ubiq.exclusion;>
+<!--end of modespec.element-->]]>
+
+<!-- Application: Type of action required for completion
+		of the links to which the ModeSpec is relevant (e.g.,
+		retrieval query) -->
+
+
+<!ENTITY % modespec.attlist "INCLUDE">
+<![%modespec.attlist;[
+<!ATTLIST modespec
+		application	NOTATION
+				(%notation.class;)	#IMPLIED
+		%common.attrib;
+		%modespec.role.attrib;
+		%local.modespec.attrib;
+>
+<!--end of modespec.attlist-->]]>
+<!--end of modespec.module-->]]>
+
+<!-- OrgName .......................... -->
+
+<!ENTITY % orgname.module "INCLUDE">
+<![%orgname.module;[
+<!ENTITY % local.orgname.attrib "">
+<!ENTITY % orgname.role.attrib "%role.attrib;">
+
+<!ENTITY % orgname.element "INCLUDE">
+<![%orgname.element;[
+<!ELEMENT orgname %ho; (%docinfo.char.mix;)*>
+<!--end of orgname.element-->]]>
+
+<!ENTITY % orgname.attlist "INCLUDE">
+<![%orgname.attlist;[
+<!ATTLIST orgname
+		%common.attrib;
+		class	(corporation|nonprofit|consortium|informal|other)	#IMPLIED
+		otherclass	CDATA			#IMPLIED
+		%orgname.role.attrib;
+		%local.orgname.attrib;
+>
+<!--end of orgname.attlist-->]]>
+<!--end of orgname.module-->]]>
+
+<!-- OtherCredit ...................... -->
+
+<!ENTITY % othercredit.module "INCLUDE">
+<![%othercredit.module;[
+<!ENTITY % local.othercredit.attrib "">
+<!ENTITY % othercredit.role.attrib "%role.attrib;">
+
+<!ENTITY % othercredit.element "INCLUDE">
+<![%othercredit.element;[
+<!ELEMENT othercredit %ho; ((personname|(%person.ident.mix;)+),
+                            (personblurb|email|address)*)>
+<!--end of othercredit.element-->]]>
+
+<!ENTITY % othercredit.attlist "INCLUDE">
+<![%othercredit.attlist;[
+<!ATTLIST othercredit
+		class	(graphicdesigner
+			|productioneditor
+			|copyeditor
+			|technicaleditor
+			|translator
+			|other)			#IMPLIED
+		%common.attrib;
+		%othercredit.role.attrib;
+		%local.othercredit.attrib;
+>
+<!--end of othercredit.attlist-->]]>
+  <!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of othercredit.module-->]]>
+
+<!-- PageNums ......................... -->
+
+<!ENTITY % pagenums.module "INCLUDE">
+<![%pagenums.module;[
+<!ENTITY % local.pagenums.attrib "">
+<!ENTITY % pagenums.role.attrib "%role.attrib;">
+
+<!ENTITY % pagenums.element "INCLUDE">
+<![%pagenums.element;[
+<!ELEMENT pagenums %ho; (%docinfo.char.mix;)*>
+<!--end of pagenums.element-->]]>
+
+<!ENTITY % pagenums.attlist "INCLUDE">
+<![%pagenums.attlist;[
+<!ATTLIST pagenums
+		%common.attrib;
+		%pagenums.role.attrib;
+		%local.pagenums.attrib;
+>
+<!--end of pagenums.attlist-->]]>
+<!--end of pagenums.module-->]]>
+
+<!-- Personal identity elements ....... -->
+
+<!-- These elements are used only within Author, Editor, and
+OtherCredit. -->
+
+<!ENTITY % person.ident.module "INCLUDE">
+<![%person.ident.module;[
+  <!ENTITY % contrib.module "INCLUDE">
+  <![%contrib.module;[
+  <!ENTITY % local.contrib.attrib "">
+  <!ENTITY % contrib.role.attrib "%role.attrib;">
+
+<!ENTITY % contrib.element "INCLUDE">
+<![%contrib.element;[
+<!ELEMENT contrib %ho; (%docinfo.char.mix;)*>
+<!--end of contrib.element-->]]>
+
+<!ENTITY % contrib.attlist "INCLUDE">
+<![%contrib.attlist;[
+<!ATTLIST contrib
+		%common.attrib;
+		%contrib.role.attrib;
+		%local.contrib.attrib;
+>
+<!--end of contrib.attlist-->]]>
+  <!--end of contrib.module-->]]>
+
+  <!ENTITY % firstname.module "INCLUDE">
+  <![%firstname.module;[
+  <!ENTITY % local.firstname.attrib "">
+  <!ENTITY % firstname.role.attrib "%role.attrib;">
+
+<!ENTITY % firstname.element "INCLUDE">
+<![%firstname.element;[
+<!ELEMENT firstname %ho; (%docinfo.char.mix;)*>
+<!--end of firstname.element-->]]>
+
+<!ENTITY % firstname.attlist "INCLUDE">
+<![%firstname.attlist;[
+<!ATTLIST firstname
+		%common.attrib;
+		%firstname.role.attrib;
+		%local.firstname.attrib;
+>
+<!--end of firstname.attlist-->]]>
+  <!--end of firstname.module-->]]>
+
+  <!ENTITY % honorific.module "INCLUDE">
+  <![%honorific.module;[
+  <!ENTITY % local.honorific.attrib "">
+  <!ENTITY % honorific.role.attrib "%role.attrib;">
+
+<!ENTITY % honorific.element "INCLUDE">
+<![%honorific.element;[
+<!ELEMENT honorific %ho; (%docinfo.char.mix;)*>
+<!--end of honorific.element-->]]>
+
+<!ENTITY % honorific.attlist "INCLUDE">
+<![%honorific.attlist;[
+<!ATTLIST honorific
+		%common.attrib;
+		%honorific.role.attrib;
+		%local.honorific.attrib;
+>
+<!--end of honorific.attlist-->]]>
+  <!--end of honorific.module-->]]>
+
+  <!ENTITY % lineage.module "INCLUDE">
+  <![%lineage.module;[
+  <!ENTITY % local.lineage.attrib "">
+  <!ENTITY % lineage.role.attrib "%role.attrib;">
+
+<!ENTITY % lineage.element "INCLUDE">
+<![%lineage.element;[
+<!ELEMENT lineage %ho; (%docinfo.char.mix;)*>
+<!--end of lineage.element-->]]>
+
+<!ENTITY % lineage.attlist "INCLUDE">
+<![%lineage.attlist;[
+<!ATTLIST lineage
+		%common.attrib;
+		%lineage.role.attrib;
+		%local.lineage.attrib;
+>
+<!--end of lineage.attlist-->]]>
+  <!--end of lineage.module-->]]>
+
+  <!ENTITY % othername.module "INCLUDE">
+  <![%othername.module;[
+  <!ENTITY % local.othername.attrib "">
+  <!ENTITY % othername.role.attrib "%role.attrib;">
+
+<!ENTITY % othername.element "INCLUDE">
+<![%othername.element;[
+<!ELEMENT othername %ho; (%docinfo.char.mix;)*>
+<!--end of othername.element-->]]>
+
+<!ENTITY % othername.attlist "INCLUDE">
+<![%othername.attlist;[
+<!ATTLIST othername
+		%common.attrib;
+		%othername.role.attrib;
+		%local.othername.attrib;
+>
+<!--end of othername.attlist-->]]>
+  <!--end of othername.module-->]]>
+
+  <!ENTITY % surname.module "INCLUDE">
+  <![%surname.module;[
+  <!ENTITY % local.surname.attrib "">
+  <!ENTITY % surname.role.attrib "%role.attrib;">
+
+<!ENTITY % surname.element "INCLUDE">
+<![%surname.element;[
+<!ELEMENT surname %ho; (%docinfo.char.mix;)*>
+<!--end of surname.element-->]]>
+
+<!ENTITY % surname.attlist "INCLUDE">
+<![%surname.attlist;[
+<!ATTLIST surname
+		%common.attrib;
+		%surname.role.attrib;
+		%local.surname.attrib;
+>
+<!--end of surname.attlist-->]]>
+  <!--end of surname.module-->]]>
+<!--end of person.ident.module-->]]>
+
+<!-- PrintHistory ..................... -->
+
+<!ENTITY % printhistory.module "INCLUDE">
+<![%printhistory.module;[
+<!ENTITY % local.printhistory.attrib "">
+<!ENTITY % printhistory.role.attrib "%role.attrib;">
+
+<!ENTITY % printhistory.element "INCLUDE">
+<![%printhistory.element;[
+<!ELEMENT printhistory %ho; ((%para.class;)+)>
+<!--end of printhistory.element-->]]>
+
+<!ENTITY % printhistory.attlist "INCLUDE">
+<![%printhistory.attlist;[
+<!ATTLIST printhistory
+		%common.attrib;
+		%printhistory.role.attrib;
+		%local.printhistory.attrib;
+>
+<!--end of printhistory.attlist-->]]>
+<!--end of printhistory.module-->]]>
+
+<!-- ProductName ...................... -->
+
+<!ENTITY % productname.module "INCLUDE">
+<![%productname.module;[
+<!ENTITY % local.productname.attrib "">
+<!ENTITY % productname.role.attrib "%role.attrib;">
+
+<!ENTITY % productname.element "INCLUDE">
+<![%productname.element;[
+<!ELEMENT productname %ho; (%para.char.mix;)*>
+<!--end of productname.element-->]]>
+
+<!-- Class: More precisely identifies the item the element names -->
+
+
+<!ENTITY % productname.attlist "INCLUDE">
+<![%productname.attlist;[
+<!ATTLIST productname
+		class		(service
+				|trade
+				|registered
+				|copyright)	'trade'
+		%common.attrib;
+		%productname.role.attrib;
+		%local.productname.attrib;
+>
+<!--end of productname.attlist-->]]>
+<!--end of productname.module-->]]>
+
+<!-- ProductNumber .................... -->
+
+<!ENTITY % productnumber.module "INCLUDE">
+<![%productnumber.module;[
+<!ENTITY % local.productnumber.attrib "">
+<!ENTITY % productnumber.role.attrib "%role.attrib;">
+
+<!ENTITY % productnumber.element "INCLUDE">
+<![%productnumber.element;[
+<!ELEMENT productnumber %ho; (%docinfo.char.mix;)*>
+<!--end of productnumber.element-->]]>
+
+<!ENTITY % productnumber.attlist "INCLUDE">
+<![%productnumber.attlist;[
+<!ATTLIST productnumber
+		%common.attrib;
+		%productnumber.role.attrib;
+		%local.productnumber.attrib;
+>
+<!--end of productnumber.attlist-->]]>
+<!--end of productnumber.module-->]]>
+
+<!-- PubDate .......................... -->
+
+<!ENTITY % pubdate.module "INCLUDE">
+<![%pubdate.module;[
+<!ENTITY % local.pubdate.attrib "">
+<!ENTITY % pubdate.role.attrib "%role.attrib;">
+
+<!ENTITY % pubdate.element "INCLUDE">
+<![%pubdate.element;[
+<!ELEMENT pubdate %ho; (%docinfo.char.mix;)*>
+<!--end of pubdate.element-->]]>
+
+<!ENTITY % pubdate.attlist "INCLUDE">
+<![%pubdate.attlist;[
+<!ATTLIST pubdate
+		%common.attrib;
+		%pubdate.role.attrib;
+		%local.pubdate.attrib;
+>
+<!--end of pubdate.attlist-->]]>
+<!--end of pubdate.module-->]]>
+
+<!-- Publisher ........................ -->
+
+<!ENTITY % publisher.content.module "INCLUDE">
+<![%publisher.content.module;[
+<!ENTITY % publisher.module "INCLUDE">
+<![%publisher.module;[
+<!ENTITY % local.publisher.attrib "">
+<!ENTITY % publisher.role.attrib "%role.attrib;">
+
+<!ENTITY % publisher.element "INCLUDE">
+<![%publisher.element;[
+<!ELEMENT publisher %ho; (publishername, address*)>
+<!--end of publisher.element-->]]>
+
+<!ENTITY % publisher.attlist "INCLUDE">
+<![%publisher.attlist;[
+<!ATTLIST publisher
+		%common.attrib;
+		%publisher.role.attrib;
+		%local.publisher.attrib;
+>
+<!--end of publisher.attlist-->]]>
+<!--end of publisher.module-->]]>
+
+  <!ENTITY % publishername.module "INCLUDE">
+  <![%publishername.module;[
+  <!ENTITY % local.publishername.attrib "">
+  <!ENTITY % publishername.role.attrib "%role.attrib;">
+
+<!ENTITY % publishername.element "INCLUDE">
+<![%publishername.element;[
+<!ELEMENT publishername %ho; (%docinfo.char.mix;)*>
+<!--end of publishername.element-->]]>
+
+<!ENTITY % publishername.attlist "INCLUDE">
+<![%publishername.attlist;[
+<!ATTLIST publishername
+		%common.attrib;
+		%publishername.role.attrib;
+		%local.publishername.attrib;
+>
+<!--end of publishername.attlist-->]]>
+  <!--end of publishername.module-->]]>
+
+  <!-- Address (defined elsewhere in this section)-->
+<!--end of publisher.content.module-->]]>
+
+<!-- PubsNumber ....................... -->
+
+<!ENTITY % pubsnumber.module "INCLUDE">
+<![%pubsnumber.module;[
+<!ENTITY % local.pubsnumber.attrib "">
+<!ENTITY % pubsnumber.role.attrib "%role.attrib;">
+
+<!ENTITY % pubsnumber.element "INCLUDE">
+<![%pubsnumber.element;[
+<!ELEMENT pubsnumber %ho; (%docinfo.char.mix;)*>
+<!--end of pubsnumber.element-->]]>
+
+<!ENTITY % pubsnumber.attlist "INCLUDE">
+<![%pubsnumber.attlist;[
+<!ATTLIST pubsnumber
+		%common.attrib;
+		%pubsnumber.role.attrib;
+		%local.pubsnumber.attrib;
+>
+<!--end of pubsnumber.attlist-->]]>
+<!--end of pubsnumber.module-->]]>
+
+<!-- ReleaseInfo ...................... -->
+
+<!ENTITY % releaseinfo.module "INCLUDE">
+<![%releaseinfo.module;[
+<!ENTITY % local.releaseinfo.attrib "">
+<!ENTITY % releaseinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % releaseinfo.element "INCLUDE">
+<![%releaseinfo.element;[
+<!ELEMENT releaseinfo %ho; (%docinfo.char.mix;)*>
+<!--end of releaseinfo.element-->]]>
+
+<!ENTITY % releaseinfo.attlist "INCLUDE">
+<![%releaseinfo.attlist;[
+<!ATTLIST releaseinfo
+		%common.attrib;
+		%releaseinfo.role.attrib;
+		%local.releaseinfo.attrib;
+>
+<!--end of releaseinfo.attlist-->]]>
+<!--end of releaseinfo.module-->]]>
+
+<!-- RevHistory ....................... -->
+
+<!ENTITY % revhistory.content.module "INCLUDE">
+<![%revhistory.content.module;[
+<!ENTITY % revhistory.module "INCLUDE">
+<![%revhistory.module;[
+<!ENTITY % local.revhistory.attrib "">
+<!ENTITY % revhistory.role.attrib "%role.attrib;">
+
+<!ENTITY % revhistory.element "INCLUDE">
+<![%revhistory.element;[
+<!ELEMENT revhistory %ho; (revision+)>
+<!--end of revhistory.element-->]]>
+
+<!ENTITY % revhistory.attlist "INCLUDE">
+<![%revhistory.attlist;[
+<!ATTLIST revhistory
+		%common.attrib;
+		%revhistory.role.attrib;
+		%local.revhistory.attrib;
+>
+<!--end of revhistory.attlist-->]]>
+<!--end of revhistory.module-->]]>
+
+<!ENTITY % revision.module "INCLUDE">
+<![%revision.module;[
+<!ENTITY % local.revision.attrib "">
+<!ENTITY % revision.role.attrib "%role.attrib;">
+
+<!ENTITY % revision.element "INCLUDE">
+<![%revision.element;[
+<!ELEMENT revision %ho; (revnumber, date, (author|authorinitials)*,
+                    (revremark|revdescription)?)>
+<!--end of revision.element-->]]>
+
+<!ENTITY % revision.attlist "INCLUDE">
+<![%revision.attlist;[
+<!ATTLIST revision
+		%common.attrib;
+		%revision.role.attrib;
+		%local.revision.attrib;
+>
+<!--end of revision.attlist-->]]>
+<!--end of revision.module-->]]>
+
+<!ENTITY % revnumber.module "INCLUDE">
+<![%revnumber.module;[
+<!ENTITY % local.revnumber.attrib "">
+<!ENTITY % revnumber.role.attrib "%role.attrib;">
+
+<!ENTITY % revnumber.element "INCLUDE">
+<![%revnumber.element;[
+<!ELEMENT revnumber %ho; (%docinfo.char.mix;)*>
+<!--end of revnumber.element-->]]>
+
+<!ENTITY % revnumber.attlist "INCLUDE">
+<![%revnumber.attlist;[
+<!ATTLIST revnumber
+		%common.attrib;
+		%revnumber.role.attrib;
+		%local.revnumber.attrib;
+>
+<!--end of revnumber.attlist-->]]>
+<!--end of revnumber.module-->]]>
+
+<!-- Date (defined elsewhere in this section)-->
+<!-- AuthorInitials (defined elsewhere in this section)-->
+
+<!ENTITY % revremark.module "INCLUDE">
+<![%revremark.module;[
+<!ENTITY % local.revremark.attrib "">
+<!ENTITY % revremark.role.attrib "%role.attrib;">
+
+<!ENTITY % revremark.element "INCLUDE">
+<![%revremark.element;[
+<!ELEMENT revremark %ho; (%docinfo.char.mix;)*>
+<!--end of revremark.element-->]]>
+
+<!ENTITY % revremark.attlist "INCLUDE">
+<![%revremark.attlist;[
+<!ATTLIST revremark
+		%common.attrib;
+		%revremark.role.attrib;
+		%local.revremark.attrib;
+>
+<!--end of revremark.attlist-->]]>
+<!--end of revremark.module-->]]>
+
+<!ENTITY % revdescription.module "INCLUDE">
+<![ %revdescription.module; [
+<!ENTITY % local.revdescription.attrib "">
+<!ENTITY % revdescription.role.attrib "%role.attrib;">
+
+<!ENTITY % revdescription.element "INCLUDE">
+<![ %revdescription.element; [
+<!ELEMENT revdescription %ho; ((%revdescription.mix;)+)>
+<!--end of revdescription.element-->]]>
+
+<!ENTITY % revdescription.attlist "INCLUDE">
+<![ %revdescription.attlist; [
+<!ATTLIST revdescription
+		%common.attrib;
+		%revdescription.role.attrib;
+		%local.revdescription.attrib;
+>
+<!--end of revdescription.attlist-->]]>
+<!--end of revdescription.module-->]]>
+<!--end of revhistory.content.module-->]]>
+
+<!-- SeriesVolNums .................... -->
+
+<!ENTITY % seriesvolnums.module "INCLUDE">
+<![%seriesvolnums.module;[
+<!ENTITY % local.seriesvolnums.attrib "">
+<!ENTITY % seriesvolnums.role.attrib "%role.attrib;">
+
+<!ENTITY % seriesvolnums.element "INCLUDE">
+<![%seriesvolnums.element;[
+<!ELEMENT seriesvolnums %ho; (%docinfo.char.mix;)*>
+<!--end of seriesvolnums.element-->]]>
+
+<!ENTITY % seriesvolnums.attlist "INCLUDE">
+<![%seriesvolnums.attlist;[
+<!ATTLIST seriesvolnums
+		%common.attrib;
+		%seriesvolnums.role.attrib;
+		%local.seriesvolnums.attrib;
+>
+<!--end of seriesvolnums.attlist-->]]>
+<!--end of seriesvolnums.module-->]]>
+
+<!-- VolumeNum ........................ -->
+
+<!ENTITY % volumenum.module "INCLUDE">
+<![%volumenum.module;[
+<!ENTITY % local.volumenum.attrib "">
+<!ENTITY % volumenum.role.attrib "%role.attrib;">
+
+<!ENTITY % volumenum.element "INCLUDE">
+<![%volumenum.element;[
+<!ELEMENT volumenum %ho; (%docinfo.char.mix;)*>
+<!--end of volumenum.element-->]]>
+
+<!ENTITY % volumenum.attlist "INCLUDE">
+<![%volumenum.attlist;[
+<!ATTLIST volumenum
+		%common.attrib;
+		%volumenum.role.attrib;
+		%local.volumenum.attrib;
+>
+<!--end of volumenum.attlist-->]]>
+<!--end of volumenum.module-->]]>
+
+<!-- .................................. -->
+
+<!--end of docinfo.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Inline, link, and ubiquitous elements ................................ -->
+
+<!-- Technical and computer terms ......................................... -->
+
+<!ENTITY % accel.module "INCLUDE">
+<![%accel.module;[
+<!ENTITY % local.accel.attrib "">
+<!ENTITY % accel.role.attrib "%role.attrib;">
+
+<!ENTITY % accel.element "INCLUDE">
+<![%accel.element;[
+<!ELEMENT accel %ho; (%smallcptr.char.mix;)*>
+<!--end of accel.element-->]]>
+
+<!ENTITY % accel.attlist "INCLUDE">
+<![%accel.attlist;[
+<!ATTLIST accel
+		%common.attrib;
+		%accel.role.attrib;
+		%local.accel.attrib;
+>
+<!--end of accel.attlist-->]]>
+<!--end of accel.module-->]]>
+
+<!ENTITY % action.module "INCLUDE">
+<![%action.module;[
+<!ENTITY % local.action.attrib "">
+<!ENTITY % action.role.attrib "%role.attrib;">
+
+<!ENTITY % action.element "INCLUDE">
+<![%action.element;[
+<!ELEMENT action %ho; (%cptr.char.mix;)*>
+<!--end of action.element-->]]>
+
+<!ENTITY % action.attlist "INCLUDE">
+<![%action.attlist;[
+<!ATTLIST action
+		%moreinfo.attrib;
+		%common.attrib;
+		%action.role.attrib;
+		%local.action.attrib;
+>
+<!--end of action.attlist-->]]>
+<!--end of action.module-->]]>
+
+<!ENTITY % application.module "INCLUDE">
+<![%application.module;[
+<!ENTITY % local.application.attrib "">
+<!ENTITY % application.role.attrib "%role.attrib;">
+
+<!ENTITY % application.element "INCLUDE">
+<![%application.element;[
+<!ELEMENT application %ho; (%para.char.mix;)*>
+<!--end of application.element-->]]>
+
+<!ENTITY % application.attlist "INCLUDE">
+<![%application.attlist;[
+<!ATTLIST application
+		class 		(hardware
+				|software)	#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%application.role.attrib;
+		%local.application.attrib;
+>
+<!--end of application.attlist-->]]>
+<!--end of application.module-->]]>
+
+<!ENTITY % classname.module "INCLUDE">
+<![%classname.module;[
+<!ENTITY % local.classname.attrib "">
+<!ENTITY % classname.role.attrib "%role.attrib;">
+
+<!ENTITY % classname.element "INCLUDE">
+<![%classname.element;[
+<!ELEMENT classname %ho; (%smallcptr.char.mix;)*>
+<!--end of classname.element-->]]>
+
+<!ENTITY % classname.attlist "INCLUDE">
+<![%classname.attlist;[
+<!ATTLIST classname
+		%common.attrib;
+		%classname.role.attrib;
+		%local.classname.attrib;
+>
+<!--end of classname.attlist-->]]>
+<!--end of classname.module-->]]>
+
+<!ENTITY % package.module "INCLUDE">
+<![%package.module;[
+<!ENTITY % local.package.attrib "">
+<!ENTITY % package.role.attrib "%role.attrib;">
+
+<!ENTITY % package.element "INCLUDE">
+<![%package.element;[
+<!ELEMENT package %ho; (%smallcptr.char.mix;)*>
+<!--end of package.element-->]]>
+
+<!ENTITY % package.attlist "INCLUDE">
+<![%package.attlist;[
+<!ATTLIST package
+		%common.attrib;
+		%package.role.attrib;
+		%local.package.attrib;
+>
+<!--end of package.attlist-->]]>
+<!--end of package.module-->]]>
+
+<!ENTITY % co.module "INCLUDE">
+<![%co.module;[
+<!ENTITY % local.co.attrib "">
+<!-- CO is a callout area of the LineColumn unit type (a single character
+     position); the position is directly indicated by the location of CO. -->
+<!ENTITY % co.role.attrib "%role.attrib;">
+
+<!ENTITY % co.element "INCLUDE">
+<![%co.element;[
+<!ELEMENT co %ho; EMPTY>
+<!--end of co.element-->]]>
+
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+
+
+<!ENTITY % co.attlist "INCLUDE">
+<![%co.attlist;[
+<!ATTLIST co
+		%label.attrib;
+		%linkends.attrib;
+		%idreq.common.attrib;
+		%co.role.attrib;
+		%local.co.attrib;
+>
+<!--end of co.attlist-->]]>
+<!--end of co.module-->]]>
+
+<!ENTITY % coref.module "INCLUDE">
+<![%coref.module;[
+<!ENTITY % local.coref.attrib "">
+<!-- COREF is a reference to a CO -->
+<!ENTITY % coref.role.attrib "%role.attrib;">
+
+<!ENTITY % coref.element "INCLUDE">
+<![%coref.element;[
+<!ELEMENT coref %ho; EMPTY>
+<!--end of coref.element-->]]>
+
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+
+<!ENTITY % coref.attlist "INCLUDE">
+<![%coref.attlist;[
+<!ATTLIST coref
+		%label.attrib;
+		%linkendreq.attrib;
+		%common.attrib;
+		%coref.role.attrib;
+		%local.coref.attrib;
+>
+<!--end of coref.attlist-->]]>
+<!--end of coref.module-->]]>
+
+<!ENTITY % command.module "INCLUDE">
+<![%command.module;[
+<!ENTITY % local.command.attrib "">
+<!ENTITY % command.role.attrib "%role.attrib;">
+
+<!ENTITY % command.element "INCLUDE">
+<![%command.element;[
+<!ELEMENT command %ho; (%cptr.char.mix;)*>
+<!--end of command.element-->]]>
+
+<!ENTITY % command.attlist "INCLUDE">
+<![%command.attlist;[
+<!ATTLIST command
+		%moreinfo.attrib;
+		%common.attrib;
+		%command.role.attrib;
+		%local.command.attrib;
+>
+<!--end of command.attlist-->]]>
+<!--end of command.module-->]]>
+
+<!ENTITY % computeroutput.module "INCLUDE">
+<![%computeroutput.module;[
+<!ENTITY % local.computeroutput.attrib "">
+<!ENTITY % computeroutput.role.attrib "%role.attrib;">
+
+<!ENTITY % computeroutput.element "INCLUDE">
+<![%computeroutput.element;[
+<!ELEMENT computeroutput %ho; (%cptr.char.mix;|co)*>
+<!--end of computeroutput.element-->]]>
+
+<!ENTITY % computeroutput.attlist "INCLUDE">
+<![%computeroutput.attlist;[
+<!ATTLIST computeroutput
+		%moreinfo.attrib;
+		%common.attrib;
+		%computeroutput.role.attrib;
+		%local.computeroutput.attrib;
+>
+<!--end of computeroutput.attlist-->]]>
+<!--end of computeroutput.module-->]]>
+
+<!ENTITY % database.module "INCLUDE">
+<![%database.module;[
+<!ENTITY % local.database.attrib "">
+<!ENTITY % database.role.attrib "%role.attrib;">
+
+<!ENTITY % database.element "INCLUDE">
+<![%database.element;[
+<!ELEMENT database %ho; (%cptr.char.mix;)*>
+<!--end of database.element-->]]>
+
+<!-- Class: Type of database the element names; no default -->
+
+
+<!ENTITY % database.attlist "INCLUDE">
+<![%database.attlist;[
+<!ATTLIST database
+		class 		(name
+				|table
+				|field
+				|key1
+				|key2
+				|record
+                                |index
+                                |view
+                                |primarykey
+                                |secondarykey
+                                |foreignkey
+                                |altkey
+                                |procedure
+                                |datatype
+                                |constraint
+                                |rule
+                                |user
+                                |group)	#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%database.role.attrib;
+		%local.database.attrib;
+>
+<!--end of database.attlist-->]]>
+<!--end of database.module-->]]>
+
+<!ENTITY % email.module "INCLUDE">
+<![%email.module;[
+<!ENTITY % local.email.attrib "">
+<!ENTITY % email.role.attrib "%role.attrib;">
+
+<!ENTITY % email.element "INCLUDE">
+<![%email.element;[
+<!ELEMENT email %ho; (%docinfo.char.mix;)*>
+<!--end of email.element-->]]>
+
+<!ENTITY % email.attlist "INCLUDE">
+<![%email.attlist;[
+<!ATTLIST email
+		%common.attrib;
+		%email.role.attrib;
+		%local.email.attrib;
+>
+<!--end of email.attlist-->]]>
+<!--end of email.module-->]]>
+
+<!ENTITY % envar.module "INCLUDE">
+<![%envar.module;[
+<!ENTITY % local.envar.attrib "">
+<!ENTITY % envar.role.attrib "%role.attrib;">
+
+<!ENTITY % envar.element "INCLUDE">
+<![%envar.element;[
+<!ELEMENT envar %ho; (%smallcptr.char.mix;)*>
+<!--end of envar.element-->]]>
+
+<!ENTITY % envar.attlist "INCLUDE">
+<![%envar.attlist;[
+<!ATTLIST envar
+		%common.attrib;
+		%envar.role.attrib;
+		%local.envar.attrib;
+>
+<!--end of envar.attlist-->]]>
+<!--end of envar.module-->]]>
+
+
+<!ENTITY % errorcode.module "INCLUDE">
+<![%errorcode.module;[
+<!ENTITY % local.errorcode.attrib "">
+<!ENTITY % errorcode.role.attrib "%role.attrib;">
+
+<!ENTITY % errorcode.element "INCLUDE">
+<![%errorcode.element;[
+<!ELEMENT errorcode %ho; (%smallcptr.char.mix;)*>
+<!--end of errorcode.element-->]]>
+
+<!ENTITY % errorcode.attlist "INCLUDE">
+<![%errorcode.attlist;[
+<!ATTLIST errorcode
+		%moreinfo.attrib;
+		%common.attrib;
+		%errorcode.role.attrib;
+		%local.errorcode.attrib;
+>
+<!--end of errorcode.attlist-->]]>
+<!--end of errorcode.module-->]]>
+
+<!ENTITY % errorname.module "INCLUDE">
+<![%errorname.module;[
+<!ENTITY % local.errorname.attrib "">
+<!ENTITY % errorname.role.attrib "%role.attrib;">
+
+<!ENTITY % errorname.element "INCLUDE">
+<![%errorname.element;[
+<!ELEMENT errorname %ho; (%smallcptr.char.mix;)*>
+<!--end of errorname.element-->]]>
+
+<!ENTITY % errorname.attlist "INCLUDE">
+<![%errorname.attlist;[
+<!ATTLIST errorname
+		%common.attrib;
+		%errorname.role.attrib;
+		%local.errorname.attrib;
+>
+<!--end of errorname.attlist-->]]>
+<!--end of errorname.module-->]]>
+
+<!ENTITY % errortext.module "INCLUDE">
+<![%errortext.module;[
+<!ENTITY % local.errortext.attrib "">
+<!ENTITY % errortext.role.attrib "%role.attrib;">
+
+<!ENTITY % errortext.element "INCLUDE">
+<![%errortext.element;[
+<!ELEMENT errortext %ho; (%smallcptr.char.mix;)*>
+<!--end of errortext.element-->]]>
+
+<!ENTITY % errortext.attlist "INCLUDE">
+<![%errortext.attlist;[
+<!ATTLIST errortext
+		%common.attrib;
+		%errortext.role.attrib;
+		%local.errortext.attrib;
+>
+<!--end of errortext.attlist-->]]>
+<!--end of errortext.module-->]]>
+
+<!ENTITY % errortype.module "INCLUDE">
+<![%errortype.module;[
+<!ENTITY % local.errortype.attrib "">
+<!ENTITY % errortype.role.attrib "%role.attrib;">
+
+<!ENTITY % errortype.element "INCLUDE">
+<![%errortype.element;[
+<!ELEMENT errortype %ho; (%smallcptr.char.mix;)*>
+<!--end of errortype.element-->]]>
+
+<!ENTITY % errortype.attlist "INCLUDE">
+<![%errortype.attlist;[
+<!ATTLIST errortype
+		%common.attrib;
+		%errortype.role.attrib;
+		%local.errortype.attrib;
+>
+<!--end of errortype.attlist-->]]>
+<!--end of errortype.module-->]]>
+
+<!ENTITY % filename.module "INCLUDE">
+<![%filename.module;[
+<!ENTITY % local.filename.attrib "">
+<!ENTITY % filename.role.attrib "%role.attrib;">
+
+<!ENTITY % filename.element "INCLUDE">
+<![%filename.element;[
+<!ELEMENT filename %ho; (%cptr.char.mix;)*>
+<!--end of filename.element-->]]>
+
+<!-- Class: Type of filename the element names; no default -->
+<!-- Path: Search path (possibly system-specific) in which
+		file can be found -->
+
+
+<!ENTITY % filename.attlist "INCLUDE">
+<![%filename.attlist;[
+<!ATTLIST filename
+		class		(headerfile
+                                |partition
+                                |devicefile
+                                |libraryfile
+                                |directory
+                                |extension
+				|symlink)       #IMPLIED
+		path		CDATA		#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%filename.role.attrib;
+		%local.filename.attrib;
+>
+<!--end of filename.attlist-->]]>
+<!--end of filename.module-->]]>
+
+<!ENTITY % function.module "INCLUDE">
+<![%function.module;[
+<!ENTITY % local.function.attrib "">
+<!ENTITY % function.role.attrib "%role.attrib;">
+
+<!ENTITY % function.element "INCLUDE">
+<![%function.element;[
+<!ELEMENT function %ho; (%cptr.char.mix;)*>
+<!--end of function.element-->]]>
+
+<!ENTITY % function.attlist "INCLUDE">
+<![%function.attlist;[
+<!ATTLIST function
+		%moreinfo.attrib;
+		%common.attrib;
+		%function.role.attrib;
+		%local.function.attrib;
+>
+<!--end of function.attlist-->]]>
+<!--end of function.module-->]]>
+
+<!ENTITY % guibutton.module "INCLUDE">
+<![%guibutton.module;[
+<!ENTITY % local.guibutton.attrib "">
+<!ENTITY % guibutton.role.attrib "%role.attrib;">
+
+<!ENTITY % guibutton.element "INCLUDE">
+<![%guibutton.element;[
+<!ELEMENT guibutton %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guibutton.element-->]]>
+
+<!ENTITY % guibutton.attlist "INCLUDE">
+<![%guibutton.attlist;[
+<!ATTLIST guibutton
+		%moreinfo.attrib;
+		%common.attrib;
+		%guibutton.role.attrib;
+		%local.guibutton.attrib;
+>
+<!--end of guibutton.attlist-->]]>
+<!--end of guibutton.module-->]]>
+
+<!ENTITY % guiicon.module "INCLUDE">
+<![%guiicon.module;[
+<!ENTITY % local.guiicon.attrib "">
+<!ENTITY % guiicon.role.attrib "%role.attrib;">
+
+<!ENTITY % guiicon.element "INCLUDE">
+<![%guiicon.element;[
+<!ELEMENT guiicon %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guiicon.element-->]]>
+
+<!ENTITY % guiicon.attlist "INCLUDE">
+<![%guiicon.attlist;[
+<!ATTLIST guiicon
+		%moreinfo.attrib;
+		%common.attrib;
+		%guiicon.role.attrib;
+		%local.guiicon.attrib;
+>
+<!--end of guiicon.attlist-->]]>
+<!--end of guiicon.module-->]]>
+
+<!ENTITY % guilabel.module "INCLUDE">
+<![%guilabel.module;[
+<!ENTITY % local.guilabel.attrib "">
+<!ENTITY % guilabel.role.attrib "%role.attrib;">
+
+<!ENTITY % guilabel.element "INCLUDE">
+<![%guilabel.element;[
+<!ELEMENT guilabel %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guilabel.element-->]]>
+
+<!ENTITY % guilabel.attlist "INCLUDE">
+<![%guilabel.attlist;[
+<!ATTLIST guilabel
+		%moreinfo.attrib;
+		%common.attrib;
+		%guilabel.role.attrib;
+		%local.guilabel.attrib;
+>
+<!--end of guilabel.attlist-->]]>
+<!--end of guilabel.module-->]]>
+
+<!ENTITY % guimenu.module "INCLUDE">
+<![%guimenu.module;[
+<!ENTITY % local.guimenu.attrib "">
+<!ENTITY % guimenu.role.attrib "%role.attrib;">
+
+<!ENTITY % guimenu.element "INCLUDE">
+<![%guimenu.element;[
+<!ELEMENT guimenu %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guimenu.element-->]]>
+
+<!ENTITY % guimenu.attlist "INCLUDE">
+<![%guimenu.attlist;[
+<!ATTLIST guimenu
+		%moreinfo.attrib;
+		%common.attrib;
+		%guimenu.role.attrib;
+		%local.guimenu.attrib;
+>
+<!--end of guimenu.attlist-->]]>
+<!--end of guimenu.module-->]]>
+
+<!ENTITY % guimenuitem.module "INCLUDE">
+<![%guimenuitem.module;[
+<!ENTITY % local.guimenuitem.attrib "">
+<!ENTITY % guimenuitem.role.attrib "%role.attrib;">
+
+<!ENTITY % guimenuitem.element "INCLUDE">
+<![%guimenuitem.element;[
+<!ELEMENT guimenuitem %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guimenuitem.element-->]]>
+
+<!ENTITY % guimenuitem.attlist "INCLUDE">
+<![%guimenuitem.attlist;[
+<!ATTLIST guimenuitem
+		%moreinfo.attrib;
+		%common.attrib;
+		%guimenuitem.role.attrib;
+		%local.guimenuitem.attrib;
+>
+<!--end of guimenuitem.attlist-->]]>
+<!--end of guimenuitem.module-->]]>
+
+<!ENTITY % guisubmenu.module "INCLUDE">
+<![%guisubmenu.module;[
+<!ENTITY % local.guisubmenu.attrib "">
+<!ENTITY % guisubmenu.role.attrib "%role.attrib;">
+
+<!ENTITY % guisubmenu.element "INCLUDE">
+<![%guisubmenu.element;[
+<!ELEMENT guisubmenu %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guisubmenu.element-->]]>
+
+<!ENTITY % guisubmenu.attlist "INCLUDE">
+<![%guisubmenu.attlist;[
+<!ATTLIST guisubmenu
+		%moreinfo.attrib;
+		%common.attrib;
+		%guisubmenu.role.attrib;
+		%local.guisubmenu.attrib;
+>
+<!--end of guisubmenu.attlist-->]]>
+<!--end of guisubmenu.module-->]]>
+
+<!ENTITY % hardware.module "INCLUDE">
+<![%hardware.module;[
+<!ENTITY % local.hardware.attrib "">
+<!ENTITY % hardware.role.attrib "%role.attrib;">
+
+<!ENTITY % hardware.element "INCLUDE">
+<![%hardware.element;[
+<!ELEMENT hardware %ho; (%cptr.char.mix;)*>
+<!--end of hardware.element-->]]>
+
+<!ENTITY % hardware.attlist "INCLUDE">
+<![%hardware.attlist;[
+<!ATTLIST hardware
+		%moreinfo.attrib;
+		%common.attrib;
+		%hardware.role.attrib;
+		%local.hardware.attrib;
+>
+<!--end of hardware.attlist-->]]>
+<!--end of hardware.module-->]]>
+
+<!ENTITY % interface.module "INCLUDE">
+<![%interface.module;[
+<!ENTITY % local.interface.attrib "">
+<!ENTITY % interface.role.attrib "%role.attrib;">
+
+<!ENTITY % interface.element "INCLUDE">
+<![%interface.element;[
+<!ELEMENT interface %ho; (%smallcptr.char.mix;|accel)*>
+<!--end of interface.element-->]]>
+
+<!-- Class: Type of the Interface item; no default -->
+
+
+<!ENTITY % interface.attlist "INCLUDE">
+<![%interface.attlist;[
+<!ATTLIST interface
+		%moreinfo.attrib;
+		%common.attrib;
+		%interface.role.attrib;
+		%local.interface.attrib;
+>
+<!--end of interface.attlist-->]]>
+<!--end of interface.module-->]]>
+
+<!ENTITY % keycap.module "INCLUDE">
+<![%keycap.module;[
+<!ENTITY % local.keycap.attrib "">
+<!ENTITY % keycap.role.attrib "%role.attrib;">
+
+<!ENTITY % keycap.element "INCLUDE">
+<![%keycap.element;[
+<!ELEMENT keycap %ho; (%cptr.char.mix;)*>
+<!--end of keycap.element-->]]>
+
+<!ENTITY % keycap.attlist "INCLUDE">
+<![%keycap.attlist;[
+<!ATTLIST keycap
+		function	(alt
+				|control
+				|shift
+				|meta
+				|escape
+				|enter
+				|tab
+				|backspace
+				|command
+				|option
+				|space
+				|delete
+				|insert
+				|up
+				|down
+				|left
+				|right
+				|home
+				|end
+				|pageup
+				|pagedown
+				|other)		#IMPLIED
+		otherfunction	CDATA		#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%keycap.role.attrib;
+		%local.keycap.attrib;
+>
+<!--end of keycap.attlist-->]]>
+<!--end of keycap.module-->]]>
+
+<!ENTITY % keycode.module "INCLUDE">
+<![%keycode.module;[
+<!ENTITY % local.keycode.attrib "">
+<!ENTITY % keycode.role.attrib "%role.attrib;">
+
+<!ENTITY % keycode.element "INCLUDE">
+<![%keycode.element;[
+<!ELEMENT keycode %ho; (%smallcptr.char.mix;)*>
+<!--end of keycode.element-->]]>
+
+<!ENTITY % keycode.attlist "INCLUDE">
+<![%keycode.attlist;[
+<!ATTLIST keycode
+		%common.attrib;
+		%keycode.role.attrib;
+		%local.keycode.attrib;
+>
+<!--end of keycode.attlist-->]]>
+<!--end of keycode.module-->]]>
+
+<!ENTITY % keycombo.module "INCLUDE">
+<![%keycombo.module;[
+<!ENTITY % local.keycombo.attrib "">
+<!ENTITY % keycombo.role.attrib "%role.attrib;">
+
+<!ENTITY % keycombo.element "INCLUDE">
+<![%keycombo.element;[
+<!ELEMENT keycombo %ho; ((keycap|keycombo|keysym|mousebutton)+)>
+<!--end of keycombo.element-->]]>
+
+<!ENTITY % keycombo.attlist "INCLUDE">
+<![%keycombo.attlist;[
+<!ATTLIST keycombo
+		%keyaction.attrib;
+		%moreinfo.attrib;
+		%common.attrib;
+		%keycombo.role.attrib;
+		%local.keycombo.attrib;
+>
+<!--end of keycombo.attlist-->]]>
+<!--end of keycombo.module-->]]>
+
+<!ENTITY % keysym.module "INCLUDE">
+<![%keysym.module;[
+<!ENTITY % local.keysym.attrib "">
+<!ENTITY % keysysm.role.attrib "%role.attrib;">
+
+<!ENTITY % keysym.element "INCLUDE">
+<![%keysym.element;[
+<!ELEMENT keysym %ho; (%smallcptr.char.mix;)*>
+<!--end of keysym.element-->]]>
+
+<!ENTITY % keysym.attlist "INCLUDE">
+<![%keysym.attlist;[
+<!ATTLIST keysym
+		%common.attrib;
+		%keysysm.role.attrib;
+		%local.keysym.attrib;
+>
+<!--end of keysym.attlist-->]]>
+<!--end of keysym.module-->]]>
+
+<!ENTITY % lineannotation.module "INCLUDE">
+<![%lineannotation.module;[
+<!ENTITY % local.lineannotation.attrib "">
+<!ENTITY % lineannotation.role.attrib "%role.attrib;">
+
+<!ENTITY % lineannotation.element "INCLUDE">
+<![%lineannotation.element;[
+<!ELEMENT lineannotation %ho; (%para.char.mix;)*>
+<!--end of lineannotation.element-->]]>
+
+<!ENTITY % lineannotation.attlist "INCLUDE">
+<![%lineannotation.attlist;[
+<!ATTLIST lineannotation
+		%common.attrib;
+		%lineannotation.role.attrib;
+		%local.lineannotation.attrib;
+>
+<!--end of lineannotation.attlist-->]]>
+<!--end of lineannotation.module-->]]>
+
+<!ENTITY % literal.module "INCLUDE">
+<![%literal.module;[
+<!ENTITY % local.literal.attrib "">
+<!ENTITY % literal.role.attrib "%role.attrib;">
+
+<!ENTITY % literal.element "INCLUDE">
+<![%literal.element;[
+<!ELEMENT literal %ho; (%cptr.char.mix;)*>
+<!--end of literal.element-->]]>
+
+<!ENTITY % literal.attlist "INCLUDE">
+<![%literal.attlist;[
+<!ATTLIST literal
+		%moreinfo.attrib;
+		%common.attrib;
+		%literal.role.attrib;
+		%local.literal.attrib;
+>
+<!--end of literal.attlist-->]]>
+<!--end of literal.module-->]]>
+
+<!ENTITY % code.module "INCLUDE">
+<![%code.module;[
+<!ENTITY % local.code.attrib "">
+<!ENTITY % code.role.attrib "%role.attrib;">
+
+<!ENTITY % code.element "INCLUDE">
+<![%code.element;[
+<!ELEMENT code %ho; (%cptr.char.mix;)*>
+<!--end of code.element-->]]>
+
+<!ENTITY % code.attlist "INCLUDE">
+<![%code.attlist;[
+<!ATTLIST code
+		language	CDATA	#IMPLIED
+		%common.attrib;
+		%code.role.attrib;
+		%local.code.attrib;
+>
+<!--end of code.attlist-->]]>
+<!--end of code.module-->]]>
+
+<!ENTITY % constant.module "INCLUDE">
+<![ %constant.module; [
+<!ENTITY % local.constant.attrib "">
+<!ENTITY % constant.role.attrib "%role.attrib;">
+
+<!ENTITY % constant.element "INCLUDE">
+<![ %constant.element; [
+<!ELEMENT constant %ho; (%smallcptr.char.mix;)*>
+<!--end of constant.element-->]]>
+
+<!ENTITY % constant.attlist "INCLUDE">
+<![ %constant.attlist; [
+<!ATTLIST constant
+		class	(limit)		#IMPLIED
+		%common.attrib;
+		%constant.role.attrib;
+		%local.constant.attrib;
+>
+<!--end of constant.attlist-->]]>
+<!--end of constant.module-->]]>
+
+<!ENTITY % varname.module "INCLUDE">
+<![ %varname.module; [
+<!ENTITY % local.varname.attrib "">
+<!ENTITY % varname.role.attrib "%role.attrib;">
+
+<!ENTITY % varname.element "INCLUDE">
+<![ %varname.element; [
+<!ELEMENT varname %ho; (%smallcptr.char.mix;)*>
+<!--end of varname.element-->]]>
+
+<!ENTITY % varname.attlist "INCLUDE">
+<![ %varname.attlist; [
+<!ATTLIST varname
+		%common.attrib;
+		%varname.role.attrib;
+		%local.varname.attrib;
+>
+<!--end of varname.attlist-->]]>
+<!--end of varname.module-->]]>
+
+<!ENTITY % markup.module "INCLUDE">
+<![%markup.module;[
+<!ENTITY % local.markup.attrib "">
+<!ENTITY % markup.role.attrib "%role.attrib;">
+
+<!ENTITY % markup.element "INCLUDE">
+<![%markup.element;[
+<!ELEMENT markup %ho; (%smallcptr.char.mix;)*>
+<!--end of markup.element-->]]>
+
+<!ENTITY % markup.attlist "INCLUDE">
+<![%markup.attlist;[
+<!ATTLIST markup
+		%common.attrib;
+		%markup.role.attrib;
+		%local.markup.attrib;
+>
+<!--end of markup.attlist-->]]>
+<!--end of markup.module-->]]>
+
+<!ENTITY % medialabel.module "INCLUDE">
+<![%medialabel.module;[
+<!ENTITY % local.medialabel.attrib "">
+<!ENTITY % medialabel.role.attrib "%role.attrib;">
+
+<!ENTITY % medialabel.element "INCLUDE">
+<![%medialabel.element;[
+<!ELEMENT medialabel %ho; (%smallcptr.char.mix;)*>
+<!--end of medialabel.element-->]]>
+
+<!-- Class: Type of medium named by the element; no default -->
+
+
+<!ENTITY % medialabel.attlist "INCLUDE">
+<![%medialabel.attlist;[
+<!ATTLIST medialabel
+		class 		(cartridge
+				|cdrom
+				|disk
+				|tape)		#IMPLIED
+		%common.attrib;
+		%medialabel.role.attrib;
+		%local.medialabel.attrib;
+>
+<!--end of medialabel.attlist-->]]>
+<!--end of medialabel.module-->]]>
+
+<!ENTITY % menuchoice.content.module "INCLUDE">
+<![%menuchoice.content.module;[
+<!ENTITY % menuchoice.module "INCLUDE">
+<![%menuchoice.module;[
+<!ENTITY % local.menuchoice.attrib "">
+<!ENTITY % menuchoice.role.attrib "%role.attrib;">
+
+<!ENTITY % menuchoice.element "INCLUDE">
+<![%menuchoice.element;[
+<!ELEMENT menuchoice %ho; (shortcut?, (guibutton|guiicon|guilabel
+		|guimenu|guimenuitem|guisubmenu|interface)+)>
+<!--end of menuchoice.element-->]]>
+
+<!ENTITY % menuchoice.attlist "INCLUDE">
+<![%menuchoice.attlist;[
+<!ATTLIST menuchoice
+		%moreinfo.attrib;
+		%common.attrib;
+		%menuchoice.role.attrib;
+		%local.menuchoice.attrib;
+>
+<!--end of menuchoice.attlist-->]]>
+<!--end of menuchoice.module-->]]>
+
+<!ENTITY % shortcut.module "INCLUDE">
+<![%shortcut.module;[
+<!-- See also KeyCombo -->
+<!ENTITY % local.shortcut.attrib "">
+<!ENTITY % shortcut.role.attrib "%role.attrib;">
+
+<!ENTITY % shortcut.element "INCLUDE">
+<![%shortcut.element;[
+<!ELEMENT shortcut %ho; ((keycap|keycombo|keysym|mousebutton)+)>
+<!--end of shortcut.element-->]]>
+
+<!ENTITY % shortcut.attlist "INCLUDE">
+<![%shortcut.attlist;[
+<!ATTLIST shortcut
+		%keyaction.attrib;
+		%moreinfo.attrib;
+		%common.attrib;
+		%shortcut.role.attrib;
+		%local.shortcut.attrib;
+>
+<!--end of shortcut.attlist-->]]>
+<!--end of shortcut.module-->]]>
+<!--end of menuchoice.content.module-->]]>
+
+<!ENTITY % mousebutton.module "INCLUDE">
+<![%mousebutton.module;[
+<!ENTITY % local.mousebutton.attrib "">
+<!ENTITY % mousebutton.role.attrib "%role.attrib;">
+
+<!ENTITY % mousebutton.element "INCLUDE">
+<![%mousebutton.element;[
+<!ELEMENT mousebutton %ho; (%smallcptr.char.mix;)*>
+<!--end of mousebutton.element-->]]>
+
+<!ENTITY % mousebutton.attlist "INCLUDE">
+<![%mousebutton.attlist;[
+<!ATTLIST mousebutton
+		%moreinfo.attrib;
+		%common.attrib;
+		%mousebutton.role.attrib;
+		%local.mousebutton.attrib;
+>
+<!--end of mousebutton.attlist-->]]>
+<!--end of mousebutton.module-->]]>
+
+<!ENTITY % msgtext.module "INCLUDE">
+<![%msgtext.module;[
+<!ENTITY % local.msgtext.attrib "">
+<!ENTITY % msgtext.role.attrib "%role.attrib;">
+
+<!ENTITY % msgtext.element "INCLUDE">
+<![%msgtext.element;[
+<!ELEMENT msgtext %ho; ((%component.mix;)+)>
+<!--end of msgtext.element-->]]>
+
+<!ENTITY % msgtext.attlist "INCLUDE">
+<![%msgtext.attlist;[
+<!ATTLIST msgtext
+		%common.attrib;
+		%msgtext.role.attrib;
+		%local.msgtext.attrib;
+>
+<!--end of msgtext.attlist-->]]>
+<!--end of msgtext.module-->]]>
+
+<!ENTITY % option.module "INCLUDE">
+<![%option.module;[
+<!ENTITY % local.option.attrib "">
+<!ENTITY % option.role.attrib "%role.attrib;">
+
+<!ENTITY % option.element "INCLUDE">
+<![%option.element;[
+<!ELEMENT option %ho; (%cptr.char.mix;)*>
+<!--end of option.element-->]]>
+
+<!ENTITY % option.attlist "INCLUDE">
+<![%option.attlist;[
+<!ATTLIST option
+		%common.attrib;
+		%option.role.attrib;
+		%local.option.attrib;
+>
+<!--end of option.attlist-->]]>
+<!--end of option.module-->]]>
+
+<!ENTITY % optional.module "INCLUDE">
+<![%optional.module;[
+<!ENTITY % local.optional.attrib "">
+<!ENTITY % optional.role.attrib "%role.attrib;">
+
+<!ENTITY % optional.element "INCLUDE">
+<![%optional.element;[
+<!ELEMENT optional %ho; (%cptr.char.mix;)*>
+<!--end of optional.element-->]]>
+
+<!ENTITY % optional.attlist "INCLUDE">
+<![%optional.attlist;[
+<!ATTLIST optional
+		%common.attrib;
+		%optional.role.attrib;
+		%local.optional.attrib;
+>
+<!--end of optional.attlist-->]]>
+<!--end of optional.module-->]]>
+
+<!ENTITY % parameter.module "INCLUDE">
+<![%parameter.module;[
+<!ENTITY % local.parameter.attrib "">
+<!ENTITY % parameter.role.attrib "%role.attrib;">
+
+<!ENTITY % parameter.element "INCLUDE">
+<![%parameter.element;[
+<!ELEMENT parameter %ho; (%cptr.char.mix;)*>
+<!--end of parameter.element-->]]>
+
+<!-- Class: Type of the Parameter; no default -->
+
+
+<!ENTITY % parameter.attlist "INCLUDE">
+<![%parameter.attlist;[
+<!ATTLIST parameter
+		class 		(command
+				|function
+				|option)	#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%parameter.role.attrib;
+		%local.parameter.attrib;
+>
+<!--end of parameter.attlist-->]]>
+<!--end of parameter.module-->]]>
+
+<!ENTITY % prompt.module "INCLUDE">
+<![%prompt.module;[
+<!ENTITY % local.prompt.attrib "">
+<!ENTITY % prompt.role.attrib "%role.attrib;">
+
+<!ENTITY % prompt.element "INCLUDE">
+<![%prompt.element;[
+<!ELEMENT prompt %ho; (%smallcptr.char.mix;|co)*>
+<!--end of prompt.element-->]]>
+
+<!ENTITY % prompt.attlist "INCLUDE">
+<![%prompt.attlist;[
+<!ATTLIST prompt
+		%moreinfo.attrib;
+		%common.attrib;
+		%prompt.role.attrib;
+		%local.prompt.attrib;
+>
+<!--end of prompt.attlist-->]]>
+<!--end of prompt.module-->]]>
+
+<!ENTITY % property.module "INCLUDE">
+<![%property.module;[
+<!ENTITY % local.property.attrib "">
+<!ENTITY % property.role.attrib "%role.attrib;">
+
+<!ENTITY % property.element "INCLUDE">
+<![%property.element;[
+<!ELEMENT property %ho; (%cptr.char.mix;)*>
+<!--end of property.element-->]]>
+
+<!ENTITY % property.attlist "INCLUDE">
+<![%property.attlist;[
+<!ATTLIST property
+		%moreinfo.attrib;
+		%common.attrib;
+		%property.role.attrib;
+		%local.property.attrib;
+>
+<!--end of property.attlist-->]]>
+<!--end of property.module-->]]>
+
+<!ENTITY % replaceable.module "INCLUDE">
+<![%replaceable.module;[
+<!ENTITY % local.replaceable.attrib "">
+<!ENTITY % replaceable.role.attrib "%role.attrib;">
+
+<!ENTITY % replaceable.element "INCLUDE">
+<![%replaceable.element;[
+<!ELEMENT replaceable %ho; (#PCDATA
+		| %link.char.class;
+		| optional
+		| %base.char.class;
+		| %other.char.class;
+		| inlinegraphic
+                | inlinemediaobject
+		| co)*>
+<!--end of replaceable.element-->]]>
+
+<!-- Class: Type of information the element represents; no
+		default -->
+
+
+<!ENTITY % replaceable.attlist "INCLUDE">
+<![%replaceable.attlist;[
+<!ATTLIST replaceable
+		class		(command
+				|function
+				|option
+				|parameter)	#IMPLIED
+		%common.attrib;
+		%replaceable.role.attrib;
+		%local.replaceable.attrib;
+>
+<!--end of replaceable.attlist-->]]>
+<!--end of replaceable.module-->]]>
+
+<!ENTITY % returnvalue.module "INCLUDE">
+<![%returnvalue.module;[
+<!ENTITY % local.returnvalue.attrib "">
+<!ENTITY % returnvalue.role.attrib "%role.attrib;">
+
+<!ENTITY % returnvalue.element "INCLUDE">
+<![%returnvalue.element;[
+<!ELEMENT returnvalue %ho; (%smallcptr.char.mix;)*>
+<!--end of returnvalue.element-->]]>
+
+<!ENTITY % returnvalue.attlist "INCLUDE">
+<![%returnvalue.attlist;[
+<!ATTLIST returnvalue
+		%common.attrib;
+		%returnvalue.role.attrib;
+		%local.returnvalue.attrib;
+>
+<!--end of returnvalue.attlist-->]]>
+<!--end of returnvalue.module-->]]>
+
+<!ENTITY % sgmltag.module "INCLUDE">
+<![%sgmltag.module;[
+<!ENTITY % local.sgmltag.attrib "">
+<!ENTITY % sgmltag.role.attrib "%role.attrib;">
+
+<!ENTITY % sgmltag.element "INCLUDE">
+<![%sgmltag.element;[
+<!ELEMENT sgmltag %ho; (%smallcptr.char.mix;)*>
+<!--end of sgmltag.element-->]]>
+
+<!-- Class: Type of SGML construct the element names; no default -->
+
+
+<!ENTITY % sgmltag.attlist "INCLUDE">
+<![%sgmltag.attlist;[
+<!ATTLIST sgmltag
+		class 		(attribute
+				|attvalue
+				|element
+				|endtag
+                                |emptytag
+				|genentity
+				|numcharref
+				|paramentity
+				|pi
+                                |xmlpi
+				|starttag
+				|sgmlcomment
+                                |prefix
+                                |namespace
+                                |localname)	#IMPLIED
+		namespace	CDATA		#IMPLIED
+		%common.attrib;
+		%sgmltag.role.attrib;
+		%local.sgmltag.attrib;
+>
+<!--end of sgmltag.attlist-->]]>
+<!--end of sgmltag.module-->]]>
+
+<!ENTITY % structfield.module "INCLUDE">
+<![%structfield.module;[
+<!ENTITY % local.structfield.attrib "">
+<!ENTITY % structfield.role.attrib "%role.attrib;">
+
+<!ENTITY % structfield.element "INCLUDE">
+<![%structfield.element;[
+<!ELEMENT structfield %ho; (%smallcptr.char.mix;)*>
+<!--end of structfield.element-->]]>
+
+<!ENTITY % structfield.attlist "INCLUDE">
+<![%structfield.attlist;[
+<!ATTLIST structfield
+		%common.attrib;
+		%structfield.role.attrib;
+		%local.structfield.attrib;
+>
+<!--end of structfield.attlist-->]]>
+<!--end of structfield.module-->]]>
+
+<!ENTITY % structname.module "INCLUDE">
+<![%structname.module;[
+<!ENTITY % local.structname.attrib "">
+<!ENTITY % structname.role.attrib "%role.attrib;">
+
+<!ENTITY % structname.element "INCLUDE">
+<![%structname.element;[
+<!ELEMENT structname %ho; (%smallcptr.char.mix;)*>
+<!--end of structname.element-->]]>
+
+<!ENTITY % structname.attlist "INCLUDE">
+<![%structname.attlist;[
+<!ATTLIST structname
+		%common.attrib;
+		%structname.role.attrib;
+		%local.structname.attrib;
+>
+<!--end of structname.attlist-->]]>
+<!--end of structname.module-->]]>
+
+<!ENTITY % symbol.module "INCLUDE">
+<![%symbol.module;[
+<!ENTITY % local.symbol.attrib "">
+<!ENTITY % symbol.role.attrib "%role.attrib;">
+
+<!ENTITY % symbol.element "INCLUDE">
+<![%symbol.element;[
+<!ELEMENT symbol %ho; (%smallcptr.char.mix;)*>
+<!--end of symbol.element-->]]>
+
+<!-- Class: Type of symbol; no default -->
+
+
+<!ENTITY % symbol.attlist "INCLUDE">
+<![%symbol.attlist;[
+<!ATTLIST symbol
+		class		(limit)		#IMPLIED
+		%common.attrib;
+		%symbol.role.attrib;
+		%local.symbol.attrib;
+>
+<!--end of symbol.attlist-->]]>
+<!--end of symbol.module-->]]>
+
+<!ENTITY % systemitem.module "INCLUDE">
+<![%systemitem.module;[
+<!ENTITY % local.systemitem.attrib "">
+<!ENTITY % systemitem.role.attrib "%role.attrib;">
+
+<!ENTITY % systemitem.element "INCLUDE">
+<![%systemitem.element;[
+<!ELEMENT systemitem %ho; (%cptr.char.mix; | acronym | co)*>
+<!--end of systemitem.element-->]]>
+
+<!-- Class: Type of system item the element names; no default -->
+
+<!ENTITY % systemitem.attlist "INCLUDE">
+<![%systemitem.attlist;[
+<!ATTLIST systemitem
+		class	(constant
+                        |daemon
+			|domainname
+			|etheraddress
+			|event
+			|eventhandler
+			|filesystem
+			|fqdomainname
+			|groupname
+			|ipaddress
+			|library
+			|macro
+			|netmask
+			|newsgroup
+			|osname
+                        |protocol
+			|resource
+			|systemname
+			|username
+                        |process
+                        |server
+                        |service)	#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%systemitem.role.attrib;
+		%local.systemitem.attrib;
+>
+<!--end of systemitem.attlist-->]]>
+<!--end of systemitem.module-->]]>
+
+<!ENTITY % uri.module "INCLUDE">
+<![%uri.module;[
+<!ENTITY % local.uri.attrib "">
+<!ENTITY % uri.role.attrib "%role.attrib;">
+
+<!ENTITY % uri.element "INCLUDE">
+<![%uri.element;[
+<!ELEMENT uri %ho; (%smallcptr.char.mix;)*>
+<!--end of uri.element-->]]>
+
+<!-- Type: Type of URI; no default -->
+
+<!ENTITY % uri.attlist "INCLUDE">
+<![%uri.attlist;[
+<!ATTLIST uri
+		type	CDATA	#IMPLIED
+		%common.attrib;
+		%uri.role.attrib;
+		%local.uri.attrib;
+>
+<!--end of uri.attlist-->]]>
+<!--end of uri.module-->]]>
+
+<!ENTITY % token.module "INCLUDE">
+<![%token.module;[
+<!ENTITY % local.token.attrib "">
+<!ENTITY % token.role.attrib "%role.attrib;">
+
+<!ENTITY % token.element "INCLUDE">
+<![%token.element;[
+<!ELEMENT token %ho; (%smallcptr.char.mix;)*>
+<!--end of token.element-->]]>
+
+<!ENTITY % token.attlist "INCLUDE">
+<![%token.attlist;[
+<!ATTLIST token
+		%common.attrib;
+		%token.role.attrib;
+		%local.token.attrib;
+>
+<!--end of token.attlist-->]]>
+<!--end of token.module-->]]>
+
+<!ENTITY % type.module "INCLUDE">
+<![%type.module;[
+<!ENTITY % local.type.attrib "">
+<!ENTITY % type.role.attrib "%role.attrib;">
+
+<!ENTITY % type.element "INCLUDE">
+<![%type.element;[
+<!ELEMENT type %ho; (%smallcptr.char.mix;)*>
+<!--end of type.element-->]]>
+
+<!ENTITY % type.attlist "INCLUDE">
+<![%type.attlist;[
+<!ATTLIST type
+		%common.attrib;
+		%type.role.attrib;
+		%local.type.attrib;
+>
+<!--end of type.attlist-->]]>
+<!--end of type.module-->]]>
+
+<!ENTITY % userinput.module "INCLUDE">
+<![%userinput.module;[
+<!ENTITY % local.userinput.attrib "">
+<!ENTITY % userinput.role.attrib "%role.attrib;">
+
+<!ENTITY % userinput.element "INCLUDE">
+<![%userinput.element;[
+<!ELEMENT userinput %ho; (%cptr.char.mix;|co)*>
+<!--end of userinput.element-->]]>
+
+<!ENTITY % userinput.attlist "INCLUDE">
+<![%userinput.attlist;[
+<!ATTLIST userinput
+		%moreinfo.attrib;
+		%common.attrib;
+		%userinput.role.attrib;
+		%local.userinput.attrib;
+>
+<!--end of userinput.attlist-->]]>
+<!--end of userinput.module-->]]>
+
+<!-- General words and phrases ............................................ -->
+
+<!ENTITY % abbrev.module "INCLUDE">
+<![%abbrev.module;[
+<!ENTITY % local.abbrev.attrib "">
+<!ENTITY % abbrev.role.attrib "%role.attrib;">
+
+<!ENTITY % abbrev.element "INCLUDE">
+<![%abbrev.element;[
+<!ELEMENT abbrev %ho; (%word.char.mix;)*>
+<!--end of abbrev.element-->]]>
+
+<!ENTITY % abbrev.attlist "INCLUDE">
+<![%abbrev.attlist;[
+<!ATTLIST abbrev
+		%common.attrib;
+		%abbrev.role.attrib;
+		%local.abbrev.attrib;
+>
+<!--end of abbrev.attlist-->]]>
+<!--end of abbrev.module-->]]>
+
+<!ENTITY % acronym.module "INCLUDE">
+<![%acronym.module;[
+<!ENTITY % local.acronym.attrib "">
+<!ENTITY % acronym.role.attrib "%role.attrib;">
+
+<!ENTITY % acronym.element "INCLUDE">
+<![%acronym.element;[
+<!ELEMENT acronym %ho; (%word.char.mix;)*
+		%acronym.exclusion;>
+<!--end of acronym.element-->]]>
+
+<!ENTITY % acronym.attlist "INCLUDE">
+<![%acronym.attlist;[
+<!ATTLIST acronym
+		%common.attrib;
+		%acronym.role.attrib;
+		%local.acronym.attrib;
+>
+<!--end of acronym.attlist-->]]>
+<!--end of acronym.module-->]]>
+
+<!ENTITY % citation.module "INCLUDE">
+<![%citation.module;[
+<!ENTITY % local.citation.attrib "">
+<!ENTITY % citation.role.attrib "%role.attrib;">
+
+<!ENTITY % citation.element "INCLUDE">
+<![%citation.element;[
+<!ELEMENT citation %ho; (%para.char.mix;)*>
+<!--end of citation.element-->]]>
+
+<!ENTITY % citation.attlist "INCLUDE">
+<![%citation.attlist;[
+<!ATTLIST citation
+		%common.attrib;
+		%citation.role.attrib;
+		%local.citation.attrib;
+>
+<!--end of citation.attlist-->]]>
+<!--end of citation.module-->]]>
+
+<!ENTITY % citerefentry.module "INCLUDE">
+<![%citerefentry.module;[
+<!ENTITY % local.citerefentry.attrib "">
+<!ENTITY % citerefentry.role.attrib "%role.attrib;">
+
+<!ENTITY % citerefentry.element "INCLUDE">
+<![%citerefentry.element;[
+<!ELEMENT citerefentry %ho; (refentrytitle, manvolnum?)>
+<!--end of citerefentry.element-->]]>
+
+<!ENTITY % citerefentry.attlist "INCLUDE">
+<![%citerefentry.attlist;[
+<!ATTLIST citerefentry
+		%common.attrib;
+		%citerefentry.role.attrib;
+		%local.citerefentry.attrib;
+>
+<!--end of citerefentry.attlist-->]]>
+<!--end of citerefentry.module-->]]>
+
+<!ENTITY % refentrytitle.module "INCLUDE">
+<![%refentrytitle.module;[
+<!ENTITY % local.refentrytitle.attrib "">
+<!ENTITY % refentrytitle.role.attrib "%role.attrib;">
+
+<!ENTITY % refentrytitle.element "INCLUDE">
+<![%refentrytitle.element;[
+<!ELEMENT refentrytitle %ho; (%para.char.mix;)*>
+<!--end of refentrytitle.element-->]]>
+
+<!ENTITY % refentrytitle.attlist "INCLUDE">
+<![%refentrytitle.attlist;[
+<!ATTLIST refentrytitle
+		%common.attrib;
+		%refentrytitle.role.attrib;
+		%local.refentrytitle.attrib;
+>
+<!--end of refentrytitle.attlist-->]]>
+<!--end of refentrytitle.module-->]]>
+
+<!ENTITY % manvolnum.module "INCLUDE">
+<![%manvolnum.module;[
+<!ENTITY % local.manvolnum.attrib "">
+<!ENTITY % namvolnum.role.attrib "%role.attrib;">
+
+<!ENTITY % manvolnum.element "INCLUDE">
+<![%manvolnum.element;[
+<!ELEMENT manvolnum %ho; (%word.char.mix;)*>
+<!--end of manvolnum.element-->]]>
+
+<!ENTITY % manvolnum.attlist "INCLUDE">
+<![%manvolnum.attlist;[
+<!ATTLIST manvolnum
+		%common.attrib;
+		%namvolnum.role.attrib;
+		%local.manvolnum.attrib;
+>
+<!--end of manvolnum.attlist-->]]>
+<!--end of manvolnum.module-->]]>
+
+<!ENTITY % citetitle.module "INCLUDE">
+<![%citetitle.module;[
+<!ENTITY % local.citetitle.attrib "">
+<!ENTITY % citetitle.role.attrib "%role.attrib;">
+
+<!ENTITY % citetitle.element "INCLUDE">
+<![%citetitle.element;[
+<!ELEMENT citetitle %ho; (%para.char.mix;)*>
+<!--end of citetitle.element-->]]>
+
+<!-- Pubwork: Genre of published work cited; no default -->
+
+
+<!ENTITY % citetitle.attlist "INCLUDE">
+<![%citetitle.attlist;[
+<!ATTLIST citetitle
+		pubwork		(article
+				|book
+				|chapter
+				|part
+				|refentry
+				|section
+				|journal
+				|series
+				|set
+				|manuscript
+				|cdrom
+				|dvd
+				|wiki
+				|gopher
+				|bbs
+                                |emailmessage
+                                |webpage
+                                |newsposting)	#IMPLIED
+		%common.attrib;
+		%citetitle.role.attrib;
+		%local.citetitle.attrib;
+>
+<!--end of citetitle.attlist-->]]>
+<!--end of citetitle.module-->]]>
+
+<!ENTITY % emphasis.module "INCLUDE">
+<![%emphasis.module;[
+<!ENTITY % local.emphasis.attrib "">
+<!ENTITY % emphasis.role.attrib "%role.attrib;">
+
+<!ENTITY % emphasis.element "INCLUDE">
+<![%emphasis.element;[
+<!ELEMENT emphasis %ho; (%para.char.mix;)*>
+<!--end of emphasis.element-->]]>
+
+<!ENTITY % emphasis.attlist "INCLUDE">
+<![%emphasis.attlist;[
+<!ATTLIST emphasis
+		%common.attrib;
+		%emphasis.role.attrib;
+		%local.emphasis.attrib;
+>
+<!--end of emphasis.attlist-->]]>
+<!--end of emphasis.module-->]]>
+
+<!ENTITY % foreignphrase.module "INCLUDE">
+<![%foreignphrase.module;[
+<!ENTITY % local.foreignphrase.attrib "">
+<!ENTITY % foreignphrase.role.attrib "%role.attrib;">
+
+<!ENTITY % foreignphrase.element "INCLUDE">
+<![%foreignphrase.element;[
+<!ELEMENT foreignphrase %ho; (%para.char.mix;)*>
+<!--end of foreignphrase.element-->]]>
+
+<!ENTITY % foreignphrase.attlist "INCLUDE">
+<![%foreignphrase.attlist;[
+<!ATTLIST foreignphrase
+		%common.attrib;
+		%foreignphrase.role.attrib;
+		%local.foreignphrase.attrib;
+>
+<!--end of foreignphrase.attlist-->]]>
+<!--end of foreignphrase.module-->]]>
+
+<!ENTITY % glossterm.module "INCLUDE">
+<![%glossterm.module;[
+<!ENTITY % local.glossterm.attrib "">
+<!ENTITY % glossterm.role.attrib "%role.attrib;">
+
+<!ENTITY % glossterm.element "INCLUDE">
+<![%glossterm.element;[
+<!ELEMENT glossterm %ho; (%para.char.mix;)*
+		%glossterm.exclusion;>
+<!--end of glossterm.element-->]]>
+
+<!-- to GlossEntry if Glossterm used in text -->
+<!-- BaseForm: Provides the form of GlossTerm to be used
+		for indexing -->
+
+<!ENTITY % glossterm.attlist "INCLUDE">
+<![%glossterm.attlist;[
+<!ATTLIST glossterm
+		baseform	CDATA		#IMPLIED
+		%linkend.attrib;
+		%common.attrib;
+		%glossterm.role.attrib;
+		%local.glossterm.attrib;
+>
+<!--end of glossterm.attlist-->]]>
+<!--end of glossterm.module-->]]>
+
+<!ENTITY % firstterm.module "INCLUDE">
+<![%firstterm.module;[
+<!ENTITY % local.firstterm.attrib "">
+<!ENTITY % firstterm.role.attrib "%role.attrib;">
+
+<!ENTITY % firstterm.element "INCLUDE">
+<![%firstterm.element;[
+<!ELEMENT firstterm %ho; (%para.char.mix;)*
+		%glossterm.exclusion;>
+<!--end of firstterm.element-->]]>
+
+<!-- to GlossEntry or other explanation -->
+
+
+<!ENTITY % firstterm.attlist "INCLUDE">
+<![%firstterm.attlist;[
+<!ATTLIST firstterm
+		baseform	CDATA		#IMPLIED
+		%linkend.attrib;
+		%common.attrib;
+		%firstterm.role.attrib;
+		%local.firstterm.attrib;
+>
+<!--end of firstterm.attlist-->]]>
+<!--end of firstterm.module-->]]>
+
+<!ENTITY % phrase.module "INCLUDE">
+<![%phrase.module;[
+<!ENTITY % local.phrase.attrib "">
+<!ENTITY % phrase.role.attrib "%role.attrib;">
+
+<!ENTITY % phrase.element "INCLUDE">
+<![%phrase.element;[
+<!ELEMENT phrase %ho; (%para.char.mix;)*>
+<!--end of phrase.element-->]]>
+
+<!ENTITY % phrase.attlist "INCLUDE">
+<![%phrase.attlist;[
+<!ATTLIST phrase
+		%common.attrib;
+		%phrase.role.attrib;
+		%local.phrase.attrib;
+>
+<!--end of phrase.attlist-->]]>
+<!--end of phrase.module-->]]>
+
+<!ENTITY % quote.module "INCLUDE">
+<![%quote.module;[
+<!ENTITY % local.quote.attrib "">
+<!ENTITY % quote.role.attrib "%role.attrib;">
+
+<!ENTITY % quote.element "INCLUDE">
+<![%quote.element;[
+<!ELEMENT quote %ho; (%para.char.mix;)*>
+<!--end of quote.element-->]]>
+
+<!ENTITY % quote.attlist "INCLUDE">
+<![%quote.attlist;[
+<!ATTLIST quote
+		%common.attrib;
+		%quote.role.attrib;
+		%local.quote.attrib;
+>
+<!--end of quote.attlist-->]]>
+<!--end of quote.module-->]]>
+
+<!ENTITY % ssscript.module "INCLUDE">
+<![%ssscript.module;[
+<!ENTITY % local.ssscript.attrib "">
+<!ENTITY % ssscript.role.attrib "%role.attrib;">
+
+<!ENTITY % subscript.element "INCLUDE">
+<![%subscript.element;[
+<!ELEMENT subscript %ho; (#PCDATA
+		| %link.char.class;
+		| emphasis
+		| replaceable
+		| symbol
+		| inlinegraphic
+                | inlinemediaobject
+		| %base.char.class;
+		| %other.char.class;)*
+		%ubiq.exclusion;>
+<!--end of subscript.element-->]]>
+
+<!ENTITY % subscript.attlist "INCLUDE">
+<![%subscript.attlist;[
+<!ATTLIST subscript
+		%common.attrib;
+		%ssscript.role.attrib;
+		%local.ssscript.attrib;
+>
+<!--end of subscript.attlist-->]]>
+
+<!ENTITY % superscript.element "INCLUDE">
+<![%superscript.element;[
+<!ELEMENT superscript %ho; (#PCDATA
+		| %link.char.class;
+		| emphasis
+		| replaceable
+		| symbol
+		| inlinegraphic
+                | inlinemediaobject
+		| %base.char.class;
+		| %other.char.class;)*
+		%ubiq.exclusion;>
+<!--end of superscript.element-->]]>
+
+<!ENTITY % superscript.attlist "INCLUDE">
+<![%superscript.attlist;[
+<!ATTLIST superscript
+		%common.attrib;
+		%ssscript.role.attrib;
+		%local.ssscript.attrib;
+>
+<!--end of superscript.attlist-->]]>
+<!--end of ssscript.module-->]]>
+
+<!ENTITY % trademark.module "INCLUDE">
+<![%trademark.module;[
+<!ENTITY % local.trademark.attrib "">
+<!ENTITY % trademark.role.attrib "%role.attrib;">
+
+<!ENTITY % trademark.element "INCLUDE">
+<![%trademark.element;[
+<!ELEMENT trademark %ho; (#PCDATA
+		| %link.char.class;
+		| %tech.char.class;
+		| %base.char.class;
+		| %other.char.class;
+		| inlinegraphic
+                | inlinemediaobject
+		| emphasis)*>
+<!--end of trademark.element-->]]>
+
+<!-- Class: More precisely identifies the item the element names -->
+
+
+<!ENTITY % trademark.attlist "INCLUDE">
+<![%trademark.attlist;[
+<!ATTLIST trademark
+		class		(service
+				|trade
+				|registered
+				|copyright)	'trade'
+		%common.attrib;
+		%trademark.role.attrib;
+		%local.trademark.attrib;
+>
+<!--end of trademark.attlist-->]]>
+<!--end of trademark.module-->]]>
+
+<!ENTITY % wordasword.module "INCLUDE">
+<![%wordasword.module;[
+<!ENTITY % local.wordasword.attrib "">
+<!ENTITY % wordasword.role.attrib "%role.attrib;">
+
+<!ENTITY % wordasword.element "INCLUDE">
+<![%wordasword.element;[
+<!ELEMENT wordasword %ho; (%word.char.mix;)*>
+<!--end of wordasword.element-->]]>
+
+<!ENTITY % wordasword.attlist "INCLUDE">
+<![%wordasword.attlist;[
+<!ATTLIST wordasword
+		%common.attrib;
+		%wordasword.role.attrib;
+		%local.wordasword.attrib;
+>
+<!--end of wordasword.attlist-->]]>
+<!--end of wordasword.module-->]]>
+
+<!-- Links and cross-references ........................................... -->
+
+<!ENTITY % link.module "INCLUDE">
+<![%link.module;[
+<!ENTITY % local.link.attrib "">
+<!ENTITY % link.role.attrib "%role.attrib;">
+
+<!ENTITY % link.element "INCLUDE">
+<![%link.element;[
+<!ELEMENT link %ho; (%para.char.mix;)*
+		%links.exclusion;>
+<!--end of link.element-->]]>
+
+<!-- Endterm: ID of element containing text that is to be
+		fetched from elsewhere in the document to appear as
+		the content of this element -->
+<!-- to linked-to object -->
+<!-- Type: Freely assignable parameter -->
+
+
+<!ENTITY % link.attlist "INCLUDE">
+<![%link.attlist;[
+<!ATTLIST link
+		endterm		IDREF		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		type		CDATA		#IMPLIED
+		%linkendreq.attrib;
+		%common.attrib;
+		%link.role.attrib;
+		%local.link.attrib;
+>
+<!--end of link.attlist-->]]>
+<!--end of link.module-->]]>
+
+<!ENTITY % olink.module "INCLUDE">
+<![%olink.module;[
+<!ENTITY % local.olink.attrib "">
+<!ENTITY % olink.role.attrib "%role.attrib;">
+
+<!ENTITY % olink.element "INCLUDE">
+<![%olink.element;[
+<!ELEMENT olink %ho; (%para.char.mix;)*
+		%links.exclusion;>
+<!--end of olink.element-->]]>
+
+<!-- TargetDocEnt: Name of an entity to be the target of the link -->
+<!-- LinkMode: ID of a ModeSpec containing instructions for
+		operating on the entity named by TargetDocEnt -->
+<!-- LocalInfo: Information that may be passed to ModeSpec -->
+<!-- Type: Freely assignable parameter -->
+
+
+<!ENTITY % olink.attlist "INCLUDE">
+<![%olink.attlist;[
+<!ATTLIST olink
+		targetdocent	ENTITY 		#IMPLIED
+		linkmode	IDREF		#IMPLIED
+		localinfo 	CDATA		#IMPLIED
+		type		CDATA		#IMPLIED
+		targetdoc	CDATA		#IMPLIED
+		targetptr	CDATA		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		%common.attrib;
+		%olink.role.attrib;
+		%local.olink.attrib;
+>
+<!--end of olink.attlist-->]]>
+<!--end of olink.module-->]]>
+
+<!ENTITY % ulink.module "INCLUDE">
+<![%ulink.module;[
+<!ENTITY % local.ulink.attrib "">
+<!ENTITY % ulink.role.attrib "%role.attrib;">
+
+<!ENTITY % ulink.element "INCLUDE">
+<![%ulink.element;[
+<!ELEMENT ulink %ho; (%para.char.mix;)*
+		%links.exclusion;>
+<!--end of ulink.element-->]]>
+
+<!-- URL: uniform resource locator; the target of the ULink -->
+<!-- Type: Freely assignable parameter -->
+
+
+<!ENTITY % ulink.attlist "INCLUDE">
+<![%ulink.attlist;[
+<!ATTLIST ulink
+		url		CDATA		#REQUIRED
+		type		CDATA		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		%common.attrib;
+		%ulink.role.attrib;
+		%local.ulink.attrib;
+>
+<!--end of ulink.attlist-->]]>
+<!--end of ulink.module-->]]>
+
+<!ENTITY % footnoteref.module "INCLUDE">
+<![%footnoteref.module;[
+<!ENTITY % local.footnoteref.attrib "">
+<!ENTITY % footnoteref.role.attrib "%role.attrib;">
+
+<!ENTITY % footnoteref.element "INCLUDE">
+<![%footnoteref.element;[
+<!ELEMENT footnoteref %ho; EMPTY>
+<!--end of footnoteref.element-->]]>
+
+<!-- to footnote content supplied elsewhere -->
+
+
+<!ENTITY % footnoteref.attlist "INCLUDE">
+<![%footnoteref.attlist;[
+<!ATTLIST footnoteref
+		%linkendreq.attrib;		%label.attrib;
+		%common.attrib;
+		%footnoteref.role.attrib;
+		%local.footnoteref.attrib;
+>
+<!--end of footnoteref.attlist-->]]>
+<!--end of footnoteref.module-->]]>
+
+<!ENTITY % xref.module "INCLUDE">
+<![%xref.module;[
+<!ENTITY % local.xref.attrib "">
+<!ENTITY % xref.role.attrib "%role.attrib;">
+
+<!ENTITY % xref.element "INCLUDE">
+<![%xref.element;[
+<!ELEMENT xref %ho; EMPTY>
+<!--end of xref.element-->]]>
+
+<!-- Endterm: ID of element containing text that is to be
+		fetched from elsewhere in the document to appear as
+		the content of this element -->
+<!-- to linked-to object -->
+
+
+<!ENTITY % xref.attlist "INCLUDE">
+<![%xref.attlist;[
+<!ATTLIST xref
+		endterm		IDREF		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		%common.attrib;
+		%linkendreq.attrib;
+		%xref.role.attrib;
+		%local.xref.attrib;
+>
+<!--end of xref.attlist-->]]>
+<!--end of xref.module-->]]>
+
+<!ENTITY % biblioref.module "INCLUDE">
+<![%biblioref.module;[
+<!ENTITY % local.biblioref.attrib "">
+<!ENTITY % biblioref.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioref.element "INCLUDE">
+<![%biblioref.element;[
+<!ELEMENT biblioref %ho; EMPTY>
+<!--end of biblioref.element-->]]>
+
+<!ENTITY % biblioref.attlist "INCLUDE">
+<![%biblioref.attlist;[
+<!ATTLIST biblioref
+		endterm		IDREF		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		units		CDATA		#IMPLIED
+		begin		CDATA		#IMPLIED
+		end		CDATA		#IMPLIED
+		%common.attrib;
+		%linkendreq.attrib;
+		%biblioref.role.attrib;
+		%local.biblioref.attrib;
+>
+<!--end of biblioref.attlist-->]]>
+<!--end of biblioref.module-->]]>
+
+<!-- Ubiquitous elements .................................................. -->
+
+<!ENTITY % anchor.module "INCLUDE">
+<![%anchor.module;[
+<!ENTITY % local.anchor.attrib "">
+<!ENTITY % anchor.role.attrib "%role.attrib;">
+
+<!ENTITY % anchor.element "INCLUDE">
+<![%anchor.element;[
+<!ELEMENT anchor %ho; EMPTY>
+<!--end of anchor.element-->]]>
+
+<!-- required -->
+<!-- replaces Lang -->
+
+
+<!ENTITY % anchor.attlist "INCLUDE">
+<![%anchor.attlist;[
+<!ATTLIST anchor
+		%idreq.attrib;		%pagenum.attrib;		%remap.attrib;
+		%xreflabel.attrib;
+		%revisionflag.attrib;
+		%effectivity.attrib;
+		%anchor.role.attrib;
+		%local.anchor.attrib;
+>
+<!--end of anchor.attlist-->]]>
+<!--end of anchor.module-->]]>
+
+<!ENTITY % beginpage.module "INCLUDE">
+<![%beginpage.module;[
+<!ENTITY % local.beginpage.attrib "">
+<!ENTITY % beginpage.role.attrib "%role.attrib;">
+
+<!ENTITY % beginpage.element "INCLUDE">
+<![%beginpage.element;[
+<!ELEMENT beginpage %ho; EMPTY>
+<!--end of beginpage.element-->]]>
+
+<!-- PageNum: Number of page that begins at this point -->
+
+
+<!ENTITY % beginpage.attlist "INCLUDE">
+<![%beginpage.attlist;[
+<!ATTLIST beginpage
+		%pagenum.attrib;
+		%common.attrib;
+		%beginpage.role.attrib;
+		%local.beginpage.attrib;
+>
+<!--end of beginpage.attlist-->]]>
+<!--end of beginpage.module-->]]>
+
+<!-- IndexTerms appear in the text flow for generating or linking an
+     index. -->
+
+<!ENTITY % indexterm.content.module "INCLUDE">
+<![%indexterm.content.module;[
+<!ENTITY % indexterm.module "INCLUDE">
+<![%indexterm.module;[
+<!ENTITY % local.indexterm.attrib "">
+<!ENTITY % indexterm.role.attrib "%role.attrib;">
+
+<!ENTITY % indexterm.element "INCLUDE">
+<![%indexterm.element;[
+<!ELEMENT indexterm %ho; (primary?, ((secondary, ((tertiary, (see|seealso+)?)
+		| see | seealso+)?) | see | seealso+)?)
+			%ubiq.exclusion;>
+<!--end of indexterm.element-->]]>
+
+<!-- Scope: Indicates which generated indices the IndexTerm
+		should appear in: Global (whole document set), Local (this
+		document only), or All (both) -->
+<!-- Significance: Whether this IndexTerm is the most pertinent
+		of its series (Preferred) or not (Normal, the default) -->
+<!-- Class: Indicates type of IndexTerm; default is Singular,
+		or EndOfRange if StartRef is supplied; StartOfRange value
+		must be supplied explicitly on starts of ranges -->
+<!-- StartRef: ID of the IndexTerm that starts the indexing
+		range ended by this IndexTerm -->
+<!-- Zone: IDs of the elements to which the IndexTerm applies,
+		and indicates that the IndexTerm applies to those entire
+		elements rather than the point at which the IndexTerm
+		occurs -->
+
+
+<!ENTITY % indexterm.attlist "INCLUDE">
+<![%indexterm.attlist;[
+<!ATTLIST indexterm
+		%pagenum.attrib;
+		scope		(all
+				|global
+				|local)		#IMPLIED
+		significance	(preferred
+				|normal)	"normal"
+		class		(singular
+				|startofrange
+				|endofrange)	#IMPLIED
+		startref	IDREF		#IMPLIED
+		zone		IDREFS		#IMPLIED
+		type		CDATA		#IMPLIED
+		%common.attrib;
+		%indexterm.role.attrib;
+		%local.indexterm.attrib;
+>
+<!--end of indexterm.attlist-->]]>
+<!--end of indexterm.module-->]]>
+
+<!ENTITY % primsecter.module "INCLUDE">
+<![%primsecter.module;[
+<!ENTITY % local.primsecter.attrib "">
+<!ENTITY % primsecter.role.attrib "%role.attrib;">
+
+
+<!ENTITY % primary.element "INCLUDE">
+<![%primary.element;[
+<!ELEMENT primary %ho;   (%ndxterm.char.mix;)*>
+<!--end of primary.element-->]]>
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+
+<!ENTITY % primary.attlist "INCLUDE">
+<![%primary.attlist;[
+<!ATTLIST primary
+		sortas		CDATA		#IMPLIED
+		%common.attrib;
+		%primsecter.role.attrib;
+		%local.primsecter.attrib;
+>
+<!--end of primary.attlist-->]]>
+
+
+<!ENTITY % secondary.element "INCLUDE">
+<![%secondary.element;[
+<!ELEMENT secondary %ho; (%ndxterm.char.mix;)*>
+<!--end of secondary.element-->]]>
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+
+<!ENTITY % secondary.attlist "INCLUDE">
+<![%secondary.attlist;[
+<!ATTLIST secondary
+		sortas		CDATA		#IMPLIED
+		%common.attrib;
+		%primsecter.role.attrib;
+		%local.primsecter.attrib;
+>
+<!--end of secondary.attlist-->]]>
+
+
+<!ENTITY % tertiary.element "INCLUDE">
+<![%tertiary.element;[
+<!ELEMENT tertiary %ho;  (%ndxterm.char.mix;)*>
+<!--end of tertiary.element-->]]>
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+
+<!ENTITY % tertiary.attlist "INCLUDE">
+<![%tertiary.attlist;[
+<!ATTLIST tertiary
+		sortas		CDATA		#IMPLIED
+		%common.attrib;
+		%primsecter.role.attrib;
+		%local.primsecter.attrib;
+>
+<!--end of tertiary.attlist-->]]>
+
+<!--end of primsecter.module-->]]>
+
+<!ENTITY % seeseealso.module "INCLUDE">
+<![%seeseealso.module;[
+<!ENTITY % local.seeseealso.attrib "">
+<!ENTITY % seeseealso.role.attrib "%role.attrib;">
+
+<!ENTITY % see.element "INCLUDE">
+<![%see.element;[
+<!ELEMENT see %ho; (%ndxterm.char.mix;)*>
+<!--end of see.element-->]]>
+
+<!ENTITY % see.attlist "INCLUDE">
+<![%see.attlist;[
+<!ATTLIST see
+		%common.attrib;
+		%seeseealso.role.attrib;
+		%local.seeseealso.attrib;
+>
+<!--end of see.attlist-->]]>
+
+<!ENTITY % seealso.element "INCLUDE">
+<![%seealso.element;[
+<!ELEMENT seealso %ho; (%ndxterm.char.mix;)*>
+<!--end of seealso.element-->]]>
+
+<!ENTITY % seealso.attlist "INCLUDE">
+<![%seealso.attlist;[
+<!ATTLIST seealso
+		%common.attrib;
+		%seeseealso.role.attrib;
+		%local.seeseealso.attrib;
+>
+<!--end of seealso.attlist-->]]>
+<!--end of seeseealso.module-->]]>
+<!--end of indexterm.content.module-->]]>
+
+<!-- End of DocBook XML information pool module V4.4 ...................... -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting/docbookx.dtd b/xml/tests/testData/xml/DocBookHighlighting/docbookx.dtd
new file mode 100644
index 000000000000..e93b60188bd2
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/docbookx.dtd
@@ -0,0 +1,170 @@
+<!-- ...................................................................... -->
+<!-- DocBook XML DTD V4.4 ................................................. -->
+<!-- File docbookx.dtd .................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     See also http://docbook.org/specs/
+
+     $Id: docbookx.dtd,v 1.31 2005/01/27 13:52:36 nwalsh Exp $
+
+     Permission to use, copy, modify and distribute the DocBook XML DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This is the driver file for V4.4 of the DocBook DTD.
+     Please use the following formal public identifier to identify it:
+
+     "-//OASIS//DTD DocBook XML V4.4//EN"
+
+     For example, if your document's top-level element is Book, and
+     you are using DocBook directly, use the FPI in the DOCTYPE
+     declaration:
+
+     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+                    "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
+                    [...]>
+
+     Or, if you have a higher-level driver file that customizes DocBook,
+     use the FPI in the parameter entity declaration:
+
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+                "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+     %DocBookDTD;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+<!-- Enable SGML features ................................................. -->
+
+<!ENTITY % sgml.features "IGNORE">
+<![%sgml.features;[
+<!ENTITY % xml.features "IGNORE">
+]]>
+<!ENTITY % xml.features "INCLUDE">
+
+<![%sgml.features;[
+<![%xml.features;[
+
+<!-- ERROR: Exactly one of xml.features and sgml.features must be turned on! -->
+<!ENTITY % dbnotn SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+<!ENTITY % dbcent SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+<!ENTITY % dbpool SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+<!ENTITY % dbhier SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+<!ENTITY % dbgenent SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+
+]]>
+]]>
+
+<![%sgml.features;[
+<!ENTITY % ho "- O">
+<!ENTITY % hh "- -">
+]]>
+
+<![%xml.features;[
+<!ENTITY % ho "">
+<!ENTITY % hh "">
+]]>
+
+<!-- ...................................................................... -->
+<!-- Notation declarations ................................................ -->
+
+<!ENTITY % dbnotn.module "INCLUDE">
+<![%dbnotn.module;[
+<!ENTITY % dbnotn PUBLIC
+"-//OASIS//ENTITIES DocBook Notations V4.4//EN"
+"dbnotnx.mod">
+%dbnotn;
+]]>
+
+<!-- ...................................................................... -->
+<!-- ISO character entity sets ............................................ -->
+
+<!ENTITY % dbcent.module "INCLUDE">
+<![%dbcent.module;[
+
+<!ENTITY % dbcent.euro "INCLUDE">
+<![%dbcent.euro;[
+<![%sgml.features;[
+<!ENTITY euro SDATA "[euro  ]"><!-- euro sign -->
+]]>
+<![%xml.features;[
+<!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
+]]>
+]]>
+
+<!ENTITY % dbcent PUBLIC
+"-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
+"dbcentx.mod">
+%dbcent;
+]]>
+
+<!-- ...................................................................... -->
+<!-- DTD modules .......................................................... -->
+
+<!-- Information pool .............. -->
+
+<!ENTITY % dbpool.module "INCLUDE">
+<![ %dbpool.module; [
+<!ENTITY % dbpool PUBLIC
+"-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
+"dbpoolx.mod">
+%dbpool;
+]]>
+
+<!-- Redeclaration placeholder ..... -->
+
+<!ENTITY % intermod.redecl.module "IGNORE">
+<![%intermod.redecl.module;[
+<!-- Defining rdbmods here makes some buggy XML parsers happy. -->
+<!ENTITY % rdbmods "">
+%rdbmods;
+<!--end of intermod.redecl.module-->]]>
+
+<!-- Document hierarchy ............ -->
+
+<!ENTITY % dbhier.module "INCLUDE">
+<![ %dbhier.module; [
+<!ENTITY % dbhier PUBLIC
+"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
+"dbhierx.mod">
+%dbhier;
+]]>
+
+<!-- ...................................................................... -->
+<!-- Other general entities ............................................... -->
+
+<!ENTITY % dbgenent.module "INCLUDE">
+<![ %dbgenent.module; [
+<!ENTITY % dbgenent PUBLIC
+"-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
+"dbgenent.mod">
+%dbgenent;
+]]>
+
+<!-- End of DocBook XML DTD V4.4 .......................................... -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting/htmltblx.mod b/xml/tests/testData/xml/DocBookHighlighting/htmltblx.mod
new file mode 100644
index 000000000000..7805a9ff2a71
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/htmltblx.mod
@@ -0,0 +1,237 @@
+<!-- ...................................................................... -->
+<!-- DocBook XML HTML Table Module V4.4 ................................... -->
+<!-- File htmltblx.mod .................................................... -->
+
+<!-- Copyright 2003, 2004 ArborText, Inc., Norman Walsh, Sun Microsystems,
+     Inc., and the Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: htmltblx.mod,v 1.23 2005/01/27 13:52:00 nwalsh Exp $
+
+     Permission to use, copy, modify and distribute the DocBook XML DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook XML DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the definitions for elements that are
+     isomorphic to the HTML elements. One could argue we should
+     instead have based ourselves on the XHTML Table Module, but the
+     HTML one is more like what browsers are likely to accept today
+     and users are likely to use.
+
+     This module has been developed for use with the DocBook V4.4
+     "union table model" in which elements and attlists common to both
+     models are defined (as the union) in the CALS table module by
+     setting various parameter entities appropriately in this file.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % htmltbl PUBLIC
+     "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN"
+     "htmltblx.mod">
+     %htmltbl;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!--======================= XHTML Tables =======================================-->
+
+<!ENTITY % html.coreattrs
+ "id          ID             #IMPLIED
+  class       CDATA          #IMPLIED
+  style       CDATA          #IMPLIED
+  title       CDATA         #IMPLIED"
+  >
+
+<!-- Does not contain lang or dir because they are in %common.attribs -->
+<!ENTITY % i18n
+ "xml:lang    NMTOKEN        #IMPLIED"
+  >
+
+<!ENTITY % events
+ "onclick     CDATA       #IMPLIED
+  ondblclick  CDATA       #IMPLIED
+  onmousedown CDATA       #IMPLIED
+  onmouseup   CDATA       #IMPLIED
+  onmouseover CDATA       #IMPLIED
+  onmousemove CDATA       #IMPLIED
+  onmouseout  CDATA       #IMPLIED
+  onkeypress  CDATA       #IMPLIED
+  onkeydown   CDATA       #IMPLIED
+  onkeyup     CDATA       #IMPLIED"
+  >
+
+<!ENTITY % attrs "%html.coreattrs; %i18n; %events;">
+
+<!ENTITY % cellhalign
+  "align      (left|center|right|justify|char) #IMPLIED
+   char       CDATA    #IMPLIED
+   charoff    CDATA       #IMPLIED"
+  >
+
+<!ENTITY % cellvalign
+  "valign     (top|middle|bottom|baseline) #IMPLIED"
+  >
+
+<!ELEMENT colgroup (col)*>
+<!ELEMENT col      EMPTY>
+<!ELEMENT tr       (th|td)+>
+<!ELEMENT th       (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+<!ELEMENT td       (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+
+<!ATTLIST colgroup
+  %attrs;
+  span        CDATA       "1"
+  width       CDATA  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST col
+  %attrs;
+  span        CDATA       "1"
+  width       CDATA  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tr
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  bgcolor     CDATA        #IMPLIED
+  >
+
+<!ATTLIST th
+  %attrs;
+  abbr        CDATA         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       (row|col|rowgroup|colgroup)   #IMPLIED
+  rowspan     CDATA       "1"
+  colspan     CDATA       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     CDATA         #IMPLIED
+  width       CDATA       #IMPLIED
+  height      CDATA       #IMPLIED
+  >
+
+<!ATTLIST td
+  %attrs;
+  abbr        CDATA         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       (row|col|rowgroup|colgroup)   #IMPLIED
+  rowspan     CDATA       "1"
+  colspan     CDATA       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     CDATA         #IMPLIED
+  width       CDATA       #IMPLIED
+  height      CDATA       #IMPLIED
+  >
+
+<!-- ====================================================== -->
+<!--        Set up to read in the CALS model configured to
+            merge with the XHTML table model                -->
+<!-- ====================================================== -->
+
+<!ENTITY % tables.role.attrib "%role.attrib;">
+
+<!-- Add label and role attributes to table and informaltable -->
+<!ENTITY % bodyatt "
+		floatstyle	CDATA			#IMPLIED
+		rowheader	(firstcol|norowheader)	#IMPLIED
+                %label.attrib;"
+>
+
+<!-- Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
+     EntryTbl, and Entry (and InformalTable element). -->
+
+<!ENTITY % secur "
+	%common.attrib;
+	class       CDATA          #IMPLIED
+	style       CDATA          #IMPLIED
+	title       CDATA         #IMPLIED
+	%i18n;
+	%events;
+	%tables.role.attrib;">
+
+<!ENTITY % common.table.attribs
+	"%bodyatt;
+	%secur;">
+
+<!-- Content model for Table (that also allows HTML tables) -->
+<!ENTITY % tbl.table.mdl
+	"((blockinfo?,
+           (%formalobject.title.content;),
+           (%ndxterm.class;)*,
+           textobject*,
+           (graphic+|mediaobject+|tgroup+))
+         |(caption, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+)))">
+
+<!ENTITY % informal.tbl.table.mdl
+	"(textobject*,
+          (graphic+|mediaobject+|tgroup+))
+         | ((col*|colgroup*), thead?, tfoot?, (tbody+|tr+))">
+
+<!-- Attributes for Table (including HTML ones) -->
+
+<!-- N.B. rules = (none | groups | rows | cols | all) but it can't be spec'd -->
+<!-- that way because 'all' already occurs in a different enumeration in -->
+<!-- CALS tables (frame). -->
+
+<!ENTITY % tbl.table.att        '
+    tabstyle    CDATA           #IMPLIED
+    tocentry    %yesorno.attvals;       #IMPLIED
+    shortentry  %yesorno.attvals;       #IMPLIED
+    orient      (port|land)     #IMPLIED
+    pgwide      %yesorno.attvals;       #IMPLIED
+    summary     CDATA          #IMPLIED
+    width       CDATA        #IMPLIED
+    border      CDATA        #IMPLIED
+    rules       CDATA		#IMPLIED
+    cellspacing CDATA        #IMPLIED
+    cellpadding CDATA        #IMPLIED
+    align       (left|center|right)   #IMPLIED
+    bgcolor     CDATA         #IMPLIED
+'>
+
+<!ENTITY % tbl.frame.attval "void|above|below|hsides|lhs|rhs|vsides|box|border|
+top|bottom|topbot|all|sides|none">
+
+<!-- Allow either objects or inlines; beware of REs between elements. -->
+<!ENTITY % tbl.entry.mdl "%para.char.mix; | %tabentry.mix;">
+
+<!-- thead, tfoot, and tbody are defined in both table models,
+     so we set up parameter entities to define union models for them
+ -->
+
+<!ENTITY % tbl.hdft.mdl        "(tr+|(colspec*,row+))">
+<!ENTITY % tbl.tbody.mdl       "(tr+|row+)">
+<!ENTITY % tbl.valign.attval   "top|middle|bottom|baseline">
+
+<!-- End of DocBook XML HTML Table Module V4.4 ............................ -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting/soextblx.dtd b/xml/tests/testData/xml/DocBookHighlighting/soextblx.dtd
new file mode 100644
index 000000000000..f51e4d7710b0
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting/soextblx.dtd
@@ -0,0 +1,314 @@
+<!-- XML EXCHANGE TABLE MODEL DECLARATION MODULE -->
+
+<!-- This set of declarations defines the XML version of the Exchange
+     Table Model as of the date shown in the Formal Public Identifier
+     (FPI) for this entity.
+
+     This set of declarations may be referred to using a public external
+     entity declaration and reference as shown in the following three
+     lines:
+
+     <!ENTITY % calstblx
+       PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN">
+       %calstblx;
+
+     If various parameter entities used within this set of declarations
+     are to be given non-default values, the appropriate declarations
+     should be given before calling in this package (i.e., before the
+     "%calstblx;" reference).
+-->
+
+<!-- The motivation for this XML version of the Exchange Table Model
+     is simply to create an XML version of the SGML Exchange Table
+     Model. By design, no effort has been made to "improve" the model.
+
+     This XML version incorporates the logical bare minimum changes
+     necessary to make the Exchange Table Model a valid XML DTD.
+
+     It has been modified slightly for use in the combined HTML/CALS models
+     supported by DocBook V4.3 and later.
+-->
+
+<!-- The XML version of the Exchange Table Model differs from
+     the SGML version in the following ways:
+
+     The following parameter entities have been removed:
+
+       - tbl.table.excep, tbl.hdft.excep, tbl.row.excep, tbl.entry.excep
+         There are no exceptions in XML. The following normative statement
+         is made in lieu of exceptions: the exchange table model explicitly
+         forbids a table from occurring within another table. If the
+         content model of an entry includes a table element, then this
+         cannot be enforced by the DTD, but it is a deviation from the
+         exchange table model to include a table within a table.
+
+       - tbl.hdft.name, tbl.hdft.mdl, tbl.hdft.excep, tbl.hdft.att
+         The motivation for these elements was to change the table
+         header/footer elements. Since XML does not allow element declarations
+         to contain name groups, and the exchange table model does not
+         allow a table to contain footers, the continued presence of these
+         attributes seems unnecessary.
+
+     The following parameter entity has been added:
+
+       - tbl.thead.att
+         This entity parameterizes the attributes on thead. It replaces
+         the tbl.hdft.att parameter entity.
+
+     Other miscellaneous changes:
+
+       - Tag ommission indicators have been removed
+       - Comments have been removed from declarations
+       - NUMBER attributes have been changed to NMTOKEN
+       - NUTOKEN attributes have been to changed to NMTOKEN
+       - Removed the grouping characters around the content model
+         parameter entry for the 'entry' element. This is necessary
+         so that an entry can contain #PCDATA and be defined as an
+         optional, repeatable OR group beginning with #PCDATA.
+-->
+
+<!-- This entity includes a set of element and attribute declarations
+     that partially defines the Exchange table model.  However, the model
+     is not well-defined without the accompanying natural language
+     description of the semantics (meanings) of these various elements,
+     attributes, and attribute values.  The semantic writeup, also available
+     from SGML Open, should be used in conjunction with this entity.
+-->
+
+<!-- In order to use the Exchange table model, various parameter entity
+     declarations are required.  A brief description is as follows:
+
+     ENTITY NAME      WHERE USED              WHAT IT IS
+
+     %yesorno         In ATTLIST of:          An attribute declared value
+                      almost all elements     for a "boolean" attribute
+
+     %paracon         In content model of:    The "text" (logical content)
+                      <entry>                 of the model group for <entry>
+
+     %titles          In content model of:    The "title" part of the model
+                      table element           group for the table element
+
+     %tbl.table.name  In declaration of:      The name of the "table"
+                      table element           element
+
+     %tbl.table-titles.mdl In content model of: The model group for the title
+                      table elements          part of the content model for
+                                              table element
+
+     %tbl.table.mdl   In content model of:    The model group for the content
+                      table elements          model for table element,
+                                              often (and by default) defined
+                                              in terms of %tbl.table-titles.mdl
+                                              and tgroup
+
+     %tbl.table.att   In ATTLIST of:          Additional attributes on the
+                      table element           table element
+
+     %bodyatt         In ATTLIST of:          Additional attributes on the
+                      table element           table element (for backward
+                                              compatibility with the SGML
+                                              model)
+
+     %tbl.tgroup.mdl  In content model of:    The model group for the content
+                      <tgroup>                model for <tgroup>
+
+     %tbl.tgroup.att  In ATTLIST of:          Additional attributes on the
+                      <tgroup>                <tgroup> element
+
+     %tbl.thead.att   In ATTLIST of:          Additional attributes on the
+                      <thead>                 <thead> element
+
+     %tbl.tbody.att   In ATTLIST of:          Additional attributes on the
+                      <tbody>                 <tbody> element
+
+     %tbl.colspec.att In ATTLIST of:          Additional attributes on the
+                      <colspec>               <colspec> element
+
+     %tbl.row.mdl     In content model of:    The model group for the content
+                      <row>                   model for <row>
+
+     %tbl.row.att     In ATTLIST of:          Additional attributes on the
+                      <row>                   <row> element
+
+     %tbl.entry.mdl   In content model of:    The model group for the content
+                      <entry>                 model for <entry>
+
+     %tbl.entry.att   In ATTLIST of:          Additional attributes on the
+                      <entry>                 <entry> element
+
+     This set of declarations will use the default definitions shown below
+     for any of these parameter entities that are not declared before this
+     set of declarations is referenced.
+-->
+
+<!-- These definitions are not directly related to the table model, but are
+     used in the default CALS table model and may be defined elsewhere (and
+     prior to the inclusion of this table module) in the referencing DTD. -->
+
+<!ENTITY % yesorno 'NMTOKEN'> <!-- no if zero(s), yes if any other value -->
+<!ENTITY % titles  'title?'>
+<!ENTITY % pcd "#PCDATA">
+<!ENTITY % paracon '%pcd;'> <!-- default for use in entry content -->
+
+<!--
+The parameter entities as defined below change and simplify the CALS table
+model as published (as part of the Example DTD) in MIL-HDBK-28001.  The
+resulting simplified DTD has support from the SGML Open vendors and is
+therefore more interoperable among different systems.
+
+These following declarations provide the Exchange default definitions
+for these entities.  However, these entities can be redefined (by giving
+the appropriate parameter entity declaration(s) prior to the reference
+to this Table Model declaration set entity) to fit the needs of the
+current application.
+
+Note, however, that changes may have significant effect on the ability to
+interchange table information.  These changes may manifest themselves
+in useability, presentation, and possible structure information degradation.
+-->
+
+<!ENTITY % tbl.table.name       "table">
+<!ENTITY % tbl.table-titles.mdl "%titles;,">
+<!ENTITY % tbl.table-main.mdl   "tgroup+">
+<!ENTITY % tbl.table.mdl        "%tbl.table-titles.mdl; %tbl.table-main.mdl;">
+<!ENTITY % tbl.table.att        "
+    pgwide      %yesorno;       #IMPLIED ">
+<!ENTITY % bodyatt              "">
+<!ENTITY % tbl.tgroup.mdl       "colspec*,thead?,tbody">
+<!ENTITY % tbl.tgroup.att       "">
+<!ENTITY % tbl.thead.att        "">
+<!ENTITY % tbl.tbody.att        "">
+<!ENTITY % tbl.colspec.att      "">
+<!ENTITY % tbl.row.mdl          "entry+">
+<!ENTITY % tbl.row.att          "">
+<!ENTITY % tbl.entry.mdl        "(%paracon;)*">
+<!ENTITY % tbl.entry.att        "">
+
+<!ENTITY % tbl.frame.attval     "top|bottom|topbot|all|sides|none">
+<!ENTITY % tbl.tbody.mdl        "row+">
+
+<!-- =====  Element and attribute declarations follow. =====  -->
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.table.name       "table"
+     ENTITY % tbl.table-titles.mdl "%titles;,"
+     ENTITY % tbl.table.mdl        "%tbl.table-titles; tgroup+"
+     ENTITY % tbl.table.att        "
+                        pgwide          %yesorno;       #IMPLIED "
+-->
+
+<!ELEMENT %tbl.table.name; (%tbl.table.mdl;)>
+
+<!ATTLIST %tbl.table.name;
+        frame           (%tbl.frame.attval;)                    #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        %tbl.table.att;
+        %bodyatt;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.tgroup.mdl    "colspec*,thead?,tbody"
+     ENTITY % tbl.tgroup.att    ""
+-->
+
+<!ELEMENT tgroup (%tbl.tgroup.mdl;) >
+
+<!ATTLIST tgroup
+        cols            NMTOKEN                                 #REQUIRED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        %tbl.tgroup.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.colspec.att   ""
+-->
+
+<!ELEMENT colspec EMPTY >
+
+<!ATTLIST colspec
+        colnum          NMTOKEN                                 #IMPLIED
+        colname         NMTOKEN                                 #IMPLIED
+        colwidth        CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         NMTOKEN                                 #IMPLIED
+        %tbl.colspec.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.thead.att      ""
+-->
+
+<!ELEMENT thead (row+)>
+
+<!ATTLIST thead
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.thead.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.tbody.att     ""
+-->
+
+<!ELEMENT tbody (%tbl.tbody.mdl;)>
+
+<!ATTLIST tbody
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.tbody.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.row.mdl       "entry+"
+     ENTITY % tbl.row.att       ""
+-->
+
+<!ELEMENT row (%tbl.row.mdl;)>
+
+<!ATTLIST row
+        rowsep          %yesorno;                               #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.row.att;
+>
+
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % paracon           "#PCDATA"
+     ENTITY % tbl.entry.mdl     "(%paracon;)*"
+     ENTITY % tbl.entry.att     ""
+-->
+
+<!ELEMENT entry (%tbl.entry.mdl;)*>
+
+<!ATTLIST entry
+        colname         NMTOKEN                                 #IMPLIED
+        namest          NMTOKEN                                 #IMPLIED
+        nameend         NMTOKEN                                 #IMPLIED
+        morerows        NMTOKEN                                 #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         NMTOKEN                                 #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.entry.att;
+>
diff --git a/xml/tests/testData/xml/DocBookHighlighting2.xml b/xml/tests/testData/xml/DocBookHighlighting2.xml
new file mode 100644
index 000000000000..8040f30de4d5
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2.xml
@@ -0,0 +1,43 @@
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+        "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+
+        [<!ENTITY etc "etc."><!ENTITY ie  "i.e."><!ENTITY eg  "e.g.">]>
+<book>
+    <bookinfo>
+        <title>Taming Text</title>
+        <subtitle>Find, Organize and Manipulate Content</subtitle>
+
+        <author>
+            <firstname>Grant</firstname>
+            <surname>Ingersoll</surname>
+        </author>
+
+        <date>
+
+        </date>
+
+    </bookinfo>
+    <chapter><title>Test</title>
+        <section><title>Bad Table</title>
+            <para><table>
+                <title>Really Bad Table</title>
+                        <tgroup cols="2">
+                            <thead>
+                                <row>
+                                    <entry>Foo</entry>
+                                    <entry>Bar</entry>
+                                </row>
+                            </thead>
+                            <tbody>
+
+                                <row>
+                                    <entry>Hi</entry>
+                                    <entry>Entry
+                                    </entry>
+                                </row>
+                            </tbody>
+                        </tgroup>
+            </table></para>
+        </section>
+    </chapter>
+</book>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/calstblx.dtd b/xml/tests/testData/xml/DocBookHighlighting2/calstblx.dtd
new file mode 100644
index 000000000000..fac58d77e1c3
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/calstblx.dtd
@@ -0,0 +1,215 @@
+<!-- ...................................................................... -->
+<!-- DocBook CALS Table Model V4.5 ........................................ -->
+<!-- File calstblx.mod .................................................... -->
+
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     This DTD is based on the CALS Table Model
+     PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
+
+     $Id: calstblx.dtd 6340 2006-10-03 13:23:24Z nwalsh $
+
+     Permission to use, copy, modify and distribute the DocBook DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the definitions for the CALS Table Model
+     converted to XML. It has been modified slightly for use in the
+     combined HTML/CALS models supported by DocBook V4.5.
+-->
+
+<!-- These definitions are not directly related to the table model, but are
+     used in the default CALS table model and are usually defined elsewhere
+     (and prior to the inclusion of this table module) in a CALS DTD. -->
+
+<!ENTITY % bodyatt "">
+<!ENTITY % secur "">
+
+<!-- no if zero(s),
+                                yes if any other digits value -->
+
+<!ENTITY % yesorno 'CDATA'>
+<!ENTITY % titles  'title?'>
+
+<!-- default for use in entry content -->
+
+<!ENTITY % paracon '#PCDATA'>
+
+<!--
+The parameter entities as defined below provide the CALS table model
+as published (as part of the Example DTD) in MIL-HDBK-28001.
+
+These following declarations provide the CALS-compliant default definitions
+for these entities.  However, these entities can and should be redefined
+(by giving the appropriate parameter entity declaration(s) prior to the
+reference to this Table Model declaration set entity) to fit the needs
+of the current application.
+-->
+
+<!ENTITY % tbl.table.name       "(table|chart)">
+<!ENTITY % tbl.table-titles.mdl "%titles;,">
+<!ENTITY % tbl.table-main.mdl   "(tgroup+|graphic+)">
+<!ENTITY % tbl.table.mdl        "%tbl.table-titles.mdl; %tbl.table-main.mdl;">
+<!ENTITY % tbl.table.att        '
+    tabstyle    CDATA           #IMPLIED
+    tocentry    %yesorno;       #IMPLIED
+    shortentry  %yesorno;       #IMPLIED
+    orient      (port|land)     #IMPLIED
+    pgwide      %yesorno;       #IMPLIED '>
+<!ENTITY % tbl.tgroup.mdl       "colspec*,spanspec*,thead?,tfoot?,tbody">
+<!ENTITY % tbl.tgroup.att       '
+    tgroupstyle CDATA           #IMPLIED '>
+<!ENTITY % tbl.hdft.mdl         "colspec*,row+">
+<!ENTITY % tbl.row.mdl          "(entry|entrytbl)+">
+<!ENTITY % tbl.entrytbl.mdl     "colspec*,spanspec*,thead?,tbody">
+<!ENTITY % tbl.entry.mdl        "(para|warning|caution|note|legend|%paracon;)*">
+
+<!ENTITY % tbl.frame.attval     "top|bottom|topbot|all|sides|none">
+<!ENTITY % tbl.tbody.mdl        "row+">
+
+<!-- =====  Element and attribute declarations follow. =====  -->
+
+<!--doc:A formal table in a document.-->
+<!ELEMENT table %ho; (%tbl.table.mdl;)>
+
+<!ATTLIST table
+        frame           (%tbl.frame.attval;)                    #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        %tbl.table.att;
+        %bodyatt;
+        %secur;
+>
+
+<!--doc:A wrapper for the main content of a table, or part of a table.-->
+<!ELEMENT tgroup %ho; (%tbl.tgroup.mdl;) >
+
+<!ATTLIST tgroup
+        cols            CDATA                                   #REQUIRED
+        %tbl.tgroup.att;
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+        %secur;
+>
+
+<!--doc:Specifications for a column in a table.-->
+<!ELEMENT colspec %ho; EMPTY >
+
+<!ATTLIST colspec
+        colnum          CDATA                                   #IMPLIED
+        colname         CDATA                                   #IMPLIED
+        colwidth        CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+>
+
+<!--doc:Formatting information for a spanned column in a table.-->
+<!ELEMENT spanspec %ho; EMPTY >
+
+<!ATTLIST spanspec
+        namest          CDATA                                   #REQUIRED
+        nameend         CDATA                                   #REQUIRED
+        spanname        CDATA                                   #REQUIRED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+>
+
+<!--doc:A table header consisting of one or more rows.-->
+<!ELEMENT thead %ho; (%tbl.hdft.mdl;)>
+<!ATTLIST thead
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!--doc:A table footer consisting of one or more rows.-->
+<!ELEMENT tfoot %ho; (%tbl.hdft.mdl;)>
+<!ATTLIST tfoot
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!--doc:A wrapper for the rows of a table or informal table.-->
+<!ELEMENT tbody %ho; (%tbl.tbody.mdl;)>
+
+<!ATTLIST tbody
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!--doc:A row in a table.-->
+<!ELEMENT row %ho; (%tbl.row.mdl;)>
+
+<!ATTLIST row
+        rowsep          %yesorno;                               #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!--doc:A subtable appearing in place of an Entry in a table.-->
+<!ELEMENT entrytbl %ho; (%tbl.entrytbl.mdl;)>
+
+<!ATTLIST entrytbl
+        cols            CDATA                                   #REQUIRED
+        %tbl.tgroup.att;
+        colname         CDATA                                   #IMPLIED
+        spanname        CDATA                                   #IMPLIED
+        namest          CDATA                                   #IMPLIED
+        nameend         CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+        %secur;
+>
+
+<!--doc:A cell in a table.-->
+<!ELEMENT entry %ho; (%tbl.entry.mdl;)*>
+
+<!ATTLIST entry
+        colname         CDATA                                   #IMPLIED
+        namest          CDATA                                   #IMPLIED
+        nameend         CDATA                                   #IMPLIED
+        spanname        CDATA                                   #IMPLIED
+        morerows        CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         CDATA                                   #IMPLIED
+        rotate          %yesorno;                               #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %secur;
+>
+
+<!-- End of DocBook CALS Table Model V4.5 ................................. -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/dbcentx.mod b/xml/tests/testData/xml/DocBookHighlighting2/dbcentx.mod
new file mode 100644
index 000000000000..60de99f860c3
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/dbcentx.mod
@@ -0,0 +1,384 @@
+<!-- ...................................................................... -->
+<!-- DocBook character entities module V4.5 ............................... -->
+<!-- File dbcentx.mod ..................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: dbcentx.mod 6340 2006-10-03 13:23:24Z nwalsh $
+
+     Permission to use, copy, modify and distribute the DocBook DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the entity declarations for the standard ISO
+     entity sets used by DocBook.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbcent PUBLIC
+     "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+     "dbcentx.mod">
+     %dbcent;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+
+<![%sgml.features;[
+
+<!ENTITY % ISOamsa.module "INCLUDE">
+<![ %ISOamsa.module; [
+<!ENTITY % ISOamsa PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN">
+<!--end of ISOamsa.module-->]]>
+
+<!ENTITY % ISOamsb.module "INCLUDE">
+<![ %ISOamsb.module; [
+<!ENTITY % ISOamsb PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN">
+<!--end of ISOamsb.module-->]]>
+
+<!ENTITY % ISOamsc.module "INCLUDE">
+<![ %ISOamsc.module; [
+<!ENTITY % ISOamsc PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN">
+<!--end of ISOamsc.module-->]]>
+
+<!ENTITY % ISOamsn.module "INCLUDE">
+<![ %ISOamsn.module; [
+<!ENTITY % ISOamsn PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN">
+<!--end of ISOamsn.module-->]]>
+
+<!ENTITY % ISOamso.module "INCLUDE">
+<![ %ISOamso.module; [
+<!ENTITY % ISOamso PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN">
+<!--end of ISOamso.module-->]]>
+
+<!ENTITY % ISOamsr.module "INCLUDE">
+<![ %ISOamsr.module; [
+<!ENTITY % ISOamsr PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN">
+<!--end of ISOamsr.module-->]]>
+
+<!ENTITY % ISObox.module "INCLUDE">
+<![ %ISObox.module; [
+<!ENTITY % ISObox PUBLIC
+"ISO 8879:1986//ENTITIES Box and Line Drawing//EN">
+<!--end of ISObox.module-->]]>
+
+<!ENTITY % ISOcyr1.module "INCLUDE">
+<![ %ISOcyr1.module; [
+<!ENTITY % ISOcyr1 PUBLIC
+"ISO 8879:1986//ENTITIES Russian Cyrillic//EN">
+<!--end of ISOcyr1.module-->]]>
+
+<!ENTITY % ISOcyr2.module "INCLUDE">
+<![ %ISOcyr2.module; [
+<!ENTITY % ISOcyr2 PUBLIC
+"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN">
+<!--end of ISOcyr2.module-->]]>
+
+<!ENTITY % ISOdia.module "INCLUDE">
+<![ %ISOdia.module; [
+<!ENTITY % ISOdia PUBLIC
+"ISO 8879:1986//ENTITIES Diacritical Marks//EN">
+<!--end of ISOdia.module-->]]>
+
+<!ENTITY % ISOgrk1.module "INCLUDE">
+<![ %ISOgrk1.module; [
+<!ENTITY % ISOgrk1 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Letters//EN">
+<!--end of ISOgrk1.module-->]]>
+
+<!ENTITY % ISOgrk2.module "INCLUDE">
+<![ %ISOgrk2.module; [
+<!ENTITY % ISOgrk2 PUBLIC
+"ISO 8879:1986//ENTITIES Monotoniko Greek//EN">
+<!--end of ISOgrk2.module-->]]>
+
+<!ENTITY % ISOgrk3.module "INCLUDE">
+<![ %ISOgrk3.module; [
+<!ENTITY % ISOgrk3 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Symbols//EN">
+<!--end of ISOgrk3.module-->]]>
+
+<!ENTITY % ISOgrk4.module "INCLUDE">
+<![ %ISOgrk4.module; [
+<!ENTITY % ISOgrk4 PUBLIC
+"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN">
+<!--end of ISOgrk4.module-->]]>
+
+<!ENTITY % ISOlat1.module "INCLUDE">
+<![ %ISOlat1.module; [
+<!ENTITY % ISOlat1 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 1//EN">
+<!--end of ISOlat1.module-->]]>
+
+<!ENTITY % ISOlat2.module "INCLUDE">
+<![ %ISOlat2.module; [
+<!ENTITY % ISOlat2 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 2//EN">
+<!--end of ISOlat2.module-->]]>
+
+<!ENTITY % ISOnum.module "INCLUDE">
+<![ %ISOnum.module; [
+<!ENTITY % ISOnum PUBLIC
+"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN">
+<!--end of ISOnum.module-->]]>
+
+<!ENTITY % ISOpub.module "INCLUDE">
+<![ %ISOpub.module; [
+<!ENTITY % ISOpub PUBLIC
+"ISO 8879:1986//ENTITIES Publishing//EN">
+<!--end of ISOpub.module-->]]>
+
+<!ENTITY % ISOtech.module "INCLUDE">
+<![ %ISOtech.module; [
+<!ENTITY % ISOtech PUBLIC
+"ISO 8879:1986//ENTITIES General Technical//EN">
+<!--end of ISOtech.module-->]]>
+
+<!--end of sgml.features-->]]>
+
+<![%xml.features;[
+
+<!ENTITY % ISOamsa.module "INCLUDE">
+<![%ISOamsa.module;[
+<!ENTITY % ISOamsa PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+"ent/isoamsa.ent">
+<!--end of ISOamsa.module-->]]>
+
+<!ENTITY % ISOamsb.module "INCLUDE">
+<![%ISOamsb.module;[
+<!ENTITY % ISOamsb PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+"ent/isoamsb.ent">
+<!--end of ISOamsb.module-->]]>
+
+<!ENTITY % ISOamsc.module "INCLUDE">
+<![%ISOamsc.module;[
+<!ENTITY % ISOamsc PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+"ent/isoamsc.ent">
+<!--end of ISOamsc.module-->]]>
+
+<!ENTITY % ISOamsn.module "INCLUDE">
+<![%ISOamsn.module;[
+<!ENTITY % ISOamsn PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+"ent/isoamsn.ent">
+<!--end of ISOamsn.module-->]]>
+
+<!ENTITY % ISOamso.module "INCLUDE">
+<![%ISOamso.module;[
+<!ENTITY % ISOamso PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+"ent/isoamso.ent">
+<!--end of ISOamso.module-->]]>
+
+<!ENTITY % ISOamsr.module "INCLUDE">
+<![%ISOamsr.module;[
+<!ENTITY % ISOamsr PUBLIC
+"ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+"ent/isoamsr.ent">
+<!--end of ISOamsr.module-->]]>
+
+<!ENTITY % ISObox.module "INCLUDE">
+<![%ISObox.module;[
+<!ENTITY % ISObox PUBLIC
+"ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+"ent/isobox.ent">
+<!--end of ISObox.module-->]]>
+
+<!ENTITY % ISOcyr1.module "INCLUDE">
+<![%ISOcyr1.module;[
+<!ENTITY % ISOcyr1 PUBLIC
+"ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+"ent/isocyr1.ent">
+<!--end of ISOcyr1.module-->]]>
+
+<!ENTITY % ISOcyr2.module "INCLUDE">
+<![%ISOcyr2.module;[
+<!ENTITY % ISOcyr2 PUBLIC
+"ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+"ent/isocyr2.ent">
+<!--end of ISOcyr2.module-->]]>
+
+<!ENTITY % ISOdia.module "INCLUDE">
+<![%ISOdia.module;[
+<!ENTITY % ISOdia PUBLIC
+"ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+"ent/isodia.ent">
+<!--end of ISOdia.module-->]]>
+
+<!ENTITY % ISOgrk1.module "INCLUDE">
+<![%ISOgrk1.module;[
+<!ENTITY % ISOgrk1 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+"ent/isogrk1.ent">
+<!--end of ISOgrk1.module-->]]>
+
+<!ENTITY % ISOgrk2.module "INCLUDE">
+<![%ISOgrk2.module;[
+<!ENTITY % ISOgrk2 PUBLIC
+"ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+"ent/isogrk2.ent">
+<!--end of ISOgrk2.module-->]]>
+
+<!ENTITY % ISOgrk3.module "INCLUDE">
+<![%ISOgrk3.module;[
+<!ENTITY % ISOgrk3 PUBLIC
+"ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+"ent/isogrk3.ent">
+<!--end of ISOgrk3.module-->]]>
+
+<!ENTITY % ISOgrk4.module "INCLUDE">
+<![%ISOgrk4.module;[
+<!ENTITY % ISOgrk4 PUBLIC
+"ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+"ent/isogrk4.ent">
+<!--end of ISOgrk4.module-->]]>
+
+<!ENTITY % ISOlat1.module "INCLUDE">
+<![%ISOlat1.module;[
+<!ENTITY % ISOlat1 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+"ent/isolat1.ent">
+<!--end of ISOlat1.module-->]]>
+
+<!ENTITY % ISOlat2.module "INCLUDE">
+<![%ISOlat2.module;[
+<!ENTITY % ISOlat2 PUBLIC
+"ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+"ent/isolat2.ent">
+<!--end of ISOlat2.module-->]]>
+
+<!ENTITY % ISOnum.module "INCLUDE">
+<![%ISOnum.module;[
+<!ENTITY % ISOnum PUBLIC
+"ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+"ent/isonum.ent">
+<!--end of ISOnum.module-->]]>
+
+<!ENTITY % ISOpub.module "INCLUDE">
+<![%ISOpub.module;[
+<!ENTITY % ISOpub PUBLIC
+"ISO 8879:1986//ENTITIES Publishing//EN//XML"
+"ent/isopub.ent">
+<!--end of ISOpub.module-->]]>
+
+<!ENTITY % ISOtech.module "INCLUDE">
+<![%ISOtech.module;[
+<!ENTITY % ISOtech PUBLIC
+"ISO 8879:1986//ENTITIES General Technical//EN//XML"
+"ent/isotech.ent">
+<!--end of ISOtech.module-->]]>
+
+<!--end of xml.features-->]]>
+
+<![ %ISOamsa.module; [
+%ISOamsa;
+]]>
+
+<![ %ISOamsb.module; [
+%ISOamsb;
+]]>
+
+<![ %ISOamsc.module; [
+%ISOamsc;
+]]>
+
+<![ %ISOamsn.module; [
+%ISOamsn;
+]]>
+
+<![ %ISOamso.module; [
+%ISOamso;
+]]>
+
+<![ %ISOamsr.module; [
+%ISOamsr;
+]]>
+
+<![ %ISObox.module; [
+%ISObox;
+]]>
+
+<![ %ISOcyr1.module; [
+%ISOcyr1;
+]]>
+
+<![ %ISOcyr2.module; [
+%ISOcyr2;
+]]>
+
+<![ %ISOdia.module; [
+%ISOdia;
+]]>
+
+<![ %ISOgrk1.module; [
+%ISOgrk1;
+]]>
+
+<![ %ISOgrk2.module; [
+%ISOgrk2;
+]]>
+
+<![ %ISOgrk3.module; [
+%ISOgrk3;
+]]>
+
+<![ %ISOgrk4.module; [
+%ISOgrk4;
+]]>
+
+<![ %ISOlat1.module; [
+%ISOlat1;
+]]>
+
+<![ %ISOlat2.module; [
+%ISOlat2;
+]]>
+
+<![ %ISOnum.module; [
+%ISOnum;
+]]>
+
+<![ %ISOpub.module; [
+%ISOpub;
+]]>
+
+<![ %ISOtech.module; [
+%ISOtech;
+]]>
+
+<!-- End of DocBook character entity sets module V4.5 ..................... -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/dbgenent.mod b/xml/tests/testData/xml/DocBookHighlighting2/dbgenent.mod
new file mode 100644
index 000000000000..ff5ba90d1d52
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/dbgenent.mod
@@ -0,0 +1,41 @@
+<!-- ...................................................................... -->
+<!-- DocBook additional general entities V4.5 ............................. -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbgenent PUBLIC
+     "-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
+     "dbgenent.mod">
+     %dbgenent;
+-->
+
+<!-- File dbgenent.mod .................................................... -->
+
+<!-- You can edit this file to add the following:
+
+     o General entity declarations of any kind.  For example:
+
+       <!ENTITY productname "WinWidget">          (small boilerplate)
+       <!ENTITY legal-notice SYSTEM "notice.sgm"> (large boilerplate)
+
+     o Notation declarations.  For example:
+
+       <!NOTATION chicken-scratch SYSTEM>
+
+     o Declarations for and references to external parameter entities
+       containing collections of any of the above.  For example:
+
+       <!ENTITY % all-titles PUBLIC "-//DocTools//ELEMENTS Book Titles//EN"
+           "booktitles.ent">
+       %all-titles;
+-->
+
+<!-- End of DocBook additional general entities V4.5 ...................... -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/dbhierx.mod b/xml/tests/testData/xml/DocBookHighlighting2/dbhierx.mod
new file mode 100644
index 000000000000..5f839f567979
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/dbhierx.mod
@@ -0,0 +1,2193 @@
+<!-- ...................................................................... -->
+<!-- DocBook document hierarchy module V4.5 ............................... -->
+<!-- File dbhierx.mod ..................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: dbhierx.mod 6340 2006-10-03 13:23:24Z nwalsh $
+
+     Permission to use, copy, modify and distribute the DocBook DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the definitions for the overall document
+     hierarchies of DocBook documents.  It covers computer documentation
+     manuals and manual fragments, as well as reference entries (such as
+     man pages) and technical journals or anthologies containing
+     articles.
+
+     This module depends on the DocBook information pool module.  All
+     elements and entities referenced but not defined here are assumed
+     to be defined in the information pool module.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbhier PUBLIC
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
+     "dbhierx.mod">
+     %dbhier;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+<!-- Entities for module inclusions ....................................... -->
+
+<!ENTITY % dbhier.redecl.module		"IGNORE">
+<!ENTITY % dbhier.redecl2.module	"IGNORE">
+
+<!-- ...................................................................... -->
+<!-- Entities for element classes ......................................... -->
+
+<!ENTITY % local.appendix.class "">
+<!ENTITY % appendix.class	"appendix %local.appendix.class;">
+
+<!ENTITY % local.article.class "">
+<!ENTITY % article.class	"article %local.article.class;">
+
+<!ENTITY % local.book.class "">
+<!ENTITY % book.class		"book %local.book.class;">
+
+<!ENTITY % local.chapter.class "">
+<!ENTITY % chapter.class	"chapter %local.chapter.class;">
+
+<!ENTITY % local.index.class "">
+<!ENTITY % index.class		"index|setindex %local.index.class;">
+
+<!ENTITY % local.refentry.class "">
+<!ENTITY % refentry.class	"refentry %local.refentry.class;">
+
+<!ENTITY % local.section.class "">
+<!ENTITY % section.class	"section %local.section.class;">
+
+<!ENTITY % local.nav.class "">
+<!ENTITY % nav.class		"toc|lot|index|glossary|bibliography
+				%local.nav.class;">
+
+<!-- Redeclaration placeholder ............................................ -->
+
+<!-- For redeclaring entities that are declared after this point while
+     retaining their references to the entities that are declared before
+     this point -->
+
+<![%dbhier.redecl.module;[
+<!-- Defining rdbhier here makes some buggy XML parsers happy. -->
+<!ENTITY % rdbhier "">
+%rdbhier;
+<!--end of dbhier.redecl.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Entities for element mixtures ........................................ -->
+
+<!ENTITY % local.divcomponent.mix "">
+<!ENTITY % divcomponent.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|%compound.class;
+		|%genobj.class;		|%descobj.class;
+		|%ndxterm.class;        |beginpage
+                %forms.hook;
+		%local.divcomponent.mix;">
+
+<!ENTITY % local.refcomponent.mix "">
+<!ENTITY % refcomponent.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|%compound.class;
+		|%genobj.class;		|%descobj.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.refcomponent.mix;">
+
+<!ENTITY % local.indexdivcomponent.mix "">
+<!ENTITY % indexdivcomponent.mix
+		"itemizedlist|orderedlist|variablelist|simplelist
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|anchor|remark
+		|%link.char.class;
+ 		                        |beginpage
+		%local.indexdivcomponent.mix;">
+
+<!ENTITY % local.refname.char.mix "">
+<!ENTITY % refname.char.mix
+		"#PCDATA
+		|%tech.char.class;
+		%local.refname.char.mix;">
+
+<!ENTITY % local.partcontent.mix "">
+<!ENTITY % partcontent.mix
+		"%appendix.class;|%chapter.class;|%nav.class;|%article.class;
+		|preface|%refentry.class;|reference %local.partcontent.mix;">
+
+<!ENTITY % local.refinline.char.mix "">
+<!ENTITY % refinline.char.mix
+		"#PCDATA
+		|%xref.char.class;	|%gen.char.class;
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;	|%docinfo.char.class;
+		|%other.char.class;
+		|%ndxterm.class;        |beginpage
+		%local.refinline.char.mix;">
+
+<!ENTITY % local.refclass.char.mix "">
+<!ENTITY % refclass.char.mix
+		"#PCDATA
+		|application
+		%local.refclass.char.mix;">
+
+<!-- Redeclaration placeholder 2 .......................................... -->
+
+<!-- For redeclaring entities that are declared after this point while
+     retaining their references to the entities that are declared before
+     this point -->
+
+<![%dbhier.redecl2.module;[
+<!-- Defining rdbhier2 here makes some buggy XML parsers happy. -->
+<!ENTITY % rdbhier2 "">
+%rdbhier2;
+<!--end of dbhier.redecl2.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Entities for content models .......................................... -->
+
+<!ENTITY % div.title.content
+	"title, subtitle?, titleabbrev?">
+
+<!ENTITY % bookcomponent.title.content
+	"title, subtitle?, titleabbrev?">
+
+<!ENTITY % sect.title.content
+	"title, subtitle?, titleabbrev?">
+
+<!ENTITY % refsect.title.content
+	"title, subtitle?, titleabbrev?">
+
+<!ENTITY % bookcomponent.content
+	"((%divcomponent.mix;)+,
+	(sect1*|(%refentry.class;)*|simplesect*|(%section.class;)*))
+	| (sect1+|(%refentry.class;)+|simplesect+|(%section.class;)+)">
+
+<!-- ...................................................................... -->
+<!-- Set and SetInfo ...................................................... -->
+
+<!ENTITY % set.content.module "INCLUDE">
+<![%set.content.module;[
+<!ENTITY % set.module "INCLUDE">
+<![%set.module;[
+<!ENTITY % local.set.attrib "">
+<!ENTITY % set.role.attrib "%role.attrib;">
+
+<!ENTITY % set.element "INCLUDE">
+<![%set.element;[
+<!--doc:A collection of books.-->
+<!ELEMENT set %ho; ((%div.title.content;)?, setinfo?, toc?, (set|%book.class;)+,
+		setindex?)
+		%ubiq.inclusion;>
+<!--end of set.element-->]]>
+
+<!-- FPI: SGML formal public identifier -->
+
+
+<!ENTITY % set.attlist "INCLUDE">
+<![%set.attlist;[
+<!ATTLIST set
+		fpi		CDATA		#IMPLIED
+		%status.attrib;
+		%common.attrib;
+		%set.role.attrib;
+		%local.set.attrib;
+>
+<!--end of set.attlist-->]]>
+<!--end of set.module-->]]>
+
+<!ENTITY % setinfo.module "INCLUDE">
+<![%setinfo.module;[
+<!ENTITY % local.setinfo.attrib "">
+<!ENTITY % setinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % setinfo.element "INCLUDE">
+<![%setinfo.element;[
+<!--doc:Meta-information for a Set.-->
+<!ELEMENT setinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of setinfo.element-->]]>
+
+<!-- Contents: IDs of the ToC, Books, and SetIndex that comprise
+		the set, in the order of their appearance -->
+
+
+<!ENTITY % setinfo.attlist "INCLUDE">
+<![%setinfo.attlist;[
+<!ATTLIST setinfo
+		contents	IDREFS		#IMPLIED
+		%common.attrib;
+		%setinfo.role.attrib;
+		%local.setinfo.attrib;
+>
+<!--end of setinfo.attlist-->]]>
+<!--end of setinfo.module-->]]>
+<!--end of set.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Book and BookInfo .................................................... -->
+
+<!ENTITY % book.content.module "INCLUDE">
+<![%book.content.module;[
+<!ENTITY % book.module "INCLUDE">
+<![%book.module;[
+
+<!ENTITY % local.book.attrib "">
+<!ENTITY % book.role.attrib "%role.attrib;">
+
+<!ENTITY % book.element "INCLUDE">
+<![%book.element;[
+<!--doc:A book.-->
+<!ELEMENT book %ho; ((%div.title.content;)?, bookinfo?,
+ 		(dedication | toc | lot
+ 		| glossary | bibliography | preface
+		| %chapter.class; | reference | part
+		| %article.class;
+ 		| %appendix.class;
+		| %index.class;
+		| colophon)*)
+		%ubiq.inclusion;>
+<!--end of book.element-->]]>
+
+<!-- FPI: SGML formal public identifier -->
+
+
+<!ENTITY % book.attlist "INCLUDE">
+<![%book.attlist;[
+<!ATTLIST book		fpi		CDATA		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%book.role.attrib;
+		%local.book.attrib;
+>
+<!--end of book.attlist-->]]>
+<!--end of book.module-->]]>
+
+<!ENTITY % bookinfo.module "INCLUDE">
+<![%bookinfo.module;[
+<!ENTITY % local.bookinfo.attrib "">
+<!ENTITY % bookinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % bookinfo.element "INCLUDE">
+<![%bookinfo.element;[
+<!--doc:Meta-information for a Book.-->
+<!ELEMENT bookinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of bookinfo.element-->]]>
+
+<!-- Contents: IDs of the ToC, LoTs, Prefaces, Parts, Chapters,
+		Appendixes, References, GLossary, Bibliography, and indexes
+		comprising the Book, in the order of their appearance -->
+
+
+<!ENTITY % bookinfo.attlist "INCLUDE">
+<![%bookinfo.attlist;[
+<!ATTLIST bookinfo
+		contents	IDREFS		#IMPLIED
+		%common.attrib;
+		%bookinfo.role.attrib;
+		%local.bookinfo.attrib;
+>
+<!--end of bookinfo.attlist-->]]>
+<!--end of bookinfo.module-->]]>
+<!--end of book.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Dedication, ToC, and LoT ............................................. -->
+
+<!ENTITY % dedication.module "INCLUDE">
+<![%dedication.module;[
+<!ENTITY % local.dedication.attrib "">
+<!ENTITY % dedication.role.attrib "%role.attrib;">
+
+<!ENTITY % dedication.element "INCLUDE">
+<![%dedication.element;[
+<!--doc:A wrapper for the dedication section of a book.-->
+<!ELEMENT dedication %ho; ((%sect.title.content;)?, (%legalnotice.mix;)+)>
+<!--end of dedication.element-->]]>
+
+<!ENTITY % dedication.attlist "INCLUDE">
+<![%dedication.attlist;[
+<!ATTLIST dedication
+		%status.attrib;
+		%common.attrib;
+		%dedication.role.attrib;
+		%local.dedication.attrib;
+>
+<!--end of dedication.attlist-->]]>
+<!--end of dedication.module-->]]>
+
+<!ENTITY % colophon.module "INCLUDE">
+<![ %colophon.module; [
+<!ENTITY % local.colophon.attrib "">
+<!ENTITY % colophon.role.attrib "%role.attrib;">
+
+<!ENTITY % colophon.element "INCLUDE">
+<![ %colophon.element; [
+<!--doc:Text at the back of a book describing facts about its production.-->
+<!ELEMENT colophon %ho; ((%sect.title.content;)?, (%textobject.mix;)+)>
+<!--end of colophon.element-->]]>
+
+<!ENTITY % colophon.attlist "INCLUDE">
+<![ %colophon.attlist; [
+<!ATTLIST colophon
+		%status.attrib;
+		%common.attrib;
+		%colophon.role.attrib;
+		%local.colophon.attrib;>
+<!--end of colophon.attlist-->]]>
+<!--end of colophon.module-->]]>
+
+<!ENTITY % toc.content.module "INCLUDE">
+<![%toc.content.module;[
+<!ENTITY % toc.module "INCLUDE">
+<![%toc.module;[
+<!ENTITY % local.toc.attrib "">
+<!ENTITY % toc.role.attrib "%role.attrib;">
+
+<!ENTITY % toc.element "INCLUDE">
+<![%toc.element;[
+<!--doc:A table of contents.-->
+<!ELEMENT toc %ho; (beginpage?,
+		(%bookcomponent.title.content;)?,
+		tocfront*,
+		(tocpart | tocchap)*, tocback*)>
+<!--end of toc.element-->]]>
+
+<!ENTITY % toc.attlist "INCLUDE">
+<![%toc.attlist;[
+<!ATTLIST toc
+		%pagenum.attrib;
+		%common.attrib;
+		%toc.role.attrib;
+		%local.toc.attrib;
+>
+<!--end of toc.attlist-->]]>
+<!--end of toc.module-->]]>
+
+<!ENTITY % tocfront.module "INCLUDE">
+<![%tocfront.module;[
+<!ENTITY % local.tocfront.attrib "">
+<!ENTITY % tocfront.role.attrib "%role.attrib;">
+
+<!ENTITY % tocfront.element "INCLUDE">
+<![%tocfront.element;[
+<!--doc:An entry in a table of contents for a front matter component.-->
+<!ELEMENT tocfront %ho; (%para.char.mix;)*>
+<!--end of tocfront.element-->]]>
+
+<!-- to element that this entry represents -->
+
+
+<!ENTITY % tocfront.attlist "INCLUDE">
+<![%tocfront.attlist;[
+<!ATTLIST tocfront
+		%label.attrib;
+		%linkend.attrib;		%pagenum.attrib;
+		%common.attrib;
+		%tocfront.role.attrib;
+		%local.tocfront.attrib;
+>
+<!--end of tocfront.attlist-->]]>
+<!--end of tocfront.module-->]]>
+
+<!ENTITY % tocentry.module "INCLUDE">
+<![%tocentry.module;[
+<!ENTITY % local.tocentry.attrib "">
+<!ENTITY % tocentry.role.attrib "%role.attrib;">
+
+<!ENTITY % tocentry.element "INCLUDE">
+<![%tocentry.element;[
+<!--doc:A component title in a table of contents.-->
+<!ELEMENT tocentry %ho; (%para.char.mix;)*>
+<!--end of tocentry.element-->]]>
+
+<!-- to element that this entry represents -->
+
+
+<!ENTITY % tocentry.attlist "INCLUDE">
+<![%tocentry.attlist;[
+<!ATTLIST tocentry
+		%linkend.attrib;		%pagenum.attrib;
+		%common.attrib;
+		%tocentry.role.attrib;
+		%local.tocentry.attrib;
+>
+<!--end of tocentry.attlist-->]]>
+<!--end of tocentry.module-->]]>
+
+<!ENTITY % tocpart.module "INCLUDE">
+<![%tocpart.module;[
+<!ENTITY % local.tocpart.attrib "">
+<!ENTITY % tocpart.role.attrib "%role.attrib;">
+
+<!ENTITY % tocpart.element "INCLUDE">
+<![%tocpart.element;[
+<!--doc:An entry in a table of contents for a part of a book.-->
+<!ELEMENT tocpart %ho; (tocentry+, tocchap*)>
+<!--end of tocpart.element-->]]>
+
+<!ENTITY % tocpart.attlist "INCLUDE">
+<![%tocpart.attlist;[
+<!ATTLIST tocpart
+		%common.attrib;
+		%tocpart.role.attrib;
+		%local.tocpart.attrib;
+>
+<!--end of tocpart.attlist-->]]>
+<!--end of tocpart.module-->]]>
+
+<!ENTITY % tocchap.module "INCLUDE">
+<![%tocchap.module;[
+<!ENTITY % local.tocchap.attrib "">
+<!ENTITY % tocchap.role.attrib "%role.attrib;">
+
+<!ENTITY % tocchap.element "INCLUDE">
+<![%tocchap.element;[
+<!--doc:An entry in a table of contents for a component in the body of a document.-->
+<!ELEMENT tocchap %ho; (tocentry+, toclevel1*)>
+<!--end of tocchap.element-->]]>
+
+<!ENTITY % tocchap.attlist "INCLUDE">
+<![%tocchap.attlist;[
+<!ATTLIST tocchap
+		%label.attrib;
+		%common.attrib;
+		%tocchap.role.attrib;
+		%local.tocchap.attrib;
+>
+<!--end of tocchap.attlist-->]]>
+<!--end of tocchap.module-->]]>
+
+<!ENTITY % toclevel1.module "INCLUDE">
+<![%toclevel1.module;[
+<!ENTITY % local.toclevel1.attrib "">
+<!ENTITY % toclevel1.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel1.element "INCLUDE">
+<![%toclevel1.element;[
+<!--doc:A top-level entry within a table of contents entry for a chapter-like component.-->
+<!ELEMENT toclevel1 %ho; (tocentry+, toclevel2*)>
+<!--end of toclevel1.element-->]]>
+
+<!ENTITY % toclevel1.attlist "INCLUDE">
+<![%toclevel1.attlist;[
+<!ATTLIST toclevel1
+		%common.attrib;
+		%toclevel1.role.attrib;
+		%local.toclevel1.attrib;
+>
+<!--end of toclevel1.attlist-->]]>
+<!--end of toclevel1.module-->]]>
+
+<!ENTITY % toclevel2.module "INCLUDE">
+<![%toclevel2.module;[
+<!ENTITY % local.toclevel2.attrib "">
+<!ENTITY % toclevel2.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel2.element "INCLUDE">
+<![%toclevel2.element;[
+<!--doc:A second-level entry within a table of contents entry for a chapter-like component.-->
+<!ELEMENT toclevel2 %ho; (tocentry+, toclevel3*)>
+<!--end of toclevel2.element-->]]>
+
+<!ENTITY % toclevel2.attlist "INCLUDE">
+<![%toclevel2.attlist;[
+<!ATTLIST toclevel2
+		%common.attrib;
+		%toclevel2.role.attrib;
+		%local.toclevel2.attrib;
+>
+<!--end of toclevel2.attlist-->]]>
+<!--end of toclevel2.module-->]]>
+
+<!ENTITY % toclevel3.module "INCLUDE">
+<![%toclevel3.module;[
+<!ENTITY % local.toclevel3.attrib "">
+<!ENTITY % toclevel3.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel3.element "INCLUDE">
+<![%toclevel3.element;[
+<!--doc:A third-level entry within a table of contents entry for a chapter-like component.-->
+<!ELEMENT toclevel3 %ho; (tocentry+, toclevel4*)>
+<!--end of toclevel3.element-->]]>
+
+<!ENTITY % toclevel3.attlist "INCLUDE">
+<![%toclevel3.attlist;[
+<!ATTLIST toclevel3
+		%common.attrib;
+		%toclevel3.role.attrib;
+		%local.toclevel3.attrib;
+>
+<!--end of toclevel3.attlist-->]]>
+<!--end of toclevel3.module-->]]>
+
+<!ENTITY % toclevel4.module "INCLUDE">
+<![%toclevel4.module;[
+<!ENTITY % local.toclevel4.attrib "">
+<!ENTITY % toclevel4.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel4.element "INCLUDE">
+<![%toclevel4.element;[
+<!--doc:A fourth-level entry within a table of contents entry for a chapter-like component.-->
+<!ELEMENT toclevel4 %ho; (tocentry+, toclevel5*)>
+<!--end of toclevel4.element-->]]>
+
+<!ENTITY % toclevel4.attlist "INCLUDE">
+<![%toclevel4.attlist;[
+<!ATTLIST toclevel4
+		%common.attrib;
+		%toclevel4.role.attrib;
+		%local.toclevel4.attrib;
+>
+<!--end of toclevel4.attlist-->]]>
+<!--end of toclevel4.module-->]]>
+
+<!ENTITY % toclevel5.module "INCLUDE">
+<![%toclevel5.module;[
+<!ENTITY % local.toclevel5.attrib "">
+<!ENTITY % toclevel5.role.attrib "%role.attrib;">
+
+<!ENTITY % toclevel5.element "INCLUDE">
+<![%toclevel5.element;[
+<!--doc:A fifth-level entry within a table of contents entry for a chapter-like component.-->
+<!ELEMENT toclevel5 %ho; (tocentry+)>
+<!--end of toclevel5.element-->]]>
+
+<!ENTITY % toclevel5.attlist "INCLUDE">
+<![%toclevel5.attlist;[
+<!ATTLIST toclevel5
+		%common.attrib;
+		%toclevel5.role.attrib;
+		%local.toclevel5.attrib;
+>
+<!--end of toclevel5.attlist-->]]>
+<!--end of toclevel5.module-->]]>
+
+<!ENTITY % tocback.module "INCLUDE">
+<![%tocback.module;[
+<!ENTITY % local.tocback.attrib "">
+<!ENTITY % tocback.role.attrib "%role.attrib;">
+
+<!ENTITY % tocback.element "INCLUDE">
+<![%tocback.element;[
+<!--doc:An entry in a table of contents for a back matter component.-->
+<!ELEMENT tocback %ho; (%para.char.mix;)*>
+<!--end of tocback.element-->]]>
+
+<!-- to element that this entry represents -->
+
+
+<!ENTITY % tocback.attlist "INCLUDE">
+<![%tocback.attlist;[
+<!ATTLIST tocback
+		%label.attrib;
+		%linkend.attrib;		%pagenum.attrib;
+		%common.attrib;
+		%tocback.role.attrib;
+		%local.tocback.attrib;
+>
+<!--end of tocback.attlist-->]]>
+<!--end of tocback.module-->]]>
+<!--end of toc.content.module-->]]>
+
+<!ENTITY % lot.content.module "INCLUDE">
+<![%lot.content.module;[
+<!ENTITY % lot.module "INCLUDE">
+<![%lot.module;[
+<!ENTITY % local.lot.attrib "">
+<!ENTITY % lot.role.attrib "%role.attrib;">
+
+<!ENTITY % lot.element "INCLUDE">
+<![%lot.element;[
+<!--doc:A list of the titles of formal objects (as tables or figures) in a document.-->
+<!ELEMENT lot %ho; (beginpage?, (%bookcomponent.title.content;)?, lotentry*)>
+<!--end of lot.element-->]]>
+
+<!ENTITY % lot.attlist "INCLUDE">
+<![%lot.attlist;[
+<!ATTLIST lot
+		%label.attrib;
+		%common.attrib;
+		%lot.role.attrib;
+		%local.lot.attrib;
+>
+<!--end of lot.attlist-->]]>
+<!--end of lot.module-->]]>
+
+<!ENTITY % lotentry.module "INCLUDE">
+<![%lotentry.module;[
+<!ENTITY % local.lotentry.attrib "">
+<!ENTITY % lotentry.role.attrib "%role.attrib;">
+
+<!ENTITY % lotentry.element "INCLUDE">
+<![%lotentry.element;[
+<!--doc:An entry in a list of titles.-->
+<!ELEMENT lotentry %ho; (%para.char.mix;)*>
+<!--end of lotentry.element-->]]>
+
+<!-- SrcCredit: Information about the source of the entry,
+		as for a list of illustrations -->
+<!-- linkend: to element that this entry represents-->
+<!ENTITY % lotentry.attlist "INCLUDE">
+<![%lotentry.attlist;[
+<!ATTLIST lotentry
+		%linkend.attrib;
+		%pagenum.attrib;
+		srccredit	CDATA		#IMPLIED
+		%common.attrib;
+		%lotentry.role.attrib;
+		%local.lotentry.attrib;
+>
+<!--end of lotentry.attlist-->]]>
+<!--end of lotentry.module-->]]>
+<!--end of lot.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Appendix, Chapter, Part, Preface, Reference, PartIntro ............... -->
+
+<!ENTITY % appendix.module "INCLUDE">
+<![%appendix.module;[
+<!ENTITY % local.appendix.attrib "">
+<!ENTITY % appendix.role.attrib "%role.attrib;">
+
+<!ENTITY % appendix.element "INCLUDE">
+<![%appendix.element;[
+<!--doc:An appendix in a Book or Article.-->
+<!ELEMENT appendix %ho; (beginpage?,
+                     appendixinfo?,
+                     (%bookcomponent.title.content;),
+                     (%nav.class;)*,
+                     tocchap?,
+                     (%bookcomponent.content;),
+                     (%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of appendix.element-->]]>
+
+<!ENTITY % appendix.attlist "INCLUDE">
+<![%appendix.attlist;[
+<!ATTLIST appendix
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%appendix.role.attrib;
+		%local.appendix.attrib;
+>
+<!--end of appendix.attlist-->]]>
+<!--end of appendix.module-->]]>
+
+<!ENTITY % chapter.module "INCLUDE">
+<![%chapter.module;[
+<!ENTITY % local.chapter.attrib "">
+<!ENTITY % chapter.role.attrib "%role.attrib;">
+
+<!ENTITY % chapter.element "INCLUDE">
+<![%chapter.element;[
+<!--doc:A chapter, as of a book.-->
+<!ELEMENT chapter %ho; (beginpage?,
+                    chapterinfo?,
+                    (%bookcomponent.title.content;),
+                    (%nav.class;)*,
+                    tocchap?,
+                    (%bookcomponent.content;),
+                    (%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of chapter.element-->]]>
+
+<!ENTITY % chapter.attlist "INCLUDE">
+<![%chapter.attlist;[
+<!ATTLIST chapter
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%chapter.role.attrib;
+		%local.chapter.attrib;
+>
+<!--end of chapter.attlist-->]]>
+<!--end of chapter.module-->]]>
+
+<!ENTITY % part.module "INCLUDE">
+<![%part.module;[
+
+<!-- Note that Part was to have its content model reduced in V4.5.  This
+change will not be made after all. -->
+
+<!ENTITY % local.part.attrib "">
+<!ENTITY % part.role.attrib "%role.attrib;">
+
+<!ENTITY % part.element "INCLUDE">
+<![%part.element;[
+<!--doc:A division in a book.-->
+<!ELEMENT part %ho; (beginpage?,
+                partinfo?, (%bookcomponent.title.content;), partintro?,
+		(%partcontent.mix;)+)
+		%ubiq.inclusion;>
+<!--end of part.element-->]]>
+
+<!ENTITY % part.attlist "INCLUDE">
+<![%part.attlist;[
+<!ATTLIST part
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%part.role.attrib;
+		%local.part.attrib;
+>
+<!--end of part.attlist-->]]>
+<!--ELEMENT PartIntro (defined below)-->
+<!--end of part.module-->]]>
+
+<!ENTITY % preface.module "INCLUDE">
+<![%preface.module;[
+<!ENTITY % local.preface.attrib "">
+<!ENTITY % preface.role.attrib "%role.attrib;">
+
+<!ENTITY % preface.element "INCLUDE">
+<![%preface.element;[
+<!--doc:Introductory matter preceding the first chapter of a book.-->
+<!ELEMENT preface %ho; (beginpage?,
+                    prefaceinfo?,
+                    (%bookcomponent.title.content;),
+                    (%nav.class;)*,
+                    tocchap?,
+                    (%bookcomponent.content;),
+                    (%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of preface.element-->]]>
+
+<!ENTITY % preface.attlist "INCLUDE">
+<![%preface.attlist;[
+<!ATTLIST preface
+		%status.attrib;
+		%common.attrib;
+		%preface.role.attrib;
+		%local.preface.attrib;
+>
+<!--end of preface.attlist-->]]>
+<!--end of preface.module-->]]>
+
+<!ENTITY % reference.module "INCLUDE">
+<![%reference.module;[
+<!ENTITY % local.reference.attrib "">
+<!ENTITY % reference.role.attrib "%role.attrib;">
+
+<!ENTITY % reference.element "INCLUDE">
+<![%reference.element;[
+<!--doc:A collection of reference entries.-->
+<!ELEMENT reference %ho; (beginpage?,
+                     referenceinfo?,
+                     (%bookcomponent.title.content;), partintro?,
+                     (%refentry.class;)+)
+		%ubiq.inclusion;>
+<!--end of reference.element-->]]>
+
+<!ENTITY % reference.attlist "INCLUDE">
+<![%reference.attlist;[
+<!ATTLIST reference
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%reference.role.attrib;
+		%local.reference.attrib;
+>
+<!--end of reference.attlist-->]]>
+<!--ELEMENT PartIntro (defined below)-->
+<!--end of reference.module-->]]>
+
+<!ENTITY % partintro.module "INCLUDE">
+<![%partintro.module;[
+<!ENTITY % local.partintro.attrib "">
+<!ENTITY % partintro.role.attrib "%role.attrib;">
+
+<!ENTITY % partintro.element "INCLUDE">
+<![%partintro.element;[
+<!--doc:An introduction to the contents of a part.-->
+<!ELEMENT partintro %ho; ((%div.title.content;)?, (%bookcomponent.content;))
+		%ubiq.inclusion;>
+<!--end of partintro.element-->]]>
+
+<!ENTITY % partintro.attlist "INCLUDE">
+<![%partintro.attlist;[
+<!ATTLIST partintro
+		%label.attrib;
+		%common.attrib;
+		%partintro.role.attrib;
+		%local.partintro.attrib;
+>
+<!--end of partintro.attlist-->]]>
+<!--end of partintro.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Other Info elements .................................................. -->
+
+<!ENTITY % appendixinfo.module "INCLUDE">
+<![ %appendixinfo.module; [
+<!ENTITY % local.appendixinfo.attrib "">
+<!ENTITY % appendixinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % appendixinfo.element "INCLUDE">
+<![ %appendixinfo.element; [
+<!--doc:Meta-information for an Appendix.-->
+<!ELEMENT appendixinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of appendixinfo.element-->]]>
+
+<!ENTITY % appendixinfo.attlist "INCLUDE">
+<![ %appendixinfo.attlist; [
+<!ATTLIST appendixinfo
+		%common.attrib;
+		%appendixinfo.role.attrib;
+		%local.appendixinfo.attrib;
+>
+<!--end of appendixinfo.attlist-->]]>
+<!--end of appendixinfo.module-->]]>
+
+<!ENTITY % bibliographyinfo.module "INCLUDE">
+<![ %bibliographyinfo.module; [
+<!ENTITY % local.bibliographyinfo.attrib "">
+<!ENTITY % bibliographyinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliographyinfo.element "INCLUDE">
+<![ %bibliographyinfo.element; [
+<!--doc:Meta-information for a Bibliography.-->
+<!ELEMENT bibliographyinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of bibliographyinfo.element-->]]>
+
+<!ENTITY % bibliographyinfo.attlist "INCLUDE">
+<![ %bibliographyinfo.attlist; [
+<!ATTLIST bibliographyinfo
+		%common.attrib;
+		%bibliographyinfo.role.attrib;
+		%local.bibliographyinfo.attrib;
+>
+<!--end of bibliographyinfo.attlist-->]]>
+<!--end of bibliographyinfo.module-->]]>
+
+<!ENTITY % chapterinfo.module "INCLUDE">
+<![ %chapterinfo.module; [
+<!ENTITY % local.chapterinfo.attrib "">
+<!ENTITY % chapterinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % chapterinfo.element "INCLUDE">
+<![ %chapterinfo.element; [
+<!--doc:Meta-information for a Chapter.-->
+<!ELEMENT chapterinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of chapterinfo.element-->]]>
+
+<!ENTITY % chapterinfo.attlist "INCLUDE">
+<![ %chapterinfo.attlist; [
+<!ATTLIST chapterinfo
+		%common.attrib;
+		%chapterinfo.role.attrib;
+		%local.chapterinfo.attrib;
+>
+<!--end of chapterinfo.attlist-->]]>
+<!--end of chapterinfo.module-->]]>
+
+<!ENTITY % glossaryinfo.module "INCLUDE">
+<![ %glossaryinfo.module; [
+<!ENTITY % local.glossaryinfo.attrib "">
+<!ENTITY % glossaryinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % glossaryinfo.element "INCLUDE">
+<![ %glossaryinfo.element; [
+<!--doc:Meta-information for a Glossary.-->
+<!ELEMENT glossaryinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of glossaryinfo.element-->]]>
+
+<!ENTITY % glossaryinfo.attlist "INCLUDE">
+<![ %glossaryinfo.attlist; [
+<!ATTLIST glossaryinfo
+		%common.attrib;
+		%glossaryinfo.role.attrib;
+		%local.glossaryinfo.attrib;
+>
+<!--end of glossaryinfo.attlist-->]]>
+<!--end of glossaryinfo.module-->]]>
+
+<!ENTITY % indexinfo.module "INCLUDE">
+<![ %indexinfo.module; [
+<!ENTITY % local.indexinfo.attrib "">
+<!ENTITY % indexinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % indexinfo.element "INCLUDE">
+<![ %indexinfo.element; [
+<!--doc:Meta-information for an Index.-->
+<!ELEMENT indexinfo %ho; ((%info.class;)+)>
+<!--end of indexinfo.element-->]]>
+
+<!ENTITY % indexinfo.attlist "INCLUDE">
+<![ %indexinfo.attlist; [
+<!ATTLIST indexinfo
+		%common.attrib;
+		%indexinfo.role.attrib;
+		%local.indexinfo.attrib;
+>
+<!--end of indexinfo.attlist-->]]>
+<!--end of indexinfo.module-->]]>
+
+<!ENTITY % setindexinfo.module "INCLUDE">
+<![ %setindexinfo.module; [
+<!ENTITY % local.setindexinfo.attrib "">
+<!ENTITY % setindexinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % setindexinfo.element "INCLUDE">
+<![ %setindexinfo.element; [
+<!--doc:Meta-information for a SetIndex.-->
+<!ELEMENT setindexinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of setindexinfo.element-->]]>
+
+<!ENTITY % setindexinfo.attlist "INCLUDE">
+<![ %setindexinfo.attlist; [
+<!ATTLIST setindexinfo
+		%common.attrib;
+		%setindexinfo.role.attrib;
+		%local.setindexinfo.attrib;
+>
+<!--end of setindexinfo.attlist-->]]>
+<!--end of setindexinfo.module-->]]>
+
+<!ENTITY % partinfo.module "INCLUDE">
+<![ %partinfo.module; [
+<!ENTITY % local.partinfo.attrib "">
+<!ENTITY % partinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % partinfo.element "INCLUDE">
+<![ %partinfo.element; [
+<!--doc:Meta-information for a Part.-->
+<!ELEMENT partinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of partinfo.element-->]]>
+
+<!ENTITY % partinfo.attlist "INCLUDE">
+<![ %partinfo.attlist; [
+<!ATTLIST partinfo
+		%common.attrib;
+		%partinfo.role.attrib;
+		%local.partinfo.attrib;
+>
+<!--end of partinfo.attlist-->]]>
+<!--end of partinfo.module-->]]>
+
+<!ENTITY % prefaceinfo.module "INCLUDE">
+<![ %prefaceinfo.module; [
+<!ENTITY % local.prefaceinfo.attrib "">
+<!ENTITY % prefaceinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % prefaceinfo.element "INCLUDE">
+<![ %prefaceinfo.element; [
+<!--doc:Meta-information for a Preface.-->
+<!ELEMENT prefaceinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of prefaceinfo.element-->]]>
+
+<!ENTITY % prefaceinfo.attlist "INCLUDE">
+<![ %prefaceinfo.attlist; [
+<!ATTLIST prefaceinfo
+		%common.attrib;
+		%prefaceinfo.role.attrib;
+		%local.prefaceinfo.attrib;
+>
+<!--end of prefaceinfo.attlist-->]]>
+<!--end of prefaceinfo.module-->]]>
+
+<!ENTITY % refentryinfo.module "INCLUDE">
+<![ %refentryinfo.module; [
+<!ENTITY % local.refentryinfo.attrib "">
+<!ENTITY % refentryinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % refentryinfo.element "INCLUDE">
+<![ %refentryinfo.element; [
+<!--doc:Meta-information for a Refentry.-->
+<!ELEMENT refentryinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refentryinfo.element-->]]>
+
+<!ENTITY % refentryinfo.attlist "INCLUDE">
+<![ %refentryinfo.attlist; [
+<!ATTLIST refentryinfo
+		%common.attrib;
+		%refentryinfo.role.attrib;
+		%local.refentryinfo.attrib;
+>
+<!--end of refentryinfo.attlist-->]]>
+<!--end of refentryinfo.module-->]]>
+
+<!ENTITY % refsectioninfo.module "INCLUDE">
+<![ %refsectioninfo.module; [
+<!ENTITY % local.refsectioninfo.attrib "">
+<!ENTITY % refsectioninfo.role.attrib "%role.attrib;">
+
+<!ENTITY % refsectioninfo.element "INCLUDE">
+<![ %refsectioninfo.element; [
+<!--doc:Meta-information for a refsection.-->
+<!ELEMENT refsectioninfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsectioninfo.element-->]]>
+
+<!ENTITY % refsectioninfo.attlist "INCLUDE">
+<![ %refsectioninfo.attlist; [
+<!ATTLIST refsectioninfo
+		%common.attrib;
+		%refsectioninfo.role.attrib;
+		%local.refsectioninfo.attrib;
+>
+<!--end of refsectioninfo.attlist-->]]>
+<!--end of refsectioninfo.module-->]]>
+
+<!ENTITY % refsect1info.module "INCLUDE">
+<![ %refsect1info.module; [
+<!ENTITY % local.refsect1info.attrib "">
+<!ENTITY % refsect1info.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect1info.element "INCLUDE">
+<![ %refsect1info.element; [
+<!--doc:Meta-information for a RefSect1.-->
+<!ELEMENT refsect1info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsect1info.element-->]]>
+
+<!ENTITY % refsect1info.attlist "INCLUDE">
+<![ %refsect1info.attlist; [
+<!ATTLIST refsect1info
+		%common.attrib;
+		%refsect1info.role.attrib;
+		%local.refsect1info.attrib;
+>
+<!--end of refsect1info.attlist-->]]>
+<!--end of refsect1info.module-->]]>
+
+<!ENTITY % refsect2info.module "INCLUDE">
+<![ %refsect2info.module; [
+<!ENTITY % local.refsect2info.attrib "">
+<!ENTITY % refsect2info.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect2info.element "INCLUDE">
+<![ %refsect2info.element; [
+<!--doc:Meta-information for a RefSect2.-->
+<!ELEMENT refsect2info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsect2info.element-->]]>
+
+<!ENTITY % refsect2info.attlist "INCLUDE">
+<![ %refsect2info.attlist; [
+<!ATTLIST refsect2info
+		%common.attrib;
+		%refsect2info.role.attrib;
+		%local.refsect2info.attrib;
+>
+<!--end of refsect2info.attlist-->]]>
+<!--end of refsect2info.module-->]]>
+
+<!ENTITY % refsect3info.module "INCLUDE">
+<![ %refsect3info.module; [
+<!ENTITY % local.refsect3info.attrib "">
+<!ENTITY % refsect3info.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect3info.element "INCLUDE">
+<![ %refsect3info.element; [
+<!--doc:Meta-information for a RefSect3.-->
+<!ELEMENT refsect3info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsect3info.element-->]]>
+
+<!ENTITY % refsect3info.attlist "INCLUDE">
+<![ %refsect3info.attlist; [
+<!ATTLIST refsect3info
+		%common.attrib;
+		%refsect3info.role.attrib;
+		%local.refsect3info.attrib;
+>
+<!--end of refsect3info.attlist-->]]>
+<!--end of refsect3info.module-->]]>
+
+<!ENTITY % refsynopsisdivinfo.module "INCLUDE">
+<![ %refsynopsisdivinfo.module; [
+<!ENTITY % local.refsynopsisdivinfo.attrib "">
+<!ENTITY % refsynopsisdivinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % refsynopsisdivinfo.element "INCLUDE">
+<![ %refsynopsisdivinfo.element; [
+<!--doc:Meta-information for a RefSynopsisDiv.-->
+<!ELEMENT refsynopsisdivinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of refsynopsisdivinfo.element-->]]>
+
+<!ENTITY % refsynopsisdivinfo.attlist "INCLUDE">
+<![ %refsynopsisdivinfo.attlist; [
+<!ATTLIST refsynopsisdivinfo
+		%common.attrib;
+		%refsynopsisdivinfo.role.attrib;
+		%local.refsynopsisdivinfo.attrib;
+>
+<!--end of refsynopsisdivinfo.attlist-->]]>
+<!--end of refsynopsisdivinfo.module-->]]>
+
+<!ENTITY % referenceinfo.module "INCLUDE">
+<![ %referenceinfo.module; [
+<!ENTITY % local.referenceinfo.attrib "">
+<!ENTITY % referenceinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % referenceinfo.element "INCLUDE">
+<![ %referenceinfo.element; [
+<!--doc:Meta-information for a Reference.-->
+<!ELEMENT referenceinfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of referenceinfo.element-->]]>
+
+<!ENTITY % referenceinfo.attlist "INCLUDE">
+<![ %referenceinfo.attlist; [
+<!ATTLIST referenceinfo
+		%common.attrib;
+		%referenceinfo.role.attrib;
+		%local.referenceinfo.attrib;
+>
+<!--end of referenceinfo.attlist-->]]>
+<!--end of referenceinfo.module-->]]>
+
+<!ENTITY % local.sect1info.attrib "">
+<!ENTITY % sect1info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect1info.element "INCLUDE">
+<![%sect1info.element;[
+<!--doc:Meta-information for a Sect1.-->
+<!ELEMENT sect1info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect1info.element-->]]>
+
+<!ENTITY % sect1info.attlist "INCLUDE">
+<![%sect1info.attlist;[
+<!ATTLIST sect1info
+		%common.attrib;
+		%sect1info.role.attrib;
+		%local.sect1info.attrib;
+>
+<!--end of sect1info.attlist-->]]>
+
+<!ENTITY % local.sect2info.attrib "">
+<!ENTITY % sect2info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect2info.element "INCLUDE">
+<![%sect2info.element;[
+<!--doc:Meta-information for a Sect2.-->
+<!ELEMENT sect2info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect2info.element-->]]>
+
+<!ENTITY % sect2info.attlist "INCLUDE">
+<![%sect2info.attlist;[
+<!ATTLIST sect2info
+		%common.attrib;
+		%sect2info.role.attrib;
+		%local.sect2info.attrib;
+>
+<!--end of sect2info.attlist-->]]>
+
+<!ENTITY % local.sect3info.attrib "">
+<!ENTITY % sect3info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect3info.element "INCLUDE">
+<![%sect3info.element;[
+<!--doc:Meta-information for a Sect3.-->
+<!ELEMENT sect3info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect3info.element-->]]>
+
+<!ENTITY % sect3info.attlist "INCLUDE">
+<![%sect3info.attlist;[
+<!ATTLIST sect3info
+		%common.attrib;
+		%sect3info.role.attrib;
+		%local.sect3info.attrib;
+>
+<!--end of sect3info.attlist-->]]>
+
+<!ENTITY % local.sect4info.attrib "">
+<!ENTITY % sect4info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect4info.element "INCLUDE">
+<![%sect4info.element;[
+<!--doc:Meta-information for a Sect4.-->
+<!ELEMENT sect4info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect4info.element-->]]>
+
+<!ENTITY % sect4info.attlist "INCLUDE">
+<![%sect4info.attlist;[
+<!ATTLIST sect4info
+		%common.attrib;
+		%sect4info.role.attrib;
+		%local.sect4info.attrib;
+>
+<!--end of sect4info.attlist-->]]>
+
+<!ENTITY % local.sect5info.attrib "">
+<!ENTITY % sect5info.role.attrib "%role.attrib;">
+
+<!ENTITY % sect5info.element "INCLUDE">
+<![%sect5info.element;[
+<!--doc:Meta-information for a Sect5.-->
+<!ELEMENT sect5info %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sect5info.element-->]]>
+
+<!ENTITY % sect5info.attlist "INCLUDE">
+<![%sect5info.attlist;[
+<!ATTLIST sect5info
+		%common.attrib;
+		%sect5info.role.attrib;
+		%local.sect5info.attrib;
+>
+<!--end of sect5info.attlist-->]]>
+
+<!-- ...................................................................... -->
+<!-- Section (parallel to Sect*) ......................................... -->
+
+<!ENTITY % section.content.module "INCLUDE">
+<![ %section.content.module; [
+<!ENTITY % section.module "INCLUDE">
+<![ %section.module; [
+<!ENTITY % local.section.attrib "">
+<!ENTITY % section.role.attrib "%role.attrib;">
+
+<!ENTITY % section.element "INCLUDE">
+<![ %section.element; [
+<!--doc:A recursive section.-->
+<!ELEMENT section %ho; (sectioninfo?,
+			(%sect.title.content;),
+			(%nav.class;)*,
+			(((%divcomponent.mix;)+,
+ 			  ((%refentry.class;)*|(%section.class;)*|simplesect*))
+			 | (%refentry.class;)+|(%section.class;)+|simplesect+),
+			(%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of section.element-->]]>
+
+<!ENTITY % section.attlist "INCLUDE">
+<![ %section.attlist; [
+<!ATTLIST section
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%section.role.attrib;
+		%local.section.attrib;
+>
+<!--end of section.attlist-->]]>
+<!--end of section.module-->]]>
+
+<!ENTITY % sectioninfo.module "INCLUDE">
+<![ %sectioninfo.module; [
+<!ENTITY % sectioninfo.role.attrib "%role.attrib;">
+<!ENTITY % local.sectioninfo.attrib "">
+
+<!ENTITY % sectioninfo.element "INCLUDE">
+<![ %sectioninfo.element; [
+<!--doc:Meta-information for a recursive section.-->
+<!ELEMENT sectioninfo %ho; ((%info.class;)+)
+		%beginpage.exclusion;>
+<!--end of sectioninfo.element-->]]>
+
+<!ENTITY % sectioninfo.attlist "INCLUDE">
+<![ %sectioninfo.attlist; [
+<!ATTLIST sectioninfo
+		%common.attrib;
+		%sectioninfo.role.attrib;
+		%local.sectioninfo.attrib;
+>
+<!--end of sectioninfo.attlist-->]]>
+<!--end of sectioninfo.module-->]]>
+<!--end of section.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Sect1, Sect2, Sect3, Sect4, Sect5 .................................... -->
+
+<!ENTITY % sect1.module "INCLUDE">
+<![%sect1.module;[
+<!ENTITY % local.sect1.attrib "">
+<!ENTITY % sect1.role.attrib "%role.attrib;">
+
+<!ENTITY % sect1.element "INCLUDE">
+<![%sect1.element;[
+<!--doc:A top-level section of document.-->
+<!ELEMENT sect1 %ho; (sect1info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+,
+		((%refentry.class;)* | sect2* | simplesect*))
+		| (%refentry.class;)+ | sect2+ | simplesect+), (%nav.class;)*)
+		%ubiq.inclusion;>
+<!--end of sect1.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect1.attlist "INCLUDE">
+<![%sect1.attlist;[
+<!ATTLIST sect1
+		renderas	(sect2
+				|sect3
+				|sect4
+				|sect5)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect1.role.attrib;
+		%local.sect1.attrib;
+>
+<!--end of sect1.attlist-->]]>
+<!--end of sect1.module-->]]>
+
+<!ENTITY % sect2.module "INCLUDE">
+<![%sect2.module;[
+<!ENTITY % local.sect2.attrib "">
+<!ENTITY % sect2.role.attrib "%role.attrib;">
+
+<!ENTITY % sect2.element "INCLUDE">
+<![%sect2.element;[
+<!--doc:A subsection within a Sect1.-->
+<!ELEMENT sect2 %ho; (sect2info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+,
+		((%refentry.class;)* | sect3* | simplesect*))
+		| (%refentry.class;)+ | sect3+ | simplesect+), (%nav.class;)*)>
+<!--end of sect2.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect2.attlist "INCLUDE">
+<![%sect2.attlist;[
+<!ATTLIST sect2
+		renderas	(sect1
+				|sect3
+				|sect4
+				|sect5)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect2.role.attrib;
+		%local.sect2.attrib;
+>
+<!--end of sect2.attlist-->]]>
+<!--end of sect2.module-->]]>
+
+<!ENTITY % sect3.module "INCLUDE">
+<![%sect3.module;[
+<!ENTITY % local.sect3.attrib "">
+<!ENTITY % sect3.role.attrib "%role.attrib;">
+
+<!ENTITY % sect3.element "INCLUDE">
+<![%sect3.element;[
+<!--doc:A subsection within a Sect2.-->
+<!ELEMENT sect3 %ho; (sect3info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+,
+		((%refentry.class;)* | sect4* | simplesect*))
+		| (%refentry.class;)+ | sect4+ | simplesect+), (%nav.class;)*)>
+<!--end of sect3.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect3.attlist "INCLUDE">
+<![%sect3.attlist;[
+<!ATTLIST sect3
+		renderas	(sect1
+				|sect2
+				|sect4
+				|sect5)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect3.role.attrib;
+		%local.sect3.attrib;
+>
+<!--end of sect3.attlist-->]]>
+<!--end of sect3.module-->]]>
+
+<!ENTITY % sect4.module "INCLUDE">
+<![%sect4.module;[
+<!ENTITY % local.sect4.attrib "">
+<!ENTITY % sect4.role.attrib "%role.attrib;">
+
+<!ENTITY % sect4.element "INCLUDE">
+<![%sect4.element;[
+<!--doc:A subsection within a Sect3.-->
+<!ELEMENT sect4 %ho; (sect4info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+,
+		((%refentry.class;)* | sect5* | simplesect*))
+		| (%refentry.class;)+ | sect5+ | simplesect+), (%nav.class;)*)>
+<!--end of sect4.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect4.attlist "INCLUDE">
+<![%sect4.attlist;[
+<!ATTLIST sect4
+		renderas	(sect1
+				|sect2
+				|sect3
+				|sect5)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect4.role.attrib;
+		%local.sect4.attrib;
+>
+<!--end of sect4.attlist-->]]>
+<!--end of sect4.module-->]]>
+
+<!ENTITY % sect5.module "INCLUDE">
+<![%sect5.module;[
+<!ENTITY % local.sect5.attrib "">
+<!ENTITY % sect5.role.attrib "%role.attrib;">
+
+<!ENTITY % sect5.element "INCLUDE">
+<![%sect5.element;[
+<!--doc:A subsection within a Sect4.-->
+<!ELEMENT sect5 %ho; (sect5info?, (%sect.title.content;), (%nav.class;)*,
+		(((%divcomponent.mix;)+, ((%refentry.class;)* | simplesect*))
+		| (%refentry.class;)+ | simplesect+), (%nav.class;)*)>
+<!--end of sect5.element-->]]>
+
+<!-- Renderas: Indicates the format in which the heading should
+		appear -->
+
+
+<!ENTITY % sect5.attlist "INCLUDE">
+<![%sect5.attlist;[
+<!ATTLIST sect5
+		renderas	(sect1
+				|sect2
+				|sect3
+				|sect4)		#IMPLIED
+		%label.attrib;
+		%status.attrib;
+		%common.attrib;
+		%sect5.role.attrib;
+		%local.sect5.attrib;
+>
+<!--end of sect5.attlist-->]]>
+<!--end of sect5.module-->]]>
+
+<!ENTITY % simplesect.module "INCLUDE">
+<![%simplesect.module;[
+<!ENTITY % local.simplesect.attrib "">
+<!ENTITY % simplesect.role.attrib "%role.attrib;">
+
+<!ENTITY % simplesect.element "INCLUDE">
+<![%simplesect.element;[
+<!--doc:A section of a document with no subdivisions.-->
+<!ELEMENT simplesect %ho; ((%sect.title.content;), (%divcomponent.mix;)+)
+		%ubiq.inclusion;>
+<!--end of simplesect.element-->]]>
+
+<!ENTITY % simplesect.attlist "INCLUDE">
+<![%simplesect.attlist;[
+<!ATTLIST simplesect
+		%common.attrib;
+		%simplesect.role.attrib;
+		%local.simplesect.attrib;
+>
+<!--end of simplesect.attlist-->]]>
+<!--end of simplesect.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Bibliography ......................................................... -->
+
+<!ENTITY % bibliography.content.module "INCLUDE">
+<![%bibliography.content.module;[
+<!ENTITY % bibliography.module "INCLUDE">
+<![%bibliography.module;[
+<!ENTITY % local.bibliography.attrib "">
+<!ENTITY % bibliography.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliography.element "INCLUDE">
+<![%bibliography.element;[
+<!--doc:A bibliography.-->
+<!ELEMENT bibliography %ho; (bibliographyinfo?,
+                        (%bookcomponent.title.content;)?,
+                        (%component.mix;)*,
+                        (bibliodiv+ | (biblioentry|bibliomixed)+))>
+<!--end of bibliography.element-->]]>
+
+<!ENTITY % bibliography.attlist "INCLUDE">
+<![%bibliography.attlist;[
+<!ATTLIST bibliography
+		%status.attrib;
+		%common.attrib;
+		%bibliography.role.attrib;
+		%local.bibliography.attrib;
+>
+<!--end of bibliography.attlist-->]]>
+<!--end of bibliography.module-->]]>
+
+<!ENTITY % bibliodiv.module "INCLUDE">
+<![%bibliodiv.module;[
+<!ENTITY % local.bibliodiv.attrib "">
+<!ENTITY % bibliodiv.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliodiv.element "INCLUDE">
+<![%bibliodiv.element;[
+<!--doc:A section of a Bibliography.-->
+<!ELEMENT bibliodiv %ho; ((%sect.title.content;)?, (%component.mix;)*,
+		(biblioentry|bibliomixed)+)>
+<!--end of bibliodiv.element-->]]>
+
+<!ENTITY % bibliodiv.attlist "INCLUDE">
+<![%bibliodiv.attlist;[
+<!ATTLIST bibliodiv
+		%status.attrib;
+		%common.attrib;
+		%bibliodiv.role.attrib;
+		%local.bibliodiv.attrib;
+>
+<!--end of bibliodiv.attlist-->]]>
+<!--end of bibliodiv.module-->]]>
+<!--end of bibliography.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Glossary ............................................................. -->
+
+<!ENTITY % glossary.content.module "INCLUDE">
+<![%glossary.content.module;[
+<!ENTITY % glossary.module "INCLUDE">
+<![%glossary.module;[
+<!ENTITY % local.glossary.attrib "">
+<!ENTITY % glossary.role.attrib "%role.attrib;">
+
+<!ENTITY % glossary.element "INCLUDE">
+<![%glossary.element;[
+<!--doc:A glossary.-->
+<!ELEMENT glossary %ho; (glossaryinfo?,
+                    (%bookcomponent.title.content;)?,
+                    (%component.mix;)*,
+                    (glossdiv+ | glossentry+), bibliography?)>
+<!--end of glossary.element-->]]>
+
+<!ENTITY % glossary.attlist "INCLUDE">
+<![%glossary.attlist;[
+<!ATTLIST glossary
+		%status.attrib;
+		%common.attrib;
+		%glossary.role.attrib;
+		%local.glossary.attrib;
+>
+<!--end of glossary.attlist-->]]>
+<!--end of glossary.module-->]]>
+
+<!ENTITY % glossdiv.module "INCLUDE">
+<![%glossdiv.module;[
+<!ENTITY % local.glossdiv.attrib "">
+<!ENTITY % glossdiv.role.attrib "%role.attrib;">
+
+<!ENTITY % glossdiv.element "INCLUDE">
+<![%glossdiv.element;[
+<!--doc:A division in a Glossary.-->
+<!ELEMENT glossdiv %ho; ((%sect.title.content;), (%component.mix;)*,
+		glossentry+)>
+<!--end of glossdiv.element-->]]>
+
+<!ENTITY % glossdiv.attlist "INCLUDE">
+<![%glossdiv.attlist;[
+<!ATTLIST glossdiv
+		%status.attrib;
+		%common.attrib;
+		%glossdiv.role.attrib;
+		%local.glossdiv.attrib;
+>
+<!--end of glossdiv.attlist-->]]>
+<!--end of glossdiv.module-->]]>
+<!--end of glossary.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Index and SetIndex ................................................... -->
+
+<!ENTITY % index.content.module "INCLUDE">
+<![%index.content.module;[
+<!ENTITY % indexes.module "INCLUDE">
+<![%indexes.module;[
+<!ENTITY % local.indexes.attrib "">
+<!ENTITY % indexes.role.attrib "%role.attrib;">
+
+<!ENTITY % index.element "INCLUDE">
+<![%index.element;[
+<!--doc:An index.-->
+<!ELEMENT index %ho; (indexinfo?,
+                 (%bookcomponent.title.content;)?,
+                 (%component.mix;)*,
+                 (indexdiv* | indexentry*))
+		%ndxterm.exclusion;>
+<!--end of index.element-->]]>
+
+<!ENTITY % index.attlist "INCLUDE">
+<![%index.attlist;[
+<!ATTLIST index
+		type		CDATA		#IMPLIED
+		%common.attrib;
+		%indexes.role.attrib;
+		%local.indexes.attrib;
+>
+<!--end of index.attlist-->]]>
+
+<!ENTITY % setindex.element "INCLUDE">
+<![%setindex.element;[
+<!--doc:An index to a set of books.-->
+<!ELEMENT setindex %ho; (setindexinfo?,
+                    (%bookcomponent.title.content;)?,
+                    (%component.mix;)*,
+                    (indexdiv* | indexentry*))
+		%ndxterm.exclusion;>
+<!--end of setindex.element-->]]>
+
+<!ENTITY % setindex.attlist "INCLUDE">
+<![%setindex.attlist;[
+<!ATTLIST setindex
+		%common.attrib;
+		%indexes.role.attrib;
+		%local.indexes.attrib;
+>
+<!--end of setindex.attlist-->]]>
+<!--end of indexes.module-->]]>
+
+<!ENTITY % indexdiv.module "INCLUDE">
+<![%indexdiv.module;[
+
+<!-- SegmentedList in this content is useful for marking up permuted
+     indices. -->
+
+<!ENTITY % local.indexdiv.attrib "">
+<!ENTITY % indexdiv.role.attrib "%role.attrib;">
+
+<!ENTITY % indexdiv.element "INCLUDE">
+<![%indexdiv.element;[
+<!--doc:A division in an index.-->
+<!ELEMENT indexdiv %ho; ((%sect.title.content;)?, ((%indexdivcomponent.mix;)*,
+		(indexentry+ | segmentedlist)))>
+<!--end of indexdiv.element-->]]>
+
+<!ENTITY % indexdiv.attlist "INCLUDE">
+<![%indexdiv.attlist;[
+<!ATTLIST indexdiv
+		%common.attrib;
+		%indexdiv.role.attrib;
+		%local.indexdiv.attrib;
+>
+<!--end of indexdiv.attlist-->]]>
+<!--end of indexdiv.module-->]]>
+
+<!ENTITY % indexentry.module "INCLUDE">
+<![%indexentry.module;[
+<!-- Index entries appear in the index, not the text. -->
+
+<!ENTITY % local.indexentry.attrib "">
+<!ENTITY % indexentry.role.attrib "%role.attrib;">
+
+<!ENTITY % indexentry.element "INCLUDE">
+<![%indexentry.element;[
+<!--doc:An entry in an index.-->
+<!ELEMENT indexentry %ho; (primaryie, (seeie|seealsoie)*,
+		(secondaryie, (seeie|seealsoie|tertiaryie)*)*)>
+<!--end of indexentry.element-->]]>
+
+<!ENTITY % indexentry.attlist "INCLUDE">
+<![%indexentry.attlist;[
+<!ATTLIST indexentry
+		%common.attrib;
+		%indexentry.role.attrib;
+		%local.indexentry.attrib;
+>
+<!--end of indexentry.attlist-->]]>
+<!--end of indexentry.module-->]]>
+
+<!ENTITY % primsecterie.module "INCLUDE">
+<![%primsecterie.module;[
+<!ENTITY % local.primsecterie.attrib "">
+<!ENTITY % primsecterie.role.attrib "%role.attrib;">
+
+<!ENTITY % primaryie.element "INCLUDE">
+<![%primaryie.element;[
+<!--doc:A primary term in an index entry, not in the text.-->
+<!ELEMENT primaryie %ho; (%ndxterm.char.mix;)*>
+<!--end of primaryie.element-->]]>
+
+<!-- to IndexTerms that these entries represent -->
+
+<!ENTITY % primaryie.attlist "INCLUDE">
+<![%primaryie.attlist;[
+<!ATTLIST primaryie
+		%linkends.attrib;		%common.attrib;
+		%primsecterie.role.attrib;
+		%local.primsecterie.attrib;
+>
+<!--end of primaryie.attlist-->]]>
+
+<!ENTITY % secondaryie.element "INCLUDE">
+<![%secondaryie.element;[
+<!--doc:A secondary term in an index entry, rather than in the text.-->
+<!ELEMENT secondaryie %ho; (%ndxterm.char.mix;)*>
+<!--end of secondaryie.element-->]]>
+
+<!-- to IndexTerms that these entries represent -->
+
+<!ENTITY % secondaryie.attlist "INCLUDE">
+<![%secondaryie.attlist;[
+<!ATTLIST secondaryie
+		%linkends.attrib;		%common.attrib;
+		%primsecterie.role.attrib;
+		%local.primsecterie.attrib;
+>
+<!--end of secondaryie.attlist-->]]>
+
+<!ENTITY % tertiaryie.element "INCLUDE">
+<![%tertiaryie.element;[
+<!--doc:A tertiary term in an index entry, rather than in the text.-->
+<!ELEMENT tertiaryie %ho; (%ndxterm.char.mix;)*>
+<!--end of tertiaryie.element-->]]>
+
+<!-- to IndexTerms that these entries represent -->
+
+<!ENTITY % tertiaryie.attlist "INCLUDE">
+<![%tertiaryie.attlist;[
+<!ATTLIST tertiaryie
+		%linkends.attrib;		%common.attrib;
+		%primsecterie.role.attrib;
+		%local.primsecterie.attrib;
+>
+<!--end of tertiaryie.attlist-->]]>
+
+<!--end of primsecterie.module-->]]>
+
+<!ENTITY % seeie.module "INCLUDE">
+<![%seeie.module;[
+<!ENTITY % local.seeie.attrib "">
+<!ENTITY % seeie.role.attrib "%role.attrib;">
+
+<!ENTITY % seeie.element "INCLUDE">
+<![%seeie.element;[
+<!--doc:A See entry in an index, rather than in the text.-->
+<!ELEMENT seeie %ho; (%ndxterm.char.mix;)*>
+<!--end of seeie.element-->]]>
+
+<!-- to IndexEntry to look up -->
+
+
+<!ENTITY % seeie.attlist "INCLUDE">
+<![%seeie.attlist;[
+<!ATTLIST seeie
+		%linkend.attrib;		%common.attrib;
+		%seeie.role.attrib;
+		%local.seeie.attrib;
+>
+<!--end of seeie.attlist-->]]>
+<!--end of seeie.module-->]]>
+
+<!ENTITY % seealsoie.module "INCLUDE">
+<![%seealsoie.module;[
+<!ENTITY % local.seealsoie.attrib "">
+<!ENTITY % seealsoie.role.attrib "%role.attrib;">
+
+<!ENTITY % seealsoie.element "INCLUDE">
+<![%seealsoie.element;[
+<!--doc:A See also entry in an index, rather than in the text.-->
+<!ELEMENT seealsoie %ho; (%ndxterm.char.mix;)*>
+<!--end of seealsoie.element-->]]>
+
+<!-- to related IndexEntries -->
+
+
+<!ENTITY % seealsoie.attlist "INCLUDE">
+<![%seealsoie.attlist;[
+<!ATTLIST seealsoie
+		%linkends.attrib;		%common.attrib;
+		%seealsoie.role.attrib;
+		%local.seealsoie.attrib;
+>
+<!--end of seealsoie.attlist-->]]>
+<!--end of seealsoie.module-->]]>
+<!--end of index.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- RefEntry ............................................................. -->
+
+<!ENTITY % refentry.content.module "INCLUDE">
+<![%refentry.content.module;[
+<!ENTITY % refentry.module "INCLUDE">
+<![%refentry.module;[
+<!ENTITY % local.refentry.attrib "">
+<!ENTITY % refentry.role.attrib "%role.attrib;">
+
+<!ENTITY % refentry.element "INCLUDE">
+<![%refentry.element;[
+<!--doc:A reference page (originally a UNIX man-style reference page).-->
+<!ELEMENT refentry %ho; (beginpage?,
+                    (%ndxterm.class;)*,
+                    refentryinfo?, refmeta?, (remark|%link.char.class;)*,
+                    refnamediv+, refsynopsisdiv?, (refsect1+|refsection+))
+		%ubiq.inclusion;>
+<!--end of refentry.element-->]]>
+
+<!ENTITY % refentry.attlist "INCLUDE">
+<![%refentry.attlist;[
+<!ATTLIST refentry
+		%status.attrib;
+		%common.attrib;
+		%refentry.role.attrib;
+		%local.refentry.attrib;
+>
+<!--end of refentry.attlist-->]]>
+<!--end of refentry.module-->]]>
+
+<!ENTITY % refmeta.module "INCLUDE">
+<![%refmeta.module;[
+<!ENTITY % local.refmeta.attrib "">
+<!ENTITY % refmeta.role.attrib "%role.attrib;">
+
+<!ENTITY % refmeta.element "INCLUDE">
+<![%refmeta.element;[
+<!--doc:Meta-information for a reference entry.-->
+<!ELEMENT refmeta %ho; ((%ndxterm.class;)*,
+                   refentrytitle, manvolnum?, refmiscinfo*,
+                   (%ndxterm.class;)*)
+		%beginpage.exclusion;>
+<!--end of refmeta.element-->]]>
+
+<!ENTITY % refmeta.attlist "INCLUDE">
+<![%refmeta.attlist;[
+<!ATTLIST refmeta
+		%common.attrib;
+		%refmeta.role.attrib;
+		%local.refmeta.attrib;
+>
+<!--end of refmeta.attlist-->]]>
+<!--end of refmeta.module-->]]>
+
+<!ENTITY % refmiscinfo.module "INCLUDE">
+<![%refmiscinfo.module;[
+<!ENTITY % local.refmiscinfo.attrib "">
+<!ENTITY % refmiscinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % refmiscinfo.element "INCLUDE">
+<![%refmiscinfo.element;[
+<!--doc:Meta-information for a reference entry other than the title and volume number.-->
+<!ELEMENT refmiscinfo %ho; (%docinfo.char.mix;)*>
+<!--end of refmiscinfo.element-->]]>
+
+<!-- Class: Freely assignable parameter; no default -->
+
+
+<!ENTITY % refmiscinfo.attlist "INCLUDE">
+<![%refmiscinfo.attlist;[
+<!ATTLIST refmiscinfo
+		class		CDATA		#IMPLIED
+		%common.attrib;
+		%refmiscinfo.role.attrib;
+		%local.refmiscinfo.attrib;
+>
+<!--end of refmiscinfo.attlist-->]]>
+<!--end of refmiscinfo.module-->]]>
+
+<!ENTITY % refnamediv.module "INCLUDE">
+<![%refnamediv.module;[
+<!ENTITY % local.refnamediv.attrib "">
+<!ENTITY % refnamediv.role.attrib "%role.attrib;">
+
+<!ENTITY % refnamediv.element "INCLUDE">
+<![%refnamediv.element;[
+<!--doc:The name, purpose, and classification of a reference page.-->
+<!ELEMENT refnamediv %ho; (refdescriptor?, refname+, refpurpose, refclass*,
+		(remark|%link.char.class;)*)>
+<!--end of refnamediv.element-->]]>
+
+<!ENTITY % refnamediv.attlist "INCLUDE">
+<![%refnamediv.attlist;[
+<!ATTLIST refnamediv
+		%common.attrib;
+		%refnamediv.role.attrib;
+		%local.refnamediv.attrib;
+>
+<!--end of refnamediv.attlist-->]]>
+<!--end of refnamediv.module-->]]>
+
+<!ENTITY % refdescriptor.module "INCLUDE">
+<![%refdescriptor.module;[
+<!ENTITY % local.refdescriptor.attrib "">
+<!ENTITY % refdescriptor.role.attrib "%role.attrib;">
+
+<!ENTITY % refdescriptor.element "INCLUDE">
+<![%refdescriptor.element;[
+<!--doc:A description of the topic of a reference page.-->
+<!ELEMENT refdescriptor %ho; (%refname.char.mix;)*>
+<!--end of refdescriptor.element-->]]>
+
+<!ENTITY % refdescriptor.attlist "INCLUDE">
+<![%refdescriptor.attlist;[
+<!ATTLIST refdescriptor
+		%common.attrib;
+		%refdescriptor.role.attrib;
+		%local.refdescriptor.attrib;
+>
+<!--end of refdescriptor.attlist-->]]>
+<!--end of refdescriptor.module-->]]>
+
+<!ENTITY % refname.module "INCLUDE">
+<![%refname.module;[
+<!ENTITY % local.refname.attrib "">
+<!ENTITY % refname.role.attrib "%role.attrib;">
+
+<!ENTITY % refname.element "INCLUDE">
+<![%refname.element;[
+<!--doc:The name of (one of) the subject(s) of a reference page.-->
+<!ELEMENT refname %ho; (%refname.char.mix;)*>
+<!--end of refname.element-->]]>
+
+<!ENTITY % refname.attlist "INCLUDE">
+<![%refname.attlist;[
+<!ATTLIST refname
+		%common.attrib;
+		%refname.role.attrib;
+		%local.refname.attrib;
+>
+<!--end of refname.attlist-->]]>
+<!--end of refname.module-->]]>
+
+<!ENTITY % refpurpose.module "INCLUDE">
+<![%refpurpose.module;[
+<!ENTITY % local.refpurpose.attrib "">
+<!ENTITY % refpurpose.role.attrib "%role.attrib;">
+
+<!ENTITY % refpurpose.element "INCLUDE">
+<![%refpurpose.element;[
+<!--doc:A short (one sentence) synopsis of the topic of a reference page.-->
+<!ELEMENT refpurpose %ho; (%refinline.char.mix;)*>
+<!--end of refpurpose.element-->]]>
+
+<!ENTITY % refpurpose.attlist "INCLUDE">
+<![%refpurpose.attlist;[
+<!ATTLIST refpurpose
+		%common.attrib;
+		%refpurpose.role.attrib;
+		%local.refpurpose.attrib;
+>
+<!--end of refpurpose.attlist-->]]>
+<!--end of refpurpose.module-->]]>
+
+<!ENTITY % refclass.module "INCLUDE">
+<![%refclass.module;[
+<!ENTITY % local.refclass.attrib "">
+<!ENTITY % refclass.role.attrib "%role.attrib;">
+
+<!ENTITY % refclass.element "INCLUDE">
+<![%refclass.element;[
+<!--doc:The scope or other indication of applicability of a reference entry.-->
+<!ELEMENT refclass %ho; (%refclass.char.mix;)*>
+<!--end of refclass.element-->]]>
+
+<!ENTITY % refclass.attlist "INCLUDE">
+<![%refclass.attlist;[
+<!ATTLIST refclass
+		%common.attrib;
+		%refclass.role.attrib;
+		%local.refclass.attrib;
+>
+<!--end of refclass.attlist-->]]>
+<!--end of refclass.module-->]]>
+
+<!ENTITY % refsynopsisdiv.module "INCLUDE">
+<![%refsynopsisdiv.module;[
+<!ENTITY % local.refsynopsisdiv.attrib "">
+<!ENTITY % refsynopsisdiv.role.attrib "%role.attrib;">
+
+<!ENTITY % refsynopsisdiv.element "INCLUDE">
+<![%refsynopsisdiv.element;[
+<!--doc:A syntactic synopsis of the subject of the reference page.-->
+<!ELEMENT refsynopsisdiv %ho; (refsynopsisdivinfo?, (%refsect.title.content;)?,
+		(((%refcomponent.mix;)+, refsect2*) | (refsect2+)))>
+<!--end of refsynopsisdiv.element-->]]>
+
+<!ENTITY % refsynopsisdiv.attlist "INCLUDE">
+<![%refsynopsisdiv.attlist;[
+<!ATTLIST refsynopsisdiv
+		%common.attrib;
+		%refsynopsisdiv.role.attrib;
+		%local.refsynopsisdiv.attrib;
+>
+<!--end of refsynopsisdiv.attlist-->]]>
+<!--end of refsynopsisdiv.module-->]]>
+
+<!ENTITY % refsection.module "INCLUDE">
+<![%refsection.module;[
+<!ENTITY % local.refsection.attrib "">
+<!ENTITY % refsection.role.attrib "%role.attrib;">
+
+<!ENTITY % refsection.element "INCLUDE">
+<![%refsection.element;[
+<!--doc:A recursive section in a refentry.-->
+<!ELEMENT refsection %ho; (refsectioninfo?, (%refsect.title.content;),
+		(((%refcomponent.mix;)+, refsection*) | refsection+))>
+<!--end of refsection.element-->]]>
+
+<!ENTITY % refsection.attlist "INCLUDE">
+<![%refsection.attlist;[
+<!ATTLIST refsection
+		%status.attrib;
+		%common.attrib;
+		%refsection.role.attrib;
+		%local.refsection.attrib;
+>
+<!--end of refsection.attlist-->]]>
+<!--end of refsection.module-->]]>
+
+<!ENTITY % refsect1.module "INCLUDE">
+<![%refsect1.module;[
+<!ENTITY % local.refsect1.attrib "">
+<!ENTITY % refsect1.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect1.element "INCLUDE">
+<![%refsect1.element;[
+<!--doc:A major subsection of a reference entry.-->
+<!ELEMENT refsect1 %ho; (refsect1info?, (%refsect.title.content;),
+		(((%refcomponent.mix;)+, refsect2*) | refsect2+))>
+<!--end of refsect1.element-->]]>
+
+<!ENTITY % refsect1.attlist "INCLUDE">
+<![%refsect1.attlist;[
+<!ATTLIST refsect1
+		%status.attrib;
+		%common.attrib;
+		%refsect1.role.attrib;
+		%local.refsect1.attrib;
+>
+<!--end of refsect1.attlist-->]]>
+<!--end of refsect1.module-->]]>
+
+<!ENTITY % refsect2.module "INCLUDE">
+<![%refsect2.module;[
+<!ENTITY % local.refsect2.attrib "">
+<!ENTITY % refsect2.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect2.element "INCLUDE">
+<![%refsect2.element;[
+<!--doc:A subsection of a RefSect1.-->
+<!ELEMENT refsect2 %ho; (refsect2info?, (%refsect.title.content;),
+	(((%refcomponent.mix;)+, refsect3*) | refsect3+))>
+<!--end of refsect2.element-->]]>
+
+<!ENTITY % refsect2.attlist "INCLUDE">
+<![%refsect2.attlist;[
+<!ATTLIST refsect2
+		%status.attrib;
+		%common.attrib;
+		%refsect2.role.attrib;
+		%local.refsect2.attrib;
+>
+<!--end of refsect2.attlist-->]]>
+<!--end of refsect2.module-->]]>
+
+<!ENTITY % refsect3.module "INCLUDE">
+<![%refsect3.module;[
+<!ENTITY % local.refsect3.attrib "">
+<!ENTITY % refsect3.role.attrib "%role.attrib;">
+
+<!ENTITY % refsect3.element "INCLUDE">
+<![%refsect3.element;[
+<!--doc:A subsection of a RefSect2.-->
+<!ELEMENT refsect3 %ho; (refsect3info?, (%refsect.title.content;),
+	(%refcomponent.mix;)+)>
+<!--end of refsect3.element-->]]>
+
+<!ENTITY % refsect3.attlist "INCLUDE">
+<![%refsect3.attlist;[
+<!ATTLIST refsect3
+		%status.attrib;
+		%common.attrib;
+		%refsect3.role.attrib;
+		%local.refsect3.attrib;
+>
+<!--end of refsect3.attlist-->]]>
+<!--end of refsect3.module-->]]>
+<!--end of refentry.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Article .............................................................. -->
+
+<!ENTITY % article.module "INCLUDE">
+<![%article.module;[
+<!-- An Article is a chapter-level, stand-alone document that is often,
+     but need not be, collected into a Book. -->
+
+<!ENTITY % local.article.attrib "">
+<!ENTITY % article.role.attrib "%role.attrib;">
+
+<!ENTITY % article.element "INCLUDE">
+<![%article.element;[
+<!--doc:An article.-->
+<!ELEMENT article %ho; ((%div.title.content;)?, articleinfo?, tocchap?, lot*,
+			(%bookcomponent.content;),
+			(%nav.class;|%appendix.class;|colophon|ackno)*)
+		%ubiq.inclusion;>
+<!--end of article.element-->]]>
+
+<!-- Class: Indicates the type of a particular article;
+		all articles have the same structure and general purpose.
+		No default. -->
+<!-- ParentBook: ID of the enclosing Book -->
+
+
+<!ENTITY % article.attlist "INCLUDE">
+<![%article.attlist;[
+<!ATTLIST article
+		class		(journalarticle
+				|productsheet
+				|whitepaper
+				|techreport
+                                |specification
+				|faq)		#IMPLIED
+		parentbook	IDREF		#IMPLIED
+		%status.attrib;
+		%common.attrib;
+		%article.role.attrib;
+		%local.article.attrib;
+>
+<!--end of article.attlist-->]]>
+<!--end of article.module-->]]>
+
+<!-- End of DocBook document hierarchy module V4.5 ........................ -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/dbnotnx.mod b/xml/tests/testData/xml/DocBookHighlighting2/dbnotnx.mod
new file mode 100644
index 000000000000..2416049bfc34
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/dbnotnx.mod
@@ -0,0 +1,101 @@
+<!-- ...................................................................... -->
+<!-- DocBook notations module V4.5 ........................................ -->
+<!-- File dbnotnx.mod ..................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: dbnotnx.mod 6340 2006-10-03 13:23:24Z nwalsh $
+
+     Permission to use, copy, modify and distribute the DocBook DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the notation declarations used by DocBook.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbnotn PUBLIC
+     "-//OASIS//ENTITIES DocBook Notations V4.5//EN"
+     "dbnotnx.mod">
+     %dbnotn;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!ENTITY % local.notation.class "">
+<!ENTITY % notation.class
+		"BMP| CGM-CHAR | CGM-BINARY | CGM-CLEAR | DITROFF | DVI
+		| EPS | EQN | FAX | GIF | GIF87a | GIF89a
+		| JPG | JPEG | IGES | PCX
+		| PIC | PNG | PS | SGML | TBL | TEX | TIFF | WMF | WPG
+                | SVG | PDF | SWF
+		| linespecific
+		%local.notation.class;">
+
+<!NOTATION BMP		PUBLIC
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION Microsoft Windows bitmap//EN">
+<!NOTATION CGM-CHAR	PUBLIC "ISO 8632/2//NOTATION Character encoding//EN">
+<!NOTATION CGM-BINARY	PUBLIC "ISO 8632/3//NOTATION Binary encoding//EN">
+<!NOTATION CGM-CLEAR	PUBLIC "ISO 8632/4//NOTATION Clear text encoding//EN">
+<!NOTATION DITROFF	SYSTEM "DITROFF">
+<!NOTATION DVI		SYSTEM "DVI">
+<!NOTATION EPS		PUBLIC
+"+//ISBN 0-201-18127-4::Adobe//NOTATION PostScript Language Ref. Manual//EN">
+<!NOTATION EQN		SYSTEM "EQN">
+<!NOTATION FAX		PUBLIC
+"-//USA-DOD//NOTATION CCITT Group 4 Facsimile Type 1 Untiled Raster//EN">
+<!NOTATION GIF		SYSTEM "GIF">
+<!NOTATION GIF87a               PUBLIC
+"-//CompuServe//NOTATION Graphics Interchange Format 87a//EN">
+
+<!NOTATION GIF89a               PUBLIC
+"-//CompuServe//NOTATION Graphics Interchange Format 89a//EN">
+<!NOTATION JPG		SYSTEM "JPG">
+<!NOTATION JPEG		SYSTEM "JPG">
+<!NOTATION IGES		PUBLIC
+"-//USA-DOD//NOTATION (ASME/ANSI Y14.26M-1987) Initial Graphics Exchange Specification//EN">
+<!NOTATION PCX		PUBLIC
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION ZSoft PCX bitmap//EN">
+<!NOTATION PIC		SYSTEM "PIC">
+<!NOTATION PNG          SYSTEM "http://www.w3.org/TR/REC-png">
+<!NOTATION PS		SYSTEM "PS">
+<!NOTATION SGML		PUBLIC
+"ISO 8879:1986//NOTATION Standard Generalized Markup Language//EN">
+<!NOTATION TBL		SYSTEM "TBL">
+<!NOTATION TEX		PUBLIC
+"+//ISBN 0-201-13448-9::Knuth//NOTATION The TeXbook//EN">
+<!NOTATION TIFF		SYSTEM "TIFF">
+<!NOTATION WMF		PUBLIC
+"+//ISBN 0-7923-94.2-1::Graphic Notation//NOTATION Microsoft Windows Metafile//EN">
+<!NOTATION WPG		SYSTEM "WPG"> <!--WordPerfect Graphic format-->
+<!NOTATION SVG		SYSTEM "http://www.w3.org/TR/SVG/">
+<!NOTATION PDF		SYSTEM "http://www.adobe.com/products/acrobat/adobepdf.html">
+<!NOTATION SWF          SYSTEM "http://www.macromedia.com/software/flash">
+<!NOTATION linespecific	SYSTEM "linespecific">
+
+<!-- End of DocBook notations module V4.5 ................................. -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/dbpoolx.mod b/xml/tests/testData/xml/DocBookHighlighting2/dbpoolx.mod
new file mode 100644
index 000000000000..53b07044a0b8
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/dbpoolx.mod
@@ -0,0 +1,8701 @@
+<!-- ...................................................................... -->
+<!-- DocBook XML information pool module V4.5 ............................. -->
+<!-- File dbpoolx.mod ..................................................... -->
+
+<!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: dbpoolx.mod 6340 2006-10-03 13:23:24Z nwalsh $
+
+     Permission to use, copy, modify and distribute the DocBook XML DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook XML DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the definitions for the objects, inline
+     elements, and so on that are available to be used as the main
+     content of DocBook documents.  Some elements are useful for general
+     publishing, and others are useful specifically for computer
+     documentation.
+
+     This module has the following dependencies on other modules:
+
+     o It assumes that a %notation.class; entity is defined by the
+       driver file or other high-level module.  This entity is
+       referenced in the NOTATION attributes for the graphic-related and
+       ModeSpec elements.
+
+     o It assumes that an appropriately parameterized table module is
+       available for use with the table-related elements.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % dbpool PUBLIC
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN"
+     "dbpoolx.mod">
+     %dbpool;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+<!-- Forms entities ....................................................... -->
+<!-- These PEs provide the hook by which the forms module can be inserted   -->
+<!-- into the DTD. -->
+<!ENTITY % forminlines.hook "">
+<!ENTITY % forms.hook "">
+
+<!-- ...................................................................... -->
+<!-- General-purpose semantics entities ................................... -->
+
+<!ENTITY % yesorno.attvals	"CDATA">
+
+<!-- ...................................................................... -->
+<!-- Entities for module inclusions ....................................... -->
+
+<!ENTITY % dbpool.redecl.module "IGNORE">
+
+<!-- ...................................................................... -->
+<!-- Entities for element classes and mixtures ............................ -->
+
+<!-- "Ubiquitous" classes: ndxterm.class and beginpage -->
+
+<!ENTITY % local.ndxterm.class "">
+<!ENTITY % ndxterm.class
+		"indexterm %local.ndxterm.class;">
+
+<!-- Object-level classes ................................................. -->
+
+<!ENTITY % local.list.class "">
+<!ENTITY % list.class
+		"calloutlist|glosslist|bibliolist|itemizedlist|orderedlist|segmentedlist
+		|simplelist|variablelist %local.list.class;">
+
+<!ENTITY % local.admon.class "">
+<!ENTITY % admon.class
+		"caution|important|note|tip|warning %local.admon.class;">
+
+<!ENTITY % local.linespecific.class "">
+<!ENTITY % linespecific.class
+		"literallayout|programlisting|programlistingco|screen
+		|screenco|screenshot %local.linespecific.class;">
+
+<!ENTITY % local.method.synop.class "">
+<!ENTITY % method.synop.class
+		"constructorsynopsis
+                 |destructorsynopsis
+                 |methodsynopsis %local.method.synop.class;">
+
+<!ENTITY % local.synop.class "">
+<!ENTITY % synop.class
+		"synopsis|cmdsynopsis|funcsynopsis
+                 |classsynopsis|fieldsynopsis
+                 |%method.synop.class; %local.synop.class;">
+
+<!ENTITY % local.para.class "">
+<!ENTITY % para.class
+		"formalpara|para|simpara %local.para.class;">
+
+<!ENTITY % local.informal.class "">
+<!ENTITY % informal.class
+		"address|blockquote
+                |graphic|graphicco|mediaobject|mediaobjectco
+                |informalequation
+		|informalexample
+                |informalfigure
+                |informaltable %local.informal.class;">
+
+<!ENTITY % local.formal.class "">
+<!ENTITY % formal.class
+		"equation|example|figure|table %local.formal.class;">
+
+<!-- The DocBook TC may produce an official EBNF module for DocBook. -->
+<!-- This PE provides the hook by which it can be inserted into the DTD. -->
+<!ENTITY % ebnf.block.hook "">
+
+<!ENTITY % local.compound.class "">
+<!ENTITY % compound.class
+		"msgset|procedure|sidebar|qandaset|task
+                 %ebnf.block.hook;
+                 %local.compound.class;">
+
+<!ENTITY % local.genobj.class "">
+<!ENTITY % genobj.class
+		"anchor|bridgehead|remark|highlights
+		%local.genobj.class;">
+
+<!ENTITY % local.descobj.class "">
+<!ENTITY % descobj.class
+		"abstract|authorblurb|epigraph
+		%local.descobj.class;">
+
+<!-- Character-level classes .............................................. -->
+
+<!ENTITY % local.xref.char.class "">
+<!ENTITY % xref.char.class
+		"footnoteref|xref|biblioref %local.xref.char.class;">
+
+<!ENTITY % local.gen.char.class "">
+<!ENTITY % gen.char.class
+		"abbrev|acronym|citation|citerefentry|citetitle|citebiblioid|emphasis
+		|firstterm|foreignphrase|glossterm|termdef|footnote|phrase
+		|orgname|quote|trademark|wordasword
+		|personname %local.gen.char.class;">
+
+<!ENTITY % local.link.char.class "">
+<!ENTITY % link.char.class
+		"link|olink|ulink %local.link.char.class;">
+
+<!-- The DocBook TC may produce an official EBNF module for DocBook. -->
+<!-- This PE provides the hook by which it can be inserted into the DTD. -->
+<!ENTITY % ebnf.inline.hook "">
+
+<!ENTITY % local.tech.char.class "">
+<!ENTITY % tech.char.class
+		"action|application
+                |classname|methodname|interfacename|exceptionname
+                |ooclass|oointerface|ooexception
+                |package
+                |command|computeroutput
+		|database|email|envar|errorcode|errorname|errortype|errortext|filename
+		|function|guibutton|guiicon|guilabel|guimenu|guimenuitem
+		|guisubmenu|hardware|interface|keycap
+		|keycode|keycombo|keysym|literal|code|constant|markup|medialabel
+		|menuchoice|mousebutton|option|optional|parameter
+		|prompt|property|replaceable|returnvalue|sgmltag|structfield
+		|structname|symbol|systemitem|uri|token|type|userinput|varname
+                %ebnf.inline.hook;
+		%local.tech.char.class;">
+
+<!ENTITY % local.base.char.class "">
+<!ENTITY % base.char.class
+		"anchor %local.base.char.class;">
+
+<!ENTITY % local.docinfo.char.class "">
+<!ENTITY % docinfo.char.class
+		"author|authorinitials|corpauthor|corpcredit|modespec|othercredit
+		|productname|productnumber|revhistory
+		%local.docinfo.char.class;">
+
+<!ENTITY % local.other.char.class "">
+<!ENTITY % other.char.class
+		"remark|subscript|superscript %local.other.char.class;">
+
+<!ENTITY % local.inlineobj.char.class "">
+<!ENTITY % inlineobj.char.class
+		"inlinegraphic|inlinemediaobject|inlineequation %local.inlineobj.char.class;">
+
+<!-- ...................................................................... -->
+<!-- Entities for content models .......................................... -->
+
+<!ENTITY % formalobject.title.content "title, titleabbrev?">
+
+<!-- Redeclaration placeholder ............................................ -->
+
+<!-- For redeclaring entities that are declared after this point while
+     retaining their references to the entities that are declared before
+     this point -->
+
+<![%dbpool.redecl.module;[
+<!-- Defining rdbpool here makes some buggy XML parsers happy. -->
+<!ENTITY % rdbpool "">
+%rdbpool;
+<!--end of dbpool.redecl.module-->]]>
+
+<!-- Object-level mixtures ................................................ -->
+
+<!--
+                      list admn line synp para infm form cmpd gen  desc
+Component mixture       X    X    X    X    X    X    X    X    X    X
+Sidebar mixture         X    X    X    X    X    X    X    a    X
+Footnote mixture        X         X    X    X    X
+Example mixture         X         X    X    X    X
+Highlights mixture      X    X              X
+Paragraph mixture       X         X    X         X
+Admonition mixture      X         X    X    X    X    X    b    c
+Figure mixture                    X    X         X
+Table entry mixture     X    X    X         X    d
+Glossary def mixture    X         X    X    X    X         e
+Legal notice mixture    X    X    X         X    f
+
+a. Just Procedure; not Sidebar itself or MsgSet.
+b. No MsgSet.
+c. No Highlights.
+d. Just Graphic; no other informal objects.
+e. No Anchor, BridgeHead, or Highlights.
+f. Just BlockQuote; no other informal objects.
+-->
+
+<!ENTITY % local.component.mix "">
+<!ENTITY % component.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|%compound.class;
+		|%genobj.class;		|%descobj.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.component.mix;">
+
+<!ENTITY % local.sidebar.mix "">
+<!ENTITY % sidebar.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|procedure
+		|%genobj.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.sidebar.mix;">
+
+<!ENTITY % local.qandaset.mix "">
+<!ENTITY % qandaset.mix
+		"%list.class;           |%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|procedure
+		|%genobj.class;
+		|%ndxterm.class;
+		%forms.hook;
+                %local.qandaset.mix;">
+
+<!ENTITY % local.revdescription.mix "">
+<!ENTITY % revdescription.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|procedure
+		|%genobj.class;
+		|%ndxterm.class;
+		%local.revdescription.mix;">
+
+<!ENTITY % local.footnote.mix "">
+<!ENTITY % footnote.mix
+		"%list.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		%local.footnote.mix;">
+
+<!ENTITY % local.example.mix "">
+<!ENTITY % example.mix
+		"%list.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%ndxterm.class;        |beginpage
+		|procedure
+		%forms.hook;
+                %local.example.mix;">
+
+<!ENTITY % local.highlights.mix "">
+<!ENTITY % highlights.mix
+		"%list.class;		|%admon.class;
+		|%para.class;
+		|%ndxterm.class;
+		%local.highlights.mix;">
+
+<!-- %formal.class; is explicitly excluded from many contexts in which
+     paragraphs are used -->
+<!ENTITY % local.para.mix "">
+<!ENTITY % para.mix
+		"%list.class;           |%admon.class;
+		|%linespecific.class;
+					|%informal.class;
+		|%formal.class;
+		%local.para.mix;">
+
+<!ENTITY % local.admon.mix "">
+<!ENTITY % admon.mix
+		"%list.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;		|procedure|sidebar
+		|anchor|bridgehead|remark
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.admon.mix;">
+
+<!ENTITY % local.figure.mix "">
+<!ENTITY % figure.mix
+		"%linespecific.class;	|%synop.class;
+					|%informal.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.figure.mix;">
+
+<!ENTITY % local.tabentry.mix "">
+<!ENTITY % tabentry.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;
+		|%para.class;		|graphic|mediaobject
+		%forms.hook;
+		%local.tabentry.mix;">
+
+<!ENTITY % local.glossdef.mix "">
+<!ENTITY % glossdef.mix
+		"%list.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%formal.class;
+		|remark
+		|%ndxterm.class;        |beginpage
+		%local.glossdef.mix;">
+
+<!ENTITY % local.legalnotice.mix "">
+<!ENTITY % legalnotice.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;
+		|%para.class;		|blockquote
+		|%ndxterm.class;        |beginpage
+		%local.legalnotice.mix;">
+
+<!ENTITY % local.textobject.mix "">
+<!ENTITY % textobject.mix
+		"%list.class;		|%admon.class;
+		|%linespecific.class;
+		|%para.class;		|blockquote
+		%local.textobject.mix;">
+
+<!ENTITY % local.mediaobject.mix "">
+<!ENTITY % mediaobject.mix
+		"videoobject|audioobject|imageobject|imageobjectco|textobject %local.mediaobject.mix;">
+
+<!ENTITY % local.listpreamble.mix "">
+<!ENTITY % listpreamble.mix
+		"                  	 %admon.class;
+		|%linespecific.class;	|%synop.class;
+		|%para.class;		|%informal.class;
+		|%genobj.class;		|%descobj.class;
+		|%ndxterm.class;        |beginpage
+		%forms.hook;
+                %local.listpreamble.mix;">
+
+<!-- Character-level mixtures ............................................. -->
+
+<![%sgml.features;[
+<!ENTITY % local.ubiq.mix "">
+<!ENTITY % ubiq.mix "%ndxterm.class;|beginpage %local.ubiq.mix;">
+
+<!ENTITY % ubiq.exclusion "-(%ubiq.mix)">
+<!ENTITY % ubiq.inclusion "+(%ubiq.mix)">
+
+<!ENTITY % footnote.exclusion "-(footnote|%formal.class;)">
+<!ENTITY % highlights.exclusion "-(%ubiq.mix;|%formal.class;)">
+<!ENTITY % admon.exclusion "-(%admon.class;)">
+<!ENTITY % formal.exclusion "-(%formal.class;)">
+<!ENTITY % acronym.exclusion "-(acronym)">
+<!ENTITY % beginpage.exclusion "-(beginpage)">
+<!ENTITY % ndxterm.exclusion "-(%ndxterm.class;)">
+<!ENTITY % blockquote.exclusion "-(epigraph)">
+<!ENTITY % remark.exclusion "-(remark|%ubiq.mix;)">
+<!ENTITY % glossterm.exclusion "-(glossterm)">
+<!ENTITY % links.exclusion "-(link|olink|ulink|xref|biblioref)">
+]]><!-- sgml.features -->
+
+<!-- not [sgml.features[ -->
+<!ENTITY % local.ubiq.mix "">
+<!ENTITY % ubiq.mix "">
+
+<!ENTITY % ubiq.exclusion "">
+<!ENTITY % ubiq.inclusion "">
+
+<!ENTITY % footnote.exclusion "">
+<!ENTITY % highlights.exclusion "">
+<!ENTITY % admon.exclusion "">
+<!ENTITY % formal.exclusion "">
+<!ENTITY % acronym.exclusion "">
+<!ENTITY % beginpage.exclusion "">
+<!ENTITY % ndxterm.exclusion "">
+<!ENTITY % blockquote.exclusion "">
+<!ENTITY % remark.exclusion "">
+<!ENTITY % glossterm.exclusion "">
+<!ENTITY % links.exclusion "">
+<!-- ]] not sgml.features -->
+
+<!--
+                    #PCD xref word link cptr base dnfo othr inob (synop)
+para.char.mix         X    X    X    X    X    X    X    X    X
+title.char.mix        X    X    X    X    X    X    X    X    X
+ndxterm.char.mix      X    X    X    X    X    X    X    X    a
+cptr.char.mix         X              X    X    X         X    a
+smallcptr.char.mix    X                   b                   a
+word.char.mix         X         c    X         X         X    a
+docinfo.char.mix      X         d    X    b              X    a
+
+a. Just InlineGraphic; no InlineEquation.
+b. Just Replaceable; no other computer terms.
+c. Just Emphasis and Trademark; no other word elements.
+d. Just Acronym, Emphasis, and Trademark; no other word elements.
+-->
+
+<!ENTITY % local.para.char.mix "">
+<!ENTITY % para.char.mix
+		"#PCDATA
+		|%xref.char.class;	|%gen.char.class;
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;	|%docinfo.char.class;
+		|%other.char.class;	|%inlineobj.char.class;
+		|%synop.class;
+		|%ndxterm.class;        |beginpage
+                %forminlines.hook;
+		%local.para.char.mix;">
+
+<!ENTITY % local.title.char.mix "">
+<!ENTITY % title.char.mix
+		"#PCDATA
+		|%xref.char.class;	|%gen.char.class;
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;	|%docinfo.char.class;
+		|%other.char.class;	|%inlineobj.char.class;
+		|%ndxterm.class;
+		%local.title.char.mix;">
+
+<!ENTITY % local.ndxterm.char.mix "">
+<!ENTITY % ndxterm.char.mix
+		"#PCDATA
+		|%xref.char.class;	|%gen.char.class;
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;	|%docinfo.char.class;
+		|%other.char.class;	|inlinegraphic|inlinemediaobject
+		%local.ndxterm.char.mix;">
+
+<!ENTITY % local.cptr.char.mix "">
+<!ENTITY % cptr.char.mix
+		"#PCDATA
+		|%link.char.class;	|%tech.char.class;
+		|%base.char.class;
+		|%other.char.class;	|inlinegraphic|inlinemediaobject
+		|%ndxterm.class;        |beginpage
+		%local.cptr.char.mix;">
+
+<!ENTITY % local.smallcptr.char.mix "">
+<!ENTITY % smallcptr.char.mix
+		"#PCDATA
+					|replaceable
+					|inlinegraphic|inlinemediaobject
+		|%ndxterm.class;        |beginpage
+		%local.smallcptr.char.mix;">
+
+<!ENTITY % local.word.char.mix "">
+<!ENTITY % word.char.mix
+		"#PCDATA
+					|acronym|emphasis|trademark
+		|%link.char.class;
+		|%base.char.class;
+		|%other.char.class;	|inlinegraphic|inlinemediaobject
+		|%ndxterm.class;        |beginpage
+		%local.word.char.mix;">
+
+<!ENTITY % local.docinfo.char.mix "">
+<!ENTITY % docinfo.char.mix
+		"#PCDATA
+		|%link.char.class;
+					|emphasis|trademark
+					|replaceable
+		|%other.char.class;	|inlinegraphic|inlinemediaobject
+		|%ndxterm.class;
+		%local.docinfo.char.mix;">
+<!--ENTITY % bibliocomponent.mix (see Bibliographic section, below)-->
+<!--ENTITY % person.ident.mix (see Bibliographic section, below)-->
+
+<!-- ...................................................................... -->
+<!-- Entities for attributes and attribute components ..................... -->
+
+<!-- Effectivity attributes ............................................... -->
+
+
+<!-- Arch: Computer or chip architecture to which element applies; no
+	default -->
+
+<!ENTITY % arch.attrib
+	"arch		CDATA		#IMPLIED">
+
+<!-- Condition: General-purpose effectivity attribute -->
+
+<!ENTITY % condition.attrib
+	"condition	CDATA		#IMPLIED">
+
+<!-- Conformance: Standards conformance characteristics -->
+
+<!ENTITY % conformance.attrib
+	"conformance	NMTOKENS	#IMPLIED">
+
+
+<!-- OS: Operating system to which element applies; no default -->
+
+<!ENTITY % os.attrib
+	"os		CDATA		#IMPLIED">
+
+
+<!-- Revision: Editorial revision to which element belongs; no default -->
+
+<!ENTITY % revision.attrib
+	"revision	CDATA		#IMPLIED">
+
+<!-- Security: Security classification; no default -->
+
+<!ENTITY % security.attrib
+	"security	CDATA		#IMPLIED">
+
+<!-- UserLevel: Level of user experience to which element applies; no
+	default -->
+
+<!ENTITY % userlevel.attrib
+	"userlevel	CDATA		#IMPLIED">
+
+<!-- Vendor: Computer vendor to which element applies; no default -->
+
+<!ENTITY % vendor.attrib
+	"vendor		CDATA		#IMPLIED">
+
+<!-- Wordsize: Computer word size (32 bit, 64 bit, etc.); no default -->
+
+<!ENTITY % wordsize.attrib
+	"wordsize	CDATA		#IMPLIED">
+
+<!ENTITY % local.effectivity.attrib "">
+<!ENTITY % effectivity.attrib
+	"%arch.attrib;
+        %condition.attrib;
+	%conformance.attrib;
+	%os.attrib;
+	%revision.attrib;
+        %security.attrib;
+	%userlevel.attrib;
+	%vendor.attrib;
+	%wordsize.attrib;
+	%local.effectivity.attrib;"
+>
+
+<!-- Common attributes .................................................... -->
+
+
+<!-- Id: Unique identifier of element; no default -->
+
+<!ENTITY % id.attrib
+	"id		ID		#IMPLIED">
+
+
+<!-- Id: Unique identifier of element; a value must be supplied; no
+	default -->
+
+<!ENTITY % idreq.attrib
+	"id		ID		#REQUIRED">
+
+
+<!-- Lang: Indicator of language in which element is written, for
+	translation, character set management, etc.; no default -->
+
+<!ENTITY % lang.attrib
+	"lang		CDATA		#IMPLIED">
+
+
+<!-- Remap: Previous role of element before conversion; no default -->
+
+<!ENTITY % remap.attrib
+	"remap		CDATA		#IMPLIED">
+
+
+<!-- Role: New role of element in local environment; no default -->
+
+<!ENTITY % role.attrib
+	"role		CDATA		#IMPLIED">
+
+
+<!-- XRefLabel: Alternate labeling string for XRef text generation;
+	default is usually title or other appropriate label text already
+	contained in element -->
+
+<!ENTITY % xreflabel.attrib
+	"xreflabel	CDATA		#IMPLIED">
+
+
+<!-- RevisionFlag: Revision status of element; default is that element
+	wasn't revised -->
+
+<!ENTITY % revisionflag.attrib
+	"revisionflag	(changed
+			|added
+			|deleted
+			|off)		#IMPLIED">
+
+<!ENTITY % local.common.attrib "">
+
+<!-- dir: Bidirectional override -->
+
+<!ENTITY % dir.attrib
+	"dir		(ltr
+			|rtl
+			|lro
+			|rlo)		#IMPLIED">
+
+<!-- xml:base: base URI -->
+
+<![%sgml.features;[
+<!ENTITY % xml-base.attrib "">
+]]>
+<!ENTITY % xml-base.attrib
+	"xml:base	CDATA		#IMPLIED">
+
+<!-- Role is included explicitly on each element -->
+
+<!ENTITY % common.attrib
+	"%id.attrib;
+	%lang.attrib;
+	%remap.attrib;
+	%xreflabel.attrib;
+	%revisionflag.attrib;
+	%effectivity.attrib;
+	%dir.attrib;
+	%xml-base.attrib;
+	%local.common.attrib;"
+>
+
+<!-- Role is included explicitly on each element -->
+
+<!ENTITY % idreq.common.attrib
+	"%idreq.attrib;
+	%lang.attrib;
+	%remap.attrib;
+	%xreflabel.attrib;
+	%revisionflag.attrib;
+	%effectivity.attrib;
+	%dir.attrib;
+	%xml-base.attrib;
+	%local.common.attrib;"
+>
+
+<!-- Semi-common attributes and other attribute entities .................. -->
+
+<!ENTITY % local.graphics.attrib "">
+
+<!-- EntityRef: Name of an external entity containing the content
+	of the graphic -->
+<!-- FileRef: Filename, qualified by a pathname if desired,
+	designating the file containing the content of the graphic -->
+<!-- Format: Notation of the element content, if any -->
+<!-- SrcCredit: Information about the source of the Graphic -->
+<!-- Width: Same as CALS reprowid (desired width) -->
+<!-- Depth: Same as CALS reprodep (desired depth) -->
+<!-- Align: Same as CALS hplace with 'none' removed; #IMPLIED means
+	application-specific -->
+<!-- Scale: Conflation of CALS hscale and vscale -->
+<!-- Scalefit: Same as CALS scalefit -->
+
+<!ENTITY % graphics.attrib
+	"
+	entityref	ENTITY		#IMPLIED
+	fileref 	CDATA		#IMPLIED
+	format		(%notation.class;) #IMPLIED
+	srccredit	CDATA		#IMPLIED
+	width		CDATA		#IMPLIED
+	contentwidth	CDATA		#IMPLIED
+	depth		CDATA		#IMPLIED
+	contentdepth	CDATA		#IMPLIED
+	align		(left
+			|right
+			|center)	#IMPLIED
+	valign		(top
+			|middle
+			|bottom)	#IMPLIED
+	scale		CDATA		#IMPLIED
+	scalefit	%yesorno.attvals;
+					#IMPLIED
+	%local.graphics.attrib;"
+>
+
+<!ENTITY % local.keyaction.attrib "">
+
+<!-- Action: Key combination type; default is unspecified if one
+	child element, Simul if there is more than one; if value is
+	Other, the OtherAction attribute must have a nonempty value -->
+<!-- OtherAction: User-defined key combination type -->
+
+<!ENTITY % keyaction.attrib
+	"
+	action		(click
+			|double-click
+			|press
+			|seq
+			|simul
+			|other)		#IMPLIED
+	otheraction	CDATA		#IMPLIED
+	%local.keyaction.attrib;"
+>
+
+
+<!-- Label: Identifying number or string; default is usually the
+	appropriate number or string autogenerated by a formatter -->
+
+<!ENTITY % label.attrib
+	"label		CDATA		#IMPLIED">
+
+
+<!-- xml:space: whitespace treatment -->
+
+<![%sgml.features;[
+<!ENTITY % xml-space.attrib "">
+]]>
+<!ENTITY % xml-space.attrib
+	"xml:space	(preserve)		#IMPLIED">
+
+<!-- Format: whether element is assumed to contain significant white
+	space -->
+
+<!ENTITY % linespecific.attrib
+	"format		NOTATION
+			(linespecific)	'linespecific'
+         %xml-space.attrib;
+         linenumbering	(numbered|unnumbered) 	#IMPLIED
+         continuation	(continues|restarts)	#IMPLIED
+         startinglinenumber	CDATA		#IMPLIED
+         language	CDATA			#IMPLIED">
+
+<!-- Linkend: link to related information; no default -->
+
+<!ENTITY % linkend.attrib
+	"linkend	IDREF		#IMPLIED">
+
+
+<!-- Linkend: required link to related information -->
+
+<!ENTITY % linkendreq.attrib
+	"linkend	IDREF		#REQUIRED">
+
+
+<!-- Linkends: link to one or more sets of related information; no
+	default -->
+
+<!ENTITY % linkends.attrib
+	"linkends	IDREFS		#IMPLIED">
+
+
+<!ENTITY % local.mark.attrib "">
+<!ENTITY % mark.attrib
+	"mark		CDATA		#IMPLIED
+	%local.mark.attrib;"
+>
+
+
+<!-- MoreInfo: whether element's content has an associated RefEntry -->
+
+<!ENTITY % moreinfo.attrib
+	"moreinfo	(refentry|none)	'none'">
+
+
+<!-- Pagenum: number of page on which element appears; no default -->
+
+<!ENTITY % pagenum.attrib
+	"pagenum	CDATA		#IMPLIED">
+
+<!ENTITY % local.status.attrib "">
+
+<!-- Status: Editorial or publication status of the element
+	it applies to, such as "in review" or "approved for distribution" -->
+
+<!ENTITY % status.attrib
+	"status		CDATA		#IMPLIED
+	%local.status.attrib;"
+>
+
+
+<!-- Width: width of the longest line in the element to which it
+	pertains, in number of characters -->
+
+<!ENTITY % width.attrib
+	"width		CDATA		#IMPLIED">
+
+<!-- ...................................................................... -->
+<!-- Title elements ....................................................... -->
+
+<!ENTITY % title.module "INCLUDE">
+<![%title.module;[
+<!ENTITY % local.title.attrib "">
+<!ENTITY % title.role.attrib "%role.attrib;">
+
+<!ENTITY % title.element "INCLUDE">
+<![%title.element;[
+<!--doc:The text of the title of a section of a document or of a formal block-level element.-->
+<!ELEMENT title %ho; (%title.char.mix;)*>
+<!--end of title.element-->]]>
+
+<!ENTITY % title.attlist "INCLUDE">
+<![%title.attlist;[
+<!ATTLIST title
+		%pagenum.attrib;
+		%common.attrib;
+		%title.role.attrib;
+		%local.title.attrib;
+>
+<!--end of title.attlist-->]]>
+<!--end of title.module-->]]>
+
+<!ENTITY % titleabbrev.module "INCLUDE">
+<![%titleabbrev.module;[
+<!ENTITY % local.titleabbrev.attrib "">
+<!ENTITY % titleabbrev.role.attrib "%role.attrib;">
+
+<!ENTITY % titleabbrev.element "INCLUDE">
+<![%titleabbrev.element;[
+<!--doc:The abbreviation of a Title.-->
+<!ELEMENT titleabbrev %ho; (%title.char.mix;)*>
+<!--end of titleabbrev.element-->]]>
+
+<!ENTITY % titleabbrev.attlist "INCLUDE">
+<![%titleabbrev.attlist;[
+<!ATTLIST titleabbrev
+		%common.attrib;
+		%titleabbrev.role.attrib;
+		%local.titleabbrev.attrib;
+>
+<!--end of titleabbrev.attlist-->]]>
+<!--end of titleabbrev.module-->]]>
+
+<!ENTITY % subtitle.module "INCLUDE">
+<![%subtitle.module;[
+<!ENTITY % local.subtitle.attrib "">
+<!ENTITY % subtitle.role.attrib "%role.attrib;">
+
+<!ENTITY % subtitle.element "INCLUDE">
+<![%subtitle.element;[
+<!--doc:The subtitle of a document.-->
+<!ELEMENT subtitle %ho; (%title.char.mix;)*>
+<!--end of subtitle.element-->]]>
+
+<!ENTITY % subtitle.attlist "INCLUDE">
+<![%subtitle.attlist;[
+<!ATTLIST subtitle
+		%common.attrib;
+		%subtitle.role.attrib;
+		%local.subtitle.attrib;
+>
+<!--end of subtitle.attlist-->]]>
+<!--end of subtitle.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Bibliographic entities and elements .................................. -->
+
+<!-- The bibliographic elements are typically used in the document
+     hierarchy. They do not appear in content models of information
+     pool elements.  See also the document information elements,
+     below. -->
+
+<!ENTITY % local.person.ident.mix "">
+<!ENTITY % person.ident.mix
+		"honorific|firstname|surname|lineage|othername|affiliation
+		|authorblurb|contrib %local.person.ident.mix;">
+
+<!ENTITY % local.bibliocomponent.mix "">
+<!ENTITY % bibliocomponent.mix
+		"abbrev|abstract|address|artpagenums|author
+		|authorgroup|authorinitials|bibliomisc|biblioset
+		|collab|confgroup|contractnum|contractsponsor
+		|copyright|corpauthor|corpname|corpcredit|date|edition
+		|editor|invpartnumber|isbn|issn|issuenum|orgname
+		|biblioid|citebiblioid|bibliosource|bibliorelation|bibliocoverage
+		|othercredit|pagenums|printhistory|productname
+		|productnumber|pubdate|publisher|publishername
+		|pubsnumber|releaseinfo|revhistory|seriesvolnums
+		|subtitle|title|titleabbrev|volumenum|citetitle
+		|personname|%person.ident.mix;
+		|%ndxterm.class;
+		%local.bibliocomponent.mix;">
+
+<!-- I don't think this is well placed, but it needs to be here because of -->
+<!-- the reference to bibliocomponent.mix -->
+<!ENTITY % local.info.class "">
+<!ENTITY % info.class
+		"graphic | mediaobject | legalnotice | modespec
+		 | subjectset | keywordset | itermset | %bibliocomponent.mix;
+                 %local.info.class;">
+
+
+<!-- BiblioList ........................ -->
+
+<!ENTITY % bibliolist.module "INCLUDE">
+<![%bibliolist.module;[
+<!ENTITY % local.bibliolist.attrib "">
+<!ENTITY % bibliolist.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliolist.element "INCLUDE">
+<![%bibliolist.element;[
+<!--doc:A wrapper for a set of bibliography entries.-->
+<!ELEMENT bibliolist %ho; (blockinfo?, (%formalobject.title.content;)?,
+                           (biblioentry|bibliomixed)+)>
+<!--end of bibliolist.element-->]]>
+
+<!ENTITY % bibliolist.attlist "INCLUDE">
+<![%bibliolist.attlist;[
+<!ATTLIST bibliolist
+		%common.attrib;
+		%bibliolist.role.attrib;
+		%local.bibliolist.attrib;
+>
+<!--end of bibliolist.attlist-->]]>
+<!--end of bibliolist.module-->]]>
+
+<!ENTITY % biblioentry.module "INCLUDE">
+<![%biblioentry.module;[
+<!ENTITY % local.biblioentry.attrib "">
+<!ENTITY % biblioentry.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioentry.element "INCLUDE">
+<![%biblioentry.element;[
+<!--doc:An entry in a Bibliography.-->
+<!ELEMENT biblioentry %ho; ((articleinfo | (%bibliocomponent.mix;))+)
+                      %ubiq.exclusion;>
+<!--end of biblioentry.element-->]]>
+
+<!ENTITY % biblioentry.attlist "INCLUDE">
+<![%biblioentry.attlist;[
+<!ATTLIST biblioentry
+		%common.attrib;
+		%biblioentry.role.attrib;
+		%local.biblioentry.attrib;
+>
+<!--end of biblioentry.attlist-->]]>
+<!--end of biblioentry.module-->]]>
+
+<!ENTITY % bibliomixed.module "INCLUDE">
+<![%bibliomixed.module;[
+<!ENTITY % local.bibliomixed.attrib "">
+<!ENTITY % bibliomixed.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliomixed.element "INCLUDE">
+<![%bibliomixed.element;[
+<!--doc:An entry in a Bibliography.-->
+<!ELEMENT bibliomixed %ho; (#PCDATA | %bibliocomponent.mix; | bibliomset)*
+                      %ubiq.exclusion;>
+<!--end of bibliomixed.element-->]]>
+
+<!ENTITY % bibliomixed.attlist "INCLUDE">
+<![%bibliomixed.attlist;[
+<!ATTLIST bibliomixed
+		%common.attrib;
+		%bibliomixed.role.attrib;
+		%local.bibliomixed.attrib;
+>
+<!--end of bibliomixed.attlist-->]]>
+<!--end of bibliomixed.module-->]]>
+
+<!ENTITY % articleinfo.module "INCLUDE">
+<![%articleinfo.module;[
+<!ENTITY % local.articleinfo.attrib "">
+<!ENTITY % articleinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % articleinfo.element "INCLUDE">
+<![%articleinfo.element;[
+<!--doc:Meta-information for an Article.-->
+<!ELEMENT articleinfo %ho; ((%info.class;)+)
+	%beginpage.exclusion;>
+<!--end of articleinfo.element-->]]>
+
+<!ENTITY % articleinfo.attlist "INCLUDE">
+<![%articleinfo.attlist;[
+<!ATTLIST articleinfo
+		%common.attrib;
+		%articleinfo.role.attrib;
+		%local.articleinfo.attrib;
+>
+<!--end of articleinfo.attlist-->]]>
+<!--end of articleinfo.module-->]]>
+
+<!ENTITY % biblioset.module "INCLUDE">
+<![%biblioset.module;[
+<!ENTITY % local.biblioset.attrib "">
+<!ENTITY % biblioset.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioset.element "INCLUDE">
+<![%biblioset.element;[
+<!--doc:A "raw" container for related bibliographic information.-->
+<!ELEMENT biblioset %ho; ((%bibliocomponent.mix;)+)
+                      %ubiq.exclusion;>
+<!--end of biblioset.element-->]]>
+
+<!-- Relation: Relationship of elements contained within BiblioSet -->
+
+
+<!ENTITY % biblioset.attlist "INCLUDE">
+<![%biblioset.attlist;[
+<!ATTLIST biblioset
+		relation	CDATA		#IMPLIED
+		%common.attrib;
+		%biblioset.role.attrib;
+		%local.biblioset.attrib;
+>
+<!--end of biblioset.attlist-->]]>
+<!--end of biblioset.module-->]]>
+
+<!ENTITY % bibliomset.module "INCLUDE">
+<![%bibliomset.module;[
+<!ENTITY % bibliomset.role.attrib "%role.attrib;">
+<!ENTITY % local.bibliomset.attrib "">
+
+<!ENTITY % bibliomset.element "INCLUDE">
+<![%bibliomset.element;[
+<!--doc:A "cooked" container for related bibliographic information.-->
+<!ELEMENT bibliomset %ho; (#PCDATA | %bibliocomponent.mix; | bibliomset)*
+                      %ubiq.exclusion;>
+<!--end of bibliomset.element-->]]>
+
+<!-- Relation: Relationship of elements contained within BiblioMSet -->
+
+
+<!ENTITY % bibliomset.attlist "INCLUDE">
+<![%bibliomset.attlist;[
+<!ATTLIST bibliomset
+		relation	CDATA		#IMPLIED
+		%common.attrib;
+		%bibliomset.role.attrib;
+		%local.bibliomset.attrib;
+>
+<!--end of bibliomset.attlist-->]]>
+<!--end of bibliomset.module-->]]>
+
+<!ENTITY % bibliomisc.module "INCLUDE">
+<![%bibliomisc.module;[
+<!ENTITY % local.bibliomisc.attrib "">
+<!ENTITY % bibliomisc.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliomisc.element "INCLUDE">
+<![%bibliomisc.element;[
+<!--doc:Untyped bibliographic information.-->
+<!ELEMENT bibliomisc %ho; (%para.char.mix;)*>
+<!--end of bibliomisc.element-->]]>
+
+<!ENTITY % bibliomisc.attlist "INCLUDE">
+<![%bibliomisc.attlist;[
+<!ATTLIST bibliomisc
+		%common.attrib;
+		%bibliomisc.role.attrib;
+		%local.bibliomisc.attrib;
+>
+<!--end of bibliomisc.attlist-->]]>
+<!--end of bibliomisc.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Subject, Keyword, and ITermSet elements .............................. -->
+
+<!ENTITY % subjectset.content.module "INCLUDE">
+<![%subjectset.content.module;[
+<!ENTITY % subjectset.module "INCLUDE">
+<![%subjectset.module;[
+<!ENTITY % local.subjectset.attrib "">
+<!ENTITY % subjectset.role.attrib "%role.attrib;">
+
+<!ENTITY % subjectset.element "INCLUDE">
+<![%subjectset.element;[
+<!--doc:A set of terms describing the subject matter of a document.-->
+<!ELEMENT subjectset %ho; (subject+)>
+<!--end of subjectset.element-->]]>
+
+<!-- Scheme: Controlled vocabulary employed in SubjectTerms -->
+
+
+<!ENTITY % subjectset.attlist "INCLUDE">
+<![%subjectset.attlist;[
+<!ATTLIST subjectset
+		scheme		NMTOKEN		#IMPLIED
+		%common.attrib;
+		%subjectset.role.attrib;
+		%local.subjectset.attrib;
+>
+<!--end of subjectset.attlist-->]]>
+<!--end of subjectset.module-->]]>
+
+<!ENTITY % subject.module "INCLUDE">
+<![%subject.module;[
+<!ENTITY % local.subject.attrib "">
+<!ENTITY % subject.role.attrib "%role.attrib;">
+
+<!ENTITY % subject.element "INCLUDE">
+<![%subject.element;[
+<!--doc:One of a group of terms describing the subject matter of a document.-->
+<!ELEMENT subject %ho; (subjectterm+)>
+<!--end of subject.element-->]]>
+
+<!-- Weight: Ranking of this group of SubjectTerms relative
+		to others, 0 is low, no highest value specified -->
+
+
+<!ENTITY % subject.attlist "INCLUDE">
+<![%subject.attlist;[
+<!ATTLIST subject
+		weight		CDATA		#IMPLIED
+		%common.attrib;
+		%subject.role.attrib;
+		%local.subject.attrib;
+>
+<!--end of subject.attlist-->]]>
+<!--end of subject.module-->]]>
+
+<!ENTITY % subjectterm.module "INCLUDE">
+<![%subjectterm.module;[
+<!ENTITY % local.subjectterm.attrib "">
+<!ENTITY % subjectterm.role.attrib "%role.attrib;">
+
+<!ENTITY % subjectterm.element "INCLUDE">
+<![%subjectterm.element;[
+<!--doc:A term in a group of terms describing the subject matter of a document.-->
+<!ELEMENT subjectterm %ho; (#PCDATA)>
+<!--end of subjectterm.element-->]]>
+
+<!ENTITY % subjectterm.attlist "INCLUDE">
+<![%subjectterm.attlist;[
+<!ATTLIST subjectterm
+		%common.attrib;
+		%subjectterm.role.attrib;
+		%local.subjectterm.attrib;
+>
+<!--end of subjectterm.attlist-->]]>
+<!--end of subjectterm.module-->]]>
+<!--end of subjectset.content.module-->]]>
+
+<!ENTITY % keywordset.content.module "INCLUDE">
+<![%keywordset.content.module;[
+<!ENTITY % keywordset.module "INCLUDE">
+<![%keywordset.module;[
+<!ENTITY % local.keywordset.attrib "">
+<!ENTITY % keywordset.role.attrib "%role.attrib;">
+
+<!ENTITY % keywordset.element "INCLUDE">
+<![%keywordset.element;[
+<!--doc:A set of keywords describing the content of a document.-->
+<!ELEMENT keywordset %ho; (keyword+)>
+<!--end of keywordset.element-->]]>
+
+<!ENTITY % keywordset.attlist "INCLUDE">
+<![%keywordset.attlist;[
+<!ATTLIST keywordset
+		%common.attrib;
+		%keywordset.role.attrib;
+		%local.keywordset.attrib;
+>
+<!--end of keywordset.attlist-->]]>
+<!--end of keywordset.module-->]]>
+
+<!ENTITY % keyword.module "INCLUDE">
+<![%keyword.module;[
+<!ENTITY % local.keyword.attrib "">
+<!ENTITY % keyword.role.attrib "%role.attrib;">
+
+<!ENTITY % keyword.element "INCLUDE">
+<![%keyword.element;[
+<!--doc:One of a set of keywords describing the content of a document.-->
+<!ELEMENT keyword %ho; (#PCDATA)>
+<!--end of keyword.element-->]]>
+
+<!ENTITY % keyword.attlist "INCLUDE">
+<![%keyword.attlist;[
+<!ATTLIST keyword
+		%common.attrib;
+		%keyword.role.attrib;
+		%local.keyword.attrib;
+>
+<!--end of keyword.attlist-->]]>
+<!--end of keyword.module-->]]>
+<!--end of keywordset.content.module-->]]>
+
+<!ENTITY % itermset.module "INCLUDE">
+<![%itermset.module;[
+<!ENTITY % local.itermset.attrib "">
+<!ENTITY % itermset.role.attrib "%role.attrib;">
+
+<!ENTITY % itermset.element "INCLUDE">
+<![%itermset.element;[
+<!--doc:A set of index terms in the meta-information of a document.-->
+<!ELEMENT itermset %ho; (indexterm+)>
+<!--end of itermset.element-->]]>
+
+<!ENTITY % itermset.attlist "INCLUDE">
+<![%itermset.attlist;[
+<!ATTLIST itermset
+		%common.attrib;
+		%itermset.role.attrib;
+		%local.itermset.attrib;
+>
+<!--end of itermset.attlist-->]]>
+<!--end of itermset.module-->]]>
+
+<!-- Bibliographic info for "blocks" -->
+
+<!ENTITY % blockinfo.module "INCLUDE">
+<![ %blockinfo.module; [
+<!ENTITY % local.blockinfo.attrib "">
+<!ENTITY % blockinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % blockinfo.element "INCLUDE">
+<![ %blockinfo.element; [
+<!--doc:Meta-information for a block element.-->
+<!ELEMENT blockinfo %ho; ((%info.class;)+)
+	%beginpage.exclusion;>
+<!--end of blockinfo.element-->]]>
+
+<!ENTITY % blockinfo.attlist "INCLUDE">
+<![ %blockinfo.attlist; [
+<!ATTLIST blockinfo
+		%common.attrib;
+		%blockinfo.role.attrib;
+		%local.blockinfo.attrib;
+>
+<!--end of blockinfo.attlist-->]]>
+<!--end of blockinfo.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Compound (section-ish) elements ...................................... -->
+
+<!-- Message set ...................... -->
+
+<!ENTITY % msgset.content.module "INCLUDE">
+<![%msgset.content.module;[
+<!ENTITY % msgset.module "INCLUDE">
+<![%msgset.module;[
+<!ENTITY % local.msgset.attrib "">
+<!ENTITY % msgset.role.attrib "%role.attrib;">
+
+<!ENTITY % msgset.element "INCLUDE">
+<![%msgset.element;[
+<!--doc:A detailed set of messages, usually error messages.-->
+<!ELEMENT msgset %ho; (blockinfo?, (%formalobject.title.content;)?,
+                       (msgentry+|simplemsgentry+))>
+<!--end of msgset.element-->]]>
+
+<!ENTITY % msgset.attlist "INCLUDE">
+<![%msgset.attlist;[
+<!ATTLIST msgset
+		%common.attrib;
+		%msgset.role.attrib;
+		%local.msgset.attrib;
+>
+<!--end of msgset.attlist-->]]>
+<!--end of msgset.module-->]]>
+
+<!ENTITY % msgentry.module "INCLUDE">
+<![%msgentry.module;[
+<!ENTITY % local.msgentry.attrib "">
+<!ENTITY % msgentry.role.attrib "%role.attrib;">
+
+<!ENTITY % msgentry.element "INCLUDE">
+<![%msgentry.element;[
+<!--doc:A wrapper for an entry in a message set.-->
+<!ELEMENT msgentry %ho; (msg+, msginfo?, msgexplan*)>
+<!--end of msgentry.element-->]]>
+
+<!ENTITY % msgentry.attlist "INCLUDE">
+<![%msgentry.attlist;[
+<!ATTLIST msgentry
+		%common.attrib;
+		%msgentry.role.attrib;
+		%local.msgentry.attrib;
+>
+<!--end of msgentry.attlist-->]]>
+<!--end of msgentry.module-->]]>
+
+<!ENTITY % simplemsgentry.module "INCLUDE">
+<![ %simplemsgentry.module; [
+<!ENTITY % local.simplemsgentry.attrib "">
+<!ENTITY % simplemsgentry.role.attrib "%role.attrib;">
+
+<!ENTITY % simplemsgentry.element "INCLUDE">
+<![ %simplemsgentry.element; [
+<!--doc:A wrapper for a simpler entry in a message set.-->
+<!ELEMENT simplemsgentry %ho; (msgtext, msgexplan+)>
+<!--end of simplemsgentry.element-->]]>
+
+<!ENTITY % simplemsgentry.attlist "INCLUDE">
+<![ %simplemsgentry.attlist; [
+<!ATTLIST simplemsgentry
+		audience	CDATA	#IMPLIED
+		level		CDATA	#IMPLIED
+		origin		CDATA	#IMPLIED
+		%common.attrib;
+		%simplemsgentry.role.attrib;
+		%local.simplemsgentry.attrib;
+>
+<!--end of simplemsgentry.attlist-->]]>
+<!--end of simplemsgentry.module-->]]>
+
+<!ENTITY % msg.module "INCLUDE">
+<![%msg.module;[
+<!ENTITY % local.msg.attrib "">
+<!ENTITY % msg.role.attrib "%role.attrib;">
+
+<!ENTITY % msg.element "INCLUDE">
+<![%msg.element;[
+<!--doc:A message in a message set.-->
+<!ELEMENT msg %ho; (title?, msgmain, (msgsub | msgrel)*)>
+<!--end of msg.element-->]]>
+
+<!ENTITY % msg.attlist "INCLUDE">
+<![%msg.attlist;[
+<!ATTLIST msg
+		%common.attrib;
+		%msg.role.attrib;
+		%local.msg.attrib;
+>
+<!--end of msg.attlist-->]]>
+<!--end of msg.module-->]]>
+
+<!ENTITY % msgmain.module "INCLUDE">
+<![%msgmain.module;[
+<!ENTITY % local.msgmain.attrib "">
+<!ENTITY % msgmain.role.attrib "%role.attrib;">
+
+<!ENTITY % msgmain.element "INCLUDE">
+<![%msgmain.element;[
+<!--doc:The primary component of a message in a message set.-->
+<!ELEMENT msgmain %ho; (title?, msgtext)>
+<!--end of msgmain.element-->]]>
+
+<!ENTITY % msgmain.attlist "INCLUDE">
+<![%msgmain.attlist;[
+<!ATTLIST msgmain
+		%common.attrib;
+		%msgmain.role.attrib;
+		%local.msgmain.attrib;
+>
+<!--end of msgmain.attlist-->]]>
+<!--end of msgmain.module-->]]>
+
+<!ENTITY % msgsub.module "INCLUDE">
+<![%msgsub.module;[
+<!ENTITY % local.msgsub.attrib "">
+<!ENTITY % msgsub.role.attrib "%role.attrib;">
+
+<!ENTITY % msgsub.element "INCLUDE">
+<![%msgsub.element;[
+<!--doc:A subcomponent of a message in a message set.-->
+<!ELEMENT msgsub %ho; (title?, msgtext)>
+<!--end of msgsub.element-->]]>
+
+<!ENTITY % msgsub.attlist "INCLUDE">
+<![%msgsub.attlist;[
+<!ATTLIST msgsub
+		%common.attrib;
+		%msgsub.role.attrib;
+		%local.msgsub.attrib;
+>
+<!--end of msgsub.attlist-->]]>
+<!--end of msgsub.module-->]]>
+
+<!ENTITY % msgrel.module "INCLUDE">
+<![%msgrel.module;[
+<!ENTITY % local.msgrel.attrib "">
+<!ENTITY % msgrel.role.attrib "%role.attrib;">
+
+<!ENTITY % msgrel.element "INCLUDE">
+<![%msgrel.element;[
+<!--doc:A related component of a message in a message set.-->
+<!ELEMENT msgrel %ho; (title?, msgtext)>
+<!--end of msgrel.element-->]]>
+
+<!ENTITY % msgrel.attlist "INCLUDE">
+<![%msgrel.attlist;[
+<!ATTLIST msgrel
+		%common.attrib;
+		%msgrel.role.attrib;
+		%local.msgrel.attrib;
+>
+<!--end of msgrel.attlist-->]]>
+<!--end of msgrel.module-->]]>
+
+<!-- MsgText (defined in the Inlines section, below)-->
+
+<!ENTITY % msginfo.module "INCLUDE">
+<![%msginfo.module;[
+<!ENTITY % local.msginfo.attrib "">
+<!ENTITY % msginfo.role.attrib "%role.attrib;">
+
+<!ENTITY % msginfo.element "INCLUDE">
+<![%msginfo.element;[
+<!--doc:Information about a message in a message set.-->
+<!ELEMENT msginfo %ho; ((msglevel | msgorig | msgaud)*)>
+<!--end of msginfo.element-->]]>
+
+<!ENTITY % msginfo.attlist "INCLUDE">
+<![%msginfo.attlist;[
+<!ATTLIST msginfo
+		%common.attrib;
+		%msginfo.role.attrib;
+		%local.msginfo.attrib;
+>
+<!--end of msginfo.attlist-->]]>
+<!--end of msginfo.module-->]]>
+
+<!ENTITY % msglevel.module "INCLUDE">
+<![%msglevel.module;[
+<!ENTITY % local.msglevel.attrib "">
+<!ENTITY % msglevel.role.attrib "%role.attrib;">
+
+<!ENTITY % msglevel.element "INCLUDE">
+<![%msglevel.element;[
+<!--doc:The level of importance or severity of a message in a message set.-->
+<!ELEMENT msglevel %ho; (%smallcptr.char.mix;)*>
+<!--end of msglevel.element-->]]>
+
+<!ENTITY % msglevel.attlist "INCLUDE">
+<![%msglevel.attlist;[
+<!ATTLIST msglevel
+		%common.attrib;
+		%msglevel.role.attrib;
+		%local.msglevel.attrib;
+>
+<!--end of msglevel.attlist-->]]>
+<!--end of msglevel.module-->]]>
+
+<!ENTITY % msgorig.module "INCLUDE">
+<![%msgorig.module;[
+<!ENTITY % local.msgorig.attrib "">
+<!ENTITY % msgorig.role.attrib "%role.attrib;">
+
+<!ENTITY % msgorig.element "INCLUDE">
+<![%msgorig.element;[
+<!--doc:The origin of a message in a message set.-->
+<!ELEMENT msgorig %ho; (%smallcptr.char.mix;)*>
+<!--end of msgorig.element-->]]>
+
+<!ENTITY % msgorig.attlist "INCLUDE">
+<![%msgorig.attlist;[
+<!ATTLIST msgorig
+		%common.attrib;
+		%msgorig.role.attrib;
+		%local.msgorig.attrib;
+>
+<!--end of msgorig.attlist-->]]>
+<!--end of msgorig.module-->]]>
+
+<!ENTITY % msgaud.module "INCLUDE">
+<![%msgaud.module;[
+<!ENTITY % local.msgaud.attrib "">
+<!ENTITY % msgaud.role.attrib "%role.attrib;">
+
+<!ENTITY % msgaud.element "INCLUDE">
+<![%msgaud.element;[
+<!--doc:The audience to which a message in a message set is relevant.-->
+<!ELEMENT msgaud %ho; (%para.char.mix;)*>
+<!--end of msgaud.element-->]]>
+
+<!ENTITY % msgaud.attlist "INCLUDE">
+<![%msgaud.attlist;[
+<!ATTLIST msgaud
+		%common.attrib;
+		%msgaud.role.attrib;
+		%local.msgaud.attrib;
+>
+<!--end of msgaud.attlist-->]]>
+<!--end of msgaud.module-->]]>
+
+<!ENTITY % msgexplan.module "INCLUDE">
+<![%msgexplan.module;[
+<!ENTITY % local.msgexplan.attrib "">
+<!ENTITY % msgexplan.role.attrib "%role.attrib;">
+
+<!ENTITY % msgexplan.element "INCLUDE">
+<![%msgexplan.element;[
+<!--doc:Explanatory material relating to a message in a message set.-->
+<!ELEMENT msgexplan %ho; (title?, (%component.mix;)+)>
+<!--end of msgexplan.element-->]]>
+
+<!ENTITY % msgexplan.attlist "INCLUDE">
+<![%msgexplan.attlist;[
+<!ATTLIST msgexplan
+		%common.attrib;
+		%msgexplan.role.attrib;
+		%local.msgexplan.attrib;
+>
+<!--end of msgexplan.attlist-->]]>
+<!--end of msgexplan.module-->]]>
+<!--end of msgset.content.module-->]]>
+
+<!ENTITY % task.content.module "INCLUDE">
+<![%task.content.module;[
+<!ENTITY % task.module "INCLUDE">
+<![%task.module;[
+<!ENTITY % local.task.attrib "">
+<!ENTITY % task.role.attrib "%role.attrib;">
+
+<!ENTITY % task.element "INCLUDE">
+<![%task.element;[
+<!--doc:A task to be completed.-->
+<!ELEMENT task %ho; (blockinfo?,(%ndxterm.class;)*,
+                     (%formalobject.title.content;),
+                     tasksummary?,
+                     taskprerequisites?,
+                     procedure,
+                     example*,
+                     taskrelated?)>
+<!--end of task.element-->]]>
+
+<!ENTITY % task.attlist "INCLUDE">
+<![%task.attlist;[
+<!ATTLIST task
+		%common.attrib;
+		%task.role.attrib;
+		%local.task.attrib;
+>
+<!--end of task.attlist-->]]>
+<!--end of task.module-->]]>
+
+<!ENTITY % tasksummary.module "INCLUDE">
+<![%tasksummary.module;[
+<!ENTITY % local.tasksummary.attrib "">
+<!ENTITY % tasksummary.role.attrib "%role.attrib;">
+
+<!ENTITY % tasksummary.element "INCLUDE">
+<![%tasksummary.element;[
+<!--doc:A summary of a task.-->
+<!ELEMENT tasksummary %ho; (blockinfo?,
+                            (%formalobject.title.content;)?,
+                            (%component.mix;)+)>
+<!--end of tasksummary.element-->]]>
+
+<!ENTITY % tasksummary.attlist "INCLUDE">
+<![%tasksummary.attlist;[
+<!ATTLIST tasksummary
+		%common.attrib;
+		%tasksummary.role.attrib;
+		%local.tasksummary.attrib;
+>
+<!--end of tasksummary.attlist-->]]>
+<!--end of tasksummary.module-->]]>
+
+<!ENTITY % taskprerequisites.module "INCLUDE">
+<![%taskprerequisites.module;[
+<!ENTITY % local.taskprerequisites.attrib "">
+<!ENTITY % taskprerequisites.role.attrib "%role.attrib;">
+
+<!ENTITY % taskprerequisites.element "INCLUDE">
+<![%taskprerequisites.element;[
+<!--doc:The prerequisites for a task.-->
+<!ELEMENT taskprerequisites %ho; (blockinfo?,
+                                  (%formalobject.title.content;)?,
+                                  (%component.mix;)+)>
+<!--end of taskprerequisites.element-->]]>
+
+<!ENTITY % taskprerequisites.attlist "INCLUDE">
+<![%taskprerequisites.attlist;[
+<!ATTLIST taskprerequisites
+		%common.attrib;
+		%taskprerequisites.role.attrib;
+		%local.taskprerequisites.attrib;
+>
+<!--end of taskprerequisites.attlist-->]]>
+<!--end of taskprerequisites.module-->]]>
+
+<!ENTITY % taskrelated.module "INCLUDE">
+<![%taskrelated.module;[
+<!ENTITY % local.taskrelated.attrib "">
+<!ENTITY % taskrelated.role.attrib "%role.attrib;">
+
+<!ENTITY % taskrelated.element "INCLUDE">
+<![%taskrelated.element;[
+<!--doc:Information related to a task.-->
+<!ELEMENT taskrelated %ho; (blockinfo?,
+                            (%formalobject.title.content;)?,
+                            (%component.mix;)+)>
+<!--end of taskrelated.element-->]]>
+
+<!ENTITY % taskrelated.attlist "INCLUDE">
+<![%taskrelated.attlist;[
+<!ATTLIST taskrelated
+		%common.attrib;
+		%taskrelated.role.attrib;
+		%local.taskrelated.attrib;
+>
+<!--end of taskrelated.attlist-->]]>
+<!--end of taskrelated.module-->]]>
+<!--end of task.content.module-->]]>
+
+<!-- QandASet ........................ -->
+<!ENTITY % qandaset.content.module "INCLUDE">
+<![ %qandaset.content.module; [
+<!ENTITY % qandaset.module "INCLUDE">
+<![ %qandaset.module; [
+<!ENTITY % local.qandaset.attrib "">
+<!ENTITY % qandaset.role.attrib "%role.attrib;">
+
+<!ENTITY % qandaset.element "INCLUDE">
+<![ %qandaset.element; [
+<!--doc:A question-and-answer set.-->
+<!ELEMENT qandaset %ho; (blockinfo?, (%formalobject.title.content;)?,
+			(%qandaset.mix;)*,
+                        (qandadiv+|qandaentry+))>
+<!--end of qandaset.element-->]]>
+
+<!ENTITY % qandaset.attlist "INCLUDE">
+<![ %qandaset.attlist; [
+<!ATTLIST qandaset
+		defaultlabel	(qanda|number|none)       #IMPLIED
+		%common.attrib;
+		%qandaset.role.attrib;
+		%local.qandaset.attrib;>
+<!--end of qandaset.attlist-->]]>
+<!--end of qandaset.module-->]]>
+
+<!ENTITY % qandadiv.module "INCLUDE">
+<![ %qandadiv.module; [
+<!ENTITY % local.qandadiv.attrib "">
+<!ENTITY % qandadiv.role.attrib "%role.attrib;">
+
+<!ENTITY % qandadiv.element "INCLUDE">
+<![ %qandadiv.element; [
+<!--doc:A titled division in a QandASet.-->
+<!ELEMENT qandadiv %ho; (blockinfo?, (%formalobject.title.content;)?,
+			(%qandaset.mix;)*,
+			(qandadiv+|qandaentry+))>
+<!--end of qandadiv.element-->]]>
+
+<!ENTITY % qandadiv.attlist "INCLUDE">
+<![ %qandadiv.attlist; [
+<!ATTLIST qandadiv
+		%common.attrib;
+		%qandadiv.role.attrib;
+		%local.qandadiv.attrib;>
+<!--end of qandadiv.attlist-->]]>
+<!--end of qandadiv.module-->]]>
+
+<!ENTITY % qandaentry.module "INCLUDE">
+<![ %qandaentry.module; [
+<!ENTITY % local.qandaentry.attrib "">
+<!ENTITY % qandaentry.role.attrib "%role.attrib;">
+
+<!ENTITY % qandaentry.element "INCLUDE">
+<![ %qandaentry.element; [
+<!--doc:A question/answer set within a QandASet.-->
+<!ELEMENT qandaentry %ho; (blockinfo?, revhistory?, question, answer*)>
+<!--end of qandaentry.element-->]]>
+
+<!ENTITY % qandaentry.attlist "INCLUDE">
+<![ %qandaentry.attlist; [
+<!ATTLIST qandaentry
+		%common.attrib;
+		%qandaentry.role.attrib;
+		%local.qandaentry.attrib;>
+<!--end of qandaentry.attlist-->]]>
+<!--end of qandaentry.module-->]]>
+
+<!ENTITY % question.module "INCLUDE">
+<![ %question.module; [
+<!ENTITY % local.question.attrib "">
+<!ENTITY % question.role.attrib "%role.attrib;">
+
+<!ENTITY % question.element "INCLUDE">
+<![ %question.element; [
+<!--doc:A question in a QandASet.-->
+<!ELEMENT question %ho; (label?, (%qandaset.mix;)+)>
+<!--end of question.element-->]]>
+
+<!ENTITY % question.attlist "INCLUDE">
+<![ %question.attlist; [
+<!ATTLIST question
+		%common.attrib;
+		%question.role.attrib;
+		%local.question.attrib;
+>
+<!--end of question.attlist-->]]>
+<!--end of question.module-->]]>
+
+<!ENTITY % answer.module "INCLUDE">
+<![ %answer.module; [
+<!ENTITY % local.answer.attrib "">
+<!ENTITY % answer.role.attrib "%role.attrib;">
+
+<!ENTITY % answer.element "INCLUDE">
+<![ %answer.element; [
+<!--doc:An answer to a question posed in a QandASet.-->
+<!ELEMENT answer %ho; (label?, (%qandaset.mix;)*, qandaentry*)>
+<!--end of answer.element-->]]>
+
+<!ENTITY % answer.attlist "INCLUDE">
+<![ %answer.attlist; [
+<!ATTLIST answer
+		%common.attrib;
+		%answer.role.attrib;
+		%local.answer.attrib;
+>
+<!--end of answer.attlist-->]]>
+<!--end of answer.module-->]]>
+
+<!ENTITY % label.module "INCLUDE">
+<![ %label.module; [
+<!ENTITY % local.label.attrib "">
+<!ENTITY % label.role.attrib "%role.attrib;">
+
+<!ENTITY % label.element "INCLUDE">
+<![ %label.element; [
+<!--doc:A label on a Question or Answer.-->
+<!ELEMENT label %ho; (%word.char.mix;)*>
+<!--end of label.element-->]]>
+
+<!ENTITY % label.attlist "INCLUDE">
+<![ %label.attlist; [
+<!ATTLIST label
+		%common.attrib;
+		%label.role.attrib;
+		%local.label.attrib;
+>
+<!--end of label.attlist-->]]>
+<!--end of label.module-->]]>
+<!--end of qandaset.content.module-->]]>
+
+<!-- Procedure ........................ -->
+
+<!ENTITY % procedure.content.module "INCLUDE">
+<![%procedure.content.module;[
+<!ENTITY % procedure.module "INCLUDE">
+<![%procedure.module;[
+<!ENTITY % local.procedure.attrib "">
+<!ENTITY % procedure.role.attrib "%role.attrib;">
+
+<!ENTITY % procedure.element "INCLUDE">
+<![%procedure.element;[
+<!--doc:A list of operations to be performed in a well-defined sequence.-->
+<!ELEMENT procedure %ho; (blockinfo?, (%formalobject.title.content;)?,
+                          (%component.mix;)*, step+)>
+<!--end of procedure.element-->]]>
+
+<!ENTITY % procedure.attlist "INCLUDE">
+<![%procedure.attlist;[
+<!ATTLIST procedure
+		%common.attrib;
+		%procedure.role.attrib;
+		%local.procedure.attrib;
+>
+<!--end of procedure.attlist-->]]>
+<!--end of procedure.module-->]]>
+
+<!ENTITY % step.module "INCLUDE">
+<![%step.module;[
+<!ENTITY % local.step.attrib "">
+<!ENTITY % step.role.attrib "%role.attrib;">
+
+<!ENTITY % step.element "INCLUDE">
+<![%step.element;[
+<!--doc:A unit of action in a procedure.-->
+<!ELEMENT step %ho; (title?, (((%component.mix;)+, ((substeps|stepalternatives), (%component.mix;)*)?)
+                    | ((substeps|stepalternatives), (%component.mix;)*)))>
+<!--end of step.element-->]]>
+
+<!-- Performance: Whether the Step must be performed -->
+<!-- not #REQUIRED! -->
+
+
+<!ENTITY % step.attlist "INCLUDE">
+<![%step.attlist;[
+<!ATTLIST step
+		performance	(optional
+				|required)	"required"
+		%common.attrib;
+		%step.role.attrib;
+		%local.step.attrib;
+>
+<!--end of step.attlist-->]]>
+<!--end of step.module-->]]>
+
+<!ENTITY % substeps.module "INCLUDE">
+<![%substeps.module;[
+<!ENTITY % local.substeps.attrib "">
+<!ENTITY % substeps.role.attrib "%role.attrib;">
+
+<!ENTITY % substeps.element "INCLUDE">
+<![%substeps.element;[
+<!--doc:A wrapper for steps that occur within steps in a procedure.-->
+<!ELEMENT substeps %ho; (step+)>
+<!--end of substeps.element-->]]>
+
+<!-- Performance: whether entire set of substeps must be performed -->
+<!-- not #REQUIRED! -->
+
+<!ENTITY % substeps.attlist "INCLUDE">
+<![%substeps.attlist;[
+<!ATTLIST substeps
+		performance	(optional
+				|required)	"required"
+		%common.attrib;
+		%substeps.role.attrib;
+		%local.substeps.attrib;
+>
+<!--end of substeps.attlist-->]]>
+<!--end of substeps.module-->]]>
+
+<!ENTITY % stepalternatives.module "INCLUDE">
+<![%stepalternatives.module;[
+<!ENTITY % local.stepalternatives.attrib "">
+<!ENTITY % stepalternatives.role.attrib "%role.attrib;">
+
+<!ENTITY % stepalternatives.element "INCLUDE">
+<![%stepalternatives.element;[
+<!--doc:Alternative steps in a procedure.-->
+<!ELEMENT stepalternatives %ho; (step+)>
+<!--end of stepalternatives.element-->]]>
+
+<!-- Performance: Whether (one of) the alternatives must be performed -->
+<!-- not #REQUIRED! -->
+
+<!ENTITY % stepalternatives.attlist "INCLUDE">
+<![%stepalternatives.attlist;[
+<!ATTLIST stepalternatives
+		performance	(optional
+				|required)	"required"
+		%common.attrib;
+		%stepalternatives.role.attrib;
+		%local.stepalternatives.attrib;
+>
+<!--end of stepalternatives.attlist-->]]>
+<!--end of stepalternatives.module-->]]>
+<!--end of procedure.content.module-->]]>
+
+<!-- Sidebar .......................... -->
+
+<!ENTITY % sidebar.content.model "INCLUDE">
+<![ %sidebar.content.model; [
+
+<!ENTITY % sidebarinfo.module "INCLUDE">
+<![ %sidebarinfo.module; [
+<!ENTITY % local.sidebarinfo.attrib "">
+<!ENTITY % sidebarinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % sidebarinfo.element "INCLUDE">
+<![ %sidebarinfo.element; [
+<!--doc:Meta-information for a Sidebar.-->
+<!ELEMENT sidebarinfo %ho; ((%info.class;)+)
+	%beginpage.exclusion;>
+<!--end of sidebarinfo.element-->]]>
+
+<!ENTITY % sidebarinfo.attlist "INCLUDE">
+<![ %sidebarinfo.attlist; [
+<!ATTLIST sidebarinfo
+		%common.attrib;
+		%sidebarinfo.role.attrib;
+		%local.sidebarinfo.attrib;
+>
+<!--end of sidebarinfo.attlist-->]]>
+<!--end of sidebarinfo.module-->]]>
+
+<!ENTITY % sidebar.module "INCLUDE">
+<![%sidebar.module;[
+<!ENTITY % local.sidebar.attrib "">
+<!ENTITY % sidebar.role.attrib "%role.attrib;">
+
+<!ENTITY % sidebar.element "INCLUDE">
+<![%sidebar.element;[
+<!--doc:A portion of a document that is isolated from the main narrative flow.-->
+<!ELEMENT sidebar %ho; (sidebarinfo?,
+                   (%formalobject.title.content;)?,
+                   (%sidebar.mix;)+)>
+<!--end of sidebar.element-->]]>
+
+<!ENTITY % sidebar.attlist "INCLUDE">
+<![%sidebar.attlist;[
+<!ATTLIST sidebar
+		%common.attrib;
+		%sidebar.role.attrib;
+		%local.sidebar.attrib;
+>
+<!--end of sidebar.attlist-->]]>
+<!--end of sidebar.module-->]]>
+<!--end of sidebar.content.model-->]]>
+
+<!-- ...................................................................... -->
+<!-- Paragraph-related elements ........................................... -->
+
+<!ENTITY % abstract.module "INCLUDE">
+<![%abstract.module;[
+<!ENTITY % local.abstract.attrib "">
+<!ENTITY % abstract.role.attrib "%role.attrib;">
+
+<!ENTITY % abstract.element "INCLUDE">
+<![%abstract.element;[
+<!--doc:A summary.-->
+<!ELEMENT abstract %ho; (title?, (%para.class;)+)>
+<!--end of abstract.element-->]]>
+
+<!ENTITY % abstract.attlist "INCLUDE">
+<![%abstract.attlist;[
+<!ATTLIST abstract
+		%common.attrib;
+		%abstract.role.attrib;
+		%local.abstract.attrib;
+>
+<!--end of abstract.attlist-->]]>
+<!--end of abstract.module-->]]>
+
+<!ENTITY % authorblurb.module "INCLUDE">
+<![%authorblurb.module;[
+<!ENTITY % local.authorblurb.attrib "">
+<!ENTITY % authorblurb.role.attrib "%role.attrib;">
+
+<!ENTITY % authorblurb.element "INCLUDE">
+<![%authorblurb.element;[
+<!--doc:A short description or note about an author.-->
+<!ELEMENT authorblurb %ho; (title?, (%para.class;)+)>
+<!--end of authorblurb.element-->]]>
+
+<!ENTITY % authorblurb.attlist "INCLUDE">
+<![%authorblurb.attlist;[
+<!ATTLIST authorblurb
+		%common.attrib;
+		%authorblurb.role.attrib;
+		%local.authorblurb.attrib;
+>
+<!--end of authorblurb.attlist-->]]>
+<!--end of authorblurb.module-->]]>
+
+<!ENTITY % personblurb.module "INCLUDE">
+<![%personblurb.module;[
+<!ENTITY % local.personblurb.attrib "">
+<!ENTITY % personblurb.role.attrib "%role.attrib;">
+
+<!ENTITY % personblurb.element "INCLUDE">
+<![%personblurb.element;[
+<!--doc:A short description or note about a person.-->
+<!ELEMENT personblurb %ho; (title?, (%para.class;)+)>
+<!--end of personblurb.element-->]]>
+
+<!ENTITY % personblurb.attlist "INCLUDE">
+<![%personblurb.attlist;[
+<!ATTLIST personblurb
+		%common.attrib;
+		%personblurb.role.attrib;
+		%local.personblurb.attrib;
+>
+<!--end of personblurb.attlist-->]]>
+<!--end of personblurb.module-->]]>
+
+<!ENTITY % blockquote.module "INCLUDE">
+<![%blockquote.module;[
+
+<!ENTITY % local.blockquote.attrib "">
+<!ENTITY % blockquote.role.attrib "%role.attrib;">
+
+<!ENTITY % blockquote.element "INCLUDE">
+<![%blockquote.element;[
+<!--doc:A quotation set off from the main text.-->
+<!ELEMENT blockquote %ho; (blockinfo?, title?, attribution?, (%component.mix;)+)
+                      %blockquote.exclusion;>
+<!--end of blockquote.element-->]]>
+
+<!ENTITY % blockquote.attlist "INCLUDE">
+<![%blockquote.attlist;[
+<!ATTLIST blockquote
+		%common.attrib;
+		%blockquote.role.attrib;
+		%local.blockquote.attrib;
+>
+<!--end of blockquote.attlist-->]]>
+<!--end of blockquote.module-->]]>
+
+<!ENTITY % attribution.module "INCLUDE">
+<![%attribution.module;[
+<!ENTITY % local.attribution.attrib "">
+<!ENTITY % attribution.role.attrib "%role.attrib;">
+
+<!ENTITY % attribution.element "INCLUDE">
+<![%attribution.element;[
+<!--doc:The source of a block quote or epigraph.-->
+<!ELEMENT attribution %ho; (%para.char.mix;)*>
+<!--end of attribution.element-->]]>
+
+<!ENTITY % attribution.attlist "INCLUDE">
+<![%attribution.attlist;[
+<!ATTLIST attribution
+		%common.attrib;
+		%attribution.role.attrib;
+		%local.attribution.attrib;
+>
+<!--end of attribution.attlist-->]]>
+<!--end of attribution.module-->]]>
+
+<!ENTITY % bridgehead.module "INCLUDE">
+<![%bridgehead.module;[
+<!ENTITY % local.bridgehead.attrib "">
+<!ENTITY % bridgehead.role.attrib "%role.attrib;">
+
+<!ENTITY % bridgehead.element "INCLUDE">
+<![%bridgehead.element;[
+<!--doc:A free-floating heading.-->
+<!ELEMENT bridgehead %ho; (%title.char.mix;)*>
+<!--end of bridgehead.element-->]]>
+
+<!-- Renderas: Indicates the format in which the BridgeHead
+		should appear -->
+
+
+<!ENTITY % bridgehead.attlist "INCLUDE">
+<![%bridgehead.attlist;[
+<!ATTLIST bridgehead
+		renderas	(other
+				|sect1
+				|sect2
+				|sect3
+				|sect4
+				|sect5)		#IMPLIED
+		%common.attrib;
+		%bridgehead.role.attrib;
+		%local.bridgehead.attrib;
+>
+<!--end of bridgehead.attlist-->]]>
+<!--end of bridgehead.module-->]]>
+
+<!ENTITY % remark.module "INCLUDE">
+<![%remark.module;[
+<!ENTITY % local.remark.attrib "">
+<!ENTITY % remark.role.attrib "%role.attrib;">
+
+<!ENTITY % remark.element "INCLUDE">
+<![%remark.element;[
+<!--doc:A remark (or comment) intended for presentation in a draft manuscript.-->
+<!ELEMENT remark %ho; (%para.char.mix;)*
+                      %remark.exclusion;>
+<!--end of remark.element-->]]>
+
+<!ENTITY % remark.attlist "INCLUDE">
+<![%remark.attlist;[
+<!ATTLIST remark
+		%common.attrib;
+		%remark.role.attrib;
+		%local.remark.attrib;
+>
+<!--end of remark.attlist-->]]>
+<!--end of remark.module-->]]>
+
+<!ENTITY % epigraph.module "INCLUDE">
+<![%epigraph.module;[
+<!ENTITY % local.epigraph.attrib "">
+<!ENTITY % epigraph.role.attrib "%role.attrib;">
+
+<!ENTITY % epigraph.element "INCLUDE">
+<![%epigraph.element;[
+<!--doc:A short inscription at the beginning of a document or component.-->
+<!ELEMENT epigraph %ho; (attribution?, ((%para.class;)|literallayout)+)>
+<!--end of epigraph.element-->]]>
+
+<!ENTITY % epigraph.attlist "INCLUDE">
+<![%epigraph.attlist;[
+<!ATTLIST epigraph
+		%common.attrib;
+		%epigraph.role.attrib;
+		%local.epigraph.attrib;
+>
+<!--end of epigraph.attlist-->]]>
+<!-- Attribution (defined above)-->
+<!--end of epigraph.module-->]]>
+
+<!ENTITY % footnote.module "INCLUDE">
+<![%footnote.module;[
+<!ENTITY % local.footnote.attrib "">
+<!ENTITY % footnote.role.attrib "%role.attrib;">
+
+<!ENTITY % footnote.element "INCLUDE">
+<![%footnote.element;[
+<!--doc:A footnote.-->
+<!ELEMENT footnote %ho; ((%footnote.mix;)+)
+                      %footnote.exclusion;>
+<!--end of footnote.element-->]]>
+
+<!ENTITY % footnote.attlist "INCLUDE">
+<![%footnote.attlist;[
+<!ATTLIST footnote
+		%label.attrib;
+		%common.attrib;
+		%footnote.role.attrib;
+		%local.footnote.attrib;
+>
+<!--end of footnote.attlist-->]]>
+<!--end of footnote.module-->]]>
+
+<!ENTITY % highlights.module "INCLUDE">
+<![%highlights.module;[
+<!ENTITY % local.highlights.attrib "">
+<!ENTITY % highlights.role.attrib "%role.attrib;">
+
+<!ENTITY % highlights.element "INCLUDE">
+<![%highlights.element;[
+<!--doc:A summary of the main points of the discussed component.-->
+<!ELEMENT highlights %ho; ((%highlights.mix;)+)
+                      %highlights.exclusion;>
+<!--end of highlights.element-->]]>
+
+<!ENTITY % highlights.attlist "INCLUDE">
+<![%highlights.attlist;[
+<!ATTLIST highlights
+		%common.attrib;
+		%highlights.role.attrib;
+		%local.highlights.attrib;
+>
+<!--end of highlights.attlist-->]]>
+<!--end of highlights.module-->]]>
+
+<!ENTITY % formalpara.module "INCLUDE">
+<![%formalpara.module;[
+<!ENTITY % local.formalpara.attrib "">
+<!ENTITY % formalpara.role.attrib "%role.attrib;">
+
+<!ENTITY % formalpara.element "INCLUDE">
+<![%formalpara.element;[
+<!--doc:A paragraph with a title.-->
+<!ELEMENT formalpara %ho; (title, (%ndxterm.class;)*, para)>
+<!--end of formalpara.element-->]]>
+
+<!ENTITY % formalpara.attlist "INCLUDE">
+<![%formalpara.attlist;[
+<!ATTLIST formalpara
+		%common.attrib;
+		%formalpara.role.attrib;
+		%local.formalpara.attrib;
+>
+<!--end of formalpara.attlist-->]]>
+<!--end of formalpara.module-->]]>
+
+<!ENTITY % para.module "INCLUDE">
+<![%para.module;[
+<!ENTITY % local.para.attrib "">
+<!ENTITY % para.role.attrib "%role.attrib;">
+
+<!ENTITY % para.element "INCLUDE">
+<![%para.element;[
+<!--doc:A paragraph.-->
+<!ELEMENT para %ho; (%para.char.mix; | %para.mix;)*>
+<!--end of para.element-->]]>
+
+<!ENTITY % para.attlist "INCLUDE">
+<![%para.attlist;[
+<!ATTLIST para
+		%common.attrib;
+		%para.role.attrib;
+		%local.para.attrib;
+>
+<!--end of para.attlist-->]]>
+<!--end of para.module-->]]>
+
+<!ENTITY % simpara.module "INCLUDE">
+<![%simpara.module;[
+<!ENTITY % local.simpara.attrib "">
+<!ENTITY % simpara.role.attrib "%role.attrib;">
+
+<!ENTITY % simpara.element "INCLUDE">
+<![%simpara.element;[
+<!--doc:A paragraph that contains only text and inline markup, no block elements.-->
+<!ELEMENT simpara %ho; (%para.char.mix;)*>
+<!--end of simpara.element-->]]>
+
+<!ENTITY % simpara.attlist "INCLUDE">
+<![%simpara.attlist;[
+<!ATTLIST simpara
+		%common.attrib;
+		%simpara.role.attrib;
+		%local.simpara.attrib;
+>
+<!--end of simpara.attlist-->]]>
+<!--end of simpara.module-->]]>
+
+<!ENTITY % admon.module "INCLUDE">
+<![%admon.module;[
+<!ENTITY % local.admon.attrib "">
+<!ENTITY % admon.role.attrib "%role.attrib;">
+
+
+<!ENTITY % caution.element "INCLUDE">
+<![%caution.element;[
+<!--doc:A note of caution.-->
+<!ELEMENT caution %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of caution.element-->]]>
+
+<!ENTITY % caution.attlist "INCLUDE">
+<![%caution.attlist;[
+<!ATTLIST caution
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of caution.attlist-->]]>
+
+
+<!ENTITY % important.element "INCLUDE">
+<![%important.element;[
+<!--doc:An admonition set off from the text.-->
+<!ELEMENT important %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of important.element-->]]>
+
+<!ENTITY % important.attlist "INCLUDE">
+<![%important.attlist;[
+<!ATTLIST important
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of important.attlist-->]]>
+
+
+<!ENTITY % note.element "INCLUDE">
+<![%note.element;[
+<!--doc:A message set off from the text.-->
+<!ELEMENT note %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of note.element-->]]>
+
+<!ENTITY % note.attlist "INCLUDE">
+<![%note.attlist;[
+<!ATTLIST note
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of note.attlist-->]]>
+
+<!ENTITY % tip.element "INCLUDE">
+<![%tip.element;[
+<!--doc:A suggestion to the user, set off from the text.-->
+<!ELEMENT tip %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of tip.element-->]]>
+
+<!ENTITY % tip.attlist "INCLUDE">
+<![%tip.attlist;[
+<!ATTLIST tip
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of tip.attlist-->]]>
+
+
+<!ENTITY % warning.element "INCLUDE">
+<![%warning.element;[
+<!--doc:An admonition set off from the text.-->
+<!ELEMENT warning %ho; (title?, (%admon.mix;)+)
+                      %admon.exclusion;>
+<!--end of warning.element-->]]>
+
+<!ENTITY % warning.attlist "INCLUDE">
+<![%warning.attlist;[
+<!ATTLIST warning
+		%common.attrib;
+		%admon.role.attrib;
+		%local.admon.attrib;
+>
+<!--end of warning.attlist-->]]>
+
+<!--end of admon.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Lists ................................................................ -->
+
+<!-- GlossList ........................ -->
+
+<!ENTITY % glosslist.module "INCLUDE">
+<![%glosslist.module;[
+<!ENTITY % local.glosslist.attrib "">
+<!ENTITY % glosslist.role.attrib "%role.attrib;">
+
+<!ENTITY % glosslist.element "INCLUDE">
+<![%glosslist.element;[
+<!--doc:A wrapper for a set of GlossEntrys.-->
+<!ELEMENT glosslist %ho; (blockinfo?, (%formalobject.title.content;)?, glossentry+)>
+<!--end of glosslist.element-->]]>
+
+<!ENTITY % glosslist.attlist "INCLUDE">
+<![%glosslist.attlist;[
+<!ATTLIST glosslist
+		%common.attrib;
+		%glosslist.role.attrib;
+		%local.glosslist.attrib;
+>
+<!--end of glosslist.attlist-->]]>
+<!--end of glosslist.module-->]]>
+
+<!ENTITY % glossentry.content.module "INCLUDE">
+<![%glossentry.content.module;[
+<!ENTITY % glossentry.module "INCLUDE">
+<![%glossentry.module;[
+<!ENTITY % local.glossentry.attrib "">
+<!ENTITY % glossentry.role.attrib "%role.attrib;">
+
+<!ENTITY % glossentry.element "INCLUDE">
+<![%glossentry.element;[
+<!--doc:An entry in a Glossary or GlossList.-->
+<!ELEMENT glossentry %ho; (glossterm, acronym?, abbrev?,
+                      (%ndxterm.class;)*,
+                      revhistory?, (glosssee|glossdef+))>
+<!--end of glossentry.element-->]]>
+
+<!-- SortAs: String by which the GlossEntry is to be sorted
+		(alphabetized) in lieu of its proper content -->
+
+
+<!ENTITY % glossentry.attlist "INCLUDE">
+<![%glossentry.attlist;[
+<!ATTLIST glossentry
+		sortas		CDATA		#IMPLIED
+		%common.attrib;
+		%glossentry.role.attrib;
+		%local.glossentry.attrib;
+>
+<!--end of glossentry.attlist-->]]>
+<!--end of glossentry.module-->]]>
+
+<!-- GlossTerm (defined in the Inlines section, below)-->
+<!ENTITY % glossdef.module "INCLUDE">
+<![%glossdef.module;[
+<!ENTITY % local.glossdef.attrib "">
+<!ENTITY % glossdef.role.attrib "%role.attrib;">
+
+<!ENTITY % glossdef.element "INCLUDE">
+<![%glossdef.element;[
+<!--doc:A definition in a GlossEntry.-->
+<!ELEMENT glossdef %ho; ((%glossdef.mix;)+, glossseealso*)>
+<!--end of glossdef.element-->]]>
+
+<!-- Subject: List of subjects; keywords for the definition -->
+
+
+<!ENTITY % glossdef.attlist "INCLUDE">
+<![%glossdef.attlist;[
+<!ATTLIST glossdef
+		subject		CDATA		#IMPLIED
+		%common.attrib;
+		%glossdef.role.attrib;
+		%local.glossdef.attrib;
+>
+<!--end of glossdef.attlist-->]]>
+<!--end of glossdef.module-->]]>
+
+<!ENTITY % glosssee.module "INCLUDE">
+<![%glosssee.module;[
+<!ENTITY % local.glosssee.attrib "">
+<!ENTITY % glosssee.role.attrib "%role.attrib;">
+
+<!ENTITY % glosssee.element "INCLUDE">
+<![%glosssee.element;[
+<!--doc:A cross-reference from one GlossEntry to another.-->
+<!ELEMENT glosssee %ho; (%para.char.mix;)*>
+<!--end of glosssee.element-->]]>
+
+<!-- OtherTerm: Reference to the GlossEntry whose GlossTerm
+		should be displayed at the point of the GlossSee -->
+
+
+<!ENTITY % glosssee.attlist "INCLUDE">
+<![%glosssee.attlist;[
+<!ATTLIST glosssee
+		otherterm	IDREF		#IMPLIED
+		%common.attrib;
+		%glosssee.role.attrib;
+		%local.glosssee.attrib;
+>
+<!--end of glosssee.attlist-->]]>
+<!--end of glosssee.module-->]]>
+
+<!ENTITY % glossseealso.module "INCLUDE">
+<![%glossseealso.module;[
+<!ENTITY % local.glossseealso.attrib "">
+<!ENTITY % glossseealso.role.attrib "%role.attrib;">
+
+<!ENTITY % glossseealso.element "INCLUDE">
+<![%glossseealso.element;[
+<!--doc:A cross-reference from one GlossEntry to another.-->
+<!ELEMENT glossseealso %ho; (%para.char.mix;)*>
+<!--end of glossseealso.element-->]]>
+
+<!-- OtherTerm: Reference to the GlossEntry whose GlossTerm
+		should be displayed at the point of the GlossSeeAlso -->
+
+
+<!ENTITY % glossseealso.attlist "INCLUDE">
+<![%glossseealso.attlist;[
+<!ATTLIST glossseealso
+		otherterm	IDREF		#IMPLIED
+		%common.attrib;
+		%glossseealso.role.attrib;
+		%local.glossseealso.attrib;
+>
+<!--end of glossseealso.attlist-->]]>
+<!--end of glossseealso.module-->]]>
+<!--end of glossentry.content.module-->]]>
+
+<!-- ItemizedList and OrderedList ..... -->
+
+<!ENTITY % itemizedlist.module "INCLUDE">
+<![%itemizedlist.module;[
+<!ENTITY % local.itemizedlist.attrib "">
+<!ENTITY % itemizedlist.role.attrib "%role.attrib;">
+
+<!ENTITY % itemizedlist.element "INCLUDE">
+<![%itemizedlist.element;[
+<!--doc:A list in which each entry is marked with a bullet or other dingbat.-->
+<!ELEMENT itemizedlist %ho; (blockinfo?, (%formalobject.title.content;)?,
+ 			    (%listpreamble.mix;)*, listitem+)>
+
+<!--end of itemizedlist.element-->]]>
+
+<!-- Spacing: Whether the vertical space in the list should be
+		compressed -->
+<!-- Mark: Keyword, e.g., bullet, dash, checkbox, none;
+		list of keywords and defaults are implementation specific -->
+
+
+<!ENTITY % itemizedlist.attlist "INCLUDE">
+<![%itemizedlist.attlist;[
+<!ATTLIST itemizedlist
+		spacing		(normal
+				|compact)	#IMPLIED
+		%mark.attrib;
+		%common.attrib;
+		%itemizedlist.role.attrib;
+		%local.itemizedlist.attrib;
+>
+<!--end of itemizedlist.attlist-->]]>
+<!--end of itemizedlist.module-->]]>
+
+<!ENTITY % orderedlist.module "INCLUDE">
+<![%orderedlist.module;[
+<!ENTITY % local.orderedlist.attrib "">
+<!ENTITY % orderedlist.role.attrib "%role.attrib;">
+
+<!ENTITY % orderedlist.element "INCLUDE">
+<![%orderedlist.element;[
+<!--doc:A list in which each entry is marked with a sequentially incremented label.-->
+<!ELEMENT orderedlist %ho; (blockinfo?, (%formalobject.title.content;)?,
+ 			    (%listpreamble.mix;)*, listitem+)>
+
+<!--end of orderedlist.element-->]]>
+
+<!-- Numeration: Style of ListItem numbered; default is expected
+		to be Arabic -->
+<!-- InheritNum: Specifies for a nested list that the numbering
+		of ListItems should include the number of the item
+		within which they are nested (e.g., 1a and 1b within 1,
+		rather than a and b) -->
+<!-- Continuation: Where list numbering begins afresh (Restarts,
+		the default) or continues that of the immediately preceding
+		list (Continues) -->
+<!-- Spacing: Whether the vertical space in the list should be
+		compressed -->
+
+
+<!ENTITY % orderedlist.attlist "INCLUDE">
+<![%orderedlist.attlist;[
+<!ATTLIST orderedlist
+		numeration	(arabic
+				|upperalpha
+				|loweralpha
+				|upperroman
+				|lowerroman)	#IMPLIED
+		inheritnum	(inherit
+				|ignore)	"ignore"
+		continuation	(continues
+				|restarts)	"restarts"
+		spacing		(normal
+				|compact)	#IMPLIED
+		%common.attrib;
+		%orderedlist.role.attrib;
+		%local.orderedlist.attrib;
+>
+<!--end of orderedlist.attlist-->]]>
+<!--end of orderedlist.module-->]]>
+
+<!ENTITY % listitem.module "INCLUDE">
+<![%listitem.module;[
+<!ENTITY % local.listitem.attrib "">
+<!ENTITY % listitem.role.attrib "%role.attrib;">
+
+<!ENTITY % listitem.element "INCLUDE">
+<![%listitem.element;[
+<!--doc:A wrapper for the elements of a list item.-->
+<!ELEMENT listitem %ho; ((%component.mix;)+)>
+<!--end of listitem.element-->]]>
+
+<!-- Override: Indicates the mark to be used for this ListItem
+		instead of the default mark or the mark specified by
+		the Mark attribute on the enclosing ItemizedList -->
+
+
+<!ENTITY % listitem.attlist "INCLUDE">
+<![%listitem.attlist;[
+<!ATTLIST listitem
+		override	CDATA		#IMPLIED
+		%common.attrib;
+		%listitem.role.attrib;
+		%local.listitem.attrib;
+>
+<!--end of listitem.attlist-->]]>
+<!--end of listitem.module-->]]>
+
+<!-- SegmentedList .................... -->
+<!ENTITY % segmentedlist.content.module "INCLUDE">
+<![%segmentedlist.content.module;[
+<!ENTITY % segmentedlist.module "INCLUDE">
+<![%segmentedlist.module;[
+<!ENTITY % local.segmentedlist.attrib "">
+<!ENTITY % segmentedlist.role.attrib "%role.attrib;">
+
+<!ENTITY % segmentedlist.element "INCLUDE">
+<![%segmentedlist.element;[
+<!--doc:A segmented list, a list of sets of elements.-->
+<!ELEMENT segmentedlist %ho; ((%formalobject.title.content;)?,
+                         segtitle+,
+                         seglistitem+)>
+<!--end of segmentedlist.element-->]]>
+
+<!ENTITY % segmentedlist.attlist "INCLUDE">
+<![%segmentedlist.attlist;[
+<!ATTLIST segmentedlist
+		%common.attrib;
+		%segmentedlist.role.attrib;
+		%local.segmentedlist.attrib;
+>
+<!--end of segmentedlist.attlist-->]]>
+<!--end of segmentedlist.module-->]]>
+
+<!ENTITY % segtitle.module "INCLUDE">
+<![%segtitle.module;[
+<!ENTITY % local.segtitle.attrib "">
+<!ENTITY % segtitle.role.attrib "%role.attrib;">
+
+<!ENTITY % segtitle.element "INCLUDE">
+<![%segtitle.element;[
+<!--doc:The title of an element of a list item in a segmented list.-->
+<!ELEMENT segtitle %ho; (%title.char.mix;)*>
+<!--end of segtitle.element-->]]>
+
+<!ENTITY % segtitle.attlist "INCLUDE">
+<![%segtitle.attlist;[
+<!ATTLIST segtitle
+		%common.attrib;
+		%segtitle.role.attrib;
+		%local.segtitle.attrib;
+>
+<!--end of segtitle.attlist-->]]>
+<!--end of segtitle.module-->]]>
+
+<!ENTITY % seglistitem.module "INCLUDE">
+<![%seglistitem.module;[
+<!ENTITY % local.seglistitem.attrib "">
+<!ENTITY % seglistitem.role.attrib "%role.attrib;">
+
+<!ENTITY % seglistitem.element "INCLUDE">
+<![%seglistitem.element;[
+<!--doc:A list item in a segmented list.-->
+<!ELEMENT seglistitem %ho; (seg+)>
+<!--end of seglistitem.element-->]]>
+
+<!ENTITY % seglistitem.attlist "INCLUDE">
+<![%seglistitem.attlist;[
+<!ATTLIST seglistitem
+		%common.attrib;
+		%seglistitem.role.attrib;
+		%local.seglistitem.attrib;
+>
+<!--end of seglistitem.attlist-->]]>
+<!--end of seglistitem.module-->]]>
+
+<!ENTITY % seg.module "INCLUDE">
+<![%seg.module;[
+<!ENTITY % local.seg.attrib "">
+<!ENTITY % seg.role.attrib "%role.attrib;">
+
+<!ENTITY % seg.element "INCLUDE">
+<![%seg.element;[
+<!--doc:An element of a list item in a segmented list.-->
+<!ELEMENT seg %ho; (%para.char.mix;)*>
+<!--end of seg.element-->]]>
+
+<!ENTITY % seg.attlist "INCLUDE">
+<![%seg.attlist;[
+<!ATTLIST seg
+		%common.attrib;
+		%seg.role.attrib;
+		%local.seg.attrib;
+>
+<!--end of seg.attlist-->]]>
+<!--end of seg.module-->]]>
+<!--end of segmentedlist.content.module-->]]>
+
+<!-- SimpleList ....................... -->
+
+<!ENTITY % simplelist.content.module "INCLUDE">
+<![%simplelist.content.module;[
+<!ENTITY % simplelist.module "INCLUDE">
+<![%simplelist.module;[
+<!ENTITY % local.simplelist.attrib "">
+<!ENTITY % simplelist.role.attrib "%role.attrib;">
+
+<!ENTITY % simplelist.element "INCLUDE">
+<![%simplelist.element;[
+<!--doc:An undecorated list of single words or short phrases.-->
+<!ELEMENT simplelist %ho; (member+)>
+<!--end of simplelist.element-->]]>
+
+<!-- Columns: The number of columns the array should contain -->
+<!-- Type: How the Members of the SimpleList should be
+		formatted: Inline (members separated with commas etc.
+		inline), Vert (top to bottom in n Columns), or Horiz (in
+		the direction of text flow) in n Columns.  If Column
+		is 1 or implied, Type=Vert and Type=Horiz give the same
+		results. -->
+
+
+<!ENTITY % simplelist.attlist "INCLUDE">
+<![%simplelist.attlist;[
+<!ATTLIST simplelist
+		columns		CDATA		#IMPLIED
+		type		(inline
+				|vert
+				|horiz)		"vert"
+		%common.attrib;
+		%simplelist.role.attrib;
+		%local.simplelist.attrib;
+>
+<!--end of simplelist.attlist-->]]>
+<!--end of simplelist.module-->]]>
+
+<!ENTITY % member.module "INCLUDE">
+<![%member.module;[
+<!ENTITY % local.member.attrib "">
+<!ENTITY % member.role.attrib "%role.attrib;">
+
+<!ENTITY % member.element "INCLUDE">
+<![%member.element;[
+<!--doc:An element of a simple list.-->
+<!ELEMENT member %ho; (%para.char.mix;)*>
+<!--end of member.element-->]]>
+
+<!ENTITY % member.attlist "INCLUDE">
+<![%member.attlist;[
+<!ATTLIST member
+		%common.attrib;
+		%member.role.attrib;
+		%local.member.attrib;
+>
+<!--end of member.attlist-->]]>
+<!--end of member.module-->]]>
+<!--end of simplelist.content.module-->]]>
+
+<!-- VariableList ..................... -->
+
+<!ENTITY % variablelist.content.module "INCLUDE">
+<![%variablelist.content.module;[
+<!ENTITY % variablelist.module "INCLUDE">
+<![%variablelist.module;[
+<!ENTITY % local.variablelist.attrib "">
+<!ENTITY % variablelist.role.attrib "%role.attrib;">
+
+<!ENTITY % variablelist.element "INCLUDE">
+<![%variablelist.element;[
+<!--doc:A list in which each entry is composed of a set of one or more terms and an associated description.-->
+<!ELEMENT variablelist %ho; (blockinfo?, (%formalobject.title.content;)?,
+ 			    (%listpreamble.mix;)*, varlistentry+)>
+<!--end of variablelist.element-->]]>
+
+<!-- TermLength: Length beyond which the presentation engine
+		may consider the Term too long and select an alternate
+		presentation of the Term and, or, its associated ListItem. -->
+
+
+<!ENTITY % variablelist.attlist "INCLUDE">
+<![%variablelist.attlist;[
+<!ATTLIST variablelist
+		termlength	CDATA		#IMPLIED
+		spacing		(normal
+				|compact)	#IMPLIED
+		%common.attrib;
+		%variablelist.role.attrib;
+		%local.variablelist.attrib;
+>
+<!--end of variablelist.attlist-->]]>
+<!--end of variablelist.module-->]]>
+
+<!ENTITY % varlistentry.module "INCLUDE">
+<![%varlistentry.module;[
+<!ENTITY % local.varlistentry.attrib "">
+<!ENTITY % varlistentry.role.attrib "%role.attrib;">
+
+<!ENTITY % varlistentry.element "INCLUDE">
+<![%varlistentry.element;[
+<!--doc:A wrapper for a set of terms and the associated description in a variable list.-->
+<!ELEMENT varlistentry %ho; (term+, listitem)>
+<!--end of varlistentry.element-->]]>
+
+<!ENTITY % varlistentry.attlist "INCLUDE">
+<![%varlistentry.attlist;[
+<!ATTLIST varlistentry
+		%common.attrib;
+		%varlistentry.role.attrib;
+		%local.varlistentry.attrib;
+>
+<!--end of varlistentry.attlist-->]]>
+<!--end of varlistentry.module-->]]>
+
+<!ENTITY % term.module "INCLUDE">
+<![%term.module;[
+<!ENTITY % local.term.attrib "">
+<!ENTITY % term.role.attrib "%role.attrib;">
+
+<!ENTITY % term.element "INCLUDE">
+<![%term.element;[
+<!--doc:The word or phrase being defined or described in a variable list.-->
+<!ELEMENT term %ho; (%para.char.mix;)*>
+<!--end of term.element-->]]>
+
+<!ENTITY % term.attlist "INCLUDE">
+<![%term.attlist;[
+<!ATTLIST term
+		%common.attrib;
+		%term.role.attrib;
+		%local.term.attrib;
+>
+<!--end of term.attlist-->]]>
+<!--end of term.module-->]]>
+
+<!-- ListItem (defined above)-->
+<!--end of variablelist.content.module-->]]>
+
+<!-- CalloutList ...................... -->
+
+<!ENTITY % calloutlist.content.module "INCLUDE">
+<![%calloutlist.content.module;[
+<!ENTITY % calloutlist.module "INCLUDE">
+<![%calloutlist.module;[
+<!ENTITY % local.calloutlist.attrib "">
+<!ENTITY % calloutlist.role.attrib "%role.attrib;">
+
+<!ENTITY % calloutlist.element "INCLUDE">
+<![%calloutlist.element;[
+<!--doc:A list of Callouts.-->
+<!ELEMENT calloutlist %ho; ((%formalobject.title.content;)?, callout+)>
+<!--end of calloutlist.element-->]]>
+
+<!ENTITY % calloutlist.attlist "INCLUDE">
+<![%calloutlist.attlist;[
+<!ATTLIST calloutlist
+		%common.attrib;
+		%calloutlist.role.attrib;
+		%local.calloutlist.attrib;
+>
+<!--end of calloutlist.attlist-->]]>
+<!--end of calloutlist.module-->]]>
+
+<!ENTITY % callout.module "INCLUDE">
+<![%callout.module;[
+<!ENTITY % local.callout.attrib "">
+<!ENTITY % callout.role.attrib "%role.attrib;">
+
+<!ENTITY % callout.element "INCLUDE">
+<![%callout.element;[
+<!--doc:A &ldquo;called out&rdquo; description of a marked Area.-->
+<!ELEMENT callout %ho; ((%component.mix;)+)>
+<!--end of callout.element-->]]>
+
+<!-- AreaRefs: IDs of one or more Areas or AreaSets described
+		by this Callout -->
+
+
+<!ENTITY % callout.attlist "INCLUDE">
+<![%callout.attlist;[
+<!ATTLIST callout
+		arearefs	IDREFS		#REQUIRED
+		%common.attrib;
+		%callout.role.attrib;
+		%local.callout.attrib;
+>
+<!--end of callout.attlist-->]]>
+<!--end of callout.module-->]]>
+<!--end of calloutlist.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Objects .............................................................. -->
+
+<!-- Examples etc. .................... -->
+
+<!ENTITY % example.module "INCLUDE">
+<![%example.module;[
+<!ENTITY % local.example.attrib "">
+<!ENTITY % example.role.attrib "%role.attrib;">
+
+<!ENTITY % example.element "INCLUDE">
+<![%example.element;[
+<!--doc:A formal example, with a title.-->
+<!ELEMENT example %ho; (blockinfo?, (%formalobject.title.content;), (%example.mix;)+)
+		%formal.exclusion;>
+<!--end of example.element-->]]>
+
+<!ENTITY % example.attlist "INCLUDE">
+<![%example.attlist;[
+<!ATTLIST example
+		floatstyle	CDATA			#IMPLIED
+		%label.attrib;
+		%width.attrib;
+		%common.attrib;
+		%example.role.attrib;
+		%local.example.attrib;
+>
+<!--end of example.attlist-->]]>
+<!--end of example.module-->]]>
+
+<!ENTITY % informalexample.module "INCLUDE">
+<![%informalexample.module;[
+<!ENTITY % local.informalexample.attrib "">
+<!ENTITY % informalexample.role.attrib "%role.attrib;">
+
+<!ENTITY % informalexample.element "INCLUDE">
+<![%informalexample.element;[
+<!--doc:A displayed example without a title.-->
+<!ELEMENT informalexample %ho; (blockinfo?, (%example.mix;)+)>
+<!--end of informalexample.element-->]]>
+
+<!ENTITY % informalexample.attlist "INCLUDE">
+<![%informalexample.attlist;[
+<!ATTLIST informalexample
+		floatstyle	CDATA			#IMPLIED
+		%width.attrib;
+		%common.attrib;
+		%informalexample.role.attrib;
+		%local.informalexample.attrib;
+>
+<!--end of informalexample.attlist-->]]>
+<!--end of informalexample.module-->]]>
+
+<!ENTITY % programlistingco.module "INCLUDE">
+<![%programlistingco.module;[
+<!ENTITY % local.programlistingco.attrib "">
+<!ENTITY % programlistingco.role.attrib "%role.attrib;">
+
+<!ENTITY % programlistingco.element "INCLUDE">
+<![%programlistingco.element;[
+<!--doc:A program listing with associated areas used in callouts.-->
+<!ELEMENT programlistingco %ho; (areaspec, programlisting, calloutlist*)>
+<!--end of programlistingco.element-->]]>
+
+<!ENTITY % programlistingco.attlist "INCLUDE">
+<![%programlistingco.attlist;[
+<!ATTLIST programlistingco
+		%common.attrib;
+		%programlistingco.role.attrib;
+		%local.programlistingco.attrib;
+>
+<!--end of programlistingco.attlist-->]]>
+<!-- CalloutList (defined above in Lists)-->
+<!--end of informalexample.module-->]]>
+
+<!ENTITY % areaspec.content.module "INCLUDE">
+<![%areaspec.content.module;[
+<!ENTITY % areaspec.module "INCLUDE">
+<![%areaspec.module;[
+<!ENTITY % local.areaspec.attrib "">
+<!ENTITY % areaspec.role.attrib "%role.attrib;">
+
+<!ENTITY % areaspec.element "INCLUDE">
+<![%areaspec.element;[
+<!--doc:A collection of regions in a graphic or code example.-->
+<!ELEMENT areaspec %ho; ((area|areaset)+)>
+<!--end of areaspec.element-->]]>
+
+<!-- Units: global unit of measure in which coordinates in
+		this spec are expressed:
+
+		- CALSPair "x1,y1 x2,y2": lower-left and upper-right
+		coordinates in a rectangle describing repro area in which
+		graphic is placed, where X and Y dimensions are each some
+		number 0..10000 (taken from CALS graphic attributes)
+
+		- LineColumn "line column": line number and column number
+		at which to start callout text in "linespecific" content
+
+		- LineRange "startline endline": whole lines from startline
+		to endline in "linespecific" content
+
+		- LineColumnPair "line1 col1 line2 col2": starting and ending
+		points of area in "linespecific" content that starts at
+		first position and ends at second position (including the
+		beginnings of any intervening lines)
+
+		- Other: directive to look at value of OtherUnits attribute
+		to get implementation-specific keyword
+
+		The default is implementation-specific; usually dependent on
+		the parent element (GraphicCO gets CALSPair, ProgramListingCO
+		and ScreenCO get LineColumn) -->
+<!-- OtherUnits: User-defined units -->
+
+
+<!ENTITY % areaspec.attlist "INCLUDE">
+<![%areaspec.attlist;[
+<!ATTLIST areaspec
+		units		(calspair
+				|linecolumn
+				|linerange
+				|linecolumnpair
+				|other)		#IMPLIED
+		otherunits	NMTOKEN		#IMPLIED
+		%common.attrib;
+		%areaspec.role.attrib;
+		%local.areaspec.attrib;
+>
+<!--end of areaspec.attlist-->]]>
+<!--end of areaspec.module-->]]>
+
+<!ENTITY % area.module "INCLUDE">
+<![%area.module;[
+<!ENTITY % local.area.attrib "">
+<!ENTITY % area.role.attrib "%role.attrib;">
+
+<!ENTITY % area.element "INCLUDE">
+<![%area.element;[
+<!--doc:A region defined for a Callout in a graphic or code example.-->
+<!ELEMENT area %ho; EMPTY>
+<!--end of area.element-->]]>
+
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+<!-- Units: unit of measure in which coordinates in this
+		area are expressed; inherits from AreaSet and AreaSpec -->
+<!-- OtherUnits: User-defined units -->
+
+
+<!ENTITY % area.attlist "INCLUDE">
+<![%area.attlist;[
+<!ATTLIST area
+		%label.attrib;
+		%linkends.attrib;
+		units		(calspair
+				|linecolumn
+				|linerange
+				|linecolumnpair
+				|other)		#IMPLIED
+		otherunits	NMTOKEN		#IMPLIED
+		coords		CDATA		#REQUIRED
+		%idreq.common.attrib;
+		%area.role.attrib;
+		%local.area.attrib;
+>
+<!--end of area.attlist-->]]>
+<!--end of area.module-->]]>
+
+<!ENTITY % areaset.module "INCLUDE">
+<![%areaset.module;[
+<!ENTITY % local.areaset.attrib "">
+<!ENTITY % areaset.role.attrib "%role.attrib;">
+
+<!ENTITY % areaset.element "INCLUDE">
+<![%areaset.element;[
+<!--doc:A set of related areas in a graphic or code example.-->
+<!ELEMENT areaset %ho; (area+)>
+<!--end of areaset.element-->]]>
+
+<!-- bug number/symbol override or initialization -->
+<!-- Units: unit of measure in which coordinates in this
+		area are expressed; inherits from AreaSpec -->
+
+
+<!ENTITY % areaset.attlist "INCLUDE">
+<![%areaset.attlist;[
+<!ATTLIST areaset
+		%label.attrib;
+		units		(calspair
+				|linecolumn
+				|linerange
+				|linecolumnpair
+				|other)		#IMPLIED
+		otherunits	NMTOKEN		#IMPLIED
+		coords		CDATA		#REQUIRED
+		%idreq.common.attrib;
+		%areaset.role.attrib;
+		%local.areaset.attrib;
+>
+<!--end of areaset.attlist-->]]>
+<!--end of areaset.module-->]]>
+<!--end of areaspec.content.module-->]]>
+
+<!ENTITY % programlisting.module "INCLUDE">
+<![%programlisting.module;[
+<!ENTITY % local.programlisting.attrib "">
+<!ENTITY % programlisting.role.attrib "%role.attrib;">
+
+<!ENTITY % programlisting.element "INCLUDE">
+<![%programlisting.element;[
+<!--doc:A literal listing of all or part of a program.-->
+<!ELEMENT programlisting %ho; (%para.char.mix;|co|coref|lineannotation|textobject)*>
+<!--end of programlisting.element-->]]>
+
+<!ENTITY % programlisting.attlist "INCLUDE">
+<![%programlisting.attlist;[
+<!ATTLIST programlisting
+		%width.attrib;
+		%linespecific.attrib;
+		%common.attrib;
+		%programlisting.role.attrib;
+		%local.programlisting.attrib;
+>
+<!--end of programlisting.attlist-->]]>
+<!--end of programlisting.module-->]]>
+
+<!ENTITY % literallayout.module "INCLUDE">
+<![%literallayout.module;[
+<!ENTITY % local.literallayout.attrib "">
+<!ENTITY % literallayout.role.attrib "%role.attrib;">
+
+<!ENTITY % literallayout.element "INCLUDE">
+<![%literallayout.element;[
+<!--doc:A block of text in which line breaks and white space are to be reproduced faithfully.-->
+<!ELEMENT literallayout %ho; (%para.char.mix;|co|coref|textobject|lineannotation)*>
+<!--end of literallayout.element-->]]>
+
+<!ENTITY % literallayout.attlist "INCLUDE">
+<![%literallayout.attlist;[
+<!ATTLIST literallayout
+		%width.attrib;
+		%linespecific.attrib;
+		class	(monospaced|normal)	"normal"
+		%common.attrib;
+		%literallayout.role.attrib;
+		%local.literallayout.attrib;
+>
+<!--end of literallayout.attlist-->]]>
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!--end of literallayout.module-->]]>
+
+<!ENTITY % screenco.module "INCLUDE">
+<![%screenco.module;[
+<!ENTITY % local.screenco.attrib "">
+<!ENTITY % screenco.role.attrib "%role.attrib;">
+
+<!ENTITY % screenco.element "INCLUDE">
+<![%screenco.element;[
+<!--doc:A screen with associated areas used in callouts.-->
+<!ELEMENT screenco %ho; (areaspec, screen, calloutlist*)>
+<!--end of screenco.element-->]]>
+
+<!ENTITY % screenco.attlist "INCLUDE">
+<![%screenco.attlist;[
+<!ATTLIST screenco
+		%common.attrib;
+		%screenco.role.attrib;
+		%local.screenco.attrib;
+>
+<!--end of screenco.attlist-->]]>
+<!-- AreaSpec (defined above)-->
+<!-- CalloutList (defined above in Lists)-->
+<!--end of screenco.module-->]]>
+
+<!ENTITY % screen.module "INCLUDE">
+<![%screen.module;[
+<!ENTITY % local.screen.attrib "">
+<!ENTITY % screen.role.attrib "%role.attrib;">
+
+<!ENTITY % screen.element "INCLUDE">
+<![%screen.element;[
+<!--doc:Text that a user sees or might see on a computer screen.-->
+<!ELEMENT screen %ho; (%para.char.mix;|co|coref|textobject|lineannotation)*>
+<!--end of screen.element-->]]>
+
+<!ENTITY % screen.attlist "INCLUDE">
+<![%screen.attlist;[
+<!ATTLIST screen
+		%width.attrib;
+		%linespecific.attrib;
+		%common.attrib;
+		%screen.role.attrib;
+		%local.screen.attrib;
+>
+<!--end of screen.attlist-->]]>
+<!--end of screen.module-->]]>
+
+<!ENTITY % screenshot.content.module "INCLUDE">
+<![%screenshot.content.module;[
+<!ENTITY % screenshot.module "INCLUDE">
+<![%screenshot.module;[
+<!ENTITY % local.screenshot.attrib "">
+<!ENTITY % screenshot.role.attrib "%role.attrib;">
+
+<!ENTITY % screenshot.element "INCLUDE">
+<![%screenshot.element;[
+<!--doc:A representation of what the user sees or might see on a computer screen.-->
+<!ELEMENT screenshot %ho; (screeninfo?,
+                      (graphic|graphicco
+                      |mediaobject|mediaobjectco))>
+<!--end of screenshot.element-->]]>
+
+<!ENTITY % screenshot.attlist "INCLUDE">
+<![%screenshot.attlist;[
+<!ATTLIST screenshot
+		%common.attrib;
+		%screenshot.role.attrib;
+		%local.screenshot.attrib;
+>
+<!--end of screenshot.attlist-->]]>
+<!--end of screenshot.module-->]]>
+
+<!ENTITY % screeninfo.module "INCLUDE">
+<![%screeninfo.module;[
+<!ENTITY % local.screeninfo.attrib "">
+<!ENTITY % screeninfo.role.attrib "%role.attrib;">
+
+<!ENTITY % screeninfo.element "INCLUDE">
+<![%screeninfo.element;[
+<!--doc:Information about how a screen shot was produced.-->
+<!ELEMENT screeninfo %ho; (%para.char.mix;)*
+		%ubiq.exclusion;>
+<!--end of screeninfo.element-->]]>
+
+<!ENTITY % screeninfo.attlist "INCLUDE">
+<![%screeninfo.attlist;[
+<!ATTLIST screeninfo
+		%common.attrib;
+		%screeninfo.role.attrib;
+		%local.screeninfo.attrib;
+>
+<!--end of screeninfo.attlist-->]]>
+<!--end of screeninfo.module-->]]>
+<!--end of screenshot.content.module-->]]>
+
+<!-- Figures etc. ..................... -->
+
+<!ENTITY % figure.module "INCLUDE">
+<![%figure.module;[
+<!ENTITY % local.figure.attrib "">
+<!ENTITY % figure.role.attrib "%role.attrib;">
+
+<!ENTITY % figure.element "INCLUDE">
+<![%figure.element;[
+<!--doc:A formal figure, generally an illustration, with a title.-->
+<!ELEMENT figure %ho; (blockinfo?, (%formalobject.title.content;),
+                       (%figure.mix; | %link.char.class;)+)>
+<!--end of figure.element-->]]>
+
+<!-- Float: Whether the Figure is supposed to be rendered
+		where convenient (yes (1) value) or at the place it occurs
+		in the text (no (0) value, the default) -->
+
+
+<!ENTITY % figure.attlist "INCLUDE">
+<![%figure.attlist;[
+<!ATTLIST figure
+		float		%yesorno.attvals;	'0'
+		floatstyle	CDATA			#IMPLIED
+		pgwide      	%yesorno.attvals;       #IMPLIED
+		%label.attrib;
+		%common.attrib;
+		%figure.role.attrib;
+		%local.figure.attrib;
+>
+<!--end of figure.attlist-->]]>
+<!--end of figure.module-->]]>
+
+<!ENTITY % informalfigure.module "INCLUDE">
+<![ %informalfigure.module; [
+<!ENTITY % local.informalfigure.attrib "">
+<!ENTITY % informalfigure.role.attrib "%role.attrib;">
+
+<!ENTITY % informalfigure.element "INCLUDE">
+<![ %informalfigure.element; [
+<!--doc:A untitled figure.-->
+<!ELEMENT informalfigure %ho; (blockinfo?, (%figure.mix; | %link.char.class;)+)>
+<!--end of informalfigure.element-->]]>
+
+<!ENTITY % informalfigure.attlist "INCLUDE">
+<![ %informalfigure.attlist; [
+<!--
+Float: Whether the Figure is supposed to be rendered
+where convenient (yes (1) value) or at the place it occurs
+in the text (no (0) value, the default)
+-->
+<!ATTLIST informalfigure
+		float		%yesorno.attvals;	"0"
+		floatstyle	CDATA			#IMPLIED
+		pgwide      	%yesorno.attvals;       #IMPLIED
+		%label.attrib;
+		%common.attrib;
+		%informalfigure.role.attrib;
+		%local.informalfigure.attrib;
+>
+<!--end of informalfigure.attlist-->]]>
+<!--end of informalfigure.module-->]]>
+
+<!ENTITY % graphicco.module "INCLUDE">
+<![%graphicco.module;[
+<!ENTITY % local.graphicco.attrib "">
+<!ENTITY % graphicco.role.attrib "%role.attrib;">
+
+<!ENTITY % graphicco.element "INCLUDE">
+<![%graphicco.element;[
+<!--doc:A graphic that contains callout areas.-->
+<!ELEMENT graphicco %ho; (areaspec, graphic, calloutlist*)>
+<!--end of graphicco.element-->]]>
+
+<!ENTITY % graphicco.attlist "INCLUDE">
+<![%graphicco.attlist;[
+<!ATTLIST graphicco
+		%common.attrib;
+		%graphicco.role.attrib;
+		%local.graphicco.attrib;
+>
+<!--end of graphicco.attlist-->]]>
+<!-- AreaSpec (defined above in Examples)-->
+<!-- CalloutList (defined above in Lists)-->
+<!--end of graphicco.module-->]]>
+
+<!-- Graphical data can be the content of Graphic, or you can reference
+     an external file either as an entity (Entitref) or a filename
+     (Fileref). -->
+
+<!ENTITY % graphic.module "INCLUDE">
+<![%graphic.module;[
+<!ENTITY % local.graphic.attrib "">
+<!ENTITY % graphic.role.attrib "%role.attrib;">
+
+<!ENTITY % graphic.element "INCLUDE">
+<![%graphic.element;[
+<!--doc:A displayed graphical object (not an inline).-->
+<!ELEMENT graphic %ho; EMPTY>
+<!--end of graphic.element-->]]>
+
+<!ENTITY % graphic.attlist "INCLUDE">
+<![%graphic.attlist;[
+<!ATTLIST graphic
+		%graphics.attrib;
+		%common.attrib;
+		%graphic.role.attrib;
+		%local.graphic.attrib;
+>
+<!--end of graphic.attlist-->]]>
+<!--end of graphic.module-->]]>
+
+<!ENTITY % inlinegraphic.module "INCLUDE">
+<![%inlinegraphic.module;[
+<!ENTITY % local.inlinegraphic.attrib "">
+<!ENTITY % inlinegraphic.role.attrib "%role.attrib;">
+
+<!ENTITY % inlinegraphic.element "INCLUDE">
+<![%inlinegraphic.element;[
+<!--doc:An object containing or pointing to graphical data that will be rendered inline.-->
+<!ELEMENT inlinegraphic %ho; EMPTY>
+<!--end of inlinegraphic.element-->]]>
+
+<!ENTITY % inlinegraphic.attlist "INCLUDE">
+<![%inlinegraphic.attlist;[
+<!ATTLIST inlinegraphic
+		%graphics.attrib;
+		%common.attrib;
+		%inlinegraphic.role.attrib;
+		%local.inlinegraphic.attrib;
+>
+<!--end of inlinegraphic.attlist-->]]>
+<!--end of inlinegraphic.module-->]]>
+
+<!ENTITY % mediaobject.content.module "INCLUDE">
+<![ %mediaobject.content.module; [
+
+<!ENTITY % mediaobject.module "INCLUDE">
+<![ %mediaobject.module; [
+<!ENTITY % local.mediaobject.attrib "">
+<!ENTITY % mediaobject.role.attrib "%role.attrib;">
+
+<!ENTITY % mediaobject.element "INCLUDE">
+<![ %mediaobject.element; [
+<!--doc:A displayed media object (video, audio, image, etc.).-->
+<!ELEMENT mediaobject %ho; (objectinfo?,
+                           (%mediaobject.mix;)+,
+			   caption?)>
+<!--end of mediaobject.element-->]]>
+
+<!ENTITY % mediaobject.attlist "INCLUDE">
+<![ %mediaobject.attlist; [
+<!ATTLIST mediaobject
+		%common.attrib;
+		%mediaobject.role.attrib;
+		%local.mediaobject.attrib;
+>
+<!--end of mediaobject.attlist-->]]>
+<!--end of mediaobject.module-->]]>
+
+<!ENTITY % inlinemediaobject.module "INCLUDE">
+<![ %inlinemediaobject.module; [
+<!ENTITY % local.inlinemediaobject.attrib "">
+<!ENTITY % inlinemediaobject.role.attrib "%role.attrib;">
+
+<!ENTITY % inlinemediaobject.element "INCLUDE">
+<![ %inlinemediaobject.element; [
+<!--doc:An inline media object (video, audio, image, and so on).-->
+<!ELEMENT inlinemediaobject %ho; (objectinfo?,
+                	         (%mediaobject.mix;)+)>
+<!--end of inlinemediaobject.element-->]]>
+
+<!ENTITY % inlinemediaobject.attlist "INCLUDE">
+<![ %inlinemediaobject.attlist; [
+<!ATTLIST inlinemediaobject
+		%common.attrib;
+		%inlinemediaobject.role.attrib;
+		%local.inlinemediaobject.attrib;
+>
+<!--end of inlinemediaobject.attlist-->]]>
+<!--end of inlinemediaobject.module-->]]>
+
+<!ENTITY % videoobject.module "INCLUDE">
+<![ %videoobject.module; [
+<!ENTITY % local.videoobject.attrib "">
+<!ENTITY % videoobject.role.attrib "%role.attrib;">
+
+<!ENTITY % videoobject.element "INCLUDE">
+<![ %videoobject.element; [
+<!--doc:A wrapper for video data and its associated meta-information.-->
+<!ELEMENT videoobject %ho; (objectinfo?, videodata)>
+<!--end of videoobject.element-->]]>
+
+<!ENTITY % videoobject.attlist "INCLUDE">
+<![ %videoobject.attlist; [
+<!ATTLIST videoobject
+		%common.attrib;
+		%videoobject.role.attrib;
+		%local.videoobject.attrib;
+>
+<!--end of videoobject.attlist-->]]>
+<!--end of videoobject.module-->]]>
+
+<!ENTITY % audioobject.module "INCLUDE">
+<![ %audioobject.module; [
+<!ENTITY % local.audioobject.attrib "">
+<!ENTITY % audioobject.role.attrib "%role.attrib;">
+
+<!ENTITY % audioobject.element "INCLUDE">
+<![ %audioobject.element; [
+<!--doc:A wrapper for audio data and its associated meta-information.-->
+<!ELEMENT audioobject %ho; (objectinfo?, audiodata)>
+<!--end of audioobject.element-->]]>
+
+<!ENTITY % audioobject.attlist "INCLUDE">
+<![ %audioobject.attlist; [
+<!ATTLIST audioobject
+		%common.attrib;
+		%audioobject.role.attrib;
+		%local.audioobject.attrib;
+>
+<!--end of audioobject.attlist-->]]>
+<!--end of audioobject.module-->]]>
+
+<!ENTITY % imageobject.module "INCLUDE">
+<![ %imageobject.module; [
+<!ENTITY % local.imageobject.attrib "">
+<!ENTITY % imageobject.role.attrib "%role.attrib;">
+
+<!ENTITY % imageobject.element "INCLUDE">
+<![ %imageobject.element; [
+<!--doc:A wrapper for image data and its associated meta-information.-->
+<!ELEMENT imageobject %ho; (objectinfo?, imagedata)>
+<!--end of imageobject.element-->]]>
+
+<!ENTITY % imageobject.attlist "INCLUDE">
+<![ %imageobject.attlist; [
+<!ATTLIST imageobject
+		%common.attrib;
+		%imageobject.role.attrib;
+		%local.imageobject.attrib;
+>
+<!--end of imageobject.attlist-->]]>
+<!--end of imageobject.module-->]]>
+
+<!ENTITY % textobject.module "INCLUDE">
+<![ %textobject.module; [
+<!ENTITY % local.textobject.attrib "">
+<!ENTITY % textobject.role.attrib "%role.attrib;">
+
+<!ENTITY % textobject.element "INCLUDE">
+<![ %textobject.element; [
+<!--doc:A wrapper for a text description of an object and its associated meta-information.-->
+<!ELEMENT textobject %ho; (objectinfo?, (phrase|textdata|(%textobject.mix;)+))>
+<!--end of textobject.element-->]]>
+
+<!ENTITY % textobject.attlist "INCLUDE">
+<![ %textobject.attlist; [
+<!ATTLIST textobject
+		%common.attrib;
+		%textobject.role.attrib;
+		%local.textobject.attrib;
+>
+<!--end of textobject.attlist-->]]>
+<!--end of textobject.module-->]]>
+
+<!ENTITY % objectinfo.module "INCLUDE">
+<![ %objectinfo.module; [
+<!ENTITY % local.objectinfo.attrib "">
+<!ENTITY % objectinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % objectinfo.element "INCLUDE">
+<![ %objectinfo.element; [
+<!--doc:Meta-information for an object.-->
+<!ELEMENT objectinfo %ho; ((%info.class;)+)
+	%beginpage.exclusion;>
+<!--end of objectinfo.element-->]]>
+
+<!ENTITY % objectinfo.attlist "INCLUDE">
+<![ %objectinfo.attlist; [
+<!ATTLIST objectinfo
+		%common.attrib;
+		%objectinfo.role.attrib;
+		%local.objectinfo.attrib;
+>
+<!--end of objectinfo.attlist-->]]>
+<!--end of objectinfo.module-->]]>
+
+<!--EntityRef: Name of an external entity containing the content
+	of the object data-->
+<!--FileRef: Filename, qualified by a pathname if desired,
+	designating the file containing the content of the object data-->
+<!--Format: Notation of the element content, if any-->
+<!--SrcCredit: Information about the source of the image-->
+<!ENTITY % local.objectdata.attrib "">
+<!ENTITY % objectdata.attrib
+	"
+	entityref	ENTITY		#IMPLIED
+	fileref 	CDATA		#IMPLIED
+	format		(%notation.class;)
+					#IMPLIED
+	srccredit	CDATA		#IMPLIED
+	%local.objectdata.attrib;"
+>
+
+<!ENTITY % videodata.module "INCLUDE">
+<![ %videodata.module; [
+<!ENTITY % local.videodata.attrib "">
+<!ENTITY % videodata.role.attrib "%role.attrib;">
+
+<!ENTITY % videodata.element "INCLUDE">
+<![ %videodata.element; [
+<!--doc:Pointer to external video data.-->
+<!ELEMENT videodata %ho; EMPTY>
+<!--end of videodata.element-->]]>
+
+<!ENTITY % videodata.attlist "INCLUDE">
+<![ %videodata.attlist; [
+
+<!--Width: Same as CALS reprowid (desired width)-->
+<!--Depth: Same as CALS reprodep (desired depth)-->
+<!--Align: Same as CALS hplace with 'none' removed; #IMPLIED means
+	application-specific-->
+<!--Scale: Conflation of CALS hscale and vscale-->
+<!--Scalefit: Same as CALS scalefit-->
+<!ATTLIST videodata
+	width		CDATA		#IMPLIED
+	contentwidth	CDATA		#IMPLIED
+	depth		CDATA		#IMPLIED
+	contentdepth	CDATA		#IMPLIED
+	align		(left
+			|right
+			|center)	#IMPLIED
+	valign		(top
+			|middle
+			|bottom)	#IMPLIED
+	scale		CDATA		#IMPLIED
+	scalefit	%yesorno.attvals;
+					#IMPLIED
+		%objectdata.attrib;
+		%common.attrib;
+		%videodata.role.attrib;
+		%local.videodata.attrib;
+>
+<!--end of videodata.attlist-->]]>
+<!--end of videodata.module-->]]>
+
+<!ENTITY % audiodata.module "INCLUDE">
+<![ %audiodata.module; [
+<!ENTITY % local.audiodata.attrib "">
+<!ENTITY % audiodata.role.attrib "%role.attrib;">
+
+<!ENTITY % audiodata.element "INCLUDE">
+<![ %audiodata.element; [
+<!--doc:Pointer to external audio data.-->
+<!ELEMENT audiodata %ho; EMPTY>
+<!--end of audiodata.element-->]]>
+
+<!ENTITY % audiodata.attlist "INCLUDE">
+<![ %audiodata.attlist; [
+<!ATTLIST audiodata
+		%objectdata.attrib;
+		%common.attrib;
+		%audiodata.role.attrib;
+		%local.audiodata.attrib;
+>
+<!--end of audiodata.attlist-->]]>
+<!--end of audiodata.module-->]]>
+
+<!ENTITY % imagedata.module "INCLUDE">
+<![ %imagedata.module; [
+<!ENTITY % local.imagedata.attrib "">
+<!ENTITY % imagedata.role.attrib "%role.attrib;">
+
+<!ENTITY % imagedata.element "INCLUDE">
+<![ %imagedata.element; [
+<!--doc:Pointer to external image data.-->
+<!ELEMENT imagedata %ho; EMPTY>
+<!--end of imagedata.element-->]]>
+
+<!ENTITY % imagedata.attlist "INCLUDE">
+<![ %imagedata.attlist; [
+
+<!--Width: Same as CALS reprowid (desired width)-->
+<!--Depth: Same as CALS reprodep (desired depth)-->
+<!--Align: Same as CALS hplace with 'none' removed; #IMPLIED means
+	application-specific-->
+<!--Scale: Conflation of CALS hscale and vscale-->
+<!--Scalefit: Same as CALS scalefit-->
+<!ATTLIST imagedata
+	width		CDATA		#IMPLIED
+	contentwidth	CDATA		#IMPLIED
+	depth		CDATA		#IMPLIED
+	contentdepth	CDATA		#IMPLIED
+	align		(left
+			|right
+			|center)	#IMPLIED
+	valign		(top
+			|middle
+			|bottom)	#IMPLIED
+	scale		CDATA		#IMPLIED
+	scalefit	%yesorno.attvals;
+					#IMPLIED
+		%objectdata.attrib;
+		%common.attrib;
+		%imagedata.role.attrib;
+		%local.imagedata.attrib;
+>
+<!--end of imagedata.attlist-->]]>
+<!--end of imagedata.module-->]]>
+
+<!ENTITY % textdata.module "INCLUDE">
+<![ %textdata.module; [
+<!ENTITY % local.textdata.attrib "">
+<!ENTITY % textdata.role.attrib "%role.attrib;">
+
+<!ENTITY % textdata.element "INCLUDE">
+<![ %textdata.element; [
+<!--doc:Pointer to external text data.-->
+<!ELEMENT textdata %ho; EMPTY>
+<!--end of textdata.element-->]]>
+
+<!ENTITY % textdata.attlist "INCLUDE">
+<![ %textdata.attlist; [
+<!ATTLIST textdata
+		encoding	CDATA	#IMPLIED
+		%objectdata.attrib;
+		%common.attrib;
+		%textdata.role.attrib;
+		%local.textdata.attrib;
+>
+<!--end of textdata.attlist-->]]>
+<!--end of textdata.module-->]]>
+
+<!ENTITY % mediaobjectco.module "INCLUDE">
+<![ %mediaobjectco.module; [
+<!ENTITY % local.mediaobjectco.attrib "">
+<!ENTITY % mediaobjectco.role.attrib "%role.attrib;">
+
+<!ENTITY % mediaobjectco.element "INCLUDE">
+<![ %mediaobjectco.element; [
+<!--doc:A media object that contains callouts.-->
+<!ELEMENT mediaobjectco %ho; (objectinfo?, imageobjectco,
+			   (imageobjectco|textobject)*)>
+<!--end of mediaobjectco.element-->]]>
+
+<!ENTITY % mediaobjectco.attlist "INCLUDE">
+<![ %mediaobjectco.attlist; [
+<!ATTLIST mediaobjectco
+		%common.attrib;
+		%mediaobjectco.role.attrib;
+		%local.mediaobjectco.attrib;
+>
+<!--end of mediaobjectco.attlist-->]]>
+<!--end of mediaobjectco.module-->]]>
+
+<!ENTITY % imageobjectco.module "INCLUDE">
+<![ %imageobjectco.module; [
+<!ENTITY % local.imageobjectco.attrib "">
+<!ENTITY % imageobjectco.role.attrib "%role.attrib;">
+
+<!ENTITY % imageobjectco.element "INCLUDE">
+<![ %imageobjectco.element; [
+<!--doc:A wrapper for an image object with callouts.-->
+<!ELEMENT imageobjectco %ho; (areaspec, imageobject, calloutlist*)>
+<!--end of imageobjectco.element-->]]>
+
+<!ENTITY % imageobjectco.attlist "INCLUDE">
+<![ %imageobjectco.attlist; [
+<!ATTLIST imageobjectco
+		%common.attrib;
+		%imageobjectco.role.attrib;
+		%local.imageobjectco.attrib;
+>
+<!--end of imageobjectco.attlist-->]]>
+<!--end of imageobjectco.module-->]]>
+<!--end of mediaobject.content.module-->]]>
+
+<!-- Equations ........................ -->
+
+<!-- This PE provides a mechanism for replacing equation content, -->
+<!-- perhaps adding a new or different model (e.g., MathML) -->
+<!ENTITY % equation.content "(alt?, (graphic+|mediaobject+|mathphrase+))">
+<!ENTITY % inlineequation.content "(alt?, (graphic+|inlinemediaobject+|mathphrase+))">
+
+<!ENTITY % equation.module "INCLUDE">
+<![%equation.module;[
+<!ENTITY % local.equation.attrib "">
+<!ENTITY % equation.role.attrib "%role.attrib;">
+
+<!ENTITY % equation.element "INCLUDE">
+<![%equation.element;[
+<!--doc:A displayed mathematical equation.-->
+<!ELEMENT equation %ho; (blockinfo?, (%formalobject.title.content;)?,
+                         (informalequation | %equation.content;))>
+<!--end of equation.element-->]]>
+
+<!ENTITY % equation.attlist "INCLUDE">
+<![%equation.attlist;[
+<!ATTLIST equation
+		floatstyle	CDATA			#IMPLIED
+		%label.attrib;
+	 	%common.attrib;
+		%equation.role.attrib;
+		%local.equation.attrib;
+>
+<!--end of equation.attlist-->]]>
+<!--end of equation.module-->]]>
+
+<!ENTITY % informalequation.module "INCLUDE">
+<![%informalequation.module;[
+<!ENTITY % local.informalequation.attrib "">
+<!ENTITY % informalequation.role.attrib "%role.attrib;">
+
+<!ENTITY % informalequation.element "INCLUDE">
+<![%informalequation.element;[
+<!--doc:A displayed mathematical equation without a title.-->
+<!ELEMENT informalequation %ho; (blockinfo?, %equation.content;) >
+<!--end of informalequation.element-->]]>
+
+<!ENTITY % informalequation.attlist "INCLUDE">
+<![%informalequation.attlist;[
+<!ATTLIST informalequation
+		floatstyle	CDATA			#IMPLIED
+		%common.attrib;
+		%informalequation.role.attrib;
+		%local.informalequation.attrib;
+>
+<!--end of informalequation.attlist-->]]>
+<!--end of informalequation.module-->]]>
+
+<!ENTITY % inlineequation.module "INCLUDE">
+<![%inlineequation.module;[
+<!ENTITY % local.inlineequation.attrib "">
+<!ENTITY % inlineequation.role.attrib "%role.attrib;">
+
+<!ENTITY % inlineequation.element "INCLUDE">
+<![%inlineequation.element;[
+<!--doc:A mathematical equation or expression occurring inline.-->
+<!ELEMENT inlineequation %ho; (%inlineequation.content;)>
+<!--end of inlineequation.element-->]]>
+
+<!ENTITY % inlineequation.attlist "INCLUDE">
+<![%inlineequation.attlist;[
+<!ATTLIST inlineequation
+		%common.attrib;
+		%inlineequation.role.attrib;
+		%local.inlineequation.attrib;
+>
+<!--end of inlineequation.attlist-->]]>
+<!--end of inlineequation.module-->]]>
+
+<!ENTITY % alt.module "INCLUDE">
+<![%alt.module;[
+<!ENTITY % local.alt.attrib "">
+<!ENTITY % alt.role.attrib "%role.attrib;">
+
+<!ENTITY % alt.element "INCLUDE">
+<![%alt.element;[
+<!--doc:Text representation for a graphical element.-->
+<!ELEMENT alt %ho; (#PCDATA)>
+<!--end of alt.element-->]]>
+
+<!ENTITY % alt.attlist "INCLUDE">
+<![%alt.attlist;[
+<!ATTLIST alt
+		%common.attrib;
+		%alt.role.attrib;
+		%local.alt.attrib;
+>
+<!--end of alt.attlist-->]]>
+<!--end of alt.module-->]]>
+
+<!ENTITY % mathphrase.module "INCLUDE">
+<![%mathphrase.module;[
+<!ENTITY % local.mathphrase.attrib "">
+<!ENTITY % mathphrase.role.attrib "%role.attrib;">
+
+<!ENTITY % mathphrase.element "INCLUDE">
+<![%mathphrase.element;[
+<!--doc:A mathematical phrase, an expression that can be represented with ordinary text and a small amount of markup.-->
+<!ELEMENT mathphrase %ho; (#PCDATA|subscript|superscript|emphasis)*>
+<!--end of mathphrase.element-->]]>
+
+<!ENTITY % mathphrase.attlist "INCLUDE">
+<![%mathphrase.attlist;[
+<!ATTLIST mathphrase
+		%common.attrib;
+		%mathphrase.role.attrib;
+		%local.mathphrase.attrib;
+>
+<!--end of mathphrase.attlist-->]]>
+<!--end of mathphrase.module-->]]>
+
+<!-- Tables ........................... -->
+
+<!ENTITY % table.module "INCLUDE">
+<![%table.module;[
+
+<!-- Choose a table model. CALS or OASIS XML Exchange -->
+
+<!ENTITY % cals.table.module "INCLUDE">
+<![%cals.table.module;[
+<!ENTITY % exchange.table.module "IGNORE">
+]]>
+<!ENTITY % exchange.table.module "INCLUDE">
+
+<!-- Do we allow the HTML table model as well? -->
+<!ENTITY % allow.html.tables "INCLUDE">
+<![%allow.html.tables;[
+  <!-- ====================================================== -->
+  <!--  xhtmltbl.mod defines HTML tables and sets parameter
+        entities so that, when the CALS table module is read,
+        we end up allowing any table to be CALS or HTML.
+        i.e. This include must come first!                    -->
+  <!-- ====================================================== -->
+
+<!ENTITY % htmltbl
+  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
+  "htmltblx.mod">
+%htmltbl;
+<!--end of allow.html.tables-->]]>
+
+<!ENTITY % tables.role.attrib "%role.attrib;">
+
+<![%cals.table.module;[
+<!-- Add label and role attributes to table and informaltable -->
+<!ENTITY % bodyatt "
+		floatstyle	CDATA			#IMPLIED
+		rowheader	(firstcol|norowheader)	#IMPLIED
+                %label.attrib;"
+>
+
+<!-- Add common attributes to Table, TGroup, TBody, THead, TFoot, Row,
+     EntryTbl, and Entry (and InformalTable element). -->
+<!ENTITY % secur
+	"%common.attrib;
+	%tables.role.attrib;">
+
+<!ENTITY % common.table.attribs
+	"%bodyatt;
+	%secur;">
+
+<!-- Content model for Table. -->
+<!ENTITY % tbl.table.mdl
+	"(blockinfo?, (%formalobject.title.content;), (%ndxterm.class;)*,
+	  textobject*,
+          (graphic+|mediaobject+|tgroup+))">
+
+<!-- Allow either objects or inlines; beware of REs between elements. -->
+<!ENTITY % tbl.entry.mdl "%para.char.mix; | %tabentry.mix;">
+
+<!-- Reference CALS Table Model -->
+<!ENTITY % tablemodel
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5//EN"
+  "calstblx.dtd">
+]]>
+
+<![%exchange.table.module;[
+<!-- Add common attributes and the Label attribute to Table and -->
+<!-- InformalTable.                                             -->
+<!ENTITY % bodyatt
+	"%common.attrib;
+	rowheader	(firstcol|norowheader)	#IMPLIED
+	%label.attrib;
+	%tables.role.attrib;">
+
+<!ENTITY % common.table.attribs
+	"%bodyatt;">
+
+<!-- Add common attributes to TGroup, ColSpec, TBody, THead, Row, Entry -->
+
+<!ENTITY % tbl.tgroup.att       "%common.attrib;">
+<!ENTITY % tbl.colspec.att      "%common.attrib;">
+<!ENTITY % tbl.tbody.att        "%common.attrib;">
+<!ENTITY % tbl.thead.att        "%common.attrib;">
+<!ENTITY % tbl.row.att          "%common.attrib;">
+<!ENTITY % tbl.entry.att        "%common.attrib;">
+
+<!-- Content model for Table. -->
+<!ENTITY % tbl.table.mdl
+	"(blockinfo?, (%formalobject.title.content;), (%ndxterm.class;)*,
+	  textobject*,
+          (graphic+|mediaobject+|tgroup+))">
+
+<!-- Allow either objects or inlines; beware of REs between elements. -->
+<!ENTITY % tbl.entry.mdl "(%para.char.mix; | %tabentry.mix;)*">
+
+<!-- Reference OASIS Exchange Table Model -->
+<!ENTITY % tablemodel
+  PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+  "soextblx.dtd">
+]]>
+
+%tablemodel;
+
+<!--end of table.module-->]]>
+
+<!ENTITY % informaltable.module "INCLUDE">
+<![%informaltable.module;[
+
+<!-- Note that InformalTable is dependent on some of the entity
+     declarations that customize Table. -->
+
+<!ENTITY % local.informaltable.attrib "">
+
+<!-- the following entity may have been declared by the XHTML table module -->
+<!ENTITY % informal.tbl.table.mdl "textobject*, (graphic+|mediaobject+|tgroup+)">
+
+<!ENTITY % informaltable.element "INCLUDE">
+<![%informaltable.element;[
+<!--doc:A table without a title.-->
+<!ELEMENT informaltable %ho; (blockinfo?, (%informal.tbl.table.mdl;))>
+<!--end of informaltable.element-->]]>
+
+<!-- Frame, Colsep, and Rowsep must be repeated because
+		they are not in entities in the table module. -->
+<!-- includes TabStyle, ToCentry, ShortEntry,
+				Orient, PgWide -->
+<!-- includes Label -->
+<!-- includes common attributes -->
+
+<!ENTITY % informaltable.attlist "INCLUDE">
+<![%informaltable.attlist;[
+<!ATTLIST informaltable
+		frame		(%tbl.frame.attval;)	#IMPLIED
+		colsep		%yesorno.attvals;	#IMPLIED
+		rowsep		%yesorno.attvals;	#IMPLIED
+		%common.table.attribs;
+		%tbl.table.att;
+		%local.informaltable.attrib;
+>
+<!--end of informaltable.attlist-->]]>
+<!--end of informaltable.module-->]]>
+
+<!ENTITY % caption.module "INCLUDE">
+<![ %caption.module; [
+<!ENTITY % local.caption.attrib "">
+<!ENTITY % caption.role.attrib "%role.attrib;">
+
+<!ENTITY % caption.element "INCLUDE">
+<![ %caption.element; [
+<!--doc:A caption.-->
+<!ELEMENT caption %ho; (#PCDATA | %textobject.mix;)*>
+<!--end of caption.element-->]]>
+
+<!ENTITY % caption.attlist "INCLUDE">
+<![ %caption.attlist; [
+<!-- attrs comes from HTML tables ... -->
+
+<![ %allow.html.tables; [
+<!-- common.attrib, but without ID because ID is in attrs -->
+<!ENTITY % caption.attlist.content "
+		%caption.role.attrib;
+		%attrs;
+		align	(top|bottom|left|right)	#IMPLIED
+		%local.caption.attrib;
+">
+]]>
+<!ENTITY % caption.attlist.content "
+		%common.attrib;
+		%caption.role.attrib;
+		%local.caption.attrib;
+">
+
+<!ATTLIST caption %caption.attlist.content;>
+
+<!--end of caption.attlist-->]]>
+<!--end of caption.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Synopses ............................................................. -->
+
+<!-- Synopsis ......................... -->
+
+<!ENTITY % synopsis.module "INCLUDE">
+<![%synopsis.module;[
+<!ENTITY % local.synopsis.attrib "">
+<!ENTITY % synopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % synopsis.element "INCLUDE">
+<![%synopsis.element;[
+<!--doc:A general-purpose element for representing the syntax of commands or functions.-->
+<!ELEMENT synopsis %ho; (%para.char.mix;|graphic|mediaobject|co|coref|textobject|lineannotation)*>
+<!--end of synopsis.element-->]]>
+
+<!ENTITY % synopsis.attlist "INCLUDE">
+<![%synopsis.attlist;[
+<!ATTLIST synopsis
+		%label.attrib;
+		%linespecific.attrib;
+		%common.attrib;
+		%synopsis.role.attrib;
+		%local.synopsis.attrib;
+>
+<!--end of synopsis.attlist-->]]>
+
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!--end of synopsis.module-->]]>
+
+<!-- CmdSynopsis ...................... -->
+
+<!ENTITY % cmdsynopsis.content.module "INCLUDE">
+<![%cmdsynopsis.content.module;[
+<!ENTITY % cmdsynopsis.module "INCLUDE">
+<![%cmdsynopsis.module;[
+<!ENTITY % local.cmdsynopsis.attrib "">
+<!ENTITY % cmdsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % cmdsynopsis.element "INCLUDE">
+<![%cmdsynopsis.element;[
+<!--doc:A syntax summary for a software command.-->
+<!ELEMENT cmdsynopsis %ho; ((command | arg | group | sbr)+, synopfragment*)>
+<!--end of cmdsynopsis.element-->]]>
+
+<!-- Sepchar: Character that should separate command and all
+		top-level arguments; alternate value might be e.g., &Delta; -->
+
+
+<!ENTITY % cmdsynopsis.attlist "INCLUDE">
+<![%cmdsynopsis.attlist;[
+<!ATTLIST cmdsynopsis
+		%label.attrib;
+		sepchar		CDATA		" "
+		cmdlength	CDATA		#IMPLIED
+		%common.attrib;
+		%cmdsynopsis.role.attrib;
+		%local.cmdsynopsis.attrib;
+>
+<!--end of cmdsynopsis.attlist-->]]>
+<!--end of cmdsynopsis.module-->]]>
+
+<!ENTITY % arg.module "INCLUDE">
+<![%arg.module;[
+<!ENTITY % local.arg.attrib "">
+<!ENTITY % arg.role.attrib "%role.attrib;">
+
+<!ENTITY % arg.element "INCLUDE">
+<![%arg.element;[
+<!--doc:An argument in a CmdSynopsis.-->
+<!ELEMENT arg %ho; (#PCDATA
+		| arg
+		| group
+		| option
+		| synopfragmentref
+		| replaceable
+		| sbr)*>
+<!--end of arg.element-->]]>
+
+<!-- Choice: Whether Arg must be supplied: Opt (optional to
+		supply, e.g. [arg]; the default), Req (required to supply,
+		e.g. {arg}), or Plain (required to supply, e.g. arg) -->
+<!-- Rep: whether Arg is repeatable: Norepeat (e.g. arg without
+		ellipsis; the default), or Repeat (e.g. arg...) -->
+
+
+<!ENTITY % arg.attlist "INCLUDE">
+<![%arg.attlist;[
+<!ATTLIST arg
+		choice		(opt
+				|req
+				|plain)		'opt'
+		rep		(norepeat
+				|repeat)	'norepeat'
+		%common.attrib;
+		%arg.role.attrib;
+		%local.arg.attrib;
+>
+<!--end of arg.attlist-->]]>
+<!--end of arg.module-->]]>
+
+<!ENTITY % group.module "INCLUDE">
+<![%group.module;[
+
+<!ENTITY % local.group.attrib "">
+<!ENTITY % group.role.attrib "%role.attrib;">
+
+<!ENTITY % group.element "INCLUDE">
+<![%group.element;[
+<!--doc:A group of elements in a CmdSynopsis.-->
+<!ELEMENT group %ho; ((arg | group | option | synopfragmentref
+		| replaceable | sbr)+)>
+<!--end of group.element-->]]>
+
+<!-- Choice: Whether Group must be supplied: Opt (optional to
+		supply, e.g.  [g1|g2|g3]; the default), Req (required to
+		supply, e.g.  {g1|g2|g3}), Plain (required to supply,
+		e.g.  g1|g2|g3), OptMult (can supply zero or more, e.g.
+		[[g1|g2|g3]]), or ReqMult (must supply one or more, e.g.
+		{{g1|g2|g3}}) -->
+<!-- Rep: whether Group is repeatable: Norepeat (e.g. group
+		without ellipsis; the default), or Repeat (e.g. group...) -->
+
+
+<!ENTITY % group.attlist "INCLUDE">
+<![%group.attlist;[
+<!ATTLIST group
+		choice		(opt
+				|req
+				|plain)         'opt'
+		rep		(norepeat
+				|repeat)	'norepeat'
+		%common.attrib;
+		%group.role.attrib;
+		%local.group.attrib;
+>
+<!--end of group.attlist-->]]>
+<!--end of group.module-->]]>
+
+<!ENTITY % sbr.module "INCLUDE">
+<![%sbr.module;[
+<!ENTITY % local.sbr.attrib "">
+<!-- Synopsis break -->
+<!ENTITY % sbr.role.attrib "%role.attrib;">
+
+<!ENTITY % sbr.element "INCLUDE">
+<![%sbr.element;[
+<!--doc:An explicit line break in a command synopsis.-->
+<!ELEMENT sbr %ho; EMPTY>
+<!--end of sbr.element-->]]>
+
+<!ENTITY % sbr.attlist "INCLUDE">
+<![%sbr.attlist;[
+<!ATTLIST sbr
+		%common.attrib;
+		%sbr.role.attrib;
+		%local.sbr.attrib;
+>
+<!--end of sbr.attlist-->]]>
+<!--end of sbr.module-->]]>
+
+<!ENTITY % synopfragmentref.module "INCLUDE">
+<![%synopfragmentref.module;[
+<!ENTITY % local.synopfragmentref.attrib "">
+<!ENTITY % synopfragmentref.role.attrib "%role.attrib;">
+
+<!ENTITY % synopfragmentref.element "INCLUDE">
+<![%synopfragmentref.element;[
+<!--doc:A reference to a fragment of a command synopsis.-->
+<!ELEMENT synopfragmentref %ho; (#PCDATA)>
+<!--end of synopfragmentref.element-->]]>
+
+<!-- to SynopFragment of complex synopsis
+			material for separate referencing -->
+
+
+<!ENTITY % synopfragmentref.attlist "INCLUDE">
+<![%synopfragmentref.attlist;[
+<!ATTLIST synopfragmentref
+		%linkendreq.attrib;		%common.attrib;
+		%synopfragmentref.role.attrib;
+		%local.synopfragmentref.attrib;
+>
+<!--end of synopfragmentref.attlist-->]]>
+<!--end of synopfragmentref.module-->]]>
+
+<!ENTITY % synopfragment.module "INCLUDE">
+<![%synopfragment.module;[
+<!ENTITY % local.synopfragment.attrib "">
+<!ENTITY % synopfragment.role.attrib "%role.attrib;">
+
+<!ENTITY % synopfragment.element "INCLUDE">
+<![%synopfragment.element;[
+<!--doc:A portion of a CmdSynopsis broken out from the main body of the synopsis.-->
+<!ELEMENT synopfragment %ho; ((arg | group)+)>
+<!--end of synopfragment.element-->]]>
+
+<!ENTITY % synopfragment.attlist "INCLUDE">
+<![%synopfragment.attlist;[
+<!ATTLIST synopfragment
+		%idreq.common.attrib;
+		%synopfragment.role.attrib;
+		%local.synopfragment.attrib;
+>
+<!--end of synopfragment.attlist-->]]>
+<!--end of synopfragment.module-->]]>
+
+<!-- Command (defined in the Inlines section, below)-->
+<!-- Option (defined in the Inlines section, below)-->
+<!-- Replaceable (defined in the Inlines section, below)-->
+<!--end of cmdsynopsis.content.module-->]]>
+
+<!-- FuncSynopsis ..................... -->
+
+<!ENTITY % funcsynopsis.content.module "INCLUDE">
+<![%funcsynopsis.content.module;[
+<!ENTITY % funcsynopsis.module "INCLUDE">
+<![%funcsynopsis.module;[
+
+<!ENTITY % local.funcsynopsis.attrib "">
+<!ENTITY % funcsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % funcsynopsis.element "INCLUDE">
+<![%funcsynopsis.element;[
+<!--doc:The syntax summary for a function definition.-->
+<!ELEMENT funcsynopsis %ho; ((funcsynopsisinfo | funcprototype)+)>
+<!--end of funcsynopsis.element-->]]>
+
+<!ENTITY % funcsynopsis.attlist "INCLUDE">
+<![%funcsynopsis.attlist;[
+<!ATTLIST funcsynopsis
+		%label.attrib;
+		%common.attrib;
+		%funcsynopsis.role.attrib;
+		%local.funcsynopsis.attrib;
+>
+<!--end of funcsynopsis.attlist-->]]>
+<!--end of funcsynopsis.module-->]]>
+
+<!ENTITY % funcsynopsisinfo.module "INCLUDE">
+<![%funcsynopsisinfo.module;[
+<!ENTITY % local.funcsynopsisinfo.attrib "">
+<!ENTITY % funcsynopsisinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % funcsynopsisinfo.element "INCLUDE">
+<![%funcsynopsisinfo.element;[
+<!--doc:Information supplementing the FuncDefs of a FuncSynopsis.-->
+<!ELEMENT funcsynopsisinfo %ho; (%cptr.char.mix;|textobject|lineannotation)*>
+<!--end of funcsynopsisinfo.element-->]]>
+
+<!ENTITY % funcsynopsisinfo.attlist "INCLUDE">
+<![%funcsynopsisinfo.attlist;[
+<!ATTLIST funcsynopsisinfo
+		%linespecific.attrib;
+		%common.attrib;
+		%funcsynopsisinfo.role.attrib;
+		%local.funcsynopsisinfo.attrib;
+>
+<!--end of funcsynopsisinfo.attlist-->]]>
+<!--end of funcsynopsisinfo.module-->]]>
+
+<!ENTITY % funcprototype.module "INCLUDE">
+<![%funcprototype.module;[
+<!ENTITY % local.funcprototype.attrib "">
+<!ENTITY % funcprototype.role.attrib "%role.attrib;">
+
+<!ENTITY % funcprototype.element "INCLUDE">
+<![%funcprototype.element;[
+<!--doc:The prototype of a function.-->
+<!ELEMENT funcprototype %ho; (modifier*,
+                              funcdef,
+                              (void|varargs|(paramdef+, varargs?)),
+                              modifier*)>
+
+<!--end of funcprototype.element-->]]>
+
+<!ENTITY % funcprototype.attlist "INCLUDE">
+<![%funcprototype.attlist;[
+<!ATTLIST funcprototype
+		%common.attrib;
+		%funcprototype.role.attrib;
+		%local.funcprototype.attrib;
+>
+<!--end of funcprototype.attlist-->]]>
+<!--end of funcprototype.module-->]]>
+
+<!ENTITY % funcdef.module "INCLUDE">
+<![%funcdef.module;[
+<!ENTITY % local.funcdef.attrib "">
+<!ENTITY % funcdef.role.attrib "%role.attrib;">
+
+<!ENTITY % funcdef.element "INCLUDE">
+<![%funcdef.element;[
+<!--doc:A function (subroutine) name and its return type.-->
+<!ELEMENT funcdef %ho; (#PCDATA
+		| type
+		| replaceable
+		| function)*>
+<!--end of funcdef.element-->]]>
+
+<!ENTITY % funcdef.attlist "INCLUDE">
+<![%funcdef.attlist;[
+<!ATTLIST funcdef
+		%common.attrib;
+		%funcdef.role.attrib;
+		%local.funcdef.attrib;
+>
+<!--end of funcdef.attlist-->]]>
+<!--end of funcdef.module-->]]>
+
+<!ENTITY % void.module "INCLUDE">
+<![%void.module;[
+<!ENTITY % local.void.attrib "">
+<!ENTITY % void.role.attrib "%role.attrib;">
+
+<!ENTITY % void.element "INCLUDE">
+<![%void.element;[
+<!--doc:An empty element in a function synopsis indicating that the function in question takes no arguments.-->
+<!ELEMENT void %ho; EMPTY>
+<!--end of void.element-->]]>
+
+<!ENTITY % void.attlist "INCLUDE">
+<![%void.attlist;[
+<!ATTLIST void
+		%common.attrib;
+		%void.role.attrib;
+		%local.void.attrib;
+>
+<!--end of void.attlist-->]]>
+<!--end of void.module-->]]>
+
+<!ENTITY % varargs.module "INCLUDE">
+<![%varargs.module;[
+<!ENTITY % local.varargs.attrib "">
+<!ENTITY % varargs.role.attrib "%role.attrib;">
+
+<!ENTITY % varargs.element "INCLUDE">
+<![%varargs.element;[
+<!--doc:An empty element in a function synopsis indicating a variable number of arguments.-->
+<!ELEMENT varargs %ho; EMPTY>
+<!--end of varargs.element-->]]>
+
+<!ENTITY % varargs.attlist "INCLUDE">
+<![%varargs.attlist;[
+<!ATTLIST varargs
+		%common.attrib;
+		%varargs.role.attrib;
+		%local.varargs.attrib;
+>
+<!--end of varargs.attlist-->]]>
+<!--end of varargs.module-->]]>
+
+<!-- Processing assumes that only one Parameter will appear in a
+     ParamDef, and that FuncParams will be used at most once, for
+     providing information on the "inner parameters" for parameters that
+     are pointers to functions. -->
+
+<!ENTITY % paramdef.module "INCLUDE">
+<![%paramdef.module;[
+<!ENTITY % local.paramdef.attrib "">
+<!ENTITY % paramdef.role.attrib "%role.attrib;">
+
+<!ENTITY % paramdef.element "INCLUDE">
+<![%paramdef.element;[
+<!--doc:Information about a function parameter in a programming language.-->
+<!ELEMENT paramdef %ho; (#PCDATA
+                | initializer
+		| type
+		| replaceable
+		| parameter
+		| funcparams)*>
+<!--end of paramdef.element-->]]>
+
+<!ENTITY % paramdef.attlist "INCLUDE">
+<![%paramdef.attlist;[
+<!ATTLIST paramdef
+		choice		(opt
+				|req)	#IMPLIED
+		%common.attrib;
+		%paramdef.role.attrib;
+		%local.paramdef.attrib;
+>
+<!--end of paramdef.attlist-->]]>
+<!--end of paramdef.module-->]]>
+
+<!ENTITY % funcparams.module "INCLUDE">
+<![%funcparams.module;[
+<!ENTITY % local.funcparams.attrib "">
+<!ENTITY % funcparams.role.attrib "%role.attrib;">
+
+<!ENTITY % funcparams.element "INCLUDE">
+<![%funcparams.element;[
+<!--doc:Parameters for a function referenced through a function pointer in a synopsis.-->
+<!ELEMENT funcparams %ho; (%cptr.char.mix;)*>
+<!--end of funcparams.element-->]]>
+
+<!ENTITY % funcparams.attlist "INCLUDE">
+<![%funcparams.attlist;[
+<!ATTLIST funcparams
+		%common.attrib;
+		%funcparams.role.attrib;
+		%local.funcparams.attrib;
+>
+<!--end of funcparams.attlist-->]]>
+<!--end of funcparams.module-->]]>
+
+<!-- LineAnnotation (defined in the Inlines section, below)-->
+<!-- Replaceable (defined in the Inlines section, below)-->
+<!-- Function (defined in the Inlines section, below)-->
+<!-- Parameter (defined in the Inlines section, below)-->
+<!--end of funcsynopsis.content.module-->]]>
+
+<!-- ClassSynopsis ..................... -->
+
+<!ENTITY % classsynopsis.content.module "INCLUDE">
+<![%classsynopsis.content.module;[
+
+<!ENTITY % classsynopsis.module "INCLUDE">
+<![%classsynopsis.module;[
+<!ENTITY % local.classsynopsis.attrib "">
+<!ENTITY % classsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % classsynopsis.element "INCLUDE">
+<![%classsynopsis.element;[
+<!--doc:The syntax summary for a class definition.-->
+<!ELEMENT classsynopsis %ho; ((ooclass|oointerface|ooexception)+,
+                         (classsynopsisinfo
+                          |fieldsynopsis|%method.synop.class;)*)>
+<!--end of classsynopsis.element-->]]>
+
+<!ENTITY % classsynopsis.attlist "INCLUDE">
+<![%classsynopsis.attlist;[
+<!ATTLIST classsynopsis
+	language	CDATA	#IMPLIED
+	class	(class|interface)	"class"
+	%common.attrib;
+	%classsynopsis.role.attrib;
+	%local.classsynopsis.attrib;
+>
+<!--end of classsynopsis.attlist-->]]>
+<!--end of classsynopsis.module-->]]>
+
+<!ENTITY % classsynopsisinfo.module "INCLUDE">
+<![ %classsynopsisinfo.module; [
+<!ENTITY % local.classsynopsisinfo.attrib "">
+<!ENTITY % classsynopsisinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % classsynopsisinfo.element "INCLUDE">
+<![ %classsynopsisinfo.element; [
+<!--doc:Information supplementing the contents of a ClassSynopsis.-->
+<!ELEMENT classsynopsisinfo %ho; (%cptr.char.mix;|textobject|lineannotation)*>
+<!--end of classsynopsisinfo.element-->]]>
+
+<!ENTITY % classsynopsisinfo.attlist "INCLUDE">
+<![ %classsynopsisinfo.attlist; [
+<!ATTLIST classsynopsisinfo
+		%linespecific.attrib;
+		%common.attrib;
+		%classsynopsisinfo.role.attrib;
+		%local.classsynopsisinfo.attrib;
+>
+<!--end of classsynopsisinfo.attlist-->]]>
+<!--end of classsynopsisinfo.module-->]]>
+
+<!ENTITY % ooclass.module "INCLUDE">
+<![%ooclass.module;[
+<!ENTITY % local.ooclass.attrib "">
+<!ENTITY % ooclass.role.attrib "%role.attrib;">
+
+<!ENTITY % ooclass.element "INCLUDE">
+<![%ooclass.element;[
+<!--doc:A class in an object-oriented programming language.-->
+<!ELEMENT ooclass %ho; ((modifier|package)*, classname)>
+<!--end of ooclass.element-->]]>
+
+<!ENTITY % ooclass.attlist "INCLUDE">
+<![%ooclass.attlist;[
+<!ATTLIST ooclass
+	%common.attrib;
+	%ooclass.role.attrib;
+	%local.ooclass.attrib;
+>
+<!--end of ooclass.attlist-->]]>
+<!--end of ooclass.module-->]]>
+
+<!ENTITY % oointerface.module "INCLUDE">
+<![%oointerface.module;[
+<!ENTITY % local.oointerface.attrib "">
+<!ENTITY % oointerface.role.attrib "%role.attrib;">
+
+<!ENTITY % oointerface.element "INCLUDE">
+<![%oointerface.element;[
+<!--doc:An interface in an object-oriented programming language.-->
+<!ELEMENT oointerface %ho; ((modifier|package)*, interfacename)>
+<!--end of oointerface.element-->]]>
+
+<!ENTITY % oointerface.attlist "INCLUDE">
+<![%oointerface.attlist;[
+<!ATTLIST oointerface
+	%common.attrib;
+	%oointerface.role.attrib;
+	%local.oointerface.attrib;
+>
+<!--end of oointerface.attlist-->]]>
+<!--end of oointerface.module-->]]>
+
+<!ENTITY % ooexception.module "INCLUDE">
+<![%ooexception.module;[
+<!ENTITY % local.ooexception.attrib "">
+<!ENTITY % ooexception.role.attrib "%role.attrib;">
+
+<!ENTITY % ooexception.element "INCLUDE">
+<![%ooexception.element;[
+<!--doc:An exception in an object-oriented programming language.-->
+<!ELEMENT ooexception %ho; ((modifier|package)*, exceptionname)>
+<!--end of ooexception.element-->]]>
+
+<!ENTITY % ooexception.attlist "INCLUDE">
+<![%ooexception.attlist;[
+<!ATTLIST ooexception
+	%common.attrib;
+	%ooexception.role.attrib;
+	%local.ooexception.attrib;
+>
+<!--end of ooexception.attlist-->]]>
+<!--end of ooexception.module-->]]>
+
+<!ENTITY % modifier.module "INCLUDE">
+<![%modifier.module;[
+<!ENTITY % local.modifier.attrib "">
+<!ENTITY % modifier.role.attrib "%role.attrib;">
+
+<!ENTITY % modifier.element "INCLUDE">
+<![%modifier.element;[
+<!--doc:Modifiers in a synopsis.-->
+<!ELEMENT modifier %ho; (%smallcptr.char.mix;)*>
+<!--end of modifier.element-->]]>
+
+<!ENTITY % modifier.attlist "INCLUDE">
+<![%modifier.attlist;[
+<!ATTLIST modifier
+	%common.attrib;
+	%modifier.role.attrib;
+	%local.modifier.attrib;
+>
+<!--end of modifier.attlist-->]]>
+<!--end of modifier.module-->]]>
+
+<!ENTITY % interfacename.module "INCLUDE">
+<![%interfacename.module;[
+<!ENTITY % local.interfacename.attrib "">
+<!ENTITY % interfacename.role.attrib "%role.attrib;">
+
+<!ENTITY % interfacename.element "INCLUDE">
+<![%interfacename.element;[
+<!--doc:The name of an interface.-->
+<!ELEMENT interfacename %ho; (%cptr.char.mix;)*>
+<!--end of interfacename.element-->]]>
+
+<!ENTITY % interfacename.attlist "INCLUDE">
+<![%interfacename.attlist;[
+<!ATTLIST interfacename
+	%common.attrib;
+	%interfacename.role.attrib;
+	%local.interfacename.attrib;
+>
+<!--end of interfacename.attlist-->]]>
+<!--end of interfacename.module-->]]>
+
+<!ENTITY % exceptionname.module "INCLUDE">
+<![%exceptionname.module;[
+<!ENTITY % local.exceptionname.attrib "">
+<!ENTITY % exceptionname.role.attrib "%role.attrib;">
+
+<!ENTITY % exceptionname.element "INCLUDE">
+<![%exceptionname.element;[
+<!--doc:The name of an exception.-->
+<!ELEMENT exceptionname %ho; (%smallcptr.char.mix;)*>
+<!--end of exceptionname.element-->]]>
+
+<!ENTITY % exceptionname.attlist "INCLUDE">
+<![%exceptionname.attlist;[
+<!ATTLIST exceptionname
+	%common.attrib;
+	%exceptionname.role.attrib;
+	%local.exceptionname.attrib;
+>
+<!--end of exceptionname.attlist-->]]>
+<!--end of exceptionname.module-->]]>
+
+<!ENTITY % fieldsynopsis.module "INCLUDE">
+<![%fieldsynopsis.module;[
+<!ENTITY % local.fieldsynopsis.attrib "">
+<!ENTITY % fieldsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % fieldsynopsis.element "INCLUDE">
+<![%fieldsynopsis.element;[
+<!--doc:The name of a field in a class definition.-->
+<!ELEMENT fieldsynopsis %ho; (modifier*, type?, varname, initializer?)>
+<!--end of fieldsynopsis.element-->]]>
+
+<!ENTITY % fieldsynopsis.attlist "INCLUDE">
+<![%fieldsynopsis.attlist;[
+<!ATTLIST fieldsynopsis
+	language	CDATA	#IMPLIED
+	%common.attrib;
+	%fieldsynopsis.role.attrib;
+	%local.fieldsynopsis.attrib;
+>
+<!--end of fieldsynopsis.attlist-->]]>
+<!--end of fieldsynopsis.module-->]]>
+
+<!ENTITY % initializer.module "INCLUDE">
+<![%initializer.module;[
+<!ENTITY % local.initializer.attrib "">
+<!ENTITY % initializer.role.attrib "%role.attrib;">
+
+<!ENTITY % initializer.element "INCLUDE">
+<![%initializer.element;[
+<!--doc:The initializer for a FieldSynopsis.-->
+<!ELEMENT initializer %ho; (%smallcptr.char.mix;)*>
+<!--end of initializer.element-->]]>
+
+<!ENTITY % initializer.attlist "INCLUDE">
+<![%initializer.attlist;[
+<!ATTLIST initializer
+	%common.attrib;
+	%initializer.role.attrib;
+	%local.initializer.attrib;
+>
+<!--end of initializer.attlist-->]]>
+<!--end of initializer.module-->]]>
+
+<!ENTITY % constructorsynopsis.module "INCLUDE">
+<![%constructorsynopsis.module;[
+<!ENTITY % local.constructorsynopsis.attrib "">
+<!ENTITY % constructorsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % constructorsynopsis.element "INCLUDE">
+<![%constructorsynopsis.element;[
+<!--doc:A syntax summary for a constructor.-->
+<!ELEMENT constructorsynopsis %ho; (modifier*,
+                               methodname?,
+                               (methodparam+|void?),
+                               exceptionname*)>
+<!--end of constructorsynopsis.element-->]]>
+
+<!ENTITY % constructorsynopsis.attlist "INCLUDE">
+<![%constructorsynopsis.attlist;[
+<!ATTLIST constructorsynopsis
+	language	CDATA	#IMPLIED
+	%common.attrib;
+	%constructorsynopsis.role.attrib;
+	%local.constructorsynopsis.attrib;
+>
+<!--end of constructorsynopsis.attlist-->]]>
+<!--end of constructorsynopsis.module-->]]>
+
+<!ENTITY % destructorsynopsis.module "INCLUDE">
+<![%destructorsynopsis.module;[
+<!ENTITY % local.destructorsynopsis.attrib "">
+<!ENTITY % destructorsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % destructorsynopsis.element "INCLUDE">
+<![%destructorsynopsis.element;[
+<!--doc:A syntax summary for a destructor.-->
+<!ELEMENT destructorsynopsis %ho; (modifier*,
+                              methodname?,
+                              (methodparam+|void?),
+                              exceptionname*)>
+<!--end of destructorsynopsis.element-->]]>
+
+<!ENTITY % destructorsynopsis.attlist "INCLUDE">
+<![%destructorsynopsis.attlist;[
+<!ATTLIST destructorsynopsis
+	language	CDATA	#IMPLIED
+	%common.attrib;
+	%destructorsynopsis.role.attrib;
+	%local.destructorsynopsis.attrib;
+>
+<!--end of destructorsynopsis.attlist-->]]>
+<!--end of destructorsynopsis.module-->]]>
+
+<!ENTITY % methodsynopsis.module "INCLUDE">
+<![%methodsynopsis.module;[
+<!ENTITY % local.methodsynopsis.attrib "">
+<!ENTITY % methodsynopsis.role.attrib "%role.attrib;">
+
+<!ENTITY % methodsynopsis.element "INCLUDE">
+<![%methodsynopsis.element;[
+<!--doc:A syntax summary for a method.-->
+<!ELEMENT methodsynopsis %ho; (modifier*,
+                          (type|void)?,
+                          methodname,
+                          (methodparam+|void?),
+                          exceptionname*,
+                          modifier*)>
+<!--end of methodsynopsis.element-->]]>
+
+<!ENTITY % methodsynopsis.attlist "INCLUDE">
+<![%methodsynopsis.attlist;[
+<!ATTLIST methodsynopsis
+	language	CDATA	#IMPLIED
+	%common.attrib;
+	%methodsynopsis.role.attrib;
+	%local.methodsynopsis.attrib;
+>
+<!--end of methodsynopsis.attlist-->]]>
+<!--end of methodsynopsis.module-->]]>
+
+<!ENTITY % methodname.module "INCLUDE">
+<![%methodname.module;[
+<!ENTITY % local.methodname.attrib "">
+<!ENTITY % methodname.role.attrib "%role.attrib;">
+
+<!ENTITY % methodname.element "INCLUDE">
+<![%methodname.element;[
+<!--doc:The name of a method.-->
+<!ELEMENT methodname %ho; (%smallcptr.char.mix;)*>
+<!--end of methodname.element-->]]>
+
+<!ENTITY % methodname.attlist "INCLUDE">
+<![%methodname.attlist;[
+<!ATTLIST methodname
+	%common.attrib;
+	%methodname.role.attrib;
+	%local.methodname.attrib;
+>
+<!--end of methodname.attlist-->]]>
+<!--end of methodname.module-->]]>
+
+<!ENTITY % methodparam.module "INCLUDE">
+<![%methodparam.module;[
+<!ENTITY % local.methodparam.attrib "">
+<!ENTITY % methodparam.role.attrib "%role.attrib;">
+
+<!ENTITY % methodparam.element "INCLUDE">
+<![%methodparam.element;[
+<!--doc:Parameters to a method.-->
+<!ELEMENT methodparam %ho; (modifier*,
+                       type?,
+                       ((parameter,initializer?)|funcparams),
+                       modifier*)>
+<!--end of methodparam.element-->]]>
+
+<!ENTITY % methodparam.attlist "INCLUDE">
+<![%methodparam.attlist;[
+<!ATTLIST methodparam
+	choice		(opt
+			|req
+			|plain)		"req"
+	rep		(norepeat
+			|repeat)	"norepeat"
+	%common.attrib;
+	%methodparam.role.attrib;
+	%local.methodparam.attrib;
+>
+<!--end of methodparam.attlist-->]]>
+<!--end of methodparam.module-->]]>
+<!--end of classsynopsis.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Document information entities and elements ........................... -->
+
+<!-- The document information elements include some elements that are
+     currently used only in the document hierarchy module. They are
+     defined here so that they will be available for use in customized
+     document hierarchies. -->
+
+<!-- .................................. -->
+
+<!ENTITY % docinfo.content.module "INCLUDE">
+<![%docinfo.content.module;[
+
+<!-- Ackno ............................ -->
+
+<!ENTITY % ackno.module "INCLUDE">
+<![%ackno.module;[
+<!ENTITY % local.ackno.attrib "">
+<!ENTITY % ackno.role.attrib "%role.attrib;">
+
+<!ENTITY % ackno.element "INCLUDE">
+<![%ackno.element;[
+<!--doc:Acknowledgements in an Article.-->
+<!ELEMENT ackno %ho; (%docinfo.char.mix;)*>
+<!--end of ackno.element-->]]>
+
+<!ENTITY % ackno.attlist "INCLUDE">
+<![%ackno.attlist;[
+<!ATTLIST ackno
+		%common.attrib;
+		%ackno.role.attrib;
+		%local.ackno.attrib;
+>
+<!--end of ackno.attlist-->]]>
+<!--end of ackno.module-->]]>
+
+<!-- Address .......................... -->
+
+<!ENTITY % address.content.module "INCLUDE">
+<![%address.content.module;[
+<!ENTITY % address.module "INCLUDE">
+<![%address.module;[
+<!ENTITY % local.address.attrib "">
+<!ENTITY % address.role.attrib "%role.attrib;">
+
+<!ENTITY % address.element "INCLUDE">
+<![%address.element;[
+<!--doc:A real-world address, generally a postal address.-->
+<!ELEMENT address %ho; (#PCDATA|personname|%person.ident.mix;
+		|street|pob|postcode|city|state|country|phone
+		|fax|email|otheraddr)*>
+<!--end of address.element-->]]>
+
+<!ENTITY % address.attlist "INCLUDE">
+<![%address.attlist;[
+<!ATTLIST address
+		%linespecific.attrib;
+		%common.attrib;
+		%address.role.attrib;
+		%local.address.attrib;
+>
+<!--end of address.attlist-->]]>
+<!--end of address.module-->]]>
+
+  <!ENTITY % street.module "INCLUDE">
+  <![%street.module;[
+ <!ENTITY % local.street.attrib "">
+  <!ENTITY % street.role.attrib "%role.attrib;">
+
+<!ENTITY % street.element "INCLUDE">
+<![%street.element;[
+<!--doc:A street address in an address.-->
+<!ELEMENT street %ho; (%docinfo.char.mix;)*>
+<!--end of street.element-->]]>
+
+<!ENTITY % street.attlist "INCLUDE">
+<![%street.attlist;[
+<!ATTLIST street
+		%common.attrib;
+		%street.role.attrib;
+		%local.street.attrib;
+>
+<!--end of street.attlist-->]]>
+  <!--end of street.module-->]]>
+
+  <!ENTITY % pob.module "INCLUDE">
+  <![%pob.module;[
+  <!ENTITY % local.pob.attrib "">
+  <!ENTITY % pob.role.attrib "%role.attrib;">
+
+<!ENTITY % pob.element "INCLUDE">
+<![%pob.element;[
+<!--doc:A post office box in an address.-->
+<!ELEMENT pob %ho; (%docinfo.char.mix;)*>
+<!--end of pob.element-->]]>
+
+<!ENTITY % pob.attlist "INCLUDE">
+<![%pob.attlist;[
+<!ATTLIST pob
+		%common.attrib;
+		%pob.role.attrib;
+		%local.pob.attrib;
+>
+<!--end of pob.attlist-->]]>
+  <!--end of pob.module-->]]>
+
+  <!ENTITY % postcode.module "INCLUDE">
+  <![%postcode.module;[
+  <!ENTITY % local.postcode.attrib "">
+  <!ENTITY % postcode.role.attrib "%role.attrib;">
+
+<!ENTITY % postcode.element "INCLUDE">
+<![%postcode.element;[
+<!--doc:A postal code in an address.-->
+<!ELEMENT postcode %ho; (%docinfo.char.mix;)*>
+<!--end of postcode.element-->]]>
+
+<!ENTITY % postcode.attlist "INCLUDE">
+<![%postcode.attlist;[
+<!ATTLIST postcode
+		%common.attrib;
+		%postcode.role.attrib;
+		%local.postcode.attrib;
+>
+<!--end of postcode.attlist-->]]>
+  <!--end of postcode.module-->]]>
+
+  <!ENTITY % city.module "INCLUDE">
+  <![%city.module;[
+  <!ENTITY % local.city.attrib "">
+  <!ENTITY % city.role.attrib "%role.attrib;">
+
+<!ENTITY % city.element "INCLUDE">
+<![%city.element;[
+<!--doc:The name of a city in an address.-->
+<!ELEMENT city %ho; (%docinfo.char.mix;)*>
+<!--end of city.element-->]]>
+
+<!ENTITY % city.attlist "INCLUDE">
+<![%city.attlist;[
+<!ATTLIST city
+		%common.attrib;
+		%city.role.attrib;
+		%local.city.attrib;
+>
+<!--end of city.attlist-->]]>
+  <!--end of city.module-->]]>
+
+  <!ENTITY % state.module "INCLUDE">
+  <![%state.module;[
+  <!ENTITY % local.state.attrib "">
+  <!ENTITY % state.role.attrib "%role.attrib;">
+
+<!ENTITY % state.element "INCLUDE">
+<![%state.element;[
+<!--doc:A state or province in an address.-->
+<!ELEMENT state %ho; (%docinfo.char.mix;)*>
+<!--end of state.element-->]]>
+
+<!ENTITY % state.attlist "INCLUDE">
+<![%state.attlist;[
+<!ATTLIST state
+		%common.attrib;
+		%state.role.attrib;
+		%local.state.attrib;
+>
+<!--end of state.attlist-->]]>
+  <!--end of state.module-->]]>
+
+  <!ENTITY % country.module "INCLUDE">
+  <![%country.module;[
+  <!ENTITY % local.country.attrib "">
+  <!ENTITY % country.role.attrib "%role.attrib;">
+
+<!ENTITY % country.element "INCLUDE">
+<![%country.element;[
+<!--doc:The name of a country.-->
+<!ELEMENT country %ho; (%docinfo.char.mix;)*>
+<!--end of country.element-->]]>
+
+<!ENTITY % country.attlist "INCLUDE">
+<![%country.attlist;[
+<!ATTLIST country
+		%common.attrib;
+		%country.role.attrib;
+		%local.country.attrib;
+>
+<!--end of country.attlist-->]]>
+  <!--end of country.module-->]]>
+
+  <!ENTITY % phone.module "INCLUDE">
+  <![%phone.module;[
+  <!ENTITY % local.phone.attrib "">
+  <!ENTITY % phone.role.attrib "%role.attrib;">
+
+<!ENTITY % phone.element "INCLUDE">
+<![%phone.element;[
+<!--doc:A telephone number.-->
+<!ELEMENT phone %ho; (%docinfo.char.mix;)*>
+<!--end of phone.element-->]]>
+
+<!ENTITY % phone.attlist "INCLUDE">
+<![%phone.attlist;[
+<!ATTLIST phone
+		%common.attrib;
+		%phone.role.attrib;
+		%local.phone.attrib;
+>
+<!--end of phone.attlist-->]]>
+  <!--end of phone.module-->]]>
+
+  <!ENTITY % fax.module "INCLUDE">
+  <![%fax.module;[
+  <!ENTITY % local.fax.attrib "">
+  <!ENTITY % fax.role.attrib "%role.attrib;">
+
+<!ENTITY % fax.element "INCLUDE">
+<![%fax.element;[
+<!--doc:A fax number.-->
+<!ELEMENT fax %ho; (%docinfo.char.mix;)*>
+<!--end of fax.element-->]]>
+
+<!ENTITY % fax.attlist "INCLUDE">
+<![%fax.attlist;[
+<!ATTLIST fax
+		%common.attrib;
+		%fax.role.attrib;
+		%local.fax.attrib;
+>
+<!--end of fax.attlist-->]]>
+  <!--end of fax.module-->]]>
+
+  <!-- Email (defined in the Inlines section, below)-->
+
+  <!ENTITY % otheraddr.module "INCLUDE">
+  <![%otheraddr.module;[
+  <!ENTITY % local.otheraddr.attrib "">
+  <!ENTITY % otheraddr.role.attrib "%role.attrib;">
+
+<!ENTITY % otheraddr.element "INCLUDE">
+<![%otheraddr.element;[
+<!--doc:Uncategorized information in address.-->
+<!ELEMENT otheraddr %ho; (%docinfo.char.mix;)*>
+<!--end of otheraddr.element-->]]>
+
+<!ENTITY % otheraddr.attlist "INCLUDE">
+<![%otheraddr.attlist;[
+<!ATTLIST otheraddr
+		%common.attrib;
+		%otheraddr.role.attrib;
+		%local.otheraddr.attrib;
+>
+<!--end of otheraddr.attlist-->]]>
+  <!--end of otheraddr.module-->]]>
+<!--end of address.content.module-->]]>
+
+<!-- Affiliation ...................... -->
+
+<!ENTITY % affiliation.content.module "INCLUDE">
+<![%affiliation.content.module;[
+<!ENTITY % affiliation.module "INCLUDE">
+<![%affiliation.module;[
+<!ENTITY % local.affiliation.attrib "">
+<!ENTITY % affiliation.role.attrib "%role.attrib;">
+
+<!ENTITY % affiliation.element "INCLUDE">
+<![%affiliation.element;[
+<!--doc:The institutional affiliation of an individual.-->
+<!ELEMENT affiliation %ho; (shortaffil?, jobtitle*, orgname?, orgdiv*,
+		address*)>
+<!--end of affiliation.element-->]]>
+
+<!ENTITY % affiliation.attlist "INCLUDE">
+<![%affiliation.attlist;[
+<!ATTLIST affiliation
+		%common.attrib;
+		%affiliation.role.attrib;
+		%local.affiliation.attrib;
+>
+<!--end of affiliation.attlist-->]]>
+<!--end of affiliation.module-->]]>
+
+  <!ENTITY % shortaffil.module "INCLUDE">
+  <![%shortaffil.module;[
+  <!ENTITY % local.shortaffil.attrib "">
+  <!ENTITY % shortaffil.role.attrib "%role.attrib;">
+
+<!ENTITY % shortaffil.element "INCLUDE">
+<![%shortaffil.element;[
+<!--doc:A brief description of an affiliation.-->
+<!ELEMENT shortaffil %ho; (%docinfo.char.mix;)*>
+<!--end of shortaffil.element-->]]>
+
+<!ENTITY % shortaffil.attlist "INCLUDE">
+<![%shortaffil.attlist;[
+<!ATTLIST shortaffil
+		%common.attrib;
+		%shortaffil.role.attrib;
+		%local.shortaffil.attrib;
+>
+<!--end of shortaffil.attlist-->]]>
+  <!--end of shortaffil.module-->]]>
+
+  <!ENTITY % jobtitle.module "INCLUDE">
+  <![%jobtitle.module;[
+  <!ENTITY % local.jobtitle.attrib "">
+  <!ENTITY % jobtitle.role.attrib "%role.attrib;">
+
+<!ENTITY % jobtitle.element "INCLUDE">
+<![%jobtitle.element;[
+<!--doc:The title of an individual in an organization.-->
+<!ELEMENT jobtitle %ho; (%docinfo.char.mix;)*>
+<!--end of jobtitle.element-->]]>
+
+<!ENTITY % jobtitle.attlist "INCLUDE">
+<![%jobtitle.attlist;[
+<!ATTLIST jobtitle
+		%common.attrib;
+		%jobtitle.role.attrib;
+		%local.jobtitle.attrib;
+>
+<!--end of jobtitle.attlist-->]]>
+  <!--end of jobtitle.module-->]]>
+
+  <!-- OrgName (defined elsewhere in this section)-->
+
+  <!ENTITY % orgdiv.module "INCLUDE">
+  <![%orgdiv.module;[
+  <!ENTITY % local.orgdiv.attrib "">
+  <!ENTITY % orgdiv.role.attrib "%role.attrib;">
+
+<!ENTITY % orgdiv.element "INCLUDE">
+<![%orgdiv.element;[
+<!--doc:A division of an organization.-->
+<!ELEMENT orgdiv %ho; (%docinfo.char.mix;)*>
+<!--end of orgdiv.element-->]]>
+
+<!ENTITY % orgdiv.attlist "INCLUDE">
+<![%orgdiv.attlist;[
+<!ATTLIST orgdiv
+		%common.attrib;
+		%orgdiv.role.attrib;
+		%local.orgdiv.attrib;
+>
+<!--end of orgdiv.attlist-->]]>
+  <!--end of orgdiv.module-->]]>
+
+  <!-- Address (defined elsewhere in this section)-->
+<!--end of affiliation.content.module-->]]>
+
+<!-- ArtPageNums ...................... -->
+
+<!ENTITY % artpagenums.module "INCLUDE">
+<![%artpagenums.module;[
+<!ENTITY % local.artpagenums.attrib "">
+<!ENTITY % artpagenums.role.attrib "%role.attrib;">
+
+<!ENTITY % artpagenums.element "INCLUDE">
+<![%artpagenums.element;[
+<!--doc:The page numbers of an article as published.-->
+<!ELEMENT artpagenums %ho; (%docinfo.char.mix;)*>
+<!--end of artpagenums.element-->]]>
+
+<!ENTITY % artpagenums.attlist "INCLUDE">
+<![%artpagenums.attlist;[
+<!ATTLIST artpagenums
+		%common.attrib;
+		%artpagenums.role.attrib;
+		%local.artpagenums.attrib;
+>
+<!--end of artpagenums.attlist-->]]>
+<!--end of artpagenums.module-->]]>
+
+<!-- PersonName -->
+
+<!ENTITY % personname.module "INCLUDE">
+<![%personname.module;[
+<!ENTITY % local.personname.attrib "">
+<!ENTITY % personname.role.attrib "%role.attrib;">
+
+<!ENTITY % personname.element "INCLUDE">
+<![%personname.element;[
+<!--doc:The personal name of an individual.-->
+<!ELEMENT personname %ho; ((honorific|firstname|surname|lineage|othername)+)>
+<!--end of personname.element-->]]>
+
+<!ENTITY % personname.attlist "INCLUDE">
+<![%personname.attlist;[
+<!ATTLIST personname
+		%common.attrib;
+		%personname.role.attrib;
+		%local.personname.attrib;
+>
+<!--end of personname.attlist-->]]>
+<!--end of personname.module-->]]>
+
+<!-- Author ........................... -->
+
+<!ENTITY % author.module "INCLUDE">
+<![%author.module;[
+<!ENTITY % local.author.attrib "">
+<!ENTITY % author.role.attrib "%role.attrib;">
+
+<!ENTITY % author.element "INCLUDE">
+<![%author.element;[
+<!--doc:The name of an individual author.-->
+<!ELEMENT author %ho; ((personname|(%person.ident.mix;)+),(personblurb|email|address)*)>
+<!--end of author.element-->]]>
+
+<!ENTITY % author.attlist "INCLUDE">
+<![%author.attlist;[
+<!ATTLIST author
+		%common.attrib;
+		%author.role.attrib;
+		%local.author.attrib;
+>
+<!--end of author.attlist-->]]>
+<!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of author.module-->]]>
+
+<!-- AuthorGroup ...................... -->
+
+<!ENTITY % authorgroup.content.module "INCLUDE">
+<![%authorgroup.content.module;[
+<!ENTITY % authorgroup.module "INCLUDE">
+<![%authorgroup.module;[
+<!ENTITY % local.authorgroup.attrib "">
+<!ENTITY % authorgroup.role.attrib "%role.attrib;">
+
+<!ENTITY % authorgroup.element "INCLUDE">
+<![%authorgroup.element;[
+<!--doc:Wrapper for author information when a document has multiple authors or collabarators.-->
+<!ELEMENT authorgroup %ho; ((author|editor|collab|corpauthor|corpcredit|othercredit)+)>
+<!--end of authorgroup.element-->]]>
+
+<!ENTITY % authorgroup.attlist "INCLUDE">
+<![%authorgroup.attlist;[
+<!ATTLIST authorgroup
+		%common.attrib;
+		%authorgroup.role.attrib;
+		%local.authorgroup.attrib;
+>
+<!--end of authorgroup.attlist-->]]>
+<!--end of authorgroup.module-->]]>
+
+  <!-- Author (defined elsewhere in this section)-->
+  <!-- Editor (defined elsewhere in this section)-->
+
+  <!ENTITY % collab.content.module "INCLUDE">
+  <![%collab.content.module;[
+  <!ENTITY % collab.module "INCLUDE">
+  <![%collab.module;[
+  <!ENTITY % local.collab.attrib "">
+  <!ENTITY % collab.role.attrib "%role.attrib;">
+
+<!ENTITY % collab.element "INCLUDE">
+<![%collab.element;[
+<!--doc:Identifies a collaborator.-->
+<!ELEMENT collab %ho; (collabname, affiliation*)>
+<!--end of collab.element-->]]>
+
+<!ENTITY % collab.attlist "INCLUDE">
+<![%collab.attlist;[
+<!ATTLIST collab
+		%common.attrib;
+		%collab.role.attrib;
+		%local.collab.attrib;
+>
+<!--end of collab.attlist-->]]>
+  <!--end of collab.module-->]]>
+
+    <!ENTITY % collabname.module "INCLUDE">
+  <![%collabname.module;[
+  <!ENTITY % local.collabname.attrib "">
+  <!ENTITY % collabname.role.attrib "%role.attrib;">
+
+<!ENTITY % collabname.element "INCLUDE">
+<![%collabname.element;[
+<!--doc:The name of a collaborator.-->
+<!ELEMENT collabname %ho; (%docinfo.char.mix;)*>
+<!--end of collabname.element-->]]>
+
+<!ENTITY % collabname.attlist "INCLUDE">
+<![%collabname.attlist;[
+<!ATTLIST collabname
+		%common.attrib;
+		%collabname.role.attrib;
+		%local.collabname.attrib;
+>
+<!--end of collabname.attlist-->]]>
+    <!--end of collabname.module-->]]>
+
+    <!-- Affiliation (defined elsewhere in this section)-->
+  <!--end of collab.content.module-->]]>
+
+  <!-- CorpAuthor (defined elsewhere in this section)-->
+  <!-- OtherCredit (defined elsewhere in this section)-->
+
+<!--end of authorgroup.content.module-->]]>
+
+<!-- AuthorInitials ................... -->
+
+<!ENTITY % authorinitials.module "INCLUDE">
+<![%authorinitials.module;[
+<!ENTITY % local.authorinitials.attrib "">
+<!ENTITY % authorinitials.role.attrib "%role.attrib;">
+
+<!ENTITY % authorinitials.element "INCLUDE">
+<![%authorinitials.element;[
+<!--doc:The initials or other short identifier for an author.-->
+<!ELEMENT authorinitials %ho; (%docinfo.char.mix;)*>
+<!--end of authorinitials.element-->]]>
+
+<!ENTITY % authorinitials.attlist "INCLUDE">
+<![%authorinitials.attlist;[
+<!ATTLIST authorinitials
+		%common.attrib;
+		%authorinitials.role.attrib;
+		%local.authorinitials.attrib;
+>
+<!--end of authorinitials.attlist-->]]>
+<!--end of authorinitials.module-->]]>
+
+<!-- ConfGroup ........................ -->
+
+<!ENTITY % confgroup.content.module "INCLUDE">
+<![%confgroup.content.module;[
+<!ENTITY % confgroup.module "INCLUDE">
+<![%confgroup.module;[
+<!ENTITY % local.confgroup.attrib "">
+<!ENTITY % confgroup.role.attrib "%role.attrib;">
+
+<!ENTITY % confgroup.element "INCLUDE">
+<![%confgroup.element;[
+<!--doc:A wrapper for document meta-information about a conference.-->
+<!ELEMENT confgroup %ho; ((confdates|conftitle|confnum|address|confsponsor)*)>
+<!--end of confgroup.element-->]]>
+
+<!ENTITY % confgroup.attlist "INCLUDE">
+<![%confgroup.attlist;[
+<!ATTLIST confgroup
+		%common.attrib;
+		%confgroup.role.attrib;
+		%local.confgroup.attrib;
+>
+<!--end of confgroup.attlist-->]]>
+<!--end of confgroup.module-->]]>
+
+  <!ENTITY % confdates.module "INCLUDE">
+  <![%confdates.module;[
+  <!ENTITY % local.confdates.attrib "">
+  <!ENTITY % confdates.role.attrib "%role.attrib;">
+
+<!ENTITY % confdates.element "INCLUDE">
+<![%confdates.element;[
+<!--doc:The dates of a conference for which a document was written.-->
+<!ELEMENT confdates %ho; (%docinfo.char.mix;)*>
+<!--end of confdates.element-->]]>
+
+<!ENTITY % confdates.attlist "INCLUDE">
+<![%confdates.attlist;[
+<!ATTLIST confdates
+		%common.attrib;
+		%confdates.role.attrib;
+		%local.confdates.attrib;
+>
+<!--end of confdates.attlist-->]]>
+  <!--end of confdates.module-->]]>
+
+  <!ENTITY % conftitle.module "INCLUDE">
+  <![%conftitle.module;[
+  <!ENTITY % local.conftitle.attrib "">
+  <!ENTITY % conftitle.role.attrib "%role.attrib;">
+
+<!ENTITY % conftitle.element "INCLUDE">
+<![%conftitle.element;[
+<!--doc:The title of a conference for which a document was written.-->
+<!ELEMENT conftitle %ho; (%docinfo.char.mix;)*>
+<!--end of conftitle.element-->]]>
+
+<!ENTITY % conftitle.attlist "INCLUDE">
+<![%conftitle.attlist;[
+<!ATTLIST conftitle
+		%common.attrib;
+		%conftitle.role.attrib;
+		%local.conftitle.attrib;
+>
+<!--end of conftitle.attlist-->]]>
+  <!--end of conftitle.module-->]]>
+
+  <!ENTITY % confnum.module "INCLUDE">
+  <![%confnum.module;[
+  <!ENTITY % local.confnum.attrib "">
+  <!ENTITY % confnum.role.attrib "%role.attrib;">
+
+<!ENTITY % confnum.element "INCLUDE">
+<![%confnum.element;[
+<!--doc:An identifier, frequently numerical, associated with a conference for which a document was written.-->
+<!ELEMENT confnum %ho; (%docinfo.char.mix;)*>
+<!--end of confnum.element-->]]>
+
+<!ENTITY % confnum.attlist "INCLUDE">
+<![%confnum.attlist;[
+<!ATTLIST confnum
+		%common.attrib;
+		%confnum.role.attrib;
+		%local.confnum.attrib;
+>
+<!--end of confnum.attlist-->]]>
+  <!--end of confnum.module-->]]>
+
+  <!-- Address (defined elsewhere in this section)-->
+
+  <!ENTITY % confsponsor.module "INCLUDE">
+  <![%confsponsor.module;[
+  <!ENTITY % local.confsponsor.attrib "">
+  <!ENTITY % confsponsor.role.attrib "%role.attrib;">
+
+<!ENTITY % confsponsor.element "INCLUDE">
+<![%confsponsor.element;[
+<!--doc:The sponsor of a conference for which a document was written.-->
+<!ELEMENT confsponsor %ho; (%docinfo.char.mix;)*>
+<!--end of confsponsor.element-->]]>
+
+<!ENTITY % confsponsor.attlist "INCLUDE">
+<![%confsponsor.attlist;[
+<!ATTLIST confsponsor
+		%common.attrib;
+		%confsponsor.role.attrib;
+		%local.confsponsor.attrib;
+>
+<!--end of confsponsor.attlist-->]]>
+  <!--end of confsponsor.module-->]]>
+<!--end of confgroup.content.module-->]]>
+
+<!-- ContractNum ...................... -->
+
+<!ENTITY % contractnum.module "INCLUDE">
+<![%contractnum.module;[
+<!ENTITY % local.contractnum.attrib "">
+<!ENTITY % contractnum.role.attrib "%role.attrib;">
+
+<!ENTITY % contractnum.element "INCLUDE">
+<![%contractnum.element;[
+<!--doc:The contract number of a document.-->
+<!ELEMENT contractnum %ho; (%docinfo.char.mix;)*>
+<!--end of contractnum.element-->]]>
+
+<!ENTITY % contractnum.attlist "INCLUDE">
+<![%contractnum.attlist;[
+<!ATTLIST contractnum
+		%common.attrib;
+		%contractnum.role.attrib;
+		%local.contractnum.attrib;
+>
+<!--end of contractnum.attlist-->]]>
+<!--end of contractnum.module-->]]>
+
+<!-- ContractSponsor .................. -->
+
+<!ENTITY % contractsponsor.module "INCLUDE">
+<![%contractsponsor.module;[
+<!ENTITY % local.contractsponsor.attrib "">
+<!ENTITY % contractsponsor.role.attrib "%role.attrib;">
+
+<!ENTITY % contractsponsor.element "INCLUDE">
+<![%contractsponsor.element;[
+<!--doc:The sponsor of a contract.-->
+<!ELEMENT contractsponsor %ho; (%docinfo.char.mix;)*>
+<!--end of contractsponsor.element-->]]>
+
+<!ENTITY % contractsponsor.attlist "INCLUDE">
+<![%contractsponsor.attlist;[
+<!ATTLIST contractsponsor
+		%common.attrib;
+		%contractsponsor.role.attrib;
+		%local.contractsponsor.attrib;
+>
+<!--end of contractsponsor.attlist-->]]>
+<!--end of contractsponsor.module-->]]>
+
+<!-- Copyright ........................ -->
+
+<!ENTITY % copyright.content.module "INCLUDE">
+<![%copyright.content.module;[
+<!ENTITY % copyright.module "INCLUDE">
+<![%copyright.module;[
+<!ENTITY % local.copyright.attrib "">
+<!ENTITY % copyright.role.attrib "%role.attrib;">
+
+<!ENTITY % copyright.element "INCLUDE">
+<![%copyright.element;[
+<!--doc:Copyright information about a document.-->
+<!ELEMENT copyright %ho; (year+, holder*)>
+<!--end of copyright.element-->]]>
+
+<!ENTITY % copyright.attlist "INCLUDE">
+<![%copyright.attlist;[
+<!ATTLIST copyright
+		%common.attrib;
+		%copyright.role.attrib;
+		%local.copyright.attrib;
+>
+<!--end of copyright.attlist-->]]>
+<!--end of copyright.module-->]]>
+
+  <!ENTITY % year.module "INCLUDE">
+  <![%year.module;[
+  <!ENTITY % local.year.attrib "">
+  <!ENTITY % year.role.attrib "%role.attrib;">
+
+<!ENTITY % year.element "INCLUDE">
+<![%year.element;[
+<!--doc:The year of publication of a document.-->
+<!ELEMENT year %ho; (%docinfo.char.mix;)*>
+<!--end of year.element-->]]>
+
+<!ENTITY % year.attlist "INCLUDE">
+<![%year.attlist;[
+<!ATTLIST year
+		%common.attrib;
+		%year.role.attrib;
+		%local.year.attrib;
+>
+<!--end of year.attlist-->]]>
+  <!--end of year.module-->]]>
+
+  <!ENTITY % holder.module "INCLUDE">
+  <![%holder.module;[
+  <!ENTITY % local.holder.attrib "">
+  <!ENTITY % holder.role.attrib "%role.attrib;">
+
+<!ENTITY % holder.element "INCLUDE">
+<![%holder.element;[
+<!--doc:The name of the individual or organization that holds a copyright.-->
+<!ELEMENT holder %ho; (%docinfo.char.mix;)*>
+<!--end of holder.element-->]]>
+
+<!ENTITY % holder.attlist "INCLUDE">
+<![%holder.attlist;[
+<!ATTLIST holder
+		%common.attrib;
+		%holder.role.attrib;
+		%local.holder.attrib;
+>
+<!--end of holder.attlist-->]]>
+  <!--end of holder.module-->]]>
+<!--end of copyright.content.module-->]]>
+
+<!-- CorpAuthor ....................... -->
+
+<!ENTITY % corpauthor.module "INCLUDE">
+<![%corpauthor.module;[
+<!ENTITY % local.corpauthor.attrib "">
+<!ENTITY % corpauthor.role.attrib "%role.attrib;">
+
+<!ENTITY % corpauthor.element "INCLUDE">
+<![%corpauthor.element;[
+<!--doc:A corporate author, as opposed to an individual.-->
+<!ELEMENT corpauthor %ho; (%docinfo.char.mix;)*>
+<!--end of corpauthor.element-->]]>
+
+<!ENTITY % corpauthor.attlist "INCLUDE">
+<![%corpauthor.attlist;[
+<!ATTLIST corpauthor
+		%common.attrib;
+		%corpauthor.role.attrib;
+		%local.corpauthor.attrib;
+>
+<!--end of corpauthor.attlist-->]]>
+<!--end of corpauthor.module-->]]>
+
+<!-- CorpCredit ...................... -->
+
+<!ENTITY % corpcredit.module "INCLUDE">
+<![%corpcredit.module;[
+<!ENTITY % local.corpcredit.attrib "">
+<!ENTITY % corpcredit.role.attrib "%role.attrib;">
+
+<!ENTITY % corpcredit.element "INCLUDE">
+<![%corpcredit.element;[
+<!--doc:A corporation or organization credited in a document.-->
+<!ELEMENT corpcredit %ho; (%docinfo.char.mix;)*>
+<!--end of corpcredit.element-->]]>
+
+<!ENTITY % corpcredit.attlist "INCLUDE">
+<![%corpcredit.attlist;[
+<!ATTLIST corpcredit
+		class	(graphicdesigner
+			|productioneditor
+			|copyeditor
+			|technicaleditor
+			|translator
+			|other)			#IMPLIED
+		%common.attrib;
+		%corpcredit.role.attrib;
+		%local.corpcredit.attrib;
+>
+<!--end of corpcredit.attlist-->]]>
+<!--end of corpcredit.module-->]]>
+
+<!-- CorpName ......................... -->
+
+<!ENTITY % corpname.module "INCLUDE">
+<![%corpname.module;[
+<!ENTITY % local.corpname.attrib "">
+
+<!ENTITY % corpname.element "INCLUDE">
+<![%corpname.element;[
+<!--doc:The name of a corporation.-->
+<!ELEMENT corpname %ho; (%docinfo.char.mix;)*>
+<!--end of corpname.element-->]]>
+<!ENTITY % corpname.role.attrib "%role.attrib;">
+
+<!ENTITY % corpname.attlist "INCLUDE">
+<![%corpname.attlist;[
+<!ATTLIST corpname
+		%common.attrib;
+		%corpname.role.attrib;
+		%local.corpname.attrib;
+>
+<!--end of corpname.attlist-->]]>
+<!--end of corpname.module-->]]>
+
+<!-- Date ............................. -->
+
+<!ENTITY % date.module "INCLUDE">
+<![%date.module;[
+<!ENTITY % local.date.attrib "">
+<!ENTITY % date.role.attrib "%role.attrib;">
+
+<!ENTITY % date.element "INCLUDE">
+<![%date.element;[
+<!--doc:The date of publication or revision of a document.-->
+<!ELEMENT date %ho; (%docinfo.char.mix;)*>
+<!--end of date.element-->]]>
+
+<!ENTITY % date.attlist "INCLUDE">
+<![%date.attlist;[
+<!ATTLIST date
+		%common.attrib;
+		%date.role.attrib;
+		%local.date.attrib;
+>
+<!--end of date.attlist-->]]>
+<!--end of date.module-->]]>
+
+<!-- Edition .......................... -->
+
+<!ENTITY % edition.module "INCLUDE">
+<![%edition.module;[
+<!ENTITY % local.edition.attrib "">
+<!ENTITY % edition.role.attrib "%role.attrib;">
+
+<!ENTITY % edition.element "INCLUDE">
+<![%edition.element;[
+<!--doc:The name or number of an edition of a document.-->
+<!ELEMENT edition %ho; (%docinfo.char.mix;)*>
+<!--end of edition.element-->]]>
+
+<!ENTITY % edition.attlist "INCLUDE">
+<![%edition.attlist;[
+<!ATTLIST edition
+		%common.attrib;
+		%edition.role.attrib;
+		%local.edition.attrib;
+>
+<!--end of edition.attlist-->]]>
+<!--end of edition.module-->]]>
+
+<!-- Editor ........................... -->
+
+<!ENTITY % editor.module "INCLUDE">
+<![%editor.module;[
+<!ENTITY % local.editor.attrib "">
+<!ENTITY % editor.role.attrib "%role.attrib;">
+
+<!ENTITY % editor.element "INCLUDE">
+<![%editor.element;[
+<!--doc:The name of the editor of a document.-->
+<!ELEMENT editor %ho; ((personname|(%person.ident.mix;)+),(personblurb|email|address)*)>
+<!--end of editor.element-->]]>
+
+<!ENTITY % editor.attlist "INCLUDE">
+<![%editor.attlist;[
+<!ATTLIST editor
+		%common.attrib;
+		%editor.role.attrib;
+		%local.editor.attrib;
+>
+<!--end of editor.attlist-->]]>
+  <!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of editor.module-->]]>
+
+<!-- ISBN ............................. -->
+
+<!ENTITY % isbn.module "INCLUDE">
+<![%isbn.module;[
+<!ENTITY % local.isbn.attrib "">
+<!ENTITY % isbn.role.attrib "%role.attrib;">
+
+<!ENTITY % isbn.element "INCLUDE">
+<![%isbn.element;[
+<!--doc:The International Standard Book Number of a document.-->
+<!ELEMENT isbn %ho; (%docinfo.char.mix;)*>
+<!--end of isbn.element-->]]>
+
+<!ENTITY % isbn.attlist "INCLUDE">
+<![%isbn.attlist;[
+<!ATTLIST isbn
+		%common.attrib;
+		%isbn.role.attrib;
+		%local.isbn.attrib;
+>
+<!--end of isbn.attlist-->]]>
+<!--end of isbn.module-->]]>
+
+<!-- ISSN ............................. -->
+
+<!ENTITY % issn.module "INCLUDE">
+<![%issn.module;[
+<!ENTITY % local.issn.attrib "">
+<!ENTITY % issn.role.attrib "%role.attrib;">
+
+<!ENTITY % issn.element "INCLUDE">
+<![%issn.element;[
+<!--doc:The International Standard Serial Number of a periodical.-->
+<!ELEMENT issn %ho; (%docinfo.char.mix;)*>
+<!--end of issn.element-->]]>
+
+<!ENTITY % issn.attlist "INCLUDE">
+<![%issn.attlist;[
+<!ATTLIST issn
+		%common.attrib;
+		%issn.role.attrib;
+		%local.issn.attrib;
+>
+<!--end of issn.attlist-->]]>
+<!--end of issn.module-->]]>
+
+<!-- BiblioId ................. -->
+<!ENTITY % biblio.class.attrib
+		"class	(uri
+                         |doi
+                         |isbn
+			 |isrn
+                         |issn
+                         |libraryofcongress
+                         |pubnumber
+                         |other)	#IMPLIED
+		otherclass	CDATA	#IMPLIED"
+>
+
+<!ENTITY % biblioid.module "INCLUDE">
+<![%biblioid.module;[
+<!ENTITY % local.biblioid.attrib "">
+<!ENTITY % biblioid.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioid.element "INCLUDE">
+<![%biblioid.element;[
+<!--doc:An identifier for a document.-->
+<!ELEMENT biblioid %ho; (%docinfo.char.mix;)*>
+<!--end of biblioid.element-->]]>
+
+<!ENTITY % biblioid.attlist "INCLUDE">
+<![%biblioid.attlist;[
+<!ATTLIST biblioid
+		%biblio.class.attrib;
+		%common.attrib;
+		%biblioid.role.attrib;
+		%local.biblioid.attrib;
+>
+<!--end of biblioid.attlist-->]]>
+<!--end of biblioid.module-->]]>
+
+<!-- CiteBiblioId ................. -->
+
+<!ENTITY % citebiblioid.module "INCLUDE">
+<![%citebiblioid.module;[
+<!ENTITY % local.citebiblioid.attrib "">
+<!ENTITY % citebiblioid.role.attrib "%role.attrib;">
+
+<!ENTITY % citebiblioid.element "INCLUDE">
+<![%citebiblioid.element;[
+<!--doc:A citation of a bibliographic identifier.-->
+<!ELEMENT citebiblioid %ho; (%docinfo.char.mix;)*>
+<!--end of citebiblioid.element-->]]>
+
+<!ENTITY % citebiblioid.attlist "INCLUDE">
+<![%citebiblioid.attlist;[
+<!ATTLIST citebiblioid
+		%biblio.class.attrib;
+		%common.attrib;
+		%citebiblioid.role.attrib;
+		%local.citebiblioid.attrib;
+>
+<!--end of citebiblioid.attlist-->]]>
+<!--end of citebiblioid.module-->]]>
+
+<!-- BiblioSource ................. -->
+
+<!ENTITY % bibliosource.module "INCLUDE">
+<![%bibliosource.module;[
+<!ENTITY % local.bibliosource.attrib "">
+<!ENTITY % bibliosource.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliosource.element "INCLUDE">
+<![%bibliosource.element;[
+<!--doc:The source of a document.-->
+<!ELEMENT bibliosource %ho; (%docinfo.char.mix;)*>
+<!--end of bibliosource.element-->]]>
+
+<!ENTITY % bibliosource.attlist "INCLUDE">
+<![%bibliosource.attlist;[
+<!ATTLIST bibliosource
+		%biblio.class.attrib;
+		%common.attrib;
+		%bibliosource.role.attrib;
+		%local.bibliosource.attrib;
+>
+<!--end of bibliosource.attlist-->]]>
+<!--end of bibliosource.module-->]]>
+
+<!-- BiblioRelation ................. -->
+
+<!ENTITY % bibliorelation.module "INCLUDE">
+<![%bibliorelation.module;[
+<!ENTITY % local.bibliorelation.attrib "">
+<!ENTITY % local.bibliorelation.types "">
+
+<!ENTITY % bibliorelation.type.attrib
+                "type    (isversionof
+                         |hasversion
+                         |isreplacedby
+                         |replaces
+                         |isrequiredby
+                         |requires
+                         |ispartof
+                         |haspart
+                         |isreferencedby
+                         |references
+                         |isformatof
+                         |hasformat
+                         |othertype
+                         %local.bibliorelation.types;)       #IMPLIED
+		othertype	CDATA	#IMPLIED
+">
+
+<!ENTITY % bibliorelation.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliorelation.element "INCLUDE">
+<![%bibliorelation.element;[
+<!--doc:The relationship of a document to another.-->
+<!ELEMENT bibliorelation %ho; (%docinfo.char.mix;)*>
+<!--end of bibliorelation.element-->]]>
+
+<!ENTITY % bibliorelation.attlist "INCLUDE">
+<![%bibliorelation.attlist;[
+<!ATTLIST bibliorelation
+		%biblio.class.attrib;
+		%bibliorelation.type.attrib;
+		%common.attrib;
+		%bibliorelation.role.attrib;
+		%local.bibliorelation.attrib;
+>
+<!--end of bibliorelation.attlist-->]]>
+<!--end of bibliorelation.module-->]]>
+
+<!-- BiblioCoverage ................. -->
+
+<!ENTITY % bibliocoverage.module "INCLUDE">
+<![%bibliocoverage.module;[
+<!ENTITY % local.bibliocoverage.attrib "">
+<!ENTITY % bibliocoverage.role.attrib "%role.attrib;">
+
+<!ENTITY % bibliocoverage.element "INCLUDE">
+<![%bibliocoverage.element;[
+<!--doc:The spatial or temporal coverage of a document.-->
+<!ELEMENT bibliocoverage %ho; (%docinfo.char.mix;)*>
+<!--end of bibliocoverage.element-->]]>
+
+<!ENTITY % bibliocoverage.attlist "INCLUDE">
+<![%bibliocoverage.attlist;[
+<!ATTLIST bibliocoverage
+		spatial	(dcmipoint|iso3166|dcmibox|tgn|otherspatial)	#IMPLIED
+		otherspatial	CDATA	#IMPLIED
+		temporal (dcmiperiod|w3c-dtf|othertemporal) #IMPLIED
+		othertemporal	CDATA	#IMPLIED
+		%common.attrib;
+		%bibliocoverage.role.attrib;
+		%local.bibliocoverage.attrib;
+>
+<!--end of bibliocoverage.attlist-->]]>
+<!--end of bibliocoverage.module-->]]>
+
+<!-- InvPartNumber .................... -->
+
+<!ENTITY % invpartnumber.module "INCLUDE">
+<![%invpartnumber.module;[
+<!ENTITY % local.invpartnumber.attrib "">
+<!ENTITY % invpartnumber.role.attrib "%role.attrib;">
+
+<!ENTITY % invpartnumber.element "INCLUDE">
+<![%invpartnumber.element;[
+<!--doc:An inventory part number.-->
+<!ELEMENT invpartnumber %ho; (%docinfo.char.mix;)*>
+<!--end of invpartnumber.element-->]]>
+
+<!ENTITY % invpartnumber.attlist "INCLUDE">
+<![%invpartnumber.attlist;[
+<!ATTLIST invpartnumber
+		%common.attrib;
+		%invpartnumber.role.attrib;
+		%local.invpartnumber.attrib;
+>
+<!--end of invpartnumber.attlist-->]]>
+<!--end of invpartnumber.module-->]]>
+
+<!-- IssueNum ......................... -->
+
+<!ENTITY % issuenum.module "INCLUDE">
+<![%issuenum.module;[
+<!ENTITY % local.issuenum.attrib "">
+<!ENTITY % issuenum.role.attrib "%role.attrib;">
+
+<!ENTITY % issuenum.element "INCLUDE">
+<![%issuenum.element;[
+<!--doc:The number of an issue of a journal.-->
+<!ELEMENT issuenum %ho; (%docinfo.char.mix;)*>
+<!--end of issuenum.element-->]]>
+
+<!ENTITY % issuenum.attlist "INCLUDE">
+<![%issuenum.attlist;[
+<!ATTLIST issuenum
+		%common.attrib;
+		%issuenum.role.attrib;
+		%local.issuenum.attrib;
+>
+<!--end of issuenum.attlist-->]]>
+<!--end of issuenum.module-->]]>
+
+<!-- LegalNotice ...................... -->
+
+<!ENTITY % legalnotice.module "INCLUDE">
+<![%legalnotice.module;[
+<!ENTITY % local.legalnotice.attrib "">
+<!ENTITY % legalnotice.role.attrib "%role.attrib;">
+
+<!ENTITY % legalnotice.element "INCLUDE">
+<![%legalnotice.element;[
+<!--doc:A statement of legal obligations or requirements.-->
+<!ELEMENT legalnotice %ho; (blockinfo?, title?, (%legalnotice.mix;)+)
+		%formal.exclusion;>
+<!--end of legalnotice.element-->]]>
+
+<!ENTITY % legalnotice.attlist "INCLUDE">
+<![%legalnotice.attlist;[
+<!ATTLIST legalnotice
+		%common.attrib;
+		%legalnotice.role.attrib;
+		%local.legalnotice.attrib;
+>
+<!--end of legalnotice.attlist-->]]>
+<!--end of legalnotice.module-->]]>
+
+<!-- ModeSpec ......................... -->
+
+<!ENTITY % modespec.module "INCLUDE">
+<![%modespec.module;[
+<!ENTITY % local.modespec.attrib "">
+<!ENTITY % modespec.role.attrib "%role.attrib;">
+
+<!ENTITY % modespec.element "INCLUDE">
+<![%modespec.element;[
+<!--doc:Application-specific information necessary for the completion of an OLink.-->
+<!ELEMENT modespec %ho; (%docinfo.char.mix;)*
+		%ubiq.exclusion;>
+<!--end of modespec.element-->]]>
+
+<!-- Application: Type of action required for completion
+		of the links to which the ModeSpec is relevant (e.g.,
+		retrieval query) -->
+
+
+<!ENTITY % modespec.attlist "INCLUDE">
+<![%modespec.attlist;[
+<!ATTLIST modespec
+		application	NOTATION
+				(%notation.class;)	#IMPLIED
+		%common.attrib;
+		%modespec.role.attrib;
+		%local.modespec.attrib;
+>
+<!--end of modespec.attlist-->]]>
+<!--end of modespec.module-->]]>
+
+<!-- OrgName .......................... -->
+
+<!ENTITY % orgname.module "INCLUDE">
+<![%orgname.module;[
+<!ENTITY % local.orgname.attrib "">
+<!ENTITY % orgname.role.attrib "%role.attrib;">
+
+<!ENTITY % orgname.element "INCLUDE">
+<![%orgname.element;[
+<!--doc:The name of an organization other than a corporation.-->
+<!ELEMENT orgname %ho; (%docinfo.char.mix;)*>
+<!--end of orgname.element-->]]>
+
+<!ENTITY % orgname.attlist "INCLUDE">
+<![%orgname.attlist;[
+<!ATTLIST orgname
+		%common.attrib;
+		class	(corporation|nonprofit|consortium|informal|other)	#IMPLIED
+		otherclass	CDATA			#IMPLIED
+		%orgname.role.attrib;
+		%local.orgname.attrib;
+>
+<!--end of orgname.attlist-->]]>
+<!--end of orgname.module-->]]>
+
+<!-- OtherCredit ...................... -->
+
+<!ENTITY % othercredit.module "INCLUDE">
+<![%othercredit.module;[
+<!ENTITY % local.othercredit.attrib "">
+<!ENTITY % othercredit.role.attrib "%role.attrib;">
+
+<!ENTITY % othercredit.element "INCLUDE">
+<![%othercredit.element;[
+<!--doc:A person or entity, other than an author or editor, credited in a document.-->
+<!ELEMENT othercredit %ho; ((personname|(%person.ident.mix;)+),
+                            (personblurb|email|address)*)>
+<!--end of othercredit.element-->]]>
+
+<!ENTITY % othercredit.attlist "INCLUDE">
+<![%othercredit.attlist;[
+<!ATTLIST othercredit
+		class	(graphicdesigner
+			|productioneditor
+			|copyeditor
+			|technicaleditor
+			|translator
+			|other)			#IMPLIED
+		%common.attrib;
+		%othercredit.role.attrib;
+		%local.othercredit.attrib;
+>
+<!--end of othercredit.attlist-->]]>
+  <!--(see "Personal identity elements" for %person.ident.mix;)-->
+<!--end of othercredit.module-->]]>
+
+<!-- PageNums ......................... -->
+
+<!ENTITY % pagenums.module "INCLUDE">
+<![%pagenums.module;[
+<!ENTITY % local.pagenums.attrib "">
+<!ENTITY % pagenums.role.attrib "%role.attrib;">
+
+<!ENTITY % pagenums.element "INCLUDE">
+<![%pagenums.element;[
+<!--doc:The numbers of the pages in a book, for use in a bibliographic entry.-->
+<!ELEMENT pagenums %ho; (%docinfo.char.mix;)*>
+<!--end of pagenums.element-->]]>
+
+<!ENTITY % pagenums.attlist "INCLUDE">
+<![%pagenums.attlist;[
+<!ATTLIST pagenums
+		%common.attrib;
+		%pagenums.role.attrib;
+		%local.pagenums.attrib;
+>
+<!--end of pagenums.attlist-->]]>
+<!--end of pagenums.module-->]]>
+
+<!-- Personal identity elements ....... -->
+
+<!-- These elements are used only within Author, Editor, and
+OtherCredit. -->
+
+<!ENTITY % person.ident.module "INCLUDE">
+<![%person.ident.module;[
+  <!ENTITY % contrib.module "INCLUDE">
+  <![%contrib.module;[
+  <!ENTITY % local.contrib.attrib "">
+  <!ENTITY % contrib.role.attrib "%role.attrib;">
+
+<!ENTITY % contrib.element "INCLUDE">
+<![%contrib.element;[
+<!--doc:A summary of the contributions made to a document by a credited source.-->
+<!ELEMENT contrib %ho; (%docinfo.char.mix;)*>
+<!--end of contrib.element-->]]>
+
+<!ENTITY % contrib.attlist "INCLUDE">
+<![%contrib.attlist;[
+<!ATTLIST contrib
+		%common.attrib;
+		%contrib.role.attrib;
+		%local.contrib.attrib;
+>
+<!--end of contrib.attlist-->]]>
+  <!--end of contrib.module-->]]>
+
+  <!ENTITY % firstname.module "INCLUDE">
+  <![%firstname.module;[
+  <!ENTITY % local.firstname.attrib "">
+  <!ENTITY % firstname.role.attrib "%role.attrib;">
+
+<!ENTITY % firstname.element "INCLUDE">
+<![%firstname.element;[
+<!--doc:The first name of a person.-->
+<!ELEMENT firstname %ho; (%docinfo.char.mix;)*>
+<!--end of firstname.element-->]]>
+
+<!ENTITY % firstname.attlist "INCLUDE">
+<![%firstname.attlist;[
+<!ATTLIST firstname
+		%common.attrib;
+		%firstname.role.attrib;
+		%local.firstname.attrib;
+>
+<!--end of firstname.attlist-->]]>
+  <!--end of firstname.module-->]]>
+
+  <!ENTITY % honorific.module "INCLUDE">
+  <![%honorific.module;[
+  <!ENTITY % local.honorific.attrib "">
+  <!ENTITY % honorific.role.attrib "%role.attrib;">
+
+<!ENTITY % honorific.element "INCLUDE">
+<![%honorific.element;[
+<!--doc:The title of a person.-->
+<!ELEMENT honorific %ho; (%docinfo.char.mix;)*>
+<!--end of honorific.element-->]]>
+
+<!ENTITY % honorific.attlist "INCLUDE">
+<![%honorific.attlist;[
+<!ATTLIST honorific
+		%common.attrib;
+		%honorific.role.attrib;
+		%local.honorific.attrib;
+>
+<!--end of honorific.attlist-->]]>
+  <!--end of honorific.module-->]]>
+
+  <!ENTITY % lineage.module "INCLUDE">
+  <![%lineage.module;[
+  <!ENTITY % local.lineage.attrib "">
+  <!ENTITY % lineage.role.attrib "%role.attrib;">
+
+<!ENTITY % lineage.element "INCLUDE">
+<![%lineage.element;[
+<!--doc:The portion of a person's name indicating a relationship to ancestors.-->
+<!ELEMENT lineage %ho; (%docinfo.char.mix;)*>
+<!--end of lineage.element-->]]>
+
+<!ENTITY % lineage.attlist "INCLUDE">
+<![%lineage.attlist;[
+<!ATTLIST lineage
+		%common.attrib;
+		%lineage.role.attrib;
+		%local.lineage.attrib;
+>
+<!--end of lineage.attlist-->]]>
+  <!--end of lineage.module-->]]>
+
+  <!ENTITY % othername.module "INCLUDE">
+  <![%othername.module;[
+  <!ENTITY % local.othername.attrib "">
+  <!ENTITY % othername.role.attrib "%role.attrib;">
+
+<!ENTITY % othername.element "INCLUDE">
+<![%othername.element;[
+<!--doc:A component of a persons name that is not a first name, surname, or lineage.-->
+<!ELEMENT othername %ho; (%docinfo.char.mix;)*>
+<!--end of othername.element-->]]>
+
+<!ENTITY % othername.attlist "INCLUDE">
+<![%othername.attlist;[
+<!ATTLIST othername
+		%common.attrib;
+		%othername.role.attrib;
+		%local.othername.attrib;
+>
+<!--end of othername.attlist-->]]>
+  <!--end of othername.module-->]]>
+
+  <!ENTITY % surname.module "INCLUDE">
+  <![%surname.module;[
+  <!ENTITY % local.surname.attrib "">
+  <!ENTITY % surname.role.attrib "%role.attrib;">
+
+<!ENTITY % surname.element "INCLUDE">
+<![%surname.element;[
+<!--doc:A family name; in western cultures the last name.-->
+<!ELEMENT surname %ho; (%docinfo.char.mix;)*>
+<!--end of surname.element-->]]>
+
+<!ENTITY % surname.attlist "INCLUDE">
+<![%surname.attlist;[
+<!ATTLIST surname
+		%common.attrib;
+		%surname.role.attrib;
+		%local.surname.attrib;
+>
+<!--end of surname.attlist-->]]>
+  <!--end of surname.module-->]]>
+<!--end of person.ident.module-->]]>
+
+<!-- PrintHistory ..................... -->
+
+<!ENTITY % printhistory.module "INCLUDE">
+<![%printhistory.module;[
+<!ENTITY % local.printhistory.attrib "">
+<!ENTITY % printhistory.role.attrib "%role.attrib;">
+
+<!ENTITY % printhistory.element "INCLUDE">
+<![%printhistory.element;[
+<!--doc:The printing history of a document.-->
+<!ELEMENT printhistory %ho; ((%para.class;)+)>
+<!--end of printhistory.element-->]]>
+
+<!ENTITY % printhistory.attlist "INCLUDE">
+<![%printhistory.attlist;[
+<!ATTLIST printhistory
+		%common.attrib;
+		%printhistory.role.attrib;
+		%local.printhistory.attrib;
+>
+<!--end of printhistory.attlist-->]]>
+<!--end of printhistory.module-->]]>
+
+<!-- ProductName ...................... -->
+
+<!ENTITY % productname.module "INCLUDE">
+<![%productname.module;[
+<!ENTITY % local.productname.attrib "">
+<!ENTITY % productname.role.attrib "%role.attrib;">
+
+<!ENTITY % productname.element "INCLUDE">
+<![%productname.element;[
+<!--doc:The formal name of a product.-->
+<!ELEMENT productname %ho; (%para.char.mix;)*>
+<!--end of productname.element-->]]>
+
+<!-- Class: More precisely identifies the item the element names -->
+
+
+<!ENTITY % productname.attlist "INCLUDE">
+<![%productname.attlist;[
+<!ATTLIST productname
+		class		(service
+				|trade
+				|registered
+				|copyright)	'trade'
+		%common.attrib;
+		%productname.role.attrib;
+		%local.productname.attrib;
+>
+<!--end of productname.attlist-->]]>
+<!--end of productname.module-->]]>
+
+<!-- ProductNumber .................... -->
+
+<!ENTITY % productnumber.module "INCLUDE">
+<![%productnumber.module;[
+<!ENTITY % local.productnumber.attrib "">
+<!ENTITY % productnumber.role.attrib "%role.attrib;">
+
+<!ENTITY % productnumber.element "INCLUDE">
+<![%productnumber.element;[
+<!--doc:A number assigned to a product.-->
+<!ELEMENT productnumber %ho; (%docinfo.char.mix;)*>
+<!--end of productnumber.element-->]]>
+
+<!ENTITY % productnumber.attlist "INCLUDE">
+<![%productnumber.attlist;[
+<!ATTLIST productnumber
+		%common.attrib;
+		%productnumber.role.attrib;
+		%local.productnumber.attrib;
+>
+<!--end of productnumber.attlist-->]]>
+<!--end of productnumber.module-->]]>
+
+<!-- PubDate .......................... -->
+
+<!ENTITY % pubdate.module "INCLUDE">
+<![%pubdate.module;[
+<!ENTITY % local.pubdate.attrib "">
+<!ENTITY % pubdate.role.attrib "%role.attrib;">
+
+<!ENTITY % pubdate.element "INCLUDE">
+<![%pubdate.element;[
+<!--doc:The date of publication of a document.-->
+<!ELEMENT pubdate %ho; (%docinfo.char.mix;)*>
+<!--end of pubdate.element-->]]>
+
+<!ENTITY % pubdate.attlist "INCLUDE">
+<![%pubdate.attlist;[
+<!ATTLIST pubdate
+		%common.attrib;
+		%pubdate.role.attrib;
+		%local.pubdate.attrib;
+>
+<!--end of pubdate.attlist-->]]>
+<!--end of pubdate.module-->]]>
+
+<!-- Publisher ........................ -->
+
+<!ENTITY % publisher.content.module "INCLUDE">
+<![%publisher.content.module;[
+<!ENTITY % publisher.module "INCLUDE">
+<![%publisher.module;[
+<!ENTITY % local.publisher.attrib "">
+<!ENTITY % publisher.role.attrib "%role.attrib;">
+
+<!ENTITY % publisher.element "INCLUDE">
+<![%publisher.element;[
+<!--doc:The publisher of a document.-->
+<!ELEMENT publisher %ho; (publishername, address*)>
+<!--end of publisher.element-->]]>
+
+<!ENTITY % publisher.attlist "INCLUDE">
+<![%publisher.attlist;[
+<!ATTLIST publisher
+		%common.attrib;
+		%publisher.role.attrib;
+		%local.publisher.attrib;
+>
+<!--end of publisher.attlist-->]]>
+<!--end of publisher.module-->]]>
+
+  <!ENTITY % publishername.module "INCLUDE">
+  <![%publishername.module;[
+  <!ENTITY % local.publishername.attrib "">
+  <!ENTITY % publishername.role.attrib "%role.attrib;">
+
+<!ENTITY % publishername.element "INCLUDE">
+<![%publishername.element;[
+<!--doc:The name of the publisher of a document.-->
+<!ELEMENT publishername %ho; (%docinfo.char.mix;)*>
+<!--end of publishername.element-->]]>
+
+<!ENTITY % publishername.attlist "INCLUDE">
+<![%publishername.attlist;[
+<!ATTLIST publishername
+		%common.attrib;
+		%publishername.role.attrib;
+		%local.publishername.attrib;
+>
+<!--end of publishername.attlist-->]]>
+  <!--end of publishername.module-->]]>
+
+  <!-- Address (defined elsewhere in this section)-->
+<!--end of publisher.content.module-->]]>
+
+<!-- PubsNumber ....................... -->
+
+<!ENTITY % pubsnumber.module "INCLUDE">
+<![%pubsnumber.module;[
+<!ENTITY % local.pubsnumber.attrib "">
+<!ENTITY % pubsnumber.role.attrib "%role.attrib;">
+
+<!ENTITY % pubsnumber.element "INCLUDE">
+<![%pubsnumber.element;[
+<!--doc:A number assigned to a publication other than an ISBN or ISSN or inventory part number.-->
+<!ELEMENT pubsnumber %ho; (%docinfo.char.mix;)*>
+<!--end of pubsnumber.element-->]]>
+
+<!ENTITY % pubsnumber.attlist "INCLUDE">
+<![%pubsnumber.attlist;[
+<!ATTLIST pubsnumber
+		%common.attrib;
+		%pubsnumber.role.attrib;
+		%local.pubsnumber.attrib;
+>
+<!--end of pubsnumber.attlist-->]]>
+<!--end of pubsnumber.module-->]]>
+
+<!-- ReleaseInfo ...................... -->
+
+<!ENTITY % releaseinfo.module "INCLUDE">
+<![%releaseinfo.module;[
+<!ENTITY % local.releaseinfo.attrib "">
+<!ENTITY % releaseinfo.role.attrib "%role.attrib;">
+
+<!ENTITY % releaseinfo.element "INCLUDE">
+<![%releaseinfo.element;[
+<!--doc:Information about a particular release of a document.-->
+<!ELEMENT releaseinfo %ho; (%docinfo.char.mix;)*>
+<!--end of releaseinfo.element-->]]>
+
+<!ENTITY % releaseinfo.attlist "INCLUDE">
+<![%releaseinfo.attlist;[
+<!ATTLIST releaseinfo
+		%common.attrib;
+		%releaseinfo.role.attrib;
+		%local.releaseinfo.attrib;
+>
+<!--end of releaseinfo.attlist-->]]>
+<!--end of releaseinfo.module-->]]>
+
+<!-- RevHistory ....................... -->
+
+<!ENTITY % revhistory.content.module "INCLUDE">
+<![%revhistory.content.module;[
+<!ENTITY % revhistory.module "INCLUDE">
+<![%revhistory.module;[
+<!ENTITY % local.revhistory.attrib "">
+<!ENTITY % revhistory.role.attrib "%role.attrib;">
+
+<!ENTITY % revhistory.element "INCLUDE">
+<![%revhistory.element;[
+<!--doc:A history of the revisions to a document.-->
+<!ELEMENT revhistory %ho; (revision+)>
+<!--end of revhistory.element-->]]>
+
+<!ENTITY % revhistory.attlist "INCLUDE">
+<![%revhistory.attlist;[
+<!ATTLIST revhistory
+		%common.attrib;
+		%revhistory.role.attrib;
+		%local.revhistory.attrib;
+>
+<!--end of revhistory.attlist-->]]>
+<!--end of revhistory.module-->]]>
+
+<!ENTITY % revision.module "INCLUDE">
+<![%revision.module;[
+<!ENTITY % local.revision.attrib "">
+<!ENTITY % revision.role.attrib "%role.attrib;">
+
+<!ENTITY % revision.element "INCLUDE">
+<![%revision.element;[
+<!--doc:An entry describing a single revision in the history of the revisions to a document.-->
+<!ELEMENT revision %ho; (revnumber?, date, (author|authorinitials)*,
+                    (revremark|revdescription)?)>
+<!--end of revision.element-->]]>
+
+<!ENTITY % revision.attlist "INCLUDE">
+<![%revision.attlist;[
+<!ATTLIST revision
+		%common.attrib;
+		%revision.role.attrib;
+		%local.revision.attrib;
+>
+<!--end of revision.attlist-->]]>
+<!--end of revision.module-->]]>
+
+<!ENTITY % revnumber.module "INCLUDE">
+<![%revnumber.module;[
+<!ENTITY % local.revnumber.attrib "">
+<!ENTITY % revnumber.role.attrib "%role.attrib;">
+
+<!ENTITY % revnumber.element "INCLUDE">
+<![%revnumber.element;[
+<!--doc:A document revision number.-->
+<!ELEMENT revnumber %ho; (%docinfo.char.mix;)*>
+<!--end of revnumber.element-->]]>
+
+<!ENTITY % revnumber.attlist "INCLUDE">
+<![%revnumber.attlist;[
+<!ATTLIST revnumber
+		%common.attrib;
+		%revnumber.role.attrib;
+		%local.revnumber.attrib;
+>
+<!--end of revnumber.attlist-->]]>
+<!--end of revnumber.module-->]]>
+
+<!-- Date (defined elsewhere in this section)-->
+<!-- AuthorInitials (defined elsewhere in this section)-->
+
+<!ENTITY % revremark.module "INCLUDE">
+<![%revremark.module;[
+<!ENTITY % local.revremark.attrib "">
+<!ENTITY % revremark.role.attrib "%role.attrib;">
+
+<!ENTITY % revremark.element "INCLUDE">
+<![%revremark.element;[
+<!--doc:A description of a revision to a document.-->
+<!ELEMENT revremark %ho; (%docinfo.char.mix;)*>
+<!--end of revremark.element-->]]>
+
+<!ENTITY % revremark.attlist "INCLUDE">
+<![%revremark.attlist;[
+<!ATTLIST revremark
+		%common.attrib;
+		%revremark.role.attrib;
+		%local.revremark.attrib;
+>
+<!--end of revremark.attlist-->]]>
+<!--end of revremark.module-->]]>
+
+<!ENTITY % revdescription.module "INCLUDE">
+<![ %revdescription.module; [
+<!ENTITY % local.revdescription.attrib "">
+<!ENTITY % revdescription.role.attrib "%role.attrib;">
+
+<!ENTITY % revdescription.element "INCLUDE">
+<![ %revdescription.element; [
+<!--doc:A extended description of a revision to a document.-->
+<!ELEMENT revdescription %ho; ((%revdescription.mix;)+)>
+<!--end of revdescription.element-->]]>
+
+<!ENTITY % revdescription.attlist "INCLUDE">
+<![ %revdescription.attlist; [
+<!ATTLIST revdescription
+		%common.attrib;
+		%revdescription.role.attrib;
+		%local.revdescription.attrib;
+>
+<!--end of revdescription.attlist-->]]>
+<!--end of revdescription.module-->]]>
+<!--end of revhistory.content.module-->]]>
+
+<!-- SeriesVolNums .................... -->
+
+<!ENTITY % seriesvolnums.module "INCLUDE">
+<![%seriesvolnums.module;[
+<!ENTITY % local.seriesvolnums.attrib "">
+<!ENTITY % seriesvolnums.role.attrib "%role.attrib;">
+
+<!ENTITY % seriesvolnums.element "INCLUDE">
+<![%seriesvolnums.element;[
+<!--doc:Numbers of the volumes in a series of books.-->
+<!ELEMENT seriesvolnums %ho; (%docinfo.char.mix;)*>
+<!--end of seriesvolnums.element-->]]>
+
+<!ENTITY % seriesvolnums.attlist "INCLUDE">
+<![%seriesvolnums.attlist;[
+<!ATTLIST seriesvolnums
+		%common.attrib;
+		%seriesvolnums.role.attrib;
+		%local.seriesvolnums.attrib;
+>
+<!--end of seriesvolnums.attlist-->]]>
+<!--end of seriesvolnums.module-->]]>
+
+<!-- VolumeNum ........................ -->
+
+<!ENTITY % volumenum.module "INCLUDE">
+<![%volumenum.module;[
+<!ENTITY % local.volumenum.attrib "">
+<!ENTITY % volumenum.role.attrib "%role.attrib;">
+
+<!ENTITY % volumenum.element "INCLUDE">
+<![%volumenum.element;[
+<!--doc:The volume number of a document in a set (as of books in a set or articles in a journal).-->
+<!ELEMENT volumenum %ho; (%docinfo.char.mix;)*>
+<!--end of volumenum.element-->]]>
+
+<!ENTITY % volumenum.attlist "INCLUDE">
+<![%volumenum.attlist;[
+<!ATTLIST volumenum
+		%common.attrib;
+		%volumenum.role.attrib;
+		%local.volumenum.attrib;
+>
+<!--end of volumenum.attlist-->]]>
+<!--end of volumenum.module-->]]>
+
+<!-- .................................. -->
+
+<!--end of docinfo.content.module-->]]>
+
+<!-- ...................................................................... -->
+<!-- Inline, link, and ubiquitous elements ................................ -->
+
+<!-- Technical and computer terms ......................................... -->
+
+<!ENTITY % accel.module "INCLUDE">
+<![%accel.module;[
+<!ENTITY % local.accel.attrib "">
+<!ENTITY % accel.role.attrib "%role.attrib;">
+
+<!ENTITY % accel.element "INCLUDE">
+<![%accel.element;[
+<!--doc:A graphical user interface (GUI) keyboard shortcut.-->
+<!ELEMENT accel %ho; (%smallcptr.char.mix;)*>
+<!--end of accel.element-->]]>
+
+<!ENTITY % accel.attlist "INCLUDE">
+<![%accel.attlist;[
+<!ATTLIST accel
+		%common.attrib;
+		%accel.role.attrib;
+		%local.accel.attrib;
+>
+<!--end of accel.attlist-->]]>
+<!--end of accel.module-->]]>
+
+<!ENTITY % action.module "INCLUDE">
+<![%action.module;[
+<!ENTITY % local.action.attrib "">
+<!ENTITY % action.role.attrib "%role.attrib;">
+
+<!ENTITY % action.element "INCLUDE">
+<![%action.element;[
+<!--doc:A response to a user event.-->
+<!ELEMENT action %ho; (%cptr.char.mix;)*>
+<!--end of action.element-->]]>
+
+<!ENTITY % action.attlist "INCLUDE">
+<![%action.attlist;[
+<!ATTLIST action
+		%moreinfo.attrib;
+		%common.attrib;
+		%action.role.attrib;
+		%local.action.attrib;
+>
+<!--end of action.attlist-->]]>
+<!--end of action.module-->]]>
+
+<!ENTITY % application.module "INCLUDE">
+<![%application.module;[
+<!ENTITY % local.application.attrib "">
+<!ENTITY % application.role.attrib "%role.attrib;">
+
+<!ENTITY % application.element "INCLUDE">
+<![%application.element;[
+<!--doc:The name of a software program.-->
+<!ELEMENT application %ho; (%para.char.mix;)*>
+<!--end of application.element-->]]>
+
+<!ENTITY % application.attlist "INCLUDE">
+<![%application.attlist;[
+<!ATTLIST application
+		class 		(hardware
+				|software)	#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%application.role.attrib;
+		%local.application.attrib;
+>
+<!--end of application.attlist-->]]>
+<!--end of application.module-->]]>
+
+<!ENTITY % classname.module "INCLUDE">
+<![%classname.module;[
+<!ENTITY % local.classname.attrib "">
+<!ENTITY % classname.role.attrib "%role.attrib;">
+
+<!ENTITY % classname.element "INCLUDE">
+<![%classname.element;[
+<!--doc:The name of a class, in the object-oriented programming sense.-->
+<!ELEMENT classname %ho; (%smallcptr.char.mix;)*>
+<!--end of classname.element-->]]>
+
+<!ENTITY % classname.attlist "INCLUDE">
+<![%classname.attlist;[
+<!ATTLIST classname
+		%common.attrib;
+		%classname.role.attrib;
+		%local.classname.attrib;
+>
+<!--end of classname.attlist-->]]>
+<!--end of classname.module-->]]>
+
+<!ENTITY % package.module "INCLUDE">
+<![%package.module;[
+<!ENTITY % local.package.attrib "">
+<!ENTITY % package.role.attrib "%role.attrib;">
+
+<!ENTITY % package.element "INCLUDE">
+<![%package.element;[
+<!--doc:A package.-->
+<!ELEMENT package %ho; (%smallcptr.char.mix;)*>
+<!--end of package.element-->]]>
+
+<!ENTITY % package.attlist "INCLUDE">
+<![%package.attlist;[
+<!ATTLIST package
+		%common.attrib;
+		%package.role.attrib;
+		%local.package.attrib;
+>
+<!--end of package.attlist-->]]>
+<!--end of package.module-->]]>
+
+<!ENTITY % co.module "INCLUDE">
+<![%co.module;[
+<!ENTITY % local.co.attrib "">
+<!-- CO is a callout area of the LineColumn unit type (a single character
+     position); the position is directly indicated by the location of CO. -->
+<!ENTITY % co.role.attrib "%role.attrib;">
+
+<!ENTITY % co.element "INCLUDE">
+<![%co.element;[
+<!--doc:The location of a callout embedded in text.-->
+<!ELEMENT co %ho; EMPTY>
+<!--end of co.element-->]]>
+
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+
+
+<!ENTITY % co.attlist "INCLUDE">
+<![%co.attlist;[
+<!ATTLIST co
+		%label.attrib;
+		%linkends.attrib;
+		%idreq.common.attrib;
+		%co.role.attrib;
+		%local.co.attrib;
+>
+<!--end of co.attlist-->]]>
+<!--end of co.module-->]]>
+
+<!ENTITY % coref.module "INCLUDE">
+<![%coref.module;[
+<!ENTITY % local.coref.attrib "">
+<!-- COREF is a reference to a CO -->
+<!ENTITY % coref.role.attrib "%role.attrib;">
+
+<!ENTITY % coref.element "INCLUDE">
+<![%coref.element;[
+<!--doc:A cross reference to a co.-->
+<!ELEMENT coref %ho; EMPTY>
+<!--end of coref.element-->]]>
+
+<!-- bug number/symbol override or initialization -->
+<!-- to any related information -->
+
+<!ENTITY % coref.attlist "INCLUDE">
+<![%coref.attlist;[
+<!ATTLIST coref
+		%label.attrib;
+		%linkendreq.attrib;
+		%common.attrib;
+		%coref.role.attrib;
+		%local.coref.attrib;
+>
+<!--end of coref.attlist-->]]>
+<!--end of coref.module-->]]>
+
+<!ENTITY % command.module "INCLUDE">
+<![%command.module;[
+<!ENTITY % local.command.attrib "">
+<!ENTITY % command.role.attrib "%role.attrib;">
+
+<!ENTITY % command.element "INCLUDE">
+<![%command.element;[
+<!--doc:The name of an executable program or other software command.-->
+<!ELEMENT command %ho; (%cptr.char.mix;)*>
+<!--end of command.element-->]]>
+
+<!ENTITY % command.attlist "INCLUDE">
+<![%command.attlist;[
+<!ATTLIST command
+		%moreinfo.attrib;
+		%common.attrib;
+		%command.role.attrib;
+		%local.command.attrib;
+>
+<!--end of command.attlist-->]]>
+<!--end of command.module-->]]>
+
+<!ENTITY % computeroutput.module "INCLUDE">
+<![%computeroutput.module;[
+<!ENTITY % local.computeroutput.attrib "">
+<!ENTITY % computeroutput.role.attrib "%role.attrib;">
+
+<!ENTITY % computeroutput.element "INCLUDE">
+<![%computeroutput.element;[
+<!--doc:Data, generally text, displayed or presented by a computer.-->
+<!ELEMENT computeroutput %ho; (%cptr.char.mix;|co)*>
+<!--end of computeroutput.element-->]]>
+
+<!ENTITY % computeroutput.attlist "INCLUDE">
+<![%computeroutput.attlist;[
+<!ATTLIST computeroutput
+		%moreinfo.attrib;
+		%common.attrib;
+		%computeroutput.role.attrib;
+		%local.computeroutput.attrib;
+>
+<!--end of computeroutput.attlist-->]]>
+<!--end of computeroutput.module-->]]>
+
+<!ENTITY % database.module "INCLUDE">
+<![%database.module;[
+<!ENTITY % local.database.attrib "">
+<!ENTITY % database.role.attrib "%role.attrib;">
+
+<!ENTITY % database.element "INCLUDE">
+<![%database.element;[
+<!--doc:The name of a database, or part of a database.-->
+<!ELEMENT database %ho; (%cptr.char.mix;)*>
+<!--end of database.element-->]]>
+
+<!-- Class: Type of database the element names; no default -->
+
+
+<!ENTITY % database.attlist "INCLUDE">
+<![%database.attlist;[
+<!ATTLIST database
+		class 		(name
+				|table
+				|field
+				|key1
+				|key2
+				|record
+                                |index
+                                |view
+                                |primarykey
+                                |secondarykey
+                                |foreignkey
+                                |altkey
+                                |procedure
+                                |datatype
+                                |constraint
+                                |rule
+                                |user
+                                |group)	#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%database.role.attrib;
+		%local.database.attrib;
+>
+<!--end of database.attlist-->]]>
+<!--end of database.module-->]]>
+
+<!ENTITY % email.module "INCLUDE">
+<![%email.module;[
+<!ENTITY % local.email.attrib "">
+<!ENTITY % email.role.attrib "%role.attrib;">
+
+<!ENTITY % email.element "INCLUDE">
+<![%email.element;[
+<!--doc:An email address.-->
+<!ELEMENT email %ho; (%docinfo.char.mix;)*>
+<!--end of email.element-->]]>
+
+<!ENTITY % email.attlist "INCLUDE">
+<![%email.attlist;[
+<!ATTLIST email
+		%common.attrib;
+		%email.role.attrib;
+		%local.email.attrib;
+>
+<!--end of email.attlist-->]]>
+<!--end of email.module-->]]>
+
+<!ENTITY % envar.module "INCLUDE">
+<![%envar.module;[
+<!ENTITY % local.envar.attrib "">
+<!ENTITY % envar.role.attrib "%role.attrib;">
+
+<!ENTITY % envar.element "INCLUDE">
+<![%envar.element;[
+<!--doc:A software environment variable.-->
+<!ELEMENT envar %ho; (%smallcptr.char.mix;)*>
+<!--end of envar.element-->]]>
+
+<!ENTITY % envar.attlist "INCLUDE">
+<![%envar.attlist;[
+<!ATTLIST envar
+		%common.attrib;
+		%envar.role.attrib;
+		%local.envar.attrib;
+>
+<!--end of envar.attlist-->]]>
+<!--end of envar.module-->]]>
+
+
+<!ENTITY % errorcode.module "INCLUDE">
+<![%errorcode.module;[
+<!ENTITY % local.errorcode.attrib "">
+<!ENTITY % errorcode.role.attrib "%role.attrib;">
+
+<!ENTITY % errorcode.element "INCLUDE">
+<![%errorcode.element;[
+<!--doc:An error code.-->
+<!ELEMENT errorcode %ho; (%smallcptr.char.mix;)*>
+<!--end of errorcode.element-->]]>
+
+<!ENTITY % errorcode.attlist "INCLUDE">
+<![%errorcode.attlist;[
+<!ATTLIST errorcode
+		%moreinfo.attrib;
+		%common.attrib;
+		%errorcode.role.attrib;
+		%local.errorcode.attrib;
+>
+<!--end of errorcode.attlist-->]]>
+<!--end of errorcode.module-->]]>
+
+<!ENTITY % errorname.module "INCLUDE">
+<![%errorname.module;[
+<!ENTITY % local.errorname.attrib "">
+<!ENTITY % errorname.role.attrib "%role.attrib;">
+
+<!ENTITY % errorname.element "INCLUDE">
+<![%errorname.element;[
+<!--doc:An error name.-->
+<!ELEMENT errorname %ho; (%smallcptr.char.mix;)*>
+<!--end of errorname.element-->]]>
+
+<!ENTITY % errorname.attlist "INCLUDE">
+<![%errorname.attlist;[
+<!ATTLIST errorname
+		%common.attrib;
+		%errorname.role.attrib;
+		%local.errorname.attrib;
+>
+<!--end of errorname.attlist-->]]>
+<!--end of errorname.module-->]]>
+
+<!ENTITY % errortext.module "INCLUDE">
+<![%errortext.module;[
+<!ENTITY % local.errortext.attrib "">
+<!ENTITY % errortext.role.attrib "%role.attrib;">
+
+<!ENTITY % errortext.element "INCLUDE">
+<![%errortext.element;[
+<!--doc:An error message..-->
+<!ELEMENT errortext %ho; (%smallcptr.char.mix;)*>
+<!--end of errortext.element-->]]>
+
+<!ENTITY % errortext.attlist "INCLUDE">
+<![%errortext.attlist;[
+<!ATTLIST errortext
+		%common.attrib;
+		%errortext.role.attrib;
+		%local.errortext.attrib;
+>
+<!--end of errortext.attlist-->]]>
+<!--end of errortext.module-->]]>
+
+<!ENTITY % errortype.module "INCLUDE">
+<![%errortype.module;[
+<!ENTITY % local.errortype.attrib "">
+<!ENTITY % errortype.role.attrib "%role.attrib;">
+
+<!ENTITY % errortype.element "INCLUDE">
+<![%errortype.element;[
+<!--doc:The classification of an error message.-->
+<!ELEMENT errortype %ho; (%smallcptr.char.mix;)*>
+<!--end of errortype.element-->]]>
+
+<!ENTITY % errortype.attlist "INCLUDE">
+<![%errortype.attlist;[
+<!ATTLIST errortype
+		%common.attrib;
+		%errortype.role.attrib;
+		%local.errortype.attrib;
+>
+<!--end of errortype.attlist-->]]>
+<!--end of errortype.module-->]]>
+
+<!ENTITY % filename.module "INCLUDE">
+<![%filename.module;[
+<!ENTITY % local.filename.attrib "">
+<!ENTITY % filename.role.attrib "%role.attrib;">
+
+<!ENTITY % filename.element "INCLUDE">
+<![%filename.element;[
+<!--doc:The name of a file.-->
+<!ELEMENT filename %ho; (%cptr.char.mix;)*>
+<!--end of filename.element-->]]>
+
+<!-- Class: Type of filename the element names; no default -->
+<!-- Path: Search path (possibly system-specific) in which
+		file can be found -->
+
+
+<!ENTITY % filename.attlist "INCLUDE">
+<![%filename.attlist;[
+<!ATTLIST filename
+		class		(headerfile
+                                |partition
+                                |devicefile
+                                |libraryfile
+                                |directory
+                                |extension
+				|symlink)       #IMPLIED
+		path		CDATA		#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%filename.role.attrib;
+		%local.filename.attrib;
+>
+<!--end of filename.attlist-->]]>
+<!--end of filename.module-->]]>
+
+<!ENTITY % function.module "INCLUDE">
+<![%function.module;[
+<!ENTITY % local.function.attrib "">
+<!ENTITY % function.role.attrib "%role.attrib;">
+
+<!ENTITY % function.element "INCLUDE">
+<![%function.element;[
+<!--doc:The name of a function or subroutine, as in a programming language.-->
+<!ELEMENT function %ho; (%cptr.char.mix;)*>
+<!--end of function.element-->]]>
+
+<!ENTITY % function.attlist "INCLUDE">
+<![%function.attlist;[
+<!ATTLIST function
+		%moreinfo.attrib;
+		%common.attrib;
+		%function.role.attrib;
+		%local.function.attrib;
+>
+<!--end of function.attlist-->]]>
+<!--end of function.module-->]]>
+
+<!ENTITY % guibutton.module "INCLUDE">
+<![%guibutton.module;[
+<!ENTITY % local.guibutton.attrib "">
+<!ENTITY % guibutton.role.attrib "%role.attrib;">
+
+<!ENTITY % guibutton.element "INCLUDE">
+<![%guibutton.element;[
+<!--doc:The text on a button in a GUI.-->
+<!ELEMENT guibutton %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guibutton.element-->]]>
+
+<!ENTITY % guibutton.attlist "INCLUDE">
+<![%guibutton.attlist;[
+<!ATTLIST guibutton
+		%moreinfo.attrib;
+		%common.attrib;
+		%guibutton.role.attrib;
+		%local.guibutton.attrib;
+>
+<!--end of guibutton.attlist-->]]>
+<!--end of guibutton.module-->]]>
+
+<!ENTITY % guiicon.module "INCLUDE">
+<![%guiicon.module;[
+<!ENTITY % local.guiicon.attrib "">
+<!ENTITY % guiicon.role.attrib "%role.attrib;">
+
+<!ENTITY % guiicon.element "INCLUDE">
+<![%guiicon.element;[
+<!--doc:Graphic and/or text appearing as a icon in a GUI.-->
+<!ELEMENT guiicon %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guiicon.element-->]]>
+
+<!ENTITY % guiicon.attlist "INCLUDE">
+<![%guiicon.attlist;[
+<!ATTLIST guiicon
+		%moreinfo.attrib;
+		%common.attrib;
+		%guiicon.role.attrib;
+		%local.guiicon.attrib;
+>
+<!--end of guiicon.attlist-->]]>
+<!--end of guiicon.module-->]]>
+
+<!ENTITY % guilabel.module "INCLUDE">
+<![%guilabel.module;[
+<!ENTITY % local.guilabel.attrib "">
+<!ENTITY % guilabel.role.attrib "%role.attrib;">
+
+<!ENTITY % guilabel.element "INCLUDE">
+<![%guilabel.element;[
+<!--doc:The text of a label in a GUI.-->
+<!ELEMENT guilabel %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guilabel.element-->]]>
+
+<!ENTITY % guilabel.attlist "INCLUDE">
+<![%guilabel.attlist;[
+<!ATTLIST guilabel
+		%moreinfo.attrib;
+		%common.attrib;
+		%guilabel.role.attrib;
+		%local.guilabel.attrib;
+>
+<!--end of guilabel.attlist-->]]>
+<!--end of guilabel.module-->]]>
+
+<!ENTITY % guimenu.module "INCLUDE">
+<![%guimenu.module;[
+<!ENTITY % local.guimenu.attrib "">
+<!ENTITY % guimenu.role.attrib "%role.attrib;">
+
+<!ENTITY % guimenu.element "INCLUDE">
+<![%guimenu.element;[
+<!--doc:The name of a menu in a GUI.-->
+<!ELEMENT guimenu %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guimenu.element-->]]>
+
+<!ENTITY % guimenu.attlist "INCLUDE">
+<![%guimenu.attlist;[
+<!ATTLIST guimenu
+		%moreinfo.attrib;
+		%common.attrib;
+		%guimenu.role.attrib;
+		%local.guimenu.attrib;
+>
+<!--end of guimenu.attlist-->]]>
+<!--end of guimenu.module-->]]>
+
+<!ENTITY % guimenuitem.module "INCLUDE">
+<![%guimenuitem.module;[
+<!ENTITY % local.guimenuitem.attrib "">
+<!ENTITY % guimenuitem.role.attrib "%role.attrib;">
+
+<!ENTITY % guimenuitem.element "INCLUDE">
+<![%guimenuitem.element;[
+<!--doc:The name of a terminal menu item in a GUI.-->
+<!ELEMENT guimenuitem %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guimenuitem.element-->]]>
+
+<!ENTITY % guimenuitem.attlist "INCLUDE">
+<![%guimenuitem.attlist;[
+<!ATTLIST guimenuitem
+		%moreinfo.attrib;
+		%common.attrib;
+		%guimenuitem.role.attrib;
+		%local.guimenuitem.attrib;
+>
+<!--end of guimenuitem.attlist-->]]>
+<!--end of guimenuitem.module-->]]>
+
+<!ENTITY % guisubmenu.module "INCLUDE">
+<![%guisubmenu.module;[
+<!ENTITY % local.guisubmenu.attrib "">
+<!ENTITY % guisubmenu.role.attrib "%role.attrib;">
+
+<!ENTITY % guisubmenu.element "INCLUDE">
+<![%guisubmenu.element;[
+<!--doc:The name of a submenu in a GUI.-->
+<!ELEMENT guisubmenu %ho; (%smallcptr.char.mix;|accel|superscript|subscript)*>
+<!--end of guisubmenu.element-->]]>
+
+<!ENTITY % guisubmenu.attlist "INCLUDE">
+<![%guisubmenu.attlist;[
+<!ATTLIST guisubmenu
+		%moreinfo.attrib;
+		%common.attrib;
+		%guisubmenu.role.attrib;
+		%local.guisubmenu.attrib;
+>
+<!--end of guisubmenu.attlist-->]]>
+<!--end of guisubmenu.module-->]]>
+
+<!ENTITY % hardware.module "INCLUDE">
+<![%hardware.module;[
+<!ENTITY % local.hardware.attrib "">
+<!ENTITY % hardware.role.attrib "%role.attrib;">
+
+<!ENTITY % hardware.element "INCLUDE">
+<![%hardware.element;[
+<!--doc:A physical part of a computer system.-->
+<!ELEMENT hardware %ho; (%cptr.char.mix;)*>
+<!--end of hardware.element-->]]>
+
+<!ENTITY % hardware.attlist "INCLUDE">
+<![%hardware.attlist;[
+<!ATTLIST hardware
+		%moreinfo.attrib;
+		%common.attrib;
+		%hardware.role.attrib;
+		%local.hardware.attrib;
+>
+<!--end of hardware.attlist-->]]>
+<!--end of hardware.module-->]]>
+
+<!ENTITY % interface.module "INCLUDE">
+<![%interface.module;[
+<!ENTITY % local.interface.attrib "">
+<!ENTITY % interface.role.attrib "%role.attrib;">
+
+<!ENTITY % interface.element "INCLUDE">
+<![%interface.element;[
+<!--doc:An element of a GUI.-->
+<!ELEMENT interface %ho; (%smallcptr.char.mix;|accel)*>
+<!--end of interface.element-->]]>
+
+<!-- Class: Type of the Interface item; no default -->
+
+
+<!ENTITY % interface.attlist "INCLUDE">
+<![%interface.attlist;[
+<!ATTLIST interface
+		%moreinfo.attrib;
+		%common.attrib;
+		%interface.role.attrib;
+		%local.interface.attrib;
+>
+<!--end of interface.attlist-->]]>
+<!--end of interface.module-->]]>
+
+<!ENTITY % keycap.module "INCLUDE">
+<![%keycap.module;[
+<!ENTITY % local.keycap.attrib "">
+<!ENTITY % keycap.role.attrib "%role.attrib;">
+
+<!ENTITY % keycap.element "INCLUDE">
+<![%keycap.element;[
+<!--doc:The text printed on a key on a keyboard.-->
+<!ELEMENT keycap %ho; (%cptr.char.mix;)*>
+<!--end of keycap.element-->]]>
+
+<!ENTITY % keycap.attlist "INCLUDE">
+<![%keycap.attlist;[
+<!ATTLIST keycap
+		function	(alt
+				|control
+				|shift
+				|meta
+				|escape
+				|enter
+				|tab
+				|backspace
+				|command
+				|option
+				|space
+				|delete
+				|insert
+				|up
+				|down
+				|left
+				|right
+				|home
+				|end
+				|pageup
+				|pagedown
+				|other)		#IMPLIED
+		otherfunction	CDATA		#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%keycap.role.attrib;
+		%local.keycap.attrib;
+>
+<!--end of keycap.attlist-->]]>
+<!--end of keycap.module-->]]>
+
+<!ENTITY % keycode.module "INCLUDE">
+<![%keycode.module;[
+<!ENTITY % local.keycode.attrib "">
+<!ENTITY % keycode.role.attrib "%role.attrib;">
+
+<!ENTITY % keycode.element "INCLUDE">
+<![%keycode.element;[
+<!--doc:The internal, frequently numeric, identifier for a key on a keyboard.-->
+<!ELEMENT keycode %ho; (%smallcptr.char.mix;)*>
+<!--end of keycode.element-->]]>
+
+<!ENTITY % keycode.attlist "INCLUDE">
+<![%keycode.attlist;[
+<!ATTLIST keycode
+		%common.attrib;
+		%keycode.role.attrib;
+		%local.keycode.attrib;
+>
+<!--end of keycode.attlist-->]]>
+<!--end of keycode.module-->]]>
+
+<!ENTITY % keycombo.module "INCLUDE">
+<![%keycombo.module;[
+<!ENTITY % local.keycombo.attrib "">
+<!ENTITY % keycombo.role.attrib "%role.attrib;">
+
+<!ENTITY % keycombo.element "INCLUDE">
+<![%keycombo.element;[
+<!--doc:A combination of input actions.-->
+<!ELEMENT keycombo %ho; ((keycap|keycombo|keysym|mousebutton)+)>
+<!--end of keycombo.element-->]]>
+
+<!ENTITY % keycombo.attlist "INCLUDE">
+<![%keycombo.attlist;[
+<!ATTLIST keycombo
+		%keyaction.attrib;
+		%moreinfo.attrib;
+		%common.attrib;
+		%keycombo.role.attrib;
+		%local.keycombo.attrib;
+>
+<!--end of keycombo.attlist-->]]>
+<!--end of keycombo.module-->]]>
+
+<!ENTITY % keysym.module "INCLUDE">
+<![%keysym.module;[
+<!ENTITY % local.keysym.attrib "">
+<!ENTITY % keysysm.role.attrib "%role.attrib;">
+
+<!ENTITY % keysym.element "INCLUDE">
+<![%keysym.element;[
+<!--doc:The symbolic name of a key on a keyboard.-->
+<!ELEMENT keysym %ho; (%smallcptr.char.mix;)*>
+<!--end of keysym.element-->]]>
+
+<!ENTITY % keysym.attlist "INCLUDE">
+<![%keysym.attlist;[
+<!ATTLIST keysym
+		%common.attrib;
+		%keysysm.role.attrib;
+		%local.keysym.attrib;
+>
+<!--end of keysym.attlist-->]]>
+<!--end of keysym.module-->]]>
+
+<!ENTITY % lineannotation.module "INCLUDE">
+<![%lineannotation.module;[
+<!ENTITY % local.lineannotation.attrib "">
+<!ENTITY % lineannotation.role.attrib "%role.attrib;">
+
+<!ENTITY % lineannotation.element "INCLUDE">
+<![%lineannotation.element;[
+<!--doc:A comment on a line in a verbatim listing.-->
+<!ELEMENT lineannotation %ho; (%para.char.mix;)*>
+<!--end of lineannotation.element-->]]>
+
+<!ENTITY % lineannotation.attlist "INCLUDE">
+<![%lineannotation.attlist;[
+<!ATTLIST lineannotation
+		%common.attrib;
+		%lineannotation.role.attrib;
+		%local.lineannotation.attrib;
+>
+<!--end of lineannotation.attlist-->]]>
+<!--end of lineannotation.module-->]]>
+
+<!ENTITY % literal.module "INCLUDE">
+<![%literal.module;[
+<!ENTITY % local.literal.attrib "">
+<!ENTITY % literal.role.attrib "%role.attrib;">
+
+<!ENTITY % literal.element "INCLUDE">
+<![%literal.element;[
+<!--doc:Inline text that is some literal value.-->
+<!ELEMENT literal %ho; (%cptr.char.mix;)*>
+<!--end of literal.element-->]]>
+
+<!ENTITY % literal.attlist "INCLUDE">
+<![%literal.attlist;[
+<!ATTLIST literal
+		%moreinfo.attrib;
+		%common.attrib;
+		%literal.role.attrib;
+		%local.literal.attrib;
+>
+<!--end of literal.attlist-->]]>
+<!--end of literal.module-->]]>
+
+<!ENTITY % code.module "INCLUDE">
+<![%code.module;[
+<!ENTITY % local.code.attrib "">
+<!ENTITY % code.role.attrib "%role.attrib;">
+
+<!ENTITY % code.element "INCLUDE">
+<![%code.element;[
+<!--doc:An inline code fragment.-->
+<!ELEMENT code %ho; (%cptr.char.mix;)*>
+<!--end of code.element-->]]>
+
+<!ENTITY % code.attlist "INCLUDE">
+<![%code.attlist;[
+<!ATTLIST code
+		language	CDATA	#IMPLIED
+		%common.attrib;
+		%code.role.attrib;
+		%local.code.attrib;
+>
+<!--end of code.attlist-->]]>
+<!--end of code.module-->]]>
+
+<!ENTITY % constant.module "INCLUDE">
+<![ %constant.module; [
+<!ENTITY % local.constant.attrib "">
+<!ENTITY % constant.role.attrib "%role.attrib;">
+
+<!ENTITY % constant.element "INCLUDE">
+<![ %constant.element; [
+<!--doc:A programming or system constant.-->
+<!ELEMENT constant %ho; (%smallcptr.char.mix;)*>
+<!--end of constant.element-->]]>
+
+<!ENTITY % constant.attlist "INCLUDE">
+<![ %constant.attlist; [
+<!ATTLIST constant
+		class	(limit)		#IMPLIED
+		%common.attrib;
+		%constant.role.attrib;
+		%local.constant.attrib;
+>
+<!--end of constant.attlist-->]]>
+<!--end of constant.module-->]]>
+
+<!ENTITY % varname.module "INCLUDE">
+<![ %varname.module; [
+<!ENTITY % local.varname.attrib "">
+<!ENTITY % varname.role.attrib "%role.attrib;">
+
+<!ENTITY % varname.element "INCLUDE">
+<![ %varname.element; [
+<!--doc:The name of a variable.-->
+<!ELEMENT varname %ho; (%smallcptr.char.mix;)*>
+<!--end of varname.element-->]]>
+
+<!ENTITY % varname.attlist "INCLUDE">
+<![ %varname.attlist; [
+<!ATTLIST varname
+		%common.attrib;
+		%varname.role.attrib;
+		%local.varname.attrib;
+>
+<!--end of varname.attlist-->]]>
+<!--end of varname.module-->]]>
+
+<!ENTITY % markup.module "INCLUDE">
+<![%markup.module;[
+<!ENTITY % local.markup.attrib "">
+<!ENTITY % markup.role.attrib "%role.attrib;">
+
+<!ENTITY % markup.element "INCLUDE">
+<![%markup.element;[
+<!--doc:A string of formatting markup in text that is to be represented literally.-->
+<!ELEMENT markup %ho; (%smallcptr.char.mix;)*>
+<!--end of markup.element-->]]>
+
+<!ENTITY % markup.attlist "INCLUDE">
+<![%markup.attlist;[
+<!ATTLIST markup
+		%common.attrib;
+		%markup.role.attrib;
+		%local.markup.attrib;
+>
+<!--end of markup.attlist-->]]>
+<!--end of markup.module-->]]>
+
+<!ENTITY % medialabel.module "INCLUDE">
+<![%medialabel.module;[
+<!ENTITY % local.medialabel.attrib "">
+<!ENTITY % medialabel.role.attrib "%role.attrib;">
+
+<!ENTITY % medialabel.element "INCLUDE">
+<![%medialabel.element;[
+<!--doc:A name that identifies the physical medium on which some information resides.-->
+<!ELEMENT medialabel %ho; (%smallcptr.char.mix;)*>
+<!--end of medialabel.element-->]]>
+
+<!-- Class: Type of medium named by the element; no default -->
+
+
+<!ENTITY % medialabel.attlist "INCLUDE">
+<![%medialabel.attlist;[
+<!ATTLIST medialabel
+		class 		(cartridge
+				|cdrom
+				|disk
+				|tape)		#IMPLIED
+		%common.attrib;
+		%medialabel.role.attrib;
+		%local.medialabel.attrib;
+>
+<!--end of medialabel.attlist-->]]>
+<!--end of medialabel.module-->]]>
+
+<!ENTITY % menuchoice.content.module "INCLUDE">
+<![%menuchoice.content.module;[
+<!ENTITY % menuchoice.module "INCLUDE">
+<![%menuchoice.module;[
+<!ENTITY % local.menuchoice.attrib "">
+<!ENTITY % menuchoice.role.attrib "%role.attrib;">
+
+<!ENTITY % menuchoice.element "INCLUDE">
+<![%menuchoice.element;[
+<!--doc:A selection or series of selections from a menu.-->
+<!ELEMENT menuchoice %ho; (shortcut?, (guibutton|guiicon|guilabel
+		|guimenu|guimenuitem|guisubmenu|interface)+)>
+<!--end of menuchoice.element-->]]>
+
+<!ENTITY % menuchoice.attlist "INCLUDE">
+<![%menuchoice.attlist;[
+<!ATTLIST menuchoice
+		%moreinfo.attrib;
+		%common.attrib;
+		%menuchoice.role.attrib;
+		%local.menuchoice.attrib;
+>
+<!--end of menuchoice.attlist-->]]>
+<!--end of menuchoice.module-->]]>
+
+<!ENTITY % shortcut.module "INCLUDE">
+<![%shortcut.module;[
+<!-- See also KeyCombo -->
+<!ENTITY % local.shortcut.attrib "">
+<!ENTITY % shortcut.role.attrib "%role.attrib;">
+
+<!ENTITY % shortcut.element "INCLUDE">
+<![%shortcut.element;[
+<!--doc:A key combination for an action that is also accessible through a menu.-->
+<!ELEMENT shortcut %ho; ((keycap|keycombo|keysym|mousebutton)+)>
+<!--end of shortcut.element-->]]>
+
+<!ENTITY % shortcut.attlist "INCLUDE">
+<![%shortcut.attlist;[
+<!ATTLIST shortcut
+		%keyaction.attrib;
+		%moreinfo.attrib;
+		%common.attrib;
+		%shortcut.role.attrib;
+		%local.shortcut.attrib;
+>
+<!--end of shortcut.attlist-->]]>
+<!--end of shortcut.module-->]]>
+<!--end of menuchoice.content.module-->]]>
+
+<!ENTITY % mousebutton.module "INCLUDE">
+<![%mousebutton.module;[
+<!ENTITY % local.mousebutton.attrib "">
+<!ENTITY % mousebutton.role.attrib "%role.attrib;">
+
+<!ENTITY % mousebutton.element "INCLUDE">
+<![%mousebutton.element;[
+<!--doc:The conventional name of a mouse button.-->
+<!ELEMENT mousebutton %ho; (%smallcptr.char.mix;)*>
+<!--end of mousebutton.element-->]]>
+
+<!ENTITY % mousebutton.attlist "INCLUDE">
+<![%mousebutton.attlist;[
+<!ATTLIST mousebutton
+		%moreinfo.attrib;
+		%common.attrib;
+		%mousebutton.role.attrib;
+		%local.mousebutton.attrib;
+>
+<!--end of mousebutton.attlist-->]]>
+<!--end of mousebutton.module-->]]>
+
+<!ENTITY % msgtext.module "INCLUDE">
+<![%msgtext.module;[
+<!ENTITY % local.msgtext.attrib "">
+<!ENTITY % msgtext.role.attrib "%role.attrib;">
+
+<!ENTITY % msgtext.element "INCLUDE">
+<![%msgtext.element;[
+<!--doc:The actual text of a message component in a message set.-->
+<!ELEMENT msgtext %ho; ((%component.mix;)+)>
+<!--end of msgtext.element-->]]>
+
+<!ENTITY % msgtext.attlist "INCLUDE">
+<![%msgtext.attlist;[
+<!ATTLIST msgtext
+		%common.attrib;
+		%msgtext.role.attrib;
+		%local.msgtext.attrib;
+>
+<!--end of msgtext.attlist-->]]>
+<!--end of msgtext.module-->]]>
+
+<!ENTITY % option.module "INCLUDE">
+<![%option.module;[
+<!ENTITY % local.option.attrib "">
+<!ENTITY % option.role.attrib "%role.attrib;">
+
+<!ENTITY % option.element "INCLUDE">
+<![%option.element;[
+<!--doc:An option for a software command.-->
+<!ELEMENT option %ho; (%cptr.char.mix;)*>
+<!--end of option.element-->]]>
+
+<!ENTITY % option.attlist "INCLUDE">
+<![%option.attlist;[
+<!ATTLIST option
+		%common.attrib;
+		%option.role.attrib;
+		%local.option.attrib;
+>
+<!--end of option.attlist-->]]>
+<!--end of option.module-->]]>
+
+<!ENTITY % optional.module "INCLUDE">
+<![%optional.module;[
+<!ENTITY % local.optional.attrib "">
+<!ENTITY % optional.role.attrib "%role.attrib;">
+
+<!ENTITY % optional.element "INCLUDE">
+<![%optional.element;[
+<!--doc:Optional information.-->
+<!ELEMENT optional %ho; (%cptr.char.mix;)*>
+<!--end of optional.element-->]]>
+
+<!ENTITY % optional.attlist "INCLUDE">
+<![%optional.attlist;[
+<!ATTLIST optional
+		%common.attrib;
+		%optional.role.attrib;
+		%local.optional.attrib;
+>
+<!--end of optional.attlist-->]]>
+<!--end of optional.module-->]]>
+
+<!ENTITY % parameter.module "INCLUDE">
+<![%parameter.module;[
+<!ENTITY % local.parameter.attrib "">
+<!ENTITY % parameter.role.attrib "%role.attrib;">
+
+<!ENTITY % parameter.element "INCLUDE">
+<![%parameter.element;[
+<!--doc:A value or a symbolic reference to a value.-->
+<!ELEMENT parameter %ho; (%cptr.char.mix;)*>
+<!--end of parameter.element-->]]>
+
+<!-- Class: Type of the Parameter; no default -->
+
+
+<!ENTITY % parameter.attlist "INCLUDE">
+<![%parameter.attlist;[
+<!ATTLIST parameter
+		class 		(command
+				|function
+				|option)	#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%parameter.role.attrib;
+		%local.parameter.attrib;
+>
+<!--end of parameter.attlist-->]]>
+<!--end of parameter.module-->]]>
+
+<!ENTITY % prompt.module "INCLUDE">
+<![%prompt.module;[
+<!ENTITY % local.prompt.attrib "">
+<!ENTITY % prompt.role.attrib "%role.attrib;">
+
+<!ENTITY % prompt.element "INCLUDE">
+<![%prompt.element;[
+<!--doc:A character or string indicating the start of an input field in a  computer display.-->
+<!ELEMENT prompt %ho; (%smallcptr.char.mix;|co)*>
+<!--end of prompt.element-->]]>
+
+<!ENTITY % prompt.attlist "INCLUDE">
+<![%prompt.attlist;[
+<!ATTLIST prompt
+		%moreinfo.attrib;
+		%common.attrib;
+		%prompt.role.attrib;
+		%local.prompt.attrib;
+>
+<!--end of prompt.attlist-->]]>
+<!--end of prompt.module-->]]>
+
+<!ENTITY % property.module "INCLUDE">
+<![%property.module;[
+<!ENTITY % local.property.attrib "">
+<!ENTITY % property.role.attrib "%role.attrib;">
+
+<!ENTITY % property.element "INCLUDE">
+<![%property.element;[
+<!--doc:A unit of data associated with some part of a computer system.-->
+<!ELEMENT property %ho; (%cptr.char.mix;)*>
+<!--end of property.element-->]]>
+
+<!ENTITY % property.attlist "INCLUDE">
+<![%property.attlist;[
+<!ATTLIST property
+		%moreinfo.attrib;
+		%common.attrib;
+		%property.role.attrib;
+		%local.property.attrib;
+>
+<!--end of property.attlist-->]]>
+<!--end of property.module-->]]>
+
+<!ENTITY % replaceable.module "INCLUDE">
+<![%replaceable.module;[
+<!ENTITY % local.replaceable.attrib "">
+<!ENTITY % replaceable.role.attrib "%role.attrib;">
+
+<!ENTITY % replaceable.element "INCLUDE">
+<![%replaceable.element;[
+<!--doc:Content that may or must be replaced by the user.-->
+<!ELEMENT replaceable %ho; (#PCDATA
+		| %link.char.class;
+		| optional
+		| %base.char.class;
+		| %other.char.class;
+		| inlinegraphic
+                | inlinemediaobject
+		| co)*>
+<!--end of replaceable.element-->]]>
+
+<!-- Class: Type of information the element represents; no
+		default -->
+
+
+<!ENTITY % replaceable.attlist "INCLUDE">
+<![%replaceable.attlist;[
+<!ATTLIST replaceable
+		class		(command
+				|function
+				|option
+				|parameter)	#IMPLIED
+		%common.attrib;
+		%replaceable.role.attrib;
+		%local.replaceable.attrib;
+>
+<!--end of replaceable.attlist-->]]>
+<!--end of replaceable.module-->]]>
+
+<!ENTITY % returnvalue.module "INCLUDE">
+<![%returnvalue.module;[
+<!ENTITY % local.returnvalue.attrib "">
+<!ENTITY % returnvalue.role.attrib "%role.attrib;">
+
+<!ENTITY % returnvalue.element "INCLUDE">
+<![%returnvalue.element;[
+<!--doc:The value returned by a function.-->
+<!ELEMENT returnvalue %ho; (%smallcptr.char.mix;)*>
+<!--end of returnvalue.element-->]]>
+
+<!ENTITY % returnvalue.attlist "INCLUDE">
+<![%returnvalue.attlist;[
+<!ATTLIST returnvalue
+		%common.attrib;
+		%returnvalue.role.attrib;
+		%local.returnvalue.attrib;
+>
+<!--end of returnvalue.attlist-->]]>
+<!--end of returnvalue.module-->]]>
+
+<!ENTITY % sgmltag.module "INCLUDE">
+<![%sgmltag.module;[
+<!ENTITY % local.sgmltag.attrib "">
+<!ENTITY % sgmltag.role.attrib "%role.attrib;">
+
+<!ENTITY % sgmltag.element "INCLUDE">
+<![%sgmltag.element;[
+<!--doc:A component of SGML markup.-->
+<!ELEMENT sgmltag %ho; (%smallcptr.char.mix;)*>
+<!--end of sgmltag.element-->]]>
+
+<!-- Class: Type of SGML construct the element names; no default -->
+
+
+<!ENTITY % sgmltag.attlist "INCLUDE">
+<![%sgmltag.attlist;[
+<!ATTLIST sgmltag
+		class 		(attribute
+				|attvalue
+				|element
+				|endtag
+                                |emptytag
+				|genentity
+				|numcharref
+				|paramentity
+				|pi
+                                |xmlpi
+				|starttag
+				|sgmlcomment
+                                |prefix
+                                |namespace
+                                |localname)	#IMPLIED
+		namespace	CDATA		#IMPLIED
+		%common.attrib;
+		%sgmltag.role.attrib;
+		%local.sgmltag.attrib;
+>
+<!--end of sgmltag.attlist-->]]>
+<!--end of sgmltag.module-->]]>
+
+<!ENTITY % structfield.module "INCLUDE">
+<![%structfield.module;[
+<!ENTITY % local.structfield.attrib "">
+<!ENTITY % structfield.role.attrib "%role.attrib;">
+
+<!ENTITY % structfield.element "INCLUDE">
+<![%structfield.element;[
+<!--doc:A field in a structure (in the programming language sense).-->
+<!ELEMENT structfield %ho; (%smallcptr.char.mix;)*>
+<!--end of structfield.element-->]]>
+
+<!ENTITY % structfield.attlist "INCLUDE">
+<![%structfield.attlist;[
+<!ATTLIST structfield
+		%common.attrib;
+		%structfield.role.attrib;
+		%local.structfield.attrib;
+>
+<!--end of structfield.attlist-->]]>
+<!--end of structfield.module-->]]>
+
+<!ENTITY % structname.module "INCLUDE">
+<![%structname.module;[
+<!ENTITY % local.structname.attrib "">
+<!ENTITY % structname.role.attrib "%role.attrib;">
+
+<!ENTITY % structname.element "INCLUDE">
+<![%structname.element;[
+<!--doc:The name of a structure (in the programming language sense).-->
+<!ELEMENT structname %ho; (%smallcptr.char.mix;)*>
+<!--end of structname.element-->]]>
+
+<!ENTITY % structname.attlist "INCLUDE">
+<![%structname.attlist;[
+<!ATTLIST structname
+		%common.attrib;
+		%structname.role.attrib;
+		%local.structname.attrib;
+>
+<!--end of structname.attlist-->]]>
+<!--end of structname.module-->]]>
+
+<!ENTITY % symbol.module "INCLUDE">
+<![%symbol.module;[
+<!ENTITY % local.symbol.attrib "">
+<!ENTITY % symbol.role.attrib "%role.attrib;">
+
+<!ENTITY % symbol.element "INCLUDE">
+<![%symbol.element;[
+<!--doc:A name that is replaced by a value before processing.-->
+<!ELEMENT symbol %ho; (%smallcptr.char.mix;)*>
+<!--end of symbol.element-->]]>
+
+<!-- Class: Type of symbol; no default -->
+
+
+<!ENTITY % symbol.attlist "INCLUDE">
+<![%symbol.attlist;[
+<!ATTLIST symbol
+		class		(limit)		#IMPLIED
+		%common.attrib;
+		%symbol.role.attrib;
+		%local.symbol.attrib;
+>
+<!--end of symbol.attlist-->]]>
+<!--end of symbol.module-->]]>
+
+<!ENTITY % systemitem.module "INCLUDE">
+<![%systemitem.module;[
+<!ENTITY % local.systemitem.attrib "">
+<!ENTITY % systemitem.role.attrib "%role.attrib;">
+
+<!ENTITY % systemitem.element "INCLUDE">
+<![%systemitem.element;[
+<!--doc:A system-related item or term.-->
+<!ELEMENT systemitem %ho; (%cptr.char.mix; | acronym | co)*>
+<!--end of systemitem.element-->]]>
+
+<!-- Class: Type of system item the element names; no default -->
+
+<!ENTITY % systemitem.attlist "INCLUDE">
+<![%systemitem.attlist;[
+<!ATTLIST systemitem
+		class	(constant
+                        |daemon
+			|domainname
+			|etheraddress
+			|event
+			|eventhandler
+			|filesystem
+			|fqdomainname
+			|groupname
+			|ipaddress
+			|library
+			|macro
+			|netmask
+			|newsgroup
+			|osname
+                        |protocol
+			|resource
+			|systemname
+			|username
+                        |process
+                        |server
+                        |service)	#IMPLIED
+		%moreinfo.attrib;
+		%common.attrib;
+		%systemitem.role.attrib;
+		%local.systemitem.attrib;
+>
+<!--end of systemitem.attlist-->]]>
+<!--end of systemitem.module-->]]>
+
+<!ENTITY % uri.module "INCLUDE">
+<![%uri.module;[
+<!ENTITY % local.uri.attrib "">
+<!ENTITY % uri.role.attrib "%role.attrib;">
+
+<!ENTITY % uri.element "INCLUDE">
+<![%uri.element;[
+<!--doc:A Uniform Resource Identifier.-->
+<!ELEMENT uri %ho; (%smallcptr.char.mix;)*>
+<!--end of uri.element-->]]>
+
+<!-- Type: Type of URI; no default -->
+
+<!ENTITY % uri.attlist "INCLUDE">
+<![%uri.attlist;[
+<!ATTLIST uri
+		type	CDATA	#IMPLIED
+		%common.attrib;
+		%uri.role.attrib;
+		%local.uri.attrib;
+>
+<!--end of uri.attlist-->]]>
+<!--end of uri.module-->]]>
+
+<!ENTITY % token.module "INCLUDE">
+<![%token.module;[
+<!ENTITY % local.token.attrib "">
+<!ENTITY % token.role.attrib "%role.attrib;">
+
+<!ENTITY % token.element "INCLUDE">
+<![%token.element;[
+<!--doc:A unit of information.-->
+<!ELEMENT token %ho; (%smallcptr.char.mix;)*>
+<!--end of token.element-->]]>
+
+<!ENTITY % token.attlist "INCLUDE">
+<![%token.attlist;[
+<!ATTLIST token
+		%common.attrib;
+		%token.role.attrib;
+		%local.token.attrib;
+>
+<!--end of token.attlist-->]]>
+<!--end of token.module-->]]>
+
+<!ENTITY % type.module "INCLUDE">
+<![%type.module;[
+<!ENTITY % local.type.attrib "">
+<!ENTITY % type.role.attrib "%role.attrib;">
+
+<!ENTITY % type.element "INCLUDE">
+<![%type.element;[
+<!--doc:The classification of a value.-->
+<!ELEMENT type %ho; (%smallcptr.char.mix;)*>
+<!--end of type.element-->]]>
+
+<!ENTITY % type.attlist "INCLUDE">
+<![%type.attlist;[
+<!ATTLIST type
+		%common.attrib;
+		%type.role.attrib;
+		%local.type.attrib;
+>
+<!--end of type.attlist-->]]>
+<!--end of type.module-->]]>
+
+<!ENTITY % userinput.module "INCLUDE">
+<![%userinput.module;[
+<!ENTITY % local.userinput.attrib "">
+<!ENTITY % userinput.role.attrib "%role.attrib;">
+
+<!ENTITY % userinput.element "INCLUDE">
+<![%userinput.element;[
+<!--doc:Data entered by the user.-->
+<!ELEMENT userinput %ho; (%cptr.char.mix;|co)*>
+<!--end of userinput.element-->]]>
+
+<!ENTITY % userinput.attlist "INCLUDE">
+<![%userinput.attlist;[
+<!ATTLIST userinput
+		%moreinfo.attrib;
+		%common.attrib;
+		%userinput.role.attrib;
+		%local.userinput.attrib;
+>
+<!--end of userinput.attlist-->]]>
+<!--end of userinput.module-->]]>
+
+<!ENTITY % termdef.module "INCLUDE">
+<![%termdef.module;[
+<!ENTITY % local.termdef.attrib "">
+<!ENTITY % termdef.role.attrib "%role.attrib;">
+
+<!ENTITY % termdef.element "INCLUDE">
+<![%termdef.element;[
+<!--doc:An inline definition of a term.-->
+<!ELEMENT termdef %ho; (%para.char.mix;)*>
+<!--end of termdef.element-->]]>
+
+<!ENTITY % termdef.attlist "INCLUDE">
+<![%termdef.attlist;[
+<!ATTLIST termdef
+		%common.attrib;
+		%termdef.role.attrib;
+		%local.termdef.attrib;
+>
+<!--end of termdef.attlist-->]]>
+<!--end of termdef.module-->]]>
+
+<!-- General words and phrases ............................................ -->
+
+<!ENTITY % abbrev.module "INCLUDE">
+<![%abbrev.module;[
+<!ENTITY % local.abbrev.attrib "">
+<!ENTITY % abbrev.role.attrib "%role.attrib;">
+
+<!ENTITY % abbrev.element "INCLUDE">
+<![%abbrev.element;[
+<!--doc:An abbreviation, especially one followed by a period.-->
+<!ELEMENT abbrev %ho; (%word.char.mix;)*>
+<!--end of abbrev.element-->]]>
+
+<!ENTITY % abbrev.attlist "INCLUDE">
+<![%abbrev.attlist;[
+<!ATTLIST abbrev
+		%common.attrib;
+		%abbrev.role.attrib;
+		%local.abbrev.attrib;
+>
+<!--end of abbrev.attlist-->]]>
+<!--end of abbrev.module-->]]>
+
+<!ENTITY % acronym.module "INCLUDE">
+<![%acronym.module;[
+<!ENTITY % local.acronym.attrib "">
+<!ENTITY % acronym.role.attrib "%role.attrib;">
+
+<!ENTITY % acronym.element "INCLUDE">
+<![%acronym.element;[
+<!--doc:An often pronounceable word made from the initial (or selected) letters of a name or phrase.-->
+<!ELEMENT acronym %ho; (%word.char.mix;)*
+		%acronym.exclusion;>
+<!--end of acronym.element-->]]>
+
+<!ENTITY % acronym.attlist "INCLUDE">
+<![%acronym.attlist;[
+<!ATTLIST acronym
+		%common.attrib;
+		%acronym.role.attrib;
+		%local.acronym.attrib;
+>
+<!--end of acronym.attlist-->]]>
+<!--end of acronym.module-->]]>
+
+<!ENTITY % citation.module "INCLUDE">
+<![%citation.module;[
+<!ENTITY % local.citation.attrib "">
+<!ENTITY % citation.role.attrib "%role.attrib;">
+
+<!ENTITY % citation.element "INCLUDE">
+<![%citation.element;[
+<!--doc:An inline bibliographic reference to another published work.-->
+<!ELEMENT citation %ho; (%para.char.mix;)*>
+<!--end of citation.element-->]]>
+
+<!ENTITY % citation.attlist "INCLUDE">
+<![%citation.attlist;[
+<!ATTLIST citation
+		%common.attrib;
+		%citation.role.attrib;
+		%local.citation.attrib;
+>
+<!--end of citation.attlist-->]]>
+<!--end of citation.module-->]]>
+
+<!ENTITY % citerefentry.module "INCLUDE">
+<![%citerefentry.module;[
+<!ENTITY % local.citerefentry.attrib "">
+<!ENTITY % citerefentry.role.attrib "%role.attrib;">
+
+<!ENTITY % citerefentry.element "INCLUDE">
+<![%citerefentry.element;[
+<!--doc:A citation to a reference page.-->
+<!ELEMENT citerefentry %ho; (refentrytitle, manvolnum?)>
+<!--end of citerefentry.element-->]]>
+
+<!ENTITY % citerefentry.attlist "INCLUDE">
+<![%citerefentry.attlist;[
+<!ATTLIST citerefentry
+		%common.attrib;
+		%citerefentry.role.attrib;
+		%local.citerefentry.attrib;
+>
+<!--end of citerefentry.attlist-->]]>
+<!--end of citerefentry.module-->]]>
+
+<!ENTITY % refentrytitle.module "INCLUDE">
+<![%refentrytitle.module;[
+<!ENTITY % local.refentrytitle.attrib "">
+<!ENTITY % refentrytitle.role.attrib "%role.attrib;">
+
+<!ENTITY % refentrytitle.element "INCLUDE">
+<![%refentrytitle.element;[
+<!--doc:The title of a reference page.-->
+<!ELEMENT refentrytitle %ho; (%para.char.mix;)*>
+<!--end of refentrytitle.element-->]]>
+
+<!ENTITY % refentrytitle.attlist "INCLUDE">
+<![%refentrytitle.attlist;[
+<!ATTLIST refentrytitle
+		%common.attrib;
+		%refentrytitle.role.attrib;
+		%local.refentrytitle.attrib;
+>
+<!--end of refentrytitle.attlist-->]]>
+<!--end of refentrytitle.module-->]]>
+
+<!ENTITY % manvolnum.module "INCLUDE">
+<![%manvolnum.module;[
+<!ENTITY % local.manvolnum.attrib "">
+<!ENTITY % namvolnum.role.attrib "%role.attrib;">
+
+<!ENTITY % manvolnum.element "INCLUDE">
+<![%manvolnum.element;[
+<!--doc:A reference volume number.-->
+<!ELEMENT manvolnum %ho; (%word.char.mix;)*>
+<!--end of manvolnum.element-->]]>
+
+<!ENTITY % manvolnum.attlist "INCLUDE">
+<![%manvolnum.attlist;[
+<!ATTLIST manvolnum
+		%common.attrib;
+		%namvolnum.role.attrib;
+		%local.manvolnum.attrib;
+>
+<!--end of manvolnum.attlist-->]]>
+<!--end of manvolnum.module-->]]>
+
+<!ENTITY % citetitle.module "INCLUDE">
+<![%citetitle.module;[
+<!ENTITY % local.citetitle.attrib "">
+<!ENTITY % citetitle.role.attrib "%role.attrib;">
+
+<!ENTITY % citetitle.element "INCLUDE">
+<![%citetitle.element;[
+<!--doc:The title of a cited work.-->
+<!ELEMENT citetitle %ho; (%para.char.mix;)*>
+<!--end of citetitle.element-->]]>
+
+<!-- Pubwork: Genre of published work cited; no default -->
+
+
+<!ENTITY % citetitle.attlist "INCLUDE">
+<![%citetitle.attlist;[
+<!ATTLIST citetitle
+		pubwork		(article
+				|book
+				|chapter
+				|part
+				|refentry
+				|section
+				|journal
+				|series
+				|set
+				|manuscript
+				|cdrom
+				|dvd
+				|wiki
+				|gopher
+				|bbs
+                                |emailmessage
+                                |webpage
+                                |newsposting)	#IMPLIED
+		%common.attrib;
+		%citetitle.role.attrib;
+		%local.citetitle.attrib;
+>
+<!--end of citetitle.attlist-->]]>
+<!--end of citetitle.module-->]]>
+
+<!ENTITY % emphasis.module "INCLUDE">
+<![%emphasis.module;[
+<!ENTITY % local.emphasis.attrib "">
+<!ENTITY % emphasis.role.attrib "%role.attrib;">
+
+<!ENTITY % emphasis.element "INCLUDE">
+<![%emphasis.element;[
+<!--doc:Emphasized text.-->
+<!ELEMENT emphasis %ho; (%para.char.mix;)*>
+<!--end of emphasis.element-->]]>
+
+<!ENTITY % emphasis.attlist "INCLUDE">
+<![%emphasis.attlist;[
+<!ATTLIST emphasis
+		%common.attrib;
+		%emphasis.role.attrib;
+		%local.emphasis.attrib;
+>
+<!--end of emphasis.attlist-->]]>
+<!--end of emphasis.module-->]]>
+
+<!ENTITY % foreignphrase.module "INCLUDE">
+<![%foreignphrase.module;[
+<!ENTITY % local.foreignphrase.attrib "">
+<!ENTITY % foreignphrase.role.attrib "%role.attrib;">
+
+<!ENTITY % foreignphrase.element "INCLUDE">
+<![%foreignphrase.element;[
+<!--doc:A word or phrase in a language other than the primary language of the document.-->
+<!ELEMENT foreignphrase %ho; (%para.char.mix;)*>
+<!--end of foreignphrase.element-->]]>
+
+<!ENTITY % foreignphrase.attlist "INCLUDE">
+<![%foreignphrase.attlist;[
+<!ATTLIST foreignphrase
+		%common.attrib;
+		%foreignphrase.role.attrib;
+		%local.foreignphrase.attrib;
+>
+<!--end of foreignphrase.attlist-->]]>
+<!--end of foreignphrase.module-->]]>
+
+<!ENTITY % glossterm.module "INCLUDE">
+<![%glossterm.module;[
+<!ENTITY % local.glossterm.attrib "">
+<!ENTITY % glossterm.role.attrib "%role.attrib;">
+
+<!ENTITY % glossterm.element "INCLUDE">
+<![%glossterm.element;[
+<!--doc:A glossary term.-->
+<!ELEMENT glossterm %ho; (%para.char.mix;)*
+		%glossterm.exclusion;>
+<!--end of glossterm.element-->]]>
+
+<!-- to GlossEntry if Glossterm used in text -->
+<!-- BaseForm: Provides the form of GlossTerm to be used
+		for indexing -->
+
+<!ENTITY % glossterm.attlist "INCLUDE">
+<![%glossterm.attlist;[
+<!ATTLIST glossterm
+		baseform	CDATA		#IMPLIED
+		%linkend.attrib;
+		%common.attrib;
+		%glossterm.role.attrib;
+		%local.glossterm.attrib;
+>
+<!--end of glossterm.attlist-->]]>
+<!--end of glossterm.module-->]]>
+
+<!ENTITY % firstterm.module "INCLUDE">
+<![%firstterm.module;[
+<!ENTITY % local.firstterm.attrib "">
+<!ENTITY % firstterm.role.attrib "%role.attrib;">
+
+<!ENTITY % firstterm.element "INCLUDE">
+<![%firstterm.element;[
+<!--doc:The first occurrence of a term.-->
+<!ELEMENT firstterm %ho; (%para.char.mix;)*
+		%glossterm.exclusion;>
+<!--end of firstterm.element-->]]>
+
+<!-- to GlossEntry or other explanation -->
+
+
+<!ENTITY % firstterm.attlist "INCLUDE">
+<![%firstterm.attlist;[
+<!ATTLIST firstterm
+		baseform	CDATA		#IMPLIED
+		%linkend.attrib;
+		%common.attrib;
+		%firstterm.role.attrib;
+		%local.firstterm.attrib;
+>
+<!--end of firstterm.attlist-->]]>
+<!--end of firstterm.module-->]]>
+
+<!ENTITY % phrase.module "INCLUDE">
+<![%phrase.module;[
+<!ENTITY % local.phrase.attrib "">
+<!ENTITY % phrase.role.attrib "%role.attrib;">
+
+<!ENTITY % phrase.element "INCLUDE">
+<![%phrase.element;[
+<!--doc:A span of text.-->
+<!ELEMENT phrase %ho; (%para.char.mix;)*>
+<!--end of phrase.element-->]]>
+
+<!ENTITY % phrase.attlist "INCLUDE">
+<![%phrase.attlist;[
+<!ATTLIST phrase
+		%common.attrib;
+		%phrase.role.attrib;
+		%local.phrase.attrib;
+>
+<!--end of phrase.attlist-->]]>
+<!--end of phrase.module-->]]>
+
+<!ENTITY % quote.module "INCLUDE">
+<![%quote.module;[
+<!ENTITY % local.quote.attrib "">
+<!ENTITY % quote.role.attrib "%role.attrib;">
+
+<!ENTITY % quote.element "INCLUDE">
+<![%quote.element;[
+<!--doc:An inline quotation.-->
+<!ELEMENT quote %ho; (%para.char.mix;)*>
+<!--end of quote.element-->]]>
+
+<!ENTITY % quote.attlist "INCLUDE">
+<![%quote.attlist;[
+<!ATTLIST quote
+		%common.attrib;
+		%quote.role.attrib;
+		%local.quote.attrib;
+>
+<!--end of quote.attlist-->]]>
+<!--end of quote.module-->]]>
+
+<!ENTITY % ssscript.module "INCLUDE">
+<![%ssscript.module;[
+<!ENTITY % local.ssscript.attrib "">
+<!ENTITY % ssscript.role.attrib "%role.attrib;">
+
+<!ENTITY % subscript.element "INCLUDE">
+<![%subscript.element;[
+<!--doc:A subscript (as in H{^2}O, the molecular formula for water).-->
+<!ELEMENT subscript %ho; (#PCDATA
+		| %link.char.class;
+		| emphasis
+		| replaceable
+		| symbol
+		| inlinegraphic
+                | inlinemediaobject
+		| %base.char.class;
+		| %other.char.class;)*
+		%ubiq.exclusion;>
+<!--end of subscript.element-->]]>
+
+<!ENTITY % subscript.attlist "INCLUDE">
+<![%subscript.attlist;[
+<!ATTLIST subscript
+		%common.attrib;
+		%ssscript.role.attrib;
+		%local.ssscript.attrib;
+>
+<!--end of subscript.attlist-->]]>
+
+<!ENTITY % superscript.element "INCLUDE">
+<![%superscript.element;[
+<!--doc:A superscript (as in x^2, the mathematical notation for x multiplied by itself).-->
+<!ELEMENT superscript %ho; (#PCDATA
+		| %link.char.class;
+		| emphasis
+		| replaceable
+		| symbol
+		| inlinegraphic
+                | inlinemediaobject
+		| %base.char.class;
+		| %other.char.class;)*
+		%ubiq.exclusion;>
+<!--end of superscript.element-->]]>
+
+<!ENTITY % superscript.attlist "INCLUDE">
+<![%superscript.attlist;[
+<!ATTLIST superscript
+		%common.attrib;
+		%ssscript.role.attrib;
+		%local.ssscript.attrib;
+>
+<!--end of superscript.attlist-->]]>
+<!--end of ssscript.module-->]]>
+
+<!ENTITY % trademark.module "INCLUDE">
+<![%trademark.module;[
+<!ENTITY % local.trademark.attrib "">
+<!ENTITY % trademark.role.attrib "%role.attrib;">
+
+<!ENTITY % trademark.element "INCLUDE">
+<![%trademark.element;[
+<!--doc:A trademark.-->
+<!ELEMENT trademark %ho; (#PCDATA
+		| %link.char.class;
+		| %tech.char.class;
+		| %base.char.class;
+		| %other.char.class;
+		| inlinegraphic
+                | inlinemediaobject
+		| emphasis)*>
+<!--end of trademark.element-->]]>
+
+<!-- Class: More precisely identifies the item the element names -->
+
+
+<!ENTITY % trademark.attlist "INCLUDE">
+<![%trademark.attlist;[
+<!ATTLIST trademark
+		class		(service
+				|trade
+				|registered
+				|copyright)	'trade'
+		%common.attrib;
+		%trademark.role.attrib;
+		%local.trademark.attrib;
+>
+<!--end of trademark.attlist-->]]>
+<!--end of trademark.module-->]]>
+
+<!ENTITY % wordasword.module "INCLUDE">
+<![%wordasword.module;[
+<!ENTITY % local.wordasword.attrib "">
+<!ENTITY % wordasword.role.attrib "%role.attrib;">
+
+<!ENTITY % wordasword.element "INCLUDE">
+<![%wordasword.element;[
+<!--doc:A word meant specifically as a word and not representing anything else.-->
+<!ELEMENT wordasword %ho; (%word.char.mix;)*>
+<!--end of wordasword.element-->]]>
+
+<!ENTITY % wordasword.attlist "INCLUDE">
+<![%wordasword.attlist;[
+<!ATTLIST wordasword
+		%common.attrib;
+		%wordasword.role.attrib;
+		%local.wordasword.attrib;
+>
+<!--end of wordasword.attlist-->]]>
+<!--end of wordasword.module-->]]>
+
+<!-- Links and cross-references ........................................... -->
+
+<!ENTITY % link.module "INCLUDE">
+<![%link.module;[
+<!ENTITY % local.link.attrib "">
+<!ENTITY % link.role.attrib "%role.attrib;">
+
+<!ENTITY % link.element "INCLUDE">
+<![%link.element;[
+<!--doc:A hypertext link.-->
+<!ELEMENT link %ho; (%para.char.mix;)*
+		%links.exclusion;>
+<!--end of link.element-->]]>
+
+<!-- Endterm: ID of element containing text that is to be
+		fetched from elsewhere in the document to appear as
+		the content of this element -->
+<!-- to linked-to object -->
+<!-- Type: Freely assignable parameter -->
+
+
+<!ENTITY % link.attlist "INCLUDE">
+<![%link.attlist;[
+<!ATTLIST link
+		endterm		IDREF		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		type		CDATA		#IMPLIED
+		%linkendreq.attrib;
+		%common.attrib;
+		%link.role.attrib;
+		%local.link.attrib;
+>
+<!--end of link.attlist-->]]>
+<!--end of link.module-->]]>
+
+<!ENTITY % olink.module "INCLUDE">
+<![%olink.module;[
+<!ENTITY % local.olink.attrib "">
+<!ENTITY % olink.role.attrib "%role.attrib;">
+
+<!ENTITY % olink.element "INCLUDE">
+<![%olink.element;[
+<!--doc:A link that addresses its target indirectly, through an entity.-->
+<!ELEMENT olink %ho; (%para.char.mix;)*
+		%links.exclusion;>
+<!--end of olink.element-->]]>
+
+<!-- TargetDocEnt: Name of an entity to be the target of the link -->
+<!-- LinkMode: ID of a ModeSpec containing instructions for
+		operating on the entity named by TargetDocEnt -->
+<!-- LocalInfo: Information that may be passed to ModeSpec -->
+<!-- Type: Freely assignable parameter -->
+
+
+<!ENTITY % olink.attlist "INCLUDE">
+<![%olink.attlist;[
+<!ATTLIST olink
+		targetdocent	ENTITY 		#IMPLIED
+		linkmode	IDREF		#IMPLIED
+		localinfo 	CDATA		#IMPLIED
+		type		CDATA		#IMPLIED
+		targetdoc	CDATA		#IMPLIED
+		targetptr	CDATA		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		%common.attrib;
+		%olink.role.attrib;
+		%local.olink.attrib;
+>
+<!--end of olink.attlist-->]]>
+<!--end of olink.module-->]]>
+
+<!ENTITY % ulink.module "INCLUDE">
+<![%ulink.module;[
+<!ENTITY % local.ulink.attrib "">
+<!ENTITY % ulink.role.attrib "%role.attrib;">
+
+<!ENTITY % ulink.element "INCLUDE">
+<![%ulink.element;[
+<!--doc:A link that addresses its target by means of a URL (Uniform Resource Locator).-->
+<!ELEMENT ulink %ho; (%para.char.mix;)*
+		%links.exclusion;>
+<!--end of ulink.element-->]]>
+
+<!-- URL: uniform resource locator; the target of the ULink -->
+<!-- Type: Freely assignable parameter -->
+
+
+<!ENTITY % ulink.attlist "INCLUDE">
+<![%ulink.attlist;[
+<!ATTLIST ulink
+		url		CDATA		#REQUIRED
+		type		CDATA		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		%common.attrib;
+		%ulink.role.attrib;
+		%local.ulink.attrib;
+>
+<!--end of ulink.attlist-->]]>
+<!--end of ulink.module-->]]>
+
+<!ENTITY % footnoteref.module "INCLUDE">
+<![%footnoteref.module;[
+<!ENTITY % local.footnoteref.attrib "">
+<!ENTITY % footnoteref.role.attrib "%role.attrib;">
+
+<!ENTITY % footnoteref.element "INCLUDE">
+<![%footnoteref.element;[
+<!--doc:A cross reference to a footnote (a footnote mark).-->
+<!ELEMENT footnoteref %ho; EMPTY>
+<!--end of footnoteref.element-->]]>
+
+<!-- to footnote content supplied elsewhere -->
+
+
+<!ENTITY % footnoteref.attlist "INCLUDE">
+<![%footnoteref.attlist;[
+<!ATTLIST footnoteref
+		%linkendreq.attrib;		%label.attrib;
+		%common.attrib;
+		%footnoteref.role.attrib;
+		%local.footnoteref.attrib;
+>
+<!--end of footnoteref.attlist-->]]>
+<!--end of footnoteref.module-->]]>
+
+<!ENTITY % xref.module "INCLUDE">
+<![%xref.module;[
+<!ENTITY % local.xref.attrib "">
+<!ENTITY % xref.role.attrib "%role.attrib;">
+
+<!ENTITY % xref.element "INCLUDE">
+<![%xref.element;[
+<!--doc:A cross reference to another part of the document.-->
+<!ELEMENT xref %ho; EMPTY>
+<!--end of xref.element-->]]>
+
+<!-- Endterm: ID of element containing text that is to be
+		fetched from elsewhere in the document to appear as
+		the content of this element -->
+<!-- to linked-to object -->
+
+
+<!ENTITY % xref.attlist "INCLUDE">
+<![%xref.attlist;[
+<!ATTLIST xref
+		endterm		IDREF		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		%common.attrib;
+		%linkendreq.attrib;
+		%xref.role.attrib;
+		%local.xref.attrib;
+>
+<!--end of xref.attlist-->]]>
+<!--end of xref.module-->]]>
+
+<!ENTITY % biblioref.module "INCLUDE">
+<![%biblioref.module;[
+<!ENTITY % local.biblioref.attrib "">
+<!ENTITY % biblioref.role.attrib "%role.attrib;">
+
+<!ENTITY % biblioref.element "INCLUDE">
+<![%biblioref.element;[
+<!--doc:A cross reference to a bibliographic entry.-->
+<!ELEMENT biblioref %ho; EMPTY>
+<!--end of biblioref.element-->]]>
+
+<!ENTITY % biblioref.attlist "INCLUDE">
+<![%biblioref.attlist;[
+<!ATTLIST biblioref
+		endterm		IDREF		#IMPLIED
+		xrefstyle	CDATA		#IMPLIED
+		units		CDATA		#IMPLIED
+		begin		CDATA		#IMPLIED
+		end		CDATA		#IMPLIED
+		%common.attrib;
+		%linkendreq.attrib;
+		%biblioref.role.attrib;
+		%local.biblioref.attrib;
+>
+<!--end of biblioref.attlist-->]]>
+<!--end of biblioref.module-->]]>
+
+<!-- Ubiquitous elements .................................................. -->
+
+<!ENTITY % anchor.module "INCLUDE">
+<![%anchor.module;[
+<!ENTITY % local.anchor.attrib "">
+<!ENTITY % anchor.role.attrib "%role.attrib;">
+
+<!ENTITY % anchor.element "INCLUDE">
+<![%anchor.element;[
+<!--doc:A spot in the document.-->
+<!ELEMENT anchor %ho; EMPTY>
+<!--end of anchor.element-->]]>
+
+<!-- required -->
+<!-- replaces Lang -->
+
+
+<!ENTITY % anchor.attlist "INCLUDE">
+<![%anchor.attlist;[
+<!ATTLIST anchor
+		%idreq.attrib;		%pagenum.attrib;		%remap.attrib;
+		%xreflabel.attrib;
+		%revisionflag.attrib;
+		%effectivity.attrib;
+		%anchor.role.attrib;
+		%local.anchor.attrib;
+>
+<!--end of anchor.attlist-->]]>
+<!--end of anchor.module-->]]>
+
+<!ENTITY % beginpage.module "INCLUDE">
+<![%beginpage.module;[
+<!ENTITY % local.beginpage.attrib "">
+<!ENTITY % beginpage.role.attrib "%role.attrib;">
+
+<!ENTITY % beginpage.element "INCLUDE">
+<![%beginpage.element;[
+<!--doc:The location of a page break in a print version of the document.-->
+<!ELEMENT beginpage %ho; EMPTY>
+<!--end of beginpage.element-->]]>
+
+<!-- PageNum: Number of page that begins at this point -->
+
+
+<!ENTITY % beginpage.attlist "INCLUDE">
+<![%beginpage.attlist;[
+<!ATTLIST beginpage
+		%pagenum.attrib;
+		%common.attrib;
+		%beginpage.role.attrib;
+		%local.beginpage.attrib;
+>
+<!--end of beginpage.attlist-->]]>
+<!--end of beginpage.module-->]]>
+
+<!-- IndexTerms appear in the text flow for generating or linking an
+     index. -->
+
+<!ENTITY % indexterm.content.module "INCLUDE">
+<![%indexterm.content.module;[
+<!ENTITY % indexterm.module "INCLUDE">
+<![%indexterm.module;[
+<!ENTITY % local.indexterm.attrib "">
+<!ENTITY % indexterm.role.attrib "%role.attrib;">
+
+<!ENTITY % indexterm.element "INCLUDE">
+<![%indexterm.element;[
+<!--doc:A wrapper for terms to be indexed.-->
+<!ELEMENT indexterm %ho; (primary?, ((secondary, ((tertiary, (see|seealso+)?)
+		| see | seealso+)?) | see | seealso+)?)
+			%ubiq.exclusion;>
+<!--end of indexterm.element-->]]>
+
+<!-- Scope: Indicates which generated indices the IndexTerm
+		should appear in: Global (whole document set), Local (this
+		document only), or All (both) -->
+<!-- Significance: Whether this IndexTerm is the most pertinent
+		of its series (Preferred) or not (Normal, the default) -->
+<!-- Class: Indicates type of IndexTerm; default is Singular,
+		or EndOfRange if StartRef is supplied; StartOfRange value
+		must be supplied explicitly on starts of ranges -->
+<!-- StartRef: ID of the IndexTerm that starts the indexing
+		range ended by this IndexTerm -->
+<!-- Zone: IDs of the elements to which the IndexTerm applies,
+		and indicates that the IndexTerm applies to those entire
+		elements rather than the point at which the IndexTerm
+		occurs -->
+
+
+<!ENTITY % indexterm.attlist "INCLUDE">
+<![%indexterm.attlist;[
+<!ATTLIST indexterm
+		%pagenum.attrib;
+		scope		(all
+				|global
+				|local)		#IMPLIED
+		significance	(preferred
+				|normal)	"normal"
+		class		(singular
+				|startofrange
+				|endofrange)	#IMPLIED
+		startref	IDREF		#IMPLIED
+		zone		IDREFS		#IMPLIED
+		type		CDATA		#IMPLIED
+		%common.attrib;
+		%indexterm.role.attrib;
+		%local.indexterm.attrib;
+>
+<!--end of indexterm.attlist-->]]>
+<!--end of indexterm.module-->]]>
+
+<!ENTITY % primsecter.module "INCLUDE">
+<![%primsecter.module;[
+<!ENTITY % local.primsecter.attrib "">
+<!ENTITY % primsecter.role.attrib "%role.attrib;">
+
+
+<!ENTITY % primary.element "INCLUDE">
+<![%primary.element;[
+<!--doc:The primary word or phrase under which an index term should be sorted.-->
+<!ELEMENT primary %ho;   (%ndxterm.char.mix;)*>
+<!--end of primary.element-->]]>
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+
+<!ENTITY % primary.attlist "INCLUDE">
+<![%primary.attlist;[
+<!ATTLIST primary
+		sortas		CDATA		#IMPLIED
+		%common.attrib;
+		%primsecter.role.attrib;
+		%local.primsecter.attrib;
+>
+<!--end of primary.attlist-->]]>
+
+
+<!ENTITY % secondary.element "INCLUDE">
+<![%secondary.element;[
+<!--doc:A secondary word or phrase in an index term.-->
+<!ELEMENT secondary %ho; (%ndxterm.char.mix;)*>
+<!--end of secondary.element-->]]>
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+
+<!ENTITY % secondary.attlist "INCLUDE">
+<![%secondary.attlist;[
+<!ATTLIST secondary
+		sortas		CDATA		#IMPLIED
+		%common.attrib;
+		%primsecter.role.attrib;
+		%local.primsecter.attrib;
+>
+<!--end of secondary.attlist-->]]>
+
+
+<!ENTITY % tertiary.element "INCLUDE">
+<![%tertiary.element;[
+<!--doc:A tertiary word or phrase in an index term.-->
+<!ELEMENT tertiary %ho;  (%ndxterm.char.mix;)*>
+<!--end of tertiary.element-->]]>
+<!-- SortAs: Alternate sort string for index sorting, e.g.,
+		"fourteen" for an element containing "14" -->
+
+<!ENTITY % tertiary.attlist "INCLUDE">
+<![%tertiary.attlist;[
+<!ATTLIST tertiary
+		sortas		CDATA		#IMPLIED
+		%common.attrib;
+		%primsecter.role.attrib;
+		%local.primsecter.attrib;
+>
+<!--end of tertiary.attlist-->]]>
+
+<!--end of primsecter.module-->]]>
+
+<!ENTITY % seeseealso.module "INCLUDE">
+<![%seeseealso.module;[
+<!ENTITY % local.seeseealso.attrib "">
+<!ENTITY % seeseealso.role.attrib "%role.attrib;">
+
+<!ENTITY % see.element "INCLUDE">
+<![%see.element;[
+<!--doc:Part of an index term directing the reader instead to another entry in the index.-->
+<!ELEMENT see %ho; (%ndxterm.char.mix;)*>
+<!--end of see.element-->]]>
+
+<!ENTITY % see.attlist "INCLUDE">
+<![%see.attlist;[
+<!ATTLIST see
+		%common.attrib;
+		%seeseealso.role.attrib;
+		%local.seeseealso.attrib;
+>
+<!--end of see.attlist-->]]>
+
+<!ENTITY % seealso.element "INCLUDE">
+<![%seealso.element;[
+<!--doc:Part of an index term directing the reader also to another entry in the index.-->
+<!ELEMENT seealso %ho; (%ndxterm.char.mix;)*>
+<!--end of seealso.element-->]]>
+
+<!ENTITY % seealso.attlist "INCLUDE">
+<![%seealso.attlist;[
+<!ATTLIST seealso
+		%common.attrib;
+		%seeseealso.role.attrib;
+		%local.seeseealso.attrib;
+>
+<!--end of seealso.attlist-->]]>
+<!--end of seeseealso.module-->]]>
+<!--end of indexterm.content.module-->]]>
+
+<!-- End of DocBook XML information pool module V4.5 ...................... -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/docbookx.dtd b/xml/tests/testData/xml/DocBookHighlighting2/docbookx.dtd
new file mode 100644
index 000000000000..8b43c59b6082
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/docbookx.dtd
@@ -0,0 +1,170 @@
+<!-- ...................................................................... -->
+<!-- DocBook XML DTD V4.5 ................................................. -->
+<!-- File docbookx.dtd .................................................... -->
+
+<!-- Copyright 1992-2006 HaL Computer Systems, Inc.,
+     O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     See also http://docbook.org/specs/
+
+     $Id: docbookx.dtd 6340 2006-10-03 13:23:24Z nwalsh $
+
+     Permission to use, copy, modify and distribute the DocBook XML DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This is the driver file for V4.5 of the DocBook DTD.
+     Please use the following formal public identifier to identify it:
+
+     "-//OASIS//DTD DocBook XML V4.5//EN"
+
+     For example, if your document's top-level element is Book, and
+     you are using DocBook directly, use the FPI in the DOCTYPE
+     declaration:
+
+     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+                    [...]>
+
+     Or, if you have a higher-level driver file that customizes DocBook,
+     use the FPI in the parameter entity declaration:
+
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+                "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+     %DocBookDTD;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!-- ...................................................................... -->
+<!-- Enable SGML features ................................................. -->
+
+<!ENTITY % sgml.features "IGNORE">
+<![%sgml.features;[
+<!ENTITY % xml.features "IGNORE">
+]]>
+<!ENTITY % xml.features "INCLUDE">
+
+<![%sgml.features;[
+<![%xml.features;[
+
+<!-- ERROR: Exactly one of xml.features and sgml.features must be turned on! -->
+<!ENTITY % dbnotn SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+<!ENTITY % dbcent SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+<!ENTITY % dbpool SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+<!ENTITY % dbhier SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+<!ENTITY % dbgenent SYSTEM "http://www.oasis-open.org/docbook/xml/configerror.txt">
+
+]]>
+]]>
+
+<![%sgml.features;[
+<!ENTITY % ho "- O">
+<!ENTITY % hh "- -">
+]]>
+
+<![%xml.features;[
+<!ENTITY % ho "">
+<!ENTITY % hh "">
+]]>
+
+<!-- ...................................................................... -->
+<!-- Notation declarations ................................................ -->
+
+<!ENTITY % dbnotn.module "INCLUDE">
+<![%dbnotn.module;[
+<!ENTITY % dbnotn PUBLIC
+"-//OASIS//ENTITIES DocBook Notations V4.5//EN"
+"dbnotnx.mod">
+%dbnotn;
+]]>
+
+<!-- ...................................................................... -->
+<!-- ISO character entity sets ............................................ -->
+
+<!ENTITY % dbcent.module "INCLUDE">
+<![%dbcent.module;[
+
+<!ENTITY % dbcent.euro "INCLUDE">
+<![%dbcent.euro;[
+<![%sgml.features;[
+<!ENTITY euro SDATA "[euro  ]"><!-- euro sign -->
+]]>
+<![%xml.features;[
+<!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
+]]>
+]]>
+
+<!ENTITY % dbcent PUBLIC
+"-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+"dbcentx.mod">
+%dbcent;
+]]>
+
+<!-- ...................................................................... -->
+<!-- DTD modules .......................................................... -->
+
+<!-- Information pool .............. -->
+
+<!ENTITY % dbpool.module "INCLUDE">
+<![ %dbpool.module; [
+<!ENTITY % dbpool PUBLIC
+"-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
+"dbpoolx.mod">
+%dbpool;
+]]>
+
+<!-- Redeclaration placeholder ..... -->
+
+<!ENTITY % intermod.redecl.module "IGNORE">
+<![%intermod.redecl.module;[
+<!-- Defining rdbmods here makes some buggy XML parsers happy. -->
+<!ENTITY % rdbmods "">
+%rdbmods;
+<!--end of intermod.redecl.module-->]]>
+
+<!-- Document hierarchy ............ -->
+
+<!ENTITY % dbhier.module "INCLUDE">
+<![ %dbhier.module; [
+<!ENTITY % dbhier PUBLIC
+"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
+"dbhierx.mod">
+%dbhier;
+]]>
+
+<!-- ...................................................................... -->
+<!-- Other general entities ............................................... -->
+
+<!ENTITY % dbgenent.module "INCLUDE">
+<![ %dbgenent.module; [
+<!ENTITY % dbgenent PUBLIC
+"-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
+"dbgenent.mod">
+%dbgenent;
+]]>
+
+<!-- End of DocBook XML DTD V4.5 .......................................... -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/htmltblx.mod b/xml/tests/testData/xml/DocBookHighlighting2/htmltblx.mod
new file mode 100644
index 000000000000..cdaefed410f2
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/htmltblx.mod
@@ -0,0 +1,245 @@
+<!-- ...................................................................... -->
+<!-- DocBook XML HTML Table Module V4.5 ................................... -->
+<!-- File htmltblx.mod .................................................... -->
+
+<!-- Copyright 2003-2006 ArborText, Inc., Norman Walsh, Sun Microsystems,
+     Inc., and the Organization for the Advancement of Structured Information
+     Standards (OASIS).
+
+     $Id: htmltblx.mod 6340 2006-10-03 13:23:24Z nwalsh $
+
+     Permission to use, copy, modify and distribute the DocBook XML DTD
+     and its accompanying documentation for any purpose and without fee
+     is hereby granted in perpetuity, provided that the above copyright
+     notice and this paragraph appear in all copies.  The copyright
+     holders make no representation about the suitability of the DTD for
+     any purpose.  It is provided "as is" without expressed or implied
+     warranty.
+
+     If you modify the DocBook XML DTD in any way, except for declaring and
+     referencing additional sets of general entities and declaring
+     additional notations, label your DTD as a variant of DocBook.  See
+     the maintenance documentation for more information.
+
+     Please direct all questions, bug reports, or suggestions for
+     changes to the docbook@lists.oasis-open.org mailing list. For more
+     information, see http://www.oasis-open.org/docbook/.
+-->
+
+<!-- ...................................................................... -->
+
+<!-- This module contains the definitions for elements that are
+     isomorphic to the HTML elements. One could argue we should
+     instead have based ourselves on the XHTML Table Module, but the
+     HTML one is more like what browsers are likely to accept today
+     and users are likely to use.
+
+     This module has been developed for use with the DocBook V4.5
+     "union table model" in which elements and attlists common to both
+     models are defined (as the union) in the CALS table module by
+     setting various parameter entities appropriately in this file.
+
+     In DTD driver files referring to this module, please use an entity
+     declaration that uses the public identifier shown below:
+
+     <!ENTITY % htmltbl PUBLIC
+     "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
+     "htmltblx.mod">
+     %htmltbl;
+
+     See the documentation for detailed information on the parameter
+     entity and module scheme used in DocBook, customizing DocBook and
+     planning for interchange, and changes made since the last release
+     of DocBook.
+-->
+
+<!--======================= XHTML Tables =======================================-->
+
+<!ENTITY % html.coreattrs
+ "%common.attrib;
+  class       CDATA          #IMPLIED
+  style       CDATA          #IMPLIED
+  title       CDATA         #IMPLIED"
+  >
+
+<!-- Does not contain lang or dir because they are in %common.attribs -->
+<![%sgml.features;[
+<!ENTITY % i18n "">
+]]>
+<!ENTITY % i18n
+ "xml:lang    NMTOKEN        #IMPLIED"
+  >
+
+<!ENTITY % events
+ "onclick     CDATA       #IMPLIED
+  ondblclick  CDATA       #IMPLIED
+  onmousedown CDATA       #IMPLIED
+  onmouseup   CDATA       #IMPLIED
+  onmouseover CDATA       #IMPLIED
+  onmousemove CDATA       #IMPLIED
+  onmouseout  CDATA       #IMPLIED
+  onkeypress  CDATA       #IMPLIED
+  onkeydown   CDATA       #IMPLIED
+  onkeyup     CDATA       #IMPLIED"
+  >
+
+<!ENTITY % attrs "%html.coreattrs; %i18n; %events;">
+
+<!ENTITY % cellhalign
+  "align      (left|center|right|justify|char) #IMPLIED
+   char       CDATA    #IMPLIED
+   charoff    CDATA       #IMPLIED"
+  >
+
+<!ENTITY % cellvalign
+  "valign     (top|middle|bottom|baseline) #IMPLIED"
+  >
+
+<!--doc:A group of columns in an HTML table.-->
+<!ELEMENT colgroup %ho; (col)*>
+<!--doc:Specifications for a column in an HTML table.-->
+<!ELEMENT col %ho; EMPTY>
+<!--doc:A row in an HTML table.-->
+<!ELEMENT tr %ho;  (th|td)+>
+<!--doc:A table header entry in an HTML table.-->
+<!ELEMENT th %ho;  (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+<!--doc:A table ntry in an HTML table.-->
+<!ELEMENT td %ho;  (%para.char.mix; | %tabentry.mix; | table | informaltable)*>
+
+<!ATTLIST colgroup
+  %attrs;
+  span        CDATA       "1"
+  width       CDATA  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST col
+  %attrs;
+  span        CDATA       "1"
+  width       CDATA  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!ATTLIST tr
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  bgcolor     CDATA        #IMPLIED
+  >
+
+<!ATTLIST th
+  %attrs;
+  abbr        CDATA         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       (row|col|rowgroup|colgroup)   #IMPLIED
+  rowspan     CDATA       "1"
+  colspan     CDATA       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     CDATA         #IMPLIED
+  width       CDATA       #IMPLIED
+  height      CDATA       #IMPLIED
+  >
+
+<!ATTLIST td
+  %attrs;
+  abbr        CDATA         #IMPLIED
+  axis        CDATA          #IMPLIED
+  headers     IDREFS         #IMPLIED
+  scope       (row|col|rowgroup|colgroup)   #IMPLIED
+  rowspan     CDATA       "1"
+  colspan     CDATA       "1"
+  %cellhalign;
+  %cellvalign;
+  nowrap      (nowrap)       #IMPLIED
+  bgcolor     CDATA         #IMPLIED
+  width       CDATA       #IMPLIED
+  height      CDATA       #IMPLIED
+  >
+
+<!-- ====================================================== -->
+<!--        Set up to read in the CALS model configured to
+            merge with the XHTML table model                -->
+<!-- ====================================================== -->
+
+<!ENTITY % tables.role.attrib "%role.attrib;">
+
+<!-- Add label and role attributes to table and informaltable -->
+<!ENTITY % bodyatt "
+		floatstyle	CDATA			#IMPLIED
+		rowheader	(firstcol|norowheader)	#IMPLIED
+                %label.attrib;"
+>
+
+<!-- Add common attributes to Table, TGroup, TBody, THead, TFoot, Row, 
+     EntryTbl, and Entry (and InformalTable element). -->
+
+<!ENTITY % secur "
+	%common.attrib;
+	class       CDATA          #IMPLIED
+	style       CDATA          #IMPLIED
+	title       CDATA         #IMPLIED
+	%i18n;
+	%events;
+	%tables.role.attrib;">
+
+<!ENTITY % common.table.attribs
+	"%bodyatt;
+	%secur;">
+
+<!-- Content model for Table (that also allows HTML tables) -->
+<!ENTITY % tbl.table.mdl
+	"((blockinfo?,
+           (%formalobject.title.content;),
+           (%ndxterm.class;)*,
+           textobject*,
+           (graphic+|mediaobject+|tgroup+))
+         |(caption, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+)))">
+
+<!ENTITY % informal.tbl.table.mdl
+	"(textobject*,
+          (graphic+|mediaobject+|tgroup+))
+         | ((col*|colgroup*), thead?, tfoot?, (tbody+|tr+))">
+
+<!-- Attributes for Table (including HTML ones) -->
+
+<!-- N.B. rules = (none | groups | rows | cols | all) but it can't be spec'd -->
+<!-- that way because 'all' already occurs in a different enumeration in -->
+<!-- CALS tables (frame). -->
+
+<!ENTITY % tbl.table.att        '
+    tabstyle    CDATA           #IMPLIED
+    tocentry    %yesorno.attvals;       #IMPLIED
+    shortentry  %yesorno.attvals;       #IMPLIED
+    orient      (port|land)     #IMPLIED
+    pgwide      %yesorno.attvals;       #IMPLIED 
+    summary     CDATA          #IMPLIED
+    width       CDATA        #IMPLIED
+    border      CDATA        #IMPLIED
+    rules       CDATA		#IMPLIED
+    cellspacing CDATA        #IMPLIED
+    cellpadding CDATA        #IMPLIED
+    align       (left|center|right)   #IMPLIED
+    bgcolor     CDATA         #IMPLIED
+'>
+
+<!ENTITY % tbl.frame.attval "void|above|below|hsides|lhs|rhs|vsides|box|border|
+top|bottom|topbot|all|sides|none">
+
+<!-- Allow either objects or inlines; beware of REs between elements. -->
+<!ENTITY % tbl.entry.mdl "%para.char.mix; | %tabentry.mix;">
+
+<!-- thead, tfoot, and tbody are defined in both table models,
+     so we set up parameter entities to define union models for them
+ -->
+
+<!ENTITY % tbl.hdft.mdl        "(tr+|(colspec*,row+))">
+<!ENTITY % tbl.tbody.mdl       "(tr+|row+)">
+<!ENTITY % tbl.valign.attval   "top|middle|bottom|baseline">
+
+<!-- End of DocBook XML HTML Table Module V4.5 ............................ -->
+<!-- ...................................................................... -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isoamsa.ent b/xml/tests/testData/xml/DocBookHighlighting2/isoamsa.ent
new file mode 100644
index 000000000000..dac3e6242a19
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isoamsa.ent
@@ -0,0 +1,97 @@
+
+<!--
+     File isoamsa.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isoamsa.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isoamsa.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isoamsa PUBLIC
+         "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isoamsa.ent"
+       >
+       %isoamsa;
+
+-->
+
+<!ENTITY cularr           "&#x021B6;" ><!--ANTICLOCKWISE TOP SEMICIRCLE ARROW -->
+<!ENTITY curarr           "&#x021B7;" ><!--CLOCKWISE TOP SEMICIRCLE ARROW -->
+<!ENTITY dArr             "&#x021D3;" ><!--DOWNWARDS DOUBLE ARROW -->
+<!ENTITY darr2            "&#x021CA;" ><!--DOWNWARDS PAIRED ARROWS -->
+<!ENTITY dharl            "&#x021C3;" ><!--DOWNWARDS HARPOON WITH BARB LEFTWARDS -->
+<!ENTITY dharr            "&#x021C2;" ><!--DOWNWARDS HARPOON WITH BARB RIGHTWARDS -->
+<!ENTITY dlarr            "&#x02199;" ><!--SOUTH WEST ARROW -->
+<!ENTITY drarr            "&#x02198;" ><!--SOUTH EAST ARROW -->
+<!ENTITY hArr             "&#x021D4;" ><!--LEFT RIGHT DOUBLE ARROW -->
+<!ENTITY harr             "&#x02194;" ><!--LEFT RIGHT ARROW -->
+<!ENTITY harrw            "&#x021AD;" ><!--LEFT RIGHT WAVE ARROW -->
+<!ENTITY lAarr            "&#x021DA;" ><!--LEFTWARDS TRIPLE ARROW -->
+<!ENTITY Larr             "&#x0219E;" ><!--LEFTWARDS TWO HEADED ARROW -->
+<!ENTITY larr2            "&#x021C7;" ><!--LEFTWARDS PAIRED ARROWS -->
+<!ENTITY larrhk           "&#x021A9;" ><!--LEFTWARDS ARROW WITH HOOK -->
+<!ENTITY larrlp           "&#x021AB;" ><!--LEFTWARDS ARROW WITH LOOP -->
+<!ENTITY larrtl           "&#x021A2;" ><!--LEFTWARDS ARROW WITH TAIL -->
+<!ENTITY lhard            "&#x021BD;" ><!--LEFTWARDS HARPOON WITH BARB DOWNWARDS -->
+<!ENTITY lharu            "&#x021BC;" ><!--LEFTWARDS HARPOON WITH BARB UPWARDS -->
+<!ENTITY lrarr2           "&#x021C6;" ><!--LEFTWARDS ARROW OVER RIGHTWARDS ARROW -->
+<!ENTITY lrhar2           "&#x021CB;" ><!--LEFTWARDS HARPOON OVER RIGHTWARDS HARPOON -->
+<!ENTITY lsh              "&#x021B0;" ><!--UPWARDS ARROW WITH TIP LEFTWARDS -->
+<!ENTITY map              "&#x021A6;" ><!--RIGHTWARDS ARROW FROM BAR -->
+<!ENTITY mumap            "&#x022B8;" ><!--MULTIMAP -->
+<!ENTITY nearr            "&#x02197;" ><!--NORTH EAST ARROW -->
+<!ENTITY nhArr            "&#x021CE;" ><!--LEFT RIGHT DOUBLE ARROW WITH STROKE -->
+<!ENTITY nharr            "&#x021AE;" ><!--LEFT RIGHT ARROW WITH STROKE -->
+<!ENTITY nlArr            "&#x021CD;" ><!--LEFTWARDS DOUBLE ARROW WITH STROKE -->
+<!ENTITY nlarr            "&#x0219A;" ><!--LEFTWARDS ARROW WITH STROKE -->
+<!ENTITY nrArr            "&#x021CF;" ><!--RIGHTWARDS DOUBLE ARROW WITH STROKE -->
+<!ENTITY nrarr            "&#x0219B;" ><!--RIGHTWARDS ARROW WITH STROKE -->
+<!ENTITY nwarr            "&#x02196;" ><!--NORTH WEST ARROW -->
+<!ENTITY olarr            "&#x021BA;" ><!--ANTICLOCKWISE OPEN CIRCLE ARROW -->
+<!ENTITY orarr            "&#x021BB;" ><!--CLOCKWISE OPEN CIRCLE ARROW -->
+<!ENTITY rAarr            "&#x021DB;" ><!--RIGHTWARDS TRIPLE ARROW -->
+<!ENTITY Rarr             "&#x021A0;" ><!--RIGHTWARDS TWO HEADED ARROW -->
+<!ENTITY rarr2            "&#x021C9;" ><!--RIGHTWARDS PAIRED ARROWS -->
+<!ENTITY rarrhk           "&#x021AA;" ><!--RIGHTWARDS ARROW WITH HOOK -->
+<!ENTITY rarrlp           "&#x021AC;" ><!--RIGHTWARDS ARROW WITH LOOP -->
+<!ENTITY rarrtl           "&#x021A3;" ><!--RIGHTWARDS ARROW WITH TAIL -->
+<!ENTITY rarrw            "&#x0219D;" ><!--RIGHTWARDS WAVE ARROW -->
+<!ENTITY rhard            "&#x021C1;" ><!--RIGHTWARDS HARPOON WITH BARB DOWNWARDS -->
+<!ENTITY rharu            "&#x021C0;" ><!--RIGHTWARDS HARPOON WITH BARB UPWARDS -->
+<!ENTITY rlarr2           "&#x021C4;" ><!--RIGHTWARDS ARROW OVER LEFTWARDS ARROW -->
+<!ENTITY rlhar2           "&#x021CC;" ><!--RIGHTWARDS HARPOON OVER LEFTWARDS HARPOON -->
+<!ENTITY rsh              "&#x021B1;" ><!--UPWARDS ARROW WITH TIP RIGHTWARDS -->
+<!ENTITY uArr             "&#x021D1;" ><!--UPWARDS DOUBLE ARROW -->
+<!ENTITY uarr2            "&#x021C8;" ><!--UPWARDS PAIRED ARROWS -->
+<!ENTITY uharl            "&#x021BF;" ><!--UPWARDS HARPOON WITH BARB LEFTWARDS -->
+<!ENTITY uharr            "&#x021BE;" ><!--UPWARDS HARPOON WITH BARB RIGHTWARDS -->
+<!ENTITY vArr             "&#x021D5;" ><!--UP DOWN DOUBLE ARROW -->
+<!ENTITY varr             "&#x02195;" ><!--UP DOWN ARROW -->
+<!ENTITY xhArr            "&#x027FA;" ><!--LONG LEFT RIGHT DOUBLE ARROW -->
+<!ENTITY xharr            "&#x027F7;" ><!--LONG LEFT RIGHT ARROW -->
+<!ENTITY xlArr            "&#x027F8;" ><!--LONG LEFTWARDS DOUBLE ARROW -->
+<!ENTITY xrArr            "&#x027F9;" ><!--LONG RIGHTWARDS DOUBLE ARROW -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isoamsb.ent b/xml/tests/testData/xml/DocBookHighlighting2/isoamsb.ent
new file mode 100644
index 000000000000..4065b66c4473
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isoamsb.ent
@@ -0,0 +1,83 @@
+
+<!--
+     File isoamsb.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isoamsb.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isoamsb.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isoamsb PUBLIC
+         "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isoamsb.ent"
+       >
+       %isoamsb;
+
+-->
+
+<!ENTITY amalg            "&#x02A3F;" ><!--AMALGAMATION OR COPRODUCT -->
+<!ENTITY Barwed           "&#x02306;" ><!--PERSPECTIVE -->
+<!ENTITY barwed           "&#x02305;" ><!--PROJECTIVE -->
+<!ENTITY Cap              "&#x022D2;" ><!--DOUBLE INTERSECTION -->
+<!ENTITY coprod           "&#x02210;" ><!--N-ARY COPRODUCT -->
+<!ENTITY Cup              "&#x022D3;" ><!--DOUBLE UNION -->
+<!ENTITY cuvee            "&#x022CE;" ><!--CURLY LOGICAL OR -->
+<!ENTITY cuwed            "&#x022CF;" ><!--CURLY LOGICAL AND -->
+<!ENTITY diam             "&#x022C4;" ><!--DIAMOND OPERATOR -->
+<!ENTITY divonx           "&#x022C7;" ><!--DIVISION TIMES -->
+<!ENTITY intcal           "&#x022BA;" ><!--INTERCALATE -->
+<!ENTITY lthree           "&#x022CB;" ><!--LEFT SEMIDIRECT PRODUCT -->
+<!ENTITY ltimes           "&#x022C9;" ><!--LEFT NORMAL FACTOR SEMIDIRECT PRODUCT -->
+<!ENTITY minusb           "&#x0229F;" ><!--SQUARED MINUS -->
+<!ENTITY oast             "&#x0229B;" ><!--CIRCLED ASTERISK OPERATOR -->
+<!ENTITY ocir             "&#x0229A;" ><!--CIRCLED RING OPERATOR -->
+<!ENTITY odash            "&#x0229D;" ><!--CIRCLED DASH -->
+<!ENTITY odot             "&#x02299;" ><!--CIRCLED DOT OPERATOR -->
+<!ENTITY ominus           "&#x02296;" ><!--CIRCLED MINUS -->
+<!ENTITY oplus            "&#x02295;" ><!--CIRCLED PLUS -->
+<!ENTITY osol             "&#x02298;" ><!--CIRCLED DIVISION SLASH -->
+<!ENTITY otimes           "&#x02297;" ><!--CIRCLED TIMES -->
+<!ENTITY plusb            "&#x0229E;" ><!--SQUARED PLUS -->
+<!ENTITY plusdo           "&#x02214;" ><!--DOT PLUS -->
+<!ENTITY prod             "&#x0220F;" ><!--N-ARY PRODUCT -->
+<!ENTITY rthree           "&#x022CC;" ><!--RIGHT SEMIDIRECT PRODUCT -->
+<!ENTITY rtimes           "&#x022CA;" ><!--RIGHT NORMAL FACTOR SEMIDIRECT PRODUCT -->
+<!ENTITY sdot             "&#x022C5;" ><!--DOT OPERATOR -->
+<!ENTITY sdotb            "&#x022A1;" ><!--SQUARED DOT OPERATOR -->
+<!ENTITY setmn            "&#x02216;" ><!--SET MINUS -->
+<!ENTITY sqcap            "&#x02293;" ><!--SQUARE CAP -->
+<!ENTITY sqcup            "&#x02294;" ><!--SQUARE CUP -->
+<!ENTITY ssetmn           "&#x02216;" ><!--SET MINUS -->
+<!ENTITY sstarf           "&#x022C6;" ><!--STAR OPERATOR -->
+<!ENTITY sum              "&#x02211;" ><!--N-ARY SUMMATION -->
+<!ENTITY timesb           "&#x022A0;" ><!--SQUARED TIMES -->
+<!ENTITY top              "&#x022A4;" ><!--DOWN TACK -->
+<!ENTITY uplus            "&#x0228E;" ><!--MULTISET UNION -->
+<!ENTITY wreath           "&#x02240;" ><!--WREATH PRODUCT -->
+<!ENTITY xcirc            "&#x025EF;" ><!--LARGE CIRCLE -->
+<!ENTITY xdtri            "&#x025BD;" ><!--WHITE DOWN-POINTING TRIANGLE -->
+<!ENTITY xutri            "&#x025B3;" ><!--WHITE UP-POINTING TRIANGLE -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isoamsc.ent b/xml/tests/testData/xml/DocBookHighlighting2/isoamsc.ent
new file mode 100644
index 000000000000..2fad4175251c
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isoamsc.ent
@@ -0,0 +1,51 @@
+
+<!--
+     File isoamsc.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isoamsc.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isoamsc.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isoamsc PUBLIC
+         "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isoamsc.ent"
+       >
+       %isoamsc;
+
+-->
+
+<!ENTITY dlcorn           "&#x0231E;" ><!--BOTTOM LEFT CORNER -->
+<!ENTITY drcorn           "&#x0231F;" ><!--BOTTOM RIGHT CORNER -->
+<!ENTITY lceil            "&#x02308;" ><!--LEFT CEILING -->
+<!ENTITY lfloor           "&#x0230A;" ><!--LEFT FLOOR -->
+<!ENTITY lpargt           "&#x029A0;" ><!--SPHERICAL ANGLE OPENING LEFT -->
+<!ENTITY rceil            "&#x02309;" ><!--RIGHT CEILING -->
+<!ENTITY rfloor           "&#x0230B;" ><!--RIGHT FLOOR -->
+<!ENTITY rpargt           "&#x02994;" ><!--RIGHT ARC GREATER-THAN BRACKET -->
+<!ENTITY ulcorn           "&#x0231C;" ><!--TOP LEFT CORNER -->
+<!ENTITY urcorn           "&#x0231D;" ><!--TOP RIGHT CORNER -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isoamsn.ent b/xml/tests/testData/xml/DocBookHighlighting2/isoamsn.ent
new file mode 100644
index 000000000000..ddca8d14ceb4
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isoamsn.ent
@@ -0,0 +1,103 @@
+
+<!--
+     File isoamsn.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     References to the VARIANT SELECTOR 1 character (&#x0FE00;)
+     should match the uses listed in Unicode Technical Report 25.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isoamsn.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isoamsn.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isoamsn PUBLIC
+         "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isoamsn.ent"
+       >
+       %isoamsn;
+
+-->
+
+<!ENTITY gnap             "&#x02A8A;" ><!--GREATER-THAN AND NOT APPROXIMATE -->
+<!ENTITY gnE              "&#x02269;" ><!--GREATER-THAN BUT NOT EQUAL TO -->
+<!ENTITY gne              "&#x02A88;" ><!--GREATER-THAN AND SINGLE-LINE NOT EQUAL TO -->
+<!ENTITY gnsim            "&#x022E7;" ><!--GREATER-THAN BUT NOT EQUIVALENT TO -->
+<!ENTITY gvnE             "&#x02269;&#x0FE00;" ><!--GREATER-THAN BUT NOT EQUAL TO - with vertical stroke -->
+<!ENTITY lnap             "&#x02A89;" ><!--LESS-THAN AND NOT APPROXIMATE -->
+<!ENTITY lnE              "&#x02268;" ><!--LESS-THAN BUT NOT EQUAL TO -->
+<!ENTITY lne              "&#x02A87;" ><!--LESS-THAN AND SINGLE-LINE NOT EQUAL TO -->
+<!ENTITY lnsim            "&#x022E6;" ><!--LESS-THAN BUT NOT EQUIVALENT TO -->
+<!ENTITY lvnE             "&#x02268;&#x0FE00;" ><!--LESS-THAN BUT NOT EQUAL TO - with vertical stroke -->
+<!ENTITY nap              "&#x02249;" ><!--NOT ALMOST EQUAL TO -->
+<!ENTITY ncong            "&#x02247;" ><!--NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO -->
+<!ENTITY nequiv           "&#x02262;" ><!--NOT IDENTICAL TO -->
+<!ENTITY ngE              "&#x02267;&#x00338;" ><!--GREATER-THAN OVER EQUAL TO with slash -->
+<!ENTITY nge              "&#x02271;" ><!--NEITHER GREATER-THAN NOR EQUAL TO -->
+<!ENTITY nges             "&#x02A7E;&#x00338;" ><!--GREATER-THAN OR SLANTED EQUAL TO with slash -->
+<!ENTITY ngt              "&#x0226F;" ><!--NOT GREATER-THAN -->
+<!ENTITY nlE              "&#x02266;&#x00338;" ><!--LESS-THAN OVER EQUAL TO with slash -->
+<!ENTITY nle              "&#x02270;" ><!--NEITHER LESS-THAN NOR EQUAL TO -->
+<!ENTITY nles             "&#x02A7D;&#x00338;" ><!--LESS-THAN OR SLANTED EQUAL TO with slash -->
+<!ENTITY nlt              "&#x0226E;" ><!--NOT LESS-THAN -->
+<!ENTITY nltri            "&#x022EA;" ><!--NOT NORMAL SUBGROUP OF -->
+<!ENTITY nltrie           "&#x022EC;" ><!--NOT NORMAL SUBGROUP OF OR EQUAL TO -->
+<!ENTITY nmid             "&#x02224;" ><!--DOES NOT DIVIDE -->
+<!ENTITY npar             "&#x02226;" ><!--NOT PARALLEL TO -->
+<!ENTITY npr              "&#x02280;" ><!--DOES NOT PRECEDE -->
+<!ENTITY npre             "&#x02AAF;&#x00338;" ><!--PRECEDES ABOVE SINGLE-LINE EQUALS SIGN with slash -->
+<!ENTITY nrtri            "&#x022EB;" ><!--DOES NOT CONTAIN AS NORMAL SUBGROUP -->
+<!ENTITY nrtrie           "&#x022ED;" ><!--DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL -->
+<!ENTITY nsc              "&#x02281;" ><!--DOES NOT SUCCEED -->
+<!ENTITY nsce             "&#x02AB0;&#x00338;" ><!--SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN with slash -->
+<!ENTITY nsim             "&#x02241;" ><!--NOT TILDE -->
+<!ENTITY nsime            "&#x02244;" ><!--NOT ASYMPTOTICALLY EQUAL TO -->
+<!ENTITY nsmid            "&#x02224;" ><!--DOES NOT DIVIDE -->
+<!ENTITY nspar            "&#x02226;" ><!--NOT PARALLEL TO -->
+<!ENTITY nsub             "&#x02284;" ><!--NOT A SUBSET OF -->
+<!ENTITY nsubE            "&#x02AC5;&#x00338;" ><!--SUBSET OF ABOVE EQUALS SIGN with slash -->
+<!ENTITY nsube            "&#x02288;" ><!--NEITHER A SUBSET OF NOR EQUAL TO -->
+<!ENTITY nsup             "&#x02285;" ><!--NOT A SUPERSET OF -->
+<!ENTITY nsupE            "&#x02AC6;&#x00338;" ><!--SUPERSET OF ABOVE EQUALS SIGN with slash -->
+<!ENTITY nsupe            "&#x02289;" ><!--NEITHER A SUPERSET OF NOR EQUAL TO -->
+<!ENTITY nVDash           "&#x022AF;" ><!--NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE -->
+<!ENTITY nVdash           "&#x022AE;" ><!--DOES NOT FORCE -->
+<!ENTITY nvDash           "&#x022AD;" ><!--NOT TRUE -->
+<!ENTITY nvdash           "&#x022AC;" ><!--DOES NOT PROVE -->
+<!ENTITY prnap            "&#x02AB9;" ><!--PRECEDES ABOVE NOT ALMOST EQUAL TO -->
+<!ENTITY prnE             "&#x02AB5;" ><!--PRECEDES ABOVE NOT EQUAL TO -->
+<!ENTITY prnsim           "&#x022E8;" ><!--PRECEDES BUT NOT EQUIVALENT TO -->
+<!ENTITY scnap            "&#x02ABA;" ><!--SUCCEEDS ABOVE NOT ALMOST EQUAL TO -->
+<!ENTITY scnE             "&#x02AB6;" ><!--SUCCEEDS ABOVE NOT EQUAL TO -->
+<!ENTITY scnsim           "&#x022E9;" ><!--SUCCEEDS BUT NOT EQUIVALENT TO -->
+<!ENTITY subnE            "&#x02ACB;" ><!--SUBSET OF ABOVE NOT EQUAL TO -->
+<!ENTITY subne            "&#x0228A;" ><!--SUBSET OF WITH NOT EQUAL TO -->
+<!ENTITY supnE            "&#x02ACC;" ><!--SUPERSET OF ABOVE NOT EQUAL TO -->
+<!ENTITY supne            "&#x0228B;" ><!--SUPERSET OF WITH NOT EQUAL TO -->
+<!ENTITY vsubnE           "&#x02ACB;&#x0FE00;" ><!--SUBSET OF ABOVE NOT EQUAL TO - variant with stroke through bottom members -->
+<!ENTITY vsubne           "&#x0228A;&#x0FE00;" ><!--SUBSET OF WITH NOT EQUAL TO - variant with stroke through bottom members -->
+<!ENTITY vsupnE           "&#x02ACC;&#x0FE00;" ><!--SUPERSET OF ABOVE NOT EQUAL TO - variant with stroke through bottom members -->
+<!ENTITY vsupne           "&#x0228B;&#x0FE00;" ><!--SUPERSET OF WITH NOT EQUAL TO - variant with stroke through bottom members -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isoamso.ent b/xml/tests/testData/xml/DocBookHighlighting2/isoamso.ent
new file mode 100644
index 000000000000..278e4b40910e
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isoamso.ent
@@ -0,0 +1,59 @@
+
+<!--
+     File isoamso.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isoamso.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isoamso.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isoamso PUBLIC
+         "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isoamso.ent"
+       >
+       %isoamso;
+
+-->
+
+<!ENTITY ang              "&#x02220;" ><!--ANGLE -->
+<!ENTITY angmsd           "&#x02221;" ><!--MEASURED ANGLE -->
+<!ENTITY beth             "&#x02136;" ><!--BET SYMBOL -->
+<!ENTITY bprime           "&#x02035;" ><!--REVERSED PRIME -->
+<!ENTITY comp             "&#x02201;" ><!--COMPLEMENT -->
+<!ENTITY daleth           "&#x02138;" ><!--DALET SYMBOL -->
+<!ENTITY ell              "&#x02113;" ><!--SCRIPT SMALL L -->
+<!ENTITY empty            "&#x02205;" ><!--EMPTY SET -->
+<!ENTITY gimel            "&#x02137;" ><!--GIMEL SYMBOL -->
+<!ENTITY inodot           "&#x00131;" ><!--LATIN SMALL LETTER DOTLESS I -->
+<!ENTITY jnodot           "&#x0006A;" ><!--LATIN SMALL LETTER J -->
+<!ENTITY nexist           "&#x02204;" ><!--THERE DOES NOT EXIST -->
+<!ENTITY oS               "&#x024C8;" ><!--CIRCLED LATIN CAPITAL LETTER S -->
+<!ENTITY planck           "&#x0210F;" ><!--PLANCK CONSTANT OVER TWO PI -->
+<!ENTITY real             "&#x0211C;" ><!--BLACK-LETTER CAPITAL R -->
+<!ENTITY sbsol            "&#x0FE68;" ><!--SMALL REVERSE SOLIDUS -->
+<!ENTITY vprime           "&#x02032;" ><!--PRIME -->
+<!ENTITY weierp           "&#x02118;" ><!--SCRIPT CAPITAL P -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isoamsr.ent b/xml/tests/testData/xml/DocBookHighlighting2/isoamsr.ent
new file mode 100644
index 000000000000..18e64bffdb3d
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isoamsr.ent
@@ -0,0 +1,125 @@
+
+<!--
+     File isoamsr.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isoamsr.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isoamsr.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isoamsr PUBLIC
+         "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isoamsr.ent"
+       >
+       %isoamsr;
+
+-->
+
+<!ENTITY ape              "&#x0224A;" ><!--ALMOST EQUAL OR EQUAL TO -->
+<!ENTITY asymp            "&#x02248;" ><!--ALMOST EQUAL TO -->
+<!ENTITY bcong            "&#x0224C;" ><!--ALL EQUAL TO -->
+<!ENTITY bepsi            "&#x003F6;" ><!--GREEK REVERSED LUNATE EPSILON SYMBOL -->
+<!ENTITY bowtie           "&#x022C8;" ><!--BOWTIE -->
+<!ENTITY bsim             "&#x0223D;" ><!--REVERSED TILDE -->
+<!ENTITY bsime            "&#x022CD;" ><!--REVERSED TILDE EQUALS -->
+<!ENTITY bump             "&#x0224E;" ><!--GEOMETRICALLY EQUIVALENT TO -->
+<!ENTITY bumpe            "&#x0224F;" ><!--DIFFERENCE BETWEEN -->
+<!ENTITY cire             "&#x02257;" ><!--RING EQUAL TO -->
+<!ENTITY colone           "&#x02254;" ><!--COLON EQUALS -->
+<!ENTITY cuepr            "&#x022DE;" ><!--EQUAL TO OR PRECEDES -->
+<!ENTITY cuesc            "&#x022DF;" ><!--EQUAL TO OR SUCCEEDS -->
+<!ENTITY cupre            "&#x0227C;" ><!--PRECEDES OR EQUAL TO -->
+<!ENTITY dashv            "&#x022A3;" ><!--LEFT TACK -->
+<!ENTITY ecir             "&#x02256;" ><!--RING IN EQUAL TO -->
+<!ENTITY ecolon           "&#x02255;" ><!--EQUALS COLON -->
+<!ENTITY eDot             "&#x02251;" ><!--GEOMETRICALLY EQUAL TO -->
+<!ENTITY efDot            "&#x02252;" ><!--APPROXIMATELY EQUAL TO OR THE IMAGE OF -->
+<!ENTITY egs              "&#x02A96;" ><!--SLANTED EQUAL TO OR GREATER-THAN -->
+<!ENTITY els              "&#x02A95;" ><!--SLANTED EQUAL TO OR LESS-THAN -->
+<!ENTITY erDot            "&#x02253;" ><!--IMAGE OF OR APPROXIMATELY EQUAL TO -->
+<!ENTITY esdot            "&#x02250;" ><!--APPROACHES THE LIMIT -->
+<!ENTITY fork             "&#x022D4;" ><!--PITCHFORK -->
+<!ENTITY frown            "&#x02322;" ><!--FROWN -->
+<!ENTITY gap              "&#x02A86;" ><!--GREATER-THAN OR APPROXIMATE -->
+<!ENTITY gE               "&#x02267;" ><!--GREATER-THAN OVER EQUAL TO -->
+<!ENTITY gEl              "&#x02A8C;" ><!--GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN -->
+<!ENTITY gel              "&#x022DB;" ><!--GREATER-THAN EQUAL TO OR LESS-THAN -->
+<!ENTITY ges              "&#x02A7E;" ><!--GREATER-THAN OR SLANTED EQUAL TO -->
+<!ENTITY Gg               "&#x022D9;" ><!--VERY MUCH GREATER-THAN -->
+<!ENTITY gl               "&#x02277;" ><!--GREATER-THAN OR LESS-THAN -->
+<!ENTITY gsdot            "&#x022D7;" ><!--GREATER-THAN WITH DOT -->
+<!ENTITY gsim             "&#x02273;" ><!--GREATER-THAN OR EQUIVALENT TO -->
+<!ENTITY Gt               "&#x0226B;" ><!--MUCH GREATER-THAN -->
+<!ENTITY lap              "&#x02A85;" ><!--LESS-THAN OR APPROXIMATE -->
+<!ENTITY ldot             "&#x022D6;" ><!--LESS-THAN WITH DOT -->
+<!ENTITY lE               "&#x02266;" ><!--LESS-THAN OVER EQUAL TO -->
+<!ENTITY lEg              "&#x02A8B;" ><!--LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN -->
+<!ENTITY leg              "&#x022DA;" ><!--LESS-THAN EQUAL TO OR GREATER-THAN -->
+<!ENTITY les              "&#x02A7D;" ><!--LESS-THAN OR SLANTED EQUAL TO -->
+<!ENTITY lg               "&#x02276;" ><!--LESS-THAN OR GREATER-THAN -->
+<!ENTITY Ll               "&#x022D8;" ><!--VERY MUCH LESS-THAN -->
+<!ENTITY lsim             "&#x02272;" ><!--LESS-THAN OR EQUIVALENT TO -->
+<!ENTITY Lt               "&#x0226A;" ><!--MUCH LESS-THAN -->
+<!ENTITY ltrie            "&#x022B4;" ><!--NORMAL SUBGROUP OF OR EQUAL TO -->
+<!ENTITY mid              "&#x02223;" ><!--DIVIDES -->
+<!ENTITY models           "&#x022A7;" ><!--MODELS -->
+<!ENTITY pr               "&#x0227A;" ><!--PRECEDES -->
+<!ENTITY prap             "&#x02AB7;" ><!--PRECEDES ABOVE ALMOST EQUAL TO -->
+<!ENTITY pre              "&#x02AAF;" ><!--PRECEDES ABOVE SINGLE-LINE EQUALS SIGN -->
+<!ENTITY prsim            "&#x0227E;" ><!--PRECEDES OR EQUIVALENT TO -->
+<!ENTITY rtrie            "&#x022B5;" ><!--CONTAINS AS NORMAL SUBGROUP OR EQUAL TO -->
+<!ENTITY samalg           "&#x02210;" ><!--N-ARY COPRODUCT -->
+<!ENTITY sc               "&#x0227B;" ><!--SUCCEEDS -->
+<!ENTITY scap             "&#x02AB8;" ><!--SUCCEEDS ABOVE ALMOST EQUAL TO -->
+<!ENTITY sccue            "&#x0227D;" ><!--SUCCEEDS OR EQUAL TO -->
+<!ENTITY sce              "&#x02AB0;" ><!--SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN -->
+<!ENTITY scsim            "&#x0227F;" ><!--SUCCEEDS OR EQUIVALENT TO -->
+<!ENTITY sfrown           "&#x02322;" ><!--FROWN -->
+<!ENTITY smid             "&#x02223;" ><!--DIVIDES -->
+<!ENTITY smile            "&#x02323;" ><!--SMILE -->
+<!ENTITY spar             "&#x02225;" ><!--PARALLEL TO -->
+<!ENTITY sqsub            "&#x0228F;" ><!--SQUARE IMAGE OF -->
+<!ENTITY sqsube           "&#x02291;" ><!--SQUARE IMAGE OF OR EQUAL TO -->
+<!ENTITY sqsup            "&#x02290;" ><!--SQUARE ORIGINAL OF -->
+<!ENTITY sqsupe           "&#x02292;" ><!--SQUARE ORIGINAL OF OR EQUAL TO -->
+<!ENTITY ssmile           "&#x02323;" ><!--SMILE -->
+<!ENTITY Sub              "&#x022D0;" ><!--DOUBLE SUBSET -->
+<!ENTITY subE             "&#x02AC5;" ><!--SUBSET OF ABOVE EQUALS SIGN -->
+<!ENTITY Sup              "&#x022D1;" ><!--DOUBLE SUPERSET -->
+<!ENTITY supE             "&#x02AC6;" ><!--SUPERSET OF ABOVE EQUALS SIGN -->
+<!ENTITY thkap            "&#x02248;" ><!--ALMOST EQUAL TO -->
+<!ENTITY thksim           "&#x0223C;" ><!--TILDE OPERATOR -->
+<!ENTITY trie             "&#x0225C;" ><!--DELTA EQUAL TO -->
+<!ENTITY twixt            "&#x0226C;" ><!--BETWEEN -->
+<!ENTITY Vdash            "&#x022A9;" ><!--FORCES -->
+<!ENTITY vDash            "&#x022A8;" ><!--TRUE -->
+<!ENTITY vdash            "&#x022A2;" ><!--RIGHT TACK -->
+<!ENTITY veebar           "&#x022BB;" ><!--XOR -->
+<!ENTITY vltri            "&#x022B2;" ><!--NORMAL SUBGROUP OF -->
+<!ENTITY vprop            "&#x0221D;" ><!--PROPORTIONAL TO -->
+<!ENTITY vrtri            "&#x022B3;" ><!--CONTAINS AS NORMAL SUBGROUP -->
+<!ENTITY Vvdash           "&#x022AA;" ><!--TRIPLE VERTICAL BAR RIGHT TURNSTILE -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isobox.ent b/xml/tests/testData/xml/DocBookHighlighting2/isobox.ent
new file mode 100644
index 000000000000..9ae27d4fa205
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isobox.ent
@@ -0,0 +1,81 @@
+
+<!--
+     File isobox.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isobox.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isobox.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isobox PUBLIC
+         "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isobox.ent"
+       >
+       %isobox;
+
+-->
+
+<!ENTITY boxDL            "&#x02557;" ><!--BOX DRAWINGS DOUBLE DOWN AND LEFT -->
+<!ENTITY boxDl            "&#x02556;" ><!--BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE -->
+<!ENTITY boxdL            "&#x02555;" ><!--BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE -->
+<!ENTITY boxdl            "&#x02510;" ><!--BOX DRAWINGS LIGHT DOWN AND LEFT -->
+<!ENTITY boxDR            "&#x02554;" ><!--BOX DRAWINGS DOUBLE DOWN AND RIGHT -->
+<!ENTITY boxDr            "&#x02553;" ><!--BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE -->
+<!ENTITY boxdR            "&#x02552;" ><!--BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE -->
+<!ENTITY boxdr            "&#x0250C;" ><!--BOX DRAWINGS LIGHT DOWN AND RIGHT -->
+<!ENTITY boxH             "&#x02550;" ><!--BOX DRAWINGS DOUBLE HORIZONTAL -->
+<!ENTITY boxh             "&#x02500;" ><!--BOX DRAWINGS LIGHT HORIZONTAL -->
+<!ENTITY boxHD            "&#x02566;" ><!--BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL -->
+<!ENTITY boxHd            "&#x02564;" ><!--BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE -->
+<!ENTITY boxhD            "&#x02565;" ><!--BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE -->
+<!ENTITY boxhd            "&#x0252C;" ><!--BOX DRAWINGS LIGHT DOWN AND HORIZONTAL -->
+<!ENTITY boxHU            "&#x02569;" ><!--BOX DRAWINGS DOUBLE UP AND HORIZONTAL -->
+<!ENTITY boxHu            "&#x02567;" ><!--BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE -->
+<!ENTITY boxhU            "&#x02568;" ><!--BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE -->
+<!ENTITY boxhu            "&#x02534;" ><!--BOX DRAWINGS LIGHT UP AND HORIZONTAL -->
+<!ENTITY boxUL            "&#x0255D;" ><!--BOX DRAWINGS DOUBLE UP AND LEFT -->
+<!ENTITY boxUl            "&#x0255C;" ><!--BOX DRAWINGS UP DOUBLE AND LEFT SINGLE -->
+<!ENTITY boxuL            "&#x0255B;" ><!--BOX DRAWINGS UP SINGLE AND LEFT DOUBLE -->
+<!ENTITY boxul            "&#x02518;" ><!--BOX DRAWINGS LIGHT UP AND LEFT -->
+<!ENTITY boxUR            "&#x0255A;" ><!--BOX DRAWINGS DOUBLE UP AND RIGHT -->
+<!ENTITY boxUr            "&#x02559;" ><!--BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE -->
+<!ENTITY boxuR            "&#x02558;" ><!--BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE -->
+<!ENTITY boxur            "&#x02514;" ><!--BOX DRAWINGS LIGHT UP AND RIGHT -->
+<!ENTITY boxV             "&#x02551;" ><!--BOX DRAWINGS DOUBLE VERTICAL -->
+<!ENTITY boxv             "&#x02502;" ><!--BOX DRAWINGS LIGHT VERTICAL -->
+<!ENTITY boxVH            "&#x0256C;" ><!--BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL -->
+<!ENTITY boxVh            "&#x0256B;" ><!--BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE -->
+<!ENTITY boxvH            "&#x0256A;" ><!--BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE -->
+<!ENTITY boxvh            "&#x0253C;" ><!--BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL -->
+<!ENTITY boxVL            "&#x02563;" ><!--BOX DRAWINGS DOUBLE VERTICAL AND LEFT -->
+<!ENTITY boxVl            "&#x02562;" ><!--BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE -->
+<!ENTITY boxvL            "&#x02561;" ><!--BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE -->
+<!ENTITY boxvl            "&#x02524;" ><!--BOX DRAWINGS LIGHT VERTICAL AND LEFT -->
+<!ENTITY boxVR            "&#x02560;" ><!--BOX DRAWINGS DOUBLE VERTICAL AND RIGHT -->
+<!ENTITY boxVr            "&#x0255F;" ><!--BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE -->
+<!ENTITY boxvR            "&#x0255E;" ><!--BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE -->
+<!ENTITY boxvr            "&#x0251C;" ><!--BOX DRAWINGS LIGHT VERTICAL AND RIGHT -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isocyr1.ent b/xml/tests/testData/xml/DocBookHighlighting2/isocyr1.ent
new file mode 100644
index 000000000000..364b6d8411cd
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isocyr1.ent
@@ -0,0 +1,108 @@
+
+<!--
+     File isocyr1.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isocyr1.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isocyr1.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isocyr1 PUBLIC
+         "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isocyr1.ent"
+       >
+       %isocyr1;
+
+-->
+
+<!ENTITY Acy              "&#x00410;" ><!--CYRILLIC CAPITAL LETTER A -->
+<!ENTITY acy              "&#x00430;" ><!--CYRILLIC SMALL LETTER A -->
+<!ENTITY Bcy              "&#x00411;" ><!--CYRILLIC CAPITAL LETTER BE -->
+<!ENTITY bcy              "&#x00431;" ><!--CYRILLIC SMALL LETTER BE -->
+<!ENTITY CHcy             "&#x00427;" ><!--CYRILLIC CAPITAL LETTER CHE -->
+<!ENTITY chcy             "&#x00447;" ><!--CYRILLIC SMALL LETTER CHE -->
+<!ENTITY Dcy              "&#x00414;" ><!--CYRILLIC CAPITAL LETTER DE -->
+<!ENTITY dcy              "&#x00434;" ><!--CYRILLIC SMALL LETTER DE -->
+<!ENTITY Ecy              "&#x0042D;" ><!--CYRILLIC CAPITAL LETTER E -->
+<!ENTITY ecy              "&#x0044D;" ><!--CYRILLIC SMALL LETTER E -->
+<!ENTITY Fcy              "&#x00424;" ><!--CYRILLIC CAPITAL LETTER EF -->
+<!ENTITY fcy              "&#x00444;" ><!--CYRILLIC SMALL LETTER EF -->
+<!ENTITY Gcy              "&#x00413;" ><!--CYRILLIC CAPITAL LETTER GHE -->
+<!ENTITY gcy              "&#x00433;" ><!--CYRILLIC SMALL LETTER GHE -->
+<!ENTITY HARDcy           "&#x0042A;" ><!--CYRILLIC CAPITAL LETTER HARD SIGN -->
+<!ENTITY hardcy           "&#x0044A;" ><!--CYRILLIC SMALL LETTER HARD SIGN -->
+<!ENTITY Icy              "&#x00418;" ><!--CYRILLIC CAPITAL LETTER I -->
+<!ENTITY icy              "&#x00438;" ><!--CYRILLIC SMALL LETTER I -->
+<!ENTITY IEcy             "&#x00415;" ><!--CYRILLIC CAPITAL LETTER IE -->
+<!ENTITY iecy             "&#x00435;" ><!--CYRILLIC SMALL LETTER IE -->
+<!ENTITY IOcy             "&#x00401;" ><!--CYRILLIC CAPITAL LETTER IO -->
+<!ENTITY iocy             "&#x00451;" ><!--CYRILLIC SMALL LETTER IO -->
+<!ENTITY Jcy              "&#x00419;" ><!--CYRILLIC CAPITAL LETTER SHORT I -->
+<!ENTITY jcy              "&#x00439;" ><!--CYRILLIC SMALL LETTER SHORT I -->
+<!ENTITY Kcy              "&#x0041A;" ><!--CYRILLIC CAPITAL LETTER KA -->
+<!ENTITY kcy              "&#x0043A;" ><!--CYRILLIC SMALL LETTER KA -->
+<!ENTITY KHcy             "&#x00425;" ><!--CYRILLIC CAPITAL LETTER HA -->
+<!ENTITY khcy             "&#x00445;" ><!--CYRILLIC SMALL LETTER HA -->
+<!ENTITY Lcy              "&#x0041B;" ><!--CYRILLIC CAPITAL LETTER EL -->
+<!ENTITY lcy              "&#x0043B;" ><!--CYRILLIC SMALL LETTER EL -->
+<!ENTITY Mcy              "&#x0041C;" ><!--CYRILLIC CAPITAL LETTER EM -->
+<!ENTITY mcy              "&#x0043C;" ><!--CYRILLIC SMALL LETTER EM -->
+<!ENTITY Ncy              "&#x0041D;" ><!--CYRILLIC CAPITAL LETTER EN -->
+<!ENTITY ncy              "&#x0043D;" ><!--CYRILLIC SMALL LETTER EN -->
+<!ENTITY numero           "&#x02116;" ><!--NUMERO SIGN -->
+<!ENTITY Ocy              "&#x0041E;" ><!--CYRILLIC CAPITAL LETTER O -->
+<!ENTITY ocy              "&#x0043E;" ><!--CYRILLIC SMALL LETTER O -->
+<!ENTITY Pcy              "&#x0041F;" ><!--CYRILLIC CAPITAL LETTER PE -->
+<!ENTITY pcy              "&#x0043F;" ><!--CYRILLIC SMALL LETTER PE -->
+<!ENTITY Rcy              "&#x00420;" ><!--CYRILLIC CAPITAL LETTER ER -->
+<!ENTITY rcy              "&#x00440;" ><!--CYRILLIC SMALL LETTER ER -->
+<!ENTITY Scy              "&#x00421;" ><!--CYRILLIC CAPITAL LETTER ES -->
+<!ENTITY scy              "&#x00441;" ><!--CYRILLIC SMALL LETTER ES -->
+<!ENTITY SHCHcy           "&#x00429;" ><!--CYRILLIC CAPITAL LETTER SHCHA -->
+<!ENTITY shchcy           "&#x00449;" ><!--CYRILLIC SMALL LETTER SHCHA -->
+<!ENTITY SHcy             "&#x00428;" ><!--CYRILLIC CAPITAL LETTER SHA -->
+<!ENTITY shcy             "&#x00448;" ><!--CYRILLIC SMALL LETTER SHA -->
+<!ENTITY SOFTcy           "&#x0042C;" ><!--CYRILLIC CAPITAL LETTER SOFT SIGN -->
+<!ENTITY softcy           "&#x0044C;" ><!--CYRILLIC SMALL LETTER SOFT SIGN -->
+<!ENTITY Tcy              "&#x00422;" ><!--CYRILLIC CAPITAL LETTER TE -->
+<!ENTITY tcy              "&#x00442;" ><!--CYRILLIC SMALL LETTER TE -->
+<!ENTITY TScy             "&#x00426;" ><!--CYRILLIC CAPITAL LETTER TSE -->
+<!ENTITY tscy             "&#x00446;" ><!--CYRILLIC SMALL LETTER TSE -->
+<!ENTITY Ucy              "&#x00423;" ><!--CYRILLIC CAPITAL LETTER U -->
+<!ENTITY ucy              "&#x00443;" ><!--CYRILLIC SMALL LETTER U -->
+<!ENTITY Vcy              "&#x00412;" ><!--CYRILLIC CAPITAL LETTER VE -->
+<!ENTITY vcy              "&#x00432;" ><!--CYRILLIC SMALL LETTER VE -->
+<!ENTITY YAcy             "&#x0042F;" ><!--CYRILLIC CAPITAL LETTER YA -->
+<!ENTITY yacy             "&#x0044F;" ><!--CYRILLIC SMALL LETTER YA -->
+<!ENTITY Ycy              "&#x0042B;" ><!--CYRILLIC CAPITAL LETTER YERU -->
+<!ENTITY ycy              "&#x0044B;" ><!--CYRILLIC SMALL LETTER YERU -->
+<!ENTITY YUcy             "&#x0042E;" ><!--CYRILLIC CAPITAL LETTER YU -->
+<!ENTITY yucy             "&#x0044E;" ><!--CYRILLIC SMALL LETTER YU -->
+<!ENTITY Zcy              "&#x00417;" ><!--CYRILLIC CAPITAL LETTER ZE -->
+<!ENTITY zcy              "&#x00437;" ><!--CYRILLIC SMALL LETTER ZE -->
+<!ENTITY ZHcy             "&#x00416;" ><!--CYRILLIC CAPITAL LETTER ZHE -->
+<!ENTITY zhcy             "&#x00436;" ><!--CYRILLIC SMALL LETTER ZHE -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isocyr2.ent b/xml/tests/testData/xml/DocBookHighlighting2/isocyr2.ent
new file mode 100644
index 000000000000..6432d74c440f
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isocyr2.ent
@@ -0,0 +1,67 @@
+
+<!--
+     File isocyr2.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isocyr2.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isocyr2.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isocyr2 PUBLIC
+         "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isocyr2.ent"
+       >
+       %isocyr2;
+
+-->
+
+<!ENTITY DJcy             "&#x00402;" ><!--CYRILLIC CAPITAL LETTER DJE -->
+<!ENTITY djcy             "&#x00452;" ><!--CYRILLIC SMALL LETTER DJE -->
+<!ENTITY DScy             "&#x00405;" ><!--CYRILLIC CAPITAL LETTER DZE -->
+<!ENTITY dscy             "&#x00455;" ><!--CYRILLIC SMALL LETTER DZE -->
+<!ENTITY DZcy             "&#x0040F;" ><!--CYRILLIC CAPITAL LETTER DZHE -->
+<!ENTITY dzcy             "&#x0045F;" ><!--CYRILLIC SMALL LETTER DZHE -->
+<!ENTITY GJcy             "&#x00403;" ><!--CYRILLIC CAPITAL LETTER GJE -->
+<!ENTITY gjcy             "&#x00453;" ><!--CYRILLIC SMALL LETTER GJE -->
+<!ENTITY Iukcy            "&#x00406;" ><!--CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I -->
+<!ENTITY iukcy            "&#x00456;" ><!--CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I -->
+<!ENTITY Jsercy           "&#x00408;" ><!--CYRILLIC CAPITAL LETTER JE -->
+<!ENTITY jsercy           "&#x00458;" ><!--CYRILLIC SMALL LETTER JE -->
+<!ENTITY Jukcy            "&#x00404;" ><!--CYRILLIC CAPITAL LETTER UKRAINIAN IE -->
+<!ENTITY jukcy            "&#x00454;" ><!--CYRILLIC SMALL LETTER UKRAINIAN IE -->
+<!ENTITY KJcy             "&#x0040C;" ><!--CYRILLIC CAPITAL LETTER KJE -->
+<!ENTITY kjcy             "&#x0045C;" ><!--CYRILLIC SMALL LETTER KJE -->
+<!ENTITY LJcy             "&#x00409;" ><!--CYRILLIC CAPITAL LETTER LJE -->
+<!ENTITY ljcy             "&#x00459;" ><!--CYRILLIC SMALL LETTER LJE -->
+<!ENTITY NJcy             "&#x0040A;" ><!--CYRILLIC CAPITAL LETTER NJE -->
+<!ENTITY njcy             "&#x0045A;" ><!--CYRILLIC SMALL LETTER NJE -->
+<!ENTITY TSHcy            "&#x0040B;" ><!--CYRILLIC CAPITAL LETTER TSHE -->
+<!ENTITY tshcy            "&#x0045B;" ><!--CYRILLIC SMALL LETTER TSHE -->
+<!ENTITY Ubrcy            "&#x0040E;" ><!--CYRILLIC CAPITAL LETTER SHORT U -->
+<!ENTITY ubrcy            "&#x0045E;" ><!--CYRILLIC SMALL LETTER SHORT U -->
+<!ENTITY YIcy             "&#x00407;" ><!--CYRILLIC CAPITAL LETTER YI -->
+<!ENTITY yicy             "&#x00457;" ><!--CYRILLIC SMALL LETTER YI -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isodia.ent b/xml/tests/testData/xml/DocBookHighlighting2/isodia.ent
new file mode 100644
index 000000000000..b49c30947f65
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isodia.ent
@@ -0,0 +1,55 @@
+
+<!--
+     File isodia.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isodia.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isodia.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isodia PUBLIC
+         "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isodia.ent"
+       >
+       %isodia;
+
+-->
+
+<!ENTITY acute            "&#x000B4;" ><!--ACUTE ACCENT -->
+<!ENTITY breve            "&#x002D8;" ><!--BREVE -->
+<!ENTITY caron            "&#x002C7;" ><!--CARON -->
+<!ENTITY cedil            "&#x000B8;" ><!--CEDILLA -->
+<!ENTITY circ             "&#x002C6;" ><!--MODIFIER LETTER CIRCUMFLEX ACCENT -->
+<!ENTITY dblac            "&#x002DD;" ><!--DOUBLE ACUTE ACCENT -->
+<!ENTITY die              "&#x000A8;" ><!--DIAERESIS -->
+<!ENTITY dot              "&#x002D9;" ><!--DOT ABOVE -->
+<!ENTITY grave            "&#x00060;" ><!--GRAVE ACCENT -->
+<!ENTITY macr             "&#x000AF;" ><!--MACRON -->
+<!ENTITY ogon             "&#x002DB;" ><!--OGONEK -->
+<!ENTITY ring             "&#x002DA;" ><!--RING ABOVE -->
+<!ENTITY tilde            "&#x002DC;" ><!--SMALL TILDE -->
+<!ENTITY uml              "&#x000A8;" ><!--DIAERESIS -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isogrk1.ent b/xml/tests/testData/xml/DocBookHighlighting2/isogrk1.ent
new file mode 100644
index 000000000000..7826f8109b91
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isogrk1.ent
@@ -0,0 +1,90 @@
+
+<!--
+     File isogrk1.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isogrk1.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Greek Letters//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isogrk1.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isogrk1 PUBLIC
+         "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isogrk1.ent"
+       >
+       %isogrk1;
+
+-->
+
+<!ENTITY Agr              "&#x00391;" ><!--GREEK CAPITAL LETTER ALPHA -->
+<!ENTITY agr              "&#x003B1;" ><!--GREEK SMALL LETTER ALPHA -->
+<!ENTITY Bgr              "&#x00392;" ><!--GREEK CAPITAL LETTER BETA -->
+<!ENTITY bgr              "&#x003B2;" ><!--GREEK SMALL LETTER BETA -->
+<!ENTITY Dgr              "&#x00394;" ><!--GREEK CAPITAL LETTER DELTA -->
+<!ENTITY dgr              "&#x003B4;" ><!--GREEK SMALL LETTER DELTA -->
+<!ENTITY EEgr             "&#x00397;" ><!--GREEK CAPITAL LETTER ETA -->
+<!ENTITY eegr             "&#x003B7;" ><!--GREEK SMALL LETTER ETA -->
+<!ENTITY Egr              "&#x00395;" ><!--GREEK CAPITAL LETTER EPSILON -->
+<!ENTITY egr              "&#x003B5;" ><!--GREEK SMALL LETTER EPSILON -->
+<!ENTITY Ggr              "&#x00393;" ><!--GREEK CAPITAL LETTER GAMMA -->
+<!ENTITY ggr              "&#x003B3;" ><!--GREEK SMALL LETTER GAMMA -->
+<!ENTITY Igr              "&#x00399;" ><!--GREEK CAPITAL LETTER IOTA -->
+<!ENTITY igr              "&#x003B9;" ><!--GREEK SMALL LETTER IOTA -->
+<!ENTITY Kgr              "&#x0039A;" ><!--GREEK CAPITAL LETTER KAPPA -->
+<!ENTITY kgr              "&#x003BA;" ><!--GREEK SMALL LETTER KAPPA -->
+<!ENTITY KHgr             "&#x003A7;" ><!--GREEK CAPITAL LETTER CHI -->
+<!ENTITY khgr             "&#x003C7;" ><!--GREEK SMALL LETTER CHI -->
+<!ENTITY Lgr              "&#x0039B;" ><!--GREEK CAPITAL LETTER LAMDA -->
+<!ENTITY lgr              "&#x003BB;" ><!--GREEK SMALL LETTER LAMDA -->
+<!ENTITY Mgr              "&#x0039C;" ><!--GREEK CAPITAL LETTER MU -->
+<!ENTITY mgr              "&#x003BC;" ><!--GREEK SMALL LETTER MU -->
+<!ENTITY Ngr              "&#x0039D;" ><!--GREEK CAPITAL LETTER NU -->
+<!ENTITY ngr              "&#x003BD;" ><!--GREEK SMALL LETTER NU -->
+<!ENTITY Ogr              "&#x0039F;" ><!--GREEK CAPITAL LETTER OMICRON -->
+<!ENTITY ogr              "&#x003BF;" ><!--GREEK SMALL LETTER OMICRON -->
+<!ENTITY OHgr             "&#x003A9;" ><!--GREEK CAPITAL LETTER OMEGA -->
+<!ENTITY ohgr             "&#x003C9;" ><!--GREEK SMALL LETTER OMEGA -->
+<!ENTITY Pgr              "&#x003A0;" ><!--GREEK CAPITAL LETTER PI -->
+<!ENTITY pgr              "&#x003C0;" ><!--GREEK SMALL LETTER PI -->
+<!ENTITY PHgr             "&#x003A6;" ><!--GREEK CAPITAL LETTER PHI -->
+<!ENTITY phgr             "&#x003C6;" ><!--GREEK SMALL LETTER PHI -->
+<!ENTITY PSgr             "&#x003A8;" ><!--GREEK CAPITAL LETTER PSI -->
+<!ENTITY psgr             "&#x003C8;" ><!--GREEK SMALL LETTER PSI -->
+<!ENTITY Rgr              "&#x003A1;" ><!--GREEK CAPITAL LETTER RHO -->
+<!ENTITY rgr              "&#x003C1;" ><!--GREEK SMALL LETTER RHO -->
+<!ENTITY sfgr             "&#x003C2;" ><!--GREEK SMALL LETTER FINAL SIGMA -->
+<!ENTITY Sgr              "&#x003A3;" ><!--GREEK CAPITAL LETTER SIGMA -->
+<!ENTITY sgr              "&#x003C3;" ><!--GREEK SMALL LETTER SIGMA -->
+<!ENTITY Tgr              "&#x003A4;" ><!--GREEK CAPITAL LETTER TAU -->
+<!ENTITY tgr              "&#x003C4;" ><!--GREEK SMALL LETTER TAU -->
+<!ENTITY THgr             "&#x00398;" ><!--GREEK CAPITAL LETTER THETA -->
+<!ENTITY thgr             "&#x003B8;" ><!--GREEK SMALL LETTER THETA -->
+<!ENTITY Ugr              "&#x003A5;" ><!--GREEK CAPITAL LETTER UPSILON -->
+<!ENTITY ugr              "&#x003C5;" ><!--GREEK SMALL LETTER UPSILON -->
+<!ENTITY Xgr              "&#x0039E;" ><!--GREEK CAPITAL LETTER XI -->
+<!ENTITY xgr              "&#x003BE;" ><!--GREEK SMALL LETTER XI -->
+<!ENTITY Zgr              "&#x00396;" ><!--GREEK CAPITAL LETTER ZETA -->
+<!ENTITY zgr              "&#x003B6;" ><!--GREEK SMALL LETTER ZETA -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isogrk2.ent b/xml/tests/testData/xml/DocBookHighlighting2/isogrk2.ent
new file mode 100644
index 000000000000..726b7dd70592
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isogrk2.ent
@@ -0,0 +1,61 @@
+
+<!--
+     File isogrk2.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isogrk2.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isogrk2.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isogrk2 PUBLIC
+         "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isogrk2.ent"
+       >
+       %isogrk2;
+
+-->
+
+<!ENTITY Aacgr            "&#x00386;" ><!--GREEK CAPITAL LETTER ALPHA WITH TONOS -->
+<!ENTITY aacgr            "&#x003AC;" ><!--GREEK SMALL LETTER ALPHA WITH TONOS -->
+<!ENTITY Eacgr            "&#x00388;" ><!--GREEK CAPITAL LETTER EPSILON WITH TONOS -->
+<!ENTITY eacgr            "&#x003AD;" ><!--GREEK SMALL LETTER EPSILON WITH TONOS -->
+<!ENTITY EEacgr           "&#x00389;" ><!--GREEK CAPITAL LETTER ETA WITH TONOS -->
+<!ENTITY eeacgr           "&#x003AE;" ><!--GREEK SMALL LETTER ETA WITH TONOS -->
+<!ENTITY Iacgr            "&#x0038A;" ><!--GREEK CAPITAL LETTER IOTA WITH TONOS -->
+<!ENTITY iacgr            "&#x003AF;" ><!--GREEK SMALL LETTER IOTA WITH TONOS -->
+<!ENTITY idiagr           "&#x00390;" ><!--GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS -->
+<!ENTITY Idigr            "&#x003AA;" ><!--GREEK CAPITAL LETTER IOTA WITH DIALYTIKA -->
+<!ENTITY idigr            "&#x003CA;" ><!--GREEK SMALL LETTER IOTA WITH DIALYTIKA -->
+<!ENTITY Oacgr            "&#x0038C;" ><!--GREEK CAPITAL LETTER OMICRON WITH TONOS -->
+<!ENTITY oacgr            "&#x003CC;" ><!--GREEK SMALL LETTER OMICRON WITH TONOS -->
+<!ENTITY OHacgr           "&#x0038F;" ><!--GREEK CAPITAL LETTER OMEGA WITH TONOS -->
+<!ENTITY ohacgr           "&#x003CE;" ><!--GREEK SMALL LETTER OMEGA WITH TONOS -->
+<!ENTITY Uacgr            "&#x0038E;" ><!--GREEK CAPITAL LETTER UPSILON WITH TONOS -->
+<!ENTITY uacgr            "&#x003CD;" ><!--GREEK SMALL LETTER UPSILON WITH TONOS -->
+<!ENTITY udiagr           "&#x003B0;" ><!--GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS -->
+<!ENTITY Udigr            "&#x003AB;" ><!--GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA -->
+<!ENTITY udigr            "&#x003CB;" ><!--GREEK SMALL LETTER UPSILON WITH DIALYTIKA -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isogrk3.ent b/xml/tests/testData/xml/DocBookHighlighting2/isogrk3.ent
new file mode 100644
index 000000000000..28b5c2766c52
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isogrk3.ent
@@ -0,0 +1,84 @@
+
+<!--
+     File isogrk3.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isogrk3.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Greek Symbols//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isogrk3.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isogrk3 PUBLIC
+         "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isogrk3.ent"
+       >
+       %isogrk3;
+
+-->
+
+<!ENTITY alpha            "&#x003B1;" ><!--GREEK SMALL LETTER ALPHA -->
+<!ENTITY beta             "&#x003B2;" ><!--GREEK SMALL LETTER BETA -->
+<!ENTITY chi              "&#x003C7;" ><!--GREEK SMALL LETTER CHI -->
+<!ENTITY Delta            "&#x00394;" ><!--GREEK CAPITAL LETTER DELTA -->
+<!ENTITY delta            "&#x003B4;" ><!--GREEK SMALL LETTER DELTA -->
+<!ENTITY epsi             "&#x003F5;" ><!--GREEK LUNATE EPSILON SYMBOL -->
+<!ENTITY epsis            "&#x003F5;" ><!--GREEK LUNATE EPSILON SYMBOL -->
+<!ENTITY epsiv            "&#x003B5;" ><!--GREEK SMALL LETTER EPSILON -->
+<!ENTITY eta              "&#x003B7;" ><!--GREEK SMALL LETTER ETA -->
+<!ENTITY Gamma            "&#x00393;" ><!--GREEK CAPITAL LETTER GAMMA -->
+<!ENTITY gamma            "&#x003B3;" ><!--GREEK SMALL LETTER GAMMA -->
+<!ENTITY gammad           "&#x003DD;" ><!--GREEK SMALL LETTER DIGAMMA -->
+<!ENTITY iota             "&#x003B9;" ><!--GREEK SMALL LETTER IOTA -->
+<!ENTITY kappa            "&#x003BA;" ><!--GREEK SMALL LETTER KAPPA -->
+<!ENTITY kappav           "&#x003F0;" ><!--GREEK KAPPA SYMBOL -->
+<!ENTITY Lambda           "&#x0039B;" ><!--GREEK CAPITAL LETTER LAMDA -->
+<!ENTITY lambda           "&#x003BB;" ><!--GREEK SMALL LETTER LAMDA -->
+<!ENTITY mu               "&#x003BC;" ><!--GREEK SMALL LETTER MU -->
+<!ENTITY nu               "&#x003BD;" ><!--GREEK SMALL LETTER NU -->
+<!ENTITY Omega            "&#x003A9;" ><!--GREEK CAPITAL LETTER OMEGA -->
+<!ENTITY omega            "&#x003C9;" ><!--GREEK SMALL LETTER OMEGA -->
+<!ENTITY Phi              "&#x003A6;" ><!--GREEK CAPITAL LETTER PHI -->
+<!ENTITY phis             "&#x003D5;" ><!--GREEK PHI SYMBOL -->
+<!ENTITY phiv             "&#x003C6;" ><!--GREEK SMALL LETTER PHI -->
+<!ENTITY Pi               "&#x003A0;" ><!--GREEK CAPITAL LETTER PI -->
+<!ENTITY pi               "&#x003C0;" ><!--GREEK SMALL LETTER PI -->
+<!ENTITY piv              "&#x003D6;" ><!--GREEK PI SYMBOL -->
+<!ENTITY Psi              "&#x003A8;" ><!--GREEK CAPITAL LETTER PSI -->
+<!ENTITY psi              "&#x003C8;" ><!--GREEK SMALL LETTER PSI -->
+<!ENTITY rho              "&#x003C1;" ><!--GREEK SMALL LETTER RHO -->
+<!ENTITY rhov             "&#x003F1;" ><!--GREEK RHO SYMBOL -->
+<!ENTITY Sigma            "&#x003A3;" ><!--GREEK CAPITAL LETTER SIGMA -->
+<!ENTITY sigma            "&#x003C3;" ><!--GREEK SMALL LETTER SIGMA -->
+<!ENTITY sigmav           "&#x003C2;" ><!--GREEK SMALL LETTER FINAL SIGMA -->
+<!ENTITY tau              "&#x003C4;" ><!--GREEK SMALL LETTER TAU -->
+<!ENTITY Theta            "&#x00398;" ><!--GREEK CAPITAL LETTER THETA -->
+<!ENTITY thetas           "&#x003B8;" ><!--GREEK SMALL LETTER THETA -->
+<!ENTITY thetav           "&#x003D1;" ><!--GREEK THETA SYMBOL -->
+<!ENTITY Upsi             "&#x003D2;" ><!--GREEK UPSILON WITH HOOK SYMBOL -->
+<!ENTITY upsi             "&#x003C5;" ><!--GREEK SMALL LETTER UPSILON -->
+<!ENTITY Xi               "&#x0039E;" ><!--GREEK CAPITAL LETTER XI -->
+<!ENTITY xi               "&#x003BE;" ><!--GREEK SMALL LETTER XI -->
+<!ENTITY zeta             "&#x003B6;" ><!--GREEK SMALL LETTER ZETA -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isogrk4.ent b/xml/tests/testData/xml/DocBookHighlighting2/isogrk4.ent
new file mode 100644
index 000000000000..27c6a514f63f
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isogrk4.ent
@@ -0,0 +1,84 @@
+
+<!--
+     File isogrk4.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isogrk4.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isogrk4.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isogrk4 PUBLIC
+         "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isogrk4.ent"
+       >
+       %isogrk4;
+
+-->
+
+<!ENTITY b.alpha          "&#x1D6C2;" ><!--MATHEMATICAL BOLD SMALL ALPHA -->
+<!ENTITY b.beta           "&#x1D6C3;" ><!--MATHEMATICAL BOLD SMALL BETA -->
+<!ENTITY b.chi            "&#x1D6D8;" ><!--MATHEMATICAL BOLD SMALL CHI -->
+<!ENTITY b.Delta          "&#x1D6AB;" ><!--MATHEMATICAL BOLD CAPITAL DELTA -->
+<!ENTITY b.delta          "&#x1D6C5;" ><!--MATHEMATICAL BOLD SMALL DELTA -->
+<!ENTITY b.epsi           "&#x1D6C6;" ><!--MATHEMATICAL BOLD SMALL EPSILON -->
+<!ENTITY b.epsiv          "&#x1D6DC;" ><!--MATHEMATICAL BOLD EPSILON SYMBOL -->
+<!ENTITY b.eta            "&#x1D6C8;" ><!--MATHEMATICAL BOLD SMALL ETA -->
+<!ENTITY b.Gamma          "&#x1D6AA;" ><!--MATHEMATICAL BOLD CAPITAL GAMMA -->
+<!ENTITY b.gamma          "&#x1D6C4;" ><!--MATHEMATICAL BOLD SMALL GAMMA -->
+<!ENTITY b.Gammad         "&#x003DC;" ><!--GREEK LETTER DIGAMMA -->
+<!ENTITY b.gammad         "&#x003DD;" ><!--GREEK SMALL LETTER DIGAMMA -->
+<!ENTITY b.iota           "&#x1D6CA;" ><!--MATHEMATICAL BOLD SMALL IOTA -->
+<!ENTITY b.kappa          "&#x1D6CB;" ><!--MATHEMATICAL BOLD SMALL KAPPA -->
+<!ENTITY b.kappav         "&#x1D6DE;" ><!--MATHEMATICAL BOLD KAPPA SYMBOL -->
+<!ENTITY b.Lambda         "&#x1D6B2;" ><!--MATHEMATICAL BOLD CAPITAL LAMDA -->
+<!ENTITY b.lambda         "&#x1D6CC;" ><!--MATHEMATICAL BOLD SMALL LAMDA -->
+<!ENTITY b.mu             "&#x1D6CD;" ><!--MATHEMATICAL BOLD SMALL MU -->
+<!ENTITY b.nu             "&#x1D6CE;" ><!--MATHEMATICAL BOLD SMALL NU -->
+<!ENTITY b.Omega          "&#x1D6C0;" ><!--MATHEMATICAL BOLD CAPITAL OMEGA -->
+<!ENTITY b.omega          "&#x1D6DA;" ><!--MATHEMATICAL BOLD SMALL OMEGA -->
+<!ENTITY b.Phi            "&#x1D6BD;" ><!--MATHEMATICAL BOLD CAPITAL PHI -->
+<!ENTITY b.phi            "&#x1D6D7;" ><!--MATHEMATICAL BOLD SMALL PHI -->
+<!ENTITY b.phiv           "&#x1D6DF;" ><!--MATHEMATICAL BOLD PHI SYMBOL -->
+<!ENTITY b.Pi             "&#x1D6B7;" ><!--MATHEMATICAL BOLD CAPITAL PI -->
+<!ENTITY b.pi             "&#x1D6D1;" ><!--MATHEMATICAL BOLD SMALL PI -->
+<!ENTITY b.piv            "&#x1D6E1;" ><!--MATHEMATICAL BOLD PI SYMBOL -->
+<!ENTITY b.Psi            "&#x1D6BF;" ><!--MATHEMATICAL BOLD CAPITAL PSI -->
+<!ENTITY b.psi            "&#x1D6D9;" ><!--MATHEMATICAL BOLD SMALL PSI -->
+<!ENTITY b.rho            "&#x1D6D2;" ><!--MATHEMATICAL BOLD SMALL RHO -->
+<!ENTITY b.rhov           "&#x1D6E0;" ><!--MATHEMATICAL BOLD RHO SYMBOL -->
+<!ENTITY b.Sigma          "&#x1D6BA;" ><!--MATHEMATICAL BOLD CAPITAL SIGMA -->
+<!ENTITY b.sigma          "&#x1D6D4;" ><!--MATHEMATICAL BOLD SMALL SIGMA -->
+<!ENTITY b.sigmav         "&#x1D6D3;" ><!--MATHEMATICAL BOLD SMALL FINAL SIGMA -->
+<!ENTITY b.tau            "&#x1D6D5;" ><!--MATHEMATICAL BOLD SMALL TAU -->
+<!ENTITY b.Theta          "&#x1D6AF;" ><!--MATHEMATICAL BOLD CAPITAL THETA -->
+<!ENTITY b.thetas         "&#x1D6C9;" ><!--MATHEMATICAL BOLD SMALL THETA -->
+<!ENTITY b.thetav         "&#x1D6DD;" ><!--MATHEMATICAL BOLD THETA SYMBOL -->
+<!ENTITY b.Upsi           "&#x1D6BC;" ><!--MATHEMATICAL BOLD CAPITAL UPSILON -->
+<!ENTITY b.upsi           "&#x1D6D6;" ><!--MATHEMATICAL BOLD SMALL UPSILON -->
+<!ENTITY b.Xi             "&#x1D6B5;" ><!--MATHEMATICAL BOLD CAPITAL XI -->
+<!ENTITY b.xi             "&#x1D6CF;" ><!--MATHEMATICAL BOLD SMALL XI -->
+<!ENTITY b.zeta           "&#x1D6C7;" ><!--MATHEMATICAL BOLD SMALL ZETA -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isolat1.ent b/xml/tests/testData/xml/DocBookHighlighting2/isolat1.ent
new file mode 100644
index 000000000000..381bd0900ac9
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isolat1.ent
@@ -0,0 +1,103 @@
+
+<!--
+     File isolat1.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isolat1.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Added Latin 1//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isolat1.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isolat1 PUBLIC
+         "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isolat1.ent"
+       >
+       %isolat1;
+
+-->
+
+<!ENTITY Aacute           "&#x000C1;" ><!--LATIN CAPITAL LETTER A WITH ACUTE -->
+<!ENTITY aacute           "&#x000E1;" ><!--LATIN SMALL LETTER A WITH ACUTE -->
+<!ENTITY Acirc            "&#x000C2;" ><!--LATIN CAPITAL LETTER A WITH CIRCUMFLEX -->
+<!ENTITY acirc            "&#x000E2;" ><!--LATIN SMALL LETTER A WITH CIRCUMFLEX -->
+<!ENTITY AElig            "&#x000C6;" ><!--LATIN CAPITAL LETTER AE -->
+<!ENTITY aelig            "&#x000E6;" ><!--LATIN SMALL LETTER AE -->
+<!ENTITY Agrave           "&#x000C0;" ><!--LATIN CAPITAL LETTER A WITH GRAVE -->
+<!ENTITY agrave           "&#x000E0;" ><!--LATIN SMALL LETTER A WITH GRAVE -->
+<!ENTITY Aring            "&#x000C5;" ><!--LATIN CAPITAL LETTER A WITH RING ABOVE -->
+<!ENTITY aring            "&#x000E5;" ><!--LATIN SMALL LETTER A WITH RING ABOVE -->
+<!ENTITY Atilde           "&#x000C3;" ><!--LATIN CAPITAL LETTER A WITH TILDE -->
+<!ENTITY atilde           "&#x000E3;" ><!--LATIN SMALL LETTER A WITH TILDE -->
+<!ENTITY Auml             "&#x000C4;" ><!--LATIN CAPITAL LETTER A WITH DIAERESIS -->
+<!ENTITY auml             "&#x000E4;" ><!--LATIN SMALL LETTER A WITH DIAERESIS -->
+<!ENTITY Ccedil           "&#x000C7;" ><!--LATIN CAPITAL LETTER C WITH CEDILLA -->
+<!ENTITY ccedil           "&#x000E7;" ><!--LATIN SMALL LETTER C WITH CEDILLA -->
+<!ENTITY Eacute           "&#x000C9;" ><!--LATIN CAPITAL LETTER E WITH ACUTE -->
+<!ENTITY eacute           "&#x000E9;" ><!--LATIN SMALL LETTER E WITH ACUTE -->
+<!ENTITY Ecirc            "&#x000CA;" ><!--LATIN CAPITAL LETTER E WITH CIRCUMFLEX -->
+<!ENTITY ecirc            "&#x000EA;" ><!--LATIN SMALL LETTER E WITH CIRCUMFLEX -->
+<!ENTITY Egrave           "&#x000C8;" ><!--LATIN CAPITAL LETTER E WITH GRAVE -->
+<!ENTITY egrave           "&#x000E8;" ><!--LATIN SMALL LETTER E WITH GRAVE -->
+<!ENTITY ETH              "&#x000D0;" ><!--LATIN CAPITAL LETTER ETH -->
+<!ENTITY eth              "&#x000F0;" ><!--LATIN SMALL LETTER ETH -->
+<!ENTITY Euml             "&#x000CB;" ><!--LATIN CAPITAL LETTER E WITH DIAERESIS -->
+<!ENTITY euml             "&#x000EB;" ><!--LATIN SMALL LETTER E WITH DIAERESIS -->
+<!ENTITY Iacute           "&#x000CD;" ><!--LATIN CAPITAL LETTER I WITH ACUTE -->
+<!ENTITY iacute           "&#x000ED;" ><!--LATIN SMALL LETTER I WITH ACUTE -->
+<!ENTITY Icirc            "&#x000CE;" ><!--LATIN CAPITAL LETTER I WITH CIRCUMFLEX -->
+<!ENTITY icirc            "&#x000EE;" ><!--LATIN SMALL LETTER I WITH CIRCUMFLEX -->
+<!ENTITY Igrave           "&#x000CC;" ><!--LATIN CAPITAL LETTER I WITH GRAVE -->
+<!ENTITY igrave           "&#x000EC;" ><!--LATIN SMALL LETTER I WITH GRAVE -->
+<!ENTITY Iuml             "&#x000CF;" ><!--LATIN CAPITAL LETTER I WITH DIAERESIS -->
+<!ENTITY iuml             "&#x000EF;" ><!--LATIN SMALL LETTER I WITH DIAERESIS -->
+<!ENTITY Ntilde           "&#x000D1;" ><!--LATIN CAPITAL LETTER N WITH TILDE -->
+<!ENTITY ntilde           "&#x000F1;" ><!--LATIN SMALL LETTER N WITH TILDE -->
+<!ENTITY Oacute           "&#x000D3;" ><!--LATIN CAPITAL LETTER O WITH ACUTE -->
+<!ENTITY oacute           "&#x000F3;" ><!--LATIN SMALL LETTER O WITH ACUTE -->
+<!ENTITY Ocirc            "&#x000D4;" ><!--LATIN CAPITAL LETTER O WITH CIRCUMFLEX -->
+<!ENTITY ocirc            "&#x000F4;" ><!--LATIN SMALL LETTER O WITH CIRCUMFLEX -->
+<!ENTITY Ograve           "&#x000D2;" ><!--LATIN CAPITAL LETTER O WITH GRAVE -->
+<!ENTITY ograve           "&#x000F2;" ><!--LATIN SMALL LETTER O WITH GRAVE -->
+<!ENTITY Oslash           "&#x000D8;" ><!--LATIN CAPITAL LETTER O WITH STROKE -->
+<!ENTITY oslash           "&#x000F8;" ><!--LATIN SMALL LETTER O WITH STROKE -->
+<!ENTITY Otilde           "&#x000D5;" ><!--LATIN CAPITAL LETTER O WITH TILDE -->
+<!ENTITY otilde           "&#x000F5;" ><!--LATIN SMALL LETTER O WITH TILDE -->
+<!ENTITY Ouml             "&#x000D6;" ><!--LATIN CAPITAL LETTER O WITH DIAERESIS -->
+<!ENTITY ouml             "&#x000F6;" ><!--LATIN SMALL LETTER O WITH DIAERESIS -->
+<!ENTITY szlig            "&#x000DF;" ><!--LATIN SMALL LETTER SHARP S -->
+<!ENTITY THORN            "&#x000DE;" ><!--LATIN CAPITAL LETTER THORN -->
+<!ENTITY thorn            "&#x000FE;" ><!--LATIN SMALL LETTER THORN -->
+<!ENTITY Uacute           "&#x000DA;" ><!--LATIN CAPITAL LETTER U WITH ACUTE -->
+<!ENTITY uacute           "&#x000FA;" ><!--LATIN SMALL LETTER U WITH ACUTE -->
+<!ENTITY Ucirc            "&#x000DB;" ><!--LATIN CAPITAL LETTER U WITH CIRCUMFLEX -->
+<!ENTITY ucirc            "&#x000FB;" ><!--LATIN SMALL LETTER U WITH CIRCUMFLEX -->
+<!ENTITY Ugrave           "&#x000D9;" ><!--LATIN CAPITAL LETTER U WITH GRAVE -->
+<!ENTITY ugrave           "&#x000F9;" ><!--LATIN SMALL LETTER U WITH GRAVE -->
+<!ENTITY Uuml             "&#x000DC;" ><!--LATIN CAPITAL LETTER U WITH DIAERESIS -->
+<!ENTITY uuml             "&#x000FC;" ><!--LATIN SMALL LETTER U WITH DIAERESIS -->
+<!ENTITY Yacute           "&#x000DD;" ><!--LATIN CAPITAL LETTER Y WITH ACUTE -->
+<!ENTITY yacute           "&#x000FD;" ><!--LATIN SMALL LETTER Y WITH ACUTE -->
+<!ENTITY yuml             "&#x000FF;" ><!--LATIN SMALL LETTER Y WITH DIAERESIS -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isolat2.ent b/xml/tests/testData/xml/DocBookHighlighting2/isolat2.ent
new file mode 100644
index 000000000000..e91ffdbeec10
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isolat2.ent
@@ -0,0 +1,162 @@
+
+<!--
+     File isolat2.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isolat2.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Added Latin 2//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isolat2.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isolat2 PUBLIC
+         "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isolat2.ent"
+       >
+       %isolat2;
+
+-->
+
+<!ENTITY Abreve           "&#x00102;" ><!--LATIN CAPITAL LETTER A WITH BREVE -->
+<!ENTITY abreve           "&#x00103;" ><!--LATIN SMALL LETTER A WITH BREVE -->
+<!ENTITY Amacr            "&#x00100;" ><!--LATIN CAPITAL LETTER A WITH MACRON -->
+<!ENTITY amacr            "&#x00101;" ><!--LATIN SMALL LETTER A WITH MACRON -->
+<!ENTITY Aogon            "&#x00104;" ><!--LATIN CAPITAL LETTER A WITH OGONEK -->
+<!ENTITY aogon            "&#x00105;" ><!--LATIN SMALL LETTER A WITH OGONEK -->
+<!ENTITY Cacute           "&#x00106;" ><!--LATIN CAPITAL LETTER C WITH ACUTE -->
+<!ENTITY cacute           "&#x00107;" ><!--LATIN SMALL LETTER C WITH ACUTE -->
+<!ENTITY Ccaron           "&#x0010C;" ><!--LATIN CAPITAL LETTER C WITH CARON -->
+<!ENTITY ccaron           "&#x0010D;" ><!--LATIN SMALL LETTER C WITH CARON -->
+<!ENTITY Ccirc            "&#x00108;" ><!--LATIN CAPITAL LETTER C WITH CIRCUMFLEX -->
+<!ENTITY ccirc            "&#x00109;" ><!--LATIN SMALL LETTER C WITH CIRCUMFLEX -->
+<!ENTITY Cdot             "&#x0010A;" ><!--LATIN CAPITAL LETTER C WITH DOT ABOVE -->
+<!ENTITY cdot             "&#x0010B;" ><!--LATIN SMALL LETTER C WITH DOT ABOVE -->
+<!ENTITY Dcaron           "&#x0010E;" ><!--LATIN CAPITAL LETTER D WITH CARON -->
+<!ENTITY dcaron           "&#x0010F;" ><!--LATIN SMALL LETTER D WITH CARON -->
+<!ENTITY Dstrok           "&#x00110;" ><!--LATIN CAPITAL LETTER D WITH STROKE -->
+<!ENTITY dstrok           "&#x00111;" ><!--LATIN SMALL LETTER D WITH STROKE -->
+<!ENTITY Ecaron           "&#x0011A;" ><!--LATIN CAPITAL LETTER E WITH CARON -->
+<!ENTITY ecaron           "&#x0011B;" ><!--LATIN SMALL LETTER E WITH CARON -->
+<!ENTITY Edot             "&#x00116;" ><!--LATIN CAPITAL LETTER E WITH DOT ABOVE -->
+<!ENTITY edot             "&#x00117;" ><!--LATIN SMALL LETTER E WITH DOT ABOVE -->
+<!ENTITY Emacr            "&#x00112;" ><!--LATIN CAPITAL LETTER E WITH MACRON -->
+<!ENTITY emacr            "&#x00113;" ><!--LATIN SMALL LETTER E WITH MACRON -->
+<!ENTITY ENG              "&#x0014A;" ><!--LATIN CAPITAL LETTER ENG -->
+<!ENTITY eng              "&#x0014B;" ><!--LATIN SMALL LETTER ENG -->
+<!ENTITY Eogon            "&#x00118;" ><!--LATIN CAPITAL LETTER E WITH OGONEK -->
+<!ENTITY eogon            "&#x00119;" ><!--LATIN SMALL LETTER E WITH OGONEK -->
+<!ENTITY gacute           "&#x001F5;" ><!--LATIN SMALL LETTER G WITH ACUTE -->
+<!ENTITY Gbreve           "&#x0011E;" ><!--LATIN CAPITAL LETTER G WITH BREVE -->
+<!ENTITY gbreve           "&#x0011F;" ><!--LATIN SMALL LETTER G WITH BREVE -->
+<!ENTITY Gcedil           "&#x00122;" ><!--LATIN CAPITAL LETTER G WITH CEDILLA -->
+<!ENTITY Gcirc            "&#x0011C;" ><!--LATIN CAPITAL LETTER G WITH CIRCUMFLEX -->
+<!ENTITY gcirc            "&#x0011D;" ><!--LATIN SMALL LETTER G WITH CIRCUMFLEX -->
+<!ENTITY Gdot             "&#x00120;" ><!--LATIN CAPITAL LETTER G WITH DOT ABOVE -->
+<!ENTITY gdot             "&#x00121;" ><!--LATIN SMALL LETTER G WITH DOT ABOVE -->
+<!ENTITY Hcirc            "&#x00124;" ><!--LATIN CAPITAL LETTER H WITH CIRCUMFLEX -->
+<!ENTITY hcirc            "&#x00125;" ><!--LATIN SMALL LETTER H WITH CIRCUMFLEX -->
+<!ENTITY Hstrok           "&#x00126;" ><!--LATIN CAPITAL LETTER H WITH STROKE -->
+<!ENTITY hstrok           "&#x00127;" ><!--LATIN SMALL LETTER H WITH STROKE -->
+<!ENTITY Idot             "&#x00130;" ><!--LATIN CAPITAL LETTER I WITH DOT ABOVE -->
+<!ENTITY IJlig            "&#x00132;" ><!--LATIN CAPITAL LIGATURE IJ -->
+<!ENTITY ijlig            "&#x00133;" ><!--LATIN SMALL LIGATURE IJ -->
+<!ENTITY Imacr            "&#x0012A;" ><!--LATIN CAPITAL LETTER I WITH MACRON -->
+<!ENTITY imacr            "&#x0012B;" ><!--LATIN SMALL LETTER I WITH MACRON -->
+<!ENTITY inodot           "&#x00131;" ><!--LATIN SMALL LETTER DOTLESS I -->
+<!ENTITY Iogon            "&#x0012E;" ><!--LATIN CAPITAL LETTER I WITH OGONEK -->
+<!ENTITY iogon            "&#x0012F;" ><!--LATIN SMALL LETTER I WITH OGONEK -->
+<!ENTITY Itilde           "&#x00128;" ><!--LATIN CAPITAL LETTER I WITH TILDE -->
+<!ENTITY itilde           "&#x00129;" ><!--LATIN SMALL LETTER I WITH TILDE -->
+<!ENTITY Jcirc            "&#x00134;" ><!--LATIN CAPITAL LETTER J WITH CIRCUMFLEX -->
+<!ENTITY jcirc            "&#x00135;" ><!--LATIN SMALL LETTER J WITH CIRCUMFLEX -->
+<!ENTITY Kcedil           "&#x00136;" ><!--LATIN CAPITAL LETTER K WITH CEDILLA -->
+<!ENTITY kcedil           "&#x00137;" ><!--LATIN SMALL LETTER K WITH CEDILLA -->
+<!ENTITY kgreen           "&#x00138;" ><!--LATIN SMALL LETTER KRA -->
+<!ENTITY Lacute           "&#x00139;" ><!--LATIN CAPITAL LETTER L WITH ACUTE -->
+<!ENTITY lacute           "&#x0013A;" ><!--LATIN SMALL LETTER L WITH ACUTE -->
+<!ENTITY Lcaron           "&#x0013D;" ><!--LATIN CAPITAL LETTER L WITH CARON -->
+<!ENTITY lcaron           "&#x0013E;" ><!--LATIN SMALL LETTER L WITH CARON -->
+<!ENTITY Lcedil           "&#x0013B;" ><!--LATIN CAPITAL LETTER L WITH CEDILLA -->
+<!ENTITY lcedil           "&#x0013C;" ><!--LATIN SMALL LETTER L WITH CEDILLA -->
+<!ENTITY Lmidot           "&#x0013F;" ><!--LATIN CAPITAL LETTER L WITH MIDDLE DOT -->
+<!ENTITY lmidot           "&#x00140;" ><!--LATIN SMALL LETTER L WITH MIDDLE DOT -->
+<!ENTITY Lstrok           "&#x00141;" ><!--LATIN CAPITAL LETTER L WITH STROKE -->
+<!ENTITY lstrok           "&#x00142;" ><!--LATIN SMALL LETTER L WITH STROKE -->
+<!ENTITY Nacute           "&#x00143;" ><!--LATIN CAPITAL LETTER N WITH ACUTE -->
+<!ENTITY nacute           "&#x00144;" ><!--LATIN SMALL LETTER N WITH ACUTE -->
+<!ENTITY napos            "&#x00149;" ><!--LATIN SMALL LETTER N PRECEDED BY APOSTROPHE -->
+<!ENTITY Ncaron           "&#x00147;" ><!--LATIN CAPITAL LETTER N WITH CARON -->
+<!ENTITY ncaron           "&#x00148;" ><!--LATIN SMALL LETTER N WITH CARON -->
+<!ENTITY Ncedil           "&#x00145;" ><!--LATIN CAPITAL LETTER N WITH CEDILLA -->
+<!ENTITY ncedil           "&#x00146;" ><!--LATIN SMALL LETTER N WITH CEDILLA -->
+<!ENTITY Odblac           "&#x00150;" ><!--LATIN CAPITAL LETTER O WITH DOUBLE ACUTE -->
+<!ENTITY odblac           "&#x00151;" ><!--LATIN SMALL LETTER O WITH DOUBLE ACUTE -->
+<!ENTITY OElig            "&#x00152;" ><!--LATIN CAPITAL LIGATURE OE -->
+<!ENTITY oelig            "&#x00153;" ><!--LATIN SMALL LIGATURE OE -->
+<!ENTITY Omacr            "&#x0014C;" ><!--LATIN CAPITAL LETTER O WITH MACRON -->
+<!ENTITY omacr            "&#x0014D;" ><!--LATIN SMALL LETTER O WITH MACRON -->
+<!ENTITY Racute           "&#x00154;" ><!--LATIN CAPITAL LETTER R WITH ACUTE -->
+<!ENTITY racute           "&#x00155;" ><!--LATIN SMALL LETTER R WITH ACUTE -->
+<!ENTITY Rcaron           "&#x00158;" ><!--LATIN CAPITAL LETTER R WITH CARON -->
+<!ENTITY rcaron           "&#x00159;" ><!--LATIN SMALL LETTER R WITH CARON -->
+<!ENTITY Rcedil           "&#x00156;" ><!--LATIN CAPITAL LETTER R WITH CEDILLA -->
+<!ENTITY rcedil           "&#x00157;" ><!--LATIN SMALL LETTER R WITH CEDILLA -->
+<!ENTITY Sacute           "&#x0015A;" ><!--LATIN CAPITAL LETTER S WITH ACUTE -->
+<!ENTITY sacute           "&#x0015B;" ><!--LATIN SMALL LETTER S WITH ACUTE -->
+<!ENTITY Scaron           "&#x00160;" ><!--LATIN CAPITAL LETTER S WITH CARON -->
+<!ENTITY scaron           "&#x00161;" ><!--LATIN SMALL LETTER S WITH CARON -->
+<!ENTITY Scedil           "&#x0015E;" ><!--LATIN CAPITAL LETTER S WITH CEDILLA -->
+<!ENTITY scedil           "&#x0015F;" ><!--LATIN SMALL LETTER S WITH CEDILLA -->
+<!ENTITY Scirc            "&#x0015C;" ><!--LATIN CAPITAL LETTER S WITH CIRCUMFLEX -->
+<!ENTITY scirc            "&#x0015D;" ><!--LATIN SMALL LETTER S WITH CIRCUMFLEX -->
+<!ENTITY Tcaron           "&#x00164;" ><!--LATIN CAPITAL LETTER T WITH CARON -->
+<!ENTITY tcaron           "&#x00165;" ><!--LATIN SMALL LETTER T WITH CARON -->
+<!ENTITY Tcedil           "&#x00162;" ><!--LATIN CAPITAL LETTER T WITH CEDILLA -->
+<!ENTITY tcedil           "&#x00163;" ><!--LATIN SMALL LETTER T WITH CEDILLA -->
+<!ENTITY Tstrok           "&#x00166;" ><!--LATIN CAPITAL LETTER T WITH STROKE -->
+<!ENTITY tstrok           "&#x00167;" ><!--LATIN SMALL LETTER T WITH STROKE -->
+<!ENTITY Ubreve           "&#x0016C;" ><!--LATIN CAPITAL LETTER U WITH BREVE -->
+<!ENTITY ubreve           "&#x0016D;" ><!--LATIN SMALL LETTER U WITH BREVE -->
+<!ENTITY Udblac           "&#x00170;" ><!--LATIN CAPITAL LETTER U WITH DOUBLE ACUTE -->
+<!ENTITY udblac           "&#x00171;" ><!--LATIN SMALL LETTER U WITH DOUBLE ACUTE -->
+<!ENTITY Umacr            "&#x0016A;" ><!--LATIN CAPITAL LETTER U WITH MACRON -->
+<!ENTITY umacr            "&#x0016B;" ><!--LATIN SMALL LETTER U WITH MACRON -->
+<!ENTITY Uogon            "&#x00172;" ><!--LATIN CAPITAL LETTER U WITH OGONEK -->
+<!ENTITY uogon            "&#x00173;" ><!--LATIN SMALL LETTER U WITH OGONEK -->
+<!ENTITY Uring            "&#x0016E;" ><!--LATIN CAPITAL LETTER U WITH RING ABOVE -->
+<!ENTITY uring            "&#x0016F;" ><!--LATIN SMALL LETTER U WITH RING ABOVE -->
+<!ENTITY Utilde           "&#x00168;" ><!--LATIN CAPITAL LETTER U WITH TILDE -->
+<!ENTITY utilde           "&#x00169;" ><!--LATIN SMALL LETTER U WITH TILDE -->
+<!ENTITY Wcirc            "&#x00174;" ><!--LATIN CAPITAL LETTER W WITH CIRCUMFLEX -->
+<!ENTITY wcirc            "&#x00175;" ><!--LATIN SMALL LETTER W WITH CIRCUMFLEX -->
+<!ENTITY Ycirc            "&#x00176;" ><!--LATIN CAPITAL LETTER Y WITH CIRCUMFLEX -->
+<!ENTITY ycirc            "&#x00177;" ><!--LATIN SMALL LETTER Y WITH CIRCUMFLEX -->
+<!ENTITY Yuml             "&#x00178;" ><!--LATIN CAPITAL LETTER Y WITH DIAERESIS -->
+<!ENTITY Zacute           "&#x00179;" ><!--LATIN CAPITAL LETTER Z WITH ACUTE -->
+<!ENTITY zacute           "&#x0017A;" ><!--LATIN SMALL LETTER Z WITH ACUTE -->
+<!ENTITY Zcaron           "&#x0017D;" ><!--LATIN CAPITAL LETTER Z WITH CARON -->
+<!ENTITY zcaron           "&#x0017E;" ><!--LATIN SMALL LETTER Z WITH CARON -->
+<!ENTITY Zdot             "&#x0017B;" ><!--LATIN CAPITAL LETTER Z WITH DOT ABOVE -->
+<!ENTITY zdot             "&#x0017C;" ><!--LATIN SMALL LETTER Z WITH DOT ABOVE -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isonum.ent b/xml/tests/testData/xml/DocBookHighlighting2/isonum.ent
new file mode 100644
index 000000000000..884c0c4d0330
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isonum.ent
@@ -0,0 +1,117 @@
+
+<!--
+     File isonum.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isonum.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isonum.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isonum PUBLIC
+         "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isonum.ent"
+       >
+       %isonum;
+
+-->
+
+<!ENTITY amp              "&#38;#38;" ><!--AMPERSAND -->
+<!ENTITY apos             "&#x00027;" ><!--APOSTROPHE -->
+<!ENTITY ast              "&#x0002A;" ><!--ASTERISK -->
+<!ENTITY brvbar           "&#x000A6;" ><!--BROKEN BAR -->
+<!ENTITY bsol             "&#x0005C;" ><!--REVERSE SOLIDUS -->
+<!ENTITY cent             "&#x000A2;" ><!--CENT SIGN -->
+<!ENTITY colon            "&#x0003A;" ><!--COLON -->
+<!ENTITY comma            "&#x0002C;" ><!--COMMA -->
+<!ENTITY commat           "&#x00040;" ><!--COMMERCIAL AT -->
+<!ENTITY copy             "&#x000A9;" ><!--COPYRIGHT SIGN -->
+<!ENTITY curren           "&#x000A4;" ><!--CURRENCY SIGN -->
+<!ENTITY darr             "&#x02193;" ><!--DOWNWARDS ARROW -->
+<!ENTITY deg              "&#x000B0;" ><!--DEGREE SIGN -->
+<!ENTITY divide           "&#x000F7;" ><!--DIVISION SIGN -->
+<!ENTITY dollar           "&#x00024;" ><!--DOLLAR SIGN -->
+<!ENTITY equals           "&#x0003D;" ><!--EQUALS SIGN -->
+<!ENTITY excl             "&#x00021;" ><!--EXCLAMATION MARK -->
+<!ENTITY frac12           "&#x000BD;" ><!--VULGAR FRACTION ONE HALF -->
+<!ENTITY frac14           "&#x000BC;" ><!--VULGAR FRACTION ONE QUARTER -->
+<!ENTITY frac18           "&#x0215B;" ><!--VULGAR FRACTION ONE EIGHTH -->
+<!ENTITY frac34           "&#x000BE;" ><!--VULGAR FRACTION THREE QUARTERS -->
+<!ENTITY frac38           "&#x0215C;" ><!--VULGAR FRACTION THREE EIGHTHS -->
+<!ENTITY frac58           "&#x0215D;" ><!--VULGAR FRACTION FIVE EIGHTHS -->
+<!ENTITY frac78           "&#x0215E;" ><!--VULGAR FRACTION SEVEN EIGHTHS -->
+<!ENTITY gt               "&#x0003E;" ><!--GREATER-THAN SIGN -->
+<!ENTITY half             "&#x000BD;" ><!--VULGAR FRACTION ONE HALF -->
+<!ENTITY horbar           "&#x02015;" ><!--HORIZONTAL BAR -->
+<!ENTITY hyphen           "&#x02010;" ><!--HYPHEN -->
+<!ENTITY iexcl            "&#x000A1;" ><!--INVERTED EXCLAMATION MARK -->
+<!ENTITY iquest           "&#x000BF;" ><!--INVERTED QUESTION MARK -->
+<!ENTITY laquo            "&#x000AB;" ><!--LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+<!ENTITY larr             "&#x02190;" ><!--LEFTWARDS ARROW -->
+<!ENTITY lcub             "&#x0007B;" ><!--LEFT CURLY BRACKET -->
+<!ENTITY ldquo            "&#x0201C;" ><!--LEFT DOUBLE QUOTATION MARK -->
+<!ENTITY lowbar           "&#x0005F;" ><!--LOW LINE -->
+<!ENTITY lpar             "&#x00028;" ><!--LEFT PARENTHESIS -->
+<!ENTITY lsqb             "&#x0005B;" ><!--LEFT SQUARE BRACKET -->
+<!ENTITY lsquo            "&#x02018;" ><!--LEFT SINGLE QUOTATION MARK -->
+<!ENTITY lt               "&#38;#60;" ><!--LESS-THAN SIGN -->
+<!ENTITY micro            "&#x000B5;" ><!--MICRO SIGN -->
+<!ENTITY middot           "&#x000B7;" ><!--MIDDLE DOT -->
+<!ENTITY nbsp             "&#x000A0;" ><!--NO-BREAK SPACE -->
+<!ENTITY not              "&#x000AC;" ><!--NOT SIGN -->
+<!ENTITY num              "&#x00023;" ><!--NUMBER SIGN -->
+<!ENTITY ohm              "&#x02126;" ><!--OHM SIGN -->
+<!ENTITY ordf             "&#x000AA;" ><!--FEMININE ORDINAL INDICATOR -->
+<!ENTITY ordm             "&#x000BA;" ><!--MASCULINE ORDINAL INDICATOR -->
+<!ENTITY para             "&#x000B6;" ><!--PILCROW SIGN -->
+<!ENTITY percnt           "&#x00025;" ><!--PERCENT SIGN -->
+<!ENTITY period           "&#x0002E;" ><!--FULL STOP -->
+<!ENTITY plus             "&#x0002B;" ><!--PLUS SIGN -->
+<!ENTITY plusmn           "&#x000B1;" ><!--PLUS-MINUS SIGN -->
+<!ENTITY pound            "&#x000A3;" ><!--POUND SIGN -->
+<!ENTITY quest            "&#x0003F;" ><!--QUESTION MARK -->
+<!ENTITY quot             "&#x00022;" ><!--QUOTATION MARK -->
+<!ENTITY raquo            "&#x000BB;" ><!--RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+<!ENTITY rarr             "&#x02192;" ><!--RIGHTWARDS ARROW -->
+<!ENTITY rcub             "&#x0007D;" ><!--RIGHT CURLY BRACKET -->
+<!ENTITY rdquo            "&#x0201D;" ><!--RIGHT DOUBLE QUOTATION MARK -->
+<!ENTITY reg              "&#x000AE;" ><!--REGISTERED SIGN -->
+<!ENTITY rpar             "&#x00029;" ><!--RIGHT PARENTHESIS -->
+<!ENTITY rsqb             "&#x0005D;" ><!--RIGHT SQUARE BRACKET -->
+<!ENTITY rsquo            "&#x02019;" ><!--RIGHT SINGLE QUOTATION MARK -->
+<!ENTITY sect             "&#x000A7;" ><!--SECTION SIGN -->
+<!ENTITY semi             "&#x0003B;" ><!--SEMICOLON -->
+<!ENTITY shy              "&#x000AD;" ><!--SOFT HYPHEN -->
+<!ENTITY sol              "&#x0002F;" ><!--SOLIDUS -->
+<!ENTITY sung             "&#x0266A;" ><!--EIGHTH NOTE -->
+<!ENTITY sup1             "&#x000B9;" ><!--SUPERSCRIPT ONE -->
+<!ENTITY sup2             "&#x000B2;" ><!--SUPERSCRIPT TWO -->
+<!ENTITY sup3             "&#x000B3;" ><!--SUPERSCRIPT THREE -->
+<!ENTITY times            "&#x000D7;" ><!--MULTIPLICATION SIGN -->
+<!ENTITY trade            "&#x02122;" ><!--TRADE MARK SIGN -->
+<!ENTITY uarr             "&#x02191;" ><!--UPWARDS ARROW -->
+<!ENTITY verbar           "&#x0007C;" ><!--VERTICAL LINE -->
+<!ENTITY yen              "&#x000A5;" ><!--YEN SIGN -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isopub.ent b/xml/tests/testData/xml/DocBookHighlighting2/isopub.ent
new file mode 100644
index 000000000000..a11787828a38
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isopub.ent
@@ -0,0 +1,125 @@
+
+<!--
+     File isopub.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isopub.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES Publishing//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isopub.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isopub PUBLIC
+         "ISO 8879:1986//ENTITIES Publishing//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isopub.ent"
+       >
+       %isopub;
+
+-->
+
+<!ENTITY blank            "&#x02423;" ><!--OPEN BOX -->
+<!ENTITY blk12            "&#x02592;" ><!--MEDIUM SHADE -->
+<!ENTITY blk14            "&#x02591;" ><!--LIGHT SHADE -->
+<!ENTITY blk34            "&#x02593;" ><!--DARK SHADE -->
+<!ENTITY block            "&#x02588;" ><!--FULL BLOCK -->
+<!ENTITY bull             "&#x02022;" ><!--BULLET -->
+<!ENTITY caret            "&#x02041;" ><!--CARET INSERTION POINT -->
+<!ENTITY check            "&#x02713;" ><!--CHECK MARK -->
+<!ENTITY cir              "&#x025CB;" ><!--WHITE CIRCLE -->
+<!ENTITY clubs            "&#x02663;" ><!--BLACK CLUB SUIT -->
+<!ENTITY copysr           "&#x02117;" ><!--SOUND RECORDING COPYRIGHT -->
+<!ENTITY cross            "&#x02717;" ><!--BALLOT X -->
+<!ENTITY Dagger           "&#x02021;" ><!--DOUBLE DAGGER -->
+<!ENTITY dagger           "&#x02020;" ><!--DAGGER -->
+<!ENTITY dash             "&#x02010;" ><!--HYPHEN -->
+<!ENTITY diams            "&#x02666;" ><!--BLACK DIAMOND SUIT -->
+<!ENTITY dlcrop           "&#x0230D;" ><!--BOTTOM LEFT CROP -->
+<!ENTITY drcrop           "&#x0230C;" ><!--BOTTOM RIGHT CROP -->
+<!ENTITY dtri             "&#x025BF;" ><!--WHITE DOWN-POINTING SMALL TRIANGLE -->
+<!ENTITY dtrif            "&#x025BE;" ><!--BLACK DOWN-POINTING SMALL TRIANGLE -->
+<!ENTITY emsp             "&#x02003;" ><!--EM SPACE -->
+<!ENTITY emsp13           "&#x02004;" ><!--THREE-PER-EM SPACE -->
+<!ENTITY emsp14           "&#x02005;" ><!--FOUR-PER-EM SPACE -->
+<!ENTITY ensp             "&#x02002;" ><!--EN SPACE -->
+<!ENTITY female           "&#x02640;" ><!--FEMALE SIGN -->
+<!ENTITY ffilig           "&#x0FB03;" ><!--LATIN SMALL LIGATURE FFI -->
+<!ENTITY fflig            "&#x0FB00;" ><!--LATIN SMALL LIGATURE FF -->
+<!ENTITY ffllig           "&#x0FB04;" ><!--LATIN SMALL LIGATURE FFL -->
+<!ENTITY filig            "&#x0FB01;" ><!--LATIN SMALL LIGATURE FI -->
+<!ENTITY flat             "&#x0266D;" ><!--MUSIC FLAT SIGN -->
+<!ENTITY fllig            "&#x0FB02;" ><!--LATIN SMALL LIGATURE FL -->
+<!ENTITY frac13           "&#x02153;" ><!--VULGAR FRACTION ONE THIRD -->
+<!ENTITY frac15           "&#x02155;" ><!--VULGAR FRACTION ONE FIFTH -->
+<!ENTITY frac16           "&#x02159;" ><!--VULGAR FRACTION ONE SIXTH -->
+<!ENTITY frac23           "&#x02154;" ><!--VULGAR FRACTION TWO THIRDS -->
+<!ENTITY frac25           "&#x02156;" ><!--VULGAR FRACTION TWO FIFTHS -->
+<!ENTITY frac35           "&#x02157;" ><!--VULGAR FRACTION THREE FIFTHS -->
+<!ENTITY frac45           "&#x02158;" ><!--VULGAR FRACTION FOUR FIFTHS -->
+<!ENTITY frac56           "&#x0215A;" ><!--VULGAR FRACTION FIVE SIXTHS -->
+<!ENTITY hairsp           "&#x0200A;" ><!--HAIR SPACE -->
+<!ENTITY hearts           "&#x02665;" ><!--BLACK HEART SUIT -->
+<!ENTITY hellip           "&#x02026;" ><!--HORIZONTAL ELLIPSIS -->
+<!ENTITY hybull           "&#x02043;" ><!--HYPHEN BULLET -->
+<!ENTITY incare           "&#x02105;" ><!--CARE OF -->
+<!ENTITY ldquor           "&#x0201E;" ><!--DOUBLE LOW-9 QUOTATION MARK -->
+<!ENTITY lhblk            "&#x02584;" ><!--LOWER HALF BLOCK -->
+<!ENTITY loz              "&#x025CA;" ><!--LOZENGE -->
+<!ENTITY lozf             "&#x029EB;" ><!--BLACK LOZENGE -->
+<!ENTITY lsquor           "&#x0201A;" ><!--SINGLE LOW-9 QUOTATION MARK -->
+<!ENTITY ltri             "&#x025C3;" ><!--WHITE LEFT-POINTING SMALL TRIANGLE -->
+<!ENTITY ltrif            "&#x025C2;" ><!--BLACK LEFT-POINTING SMALL TRIANGLE -->
+<!ENTITY male             "&#x02642;" ><!--MALE SIGN -->
+<!ENTITY malt             "&#x02720;" ><!--MALTESE CROSS -->
+<!ENTITY marker           "&#x025AE;" ><!--BLACK VERTICAL RECTANGLE -->
+<!ENTITY mdash            "&#x02014;" ><!--EM DASH -->
+<!ENTITY mldr             "&#x02026;" ><!--HORIZONTAL ELLIPSIS -->
+<!ENTITY natur            "&#x0266E;" ><!--MUSIC NATURAL SIGN -->
+<!ENTITY ndash            "&#x02013;" ><!--EN DASH -->
+<!ENTITY nldr             "&#x02025;" ><!--TWO DOT LEADER -->
+<!ENTITY numsp            "&#x02007;" ><!--FIGURE SPACE -->
+<!ENTITY phone            "&#x0260E;" ><!--BLACK TELEPHONE -->
+<!ENTITY puncsp           "&#x02008;" ><!--PUNCTUATION SPACE -->
+<!ENTITY rdquor           "&#x0201D;" ><!--RIGHT DOUBLE QUOTATION MARK -->
+<!ENTITY rect             "&#x025AD;" ><!--WHITE RECTANGLE -->
+<!ENTITY rsquor           "&#x02019;" ><!--RIGHT SINGLE QUOTATION MARK -->
+<!ENTITY rtri             "&#x025B9;" ><!--WHITE RIGHT-POINTING SMALL TRIANGLE -->
+<!ENTITY rtrif            "&#x025B8;" ><!--BLACK RIGHT-POINTING SMALL TRIANGLE -->
+<!ENTITY rx               "&#x0211E;" ><!--PRESCRIPTION TAKE -->
+<!ENTITY sext             "&#x02736;" ><!--SIX POINTED BLACK STAR -->
+<!ENTITY sharp            "&#x0266F;" ><!--MUSIC SHARP SIGN -->
+<!ENTITY spades           "&#x02660;" ><!--BLACK SPADE SUIT -->
+<!ENTITY squ              "&#x025A1;" ><!--WHITE SQUARE -->
+<!ENTITY squf             "&#x025AA;" ><!--BLACK SMALL SQUARE -->
+<!ENTITY star             "&#x02606;" ><!--WHITE STAR -->
+<!ENTITY starf            "&#x02605;" ><!--BLACK STAR -->
+<!ENTITY target           "&#x02316;" ><!--POSITION INDICATOR -->
+<!ENTITY telrec           "&#x02315;" ><!--TELEPHONE RECORDER -->
+<!ENTITY thinsp           "&#x02009;" ><!--THIN SPACE -->
+<!ENTITY uhblk            "&#x02580;" ><!--UPPER HALF BLOCK -->
+<!ENTITY ulcrop           "&#x0230F;" ><!--TOP LEFT CROP -->
+<!ENTITY urcrop           "&#x0230E;" ><!--TOP RIGHT CROP -->
+<!ENTITY utri             "&#x025B5;" ><!--WHITE UP-POINTING SMALL TRIANGLE -->
+<!ENTITY utrif            "&#x025B4;" ><!--BLACK UP-POINTING SMALL TRIANGLE -->
+<!ENTITY vellip           "&#x022EE;" ><!--VERTICAL ELLIPSIS -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/isotech.ent b/xml/tests/testData/xml/DocBookHighlighting2/isotech.ent
new file mode 100644
index 000000000000..07e81008d2a0
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/isotech.ent
@@ -0,0 +1,103 @@
+
+<!--
+     File isotech.ent produced by the XSL script entities.xsl
+     from input data in unicode.xml.
+
+     Please report any errors to David Carlisle
+     via the public W3C list www-math@w3.org.
+
+     The numeric character values assigned to each entity
+     (should) match the Unicode assignments in Unicode 4.0.
+
+     Entity names in this file are derived from files carrying the
+     following notice:
+
+     (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+
+-->
+
+
+<!-- 
+     Version: $Id: isotech.ent,v 1.2 2003/12/08 15:14:43 davidc Exp $
+
+       Public identifier: ISO 8879:1986//ENTITIES General Technical//EN//XML
+       System identifier: http://www.w3.org/2003/entities/iso8879/isotech.ent
+
+     The public identifier should always be used verbatim.
+     The system identifier may be changed to suit local requirements.
+
+     Typical invocation:
+
+       <!ENTITY % isotech PUBLIC
+         "ISO 8879:1986//ENTITIES General Technical//EN//XML"
+         "http://www.w3.org/2003/entities/iso8879/isotech.ent"
+       >
+       %isotech;
+
+-->
+
+<!ENTITY aleph            "&#x02135;" ><!--ALEF SYMBOL -->
+<!ENTITY and              "&#x02227;" ><!--LOGICAL AND -->
+<!ENTITY ang90            "&#x0221F;" ><!--RIGHT ANGLE -->
+<!ENTITY angsph           "&#x02222;" ><!--SPHERICAL ANGLE -->
+<!ENTITY angst            "&#x0212B;" ><!--ANGSTROM SIGN -->
+<!ENTITY ap               "&#x02248;" ><!--ALMOST EQUAL TO -->
+<!ENTITY becaus           "&#x02235;" ><!--BECAUSE -->
+<!ENTITY bernou           "&#x0212C;" ><!--SCRIPT CAPITAL B -->
+<!ENTITY bottom           "&#x022A5;" ><!--UP TACK -->
+<!ENTITY cap              "&#x02229;" ><!--INTERSECTION -->
+<!ENTITY compfn           "&#x02218;" ><!--RING OPERATOR -->
+<!ENTITY cong             "&#x02245;" ><!--APPROXIMATELY EQUAL TO -->
+<!ENTITY conint           "&#x0222E;" ><!--CONTOUR INTEGRAL -->
+<!ENTITY cup              "&#x0222A;" ><!--UNION -->
+<!ENTITY Dot              "&#x000A8;" ><!--DIAERESIS -->
+<!ENTITY DotDot           " &#x020DC;" ><!--COMBINING FOUR DOTS ABOVE -->
+<!ENTITY equiv            "&#x02261;" ><!--IDENTICAL TO -->
+<!ENTITY exist            "&#x02203;" ><!--THERE EXISTS -->
+<!ENTITY fnof             "&#x00192;" ><!--LATIN SMALL LETTER F WITH HOOK -->
+<!ENTITY forall           "&#x02200;" ><!--FOR ALL -->
+<!ENTITY ge               "&#x02265;" ><!--GREATER-THAN OR EQUAL TO -->
+<!ENTITY hamilt           "&#x0210B;" ><!--SCRIPT CAPITAL H -->
+<!ENTITY iff              "&#x021D4;" ><!--LEFT RIGHT DOUBLE ARROW -->
+<!ENTITY infin            "&#x0221E;" ><!--INFINITY -->
+<!ENTITY int              "&#x0222B;" ><!--INTEGRAL -->
+<!ENTITY isin             "&#x02208;" ><!--ELEMENT OF -->
+<!ENTITY lagran           "&#x02112;" ><!--SCRIPT CAPITAL L -->
+<!ENTITY lang             "&#x02329;" ><!--LEFT-POINTING ANGLE BRACKET -->
+<!ENTITY lArr             "&#x021D0;" ><!--LEFTWARDS DOUBLE ARROW -->
+<!ENTITY le               "&#x02264;" ><!--LESS-THAN OR EQUAL TO -->
+<!ENTITY lowast           "&#x02217;" ><!--ASTERISK OPERATOR -->
+<!ENTITY minus            "&#x02212;" ><!--MINUS SIGN -->
+<!ENTITY mnplus           "&#x02213;" ><!--MINUS-OR-PLUS SIGN -->
+<!ENTITY nabla            "&#x02207;" ><!--NABLA -->
+<!ENTITY ne               "&#x02260;" ><!--NOT EQUAL TO -->
+<!ENTITY ni               "&#x0220B;" ><!--CONTAINS AS MEMBER -->
+<!ENTITY notin            "&#x02209;" ><!--NOT AN ELEMENT OF -->
+<!ENTITY or               "&#x02228;" ><!--LOGICAL OR -->
+<!ENTITY order            "&#x02134;" ><!--SCRIPT SMALL O -->
+<!ENTITY par              "&#x02225;" ><!--PARALLEL TO -->
+<!ENTITY part             "&#x02202;" ><!--PARTIAL DIFFERENTIAL -->
+<!ENTITY permil           "&#x02030;" ><!--PER MILLE SIGN -->
+<!ENTITY perp             "&#x022A5;" ><!--UP TACK -->
+<!ENTITY phmmat           "&#x02133;" ><!--SCRIPT CAPITAL M -->
+<!ENTITY Prime            "&#x02033;" ><!--DOUBLE PRIME -->
+<!ENTITY prime            "&#x02032;" ><!--PRIME -->
+<!ENTITY prop             "&#x0221D;" ><!--PROPORTIONAL TO -->
+<!ENTITY radic            "&#x0221A;" ><!--SQUARE ROOT -->
+<!ENTITY rang             "&#x0232A;" ><!--RIGHT-POINTING ANGLE BRACKET -->
+<!ENTITY rArr             "&#x021D2;" ><!--RIGHTWARDS DOUBLE ARROW -->
+<!ENTITY sim              "&#x0223C;" ><!--TILDE OPERATOR -->
+<!ENTITY sime             "&#x02243;" ><!--ASYMPTOTICALLY EQUAL TO -->
+<!ENTITY square           "&#x025A1;" ><!--WHITE SQUARE -->
+<!ENTITY sub              "&#x02282;" ><!--SUBSET OF -->
+<!ENTITY sube             "&#x02286;" ><!--SUBSET OF OR EQUAL TO -->
+<!ENTITY sup              "&#x02283;" ><!--SUPERSET OF -->
+<!ENTITY supe             "&#x02287;" ><!--SUPERSET OF OR EQUAL TO -->
+<!ENTITY tdot             " &#x020DB;" ><!--COMBINING THREE DOTS ABOVE -->
+<!ENTITY there4           "&#x02234;" ><!--THEREFORE -->
+<!ENTITY tprime           "&#x02034;" ><!--TRIPLE PRIME -->
+<!ENTITY Verbar           "&#x02016;" ><!--DOUBLE VERTICAL LINE -->
+<!ENTITY wedgeq           "&#x02259;" ><!--ESTIMATES -->
diff --git a/xml/tests/testData/xml/DocBookHighlighting2/soextblx.dtd b/xml/tests/testData/xml/DocBookHighlighting2/soextblx.dtd
new file mode 100644
index 000000000000..4a92e116288f
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookHighlighting2/soextblx.dtd
@@ -0,0 +1,321 @@
+<!-- XML EXCHANGE TABLE MODEL DECLARATION MODULE -->
+
+<!-- This set of declarations defines the XML version of the Exchange
+     Table Model as of the date shown in the Formal Public Identifier
+     (FPI) for this entity.
+
+     This set of declarations may be referred to using a public external
+     entity declaration and reference as shown in the following three
+     lines:
+
+     <!ENTITY % calstblx
+       PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN">
+       %calstblx;
+
+     If various parameter entities used within this set of declarations
+     are to be given non-default values, the appropriate declarations
+     should be given before calling in this package (i.e., before the
+     "%calstblx;" reference).
+-->
+
+<!-- The motivation for this XML version of the Exchange Table Model
+     is simply to create an XML version of the SGML Exchange Table
+     Model. By design, no effort has been made to "improve" the model.
+
+     This XML version incorporates the logical bare minimum changes
+     necessary to make the Exchange Table Model a valid XML DTD.
+
+     It has been modified slightly for use in the combined HTML/CALS models
+     supported by DocBook V4.3 and later.
+-->
+
+<!-- The XML version of the Exchange Table Model differs from
+     the SGML version in the following ways:
+
+     The following parameter entities have been removed:
+
+       - tbl.table.excep, tbl.hdft.excep, tbl.row.excep, tbl.entry.excep
+         There are no exceptions in XML. The following normative statement
+         is made in lieu of exceptions: the exchange table model explicitly
+         forbids a table from occurring within another table. If the
+         content model of an entry includes a table element, then this
+         cannot be enforced by the DTD, but it is a deviation from the
+         exchange table model to include a table within a table.
+
+       - tbl.hdft.name, tbl.hdft.mdl, tbl.hdft.excep, tbl.hdft.att
+         The motivation for these elements was to change the table
+         header/footer elements. Since XML does not allow element declarations
+         to contain name groups, and the exchange table model does not
+         allow a table to contain footers, the continued presence of these
+         attributes seems unnecessary.
+
+     The following parameter entity has been added:
+
+       - tbl.thead.att
+         This entity parameterizes the attributes on thead. It replaces
+         the tbl.hdft.att parameter entity.
+
+     Other miscellaneous changes:
+
+       - Tag ommission indicators have been removed
+       - Comments have been removed from declarations
+       - NUMBER attributes have been changed to NMTOKEN
+       - NUTOKEN attributes have been to changed to NMTOKEN
+       - Removed the grouping characters around the content model
+         parameter entry for the 'entry' element. This is necessary
+         so that an entry can contain #PCDATA and be defined as an
+         optional, repeatable OR group beginning with #PCDATA.
+-->
+
+<!-- This entity includes a set of element and attribute declarations
+     that partially defines the Exchange table model.  However, the model
+     is not well-defined without the accompanying natural language
+     description of the semantics (meanings) of these various elements,
+     attributes, and attribute values.  The semantic writeup, also available
+     from SGML Open, should be used in conjunction with this entity.
+-->
+
+<!-- In order to use the Exchange table model, various parameter entity
+     declarations are required.  A brief description is as follows:
+
+     ENTITY NAME      WHERE USED              WHAT IT IS
+
+     %yesorno         In ATTLIST of:          An attribute declared value
+                      almost all elements     for a "boolean" attribute
+
+     %paracon         In content model of:    The "text" (logical content)
+                      <entry>                 of the model group for <entry>
+
+     %titles          In content model of:    The "title" part of the model
+                      table element           group for the table element
+
+     %tbl.table.name  In declaration of:      The name of the "table"
+                      table element           element
+
+     %tbl.table-titles.mdl In content model of: The model group for the title
+                      table elements          part of the content model for
+                                              table element
+
+     %tbl.table.mdl   In content model of:    The model group for the content
+                      table elements          model for table element,
+                                              often (and by default) defined
+                                              in terms of %tbl.table-titles.mdl
+                                              and tgroup
+
+     %tbl.table.att   In ATTLIST of:          Additional attributes on the
+                      table element           table element
+
+     %bodyatt         In ATTLIST of:          Additional attributes on the
+                      table element           table element (for backward
+                                              compatibility with the SGML
+                                              model)
+
+     %tbl.tgroup.mdl  In content model of:    The model group for the content
+                      <tgroup>                model for <tgroup>
+
+     %tbl.tgroup.att  In ATTLIST of:          Additional attributes on the
+                      <tgroup>                <tgroup> element
+
+     %tbl.thead.att   In ATTLIST of:          Additional attributes on the
+                      <thead>                 <thead> element
+
+     %tbl.tbody.att   In ATTLIST of:          Additional attributes on the
+                      <tbody>                 <tbody> element
+
+     %tbl.colspec.att In ATTLIST of:          Additional attributes on the
+                      <colspec>               <colspec> element
+
+     %tbl.row.mdl     In content model of:    The model group for the content
+                      <row>                   model for <row>
+
+     %tbl.row.att     In ATTLIST of:          Additional attributes on the
+                      <row>                   <row> element
+
+     %tbl.entry.mdl   In content model of:    The model group for the content
+                      <entry>                 model for <entry>
+
+     %tbl.entry.att   In ATTLIST of:          Additional attributes on the
+                      <entry>                 <entry> element
+
+     This set of declarations will use the default definitions shown below
+     for any of these parameter entities that are not declared before this
+     set of declarations is referenced.
+-->
+
+<!-- These definitions are not directly related to the table model, but are
+     used in the default CALS table model and may be defined elsewhere (and
+     prior to the inclusion of this table module) in the referencing DTD. -->
+
+<!ENTITY % yesorno 'NMTOKEN'> <!-- no if zero(s), yes if any other value -->
+<!ENTITY % titles  'title?'>
+<!ENTITY % pcd "#PCDATA">
+<!ENTITY % paracon '%pcd;'> <!-- default for use in entry content -->
+
+<!--
+The parameter entities as defined below change and simplify the CALS table
+model as published (as part of the Example DTD) in MIL-HDBK-28001.  The
+resulting simplified DTD has support from the SGML Open vendors and is
+therefore more interoperable among different systems.
+
+These following declarations provide the Exchange default definitions
+for these entities.  However, these entities can be redefined (by giving
+the appropriate parameter entity declaration(s) prior to the reference
+to this Table Model declaration set entity) to fit the needs of the
+current application.
+
+Note, however, that changes may have significant effect on the ability to
+interchange table information.  These changes may manifest themselves
+in useability, presentation, and possible structure information degradation.
+-->
+
+<!ENTITY % tbl.table.name       "table">
+<!ENTITY % tbl.table-titles.mdl "%titles;,">
+<!ENTITY % tbl.table-main.mdl   "tgroup+">
+<!ENTITY % tbl.table.mdl        "%tbl.table-titles.mdl; %tbl.table-main.mdl;">
+<!ENTITY % tbl.table.att        "
+    pgwide      %yesorno;       #IMPLIED ">
+<!ENTITY % bodyatt              "">
+<!ENTITY % tbl.tgroup.mdl       "colspec*,thead?,tbody">
+<!ENTITY % tbl.tgroup.att       "">
+<!ENTITY % tbl.thead.att        "">
+<!ENTITY % tbl.tbody.att        "">
+<!ENTITY % tbl.colspec.att      "">
+<!ENTITY % tbl.row.mdl          "entry+">
+<!ENTITY % tbl.row.att          "">
+<!ENTITY % tbl.entry.mdl        "(%paracon;)*">
+<!ENTITY % tbl.entry.att        "">
+
+<!ENTITY % tbl.frame.attval     "top|bottom|topbot|all|sides|none">
+<!ENTITY % tbl.tbody.mdl        "row+">
+
+<!-- =====  Element and attribute declarations follow. =====  -->
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.table.name       "table"
+     ENTITY % tbl.table-titles.mdl "%titles;,"
+     ENTITY % tbl.table.mdl        "%tbl.table-titles; tgroup+"
+     ENTITY % tbl.table.att        "
+                        pgwide          %yesorno;       #IMPLIED "
+-->
+
+<!--doc:???-->
+<!ELEMENT %tbl.table.name; (%tbl.table.mdl;)>
+
+<!ATTLIST %tbl.table.name;
+        frame           (%tbl.frame.attval;)                    #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        %tbl.table.att;
+        %bodyatt;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.tgroup.mdl    "colspec*,thead?,tbody"
+     ENTITY % tbl.tgroup.att    ""
+-->
+
+<!--doc:A wrapper for the main content of a table, or part of a table.-->
+<!ELEMENT tgroup (%tbl.tgroup.mdl;) >
+
+<!ATTLIST tgroup
+        cols            NMTOKEN                                 #REQUIRED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        %tbl.tgroup.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.colspec.att   ""
+-->
+
+<!--doc:Specifications for a column in a table.-->
+<!ELEMENT colspec EMPTY >
+
+<!ATTLIST colspec
+        colnum          NMTOKEN                                 #IMPLIED
+        colname         NMTOKEN                                 #IMPLIED
+        colwidth        CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         NMTOKEN                                 #IMPLIED
+        %tbl.colspec.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.thead.att      ""
+-->
+
+<!--doc:A table header consisting of one or more rows.-->
+<!ELEMENT thead (row+)>
+
+<!ATTLIST thead
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.thead.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.tbody.att     ""
+-->
+
+<!--doc:A wrapper for the rows of a table or informal table.-->
+<!ELEMENT tbody (%tbl.tbody.mdl;)>
+
+<!ATTLIST tbody
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.tbody.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.row.mdl       "entry+"
+     ENTITY % tbl.row.att       ""
+-->
+
+<!--doc:A row in a table.-->
+<!ELEMENT row (%tbl.row.mdl;)>
+
+<!ATTLIST row
+        rowsep          %yesorno;                               #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.row.att;
+>
+
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % paracon           "#PCDATA"
+     ENTITY % tbl.entry.mdl     "(%paracon;)*"
+     ENTITY % tbl.entry.att     ""
+-->
+
+<!--doc:A cell in a table.-->
+<!ELEMENT entry (%tbl.entry.mdl;)*>
+
+<!ATTLIST entry
+        colname         NMTOKEN                                 #IMPLIED
+        namest          NMTOKEN                                 #IMPLIED
+        nameend         NMTOKEN                                 #IMPLIED
+        morerows        NMTOKEN                                 #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         NMTOKEN                                 #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.entry.att;
+>
diff --git a/xml/tests/testData/xml/DocBookV5.xml b/xml/tests/testData/xml/DocBookV5.xml
new file mode 100644
index 000000000000..1153e4eed85f
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookV5.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="<error descr="Unknown encoding: 'Foo'">Foo</error>"?>
+ <x/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DocBookV5.xsd b/xml/tests/testData/xml/DocBookV5.xsd
new file mode 100644
index 000000000000..659bfbb52ca5
--- /dev/null
+++ b/xml/tests/testData/xml/DocBookV5.xsd
@@ -0,0 +1,17430 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"
+           xmlns:docbook="http://docbook.org/ns/docbook">
+
+  <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlink.xsd"/>
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
+  <xs:attributeGroup name="db.common.attributes">
+    <xs:attribute ref="xml:id"/>
+    <xs:attribute name="version"/>
+    <xs:attribute ref="xml:lang"/>
+    <xs:attribute ref="xml:base"/>
+    <xs:attribute name="remap"/>
+    <xs:attribute name="xreflabel"/>
+    <xs:attribute name="revisionflag">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="changed"/>
+          <xs:enumeration value="added"/>
+          <xs:enumeration value="deleted"/>
+          <xs:enumeration value="off"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="dir">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="ltr"/>
+          <xs:enumeration value="rtl"/>
+          <xs:enumeration value="lro"/>
+          <xs:enumeration value="rlo"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="arch"/>
+    <xs:attribute name="audience"/>
+    <xs:attribute name="condition"/>
+    <xs:attribute name="conformance"/>
+    <xs:attribute name="os"/>
+    <xs:attribute name="revision"/>
+    <xs:attribute name="security"/>
+    <xs:attribute name="userlevel"/>
+    <xs:attribute name="vendor"/>
+    <xs:attribute name="wordsize"/>
+    <xs:attribute name="annotations"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="db.common.linking.attributes">
+    <xs:attribute name="linkend" type="xs:IDREF"/>
+    <xs:attribute ref="xlink:href"/>
+    <xs:attribute ref="xlink:type"/>
+    <xs:attribute ref="xlink:role"/>
+    <xs:attribute ref="xlink:arcrole"/>
+    <xs:attribute ref="xlink:title"/>
+    <xs:attribute ref="xlink:show"/>
+    <xs:attribute ref="xlink:actuate"/>
+  </xs:attributeGroup>
+  <xs:element name="title">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="titleabbrev">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="subtitle">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="info">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:title"/>
+          <xs:element ref="docbook:titleabbrev"/>
+          <xs:element ref="docbook:subtitle"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:abstract"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:artpagenums"/>
+          <xs:element ref="docbook:author"/>
+          <xs:element ref="docbook:authorgroup"/>
+          <xs:element ref="docbook:authorinitials"/>
+          <xs:element ref="docbook:bibliocoverage"/>
+          <xs:element ref="docbook:biblioid"/>
+          <xs:element ref="docbook:bibliosource"/>
+          <xs:element ref="docbook:collab"/>
+          <xs:element ref="docbook:confgroup"/>
+          <xs:element ref="docbook:contractsponsor"/>
+          <xs:element ref="docbook:contractnum"/>
+          <xs:element ref="docbook:copyright"/>
+          <xs:element ref="docbook:cover"/>
+          <xs:element ref="docbook:date"/>
+          <xs:element ref="docbook:edition"/>
+          <xs:element ref="docbook:editor"/>
+          <xs:element ref="docbook:issuenum"/>
+          <xs:element ref="docbook:keywordset"/>
+          <xs:element ref="docbook:legalnotice"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:org"/>
+          <xs:element ref="docbook:orgname"/>
+          <xs:element ref="docbook:othercredit"/>
+          <xs:element ref="docbook:pagenums"/>
+          <xs:element ref="docbook:printhistory"/>
+          <xs:element ref="docbook:productname"/>
+          <xs:element ref="docbook:productnumber"/>
+          <xs:element ref="docbook:pubdate"/>
+          <xs:element ref="docbook:publisher"/>
+          <xs:element ref="docbook:publishername"/>
+          <xs:element ref="docbook:releaseinfo"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:seriesvolnums"/>
+          <xs:element ref="docbook:subjectset"/>
+          <xs:element ref="docbook:volumenum"/>
+          <xs:element ref="docbook:annotation"/>
+          <xs:element ref="docbook:extendedlink"/>
+          <xs:element ref="docbook:bibliomisc"/>
+          <xs:element ref="docbook:bibliomset"/>
+          <xs:element ref="docbook:bibliorelation"/>
+          <xs:element ref="docbook:biblioset"/>
+          <xs:element ref="docbook:itermset"/>
+        </xs:choice>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="subjectset">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:subject"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="scheme" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="subject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:subjectterm"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="weight"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="subjectterm">
+    <xs:complexType mixed="true">
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="keywordset">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:keyword"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="keyword">
+    <xs:complexType mixed="true">
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="procedure">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element maxOccurs="unbounded" ref="docbook:step"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="step">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:sequence minOccurs="0">
+              <xs:choice>
+                <xs:element ref="docbook:substeps"/>
+                <xs:element ref="docbook:stepalternatives"/>
+              </xs:choice>
+              <xs:choice minOccurs="0" maxOccurs="unbounded">
+                <xs:element ref="docbook:itemizedlist"/>
+                <xs:element ref="docbook:orderedlist"/>
+                <xs:element ref="docbook:procedure"/>
+                <xs:element ref="docbook:simplelist"/>
+                <xs:element ref="docbook:variablelist"/>
+                <xs:element ref="docbook:segmentedlist"/>
+                <xs:element ref="docbook:glosslist"/>
+                <xs:element ref="docbook:bibliolist"/>
+                <xs:element ref="docbook:calloutlist"/>
+                <xs:element ref="docbook:qandaset"/>
+                <xs:element ref="docbook:caution"/>
+                <xs:element ref="docbook:important"/>
+                <xs:element ref="docbook:note"/>
+                <xs:element ref="docbook:tip"/>
+                <xs:element ref="docbook:warning"/>
+                <xs:element ref="docbook:example"/>
+                <xs:element ref="docbook:figure"/>
+                <xs:element ref="docbook:table"/>
+                <xs:element ref="docbook:informalexample"/>
+                <xs:element ref="docbook:informalfigure"/>
+                <xs:element ref="docbook:informaltable"/>
+                <xs:element ref="docbook:sidebar"/>
+                <xs:element ref="docbook:blockquote"/>
+                <xs:element ref="docbook:address"/>
+                <xs:element ref="docbook:epigraph"/>
+                <xs:element ref="docbook:mediaobject"/>
+                <xs:element ref="docbook:screenshot"/>
+                <xs:element ref="docbook:task"/>
+                <xs:element ref="docbook:productionset"/>
+                <xs:element ref="docbook:constraintdef"/>
+                <xs:element ref="docbook:msgset"/>
+                <xs:element ref="docbook:programlisting"/>
+                <xs:element ref="docbook:screen"/>
+                <xs:element ref="docbook:literallayout"/>
+                <xs:element ref="docbook:synopsis"/>
+                <xs:element ref="docbook:programlistingco"/>
+                <xs:element ref="docbook:screenco"/>
+                <xs:element ref="docbook:cmdsynopsis"/>
+                <xs:element ref="docbook:funcsynopsis"/>
+                <xs:element ref="docbook:classsynopsis"/>
+                <xs:element ref="docbook:methodsynopsis"/>
+                <xs:element ref="docbook:constructorsynopsis"/>
+                <xs:element ref="docbook:destructorsynopsis"/>
+                <xs:element ref="docbook:fieldsynopsis"/>
+                <xs:element ref="docbook:bridgehead"/>
+                <xs:element ref="docbook:remark"/>
+                <xs:element ref="docbook:revhistory"/>
+                <xs:element ref="docbook:indexterm"/>
+                <xs:element ref="docbook:equation"/>
+                <xs:element ref="docbook:informalequation"/>
+                <xs:element ref="docbook:anchor"/>
+                <xs:element ref="docbook:para"/>
+                <xs:element ref="docbook:formalpara"/>
+                <xs:element ref="docbook:simpara"/>
+                <xs:element ref="docbook:annotation"/>
+              </xs:choice>
+            </xs:sequence>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:choice>
+              <xs:element ref="docbook:substeps"/>
+              <xs:element ref="docbook:stepalternatives"/>
+            </xs:choice>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+          </xs:sequence>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="performance">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="optional"/>
+            <xs:enumeration value="required"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="stepalternatives">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element maxOccurs="unbounded" ref="docbook:step"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="performance">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="optional"/>
+            <xs:enumeration value="required"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="substeps">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:step"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="performance">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="optional"/>
+            <xs:enumeration value="required"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sidebar">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="abstract">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="personblurb">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="blockquote">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:attribution"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="attribution">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bridgehead">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="renderas">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="sect1"/>
+            <xs:enumeration value="sect2"/>
+            <xs:enumeration value="sect3"/>
+            <xs:enumeration value="sect4"/>
+            <xs:enumeration value="sect5"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherrenderas" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="remark">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="epigraph">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element minOccurs="0" ref="docbook:attribution"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:literallayout"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="footnote">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+        <xs:element ref="docbook:annotation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="formalpara">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexterm"/>
+        <xs:element ref="docbook:para"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="para">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:info"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="simpara">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:info"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="caution">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="important">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="note">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tip">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="warning">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="itemizedlist">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element maxOccurs="unbounded" ref="docbook:listitem"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="spacing">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="compact"/>
+            <xs:enumeration value="normal"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="mark" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="orderedlist">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element maxOccurs="unbounded" ref="docbook:listitem"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="spacing">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="compact"/>
+            <xs:enumeration value="normal"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="continuation">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="continues"/>
+            <xs:enumeration value="restarts"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startingnumber" type="xs:NMTOKEN"/>
+      <xs:attribute name="inheritnum">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="ignore"/>
+            <xs:enumeration value="inherit"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="numeration">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="arabic"/>
+            <xs:enumeration value="upperalpha"/>
+            <xs:enumeration value="loweralpha"/>
+            <xs:enumeration value="upperroman"/>
+            <xs:enumeration value="lowerroman"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="listitem">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+        <xs:element ref="docbook:annotation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="override" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="segmentedlist">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:segtitle"/>
+        <xs:element maxOccurs="unbounded" ref="docbook:seglistitem"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="segtitle">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="seglistitem">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:seg"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="seg">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="simplelist">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:member"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="type" default="vert">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="horiz"/>
+            <xs:enumeration value="vert"/>
+            <xs:enumeration value="inline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="columns" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="member">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="variablelist">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element maxOccurs="unbounded" ref="docbook:varlistentry"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="spacing">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="compact"/>
+            <xs:enumeration value="normal"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="termlength"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="varlistentry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:term"/>
+        <xs:element ref="docbook:listitem"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="term">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="example">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:caption"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="floatstyle"/>
+      <xs:attribute name="width" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="informalexample">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:caption"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="floatstyle"/>
+      <xs:attribute name="width" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="programlisting">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:info"/>
+        <xs:element ref="docbook:textobject"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:lineannotation"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="continuation">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="continues"/>
+            <xs:enumeration value="restarts"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linenumbering">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="numbered"/>
+            <xs:enumeration value="unnumbered"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startinglinenumber" type="xs:NMTOKEN"/>
+      <xs:attribute name="language"/>
+      <xs:attribute ref="xml:space"/>
+      <xs:attribute name="width" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="literallayout">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:info"/>
+        <xs:element ref="docbook:textobject"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:lineannotation"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="continuation">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="continues"/>
+            <xs:enumeration value="restarts"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linenumbering">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="numbered"/>
+            <xs:enumeration value="unnumbered"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startinglinenumber" type="xs:NMTOKEN"/>
+      <xs:attribute name="language"/>
+      <xs:attribute ref="xml:space"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="monospaced"/>
+            <xs:enumeration value="normal"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="screen">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:info"/>
+        <xs:element ref="docbook:textobject"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:lineannotation"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="continuation">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="continues"/>
+            <xs:enumeration value="restarts"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linenumbering">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="numbered"/>
+            <xs:enumeration value="unnumbered"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startinglinenumber" type="xs:NMTOKEN"/>
+      <xs:attribute name="language"/>
+      <xs:attribute ref="xml:space"/>
+      <xs:attribute name="width" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="screenshot">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element ref="docbook:mediaobject"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="figure">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:caption"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="pgwide">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="floatstyle"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="informalfigure">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:caption"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="pgwide">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="floatstyle"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="mediaobject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element minOccurs="0" ref="docbook:alt"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:videoobject"/>
+          <xs:element ref="docbook:audioobject"/>
+          <xs:element ref="docbook:imageobject"/>
+          <xs:element ref="docbook:textobject"/>
+          <xs:element ref="docbook:imageobjectco"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:caption"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="inlinemediaobject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element minOccurs="0" ref="docbook:alt"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:videoobject"/>
+          <xs:element ref="docbook:audioobject"/>
+          <xs:element ref="docbook:imageobject"/>
+          <xs:element ref="docbook:textobject"/>
+          <xs:element ref="docbook:imageobjectco"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="videoobject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element ref="docbook:videodata"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="audioobject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element ref="docbook:audiodata"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="imageobject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element ref="docbook:imagedata"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="textobject">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:choice>
+          <xs:element ref="docbook:phrase"/>
+          <xs:element ref="docbook:textdata"/>
+          <xs:choice maxOccurs="unbounded">
+            <xs:element ref="docbook:itemizedlist"/>
+            <xs:element ref="docbook:orderedlist"/>
+            <xs:element ref="docbook:procedure"/>
+            <xs:element ref="docbook:simplelist"/>
+            <xs:element ref="docbook:variablelist"/>
+            <xs:element ref="docbook:segmentedlist"/>
+            <xs:element ref="docbook:glosslist"/>
+            <xs:element ref="docbook:bibliolist"/>
+            <xs:element ref="docbook:calloutlist"/>
+            <xs:element ref="docbook:qandaset"/>
+            <xs:element ref="docbook:caution"/>
+            <xs:element ref="docbook:important"/>
+            <xs:element ref="docbook:note"/>
+            <xs:element ref="docbook:tip"/>
+            <xs:element ref="docbook:warning"/>
+            <xs:element ref="docbook:example"/>
+            <xs:element ref="docbook:figure"/>
+            <xs:element ref="docbook:table"/>
+            <xs:element ref="docbook:informalexample"/>
+            <xs:element ref="docbook:informalfigure"/>
+            <xs:element ref="docbook:informaltable"/>
+            <xs:element ref="docbook:sidebar"/>
+            <xs:element ref="docbook:blockquote"/>
+            <xs:element ref="docbook:address"/>
+            <xs:element ref="docbook:epigraph"/>
+            <xs:element ref="docbook:mediaobject"/>
+            <xs:element ref="docbook:screenshot"/>
+            <xs:element ref="docbook:task"/>
+            <xs:element ref="docbook:productionset"/>
+            <xs:element ref="docbook:constraintdef"/>
+            <xs:element ref="docbook:msgset"/>
+            <xs:element ref="docbook:programlisting"/>
+            <xs:element ref="docbook:screen"/>
+            <xs:element ref="docbook:literallayout"/>
+            <xs:element ref="docbook:synopsis"/>
+            <xs:element ref="docbook:programlistingco"/>
+            <xs:element ref="docbook:screenco"/>
+            <xs:element ref="docbook:cmdsynopsis"/>
+            <xs:element ref="docbook:funcsynopsis"/>
+            <xs:element ref="docbook:classsynopsis"/>
+            <xs:element ref="docbook:methodsynopsis"/>
+            <xs:element ref="docbook:constructorsynopsis"/>
+            <xs:element ref="docbook:destructorsynopsis"/>
+            <xs:element ref="docbook:fieldsynopsis"/>
+            <xs:element ref="docbook:bridgehead"/>
+            <xs:element ref="docbook:remark"/>
+            <xs:element ref="docbook:revhistory"/>
+            <xs:element ref="docbook:indexterm"/>
+            <xs:element ref="docbook:equation"/>
+            <xs:element ref="docbook:informalequation"/>
+            <xs:element ref="docbook:anchor"/>
+            <xs:element ref="docbook:para"/>
+            <xs:element ref="docbook:formalpara"/>
+            <xs:element ref="docbook:simpara"/>
+            <xs:element ref="docbook:annotation"/>
+          </xs:choice>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="videodata">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="format"/>
+      <xs:attribute name="fileref"/>
+      <xs:attribute name="entityref" type="xs:ENTITY"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="char"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="right"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="top"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="width"/>
+      <xs:attribute name="contentwidth"/>
+      <xs:attribute name="scalefit">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="scale" type="xs:NMTOKEN"/>
+      <xs:attribute name="depth"/>
+      <xs:attribute name="contentdepth"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="audiodata">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="format"/>
+      <xs:attribute name="fileref"/>
+      <xs:attribute name="entityref" type="xs:ENTITY"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="imagedata">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="format"/>
+      <xs:attribute name="fileref"/>
+      <xs:attribute name="entityref" type="xs:ENTITY"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="char"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="right"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="top"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="width"/>
+      <xs:attribute name="contentwidth"/>
+      <xs:attribute name="scalefit">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="scale" type="xs:NMTOKEN"/>
+      <xs:attribute name="depth"/>
+      <xs:attribute name="contentdepth"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="textdata">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="format"/>
+      <xs:attribute name="fileref"/>
+      <xs:attribute name="entityref" type="xs:ENTITY"/>
+      <xs:attribute name="encoding"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="caption">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+        <xs:element ref="docbook:annotation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="synopsis">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:info"/>
+        <xs:element ref="docbook:textobject"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:lineannotation"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="continuation">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="continues"/>
+            <xs:enumeration value="restarts"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linenumbering">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="numbered"/>
+            <xs:enumeration value="unnumbered"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startinglinenumber" type="xs:NMTOKEN"/>
+      <xs:attribute name="language"/>
+      <xs:attribute ref="xml:space"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="cmdsynopsis">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:command"/>
+          <xs:element ref="docbook:arg"/>
+          <xs:element ref="docbook:group"/>
+          <xs:element ref="docbook:sbr"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:synopfragment"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="sepchar"/>
+      <xs:attribute name="cmdlength"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="arg">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:arg"/>
+        <xs:element ref="docbook:group"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:synopfragmentref"/>
+        <xs:element ref="docbook:sbr"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="rep" default="norepeat">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="norepeat"/>
+            <xs:enumeration value="repeat"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="choice" default="opt">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="opt"/>
+            <xs:enumeration value="plain"/>
+            <xs:enumeration value="req"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="group">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:arg"/>
+        <xs:element ref="docbook:group"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:synopfragmentref"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:sbr"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="rep" default="norepeat">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="norepeat"/>
+            <xs:enumeration value="repeat"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="choice" default="opt">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="opt"/>
+            <xs:enumeration value="plain"/>
+            <xs:enumeration value="req"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sbr">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="synopfragment">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:arg"/>
+        <xs:element ref="docbook:group"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="synopfragmentref">
+    <xs:complexType mixed="true">
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="funcsynopsis">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:funcsynopsisinfo"/>
+          <xs:element ref="docbook:funcprototype"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="language"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="funcsynopsisinfo">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:info"/>
+        <xs:element ref="docbook:textobject"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:lineannotation"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="continuation">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="continues"/>
+            <xs:enumeration value="restarts"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linenumbering">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="numbered"/>
+            <xs:enumeration value="unnumbered"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startinglinenumber" type="xs:NMTOKEN"/>
+      <xs:attribute name="language"/>
+      <xs:attribute ref="xml:space"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="funcprototype">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:modifier"/>
+        <xs:element ref="docbook:funcdef"/>
+        <xs:choice>
+          <xs:element ref="docbook:void"/>
+          <xs:element ref="docbook:varargs"/>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:paramdef"/>
+            <xs:element minOccurs="0" ref="docbook:varargs"/>
+          </xs:sequence>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:modifier"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="funcdef">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:function"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="void">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="varargs">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="paramdef">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:funcparams"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="choice" default="opt">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="opt"/>
+            <xs:enumeration value="req"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="funcparams">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="classsynopsis">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:ooclass"/>
+          <xs:element ref="docbook:ooexception"/>
+          <xs:element ref="docbook:oointerface"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:classsynopsisinfo"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="language"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="class"/>
+            <xs:enumeration value="interface"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="classsynopsisinfo">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:info"/>
+        <xs:element ref="docbook:textobject"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:lineannotation"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="continuation">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="continues"/>
+            <xs:enumeration value="restarts"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linenumbering">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="numbered"/>
+            <xs:enumeration value="unnumbered"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startinglinenumber" type="xs:NMTOKEN"/>
+      <xs:attribute name="language"/>
+      <xs:attribute ref="xml:space"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ooclass">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:package"/>
+          <xs:element ref="docbook:modifier"/>
+        </xs:choice>
+        <xs:element ref="docbook:classname"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="oointerface">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:package"/>
+          <xs:element ref="docbook:modifier"/>
+        </xs:choice>
+        <xs:element ref="docbook:interfacename"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ooexception">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:package"/>
+          <xs:element ref="docbook:modifier"/>
+        </xs:choice>
+        <xs:element ref="docbook:exceptionname"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="modifier">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute ref="xml:space"/>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="interfacename">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="exceptionname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="fieldsynopsis">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:modifier"/>
+        <xs:element minOccurs="0" ref="docbook:type"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element minOccurs="0" ref="docbook:initializer"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="language"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="initializer">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="constructorsynopsis">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:modifier"/>
+        <xs:element minOccurs="0" ref="docbook:methodname"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:methodparam"/>
+          <xs:element minOccurs="0" ref="docbook:void"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:exceptionname"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="language"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="destructorsynopsis">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:modifier"/>
+        <xs:element minOccurs="0" ref="docbook:methodname"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:methodparam"/>
+          <xs:element minOccurs="0" ref="docbook:void"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:exceptionname"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="language"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="methodsynopsis">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:modifier"/>
+        <xs:choice minOccurs="0">
+          <xs:element ref="docbook:type"/>
+          <xs:element ref="docbook:void"/>
+        </xs:choice>
+        <xs:element ref="docbook:methodname"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:methodparam"/>
+          <xs:element ref="docbook:void"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:exceptionname"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:modifier"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="language"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="methodname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="methodparam">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:modifier"/>
+          <xs:element ref="docbook:type"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:sequence>
+            <xs:element ref="docbook:parameter"/>
+            <xs:element minOccurs="0" ref="docbook:initializer"/>
+          </xs:sequence>
+          <xs:element ref="docbook:funcparams"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:modifier"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="rep" default="norepeat">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="norepeat"/>
+            <xs:enumeration value="repeat"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="choice" default="req">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="opt"/>
+            <xs:enumeration value="plain"/>
+            <xs:enumeration value="req"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="address">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:pob"/>
+        <xs:element ref="docbook:street"/>
+        <xs:element ref="docbook:city"/>
+        <xs:element ref="docbook:state"/>
+        <xs:element ref="docbook:postcode"/>
+        <xs:element ref="docbook:country"/>
+        <xs:element ref="docbook:phone"/>
+        <xs:element ref="docbook:fax"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:otheraddr"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="continuation">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="continues"/>
+            <xs:enumeration value="restarts"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="linenumbering">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="numbered"/>
+            <xs:enumeration value="unnumbered"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startinglinenumber" type="xs:NMTOKEN"/>
+      <xs:attribute name="language"/>
+      <xs:attribute ref="xml:space"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="street">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="pob">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="postcode">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="city">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="state">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="country">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="phone">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="fax">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="otheraddr">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="affiliation">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:shortaffil"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:jobtitle"/>
+        <xs:choice>
+          <xs:element minOccurs="0" ref="docbook:org"/>
+          <xs:sequence>
+            <xs:element minOccurs="0" ref="docbook:orgname"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:orgdiv"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:address"/>
+          </xs:sequence>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="shortaffil">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="jobtitle">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="orgname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="consortium"/>
+            <xs:enumeration value="corporation"/>
+            <xs:enumeration value="informal"/>
+            <xs:enumeration value="nonprofit"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherclass"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="orgdiv">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="artpagenums">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="personname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:honorific"/>
+        <xs:element ref="docbook:firstname"/>
+        <xs:element ref="docbook:surname"/>
+        <xs:element ref="docbook:lineage"/>
+        <xs:element ref="docbook:othername"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="author">
+    <xs:complexType>
+      <xs:choice>
+        <xs:sequence>
+          <xs:element ref="docbook:personname"/>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:personblurb"/>
+            <xs:element ref="docbook:affiliation"/>
+            <xs:element ref="docbook:email"/>
+            <xs:element ref="docbook:address"/>
+            <xs:element ref="docbook:contrib"/>
+          </xs:choice>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:element ref="docbook:orgname"/>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:orgdiv"/>
+            <xs:element ref="docbook:affiliation"/>
+            <xs:element ref="docbook:email"/>
+            <xs:element ref="docbook:address"/>
+            <xs:element ref="docbook:contrib"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="authorgroup">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:othercredit"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="collab">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:person"/>
+          <xs:element ref="docbook:personname"/>
+          <xs:element ref="docbook:org"/>
+          <xs:element ref="docbook:orgname"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:affiliation"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="authorinitials">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="person">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="docbook:personname"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:affiliation"/>
+          <xs:element ref="docbook:email"/>
+          <xs:element ref="docbook:personblurb"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="org">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="docbook:orgname"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:affiliation"/>
+          <xs:element ref="docbook:email"/>
+          <xs:element ref="docbook:orgdiv"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="confgroup">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:confdates"/>
+        <xs:element ref="docbook:conftitle"/>
+        <xs:element ref="docbook:confnum"/>
+        <xs:element ref="docbook:confsponsor"/>
+        <xs:element ref="docbook:address"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="confdates">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="conftitle">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="confnum">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="confsponsor">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="contractnum">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="contractsponsor">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="copyright">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:year"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:holder"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="year">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="holder">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="cover">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:revhistory"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="date">
+    <xs:complexType mixed="true">
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="edition">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="editor">
+    <xs:complexType>
+      <xs:choice>
+        <xs:sequence>
+          <xs:element ref="docbook:personname"/>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:personblurb"/>
+            <xs:element ref="docbook:affiliation"/>
+            <xs:element ref="docbook:email"/>
+            <xs:element ref="docbook:address"/>
+            <xs:element ref="docbook:contrib"/>
+          </xs:choice>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:element ref="docbook:orgname"/>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:orgdiv"/>
+            <xs:element ref="docbook:affiliation"/>
+            <xs:element ref="docbook:email"/>
+            <xs:element ref="docbook:address"/>
+            <xs:element ref="docbook:contrib"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="biblioid">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="doi"/>
+            <xs:enumeration value="isbn"/>
+            <xs:enumeration value="isrn"/>
+            <xs:enumeration value="issn"/>
+            <xs:enumeration value="libraryofcongress"/>
+            <xs:enumeration value="pubsnumber"/>
+            <xs:enumeration value="uri"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherclass" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="citebiblioid">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="doi"/>
+            <xs:enumeration value="isbn"/>
+            <xs:enumeration value="isrn"/>
+            <xs:enumeration value="issn"/>
+            <xs:enumeration value="libraryofcongress"/>
+            <xs:enumeration value="pubsnumber"/>
+            <xs:enumeration value="uri"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherclass" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliosource">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="doi"/>
+            <xs:enumeration value="isbn"/>
+            <xs:enumeration value="isrn"/>
+            <xs:enumeration value="issn"/>
+            <xs:enumeration value="libraryofcongress"/>
+            <xs:enumeration value="pubsnumber"/>
+            <xs:enumeration value="uri"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherclass" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliorelation">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="doi"/>
+            <xs:enumeration value="isbn"/>
+            <xs:enumeration value="isrn"/>
+            <xs:enumeration value="issn"/>
+            <xs:enumeration value="libraryofcongress"/>
+            <xs:enumeration value="pubsnumber"/>
+            <xs:enumeration value="uri"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherclass" type="xs:NMTOKEN"/>
+      <xs:attribute name="type">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="hasformat"/>
+            <xs:enumeration value="haspart"/>
+            <xs:enumeration value="hasversion"/>
+            <xs:enumeration value="isformatof"/>
+            <xs:enumeration value="ispartof"/>
+            <xs:enumeration value="isreferencedby"/>
+            <xs:enumeration value="isreplacedby"/>
+            <xs:enumeration value="isrequiredby"/>
+            <xs:enumeration value="isversionof"/>
+            <xs:enumeration value="references"/>
+            <xs:enumeration value="replaces"/>
+            <xs:enumeration value="requires"/>
+            <xs:enumeration value="othertype"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="othertype" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliocoverage">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="spatial">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="dcmipoint"/>
+            <xs:enumeration value="iso3166"/>
+            <xs:enumeration value="dcmibox"/>
+            <xs:enumeration value="tgn"/>
+            <xs:enumeration value="otherspatial"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherspatial" type="xs:NMTOKEN"/>
+      <xs:attribute name="temporal">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="dcmiperiod"/>
+            <xs:enumeration value="w3c-dtf"/>
+            <xs:enumeration value="othertemporal"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="othertemporal" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="legalnotice">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="othercredit">
+    <xs:complexType>
+      <xs:choice>
+        <xs:sequence>
+          <xs:element ref="docbook:personname"/>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:personblurb"/>
+            <xs:element ref="docbook:affiliation"/>
+            <xs:element ref="docbook:email"/>
+            <xs:element ref="docbook:address"/>
+            <xs:element ref="docbook:contrib"/>
+          </xs:choice>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:element ref="docbook:orgname"/>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:orgdiv"/>
+            <xs:element ref="docbook:affiliation"/>
+            <xs:element ref="docbook:email"/>
+            <xs:element ref="docbook:address"/>
+            <xs:element ref="docbook:contrib"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="copyeditor"/>
+            <xs:enumeration value="graphicdesigner"/>
+            <xs:enumeration value="other"/>
+            <xs:enumeration value="productioneditor"/>
+            <xs:enumeration value="technicaleditor"/>
+            <xs:enumeration value="translator"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherclass" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="pagenums">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="contrib">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="honorific">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="firstname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="surname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lineage">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="othername">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="printhistory">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="productname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="copyright"/>
+            <xs:enumeration value="registered"/>
+            <xs:enumeration value="service"/>
+            <xs:enumeration value="trade"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="productnumber">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="pubdate">
+    <xs:complexType mixed="true">
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="publisher">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="docbook:publishername"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:address"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="publishername">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="releaseinfo">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="revhistory">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:revision"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="revision">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:revnumber"/>
+        <xs:element ref="docbook:date"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:authorinitials"/>
+          <xs:element ref="docbook:author"/>
+        </xs:choice>
+        <xs:choice minOccurs="0">
+          <xs:element ref="docbook:revremark"/>
+          <xs:element ref="docbook:revdescription"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="revnumber">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="revremark">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="revdescription">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+        <xs:element ref="docbook:annotation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="seriesvolnums">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="volumenum">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="issuenum">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="accel">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="application">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="hardware"/>
+            <xs:enumeration value="software"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="package">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="classname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="command">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="computeroutput">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="database">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="altkey"/>
+            <xs:enumeration value="constraint"/>
+            <xs:enumeration value="datatype"/>
+            <xs:enumeration value="field"/>
+            <xs:enumeration value="foreignkey"/>
+            <xs:enumeration value="group"/>
+            <xs:enumeration value="index"/>
+            <xs:enumeration value="key1"/>
+            <xs:enumeration value="key2"/>
+            <xs:enumeration value="name"/>
+            <xs:enumeration value="primarykey"/>
+            <xs:enumeration value="procedure"/>
+            <xs:enumeration value="record"/>
+            <xs:enumeration value="rule"/>
+            <xs:enumeration value="secondarykey"/>
+            <xs:enumeration value="table"/>
+            <xs:enumeration value="user"/>
+            <xs:enumeration value="view"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="email">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="envar">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="errorcode">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="errorname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="errortext">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="errortype">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="filename">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="path"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="devicefile"/>
+            <xs:enumeration value="directory"/>
+            <xs:enumeration value="extension"/>
+            <xs:enumeration value="headerfile"/>
+            <xs:enumeration value="libraryfile"/>
+            <xs:enumeration value="partition"/>
+            <xs:enumeration value="symlink"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="function">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="guibutton">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:accel"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="guiicon">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:accel"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="guilabel">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:accel"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="guimenu">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:accel"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="guimenuitem">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:accel"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="guisubmenu">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:accel"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="hardware">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="keycap">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="function">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="alt"/>
+            <xs:enumeration value="backspace"/>
+            <xs:enumeration value="command"/>
+            <xs:enumeration value="control"/>
+            <xs:enumeration value="delete"/>
+            <xs:enumeration value="down"/>
+            <xs:enumeration value="end"/>
+            <xs:enumeration value="enter"/>
+            <xs:enumeration value="escape"/>
+            <xs:enumeration value="home"/>
+            <xs:enumeration value="insert"/>
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="meta"/>
+            <xs:enumeration value="option"/>
+            <xs:enumeration value="pagedown"/>
+            <xs:enumeration value="pageup"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="shift"/>
+            <xs:enumeration value="space"/>
+            <xs:enumeration value="tab"/>
+            <xs:enumeration value="up"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherfunction"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="keycode">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="keycombo">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:mousebutton"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="action">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="click"/>
+            <xs:enumeration value="double-click"/>
+            <xs:enumeration value="press"/>
+            <xs:enumeration value="seq"/>
+            <xs:enumeration value="simul"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otheraction"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="keysym">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lineannotation">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="literal">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="code">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="language"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="constant">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="limit"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="varname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="markup">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="menuchoice">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:shortcut"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:guibutton"/>
+          <xs:element ref="docbook:guiicon"/>
+          <xs:element ref="docbook:guilabel"/>
+          <xs:element ref="docbook:guimenu"/>
+          <xs:element ref="docbook:guimenuitem"/>
+          <xs:element ref="docbook:guisubmenu"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="shortcut">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:mousebutton"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="action">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="click"/>
+            <xs:enumeration value="double-click"/>
+            <xs:enumeration value="press"/>
+            <xs:enumeration value="seq"/>
+            <xs:enumeration value="simul"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otheraction"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="mousebutton">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="option">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="optional">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="property">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="parameter">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="command"/>
+            <xs:enumeration value="function"/>
+            <xs:enumeration value="option"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="prompt">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="replaceable">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="command"/>
+            <xs:enumeration value="function"/>
+            <xs:enumeration value="option"/>
+            <xs:enumeration value="parameter"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="returnvalue">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tag">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="attribute"/>
+            <xs:enumeration value="attvalue"/>
+            <xs:enumeration value="element"/>
+            <xs:enumeration value="emptytag"/>
+            <xs:enumeration value="endtag"/>
+            <xs:enumeration value="genentity"/>
+            <xs:enumeration value="localname"/>
+            <xs:enumeration value="namespace"/>
+            <xs:enumeration value="numcharref"/>
+            <xs:enumeration value="paramentity"/>
+            <xs:enumeration value="pi"/>
+            <xs:enumeration value="prefix"/>
+            <xs:enumeration value="comment"/>
+            <xs:enumeration value="starttag"/>
+            <xs:enumeration value="xmlpi"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="namespace"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="symbol">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="limit"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="systemitem">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="daemon"/>
+            <xs:enumeration value="domainname"/>
+            <xs:enumeration value="etheraddress"/>
+            <xs:enumeration value="event"/>
+            <xs:enumeration value="eventhandler"/>
+            <xs:enumeration value="filesystem"/>
+            <xs:enumeration value="fqdomainname"/>
+            <xs:enumeration value="groupname"/>
+            <xs:enumeration value="ipaddress"/>
+            <xs:enumeration value="library"/>
+            <xs:enumeration value="macro"/>
+            <xs:enumeration value="netmask"/>
+            <xs:enumeration value="newsgroup"/>
+            <xs:enumeration value="osname"/>
+            <xs:enumeration value="process"/>
+            <xs:enumeration value="protocol"/>
+            <xs:enumeration value="resource"/>
+            <xs:enumeration value="server"/>
+            <xs:enumeration value="service"/>
+            <xs:enumeration value="systemname"/>
+            <xs:enumeration value="username"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="uri">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="type"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="token">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="type">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="userinput">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:co"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="abbrev">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:trademark"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="acronym">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:trademark"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="citation">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="citerefentry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="docbook:refentrytitle"/>
+        <xs:element minOccurs="0" ref="docbook:manvolnum"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refentrytitle">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="manvolnum">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="citetitle">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="pubwork">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="article"/>
+            <xs:enumeration value="bbs"/>
+            <xs:enumeration value="book"/>
+            <xs:enumeration value="cdrom"/>
+            <xs:enumeration value="chapter"/>
+            <xs:enumeration value="dvd"/>
+            <xs:enumeration value="emailmessage"/>
+            <xs:enumeration value="gopher"/>
+            <xs:enumeration value="journal"/>
+            <xs:enumeration value="manuscript"/>
+            <xs:enumeration value="newsposting"/>
+            <xs:enumeration value="part"/>
+            <xs:enumeration value="refentry"/>
+            <xs:enumeration value="section"/>
+            <xs:enumeration value="series"/>
+            <xs:enumeration value="set"/>
+            <xs:enumeration value="webpage"/>
+            <xs:enumeration value="wiki"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="emphasis">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="foreignphrase">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="phrase">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="quote">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="subscript">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="superscript">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="trademark">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="copyright"/>
+            <xs:enumeration value="registered"/>
+            <xs:enumeration value="service"/>
+            <xs:enumeration value="trade"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="wordasword">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="footnoteref">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="xref">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="xrefstyle"/>
+      <xs:attribute name="endterm" type="xs:IDREF"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="link">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="xrefstyle"/>
+      <xs:attribute name="endterm" type="xs:IDREF"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="olink">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="targetdoc"/>
+      <xs:attribute name="role"/>
+      <xs:attribute name="xrefstyle"/>
+      <xs:attribute name="localinfo"/>
+      <xs:attribute name="targetptr"/>
+      <xs:attribute name="type"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="anchor">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="alt">
+    <xs:complexType mixed="true">
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:inlinemediaobject"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="annotation">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attribute name="annotates"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="extendedlink">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:locator"/>
+        <xs:element ref="docbook:arc"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="locator">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute ref="xlink:label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="arc">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute ref="xlink:from"/>
+      <xs:attribute ref="xlink:to"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="set">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:toc"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:set"/>
+          <xs:element ref="docbook:book"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:setindex"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="book">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+          <xs:element ref="docbook:dedication"/>
+          <xs:element ref="docbook:preface"/>
+          <xs:element ref="docbook:chapter"/>
+          <xs:element ref="docbook:appendix"/>
+          <xs:element ref="docbook:article"/>
+          <xs:element ref="docbook:colophon"/>
+          <xs:element ref="docbook:part"/>
+          <xs:element ref="docbook:reference"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="dedication">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="colophon">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="appendix">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:glossary"/>
+            <xs:element ref="docbook:bibliography"/>
+            <xs:element ref="docbook:index"/>
+            <xs:element ref="docbook:toc"/>
+          </xs:choice>
+          <xs:choice>
+            <xs:sequence>
+              <xs:choice maxOccurs="unbounded">
+                <xs:element ref="docbook:itemizedlist"/>
+                <xs:element ref="docbook:orderedlist"/>
+                <xs:element ref="docbook:procedure"/>
+                <xs:element ref="docbook:simplelist"/>
+                <xs:element ref="docbook:variablelist"/>
+                <xs:element ref="docbook:segmentedlist"/>
+                <xs:element ref="docbook:glosslist"/>
+                <xs:element ref="docbook:bibliolist"/>
+                <xs:element ref="docbook:calloutlist"/>
+                <xs:element ref="docbook:qandaset"/>
+                <xs:element ref="docbook:caution"/>
+                <xs:element ref="docbook:important"/>
+                <xs:element ref="docbook:note"/>
+                <xs:element ref="docbook:tip"/>
+                <xs:element ref="docbook:warning"/>
+                <xs:element ref="docbook:example"/>
+                <xs:element ref="docbook:figure"/>
+                <xs:element ref="docbook:table"/>
+                <xs:element ref="docbook:informalexample"/>
+                <xs:element ref="docbook:informalfigure"/>
+                <xs:element ref="docbook:informaltable"/>
+                <xs:element ref="docbook:sidebar"/>
+                <xs:element ref="docbook:blockquote"/>
+                <xs:element ref="docbook:address"/>
+                <xs:element ref="docbook:epigraph"/>
+                <xs:element ref="docbook:mediaobject"/>
+                <xs:element ref="docbook:screenshot"/>
+                <xs:element ref="docbook:task"/>
+                <xs:element ref="docbook:productionset"/>
+                <xs:element ref="docbook:constraintdef"/>
+                <xs:element ref="docbook:msgset"/>
+                <xs:element ref="docbook:programlisting"/>
+                <xs:element ref="docbook:screen"/>
+                <xs:element ref="docbook:literallayout"/>
+                <xs:element ref="docbook:synopsis"/>
+                <xs:element ref="docbook:programlistingco"/>
+                <xs:element ref="docbook:screenco"/>
+                <xs:element ref="docbook:cmdsynopsis"/>
+                <xs:element ref="docbook:funcsynopsis"/>
+                <xs:element ref="docbook:classsynopsis"/>
+                <xs:element ref="docbook:methodsynopsis"/>
+                <xs:element ref="docbook:constructorsynopsis"/>
+                <xs:element ref="docbook:destructorsynopsis"/>
+                <xs:element ref="docbook:fieldsynopsis"/>
+                <xs:element ref="docbook:bridgehead"/>
+                <xs:element ref="docbook:remark"/>
+                <xs:element ref="docbook:revhistory"/>
+                <xs:element ref="docbook:indexterm"/>
+                <xs:element ref="docbook:equation"/>
+                <xs:element ref="docbook:informalequation"/>
+                <xs:element ref="docbook:anchor"/>
+                <xs:element ref="docbook:para"/>
+                <xs:element ref="docbook:formalpara"/>
+                <xs:element ref="docbook:simpara"/>
+                <xs:element ref="docbook:annotation"/>
+              </xs:choice>
+              <xs:choice minOccurs="0">
+                <xs:sequence>
+                  <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+                </xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+                <xs:sequence>
+                  <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+                </xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+              </xs:choice>
+            </xs:sequence>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+              <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+              <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+          </xs:choice>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:glossary"/>
+            <xs:element ref="docbook:bibliography"/>
+            <xs:element ref="docbook:index"/>
+            <xs:element ref="docbook:toc"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="chapter">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:glossary"/>
+            <xs:element ref="docbook:bibliography"/>
+            <xs:element ref="docbook:index"/>
+            <xs:element ref="docbook:toc"/>
+          </xs:choice>
+          <xs:choice>
+            <xs:sequence>
+              <xs:choice maxOccurs="unbounded">
+                <xs:element ref="docbook:itemizedlist"/>
+                <xs:element ref="docbook:orderedlist"/>
+                <xs:element ref="docbook:procedure"/>
+                <xs:element ref="docbook:simplelist"/>
+                <xs:element ref="docbook:variablelist"/>
+                <xs:element ref="docbook:segmentedlist"/>
+                <xs:element ref="docbook:glosslist"/>
+                <xs:element ref="docbook:bibliolist"/>
+                <xs:element ref="docbook:calloutlist"/>
+                <xs:element ref="docbook:qandaset"/>
+                <xs:element ref="docbook:caution"/>
+                <xs:element ref="docbook:important"/>
+                <xs:element ref="docbook:note"/>
+                <xs:element ref="docbook:tip"/>
+                <xs:element ref="docbook:warning"/>
+                <xs:element ref="docbook:example"/>
+                <xs:element ref="docbook:figure"/>
+                <xs:element ref="docbook:table"/>
+                <xs:element ref="docbook:informalexample"/>
+                <xs:element ref="docbook:informalfigure"/>
+                <xs:element ref="docbook:informaltable"/>
+                <xs:element ref="docbook:sidebar"/>
+                <xs:element ref="docbook:blockquote"/>
+                <xs:element ref="docbook:address"/>
+                <xs:element ref="docbook:epigraph"/>
+                <xs:element ref="docbook:mediaobject"/>
+                <xs:element ref="docbook:screenshot"/>
+                <xs:element ref="docbook:task"/>
+                <xs:element ref="docbook:productionset"/>
+                <xs:element ref="docbook:constraintdef"/>
+                <xs:element ref="docbook:msgset"/>
+                <xs:element ref="docbook:programlisting"/>
+                <xs:element ref="docbook:screen"/>
+                <xs:element ref="docbook:literallayout"/>
+                <xs:element ref="docbook:synopsis"/>
+                <xs:element ref="docbook:programlistingco"/>
+                <xs:element ref="docbook:screenco"/>
+                <xs:element ref="docbook:cmdsynopsis"/>
+                <xs:element ref="docbook:funcsynopsis"/>
+                <xs:element ref="docbook:classsynopsis"/>
+                <xs:element ref="docbook:methodsynopsis"/>
+                <xs:element ref="docbook:constructorsynopsis"/>
+                <xs:element ref="docbook:destructorsynopsis"/>
+                <xs:element ref="docbook:fieldsynopsis"/>
+                <xs:element ref="docbook:bridgehead"/>
+                <xs:element ref="docbook:remark"/>
+                <xs:element ref="docbook:revhistory"/>
+                <xs:element ref="docbook:indexterm"/>
+                <xs:element ref="docbook:equation"/>
+                <xs:element ref="docbook:informalequation"/>
+                <xs:element ref="docbook:anchor"/>
+                <xs:element ref="docbook:para"/>
+                <xs:element ref="docbook:formalpara"/>
+                <xs:element ref="docbook:simpara"/>
+                <xs:element ref="docbook:annotation"/>
+              </xs:choice>
+              <xs:choice minOccurs="0">
+                <xs:sequence>
+                  <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+                </xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+                <xs:sequence>
+                  <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+                </xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+              </xs:choice>
+            </xs:sequence>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+              <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+              <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+          </xs:choice>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:glossary"/>
+            <xs:element ref="docbook:bibliography"/>
+            <xs:element ref="docbook:index"/>
+            <xs:element ref="docbook:toc"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="part">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:partintro"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+          <xs:element ref="docbook:dedication"/>
+          <xs:element ref="docbook:preface"/>
+          <xs:element ref="docbook:chapter"/>
+          <xs:element ref="docbook:appendix"/>
+          <xs:element ref="docbook:article"/>
+          <xs:element ref="docbook:colophon"/>
+          <xs:element ref="docbook:refentry"/>
+          <xs:element ref="docbook:reference"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="preface">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:glossary"/>
+            <xs:element ref="docbook:bibliography"/>
+            <xs:element ref="docbook:index"/>
+            <xs:element ref="docbook:toc"/>
+          </xs:choice>
+          <xs:choice>
+            <xs:sequence>
+              <xs:choice maxOccurs="unbounded">
+                <xs:element ref="docbook:itemizedlist"/>
+                <xs:element ref="docbook:orderedlist"/>
+                <xs:element ref="docbook:procedure"/>
+                <xs:element ref="docbook:simplelist"/>
+                <xs:element ref="docbook:variablelist"/>
+                <xs:element ref="docbook:segmentedlist"/>
+                <xs:element ref="docbook:glosslist"/>
+                <xs:element ref="docbook:bibliolist"/>
+                <xs:element ref="docbook:calloutlist"/>
+                <xs:element ref="docbook:qandaset"/>
+                <xs:element ref="docbook:caution"/>
+                <xs:element ref="docbook:important"/>
+                <xs:element ref="docbook:note"/>
+                <xs:element ref="docbook:tip"/>
+                <xs:element ref="docbook:warning"/>
+                <xs:element ref="docbook:example"/>
+                <xs:element ref="docbook:figure"/>
+                <xs:element ref="docbook:table"/>
+                <xs:element ref="docbook:informalexample"/>
+                <xs:element ref="docbook:informalfigure"/>
+                <xs:element ref="docbook:informaltable"/>
+                <xs:element ref="docbook:sidebar"/>
+                <xs:element ref="docbook:blockquote"/>
+                <xs:element ref="docbook:address"/>
+                <xs:element ref="docbook:epigraph"/>
+                <xs:element ref="docbook:mediaobject"/>
+                <xs:element ref="docbook:screenshot"/>
+                <xs:element ref="docbook:task"/>
+                <xs:element ref="docbook:productionset"/>
+                <xs:element ref="docbook:constraintdef"/>
+                <xs:element ref="docbook:msgset"/>
+                <xs:element ref="docbook:programlisting"/>
+                <xs:element ref="docbook:screen"/>
+                <xs:element ref="docbook:literallayout"/>
+                <xs:element ref="docbook:synopsis"/>
+                <xs:element ref="docbook:programlistingco"/>
+                <xs:element ref="docbook:screenco"/>
+                <xs:element ref="docbook:cmdsynopsis"/>
+                <xs:element ref="docbook:funcsynopsis"/>
+                <xs:element ref="docbook:classsynopsis"/>
+                <xs:element ref="docbook:methodsynopsis"/>
+                <xs:element ref="docbook:constructorsynopsis"/>
+                <xs:element ref="docbook:destructorsynopsis"/>
+                <xs:element ref="docbook:fieldsynopsis"/>
+                <xs:element ref="docbook:bridgehead"/>
+                <xs:element ref="docbook:remark"/>
+                <xs:element ref="docbook:revhistory"/>
+                <xs:element ref="docbook:indexterm"/>
+                <xs:element ref="docbook:equation"/>
+                <xs:element ref="docbook:informalequation"/>
+                <xs:element ref="docbook:anchor"/>
+                <xs:element ref="docbook:para"/>
+                <xs:element ref="docbook:formalpara"/>
+                <xs:element ref="docbook:simpara"/>
+                <xs:element ref="docbook:annotation"/>
+              </xs:choice>
+              <xs:choice minOccurs="0">
+                <xs:sequence>
+                  <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+                </xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+                <xs:sequence>
+                  <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+                  <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+                </xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+              </xs:choice>
+            </xs:sequence>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+              <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+            <xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+              <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+          </xs:choice>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:glossary"/>
+            <xs:element ref="docbook:bibliography"/>
+            <xs:element ref="docbook:index"/>
+            <xs:element ref="docbook:toc"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="partintro">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:choice minOccurs="0">
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="section">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:choice minOccurs="0">
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+              <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="simplesect">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ackno">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="article">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:choice minOccurs="0">
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:section"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:sect1"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:appendix"/>
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+          <xs:element ref="docbook:ackno"/>
+          <xs:element ref="docbook:colophon"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="faq"/>
+            <xs:enumeration value="journalarticle"/>
+            <xs:enumeration value="productsheet"/>
+            <xs:enumeration value="specification"/>
+            <xs:enumeration value="techreport"/>
+            <xs:enumeration value="whitepaper"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sect1">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:choice minOccurs="0">
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:sect2"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:sect2"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sect2">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:choice minOccurs="0">
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:sect3"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:sect3"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sect3">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:choice minOccurs="0">
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:sect4"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:sect4"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sect4">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:choice minOccurs="0">
+              <xs:sequence>
+                <xs:element maxOccurs="unbounded" ref="docbook:sect5"/>
+                <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+              </xs:sequence>
+              <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element maxOccurs="unbounded" ref="docbook:sect5"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="sect5">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplesect"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:glossary"/>
+          <xs:element ref="docbook:bibliography"/>
+          <xs:element ref="docbook:index"/>
+          <xs:element ref="docbook:toc"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="reference">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:partintro"/>
+        <xs:element maxOccurs="unbounded" ref="docbook:refentry"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="status"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refentry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexterm"/>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element minOccurs="0" ref="docbook:refmeta"/>
+        <xs:element maxOccurs="unbounded" ref="docbook:refnamediv"/>
+        <xs:element minOccurs="0" ref="docbook:refsynopsisdiv"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:refsection"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:refsect1"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="status"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refmeta">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexterm"/>
+        <xs:element ref="docbook:refentrytitle"/>
+        <xs:element minOccurs="0" ref="docbook:manvolnum"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:refmiscinfo"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexterm"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refmiscinfo">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="source"/>
+            <xs:enumeration value="version"/>
+            <xs:enumeration value="manual"/>
+            <xs:enumeration value="sectdesc"/>
+            <xs:enumeration value="software"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherclass"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refnamediv">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:refdescriptor"/>
+        <xs:element maxOccurs="unbounded" ref="docbook:refname"/>
+        <xs:element ref="docbook:refpurpose"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:refclass"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refdescriptor">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refname">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refpurpose">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refclass">
+    <xs:complexType mixed="true">
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:application"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refsynopsisdiv">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:choice minOccurs="0">
+              <xs:element maxOccurs="unbounded" ref="docbook:refsection"/>
+              <xs:element maxOccurs="unbounded" ref="docbook:refsect2"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:refsection"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:refsect2"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refsection">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:refsection"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:refsection"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="status"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refsect1">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:element maxOccurs="unbounded" ref="docbook:refsect2"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:refsect2"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refsect2">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:sequence>
+            <xs:choice maxOccurs="unbounded">
+              <xs:element ref="docbook:itemizedlist"/>
+              <xs:element ref="docbook:orderedlist"/>
+              <xs:element ref="docbook:procedure"/>
+              <xs:element ref="docbook:simplelist"/>
+              <xs:element ref="docbook:variablelist"/>
+              <xs:element ref="docbook:segmentedlist"/>
+              <xs:element ref="docbook:glosslist"/>
+              <xs:element ref="docbook:bibliolist"/>
+              <xs:element ref="docbook:calloutlist"/>
+              <xs:element ref="docbook:qandaset"/>
+              <xs:element ref="docbook:caution"/>
+              <xs:element ref="docbook:important"/>
+              <xs:element ref="docbook:note"/>
+              <xs:element ref="docbook:tip"/>
+              <xs:element ref="docbook:warning"/>
+              <xs:element ref="docbook:example"/>
+              <xs:element ref="docbook:figure"/>
+              <xs:element ref="docbook:table"/>
+              <xs:element ref="docbook:informalexample"/>
+              <xs:element ref="docbook:informalfigure"/>
+              <xs:element ref="docbook:informaltable"/>
+              <xs:element ref="docbook:sidebar"/>
+              <xs:element ref="docbook:blockquote"/>
+              <xs:element ref="docbook:address"/>
+              <xs:element ref="docbook:epigraph"/>
+              <xs:element ref="docbook:mediaobject"/>
+              <xs:element ref="docbook:screenshot"/>
+              <xs:element ref="docbook:task"/>
+              <xs:element ref="docbook:productionset"/>
+              <xs:element ref="docbook:constraintdef"/>
+              <xs:element ref="docbook:msgset"/>
+              <xs:element ref="docbook:programlisting"/>
+              <xs:element ref="docbook:screen"/>
+              <xs:element ref="docbook:literallayout"/>
+              <xs:element ref="docbook:synopsis"/>
+              <xs:element ref="docbook:programlistingco"/>
+              <xs:element ref="docbook:screenco"/>
+              <xs:element ref="docbook:cmdsynopsis"/>
+              <xs:element ref="docbook:funcsynopsis"/>
+              <xs:element ref="docbook:classsynopsis"/>
+              <xs:element ref="docbook:methodsynopsis"/>
+              <xs:element ref="docbook:constructorsynopsis"/>
+              <xs:element ref="docbook:destructorsynopsis"/>
+              <xs:element ref="docbook:fieldsynopsis"/>
+              <xs:element ref="docbook:bridgehead"/>
+              <xs:element ref="docbook:remark"/>
+              <xs:element ref="docbook:revhistory"/>
+              <xs:element ref="docbook:indexterm"/>
+              <xs:element ref="docbook:equation"/>
+              <xs:element ref="docbook:informalequation"/>
+              <xs:element ref="docbook:anchor"/>
+              <xs:element ref="docbook:para"/>
+              <xs:element ref="docbook:formalpara"/>
+              <xs:element ref="docbook:simpara"/>
+              <xs:element ref="docbook:annotation"/>
+            </xs:choice>
+            <xs:element maxOccurs="unbounded" ref="docbook:refsect3"/>
+          </xs:sequence>
+          <xs:element maxOccurs="unbounded" ref="docbook:refsect3"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="refsect3">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="glosslist">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence minOccurs="0">
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element maxOccurs="unbounded" ref="docbook:glossentry"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="glossentry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element minOccurs="0" ref="docbook:acronym"/>
+        <xs:element minOccurs="0" ref="docbook:abbrev"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexterm"/>
+        <xs:choice>
+          <xs:element ref="docbook:glosssee"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:glossdef"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="sortas"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="glossdef">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:glossseealso"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="subject"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="glosssee">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="otherterm" type="xs:IDREF"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="glossseealso">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="otherterm" type="xs:IDREF"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="firstterm">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="baseform"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="glossterm">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="baseform"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="glossary">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:glossdiv"/>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:glossentry"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:bibliography"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="glossdiv">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element maxOccurs="unbounded" ref="docbook:glossentry"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="termdef">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="baseform"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="biblioentry">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:abstract"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:artpagenums"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:authorgroup"/>
+        <xs:element ref="docbook:authorinitials"/>
+        <xs:element ref="docbook:bibliocoverage"/>
+        <xs:element ref="docbook:biblioid"/>
+        <xs:element ref="docbook:bibliosource"/>
+        <xs:element ref="docbook:collab"/>
+        <xs:element ref="docbook:confgroup"/>
+        <xs:element ref="docbook:contractsponsor"/>
+        <xs:element ref="docbook:contractnum"/>
+        <xs:element ref="docbook:copyright"/>
+        <xs:element ref="docbook:cover"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:edition"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:issuenum"/>
+        <xs:element ref="docbook:keywordset"/>
+        <xs:element ref="docbook:legalnotice"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:othercredit"/>
+        <xs:element ref="docbook:pagenums"/>
+        <xs:element ref="docbook:printhistory"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:pubdate"/>
+        <xs:element ref="docbook:publisher"/>
+        <xs:element ref="docbook:publishername"/>
+        <xs:element ref="docbook:releaseinfo"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:seriesvolnums"/>
+        <xs:element ref="docbook:subjectset"/>
+        <xs:element ref="docbook:volumenum"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:extendedlink"/>
+        <xs:element ref="docbook:bibliomisc"/>
+        <xs:element ref="docbook:bibliomset"/>
+        <xs:element ref="docbook:bibliorelation"/>
+        <xs:element ref="docbook:biblioset"/>
+        <xs:element ref="docbook:itermset"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:subtitle"/>
+        <xs:element ref="docbook:title"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliomixed">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:abstract"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:artpagenums"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:authorgroup"/>
+        <xs:element ref="docbook:authorinitials"/>
+        <xs:element ref="docbook:bibliocoverage"/>
+        <xs:element ref="docbook:biblioid"/>
+        <xs:element ref="docbook:bibliosource"/>
+        <xs:element ref="docbook:collab"/>
+        <xs:element ref="docbook:confgroup"/>
+        <xs:element ref="docbook:contractsponsor"/>
+        <xs:element ref="docbook:contractnum"/>
+        <xs:element ref="docbook:copyright"/>
+        <xs:element ref="docbook:cover"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:edition"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:issuenum"/>
+        <xs:element ref="docbook:keywordset"/>
+        <xs:element ref="docbook:legalnotice"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:othercredit"/>
+        <xs:element ref="docbook:pagenums"/>
+        <xs:element ref="docbook:printhistory"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:pubdate"/>
+        <xs:element ref="docbook:publisher"/>
+        <xs:element ref="docbook:publishername"/>
+        <xs:element ref="docbook:releaseinfo"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:seriesvolnums"/>
+        <xs:element ref="docbook:subjectset"/>
+        <xs:element ref="docbook:volumenum"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:extendedlink"/>
+        <xs:element ref="docbook:bibliomisc"/>
+        <xs:element ref="docbook:bibliomset"/>
+        <xs:element ref="docbook:bibliorelation"/>
+        <xs:element ref="docbook:biblioset"/>
+        <xs:element ref="docbook:itermset"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:subtitle"/>
+        <xs:element ref="docbook:title"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="biblioset">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:abstract"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:artpagenums"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:authorgroup"/>
+        <xs:element ref="docbook:authorinitials"/>
+        <xs:element ref="docbook:bibliocoverage"/>
+        <xs:element ref="docbook:biblioid"/>
+        <xs:element ref="docbook:bibliosource"/>
+        <xs:element ref="docbook:collab"/>
+        <xs:element ref="docbook:confgroup"/>
+        <xs:element ref="docbook:contractsponsor"/>
+        <xs:element ref="docbook:contractnum"/>
+        <xs:element ref="docbook:copyright"/>
+        <xs:element ref="docbook:cover"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:edition"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:issuenum"/>
+        <xs:element ref="docbook:keywordset"/>
+        <xs:element ref="docbook:legalnotice"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:othercredit"/>
+        <xs:element ref="docbook:pagenums"/>
+        <xs:element ref="docbook:printhistory"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:pubdate"/>
+        <xs:element ref="docbook:publisher"/>
+        <xs:element ref="docbook:publishername"/>
+        <xs:element ref="docbook:releaseinfo"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:seriesvolnums"/>
+        <xs:element ref="docbook:subjectset"/>
+        <xs:element ref="docbook:volumenum"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:extendedlink"/>
+        <xs:element ref="docbook:bibliomisc"/>
+        <xs:element ref="docbook:bibliomset"/>
+        <xs:element ref="docbook:bibliorelation"/>
+        <xs:element ref="docbook:biblioset"/>
+        <xs:element ref="docbook:itermset"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:subtitle"/>
+        <xs:element ref="docbook:title"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="relation"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliomset">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:abstract"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:artpagenums"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:authorgroup"/>
+        <xs:element ref="docbook:authorinitials"/>
+        <xs:element ref="docbook:bibliocoverage"/>
+        <xs:element ref="docbook:biblioid"/>
+        <xs:element ref="docbook:bibliosource"/>
+        <xs:element ref="docbook:collab"/>
+        <xs:element ref="docbook:confgroup"/>
+        <xs:element ref="docbook:contractsponsor"/>
+        <xs:element ref="docbook:contractnum"/>
+        <xs:element ref="docbook:copyright"/>
+        <xs:element ref="docbook:cover"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:edition"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:issuenum"/>
+        <xs:element ref="docbook:keywordset"/>
+        <xs:element ref="docbook:legalnotice"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:othercredit"/>
+        <xs:element ref="docbook:pagenums"/>
+        <xs:element ref="docbook:printhistory"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:pubdate"/>
+        <xs:element ref="docbook:publisher"/>
+        <xs:element ref="docbook:publishername"/>
+        <xs:element ref="docbook:releaseinfo"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:seriesvolnums"/>
+        <xs:element ref="docbook:subjectset"/>
+        <xs:element ref="docbook:volumenum"/>
+        <xs:element ref="docbook:extendedlink"/>
+        <xs:element ref="docbook:bibliomisc"/>
+        <xs:element ref="docbook:bibliomset"/>
+        <xs:element ref="docbook:bibliorelation"/>
+        <xs:element ref="docbook:biblioset"/>
+        <xs:element ref="docbook:itermset"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:subtitle"/>
+        <xs:element ref="docbook:title"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="relation"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliomisc">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliography">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:bibliodiv"/>
+          <xs:choice maxOccurs="unbounded">
+            <xs:element ref="docbook:biblioentry"/>
+            <xs:element ref="docbook:bibliomixed"/>
+          </xs:choice>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliodiv">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:biblioentry"/>
+          <xs:element ref="docbook:bibliomixed"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="bibliolist">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence minOccurs="0">
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:biblioentry"/>
+          <xs:element ref="docbook:bibliomixed"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="biblioref">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="xrefstyle"/>
+      <xs:attribute name="endterm" type="xs:IDREF"/>
+      <xs:attribute name="units" type="xs:NMTOKEN"/>
+      <xs:attribute name="begin" type="xs:NMTOKEN"/>
+      <xs:attribute name="end" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="itermset">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:indexterm"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="indexterm">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:primary"/>
+        <xs:choice minOccurs="0">
+          <xs:sequence>
+            <xs:element ref="docbook:secondary"/>
+            <xs:choice minOccurs="0">
+              <xs:sequence>
+                <xs:element ref="docbook:tertiary"/>
+                <xs:choice minOccurs="0">
+                  <xs:element ref="docbook:see"/>
+                  <xs:element maxOccurs="unbounded" ref="docbook:seealso"/>
+                </xs:choice>
+              </xs:sequence>
+              <xs:element ref="docbook:see"/>
+              <xs:element maxOccurs="unbounded" ref="docbook:seealso"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:element ref="docbook:see"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:seealso"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="significance">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="normal"/>
+            <xs:enumeration value="preferred"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="startref" type="xs:IDREF"/>
+      <xs:attribute name="zone" type="xs:IDREFS"/>
+      <xs:attribute name="pagenum"/>
+      <xs:attribute name="scope">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="all"/>
+            <xs:enumeration value="global"/>
+            <xs:enumeration value="local"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="type"/>
+      <xs:attribute name="class">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="singular"/>
+            <xs:enumeration value="startofrange"/>
+            <xs:enumeration value="endofrange"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="primary">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="sortas"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="secondary">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="sortas"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tertiary">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="sortas"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="see">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="seealso">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="index">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexdiv"/>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexentry"/>
+          <xs:element ref="docbook:segmentedlist"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+      <xs:attribute name="type"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="setindex">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexdiv"/>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexentry"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+      <xs:attribute name="type"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="indexdiv">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:indexentry"/>
+          <xs:element ref="docbook:segmentedlist"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="status"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="indexentry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="docbook:primaryie"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:seeie"/>
+          <xs:element ref="docbook:seealsoie"/>
+        </xs:choice>
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:secondaryie"/>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:seeie"/>
+            <xs:element ref="docbook:seealsoie"/>
+            <xs:element ref="docbook:tertiaryie"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="primaryie">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="linkends" type="xs:IDREFS"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="secondaryie">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="linkends" type="xs:IDREFS"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tertiaryie">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="linkends" type="xs:IDREFS"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="seeie">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="seealsoie">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="linkends" type="xs:IDREFS"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="toc">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:tocdiv"/>
+          <xs:element ref="docbook:tocentry"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tocdiv">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:tocdiv"/>
+          <xs:element ref="docbook:tocentry"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="pagenum"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tocentry">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="pagenum"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="task">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+            <xs:element ref="docbook:subtitle"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:tasksummary"/>
+        <xs:element minOccurs="0" ref="docbook:taskprerequisites"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:example"/>
+        <xs:element minOccurs="0" ref="docbook:taskrelated"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tasksummary">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="taskprerequisites">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="taskrelated">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="calloutlist">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:element maxOccurs="unbounded" ref="docbook:callout"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="callout">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+        <xs:element ref="docbook:annotation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="arearefs" use="required" type="xs:IDREFS"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="programlistingco">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element ref="docbook:areaspec"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:calloutlist"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="areaspec">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:area"/>
+        <xs:element ref="docbook:areaset"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="units">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="calspair"/>
+            <xs:enumeration value="linecolumn"/>
+            <xs:enumeration value="linecolumnpair"/>
+            <xs:enumeration value="linerange"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherunits" type="xs:NMTOKEN"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="area">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:alt"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="units">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="calspair"/>
+            <xs:enumeration value="linecolumn"/>
+            <xs:enumeration value="linecolumnpair"/>
+            <xs:enumeration value="linerange"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherunits" type="xs:NMTOKEN"/>
+      <xs:attribute name="linkends" type="xs:IDREFS"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="coords" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="areaset">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:area"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="units">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="calspair"/>
+            <xs:enumeration value="linecolumn"/>
+            <xs:enumeration value="linecolumnpair"/>
+            <xs:enumeration value="linerange"/>
+            <xs:enumeration value="other"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="otherunits" type="xs:NMTOKEN"/>
+      <xs:attribute name="linkends" type="xs:IDREFS"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="screenco">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element ref="docbook:areaspec"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:calloutlist"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="imageobjectco">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element ref="docbook:areaspec"/>
+        <xs:element maxOccurs="unbounded" ref="docbook:imageobject"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:calloutlist"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="co">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="linkends" type="xs:IDREFS"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="coref">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="productionset">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:production"/>
+          <xs:element ref="docbook:productionrecap"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="production">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="docbook:lhs"/>
+        <xs:element ref="docbook:rhs"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:constraint"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lhs">
+    <xs:complexType mixed="true">
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="rhs">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:lineannotation"/>
+        <xs:element ref="docbook:sbr"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="nonterminal">
+    <xs:complexType mixed="true">
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="def" use="required"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="constraint">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="productionrecap">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="constraintdef">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tgroup">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:colspec"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:spanspec"/>
+        <xs:element minOccurs="0" ref="docbook:thead"/>
+        <xs:element minOccurs="0" ref="docbook:tfoot"/>
+        <xs:element ref="docbook:tbody"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="tgroupstyle"/>
+      <xs:attribute name="cols" use="required" type="xs:NMTOKEN"/>
+      <xs:attribute name="colsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="char"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="right"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="colspec">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="colnum" type="xs:NMTOKEN"/>
+      <xs:attribute name="char"/>
+      <xs:attribute name="colsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="colwidth"/>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="colname"/>
+      <xs:attribute name="rowsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="char"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="right"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="spanspec">
+    <xs:complexType>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="spanname" use="required"/>
+      <xs:attribute name="namest" use="required"/>
+      <xs:attribute name="nameend" use="required"/>
+      <xs:attribute name="char"/>
+      <xs:attribute name="colsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="rowsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="char"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="right"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="thead">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:colspec"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:row"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:tr"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="baseline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="char"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tfoot">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:colspec"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:row"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:tr"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="baseline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="char"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tbody">
+    <xs:complexType>
+      <xs:choice>
+        <xs:element maxOccurs="unbounded" ref="docbook:row"/>
+        <xs:element maxOccurs="unbounded" ref="docbook:tr"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="baseline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="char"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="row">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:entry"/>
+        <xs:element ref="docbook:entrytbl"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="rowsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="top"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="entry">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="top"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="colsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="morerows" type="xs:NMTOKEN"/>
+      <xs:attribute name="colname"/>
+      <xs:attribute name="namest"/>
+      <xs:attribute name="spanname"/>
+      <xs:attribute name="nameend"/>
+      <xs:attribute name="rowsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rotate">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="char"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="right"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="entrytbl">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:colspec"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:spanspec"/>
+        <xs:element minOccurs="0" ref="docbook:thead"/>
+        <xs:element ref="docbook:tbody"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="colname"/>
+      <xs:attribute name="namest"/>
+      <xs:attribute name="spanname"/>
+      <xs:attribute name="nameend"/>
+      <xs:attribute name="tgroupstyle"/>
+      <xs:attribute name="cols" type="xs:NMTOKEN"/>
+      <xs:attribute name="colsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="char"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="right"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="table">
+    <xs:complexType>
+      <xs:choice>
+        <xs:sequence>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+          <xs:sequence>
+            <xs:element ref="docbook:title"/>
+            <xs:element minOccurs="0" ref="docbook:titleabbrev"/>
+          </xs:sequence>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:indexterm"/>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:textobject"/>
+          <xs:choice>
+            <xs:element maxOccurs="unbounded" ref="docbook:mediaobject"/>
+            <xs:element maxOccurs="unbounded" ref="docbook:tgroup"/>
+          </xs:choice>
+        </xs:sequence>
+        <xs:sequence>
+          <xs:element ref="docbook:caption"/>
+          <xs:choice>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:col"/>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:colgroup"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:thead"/>
+          <xs:element minOccurs="0" ref="docbook:tfoot"/>
+          <xs:choice>
+            <xs:element maxOccurs="unbounded" ref="docbook:tbody"/>
+            <xs:element maxOccurs="unbounded" ref="docbook:tr"/>
+          </xs:choice>
+        </xs:sequence>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="tabstyle"/>
+      <xs:attribute name="floatstyle"/>
+      <xs:attribute name="orient">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="land"/>
+            <xs:enumeration value="port"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="colsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="frame">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="all"/>
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="none"/>
+            <xs:enumeration value="sides"/>
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="topbot"/>
+            <xs:enumeration value="void"/>
+            <xs:enumeration value="above"/>
+            <xs:enumeration value="below"/>
+            <xs:enumeration value="hsides"/>
+            <xs:enumeration value="lhs"/>
+            <xs:enumeration value="rhs"/>
+            <xs:enumeration value="vsides"/>
+            <xs:enumeration value="box"/>
+            <xs:enumeration value="border"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="pgwide">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="shortentry">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="tocentry">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowheader">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="firstcol"/>
+            <xs:enumeration value="norowheader"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="summary"/>
+      <xs:attribute name="width"/>
+      <xs:attribute name="border" type="xs:NMTOKEN"/>
+      <xs:attribute name="rules">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="none"/>
+            <xs:enumeration value="groups"/>
+            <xs:enumeration value="rows"/>
+            <xs:enumeration value="cols"/>
+            <xs:enumeration value="all"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="cellspacing"/>
+      <xs:attribute name="cellpadding"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="informaltable">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:choice>
+          <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:textobject"/>
+            <xs:choice>
+              <xs:element maxOccurs="unbounded" ref="docbook:mediaobject"/>
+              <xs:element maxOccurs="unbounded" ref="docbook:tgroup"/>
+            </xs:choice>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:choice>
+              <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:col"/>
+              <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:colgroup"/>
+            </xs:choice>
+            <xs:element minOccurs="0" ref="docbook:thead"/>
+            <xs:element minOccurs="0" ref="docbook:tfoot"/>
+            <xs:choice>
+              <xs:element maxOccurs="unbounded" ref="docbook:tbody"/>
+              <xs:element maxOccurs="unbounded" ref="docbook:tr"/>
+            </xs:choice>
+          </xs:sequence>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="tabstyle"/>
+      <xs:attribute name="floatstyle"/>
+      <xs:attribute name="orient">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="land"/>
+            <xs:enumeration value="port"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="colsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowsep">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="frame">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="all"/>
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="none"/>
+            <xs:enumeration value="sides"/>
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="topbot"/>
+            <xs:enumeration value="void"/>
+            <xs:enumeration value="above"/>
+            <xs:enumeration value="below"/>
+            <xs:enumeration value="hsides"/>
+            <xs:enumeration value="lhs"/>
+            <xs:enumeration value="rhs"/>
+            <xs:enumeration value="vsides"/>
+            <xs:enumeration value="box"/>
+            <xs:enumeration value="border"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="pgwide">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowheader">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="firstcol"/>
+            <xs:enumeration value="norowheader"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="summary"/>
+      <xs:attribute name="width"/>
+      <xs:attribute name="border" type="xs:NMTOKEN"/>
+      <xs:attribute name="rules">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="none"/>
+            <xs:enumeration value="groups"/>
+            <xs:enumeration value="rows"/>
+            <xs:enumeration value="cols"/>
+            <xs:enumeration value="all"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="cellspacing"/>
+      <xs:attribute name="cellpadding"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="col">
+    <xs:complexType>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="span" type="xs:NMTOKEN"/>
+      <xs:attribute name="width"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="char"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="baseline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="colgroup">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:col"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="span" type="xs:NMTOKEN"/>
+      <xs:attribute name="width"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="char"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="baseline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="tr">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:th"/>
+        <xs:element ref="docbook:td"/>
+      </xs:choice>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="char"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="baseline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="th">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+      </xs:choice>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="abbr"/>
+      <xs:attribute name="axis"/>
+      <xs:attribute name="headers"/>
+      <xs:attribute name="scope">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="row"/>
+            <xs:enumeration value="col"/>
+            <xs:enumeration value="rowgroup"/>
+            <xs:enumeration value="colgroup"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowspan" type="xs:NMTOKEN"/>
+      <xs:attribute name="colspan" type="xs:NMTOKEN"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="char"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="baseline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="td">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:abbrev"/>
+        <xs:element ref="docbook:acronym"/>
+        <xs:element ref="docbook:date"/>
+        <xs:element ref="docbook:emphasis"/>
+        <xs:element ref="docbook:footnote"/>
+        <xs:element ref="docbook:footnoteref"/>
+        <xs:element ref="docbook:foreignphrase"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:quote"/>
+        <xs:element ref="docbook:wordasword"/>
+        <xs:element ref="docbook:firstterm"/>
+        <xs:element ref="docbook:glossterm"/>
+        <xs:element ref="docbook:coref"/>
+        <xs:element ref="docbook:productnumber"/>
+        <xs:element ref="docbook:productname"/>
+        <xs:element ref="docbook:database"/>
+        <xs:element ref="docbook:application"/>
+        <xs:element ref="docbook:hardware"/>
+        <xs:element ref="docbook:trademark"/>
+        <xs:element ref="docbook:citation"/>
+        <xs:element ref="docbook:citerefentry"/>
+        <xs:element ref="docbook:citetitle"/>
+        <xs:element ref="docbook:citebiblioid"/>
+        <xs:element ref="docbook:author"/>
+        <xs:element ref="docbook:person"/>
+        <xs:element ref="docbook:personname"/>
+        <xs:element ref="docbook:org"/>
+        <xs:element ref="docbook:orgname"/>
+        <xs:element ref="docbook:editor"/>
+        <xs:element ref="docbook:jobtitle"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:systemitem"/>
+        <xs:element ref="docbook:option"/>
+        <xs:element ref="docbook:optional"/>
+        <xs:element ref="docbook:package"/>
+        <xs:element ref="docbook:parameter"/>
+        <xs:element ref="docbook:property"/>
+        <xs:element ref="docbook:termdef"/>
+        <xs:element ref="docbook:nonterminal"/>
+        <xs:element ref="docbook:errorcode"/>
+        <xs:element ref="docbook:errortext"/>
+        <xs:element ref="docbook:errorname"/>
+        <xs:element ref="docbook:errortype"/>
+        <xs:element ref="docbook:prompt"/>
+        <xs:element ref="docbook:envar"/>
+        <xs:element ref="docbook:filename"/>
+        <xs:element ref="docbook:command"/>
+        <xs:element ref="docbook:computeroutput"/>
+        <xs:element ref="docbook:userinput"/>
+        <xs:element ref="docbook:function"/>
+        <xs:element ref="docbook:varname"/>
+        <xs:element ref="docbook:returnvalue"/>
+        <xs:element ref="docbook:type"/>
+        <xs:element ref="docbook:classname"/>
+        <xs:element ref="docbook:exceptionname"/>
+        <xs:element ref="docbook:interfacename"/>
+        <xs:element ref="docbook:methodname"/>
+        <xs:element ref="docbook:modifier"/>
+        <xs:element ref="docbook:initializer"/>
+        <xs:element ref="docbook:ooclass"/>
+        <xs:element ref="docbook:ooexception"/>
+        <xs:element ref="docbook:oointerface"/>
+        <xs:element ref="docbook:tag"/>
+        <xs:element ref="docbook:markup"/>
+        <xs:element ref="docbook:token"/>
+        <xs:element ref="docbook:symbol"/>
+        <xs:element ref="docbook:literal"/>
+        <xs:element ref="docbook:code"/>
+        <xs:element ref="docbook:constant"/>
+        <xs:element ref="docbook:email"/>
+        <xs:element ref="docbook:uri"/>
+        <xs:element ref="docbook:guiicon"/>
+        <xs:element ref="docbook:guibutton"/>
+        <xs:element ref="docbook:guimenuitem"/>
+        <xs:element ref="docbook:guimenu"/>
+        <xs:element ref="docbook:guisubmenu"/>
+        <xs:element ref="docbook:guilabel"/>
+        <xs:element ref="docbook:menuchoice"/>
+        <xs:element ref="docbook:mousebutton"/>
+        <xs:element ref="docbook:keycombo"/>
+        <xs:element ref="docbook:keycap"/>
+        <xs:element ref="docbook:keycode"/>
+        <xs:element ref="docbook:keysym"/>
+        <xs:element ref="docbook:shortcut"/>
+        <xs:element ref="docbook:accel"/>
+        <xs:element ref="docbook:inlineequation"/>
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+      </xs:choice>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style"/>
+      <xs:attribute name="title"/>
+      <xs:attribute name="lang"/>
+      <xs:attribute name="onclick"/>
+      <xs:attribute name="ondblclick"/>
+      <xs:attribute name="onmousedown"/>
+      <xs:attribute name="onmouseup"/>
+      <xs:attribute name="onmouseover"/>
+      <xs:attribute name="onmousemove"/>
+      <xs:attribute name="onmouseout"/>
+      <xs:attribute name="onkeypress"/>
+      <xs:attribute name="onkeydown"/>
+      <xs:attribute name="onkeyup"/>
+      <xs:attribute name="abbr"/>
+      <xs:attribute name="axis"/>
+      <xs:attribute name="headers"/>
+      <xs:attribute name="scope">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="row"/>
+            <xs:enumeration value="col"/>
+            <xs:enumeration value="rowgroup"/>
+            <xs:enumeration value="colgroup"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="rowspan" type="xs:NMTOKEN"/>
+      <xs:attribute name="colspan" type="xs:NMTOKEN"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="justify"/>
+            <xs:enumeration value="char"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="char"/>
+      <xs:attribute name="charoff"/>
+      <xs:attribute name="valign">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="top"/>
+            <xs:enumeration value="middle"/>
+            <xs:enumeration value="bottom"/>
+            <xs:enumeration value="baseline"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgset">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:msgentry"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:simplemsgentry"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgentry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="docbook:msg"/>
+        <xs:element minOccurs="0" ref="docbook:msginfo"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:msgexplan"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="simplemsgentry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="docbook:msgtext"/>
+        <xs:element maxOccurs="unbounded" ref="docbook:msgexplan"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="msgaud"/>
+      <xs:attribute name="msgorig"/>
+      <xs:attribute name="msglevel"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msg">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element ref="docbook:msgmain"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:msgsub"/>
+          <xs:element ref="docbook:msgrel"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgmain">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element ref="docbook:msgtext"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgsub">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element ref="docbook:msgtext"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgrel">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element ref="docbook:msgtext"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgtext">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="docbook:itemizedlist"/>
+        <xs:element ref="docbook:orderedlist"/>
+        <xs:element ref="docbook:procedure"/>
+        <xs:element ref="docbook:simplelist"/>
+        <xs:element ref="docbook:variablelist"/>
+        <xs:element ref="docbook:segmentedlist"/>
+        <xs:element ref="docbook:glosslist"/>
+        <xs:element ref="docbook:bibliolist"/>
+        <xs:element ref="docbook:calloutlist"/>
+        <xs:element ref="docbook:qandaset"/>
+        <xs:element ref="docbook:caution"/>
+        <xs:element ref="docbook:important"/>
+        <xs:element ref="docbook:note"/>
+        <xs:element ref="docbook:tip"/>
+        <xs:element ref="docbook:warning"/>
+        <xs:element ref="docbook:example"/>
+        <xs:element ref="docbook:figure"/>
+        <xs:element ref="docbook:table"/>
+        <xs:element ref="docbook:informalexample"/>
+        <xs:element ref="docbook:informalfigure"/>
+        <xs:element ref="docbook:informaltable"/>
+        <xs:element ref="docbook:sidebar"/>
+        <xs:element ref="docbook:blockquote"/>
+        <xs:element ref="docbook:address"/>
+        <xs:element ref="docbook:epigraph"/>
+        <xs:element ref="docbook:mediaobject"/>
+        <xs:element ref="docbook:screenshot"/>
+        <xs:element ref="docbook:task"/>
+        <xs:element ref="docbook:productionset"/>
+        <xs:element ref="docbook:constraintdef"/>
+        <xs:element ref="docbook:msgset"/>
+        <xs:element ref="docbook:programlisting"/>
+        <xs:element ref="docbook:screen"/>
+        <xs:element ref="docbook:literallayout"/>
+        <xs:element ref="docbook:synopsis"/>
+        <xs:element ref="docbook:programlistingco"/>
+        <xs:element ref="docbook:screenco"/>
+        <xs:element ref="docbook:cmdsynopsis"/>
+        <xs:element ref="docbook:funcsynopsis"/>
+        <xs:element ref="docbook:classsynopsis"/>
+        <xs:element ref="docbook:methodsynopsis"/>
+        <xs:element ref="docbook:constructorsynopsis"/>
+        <xs:element ref="docbook:destructorsynopsis"/>
+        <xs:element ref="docbook:fieldsynopsis"/>
+        <xs:element ref="docbook:bridgehead"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:revhistory"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:equation"/>
+        <xs:element ref="docbook:informalequation"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:para"/>
+        <xs:element ref="docbook:formalpara"/>
+        <xs:element ref="docbook:simpara"/>
+        <xs:element ref="docbook:annotation"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msginfo">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:msglevel"/>
+        <xs:element ref="docbook:msgorig"/>
+        <xs:element ref="docbook:msgaud"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msglevel">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgorig">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgaud">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="msgexplan">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="qandaset">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:qandadiv"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:qandaentry"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="defaultlabel">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="none"/>
+            <xs:enumeration value="number"/>
+            <xs:enumeration value="qanda"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="qandadiv">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:qandadiv"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:qandaentry"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="qandaentry">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element ref="docbook:question"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="docbook:answer"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="question">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:label"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="answer">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:label"/>
+        <xs:choice maxOccurs="unbounded">
+          <xs:element ref="docbook:itemizedlist"/>
+          <xs:element ref="docbook:orderedlist"/>
+          <xs:element ref="docbook:procedure"/>
+          <xs:element ref="docbook:simplelist"/>
+          <xs:element ref="docbook:variablelist"/>
+          <xs:element ref="docbook:segmentedlist"/>
+          <xs:element ref="docbook:glosslist"/>
+          <xs:element ref="docbook:bibliolist"/>
+          <xs:element ref="docbook:calloutlist"/>
+          <xs:element ref="docbook:qandaset"/>
+          <xs:element ref="docbook:caution"/>
+          <xs:element ref="docbook:important"/>
+          <xs:element ref="docbook:note"/>
+          <xs:element ref="docbook:tip"/>
+          <xs:element ref="docbook:warning"/>
+          <xs:element ref="docbook:example"/>
+          <xs:element ref="docbook:figure"/>
+          <xs:element ref="docbook:table"/>
+          <xs:element ref="docbook:informalexample"/>
+          <xs:element ref="docbook:informalfigure"/>
+          <xs:element ref="docbook:informaltable"/>
+          <xs:element ref="docbook:sidebar"/>
+          <xs:element ref="docbook:blockquote"/>
+          <xs:element ref="docbook:address"/>
+          <xs:element ref="docbook:epigraph"/>
+          <xs:element ref="docbook:mediaobject"/>
+          <xs:element ref="docbook:screenshot"/>
+          <xs:element ref="docbook:task"/>
+          <xs:element ref="docbook:productionset"/>
+          <xs:element ref="docbook:constraintdef"/>
+          <xs:element ref="docbook:msgset"/>
+          <xs:element ref="docbook:programlisting"/>
+          <xs:element ref="docbook:screen"/>
+          <xs:element ref="docbook:literallayout"/>
+          <xs:element ref="docbook:synopsis"/>
+          <xs:element ref="docbook:programlistingco"/>
+          <xs:element ref="docbook:screenco"/>
+          <xs:element ref="docbook:cmdsynopsis"/>
+          <xs:element ref="docbook:funcsynopsis"/>
+          <xs:element ref="docbook:classsynopsis"/>
+          <xs:element ref="docbook:methodsynopsis"/>
+          <xs:element ref="docbook:constructorsynopsis"/>
+          <xs:element ref="docbook:destructorsynopsis"/>
+          <xs:element ref="docbook:fieldsynopsis"/>
+          <xs:element ref="docbook:bridgehead"/>
+          <xs:element ref="docbook:remark"/>
+          <xs:element ref="docbook:revhistory"/>
+          <xs:element ref="docbook:indexterm"/>
+          <xs:element ref="docbook:equation"/>
+          <xs:element ref="docbook:informalequation"/>
+          <xs:element ref="docbook:anchor"/>
+          <xs:element ref="docbook:para"/>
+          <xs:element ref="docbook:formalpara"/>
+          <xs:element ref="docbook:simpara"/>
+          <xs:element ref="docbook:annotation"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="label">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="equation">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:sequence>
+          <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element ref="docbook:title"/>
+            <xs:element ref="docbook:titleabbrev"/>
+          </xs:choice>
+          <xs:element minOccurs="0" ref="docbook:info"/>
+        </xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:alt"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:mediaobject"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:mathphrase"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:caption"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+      <xs:attribute name="label"/>
+      <xs:attribute name="pgwide">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="0"/>
+            <xs:enumeration value="1"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="floatstyle"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="informalequation">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:info"/>
+        <xs:element minOccurs="0" ref="docbook:alt"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:mediaobject"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:mathphrase"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="docbook:caption"/>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="inlineequation">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="docbook:alt"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="docbook:inlinemediaobject"/>
+          <xs:element maxOccurs="unbounded" ref="docbook:mathphrase"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="mathphrase">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="docbook:inlinemediaobject"/>
+        <xs:element ref="docbook:remark"/>
+        <xs:element ref="docbook:superscript"/>
+        <xs:element ref="docbook:subscript"/>
+        <xs:element ref="docbook:xref"/>
+        <xs:element ref="docbook:link"/>
+        <xs:element ref="docbook:olink"/>
+        <xs:element ref="docbook:anchor"/>
+        <xs:element ref="docbook:biblioref"/>
+        <xs:element ref="docbook:alt"/>
+        <xs:element ref="docbook:annotation"/>
+        <xs:element ref="docbook:indexterm"/>
+        <xs:element ref="docbook:phrase"/>
+        <xs:element ref="docbook:replaceable"/>
+        <xs:element ref="docbook:emphasis"/>
+      </xs:choice>
+      <xs:attribute name="role"/>
+      <xs:attributeGroup ref="docbook:db.common.attributes"/>
+      <xs:attributeGroup ref="docbook:db.common.linking.attributes"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/xml/tests/testData/xml/DoctypeWithoutSchema.ent b/xml/tests/testData/xml/DoctypeWithoutSchema.ent
new file mode 100644
index 000000000000..70d898b548d1
--- /dev/null
+++ b/xml/tests/testData/xml/DoctypeWithoutSchema.ent
@@ -0,0 +1,19 @@
+<!ENTITY ORGS.ACCOUNTABILITY_ROLE "ACCOUNTABILITY_ROLE">
+<!ENTITY ORGS.ADDRESS_TYPE "ADDRESS_TYPE">
+<!ENTITY ORGS.JDO_CLASS "JDO_CLASS">
+<!ENTITY ORGS.MEMBER "MEMBER">
+<!ENTITY ORGS.MEMBER_INFO "MEMBER_INFO">
+<!ENTITY ORGS.ORG_UNIT "ORG_UNIT">
+<!ENTITY ORGS.ORG_UNIT_LINK "ORG_UNIT_LINK">
+<!ENTITY ORGS.ORG_UNIT_LINK_TYPE "ORG_UNIT_LINK_TYPE">
+<!ENTITY ORGS.ORG_UNIT_TYPE "ORG_UNIT_TYPE">
+<!ENTITY ORGS.ORG_UNIT_TYPE_ROLE "ORG_UNIT_TYPE_ROLE">
+<!ENTITY ORGS.POLITICAL_PARTY "POLITICAL_PARTY">
+<!ENTITY ORGS.POSITION "POSITION">
+<!ENTITY ORGS.POSITION_ACCOUNTABILITY "POSITION_ACCOUNTABILITY">
+<!ENTITY ORGS.POSITION_ADDRESS "POSITION_ADDRESS">
+<!ENTITY ORGS.POSITION_COMPATIBILITY_GROUP "POSITION_COMPATIBILITY_GROUP">
+<!ENTITY ORGS.POST "POST">
+<!ENTITY ORGS.POST_ACCOUNTABILITY "POST_ACCOUNTABILITY">
+<!ENTITY ORGS.ROLE "ROLE">
+<!ENTITY ORGS.ROLE_GROUP "ROLE_GROUP">
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DoctypeWithoutSchema.xml b/xml/tests/testData/xml/DoctypeWithoutSchema.xml
new file mode 100644
index 000000000000..20b349e3d31b
--- /dev/null
+++ b/xml/tests/testData/xml/DoctypeWithoutSchema.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapping [
+  <!ENTITY % package.tables SYSTEM  "DoctypeWithoutSchema.ent">
+  %package.tables;
+]>
+
+<mapping>
+  <package name="com.peacetech.orgs.jdo">
+    <class name="AccountabilityRoleImpl">
+      <jdbc-class-map type="base" table="&ORGS.ACCOUNTABILITY_ROLE;"/>
+    </class>
+   </package>
+</mapping>
diff --git a/xml/tests/testData/xml/DtdElementRefs.xml b/xml/tests/testData/xml/DtdElementRefs.xml
new file mode 100644
index 000000000000..e506c3811e64
--- /dev/null
+++ b/xml/tests/testData/xml/DtdElementRefs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<!DOCTYPE persistence [
+  <!ELEMENT persistence (xi:include)*>
+  <!ELEMENT persistence (<error>xi:include2</error>)*>
+  <!ATTLIST persistence
+    xmlns CDATA #REQUIRED
+    xmlns:xsi CDATA #REQUIRED
+    xmlns:xi CDATA #REQUIRED
+    xsi:schemaLocation CDATA #REQUIRED>
+  <!ELEMENT xi:include (#PCDATA)>
+  <!ATTLIST xi:include
+    href CDATA #REQUIRED>
+  ]>
+<persistence xmlns="http://example.com/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:xi="http://www.w3.org/2001/XInclude"
+             xsi:schemaLocation="http://example.com/persistence XIncludeTestSchema.xsd
+             http://www.w3.org/2001/XInclude http://www.w3.org/2001/XInclude.xsd">
+  <xi:include href="<error>sample-inc.xml</error>"/>
+</persistence>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DtdHighlighting.dtd b/xml/tests/testData/xml/DtdHighlighting.dtd
new file mode 100644
index 000000000000..ab9d48e2a8a7
--- /dev/null
+++ b/xml/tests/testData/xml/DtdHighlighting.dtd
@@ -0,0 +1,4 @@
+<!ENTITY % xhtml-inlstyle.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
+            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
+%xhtml-inlstyle.mod;
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DtdHighlighting.mod b/xml/tests/testData/xml/DtdHighlighting.mod
new file mode 100644
index 000000000000..b57c942d33f5
--- /dev/null
+++ b/xml/tests/testData/xml/DtdHighlighting.mod
@@ -0,0 +1 @@
+<!ENTITY % XHTML.profile  "" >
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DuplicateIdAttribute.xml b/xml/tests/testData/xml/DuplicateIdAttribute.xml
new file mode 100644
index 000000000000..32eec98a5242
--- /dev/null
+++ b/xml/tests/testData/xml/DuplicateIdAttribute.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE a [
+<!ELEMENT a (b)*>
+<!ELEMENT b (#PCDATA)>
+<!ATTLIST b
+    id ID #REQUIRED>
+]><a>
+ <b id=<error>"1"</error>/>
+ <b id=<error>"1"</error>/>
+ <b id="2"/>
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DuplicateIdAttribute2.xml b/xml/tests/testData/xml/DuplicateIdAttribute2.xml
new file mode 100644
index 000000000000..e77984c78313
--- /dev/null
+++ b/xml/tests/testData/xml/DuplicateIdAttribute2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:idx="<error>http://www.intellij.com/schema/css/indexer</error>"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+http://www.intellij.com/schema/css/indexer <error>http://www.intellij.com/schema/css/indexer/resource.xsd</error>">
+
+  <bean id="searchEngine" class="java.lang.StringBuffer">
+    <property name="length">
+      <idx:resource class="java.lang.String">
+        <idx:field name="author" expr="author"/>
+      </idx:resource>
+    </property>
+
+  </bean>
+
+  <bean id="author" class="java.lang.String"/>
+</beans>
diff --git a/xml/tests/testData/xml/DuplicateNameAttribute.xml b/xml/tests/testData/xml/DuplicateNameAttribute.xml
new file mode 100644
index 000000000000..3bad1d0e1505
--- /dev/null
+++ b/xml/tests/testData/xml/DuplicateNameAttribute.xml
@@ -0,0 +1,18 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:beans="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+            http://www.springframework.org/schema/beans
+            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+    <bean id="someInstance" class="java.util.Date">
+        <beans:property name="date" value="0"/>
+    </bean>
+
+    <bean id="someInstance2" class="java.util.Date">
+        <beans:property name="date" value="0"/>
+    </bean>
+
+    <bean id="date" class="java.util.Date" scope="singleton"/>
+
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/DuplicateNameAttributeSchemas/spring-beans-2.5.xsd b/xml/tests/testData/xml/DuplicateNameAttributeSchemas/spring-beans-2.5.xsd
new file mode 100644
index 000000000000..769830c69dc5
--- /dev/null
+++ b/xml/tests/testData/xml/DuplicateNameAttributeSchemas/spring-beans-2.5.xsd
@@ -0,0 +1,1164 @@
+<?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:element ref="description" minOccurs="0"/>
+			<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:element ref="description" minOccurs="0"/>
+					<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/xml/Duplicates.dtd b/xml/tests/testData/xml/Duplicates.dtd
new file mode 100644
index 000000000000..7eb246aa5081
--- /dev/null
+++ b/xml/tests/testData/xml/Duplicates.dtd
@@ -0,0 +1,3 @@
+<!ELEMENT document EMPTY>
+<!ELEMENT <error>document2</error> EMPTY>
+<!ELEMENT <error>document2</error> EMPTY>
diff --git a/xml/tests/testData/xml/Duplicates.xml b/xml/tests/testData/xml/Duplicates.xml
new file mode 100644
index 000000000000..dbd785fc0c3a
--- /dev/null
+++ b/xml/tests/testData/xml/Duplicates.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE document [
+  <!ELEMENT document (#PCDATA)>
+  <error><!ELEMENT document (#PCDATA)></error>
+  ]>
+<document>
+
+</document>
diff --git a/xml/tests/testData/xml/Duplicates.xsd b/xml/tests/testData/xml/Duplicates.xsd
new file mode 100644
index 000000000000..49a7f2825f93
--- /dev/null
+++ b/xml/tests/testData/xml/Duplicates.xsd
@@ -0,0 +1,16 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="zzz" xmlns="zzz">
+  <xsd:element name=<error>"e"</error> type="xsd:string"/>
+  <xsd:element name=<error>"e"</error> type="xsd:decimal"/>
+  <xsd:attribute name=<error>"a"</error> type="xsd:decimal"/>
+  <xsd:attribute name=<error>"a"</error> type="xsd:string"/>
+
+  <xsd:complexType name="aaa">
+    <xsd:sequence>
+      <xsd:element name=<error>"e2"</error> type="xsd:string"/>
+      <xsd:element name=<error>"e2"</error> type="xsd:decimal"/>
+    </xsd:sequence>
+    <xsd:attribute name=<error>"a2"</error> type="xsd:decimal"/>
+    <xsd:attribute name=<error>"a2"</error> type="xsd:string"/>
+  </xsd:complexType>
+  <xsd:element name="aaa" type="aaa"/>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/EmptyNSRef.xml b/xml/tests/testData/xml/EmptyNSRef.xml
new file mode 100644
index 000000000000..28b7fe673999
--- /dev/null
+++ b/xml/tests/testData/xml/EmptyNSRef.xml
@@ -0,0 +1,7 @@
+<section xmlns='<error>urn:com:books-r-us</error>'>
+   <title>Book-Signing Event</title>
+   <signing xmlns=''>
+     <author title="Mr" name="Vikram Seth" />
+     <book title="A Suitable Boy" price="$22.95" />
+   </signing>
+</section>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/Encoding.xml b/xml/tests/testData/xml/Encoding.xml
new file mode 100644
index 000000000000..1153e4eed85f
--- /dev/null
+++ b/xml/tests/testData/xml/Encoding.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="<error descr="Unknown encoding: 'Foo'">Foo</error>"?>
+ <x/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/EntityHighlighting.xml b/xml/tests/testData/xml/EntityHighlighting.xml
new file mode 100644
index 000000000000..b8c7a165f766
--- /dev/null
+++ b/xml/tests/testData/xml/EntityHighlighting.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE a [
+<!ELEMENT a (#PCDATA)>
+<!ENTITY nbsp2 "!!!" >  
+]>
+<a>
+  &<error>nbsp1</error>;
+  &nbsp2;
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/EntityHighlighting2.xml b/xml/tests/testData/xml/EntityHighlighting2.xml
new file mode 100644
index 000000000000..1de07ff60769
--- /dev/null
+++ b/xml/tests/testData/xml/EntityHighlighting2.xml
@@ -0,0 +1,19 @@
+<!DOCTYPE a [
+<!ELEMENT a (#PCDATA)>
+<!ENTITY nbsp SYSTEM "EntityHighlighting2.xml" >
+<!ENTITY nbsp2 SYSTEM "file:./EntityHighlighting2.xml" >
+<!ENTITY nbsp3 SYSTEM "<error>!!!</error>" > 
+<!ENTITY nbsp4 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">  
+<!ENTITY nbsp5 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+   "<error>_EntityHighlighting.xml</error>">
+  <!ENTITY nbsp6 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+   "EntityHighlighting2.xml">
+  <!ENTITY nbsp7 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+  <!ENTITY nbsp7 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+   "<error>urn:myurn</error>">
+]>
+<a>
+  &nbsp2;
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/EntityRefBadFormat.xml b/xml/tests/testData/xml/EntityRefBadFormat.xml
new file mode 100644
index 000000000000..54d8e4fdcb04
--- /dev/null
+++ b/xml/tests/testData/xml/EntityRefBadFormat.xml
@@ -0,0 +1,5 @@
+<root>
+
+    <a>&#xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF;</a>
+
+</root>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/EntityRefWithEmptyDtd.xml b/xml/tests/testData/xml/EntityRefWithEmptyDtd.xml
new file mode 100644
index 000000000000..5db0649d2390
--- /dev/null
+++ b/xml/tests/testData/xml/EntityRefWithEmptyDtd.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE tag [
+   <!ENTITY our2 SYSTEM "EntityRefWithEmptyDtd.xml">
+   %<error>our</error>;
+]>
+<tag id="&<error>our</error>;">
+  &<error>our</error>;
+</tag>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/EntityRefWithNoDtd.xml b/xml/tests/testData/xml/EntityRefWithNoDtd.xml
new file mode 100644
index 000000000000..01e587b96dbb
--- /dev/null
+++ b/xml/tests/testData/xml/EntityRefWithNoDtd.xml
@@ -0,0 +1,3 @@
+<aaa>
+  &<error>xxx</error>;
+</aaa>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/EnumeratedAttributesValidation.xsd b/xml/tests/testData/xml/EnumeratedAttributesValidation.xsd
new file mode 100644
index 000000000000..55e4e5189a76
--- /dev/null
+++ b/xml/tests/testData/xml/EnumeratedAttributesValidation.xsd
@@ -0,0 +1,13 @@
+<xsd:schema
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified">
+
+<xsd:element name = "plugin">
+    <xsd:complexType> <!-- content only! -->
+      <xsd:sequence>
+        <xsd:element ref = "<error>params</error>" minOccurs = "0" maxOccurs = "1"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ErrorInDtd.xml b/xml/tests/testData/xml/ErrorInDtd.xml
new file mode 100644
index 000000000000..85fd23bebfc4
--- /dev/null
+++ b/xml/tests/testData/xml/ErrorInDtd.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+    <xsl:template match="/">
+    </xsl:template>
+    <xsl:template match="/">
+    </xsl:template>
+    <xsl:template match="/">
+    </xsl:template>
+    <xsl:template match="/">
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ExternalValidatorOnValidXmlWithNamespacesNotSetup.xml b/xml/tests/testData/xml/ExternalValidatorOnValidXmlWithNamespacesNotSetup.xml
new file mode 100644
index 000000000000..a9e37eb84ddd
--- /dev/null
+++ b/xml/tests/testData/xml/ExternalValidatorOnValidXmlWithNamespacesNotSetup.xml
@@ -0,0 +1,10 @@
+<deployment xmlns="http://xml.apache.org/axis/wsdd2/"
+xmlns:java="http://xml.apache.org/axis/wsdd2/providers/java">
+    <service name="AuthService" provider="java:RPC">
+    <parameter name="className" value="com.td.atp.auth.ws.Authenticator"/>
+    <parameter name="allowedMethods" value="*"/>
+    </service>
+
+  <beanMapping xmlns:ns="http://soapinterop.org/xsd2" qname="ns:AuthRequest" languageSpecificType="java:com.td.atp.auth.ws.AuthRequest"/>
+  <beanMapping xmlns:ns="http://soapinterop.org/xsd2" qname="ns:AuthResponse" languageSpecificType="java:com.td.atp.auth.ws.AuthResponse"/>
+</deployment>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ExternalValidatorOnValidXmlWithNamespacesNotSetup2.xml b/xml/tests/testData/xml/ExternalValidatorOnValidXmlWithNamespacesNotSetup2.xml
new file mode 100644
index 000000000000..9f4089858f7c
--- /dev/null
+++ b/xml/tests/testData/xml/ExternalValidatorOnValidXmlWithNamespacesNotSetup2.xml
@@ -0,0 +1,9 @@
+<deployment xmlns:xxx="">
+    <service name="AuthService" provider="java:RPC">
+    <parameter name="className" value="com.td.atp.auth.ws.Authenticator"/>
+    <parameter name="allowedMethods" value="*"/>
+    </service>
+
+  <beanMapping qname="ns:AuthRequest" languageSpecificType="java:com.td.atp.auth.ws.AuthRequest"/>
+  <beanMapping qname="ns:AuthResponse" languageSpecificType="java:com.td.atp.auth.ws.AuthResponse"/>
+</deployment>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/FinancialReportProcess.bpmn20.xml b/xml/tests/testData/xml/FinancialReportProcess.bpmn20.xml
new file mode 100644
index 000000000000..8d7e27108b58
--- /dev/null
+++ b/xml/tests/testData/xml/FinancialReportProcess.bpmn20.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<definitions id="definitions"
+	targetNamespace="http://activiti.org/bpmn20" 
+        xmlns:activiti="<error descr="URI is not registered (Settings | Project Settings | Schemas and DTDs)">http://activiti.org/bpmn</error>"
+	xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL">
+	
+   <process id="financialReport" name="Monthly financial report process">
+	
+		<startEvent id="theStart" />
+		
+		<sequenceFlow id="flow1" sourceRef="theStart" targetRef="writeReportTask" />
+		
+		<userTask id="writeReportTask" name="Write monthly financial report" >
+		  <documentation>
+        Write monthly financial report for publication to shareholders.
+      </documentation>
+      <potentialOwner>
+        <resourceAssignmentExpression>
+          <formalExpression>accountancy</formalExpression>
+        </resourceAssignmentExpression>
+      </potentialOwner>
+		</userTask>
+		
+		<sequenceFlow id="flow2" sourceRef="writeReportTask" targetRef="verifyReportTask" />
+			
+		<userTask id="verifyReportTask" name="Verify monthly financial report" >
+		  <documentation>
+        Verify monthly financial report composed by the accountancy department.
+        This financial report is going to be sent to all the company shareholders.  
+      </documentation>
+      <potentialOwner>
+        <resourceAssignmentExpression>
+          <formalExpression>management</formalExpression>
+        </resourceAssignmentExpression>
+      </potentialOwner>
+		</userTask>
+		
+		<sequenceFlow id="flow3" sourceRef="verifyReportTask" targetRef="theEnd" />
+			
+		<endEvent id="theEnd" />
+			
+	</process>
+	
+</definitions>
diff --git a/xml/tests/testData/xml/Forms.xsd b/xml/tests/testData/xml/Forms.xsd
new file mode 100644
index 000000000000..f42d02c475bb
--- /dev/null
+++ b/xml/tests/testData/xml/Forms.xsd
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="forms" type="xs:string"/>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/HighlightWhenNoNsSchemaLocation.xml b/xml/tests/testData/xml/HighlightWhenNoNsSchemaLocation.xml
new file mode 100644
index 000000000000..c9f2474359d5
--- /dev/null
+++ b/xml/tests/testData/xml/HighlightWhenNoNsSchemaLocation.xml
@@ -0,0 +1,4 @@
+<build number="1" xsi:noNamespaceSchemaLocation="HighlightWhenNoNsSchemaLocation.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<statusInfo status="SUCCESS"/>
+<statusInfo status=<error>"SUCCESS2"</error>/>
+</build>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/HighlightWhenNoNsSchemaLocation.xsd b/xml/tests/testData/xml/HighlightWhenNoNsSchemaLocation.xsd
new file mode 100644
index 000000000000..da7cefac9c08
--- /dev/null
+++ b/xml/tests/testData/xml/HighlightWhenNoNsSchemaLocation.xsd
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsd:schema version="1.0"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            elementFormDefault="qualified"
+  >
+  <xsd:element name="build" type="buildType" />
+
+  <xsd:complexType name="buildType" mixed="true">
+    <xsd:sequence>
+      <xsd:element name="statusInfo" type="statusInfoType" minOccurs="0" />
+      <xsd:element name="statsValue" type="statsValueType" maxOccurs="unbounded" minOccurs="0" />
+    </xsd:sequence>
+    <xsd:attribute name="number" type="xsd:string" />
+  </xsd:complexType>
+
+  <xsd:complexType name="statsValueType">
+    <xsd:attribute name="key" type="xsd:string" />
+    <xsd:attribute name="value" type="xsd:decimal" />
+  </xsd:complexType>
+
+  <xsd:complexType name="statusInfoType">
+    <xsd:sequence>
+      <xsd:element name="text" type="statusInfoTextType" maxOccurs="unbounded" minOccurs="0" />
+    </xsd:sequence>
+    <xsd:attribute name="status" type="statusType"/>
+  </xsd:complexType>
+
+  <xsd:complexType name="statusInfoTextType" mixed="true">
+    <xsd:attribute name="action" type="actionType" />
+  </xsd:complexType>
+
+  <xsd:simpleType name="actionType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="prepend"/>
+      <xsd:enumeration value="append"/>
+      <xsd:enumeration value="replace"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="statusType">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="SUCCESS"/>
+      <xsd:enumeration value="NORMAL"/>
+      <xsd:enumeration value="FAILURE"/>
+      <xsd:enumeration value="ERROR"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd.dtd b/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd.dtd
new file mode 100644
index 000000000000..6cfeb167786e
--- /dev/null
+++ b/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd.dtd
@@ -0,0 +1,12 @@
+<![%draft;[
+<!ELEMENT book (comments*, title, body, supplements?)>
+<!ELEMENT comments EMPTY>
+]]>
+<![%final;[
+<!ELEMENT book (price,title, body, supplements?)>
+<!ELEMENT price EMPTY>
+]]>
+
+<!ELEMENT title EMPTY>
+<!ELEMENT body EMPTY>
+<!ELEMENT supplements EMPTY>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd.xml b/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd.xml
new file mode 100644
index 000000000000..4690ebcc0388
--- /dev/null
+++ b/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd.xml
@@ -0,0 +1,13 @@
+<!DOCTYPE book [
+  <!ENTITY % draft 'INCLUDE' >
+  <!ENTITY % final 'IGNORE' >
+  <!ENTITY MY SYSTEM 'HighlightingWithConditionalSectionsInDtd.dtd'>
+  %MY;
+]>
+<book>
+  <comments> aaa </comments>
+  <<error>price</error>> aaa </<error>price</error>>
+  <title> bbb </title>
+  <body> bbb </body>
+  <supplements> bbb </supplements>
+</book>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd2.xml b/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd2.xml
new file mode 100644
index 000000000000..f9f84b589150
--- /dev/null
+++ b/xml/tests/testData/xml/HighlightingWithConditionalSectionsInDtd2.xml
@@ -0,0 +1,12 @@
+<!DOCTYPE book [
+  <!ENTITY % draft 'IGNORE' >
+  <!ENTITY % final 'INCLUDE' >
+  <!ENTITY MY SYSTEM 'HighlightingWithConditionalSectionsInDtd.dtd'>
+  %MY;
+]>
+<book>
+  <<error>comments</error>> aaa </<error>comments</error>>
+  <title> bbb </title>
+  <body> bbb </body>
+  <supplements> bbb </supplements>
+</book>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/IgnoredNamespaceHighlighting.xml b/xml/tests/testData/xml/IgnoredNamespaceHighlighting.xml
new file mode 100644
index 000000000000..a0d84e141985
--- /dev/null
+++ b/xml/tests/testData/xml/IgnoredNamespaceHighlighting.xml
@@ -0,0 +1,7 @@
+<mine:template xmlns="http://www.w3.org/1999/xhtml" xmlns:mine="http://ignored/uri">
+     <div>
+         <mine:tag type="">
+             <div />
+         </mine:tag>
+     </div>
+</mine:template>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ImportProblems.xsd b/xml/tests/testData/xml/ImportProblems.xsd
new file mode 100644
index 000000000000..d9e3708b0d05
--- /dev/null
+++ b/xml/tests/testData/xml/ImportProblems.xsd
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.ivtest/iv" xmlns:iv="http://www.ivtest/iv">
+  <xs:import schemaLocation="ImportProblems2.xsd"/>
+  <xs:element name="InfiView">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Component"/>
+        <xs:element ref="iv:viewport"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="viewport">
+    <xs:complexType/>
+  </xs:element>
+</xs:schema>
diff --git a/xml/tests/testData/xml/ImportProblems2.xsd b/xml/tests/testData/xml/ImportProblems2.xsd
new file mode 100644
index 000000000000..38de9a8b717d
--- /dev/null
+++ b/xml/tests/testData/xml/ImportProblems2.xsd
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" xmlns:iv="http://www.ivtest/iv">
+  <xs:import namespace="http://www.ivtest/iv" schemaLocation="ImportProblems.xsd"/>
+  <xs:element name="Application">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Window"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Window">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="Component"/>
+        <xs:element ref="Label"/>
+        <xs:element ref="iv:InfiView"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="Label">
+    <xs:complexType/>
+  </xs:element>
+  <xs:element name="Component">
+    <xs:complexType/>
+  </xs:element>
+</xs:schema>
diff --git a/xml/tests/testData/xml/InvalidIdRefAttribute.xml b/xml/tests/testData/xml/InvalidIdRefAttribute.xml
new file mode 100644
index 000000000000..4a9c399d277b
--- /dev/null
+++ b/xml/tests/testData/xml/InvalidIdRefAttribute.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE tv [ <!ELEMENT tv (date)*> <!ELEMENT date (#PCDATA)> <!ATTLIST date idref IDREF #IMPLIED id ID #IMPLIED>]>
+
+<tv>
+  <date idref=<error>"aaa"</error> id="bbb"/>
+  <date idref="bbb"/>
+  <date idref="ccc"/>
+  <date id="ccc"/>
+</tv>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/InvalidIdRefInXsl.xml b/xml/tests/testData/xml/InvalidIdRefInXsl.xml
new file mode 100644
index 000000000000..5520ca8d0e2b
--- /dev/null
+++ b/xml/tests/testData/xml/InvalidIdRefInXsl.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns="http://www.w3.org/1999/xhtml"
+    >
+    <xsl:output method="xml"/>
+    <xsl:template match="a">
+        <div id="{@id}"></div>
+        <input type="{@type}" />
+    </xsl:template>
+
+    <xsl:template match="b">
+        <div id="{@id}"></div>
+    </xsl:template>
+</xsl:stylesheet>
diff --git a/xml/tests/testData/xml/ManyRootTags.xml b/xml/tests/testData/xml/ManyRootTags.xml
new file mode 100644
index 000000000000..cc3fb7544883
--- /dev/null
+++ b/xml/tests/testData/xml/ManyRootTags.xml
@@ -0,0 +1,2 @@
+<child attrib="whatever"/>
+<error><</error>child/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/MappedSchemaLocation.xml b/xml/tests/testData/xml/MappedSchemaLocation.xml
new file mode 100644
index 000000000000..556b8578cdc5
--- /dev/null
+++ b/xml/tests/testData/xml/MappedSchemaLocation.xml
@@ -0,0 +1,8 @@
+<forms
+
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+        xsi:noNamespaceSchemaLocation="schemas/Forms.xsd">
+
+
+</forms>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/MavenValidation.xml b/xml/tests/testData/xml/MavenValidation.xml
new file mode 100644
index 000000000000..6fda86abf747
--- /dev/null
+++ b/xml/tests/testData/xml/MavenValidation.xml
@@ -0,0 +1,310 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>dk.pfa</groupId>
+  <artifactId>OtherApps</artifactId>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>Maven Quick Start Archetype</name>
+  <url>http://maven.apache.org</url>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
+
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+
+                <property name="maven.compile.classpath"
+                          value="${maven.compile.classpath};C:/bea/weblogic91/server/lib/weblogic.jar"/>
+                <property name="maven.runtime.classpath"
+                          value="${maven.runtime.classpath};C:/bea/weblogic91/server/lib/weblogic.jar"/>
+                <!--
+                <classpath>
+                    <pathelement path="${classpath}"/>
+                    <pathelement path="C:/bea/weblogic91/server/lib/weblogic.jar"/>
+                </classpath>
+                -->
+                <property name="cp5" refid="maven.compile.classpath"/>
+                <echo message="maven.plugin.classpath is ${cp5}"/>
+                <echo message=""/>
+
+                <property name="wls.username" value="weblogic"/>
+                <property name="wls.password" value="weblogic"/>
+                <property name="wls.hostname" value="10.131.20.56"/>
+                <property name="wls.port" value="7001"/>
+                <property name="wls.server.name" value="myserver"/>
+
+                <property name="ear.deployed.name" value="upgradePOJOEar"/>
+                <property name="example-output" value="output"/>
+                <property name="ear-dir" value="${example-output}/upgradePOJOEar"/>
+
+                <taskdef name="jwsc" classname="weblogic.wsee.tools.anttasks.JwscTask"
+                         classpathref="maven.compile.classpath"/>
+                <taskdef name="wldeploy" classname="weblogic.ant.taskdefs.management.WLDeploy"
+                         classpathref="maven.compile.classpath"/>
+                <wldeploy action="deploy" name="OtherApps"
+                          source="target/OtherApps-1.0-SNAPSHOT.war" user="weblogic"
+                          password="weblogic" verbose="true"
+                          adminurl="t3://localhost:7001"
+                          targets="AdminServer"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+
+  <repositories>
+    <repository>
+      <id>LocalPFArep333</id>
+      <name>Local PFA rep</name>
+      <url>http://tp-VPC4890.pfae3.csc.dk:9999/repository</url>
+      <releases>
+        <checksumPolicy>false</checksumPolicy>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+    </repository>
+    <repository>
+      <id>Ibiblo</id>
+      <name>Ibiblo rep</name>
+      <url>http://www.ibiblio.org/maven2</url>
+      <releases>
+        <checksumPolicy>false</checksumPolicy>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <id>ibib</id>
+      <name>ibib</name>
+      <url>http://www.ibiblio.org/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+
+  <dependencies>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>weblogic</groupId>
+      <artifactId>weblogic</artifactId>
+      <version>9.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>otherapps</groupId>
+      <artifactId>otherapps-siGeneratedXmlbeans</artifactId>
+      <version>1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache</groupId>
+      <artifactId>xmlbeans</artifactId>
+      <version>2.1.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>oracle</groupId>
+      <artifactId>oracle-jdbc</artifactId>
+      <version>10.1.0.2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.9</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring</artifactId>
+      <version>1.2.7</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.transaction</groupId>
+      <artifactId>jta</artifactId>
+      <version>1.0.1B</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>1.0.b2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>1.0-b1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>1.1</version>
+    </dependency>
+
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>2.1_3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>1.5.3</version>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+      <version>2.7.6rc1</version>
+    </dependency>
+
+
+    <dependency>
+      <groupId>lucene</groupId>
+      <artifactId>lucene</artifactId>
+      <version>1.4.3</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>ejb</artifactId>
+      <version>3.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate</artifactId>
+      <version>3.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-annotations</artifactId>
+      <version>3.1beta9</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.sql</groupId>
+      <artifactId>jdbc-stdext</artifactId>
+      <version>2.0</version>
+    </dependency>
+
+
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <version>1.6</version>
+      <exclusions>
+        <exclusion>
+          <groupId>jaxme</groupId>
+          <artifactId>jaxme-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>jaxen</groupId>
+          <artifactId>jaxen</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>msv</groupId>
+          <artifactId>xsdlib</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>msv</groupId>
+          <artifactId>relaxngDatatype</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>pull-parser</groupId>
+          <artifactId>pull-parser</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xpp3</groupId>
+          <artifactId>xpp3</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>junitperf</groupId>
+          <artifactId>junitperf</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>stax</groupId>
+          <artifactId>stax-ri</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xalan</groupId>
+          <artifactId>xalan</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/MinMaxOccursInSchema.xsd b/xml/tests/testData/xml/MinMaxOccursInSchema.xsd
new file mode 100644
index 000000000000..0122c5cb06f6
--- /dev/null
+++ b/xml/tests/testData/xml/MinMaxOccursInSchema.xsd
@@ -0,0 +1,7 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="zzz" xmlns="zzz">
+  <xsd:complexType name="xxx">
+    <xsd:sequence>
+      <xsd:element name="e" type="xsd:string" minOccurs="1" maxOccurs=<error>"0"</error>/>
+    </xsd:sequence>
+  </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MobileHtml.html b/xml/tests/testData/xml/MobileHtml.html
new file mode 100644
index 000000000000..d5dce2f04a90
--- /dev/null
+++ b/xml/tests/testData/xml/MobileHtml.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN"
+        "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">
+
+<html>
+<body>
+<div></div>
+<p></p>
+<<warning descr="Unknown html tag unknown">unknown</warning>></<warning descr="Unknown html tag unknown">unknown</warning>>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/MuleConfigHighlighting.xml b/xml/tests/testData/xml/MuleConfigHighlighting.xml
new file mode 100644
index 000000000000..cc64506f57fa
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigHighlighting.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mule xmlns="http://www.mulesource.org/schema/mule/core/2.0"
+      xmlns:management="http://www.mulesource.org/schema/mule/management/2.0"
+      xmlns:spring="http://www.springframework.org/schema/beans"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
+      xsi:schemaLocation="http://www.mulesource.org/schema/mule/core/2.0 mule.xsd
+        http://www.mulesource.org/schema/mule/management/2.0 mule-management.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+    <management:jmx-server createServer="true"/>
+</mule>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/MuleConfigHighlighting2.xml b/xml/tests/testData/xml/MuleConfigHighlighting2.xml
new file mode 100644
index 000000000000..d3413d49c504
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigHighlighting2.xml
@@ -0,0 +1,19 @@
+<mule xmlns="http://www.mulesource.org/schema/mule/core/2.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:spring="http://www.springframework.org/schema/beans"
+xmlns:cxf="http://www.mulesource.org/schema/mule/cxf/2.2"
+xsi:schemaLocation="http://www.springframework.org/schema/beans
+http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+http://www.mulesource.org/schema/mule/core/2.2
+mule2_2.xsd
+http://www.mulesource.org/schema/mule/cxf/2.2
+mule2_2-cxf.xsd">
+<model name="CxfExample">
+  <service name="helloService">
+    <inbound>
+      <cxf:inbound-endpoint serviceName=""
+address="http://localhost:${mule.webservice.port}/${mule.wsdl.endpoint}"
+wsdlLocation="FooSvc.wsdl"/>
+    </inbound>
+</service>
+</model>
+</mule>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/MuleConfigHighlighting2/cxf-beans.xsd b/xml/tests/testData/xml/MuleConfigHighlighting2/cxf-beans.xsd
new file mode 100644
index 000000000000..83cc5436d98d
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigHighlighting2/cxf-beans.xsd
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
+<xsd:schema
+    targetNamespace="http://cxf.apache.org/configuration/beans"
+    xmlns:tns="http://cxf.apache.org/configuration/beans"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified">
+
+
+    <xsd:attributeGroup name="beanAttributes">
+	<xsd:attribute name="name" type="xsd:string">
+	    <xsd:annotation>
+	        <xsd:documentation>
+	            A unique identifier for the bean. This can also be a list of identifiers.
+                    See documentation for attribute name in attribute group beanAttributes
+                    in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="abstract" type="xsd:boolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Specifies if the bean is an abstract bean. Abstract beans act as parents for
+                    concrete bean definitions and are not instantiated. The default is "false".
+                    Setting this to "true" instructs the bean factory not to instantiate the bean.
+                    See documentation for attribute abstract in attribute group beanAttributes
+                    in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="depends-on" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of beans that the bean depends on being instantiated before it
+                    can be instantiated.
+                    See documentation for attribute depends-on in attribute group beanAttributes
+                    in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="createdFromAPI" type="xsd:boolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Specifies that the user created that bean using CXF APIs like
+                    Endpoint.publish or Service.getPort.
+                    The default is "false".
+                    Setting this to "true" does the following: Changes the internal name of the
+                    bean by appending either ".jaxws-client" or ".jaxws-endpoint" to the bean's
+                    id. Makes the bean abstract.
+                    See documentation for attribute abstract in attribute group beanAttributes
+                    in http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:complexType name="ClassOrBeanType">
+       <xsd:attribute name="class" type="xsd:string"/>
+       <xsd:attribute name="bean"  type="xsd:string"/>
+    </xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/MuleConfigHighlighting2/cxf_core.xsd b/xml/tests/testData/xml/MuleConfigHighlighting2/cxf_core.xsd
new file mode 100644
index 000000000000..045a0f3b94be
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigHighlighting2/cxf_core.xsd
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:beans="http://www.springframework.org/schema/beans"
+  xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  targetNamespace="http://cxf.apache.org/core"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified"  >
+
+  <xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/>
+  <xsd:import namespace="http://cxf.apache.org/configuration/beans" schemaLocation="cxf-beans.xsd"/>
+
+  <xsd:annotation>
+    <xsd:documentation>
+      This schema defines beans representing the CXF bus and its core features.
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:element name="logging">
+    <xsd:annotation>
+      <xsd:documentation>
+        The logging feature enables you to log the content of inbound and outbound messages and faults.
+        The content is logged by all log handlers configured in your java.util.logging configuration file,
+        provided the log level for classes org.apache.cxf.interceptor.LoggingInInterceptor and
+        org.apache.cxf.interceptor.LoggingOutInterceptor is at least INFO.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence />
+      <xsd:attribute name="limit" type="xsd:int" use="optional" default="102400"/>
+      <xsd:attribute name="id" type="xsd:string" use="optional"/>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="fastinfoset">
+    <xsd:annotation>
+      <xsd:documentation>
+        The fastinfoset feature enables you to turn on using fastinfoset encoding of
+        xml payloads.
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:complexType>
+      <xsd:sequence />
+      <xsd:attribute name="force" type="xsd:boolean" use="optional" default="false"/>
+    </xsd:complexType>
+  </xsd:element>
+
+  <xsd:element name="bus">
+    <xsd:complexType>
+      <xsd:all>
+        <xsd:element name="features" type="xsd:anyType" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>
+                The list of features that are applied to the bus.
+                Child elements of this element must be beans whose bean class extends
+                org.apache.cxf.AbstractFeature, or references to such beans.
+            </xsd:documentation>
+        </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="inInterceptors" type="xsd:anyType" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>
+                The list of interceptors that the bus contributes to all inbound message interceptor chains.
+                Child elements of this element must be beans whose bean class implements
+                org.apache.cxf.Interceptor, or references to such beans.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="inFaultInterceptors" type="xsd:anyType" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>
+                The list of interceptors that the bus contributes to all inbound fault interceptor chains.
+                Child elements of this element must be beans whose bean class implements
+                org.apache.cxf.Interceptor, or references to such beans.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="outInterceptors" type="xsd:anyType" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>
+                The list of interceptors that the bus contributes to all outbound message interceptor chains.
+                Child elements of this element must be beans whose bean class implements
+                org.apache.cxf.Interceptor, or references to such beans.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="outFaultInterceptors" type="xsd:anyType" minOccurs="0">
+          <xsd:annotation>
+            <xsd:documentation>
+                The list of interceptors that the bus contributes to all outbound fault interceptor chains.
+                Child elements of this element must be beans whose bean class implements
+                org.apache.cxf.Interceptor, or references to such beans.
+            </xsd:documentation>
+          </xsd:annotation>
+        </xsd:element>
+        <xsd:element name="properties" type="beans:mapType" minOccurs="0">
+            <xsd:annotation>
+                <xsd:documentation>Specifies a map of properties that are passed to the bus.</xsd:documentation>
+            </xsd:annotation>
+        </xsd:element>
+      </xsd:all>
+      <xsd:attributeGroup ref="cxf-beans:beanAttributes"/>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2-cxf.xsd b/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2-cxf.xsd
new file mode 100644
index 000000000000..65ee6f449389
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2-cxf.xsd
@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xsd:schema xmlns="http://www.mulesource.org/schema/mule/cxf/2.2"
+            xmlns:cxf="http://cxf.apache.org/core"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:mule="http://www.mulesource.org/schema/mule/core/2.2"
+            xmlns:schemadoc="http://www.mulesource.org/schema/mule/schemadoc/2.2"
+            xmlns:beans="http://www.springframework.org/schema/beans"
+            targetNamespace="http://www.mulesource.org/schema/mule/cxf/2.2"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:import namespace="http://www.springframework.org/schema/beans"
+                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
+    <xsd:import namespace="http://www.mulesource.org/schema/mule/core/2.2"
+                schemaLocation="mule2_2.xsd"/>
+    <xsd:import namespace="http://cxf.apache.org/core"
+                schemaLocation="cxf_core.xsd"/>
+    <xsd:import namespace = "http://www.mulesource.org/schema/mule/schemadoc/2.2"
+                schemaLocation = "mule2_2-schemadoc.xsd"/>
+
+    <xsd:annotation>
+        <xsd:documentation>
+            Apache CXF is an open source services framework. CXF helps you build and develop services using frontend programming APIs, like JAX-WS. These services can speak a variety of protocols such as SOAP, XML/HTTP, RESTful HTTP, or CORBA and work over a variety of transports such as HTTP, JMS or JBI. The Mule CXF Transport is an evolution of Mule's XFire transport, which provided support for the use of web service integration via Apache CXF. The Mule CXF connector also provides support for WS-Security, WS-Addressing, and WS-Reliable-Messaging.
+        </xsd:documentation>
+
+        <xsd:appinfo>
+            <schemadoc:short-name>CXF</schemadoc:short-name>
+            <schemadoc:page-title>CXF Transport</schemadoc:page-title>
+
+            <schemadoc:transport-features receiveEvents="true" dispatchEvents="true" responseEvents="true"
+                                          requestEvents="true"
+                                          transactions="false" streaming="true">
+                <schemadoc:inboundMEPs in-only="true" in-out="true" in-optional-out="true"/>
+                <schemadoc:outboundMEPs out-only="true" out-in="true" out-optional-in="true"/>
+            </schemadoc:transport-features>
+        </xsd:appinfo>
+    </xsd:annotation>
+
+    <xsd:element name="connector" type="cxfConnectorType" substitutionGroup="mule:abstract-connector"/>
+    <xsd:complexType name="cxfConnectorType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:connectorType">
+                <xsd:attribute name="defaultFrontend" type="xsd:string" default="jaxws">
+                   <xsd:annotation>
+                        <xsd:documentation>
+                            The CXF frontend that is used to build an internal service representation from your Java classes. The default is "jaxws". The "simple" frontend is also supported.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="configurationLocation" type="xsd:string">
+                    <xsd:annotation>
+                         <xsd:documentation>
+                             The location of a CXF configuration file, if any needs to be supplied.
+                         </xsd:documentation>
+                     </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="initializeStaticBusInstance" type="mule:substitutableBoolean" default="true">
+                    <xsd:annotation>
+                         <xsd:documentation>
+                             Initialize the static CXF Bus with a Bus configured to use Mule for all transports. This will affect any CXF generated clients that you run standalone. Defaults to true.
+                         </xsd:documentation>
+                     </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="inbound-endpoint" type="inboundEndpointType" substitutionGroup="mule:abstract-inbound-endpoint"/>
+    <xsd:complexType name="inboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:inboundEndpointType">
+                <xsd:group ref="endpointElements"/>
+                <xsd:attributeGroup ref="inboundEndpointAttributes"/>
+                <xsd:attributeGroup ref="commonEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="outbound-endpoint" type="outboundEndpointType"
+                 substitutionGroup="mule:abstract-outbound-endpoint"/>
+
+    <xsd:complexType name="outboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:outboundEndpointType">
+                <xsd:group ref="endpointElements"/>
+                <xsd:attributeGroup ref="outboundEndpointAttributes"/>
+                <xsd:attributeGroup ref="commonEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="endpoint" type="globalEndpointType" substitutionGroup="mule:abstract-global-endpoint"/>
+
+    <xsd:complexType name="globalEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:globalEndpointType">
+                <xsd:group ref="endpointElements"/>
+                <xsd:attributeGroup ref="inboundEndpointAttributes"/>
+                <xsd:attributeGroup ref="outboundEndpointAttributes"/>
+                <xsd:attributeGroup ref="commonEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:attributeGroup name="commonEndpointAttributes">
+        <xsd:attribute name="proxy" type="mule:substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Whether or not this outbound endpoint is acting as a web service proxy. If so, it will expect raw xml as the input parameter and return an XML stream as the output.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="payload">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Whether the whole SOAP Envelope, or just the body contents should be sent when in proxy mode.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+               <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="envelope"/>
+                    <xsd:enumeration value="body"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="mtomEnabled" type="mule:substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Whether or not MTOM (attachment support) is enabled for this endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="wsdlLocation" type="xsd:string" >
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location of the WSDL for your service. If this is a server side endpoint it will served to your users.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="protocolConnector" type="xsd:string" >
+            <xsd:annotation>
+                <xsd:documentation>
+                            The name of the connector that you wish to use to send/receive messages on with CXF. (As of 2.1)
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="applyTransformersToProtocol" type="mule:substitutableBoolean" default="true">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Whether to apply the transformers to the protocol endpoint. Defaults to true for Mule 2.2+ and false for 2.1 and previous versions.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="enableMuleSoapHeaders" type="mule:substitutableBoolean" default="true">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Whether or not this endpoint should write Mule SOAP headers which pass along the correlation and ReplyTo information. This is true by default, but the Mule SOAP headers are only triggered in situations where there is an existing correlation ID and the ReplyTo header is set. (As of 2.2.1)
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:attributeGroup name="inboundEndpointAttributes">
+        <xsd:attribute name="frontend">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The CXF frontend that is used to build an internal service representation from your Java classes. The default is "jaxws". The "simple" frontend is also supported.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+               <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="jaxws"/>
+                    <xsd:enumeration value="simple"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="bindingUri" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The binding that should be used for this service. It defaults to the SOAP binding by default.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="endpointName" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The WSDL endpoint name of your service.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="namespace" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The service namespace. (As of 2.2.1)
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="serviceClass" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class CXF should use to construct its service model. This is optional, and by default it will use the implementation class of your component.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="serviceName" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The WSDL service name of your service.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="applyFiltersToProtocol" type="mule:substitutableBoolean" default="true">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Whether to apply the filters to the protocol endpoint. Defaults to true for Mule 2.2+ and false for 2.1 and previous versions.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="applySecurityToProtocol" type="mule:substitutableBoolean" default="true">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Whether to apply the security filter to the protocol endpoint. Defaults to true for Mule 2.2+ and false for 2.1 and previous versions.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:group name="endpointElements">
+        <xsd:sequence>
+            <xsd:element name="databinding" type="databindingType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The databinding implementation that should be used. By default, this is JAXB for the JAX-WS frontend and Aegis for the simple frontend. This should be specified in the form of a Spring bean.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="features" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Any CXF features you want to apply to the client/server. See the CXF documentation for more information on features.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="inInterceptors" type="interceptors" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Additional incoming interceptors for this service.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="inFaultInterceptors" type="interceptors" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Additional incoming fault interceptors.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="outInterceptors" type="interceptors" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Additional outgoing interceptors.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="outFaultInterceptors" type="interceptors" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Additional outgoing fault interceptors.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:attributeGroup name="outboundEndpointAttributes">
+        <xsd:attribute name="wsdlPort" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The WSDL port you want to use to communicate with the service.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="clientClass" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the client class that CXF generated using CXF's wsdl2java tool. You must use wsdl2java if you do not have both the client and the server in the same JVM. Otherwise, this can be optional if the endpoint address is the same in both cases.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="operation" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The operation you want to invoke on the outbound endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:complexType name="databindingType">
+        <xsd:sequence>
+            <xsd:any minOccurs="0" maxOccurs="1" namespace="##any" processContents="lax"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="schemasType">
+        <xsd:sequence>
+            <xsd:element name="schemaLocation" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The location of any additional schema to be included inside the WSDL.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="features">
+        <xsd:complexType>
+            <xsd:sequence>
+                <xsd:any minOccurs="0" maxOccurs="unbounded"/>
+            </xsd:sequence>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:complexType name="interceptors">
+        <xsd:sequence>
+            <xsd:any minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="propertiesType">
+        <xsd:sequence>
+            <xsd:element ref="beans:entry" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="wrapper-component" type="wrapperComponentType" substitutionGroup="mule:abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                The WebServiceWrapperComponent class allows you to send the result of a web service call to another endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="wrapperComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:abstractComponentType">
+                <xsd:attribute name="address" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The URL of the web service.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="addressFromMessage" type="mule:substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Specifies that the URL of the web service will be obtained from the message itself.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="wsdlPort" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The WSDL port you want to use to communicate to the service.
+                         </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="operation" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The operation you want to invoke on the outbound endpoint.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="stax">
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="beans:identifiedType">
+                    <xsd:attribute name="xmlInputFactory" type="xsd:string" />
+                    <xsd:attribute name="xmlOutputFactory" type="xsd:string" />
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="security-manager-callback">
+        <xsd:annotation>
+            <xsd:documentation>
+                A WSS4J Password callback which verifies username/password combinations
+                against the Mule security manager.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="beans:identifiedType">
+                    <xsd:attribute name="securityManager-ref">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The security manager instance to use for the password callback. (Optional)
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2-schemadoc.xsd b/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2-schemadoc.xsd
new file mode 100644
index 000000000000..d9ddeba024df
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2-schemadoc.xsd
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xsd:schema xmlns="http://www.mulesource.org/schema/mule/schemadoc/2.2"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://www.mulesource.org/schema/mule/schemadoc/2.2"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:annotation>
+        <xsd:documentation>This schema provides a schema doc extentions that can be embedded in Mule schemas. These
+            elements will be used to render additional wiki content associated with the element being annotated.
+            Elements within this schema should be embedded under 'xsd:element/xsd:annotation/xsd:appinfo'.
+            To stick to convention and to ensure that XSLs will work this schema should be included in other mule
+            schemas using the 'schemadoc' prefix namespace.
+        </xsd:documentation>
+        <xsd:appinfo>
+            <page-title>SchemaDoc Reference</page-title>
+        </xsd:appinfo>
+    </xsd:annotation>
+
+    <xsd:element name="snippet" type="snippetType">
+        <xsd:annotation>
+            <xsd:documentation>The snippet allows for code snippets to be associated with an element in a schema. This
+                is useful for surfacing documentation on the wiki. When the schema reference is generated for the wiki,
+                the code snippets will also be rendered when using the 'single-element-wike.xsl'.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="page-title" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>The page title to use when rendering this schema.</xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="short-name" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>The short name of the module or transport, i.e. 'xml' or 'tcp'.</xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="additional-documentation" type="additionalDocumentationType">
+        <xsd:annotation>
+            <xsd:documentation>Additional documentation that can be rendered with the schema. Note that this element can
+                only be used in {{/xsd:schema/xsd:annotation/xsd:appinfo}}, it will be ignorred if used anywhere else.
+                Enter
+                the documentation in the body of this element.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="additionalDocumentationType" mixed="true">
+        <xsd:attribute name="where" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The point at which the documentation is rendered.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="before-common-elements">
+                        <xsd:annotation>
+                            <xsd:documentation>The documentation will appear after any title text but before any of the
+                                common elements are rendered.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="after-common-elements">
+                        <xsd:annotation>
+                            <xsd:documentation>The documentation will appear right after common elements are rendered.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="before-specific-elements">
+                        <xsd:annotation>
+                            <xsd:documentation>The documentation will appear right before the elements specific to the
+                                schema are rendered.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="after-specific-elements">
+                        <xsd:annotation>
+                            <xsd:documentation>The documentation will appear right after the elements specific to the
+                                schema are rendered.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="before-single-element">
+                        <xsd:annotation>
+                            <xsd:documentation>If a specific element was named, this documentation will appear directly
+                                before the element. The mode is less useful but supported for completeness.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="after-single-element">
+                        <xsd:annotation>
+                            <xsd:documentation>If a specific element was named, this documentation will appear directly
+                                after the element. The mode is less useful but supported for completeness.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="snippetType" mixed="true">
+        <xsd:attribute name="id" type="xsd:NMTOKEN" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The ID of the snippet to embed in the wiki page. This ID is embedded in the source
+                    file using a START SNIPPET xxx comment.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="lang">
+            <xsd:annotation>
+                <xsd:documentation>The language format to use when rendering the content of the snippet on the wiki.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="xml"/>
+                    <xsd:enumeration value="java"/>
+                    <xsd:enumeration value="javadoc"/>
+                    <xsd:enumeration value="bash"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="sourcePath" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>This is the path to the source file. Note this should be relative to the project root
+                    directory i.e. transport/jms/src/main/resources/etc...
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="transport-features" type="transportFeaturesType">
+        <xsd:annotation>
+            <xsd:documentation>Defines meta information about transports such as whether they can send or receive events
+                and if they supprt transactions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="transportFeaturesType">
+        <xsd:sequence>
+            <xsd:element name="inboundMEPs" type="inboundMEPsType" minOccurs="1">
+                <xsd:annotation>
+                    <xsd:documentation>The Inbound MEPs that are supported by this Transport.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="outboundMEPs" type="outboundMEPsType" minOccurs="1">
+                <xsd:annotation>
+                    <xsd:documentation>The Outbound MEPs that are supported by this Transport.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="receiveEvents" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether the transport can receive events and thus can be used for an inbound
+                    endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="dispatchEvents" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Ehether the transport can be used to dispatch events and thus is supported as an
+                    outbound endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="requestEvents" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether the transport can be used to request events directly from the source.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="responseEvents" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether the transport can be used in request/response style messaging. This means
+                    that the transport provides a back-channel to the callee.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="transactions" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether transactions are supported by the transports. Transports that support (/)A
+                    transactions can be configured in a distributed 2 Phase Commit (Distributed) transaction.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="transactionTypes" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>A comma separated list of transaction types, i.e. local, XA</xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="streaming" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether the transport supports streaming of the data is provides or publishes.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:complexType name="inboundMEPsType">
+        <xsd:attribute name="none" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="in-only" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="in-out" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="in-optional-out" type="xsd:boolean"></xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="outboundMEPsType">
+        <xsd:attribute name="none" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="out-only" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="out-in" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="out-optional-in" type="xsd:boolean"></xsd:attribute>
+    </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2.xsd b/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2.xsd
new file mode 100644
index 000000000000..c8ab0b751cd7
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigHighlighting2/mule2_2.xsd
@@ -0,0 +1,4533 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xsd:schema xmlns="http://www.mulesource.org/schema/mule/core/2.2"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:spring="http://www.springframework.org/schema/beans"
+            xmlns:spring-context="http://www.springframework.org/schema/context"
+            targetNamespace="http://www.mulesource.org/schema/mule/core/2.2"
+            attributeFormDefault="unqualified"
+            elementFormDefault="qualified">
+
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:import namespace="http://www.springframework.org/schema/beans"
+                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
+    <xsd:import namespace="http://www.springframework.org/schema/context"
+                schemaLocation="http://www.springframework.org/schema/context/spring-context-2.5.xsd"/>
+
+    <!--==============================================================-->
+    <!--   Structure                                                  -->
+    <!--==============================================================-->
+
+    <!-- This defines the structure in abstract terms (except for a few simple/unique things like
+         global properties).  We then provide some implementations below.  Other modules
+         can provide other implementations. -->
+
+    <xsd:element name="mule" type="muleType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Either the root element of a Mule configuration, or a "top-level" element in a Spring configuration that contains further Mule elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="muleType">
+        <xsd:sequence>
+            <xsd:element name="description" type="descriptionType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Holds any kind of documentation that accompanies this configuration file. It is intended to be "human readable" only and is not used by the system.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:group ref="springRootElements"/>
+                <xsd:group ref="muleRootElements"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="springRootElements">
+        <xsd:choice>
+            <xsd:element ref="spring:beans">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Allows the embedding of any Spring elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="spring:bean">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Allows Spring beans to be defined alongside Mule elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="spring-context:property-placeholder">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Allows Spring property placeholders to be configured directly in the Mule configuration file.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="muleRootElements">
+        <xsd:choice>
+            <xsd:element name="global-property" type="globalPropertyType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        A global property is a named string. It can be inserted in most attribute values using standard (ant-style) Spring placeholders.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="configuration" type="configurationType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Specifies defaults and general settings for the Mule instance.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="notifications" type="notificationManagerType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Registers listeners for notifications and associates interfaces with particular events.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-extension"/>
+            <xsd:element ref="abstract-security-manager"/>
+            <xsd:element ref="abstract-transaction-manager"/>
+            <xsd:element ref="abstract-connector"/>
+            <xsd:element ref="abstract-global-endpoint"/>
+            <xsd:element ref="abstract-transformer"/>
+            <xsd:element ref="abstract-filter"/>
+            <xsd:element ref="abstract-model"/>
+            <xsd:element ref="abstract-interceptor-stack"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="descriptionType">
+        <xsd:complexContent mixed="true">
+            <xsd:extension base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-extension" abstract="true" type="abstractExtensionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for arbitrary extensions as children of the 'mule' element. Other transports and modules can extend this if they need to add global elements to the configuration (but consider the more specific elements like abstract-connector first).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractExtensionType"/>
+
+    <xsd:element name="abstract-connector" abstract="true" type="abstractConnectorType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for connector elements. Connector elements allow properties to be configured across all endpoints that use the same transport. If multiple connectors are defined for the same transport, each endpoint must name which connector is being used.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractConnectorType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the connector so that other elements can reference it.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-global-endpoint" abstract="true" type="abstractGlobalEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for global endpoint elements. Global endpoints are named templates that allow you to define an endpoint once and refer to it in several places. The same template can be used for both inbound and outbound endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractGlobalEndpointType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the endpoint so that other elements can reference it. This name can also be referenced in the MuleClient.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-inbound-endpoint" abstract="true" type="abstractInboundEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for inbound endpoint elements. Inbound endpoints receive messages from the underlying transport. The message payload is then delivered to the component for processing.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInboundEndpointType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the endpoint in the registry. There is no need to set the 'name' attribute on inbound or outbound endpoints, only on global endpoints.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-outbound-endpoint" abstract="true" type="abstractOutboundEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for outbound endpoint elements. Outbound endpoints dispatch messages to the underlying transport.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractOutboundEndpointType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the endpoint in the registry. There is not need to set the 'name' attribute on inbound or outbound endpoints, only on global endpoints.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-transformer" abstract="true" type="abstractTransformerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transformer elements. Transformers convert message payloads.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransformerType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the transformer so that other elements can reference it. Required if the transformer is defined at the global level.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="returnClass" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class of the message generated by the transformer. This is used if transformers are auto-selected and to validate that the transformer returns the correct type.  Note that if you need to specify an array type you need postfix the class name with '[]'. For example, if you want return a an Orange[], you set the return class to 'org.mule.tck.testmodels.fruit.Orange[]'.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="ignoreBadInput" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Many transformers only accept certain classes. Such transformers are never called with inappropriate input (whatever the value of this attribute). If a transformer forms part of a chain and cannot accept the current message class, this flag controls whether the remaining part of the chain is evaluated. If true, the next transformer is called. If false the chain ends, keeping the result generated up to that point.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="globalPropertyType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the property. This is used inside Spring placeholders.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="value" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The value of the property. This replaces each occurence of a Spring placeholder.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- seemed pointless making these simple container types abstract -->
+    <xsd:complexType name="inboundCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-inbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-inbound-router" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-catch-all-strategy" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute name="matchAll" type="substitutableBoolean" default="true">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, the input message will be passed to all inbound routers. Otherwise, only the first matching router is used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-catch-all-strategy" abstract="true" type="abstractCatchAllStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for catch-all strategy elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractCatchAllStrategyType"/>
+
+    <xsd:element name="abstract-inbound-router" abstract="true" type="abstractInboundRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for inbound router elements, which control how incoming messages are handled.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInboundRouterType"/>
+
+    <xsd:element name="abstract-filter" abstract="true" type="abstractFilterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for filter elements, which control which messages are handled.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractFilterType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the filter so that other elements can reference it. Required if the filter is defined at the global level.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="not" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Inverts the filter condition.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="outboundCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-outbound-router" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-catch-all-strategy" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute name="matchAll" type="substitutableBoolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, the output message will be sent to all routers. Otherwise, only the first matching router is used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-outbound-router" abstract="true" type="abstractOutboundRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for outbound router elements, which control how outgoing messages are delivered to the outbound endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractOutboundRouterType"/>
+
+    <xsd:element name="abstract-transaction-manager" abstract="true" type="abstractTransactionManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transaction manager elements, which are used to coordinate transactions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransactionManagerType"/>
+
+    <xsd:complexType name="configurationType">
+        <xsd:sequence>
+            <xsd:element name="default-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default threading profile, used by components and by endpoints for dispatching and receiving if no more specific configuration is given.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-dispatcher-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default dispatching threading profile, which modifies the default-threading-profile values and is used by endpoints for dispatching messages. This can also be configured on connectors, in which case the connector configuration is used instead of this default.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-receiver-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default receiving threading profile, which modifies the default-threading-profile values and is used by endpoints for receiving messages. This can also be configured on connectors, in which case the connector configuration is used instead of this default.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-service-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default service threading profile, which modifies the default-threading-profile and is used by services for processing messages. This can also be configured on models or services, in which case these configurations will be used instead of this default.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-retry-policy" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default retry policy, used by connectors and endpoints. This can also be configured on connectors, in which case the connector configuration is used instead of this default.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="defaultSynchronousEndpoints" type="substitutableBoolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, all requests to endpoints will wait for a response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="defaultResponseTimeout" type="xsd:string" default="10000">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The default period (ms) to wait for a synchronous response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="defaultTransactionTimeout" type="xsd:string" default="30000">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The default timeout (ms) for transactions. This can also be configured on transactions, in which case the transaction configuration is used instead of this default.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="shutdownTimeout" type="substitutableInt" default="5000">
+            <xsd:annotation>
+                <xsd:documentation>
+                    (As of Mule 2.2.2) The time in milliseconds to wait for any in-progress messages to finish processing before Mule shuts down. After this threshold has been reached, Mule starts interrupting threads, and messages can be lost. If you have a very large number of services in the same Mule instance, if you have components that take more than a couple seconds to process, or if you are using large payloads and/or slower transports, you should increase this value to allow more time for graceful shutdown. The value you specify is applied to services and separately to dispatchers, so the default value of 5000 milliseconds specifies that Mule has ten seconds to process and dispatch messages gracefully after shutdown is initiated.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="notificationManagerType">
+        <xsd:sequence>
+            <xsd:element name="notification" type="defineNotificationType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Associates an event with an interface. Listeners that implement the interface will receive instances of the event.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="disable-notification" type="disableNotificationType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Blocks the association of an event with a particular interface. This filters events after the association with a particular interface (and so takes precedence).
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="notification-listener" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Registers a bean as a listener with the notification system. Events are dispatched by reflection - the listener will receive all events associated with any interfaces it implements. The relationship between interfaces and events is configured by the notification and disable-notification elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                    <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The bean that will receive notifications.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="subscription" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                An optional string that is compared with the event resource identifier. Only events with matching identifiers will be sent. If no value is given, all events are sent.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="dynamic" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If the notification manager is dynamic, listeners can be registered dynamically at runtime via the MuleContext, and the configured notification can be changed. Otherwise, some parts of Mule will cache notification configuration for efficiency and will not generate events for newly enabled notifications or listeners. The default value is false.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="defineNotificationType">
+        <xsd:attribute name="event-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class associated with a notification event that will be delivered to the interface. This can be used instead of the 'event' attribute to specify a custom class.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="event" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The notification event to deliver.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface (class name) that will receive the notification event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface that will receive the notification event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="disableNotificationType">
+        <xsd:attribute name="event-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class associated with an event that will no longer be delivered to any interface. This can be used instead of the 'event' attribute to specify a custom class.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="event" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The event you no longer want to deliver.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface (class name) that will no longer receive the event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface that will no longer receive the event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+
+    <xsd:simpleType name="notificationTypes">
+        <xsd:restriction base="xsd:NMTOKEN">
+            <xsd:enumeration value="CONTEXT"/>
+            <xsd:enumeration value="MODEL"/>
+            <xsd:enumeration value="SERVICE"/>
+            <xsd:enumeration value="SECURITY"/>
+            <xsd:enumeration value="ENDPOINT-MESSAGE"/>
+            <xsd:enumeration value="COMPONENT-MESSAGE"/>
+            <xsd:enumeration value="MANAGEMENT"/>
+            <xsd:enumeration value="CONNECTION"/>
+            <xsd:enumeration value="REGISTRY"/>
+            <xsd:enumeration value="CUSTOM"/>
+            <xsd:enumeration value="EXCEPTION"/>
+            <xsd:enumeration value="TRANSACTION"/>
+            <xsd:enumeration value="ROUTING"/>
+            <!-- DEPRECATED -->
+            <xsd:enumeration value="MESSAGE"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <!--==============================================================-->
+    <!-- Models                                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-model" abstract="true" type="abstractModelType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for model elements. A model provides basic settings and processing for all the services it contains.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractModelType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-exception-strategy" minOccurs="0"/>
+            <xsd:group ref="entryPointResolvers"/>
+            <xsd:element ref="abstract-service" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="nonBlankString">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name used to identify this model.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="seda-model" type="sedaModelType" substitutionGroup="abstract-model">
+        <xsd:annotation>
+            <xsd:documentation>
+                A staged event-driven architecture (SEDA) model has separate threads and queues for each service.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="sedaModelType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractModelType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-queue-profile" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="inherit" type="xsd:boolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If true, this model element is an extension of a previous model element with the same name.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="model" type="defaultModelType" substitutionGroup="abstract-model">
+        <xsd:annotation>
+            <xsd:documentation>
+                The container for a set of services, providing basic settings and processing for all the services it contains.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="defaultModelType">
+        <xsd:complexContent>
+            <xsd:extension base="sedaModelType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Model elements -->
+
+    <xsd:element name="abstract-queue-profile" abstract="true" type="abstractQueueProfileType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a queue profile, which controls how messages are queued.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractQueueProfileType"/>
+
+    <!-- to give a cleaner config we allow either a set or an individual entry (but not both).-->
+    <xsd:group name="entryPointResolvers">
+        <xsd:choice>
+            <xsd:element ref="abstract-entry-point-resolver-set" minOccurs="0"/>
+            <!-- we could allow many of these, but it looks ugly -->
+            <xsd:element ref="abstract-entry-point-resolver" minOccurs="0"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:element name="abstract-entry-point-resolver-set" abstract="true" type="abstractEntryPointResolverSetType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for entry point resolver set elements. These combine a group of entry point resolvers, trying them in turn until one succeeds.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractEntryPointResolverSetType"/>
+
+    <xsd:element name="legacy-entry-point-resolver-set" type="extensibleEntryPointResolverSet"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                An extensible set of entry point resolvers (which determine how a message is passed to a component in Java) that already contains resolvers to implement the standard logic. This is already provided by default and is only needed explicitly if it will be extended with other entry point resolvers. This element can be set on the model or component; the model value provides a default that individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="entry-point-resolver-set" type="extensibleEntryPointResolverSet"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                An extensible set of entry point resolvers. These determine how a message is passed to a component in Java. Each entry point resolver is tried in turn until one succeeds in delivering the message to the component. This element can be set on the model or component; the model value provides a default that individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="extensibleEntryPointResolverSet">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverSetType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-entry-point-resolver" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-entry-point-resolver-set" type="customEntryPointResolverSetType"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom entry point resolver set. This allows user-supplied code to determine how a message is passed to a component in Java. This element can be set on the model or component; the model value provides a default that individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customEntryPointResolverSetType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverSetType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the EntryPointResolverSet interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-entry-point-resolver" abstract="true" type="abstractEntryPointResolverType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an entry point resolver element. Entry point resolvers define how payloads are delivered to Java code by choosing the method to call.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="callable-entry-point-resolver" type="abstractEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                An entry point resolver for components that implement the Callable interface. This passes a MuleEventContext to the component. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractEntryPointResolverType"/>
+
+    <xsd:element name="custom-entry-point-resolver" type="customEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom entry point resolver. This allows user-supplied code to determine how a message is passed to a component in Java. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the EntryPointResolver interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverType">
+                <xsd:attribute name="transformFirst" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether the message should be transformed before being delivered to the component. By default, messages are transformed.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="acceptVoidMethods" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether the resolver should call void methods. By default, void methods are not considered as possible candidates for message delivery.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="property-entry-point-resolver" type="propertyEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Uses a message property to select the component method to be called. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="propertyEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:attribute name="property" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the message property used to select a method on the component.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="method-entry-point-resolver" type="methodEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Delivers the message to a named method. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="methodEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="include-entry-point" minOccurs="1" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="reflection-entry-point-resolver" type="reflectionEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Generates a list of candidate methods from the component via reflections. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="reflectionEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element name="exclude-object-methods" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                If specified, methods in the Java Object interface are not included in the list of possible methods that can receive the message.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="exclude-entry-point" type="methodType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Explicitly excludes a named method from receiving the message.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="array-entry-point-resolver" type="complexEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Delivers the message to a method that takes a single array as argument. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="no-arguments-entry-point-resolver" type="complexEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Calls a method without arguments (the message is not passed to the component).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="complexEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="reflectionEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="include-entry-point" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="enableDiscovery" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If no method names are configured, attempts to discover the method to invoke based on the inbound message type.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="include-entry-point" type="methodType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A possible method for delivery.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="methodType">
+        <xsd:attribute name="method" type="nonBlankString">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the method.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--  Services                                                    -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-service" abstract="true" type="abstractServiceType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a service element. Services combine message routing with a component (typically a POJO).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractServiceType">
+        <xsd:attribute name="name" type="nonBlankString" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name used to identify this service.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseServiceType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Base support for a model-based wrapper around the POJO service (SEDA, Streaming, etc.)
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractServiceType">
+                <xsd:sequence>
+                    <xsd:element name="description" type="descriptionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                This can hold any kind of documentation related to the service. It is intended to be "human readable" only and is not used by the system.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="inbound" type="inboundCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within 'inbound' describe how a service receives messages.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <!-- minOccurs="0" to allow for <forwarding-router/> and/or default component -->
+                    <xsd:element ref="abstract-component" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The service component that is invoked when incoming messages are received. If this element is not present, the service simply bridges the inbound and outbound using a pass-through component.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="outbound" type="outboundCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within 'outbound' describe how a service sends or dispatches messages.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="async-reply" type="asyncReplyCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within 'async-reply' describe how asynchronous replies are handled.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-exception-strategy" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="initialState" default="started">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The initial state of the service. Usually a service is started automatically ("started"), but this attribute can be used to disable initial startup ("stopped") or start the service in a paused state ("paused").
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="started"/>
+                            <xsd:enumeration value="stopped"/>
+                            <xsd:enumeration value="paused"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-exception-strategy" abstract="true" type="abstractExceptionStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an exception strategy element. Exception strategies define how Mule should react to errors.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="abstractExceptionStrategyType">
+        <xsd:sequence>
+            <xsd:element name="commit-transaction" type="exceptionPatternType" maxOccurs="1" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>Defines when a current transaction gets committed based on the name of the exception caught. You can set a comma-separated list of wildcard patterns that will be matched against the fully qualified classname of the current exception. Patterns defined for this element will leave the current transaction (if any) untouched and allow it to be committed.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="rollback-transaction" type="exceptionPatternType" maxOccurs="1" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>Defines when a current transaction gets rolled back based on the name of the exception caught. You can set a comma-separated list of wildcard patterns that will be matched against the fully qualified classname of the current exception. Patterns defined for this element will roll back the current transaction (if any).
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="enableNotifications" type="xsd:boolean">
+            <xsd:annotation>
+                <xsd:documentation>Determines whether ExceptionNotifications will be fired from this strategy when an exception occurs.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="exceptionPatternType">
+        <xsd:attribute name="exception-pattern" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>A comma-separated list of wildcard expressions that will be matched against the fully qualified classname of the current exception received by the ExceptionStrategy.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-retry-policy" abstract="true" type="abstractRetryPolicyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a retry policy element. Retry policies define how Mule should retry a failed message send/dispatch/request.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractRetryPolicyType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-retry-notifier" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-retry-notifier" abstract="true" type="abstractRetryNotifierType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a retry notifier element. The RetryNotifier interface is a callback that allows actions to be performed after each retry. For example, when retrying connections, Mule will fire server notification events on success or failure.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractRetryNotifierType"/>
+
+    <xsd:complexType name="asyncReplyCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-inbound-endpoint" minOccurs="1" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-async-reply-router" minOccurs="0" maxOccurs="1"/>
+            <!-- TODO leaving this commented here, but I do not think there should be a transformer here -->
+            <!--<xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>-->
+        </xsd:sequence>
+        <xsd:attribute name="timeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The timeout (ms) to wait for a reply.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="failOnTimeout" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If the router times out before all expected events have been received, specifies whether an exception should be thrown (true) or the current events should be returned for processing (false). The default is false.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-async-reply-router" abstract="true" type="abstractAsyncReplyRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an async reply router element. Asynchronous replies are handled via this router.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractAsyncReplyRouterType"/>
+
+    <xsd:element name="service" type="sedaServiceType" substitutionGroup="abstract-service">
+        <xsd:annotation>
+            <xsd:documentation>
+                Describes how to receive messages, deliver them to a component, and handle the results (if any).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="sedaServiceType">
+        <xsd:complexContent>
+            <xsd:extension base="baseServiceType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-service-threading-profile" minOccurs="0"/>
+                    <xsd:element ref="abstract-queue-profile" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="queueTimeout" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The timeout used when taking messages from the service queue.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-service" type="customServiceType" substitutionGroup="abstract-service">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented service (typically used only in testing).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customServiceType">
+        <xsd:complexContent>
+            <xsd:extension base="baseServiceType">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The class to use for the service.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-service-threading-profile" abstract="true"
+                 type="abstractServiceThreadingProfileType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for the service threading profile element. Threading profiles define how thread pools are used by a service.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractServiceThreadingProfileType"/>
+
+    <!--==============================================================-->
+    <!-- Components                                              -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-component" abstract="true" type="abstractComponentType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a component element. A component is invoked when inbound messages are received by the service.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractComponentType">
+        <xsd:group ref="interceptorGroup" minOccurs="0">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Interceptors that can be used to intercept component invocation.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:group>
+    </xsd:complexType>
+
+    <xsd:element name="component" type="defaultJavaComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                A simple POJO (Plain Old Java Object) component that will be invoked by Mule when a message is received. The class or object instance to be used can be specified using a child object factory element, or via the 'class' attribute.  If the 'class' attribute is used, an object factory cannot be configured as well. Using the 'class' attribute is equivilant to using the propotype object factory ('prototype-object' child element).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="defaultJavaComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractComponentType">
+                <xsd:sequence>
+                    <xsd:group ref="entryPointResolvers">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Entry point resolvers that are used to determine how a message is passed to a component.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:group>
+                    <xsd:element ref="abstract-object-factory" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Object factory used to obtain the object instance that will be used for the component implementation. The object factory is responsible for object creation and may implement different patterns, such as singleton or prototype, or look up an instance from other object containers.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-lifecycle-adapter-factory" minOccurs="0"/>
+                    <xsd:element name="binding" type="pojoBindingType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A binding associates a Mule endpoint with an injected Java interface. This is like using Spring to inject a bean, but instead of calling a method on the bean, a message is sent to an endpoint.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Specifies a component class. This is a shortcut that is equivalent to providing a 'prototype-object' element.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="pooled-component" type="pooledJavaComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                A pooled POJO (Plain Old Java Object) component that will be invoked by Mule when a message is received. The instance can be specified via a factory or a class.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="pooledJavaComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="defaultJavaComponentType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-pooling-profile" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>Characteristics of the object pool.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:complexType name="pojoBindingType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-outbound-endpoint" minOccurs="1" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="interface" use="required" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface to be injected. A proxy will be created that implements this interface by calling out to the endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="method" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The method on the interface that should be used. This can be omitted if the interface has a single method.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractComponentType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="bridge-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                Transfers a message from inbound to outbound endpoints. This element is provided for backward compatibility - it is equivalent to not specifying any component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!-- don't expose this, it's not needed -->
+    <!-- xsd:element name="pass-through-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default, "do nothing" component.
+                The message is simply transferred from inbound to outbound endpoints.
+                This is the default and need not be specified.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element -->
+
+    <xsd:element name="echo-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                Logs the message and returns the payload as the result.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="log-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                Logs the message content (or content length if it is a large message).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="null-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                Throws an exception if it receives a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+
+    <!--==============================================================-->
+    <!--   Transactions                                               -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-transaction" abstract="true" type="abstractTransactionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transaction elements. Transactions allow a series of operations to be grouped together.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="abstract-xa-transaction" abstract="true" type="abstractTransactionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for XA transaction elements. XA transactions allow a series of operations to be grouped together spanning different transports, such as JMS and JDBC.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="abstract-multi-transaction" abstract="true" type="abstractTransactionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for multi-transaction elements.
+                Multi-transactions allow a series of operations to be grouped together spanning different
+                transports, e.g. JMS and JDBC, but without the overhead of XA. The trade-off is that XA
+                reliability guarantees aren't available, and services must be ready to handle duplicates.
+                This is very similar to a 1.5 PC concept. EE-only feature.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransactionType">
+        <xsd:attribute name="action" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The type of action the transaction should take, one of the following:
+                    NONE - Never participate in a transaction.
+                    ALWAYS_BEGIN - Always start a new transaction when receiving a message. An exception will be thrown if a transaction already exists.
+                    BEGIN_OR_JOIN - If a transaction is already in progress when a message is received, join the transaction if possible. Otherwise, start a new transaction.
+                    ALWAYS_JOIN - Always expects a transaction to be in progress when a message is received. If there is no transaction, an exception is thrown.
+                    JOIN_IF_POSSIBLE - Join the current transaction if one is available. Otherwise, no transaction is created.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="NONE"/>
+                    <xsd:enumeration value="ALWAYS_BEGIN"/>
+                    <xsd:enumeration value="BEGIN_OR_JOIN"/>
+                    <xsd:enumeration value="ALWAYS_JOIN"/>
+                    <xsd:enumeration value="JOIN_IF_POSSIBLE"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="timeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Timeout for the transaction (ms).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseTransactionType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-transaction" type="customTransactionType" substitutionGroup="abstract-transaction">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-defined or otherwise unsupported third-party transactions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransactionType">
+        <xsd:complexContent>
+            <xsd:extension base="baseTransactionType">
+                <xsd:attribute name="factory-class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the TransactionFactory interface that will be instantiated and used to generate a transaction. This attribute and the 'factory-ref' attribute are mutually exclusive; one of the two is required.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="factory-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A bean that implements the TransactionFactory interface that will be used to generate a transaction. This attribute and the 'factory-class' attribute are mutually exclusive; one of the two is required.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="xa-transaction" type="xaTransactionType" substitutionGroup="abstract-transaction">
+        <xsd:annotation>
+            <xsd:documentation>
+                An XA transaction.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="xaTransactionType">
+        <xsd:complexContent>
+            <xsd:extension base="baseTransactionType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="transactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionManagerType">
+                <xsd:attribute name="name" type="substitutableName" default="transactionManager" use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An optional name for the transaction manager. The default value is "transactionManager".
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="websphere-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The WebSphere transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="jboss-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The JBoss transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="jndiTransactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionManagerType">
+                <xsd:sequence>
+                    <xsd:element name="environment" type="mapType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The JNDI environment.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="weblogic-transaction-manager" type="jndiTransactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The WebLogic transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="jrun-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The JRun transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="resin-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The Resin transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="jndi-transaction-manager" substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                Retrieves a named transaction manager factory from JNDI.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jndiTransactionManagerType">
+                    <xsd:attribute name="jndiName" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The name of the manager factory to retrieve (such as java:/TransactionManager).
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="custom-transaction-manager" type="customTransactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="jndiTransactionManagerType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The class to instantiate to create a transaction manager.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--   Endpoint elements                                          -->
+    <!--==============================================================-->
+
+    <xsd:element name="endpoint" type="globalEndpointType" substitutionGroup="abstract-global-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                A global endpoint, which acts as a template that can be used to construct an inbound or outbound endpoint elsewhere in the configuration by referencing the global endpoint name. Each transport implements its own endpoint element, with a more friendly syntax, but this generic element can be used with any transport by supplying the correct address URI. For example, "vm://foo" describes a VM transport endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="globalEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractGlobalEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- extend this type for endpoints that support XA transactions -->
+    <xsd:complexType name="globalEndpointWithXaType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractGlobalEndpointType">
+                <xsd:group ref="defaultXaEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="inbound-endpoint" type="inboundEndpointType" substitutionGroup="abstract-inbound-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                An inbound endpoint receives messages via the associated transport. As with global endpoints, each transport implements its own inbound endpoint element.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="inboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInboundEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- extend this type for endpoints that support XA transactions -->
+    <xsd:complexType name="inboundEndpointWithXaType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInboundEndpointType">
+                <xsd:group ref="defaultXaEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="outbound-endpoint" type="outboundEndpointType" substitutionGroup="abstract-outbound-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                An outbound endpoint sends messages via the associated transport. As with global endpoints, each transport implements its own outbound endpoint element.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="outboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="outboundEndpointWithXaType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundEndpointType">
+                <xsd:group ref="defaultXaEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- these include option/repeats - should be embedded once -->
+    <xsd:group name="defaultEndpointElements">
+        <xsd:sequence>
+            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                <xsd:group ref="endpointTransformers"/>
+                <xsd:element ref="abstract-transaction" minOccurs="0"/>
+                <xsd:element ref="abstract-filter" minOccurs="0"/>
+                <xsd:element ref="abstract-security-filter" minOccurs="0"/>
+                <xsd:element ref="abstract-retry-policy" minOccurs="0"/>
+                <xsd:element ref="abstract-multi-transaction" minOccurs="0"/>
+                <xsd:group ref="propertiesGroup"/>
+            </xsd:sequence>
+        </xsd:sequence>
+    </xsd:group>
+    <xsd:group name="defaultXaEndpointElements">
+        <xsd:sequence>
+            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                <xsd:group ref="endpointTransformers"/>
+                <xsd:element ref="abstract-transaction" minOccurs="0"/>
+                <xsd:element ref="abstract-xa-transaction" minOccurs="0"/>
+                <xsd:element ref="abstract-filter" minOccurs="0"/>
+                <xsd:element ref="abstract-security-filter" minOccurs="0"/>
+                <xsd:group ref="propertiesGroup"/>
+            </xsd:sequence>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:element name="abstract-security-filter" abstract="true" type="abstractSecurityFilterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for security filter elements, which control access to the system.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractSecurityFilterType"/>
+
+    <xsd:attributeGroup name="defaultEndpointAttributes">
+        <xsd:attributeGroup ref="restrictedEndpointAttributes"/>
+        <!-- these next two attributes are mutually exclusive and one is required.
+             but there is no way to define this in a schema... -->
+        <!-- endpoint references - dynamically checked to make sure not top level -->
+        <xsd:attribute name="ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A reference to a global endpoint, which is used as a template to construct this endpoint. A template fixes the address (protocol, path, host, etc.), and may specify initial values for various properties, but further properties can be defined locally (as long as they do not change the address in any way).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <!-- explicit or global endpoints -->
+        <xsd:attribute name="address" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The generic address for this endpoint. If this attribute is used, the protocol must be specified as part of the URI. Alternatively, most transports provide their own attributes for specifying the address (path, host, etc.). Note that the address attribute cannot be combined with 'ref' or with the transport-provided alternative attributes.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:attributeGroup name="restrictedEndpointAttributes">
+        <xsd:attribute name="synchronous" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, the result from the component processing the incoming message will be returned as a response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+
+        <xsd:attribute name="responseTimeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The timeout for a response if making a synchronous endpoint call
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="encoding" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    String encoding used for messages.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="connector-ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the connector associated with this endpoint. This must be specified if more than one connector is defined for this transport.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="transformer-refs" type="xsd:NMTOKENS">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of the transformers that will be applied (in order) to the message before it is delivered to the component.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="responseTransformer-refs" type="xsd:NMTOKENS">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of the transformers that will be applied (in order) to the synchronous response before it is returned via the transport.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:complexType name="endpointRefType">
+        <xsd:attribute name="address" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The destination address for a reply message.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The reference name of a global endpoint to use. If this EndpointRef will be associated to a message such as a Reply-To address, this endpoint ref has to be available on the remote Mule instance that reads the Reply-To address.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:group name="endpointTransformers">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows the user to specify either a simple list of normal transformers or separate bracketed lists of normal and response transformers.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:choice>
+            <xsd:group ref="transformersList"/>
+            <xsd:sequence>
+                <xsd:element name="transformers" minOccurs="0">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A list of transformer elements that will be applied to the message before it is delivered to the component. Note that a list of transformers can also be specified directly (without the 'transformers' element), but then it is not possible to also specify response transformers (using the 'response-transformers' element).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:complexType>
+                        <xsd:group ref="transformersList"/>
+                    </xsd:complexType>
+                </xsd:element>
+                <xsd:element name="response-transformers" minOccurs="0">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A list of transformer elements that will be applied to the response message returned from the component.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:complexType>
+                        <xsd:group ref="transformersList"/>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="transformersList">
+        <xsd:annotation>
+            <xsd:documentation>
+                A list of transformers - normal or response, depending on context.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <!--==============================================================-->
+    <!--   Filter elements                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="filter" type="refFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that is defined elsewhere (at the global level, or as a Spring bean).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="refFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the filter to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="not-filter" type="unitaryFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Inverts the enclosed filter. For example, if the filter would normally return true for a specific message, it will now return false, and vice versa.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="unitaryFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="and-filter" type="collectionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Returns true only if all the enclosed filters return true.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="or-filter" type="collectionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Returns true if any of the enclosed filters returns true.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="collectionFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter" minOccurs="2" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="wildcard-filter" type="wildcardFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches string messages against wildcards. It performs matches with "*", for example, "jms.events.*" would catch "jms.events.customer" and "jms.events.receipts". This filter accepts a comma-separated list of patterns, so more than one filter pattern can be matched for a given argument: "jms.events.*, jms.actions.*" will match "jms.events.system" and "jms.actions" but not "jms.queue".
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="wildcardFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="caseSensitivePatternFilterType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="expression-filter" type="expressionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that can evaluate a range of expressions. It supports some base expression types such as header, payload (payload type), regex, and wildcard.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="expressionFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="evaluator" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>The expression evaluator to use. The expression filter supports some types such as header, payload, exception, wildcard, and regex, that are built-in filters not registered with the ExpressionEvaluatorManager. All others are registered with the ExpressionEvaluatorManager. Where XPath, bean, and ONGL are used, the expression should be a boolean expression.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="substitutableName">
+                            <xsd:enumeration value="header"/>
+                            <xsd:enumeration value="payload-type"/>
+                            <xsd:enumeration value="exception-type"/>
+                            <xsd:enumeration value="wildcard"/>
+                            <xsd:enumeration value="regex"/>
+                            <xsd:enumeration value="ognl"/>
+                            <xsd:enumeration value="xpath"/>
+                            <xsd:enumeration value="jxpath"/>
+                            <xsd:enumeration value="groovy"/>
+                            <xsd:enumeration value="bean"/>
+                            <xsd:enumeration value="custom"/>
+                            <xsd:enumeration value="registry"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="expression" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>The expression that will be evaluated. This should always be a boolean expression. The syntax of the expression will be determined by the expression language being used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="customEvaluator" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>Must be set if the evaluator is set to custom. The custom evaluator must be registered with the ExpressionEvaluatorManager if it is to be used here.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="nullReturnsTrue" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>Whether the filter should return true if the specified expression returns null.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:element name="regex-filter" type="patternFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches string messages against a regular expression. The Java regular expression engine (java.util.regex.Pattern) is used.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="patternFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="pattern" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The property name and optionally a value to use when matching. If the expression is just a property name, the filter will check that the property exists. Users can also use '=' and '!=' to determine a specific value for a property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-property-filter" type="caseSensitivePatternFilterType"
+                 substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches properties on a message. This can be very useful, as the message properties represent all the meta information about the message from the underlying transport, so for a message received over HTTP, you can check for HTTP headers and so forth. The pattern should be expressed as a key/value pair, such as "propertyName=value". If you want to compare more than one property, you can use the logic filters for And, Or, and Not expressions. By default, the comparison is case sensitive, which you can override with the 'caseSensitive' property.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="caseSensitivePatternFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="patternFilterType">
+                <xsd:attribute name="caseSensitive" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If false, the comparison ignores case.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="exception-type-filter" type="typeFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches the type of an exception.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="payload-type-filter" type="typeFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches the type of the payload.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="typeFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="expectedType" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The expected class used in the comparison.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-filter" type="customFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented filter.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the Filter interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   Interceptor elements                                       -->
+    <!--==============================================================-->
+    <xsd:element name="abstract-interceptor-stack" abstract="true" type="abstractInterceptorStackType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for interceptor stack elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInterceptorStackType">
+        <xsd:sequence maxOccurs="unbounded">
+            <xsd:element ref="abstract-interceptor"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="nonBlankString" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name used to identify this interceptor stack.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:element name="interceptor-stack" type="abstractInterceptorStackType" substitutionGroup="abstract-interceptor-stack"/>
+
+
+    <xsd:element name="abstract-interceptor" abstract="true" type="abstractInterceptorType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an interceptor element.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInterceptorType"/>
+
+    <xsd:group name="interceptorGroup">
+        <xsd:sequence>
+            <xsd:choice maxOccurs="unbounded">
+                <xsd:element ref="abstract-interceptor"/>
+                <xsd:element name="interceptor-stack" type="refInterceptorStackType">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A reference to a stack of intereceptors defined globally.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:element>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:complexType name="refInterceptorStackType">
+        <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the interceptor stack to use.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="timer-interceptor" type="abstractInterceptorType" substitutionGroup="abstract-interceptor">
+        <xsd:annotation>
+            <xsd:documentation>
+                The timer interceptor (ported from 1.x).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="logging-interceptor" type="abstractInterceptorType" substitutionGroup="abstract-interceptor">
+        <xsd:annotation>
+            <xsd:documentation>
+                The logging interceptor (ported from 1.x).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="custom-interceptor" type="customInterceptorType" substitutionGroup="abstract-interceptor">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented interceptor.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customInterceptorType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInterceptorType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the Interceptor interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- security filters -->
+
+    <xsd:element name="encryption-security-filter" type="encryptionSecurityFilterType"
+                 substitutionGroup="abstract-security-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that provides password-based encyption.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="encryptionSecurityFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractSecurityFilterType">
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the encryption strategy to use. This should be configured using the 'password-encryption-strategy' element, inside a 'security-manager' element at the top level.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--   Transformer elements                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="transformer" type="refTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A reference to a transformer defined elsewhere.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="refTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the transformer to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="auto-transformer" type="abstractTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that uses the transform discovery mechanism to convert the message payload. This transformer works much better when transforming custom object types rather than Java types, because there is less chance for ambiguity.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="custom-transformer" type="customTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented transformer.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the Transformer interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-properties-transformer" type="messagePropertiesTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that can add or delete message properties.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="messagePropertiesTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:choice minOccurs="1" maxOccurs="unbounded">
+                    <xsd:element name="delete-message-property" type="keyType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Delete a message property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="add-message-property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Add a message property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="rename-message-property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Rename a message property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="add-message-properties" type="mapType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Add a set of message properties.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:choice>
+                <xsd:attribute name="overwrite" type="substitutableBoolean" use="optional" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If false, a property is not added if the message already contains a property with that name.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="no-action-transformer" type="abstractTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that has no effect.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="base64-encoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that base64 encodes a string or byte array message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="base64-decoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that base64 decodes a message to give an array of bytes.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="xml-entity-encoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that encodes a string using XML entities.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="xml-entity-decoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that decodes a string containing XML entities.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="gzip-compress-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that compresses a byte array using gzip.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="gzip-uncompress-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that uncompresses a byte array using gzip.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-hex-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to a string of hexadecimal digits.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="hex-string-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a string of hexadecimal digits to a byte array.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-object-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to an object (either deserializing or converting to a string).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="object-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that serializes all objects except strings (which are converted using getBytes()).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="object-to-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that gives a human-readable description of various types (useful for debugging).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-serializable-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to an object (deserializing the object).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="serializable-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts an object to a byte array (serializing the object).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to a string.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="string-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a string to a byte array.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="append-string-transformer" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that appends a string to a string payload.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="abstractTransformerType">
+                    <xsd:attribute name="message" type="xsd:string" use="required">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The string to append.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="encrypt-transformer" type="encryptionTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that encrypts a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="decrypt-transformer" type="encryptionTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that decrypts a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="encryptionTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the encryption strategy to use. This should be configured using the password-encryption-strategy element, inside a security-manager element at the top level.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="bean-builder-transformer" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that uses expressions to configure a simple bean object.  The user can specify a bean class or factory to create and one or more expressions that are used to configure properties on the bean.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="abstractTransformerType">
+                    <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+                        <xsd:element name="bean-property">
+                            <xsd:complexType>
+                                <xsd:attribute name="name" type="xsd:NMTOKEN" use="required">
+                                    <xsd:annotation>
+                                        <xsd:documentation>
+                                            The name of the bean property
+                                        </xsd:documentation>
+                                    </xsd:annotation>
+                                </xsd:attribute>
+                                <xsd:attributeGroup ref="expressionAttributes"/>
+                                <xsd:attribute name="optional" type="substitutableBoolean" use="optional">
+                                    <xsd:annotation>
+                                        <xsd:documentation>If the expression evaluates to null, whether to continue to the next expression without error.
+                                        </xsd:documentation>
+                                    </xsd:annotation>
+                                </xsd:attribute>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                    <xsd:attribute name="beanClass" type="xsd:NMTOKEN">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The bean class to create
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="beanFactory-ref" type="xsd:NMTOKEN">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A Bean factory to use when creating the bean object.  The factory must implement {{org.mule.api.object.ObjectFactory}}.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="expression-transformer" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that evaluates one or more expressions on the current message. Each expression equates to a parameter in the return message. The return message for two or more expressions will be an Object[].
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="abstractTransformerType">
+                    <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+                        <xsd:element name="return-argument">
+                            <xsd:annotation>
+                                <xsd:documentation>
+                                    A list of expressions, each of which is evaluated and equates to an element in the result message. If just one 'return-argument' is configured, the result will be the evaluation of that expression rather than an object array.
+                                </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                                <xsd:attributeGroup ref="expressionAttributes"/>
+                                <xsd:attribute name="optional" type="substitutableBoolean" use="optional">
+                                    <xsd:annotation>
+                                        <xsd:documentation>If the expression evaluates to null, specifies whether to continue to the next expression without error.
+                                        </xsd:documentation>
+                                    </xsd:annotation>
+                                </xsd:attribute>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                    <xsd:attribute name="returnSourceIfNull" type="xsd:boolean" use="optional">
+                        <xsd:annotation>
+                            <xsd:documentation>If all expressions return null on this transformer, this flag will cause the source payload to be returned without modification.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:attributeGroup name="expressionAttributes">
+        <xsd:attribute name="evaluator" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The expression evaluator to use. Expression evaluators must be registered with the ExpressionEvaluatorManager before they can be used. Using the custom evaluator allows you to define your own evaluator with the 'custom-evaluator' attribute. Note that some evaluators such as xpath, groovy, and bean are loaded from other Mule modules (XML and Scripting, respectively). These modules must be on your classpath before the evaluator can be used.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="substitutableName">
+                    <xsd:enumeration value="groovy"/>
+                    <xsd:enumeration value="header"/>
+                    <xsd:enumeration value="headers"/>
+                    <xsd:enumeration value="headers-list"/>
+                    <xsd:enumeration value="attachment"/>
+                    <xsd:enumeration value="attachments"/>
+                    <xsd:enumeration value="attachments-list"/>
+                    <xsd:enumeration value="message"/>
+                    <xsd:enumeration value="string"/>
+                    <xsd:enumeration value="map-payload"/>
+                    <xsd:enumeration value="payload"/>
+                    <xsd:enumeration value="mule"/>
+                    <xsd:enumeration value="xpath"/>
+                    <xsd:enumeration value="jxpath"/>
+                    <xsd:enumeration value="bean"/>
+                    <xsd:enumeration value="ognl"/>
+                    <xsd:enumeration value="function">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Foo Bar
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="custom"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="expression" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The expression to evaluate. The syntax of this attribute changes depending on the evaluator being used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="custom-evaluator" type="substitutableName" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>The name of the custom evaluator to use. This attribute is only used when the 'evaluator' attribute is set to "custom". You can plug in your own expression evaluators by registering them with the ExpressionEvaluatorManager.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <!--==============================================================-->
+    <!--   Shared elements                                             -->
+    <!--==============================================================-->
+
+    <xsd:element name="queue-profile" type="queueProfileType" substitutionGroup="abstract-queue-profile">
+        <xsd:annotation>
+            <xsd:documentation>
+                Specifies the properties of an internal Mule queue. Internal queues are used to queue messages for each component managed by Mule.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="queueProfileType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractQueueProfileType">
+                <xsd:attribute name="maxOutstandingMessages" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Defines the maximum number of messages that can be queued.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="persistent" type="substitutableBoolean" default="false">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether Mule messages are persisted to a store. Primarily, this is used for persisting queued messages to disk so that the internal state of the server is mirrored on disk in case the server fails and needs to be restarted. Default is false.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-security-manager" type="abstractSecurityManagerType" abstract="true">
+        <xsd:annotation>
+            <xsd:documentation>
+                A security manager is a container for security providers. More than one security manager may be configured; each contains providers from a particular module and has that module type. This element is abstract - a security-related module or transport will provide a suitable implementation.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="abstractSecurityManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                An empty holder that can be extended by modules that want to provide security managers. Typically it will contain elements called 'module:type-security-provider', which extend securityProviderType where "module" might be "acegi" and "type" might de "delegate", for example. It can also contain encryption strategies, which should follow a similar scheme and extend encryptionStrategyType.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="id" fixed="_muleSecurityManager"/>
+        <xsd:attribute name="name" fixed="_muleSecurityManager"/>
+    </xsd:complexType>
+
+    <xsd:element name="security-manager" type="securityManagerType" substitutionGroup="abstract-security-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default security manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="securityManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default security manager (type 'mule:defaultSecurityManagerType') provides basic support for security functions. Other modules (Acegi, JAAS, PGP) provide more advanced functionality.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractSecurityManagerType">
+                <xsd:sequence>
+                    <xsd:element name="custom-security-provider" type="customSecurityProviderType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A custom implementation of SecurityProvider.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="custom-encryption-strategy" type="customEncryptionStrategyType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A custom implementation of EncryptionStrategy.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="secret-key-encryption-strategy" type="secretKeyEncryptionStrategyType"
+                                 minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Provides secret key-based encryption using JCE.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="password-encryption-strategy" type="passwordEncryptionStrategyType"
+                                 minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Provides password-based encryption using JCE. Users must specify a password and optionally a salt and iteration count as well. The default algorithm is PBEWithMD5AndDES, but users can specify any valid algorithm supported by JCE.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="securityProviderType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A security provider is a source of specific security-related functionality.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="name" type="substitutableName" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="encryptionStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                An encryption strategy provides support for a specific encryption algorithm.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="name" type="substitutableName" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="customSecurityProviderType">
+        <xsd:complexContent>
+            <xsd:extension base="securityProviderType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="provider-ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the security provider to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="customEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A reference to the encryption strategy (which may be a Spring bean that implements the EncryptionStrategy interface).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="passwordEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:attribute name="password" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The password to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="salt" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The salt to use (this helps prevent dictionary attacks).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="iterationCount" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The number of iterations to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="secretKeyEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:attribute name="key" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The key to use. This and the 'keyFactory-ref' attribute are mutually exclusive.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="keyFactory-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the key factory to use. This should implement the ObjectFactory interface and return a byte array. This and the 'key' attribute are mutually exclusive.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="threading-profile" type="threadingProfileType"
+                 substitutionGroup="abstract-service-threading-profile">
+        <xsd:annotation>
+            <xsd:documentation>
+                The threading profile to use for the service.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <!-- this is a general threading type used by various elements here -->
+    <xsd:complexType name="threadingProfileType">
+        <xsd:complexContent>
+            <!-- this is a hack that allows us to use this general threading profile as a component threading profile
+                 without retyping everything -->
+            <xsd:extension base="abstractServiceThreadingProfileType">
+                <xsd:attribute name="maxThreadsActive" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The maximum number of threads that will be used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="maxThreadsIdle" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The maximum number of idle or inactive threads that can be in the pool before they are destroyed.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="threadTTL" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Determines how long an inactive thread is kept in the pool before being discarded.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="poolExhaustedAction">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            When the maximum pool size or queue size is bounded, this value determines how to handle incoming tasks. Possible values are: WAIT (wait until a thread becomes available; don't use this value if the minimum number of threads is zero, in which case a thread may never become available), DISCARD (throw away the current request and return), DISCARD_OLDEST (throw away the oldest request and return), ABORT (throw a RuntimeException), and RUN (the default; the thread making the execute request runs the task itself, which helps guard against lockup).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="WAIT"/>
+                            <xsd:enumeration value="DISCARD"/>
+                            <xsd:enumeration value="DISCARD_OLDEST"/>
+                            <xsd:enumeration value="ABORT"/>
+                            <xsd:enumeration value="RUN"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="threadWaitTimeout" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            How long to wait in milliseconds when the pool exhausted action is WAIT. If the value is negative, it will wait indefinitely.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="doThreading" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether threading should be used (default is true).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="maxBufferSize" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Determines how many requests are queued when the pool is at maximum usage capacity and the pool exhausted action is WAIT. The buffer is used as an overflow.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   Exception strategies                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="default-service-exception-strategy" type="endpointExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Provide default exception handling for a service via an endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="default-connector-exception-strategy" type="endpointExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Provide default exception handling for a connector via an endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="endpointExceptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractExceptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-exception-strategy" type="customExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-defined exception strategy.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customExceptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="endpointExceptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the ExceptionListener interface. In addition, if an 'outbound-endpoint' element is specified, it is set as an "endpoint" bean property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Custom connector element -->
+
+    <xsd:element name="custom-connector" type="customConnectorType" substitutionGroup="abstract-connector">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-defined connector.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customConnectorType">
+        <xsd:complexContent>
+            <xsd:extension base="connectorType">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the Connector interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--  Object stores                                                     -->
+    <!--==============================================================-->
+
+
+    <xsd:complexType name="abstractObjectStoreType"/>
+
+        <xsd:element name="abstract-object-store" abstract="true" type="abstractObjectStoreType">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A placeholder for an object store that can be used by routers to maintain state.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="in-memory-store" type="abstractMonitoredObjectStoreType"
+                     substitutionGroup="abstract-object-store">
+            <xsd:annotation>
+                <xsd:documentation>
+                    An optionally bounded in-memory store for message IDs with periodic expiry of old entries. The bounded size is a soft limit and is only enforced periodically by the expiry process. This means that the store may temporarily exceed its maximum size between expiry runs but will eventually shrink to its configured size.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="simple-text-file-store" type="textFileObjectStoreType" substitutionGroup="abstract-object-store">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A simple object store that stores String objects by key to a text file. This store is only suitable for storing simple key value pair strings. This store is backed by an in-memory store and supports the ability to expire and apply TTL to objects in the store.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:element>
+
+        <xsd:complexType name="textFileObjectStoreType">
+            <xsd:complexContent>
+                <xsd:extension base="abstractMonitoredObjectStoreType">
+                    <xsd:attribute name="directory" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The file location (directory) where the object store will be saved. If this value is not set, Mule defaults to using 'mule.working.dir/objectstore'.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+
+        <xsd:complexType name="abstractMonitoredObjectStoreType">
+            <xsd:complexContent>
+                <xsd:extension base="abstractObjectStoreType">
+                    <xsd:attribute name="name" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                An ID for this store that can be used for logging and identification purposes.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="maxEntries" type="substitutableInt">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The maximum number of entries that this store keeps around. Specify '-1' if the store is supposed to be "unbounded".
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="entryTTL" type="substitutableInt">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The time-to-live for each message ID, specified in seconds, or '-1' for entries that should never expire. DO NOT combine this with an unbounded store!
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="expirationInterval" type="substitutableInt">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The interval for periodic bounded size enforcement and entry expiration, specified in seconds. Arbitrary positive values between one second and several hours or days are possible, but should be chosen carefully according to the expected message rate to prevent OutOfMemory conditions.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--  Routers                                                     -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-message-info-mapping" abstract="true" type="abstractMessageInfoMappingType">
+        <xsd:annotation>
+            <xsd:documentation>Maps the attributes of the current message to known message elements in Mule, namely Message ID and CorrrelationID.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractMessageInfoMappingType"/>
+
+    <!-- Inbound Router implementations -->
+
+    <xsd:complexType name="filteredInboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter" minOccurs="0"/>
+                    <!-- TODO this does not make sense here, need to re-visit <xsd:element ref="abstract-message-info-mapping" minOccurs="0"/>-->
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="idempotent-receiver-router" type="idempotentReceiverType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Ensures that only unique messages are received by a service by checking the unique ID of the incoming message. Note that the ID used can be generated from the message using an expression defined in the 'idExpression' attribute. By default, the expression used is '#[message:id]', which means the underlying endpoint must support unique message IDs for this to work. Otherwise, a UniqueIdNotSupportedException is thrown.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="idempotent-secure-hash-receiver-router" type="idempotentSecureHashReceiverType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Ensures that only unique messages are received by a service by calculating the hash of the message itself using a message digest algorithm. This provides a value with an infinitesimally small chance of a collision. This can be used to filter message duplicates. Keep in mind that the hash is calculated over the entire byte array representing the message, so any leading or trailing spaces or extraneous bytes (like padding) can produce different hash values for the same semantic message content. Care should be taken to ensure that messages do not contain extraneous bytes. This class is useful when the message does not support unique identifiers.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="idempotentReceiverType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-object-store" maxOccurs="1" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="idExpression" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Defines one or more expressions to use when extracting the ID from the message. For example, it would be possible to combine to headers as the ID of the message to provide idempotency: '#[headers:foo,bar]'. Or, you could combine the message ID with a header: '#[message:id]-#[header:foo]'. If this property is not set, '#[message:id]' will be used by default.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="idempotentSecureHashReceiverType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-object-store" maxOccurs="1" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="messageDigestAlgorithm" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The secure hashing algorithm to use. If not set, the default is SHA-256.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:element name="wire-tap-router" type="wireTapRouterType" substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                The WireTap inbound router allows you to route certain messages to a different endpoint as well as to the component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="wireTapRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="1" maxOccurs="1"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="forwarding-router" type="selectiveConsumerRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows messages to be forwarded to the outbound routers without first being processed by a component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="selective-consumer-router" type="selectiveConsumerRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Applies one or more filters to the incoming message. If the filters match, the message is forwarded to the component. Otherwise, the message is forwarded to the catch-all strategy on the router. If no catch-all strategy is configured, the message is ignored and a warning is logged.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="correlation-resequencer-router" type="baseAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Holds back a group of messages and resequences them using each message's correlation sequence property.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="selectiveConsumerRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="transformFirst" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Specifies whether transformations are applied before filtering occurs. The default is true.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-chunking-aggregator-router" type="messageChunkingAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Combines two or more messages into a single message by matching messages with a given Correlation ID. Correlation IDs are set on messages when they are dispatched by certain outbound routers, such as the Recipient List and Message Splitter routers. These messages can be aggregated back together again using this router.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="messageChunkingAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="baseAggregatorRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-message-info-mapping" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-correlation-aggregator-router" type="customCorrelationAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a custom message aggregator. Mule provides an abstract implementation that has a template method that performs the message aggregation. A common use of the aggregator router is to combine the results of multiple requests such as "ask this set of vendors for the best price of X".
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customCorrelationAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="messageChunkingAggregatorRouterType">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Fully qualified class name of the custom correlation aggregator router to be used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="collection-aggregator-router" type="baseAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a Collection Response Router. This will return a MuleMessageCollection message type that will contain all messages received for a each correlation group.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="custom-inbound-router" type="customInboundRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows for custom inbound routers to be configured.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="customInboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Spring-style property elements so that custom configuration can be configured on the custom router.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of InboundRouter (fully qualified Java class name)
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:attribute name="timeout" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Defines a timeout in Milliseconds to wait for events to be aggregated. By default the router will throw an exeception if the router is waiting for a correlation group and times out before all group enties are received.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="failOnTimeout" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            When false, incomplete aggregation groups will be forwarded to a component on timeout as a java.util.List. When true (default), a CorrelationTimeoutException is thrown and RoutingNotification.CORRELATION_TIMEOUT is fired. The component doesn't receive any messages in this case.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- ResponseRouters -->
+
+    <xsd:element name="single-async-reply-router" type="asyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a Single Response Router. This will return the first message it receives on a reply endpoint and will discard the rest.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="collection-async-reply-router" type="asyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a Collection Response Router. This will return a MuleMessageCollection message type that will contain all messages received for the current correlation.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="asyncReplyRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractAsyncReplyRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-inbound-endpoint" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The endpoint used to receive the response(s) on.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-message-info-mapping" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The message info mapper used to extract key bits of the message information, such as Message ID or Correlation ID.  these properties are used by some routers and this mapping information tells Mule where to get the information from in the current message.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-async-reply-router" type="customAsyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router"/>
+    <xsd:complexType name="customAsyncReplyRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="asyncReplyRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Spring-style property elements so that custom configuration can be configured on the custom router.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A fully qualified Java class name of the router to use. The router should either extend {{org.mule.routing.response.AbstractResponseRouter}} or {{org.mule.routing.response.AbstractResponseAggregator}}.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- Outbound Router implementations -->
+
+    <!-- Outbound router element and attribute groups -->
+
+    <xsd:group name="defaultOutboundRouterElements">
+        <xsd:sequence>
+            <xsd:element name="reply-to" type="endpointRefType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Defines where the message should be routed after the recipient of the message to which this service dispatches has finished with it.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-transaction" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Defines an overall transaction that will be used for all endpoints on this router.  This is only useful when you want to define an outbound only transaction that will commit all of the transactions defined on the outbound endpoints for this router.  Note that you must still define a transaction on each of the endpoints that should take part in the transaction.  These transactions should always be configured to JOIN the existing transaction.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-message-info-mapping" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The message info mapper used to extract key bits of the message information, such as Message ID or Correlation ID.  these properties are used by some routers and this mapping information tells Mule where to get the information from in the current message.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:group name="defaultFilteredOutboundRouterElements">
+        <xsd:sequence>
+            <xsd:group ref="defaultOutboundRouterElements" />
+            <xsd:element ref="abstract-filter" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Filters the messages to be processed by this router.
+                        @Deprecated since 2.2.  Configure the filter on the endpoint instead of the router.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Filters are applied before message transformations. A transformer can be configured here to transform messages before they are filtered.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:attributeGroup name="defaultOutboundRouterAttributes">
+        <xsd:attribute name="enableCorrelation" default="IF_NOT_SET">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Specifies whether Mule should give outgoing messages a correlation ID. The default behavior is to give messages a correlation ID only if they don't already have one, so that existing correlation IDs are maintained.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="ALWAYS" />
+                    <xsd:enumeration value="NEVER" />
+                    <xsd:enumeration value="IF_NOT_SET" />
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:attributeGroup name="defaultFilteredOutboundRouterAttributes">
+        <xsd:attributeGroup ref="defaultOutboundRouterAttributes"/>
+        <xsd:attribute name="transformer-refs" type="xsd:NMTOKENS">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of the transformers that will be applied to the message in order before it is delivered to the component.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <!-- Default Outbound Router Types -->
+    <xsd:complexType name="outboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint"/>
+                    <xsd:group ref="defaultOutboundRouterElements"/>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultOutboundRouterAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="filteringOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint"/>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+     <xsd:complexType name="multipleEndpointFilteringOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" maxOccurs="unbounded"/>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="singleEndpointFilteringOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" maxOccurs="1"/>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--  Concrete Outbound Routers -->
+
+    <xsd:element name="pass-through-router" type="outboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                This router always matches and simply sends or dispatches message via the endpoint that is configured.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!--  FilteringOutboundRouter only uses a single endpoint. For now this needs to support multiple endpoints for MessageBuilderComponent usage only. -->
+    <xsd:element name="filtering-router" type="singleEndpointFilteringOutboundRouterType" substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Uses filters to determine whether the message matches a particular criteria and if so will route the message to the endpoint configured on the router.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="template-endpoint-router" type="filteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows endpoints to be altered at runtime based on properties set on the current message or fallback values set on the endpoint properties. Templated values are expressed using square braces around a property name.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="chaining-router" type="multipleEndpointFilteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends the message through multiple endpoints using the result of the first invocation as the input for the next.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="exception-based-router" type="multipleEndpointFilteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends a message over an endpoint by selecting the first endpoint that can connect to the transport.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="multicasting-router" type="multipleEndpointFilteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends the same message over multiple endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="endpoint-selector-router" type="endpointSelectorRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Selects the outgoing endpoint based on an expression evaluator ("header:endpoint" by default). It will first try to match the endpoint by name and then by address. The endpoints to use can be set on the router itself or be global endpoint definitions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="endpointSelectorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="multipleEndpointFilteringOutboundRouterType">
+                <xsd:attributeGroup ref="expressionAttributes"/>
+                <xsd:attribute name="default" type="xsd:NMTOKEN" use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the default endpoint to use if the expression returns null. This can be used as an 'else' condition to route messages that don't contain the expected routing information.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Splitter routers -->
+
+    <!-- Extends AbstractMessageSplitter-->
+    <xsd:complexType name="messageSplitterOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="multipleEndpointFilteringOutboundRouterType">
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Extends AbstractRoundRobinMessageSplitter -->
+    <xsd:complexType name="roundRobinSplitterType">
+        <xsd:complexContent>
+            <xsd:extension base="messageSplitterOutboundRouterType">
+                <xsd:attribute name="deterministic" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If 'disableRoundRobin' is false and this option is true (the default) then the first message part will be routed to the first endpoint, the second part to the second endpoint, etc, with the nth part going to the (n modulo number of endpoints) endpoint. If false then the messages will be distributed equally amongst all endpoints.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="disableRoundRobin" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If filters are being used on endpoints then round robin behaviour is probably not desirable. This flag switches round robin behaviour off, it is on by default.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="failIfNoMatch" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If 'disableRoundRobin' is true, there may be situations where the current split message does not match any endpoints.  this flag controls whether an exception should be thrown when a match is not found.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="list-message-splitter-router" type="roundRobinSplitterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                The Filtering List Message Splitter accepts a list of objects that is split each object being routed to different endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="expression-splitter-router" type="expressionSplitterOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Splits the message based on an expression. The expression must return one or more message parts in order to be effective.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+
+    <xsd:complexType name="expressionSplitterOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="roundRobinSplitterType">
+                <xsd:attributeGroup ref="expressionAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Messgae chunking routers -->
+    <xsd:element name="message-chunking-router" type="chunkingRouterType" substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows you to split a single message into a number of fixed-length messages that will all be routed to the same endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="chunkingRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="multipleEndpointFilteringOutboundRouterType">
+                <xsd:attribute name="messageSize" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The message chunk size (in bytes) that the current message will be split into. Note that this is mutually exclusive to the 'numberOfMessages' property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="numberOfMessages" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The number of message peices to break the current message into.  This property is less useful than the 'message' size property since, usually messages are constricted by size. Note that this is mutually exclusive to the 'messageSize' property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- recipient List routers -->
+    <xsd:element name="static-recipient-list-router" type="staticRecipientListRouterType" substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends the same message to multiple endpoints over the same endpoint, or implements routing-slip behavior where the next destination for the message is determined from message properties or the payload. It uses a static list of recipient endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="staticRecipientListRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                    <xsd:element name="recipients" type="listOrSetType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Static list of recipients that the outgoing message is sent to. The default delimiter is ','.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+                <xsd:attribute name="recipientsProperty" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Defines a property name on the current message where a list of endpoint names (or URIs) can be obtained. This property can return a {{java.util.List}} of values or a delimited {{java.lang.String}}. If the 'recipientsProperty' returns a string then the 'recipientsDelimiter' property is used to split the string.
+                            If the entries in the String or List define endpoint names, these will be looked up at runtime. If the entries define endpoint URIs these endpoints will be created at runtime.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="recipientsDelimiter" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The delimiter to use when splitting a String list of recipients.  the default is ','. This property is only used with the 'recipientsProperty'.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="synchronous" type="xsd:boolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            This flag controls whether the message will be sent to the recipients synchronously. Unlike other routers th recipient list router doesn't have pre-configured endpoints so the synchronicity of the endpoint cannot be honoured.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="expression-recipient-list-router" type="expressionRecipientListRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends the same message to multiple endpoints over the same endpoint, or implements routing-slip behavior where the next destination for the message is determined from message properties or the payload. The recipients can be extracted from the message using an expression, or you can specify a static list of recipient endpoints. (As of version 2.1)
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="expressionRecipientListRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                    <xsd:element name="recipients" type="listOrSetType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A static list of endpoint names or URIs that will be used as recipients of the current message. If the expression on this router returns a list of endpoint names, the endpoints here will be checked as well as any global endpoints.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+                <xsd:attributeGroup ref="expressionAttributes"/>
+                <xsd:attribute name="synchronous" type="xsd:boolean">
+                    <xsd:annotation>
+                        <xsd:documentation>This flag controls whether the message will be sent to the recipients synchronously. Unlike other routers th recipient list router doesn't have pre-configured endpoints so the synchronicity of the endpoint cannot be honoured.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- custom router -->
+    <xsd:element name="custom-outbound-router" type="customOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows you to configure a custom outbound router by specifying the custom router class and by using Spring properties.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Spring-style property elements so that custom configuration can be configured on the
+                                custom router.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of OutboundRouter (fully qualified Java class name)
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- Catch all strategy implementations -->
+    <xsd:element name="logging-catch-all-strategy" type="loggingCatchAllStrategyType" substitutionGroup="abstract-catch-all-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Does nothing with the message but simply logs (using the WARN log level) the fact that the message was not dispatched because no routing path was defined.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="loggingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-catch-all-strategy" type="customCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy"/>
+    <xsd:complexType name="customCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Fully qualified class name of the custom catch-all strategy to be used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="forwarding-catch-all-strategy" type="forwardingCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Forwards the message to the specified endpoint if no outbound routers match.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="forwardingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-forwarding-catch-all-strategy" type="customForwardingCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy"/>
+    <xsd:complexType name="customForwardingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="forwardingCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Fully qualified class name of the custom forwarding catch-all strategy to be used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Message Info Mappers -->
+
+    <xsd:element name="expression-message-info-mapping" type="expressionMessageInfoMappingType"
+                 substitutionGroup="abstract-message-info-mapping">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows expressions to be configured to extract the message information.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="expressionMessageInfoMappingType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractMessageInfoMappingType">
+                <xsd:attribute name="messageIdExpression" type="xsd:string" use="required"/>
+                <xsd:attribute name="correlationIdExpression" type="xsd:string" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-message-info-mapping" type="customMessageInfoMappingType"
+                 substitutionGroup="abstract-message-info-mapping">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows configuraton of a custom implementation of MessageInfoMapping.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customMessageInfoMappingType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractMessageInfoMappingType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the MessageInfoMapping interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!--==============================================================-->
+    <!--  Lifecycle Adapters                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-lifecycle-adapter-factory" abstract="true" type="abstractLifecycleAdapterFactory"/>
+    <xsd:complexType name="abstractLifecycleAdapterFactory">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows a lifecycle adaptor factory to be implemented, which allows an alternative custom lifecycle adaptor to be used if required instead of the default implementation that propagates the Mule lifecycle to component implementations.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:complexType>
+    <xsd:complexType name="customLifecycleAdapterFactory">
+        <xsd:complexContent>
+            <xsd:extension base="abstractLifecycleAdapterFactory">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the LifecycleAdapter interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:element name="custom-lifecycle-adapter-factory" type="customLifecycleAdapterFactory"
+                 substitutionGroup="abstract-lifecycle-adapter-factory">
+        <xsd:annotation>
+            <xsd:documentation>
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!--==============================================================-->
+    <!--  Object Factories                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-object-factory" abstract="true" type="abstractObjectFactoryType"/>
+    <xsd:complexType name="abstractObjectFactoryType">
+        <xsd:annotation>
+            <xsd:documentation>
+                An object factory is used to obtain object instances. The object factory is responsible for object creation and can implement different patterns, such a singleton or prototype, or lookup an instance from other object containers.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:group ref="propertiesGroup">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Properties to be set on the created object.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:group>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="genericObjectFactoryType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-object-factory"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="spring-object" type="springBeanLookupType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="springBeanLookupType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Object factory used to obtain Spring bean instances. This object factory does not create any instances but rather looks them up from Spring.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="bean" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>Name of Spring bean to look up.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="singleton-object" type="singletonObjectFactoryType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="singletonObjectFactoryType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Object factory that creates and always returns a singleton object instance.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>Class name</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="prototype-object" type="prototypeObjectFactoryType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="prototypeObjectFactoryType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Object factory that creates and returns a new 'prototype' object instance every time it is called.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>Class name</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-pooling-profile" abstract="true" type="abstractPoolingProfileType"/>
+    <xsd:complexType name="abstractPoolingProfileType"/>
+
+    <xsd:element name="pooling-profile" type="poolingProfileType" substitutionGroup="abstract-pooling-profile"/>
+    <xsd:complexType name="poolingProfileType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A pooling profile is used to configure the pooling behaviour of Mule components. Each component can have its own pooling profile.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractPoolingProfileType">
+                <xsd:attribute name="maxActive" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>Controls the maximum number of Mule components that can be borrowed from a session at one time. When set to a negative value, there is no limit to the number of components that may be active at one time. When maxActive is exceeded, the pool is said to be exhausted.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="maxIdle" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>Controls the maximum number of Mule components that can sit idle in the pool at any time. When set to a negative value, there is no limit to the number of Mule components that may be idle at one time.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="initialisationPolicy" default="INITIALISE_ONE">
+                    <xsd:annotation>
+                        <xsd:documentation>Determines how components in a pool should be initialized. The possible values are: INITIALISE_NONE (will not load any components into the pool on startup), INITIALISE_ONE (will load one initial component into the pool on startup), or INITIALISE_ALL (will load all components in the pool on startup)</xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="INITIALISE_NONE"/>
+                            <xsd:enumeration value="INITIALISE_ONE"/>
+                            <xsd:enumeration value="INITIALISE_ALL"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="exhaustedAction" default="WHEN_EXHAUSTED_GROW">
+                    <xsd:annotation>
+                        <xsd:documentation>Specifies the behavior of the Mule component pool when the pool is exhausted. Possible values are: "WHEN_EXHAUSTED_FAIL", which will throw a NoSuchElementException, "WHEN_EXHAUSTED_WAIT", which will block by invoking Object.wait(long) until a new or idle object is available, or WHEN_EXHAUSTED_GROW, which will create a new Mule instance and return it, essentially making maxActive meaningless. If a positive maxWait value is supplied, it will block for at most that many milliseconds, after which a NoSuchElementException will be thrown. If maxThreadWait is a negative value, it will block indefinitely.</xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="WHEN_EXHAUSTED_GROW"/>
+                            <xsd:enumeration value="WHEN_EXHAUSTED_WAIT"/>
+                            <xsd:enumeration value="WHEN_EXHAUSTED_FAIL"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="maxWait" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>Specifies the number of milliseconds to wait for a pooled component to become available when the pool is exhausted and the exhaustedAction is set to WHEN_EXHAUSTED_BLOCK.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <!-- <xsd:attribute name="factory" type="xsd:string" default="org.mule.config.pool.CommonsPoolFactory"/> -->
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--  Utils / Standard Types                                      -->
+    <!--==============================================================-->
+
+
+    <xsd:complexType name="abstractAgentType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for agents. Not used in core, but common to several modules.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractExtensionType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsIndirectKeyStore, named as tls-client in transport namespace -->
+    <xsd:complexType name="tlsClientKeyStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configure client key stores. TLS/SSL connections are made on behalf of an entity, which can be anonymous or identified by a certificate. This interface specifies how a keystore can be used to provide the certificates (and associated private keys) necessary for identification. This is also used as the trust store if no other trust store is specified and the explicitTrustStoreOnly parameter in the server trust store configuration is false. WARNING - due to restrictions in library implementations the values specified here typically apply to all connectors using this transport.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if possible) of the keystore that contains public certificates and private keys for identification.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the keystore.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The type of keystore used (a Java class name).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsDirectKeyStore, named as tls-key-store in transport namespace -->
+    <xsd:complexType name="tlsKeyStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures key stores. TLS/SSL connections are made on behalf of an entity, which can be anonymous or identified by a certificate. This interface specifies how a keystore can be used to provide the certificates (and associated private keys) necessary for identification.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if possible) of the keystore that contains public certificates and private keys for identification.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The type of keystore used (a Java class name).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="keyPassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the private key.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the keystore.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="algorithm" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The algorithm used by the key store.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsIndirectTrustStore, named as tls-trust-store in transport namespace -->
+    <xsd:complexType name="tlsTrustStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a trust store. TLS/SSL connections are made to trusted systems. The public certificates of trusted systems are stored in a keystore (called a trust store) and used to verify that the connection made to a remote system is the expected identity.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if possible) of the keystore that contains public certificates of trusted servers.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the trust store.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsDirectTrustStore, named as tls-server in transport namespace
+         note that this extends tlsTrustStoreType, so only one of the two is needed -->
+    <xsd:complexType name="tlsServerTrustStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a direct trust store. TLS/SSL connections are made to trusted systems. The public certificates of trusted systems are stored in a keystore (called a trust store) and used to verify that the connection made to a remote system is the expected identity.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="tlsTrustStoreType">
+                <xsd:attribute name="class" type="substitutableClass"/>
+                <xsd:attribute name="algorithm" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The algorithm used by the trust store.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <!-- should be of type TrustManagerFactory -->
+                <xsd:attribute name="factory-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Reference to a TrustManagerFactory configured as a Spring bean.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="explicitOnly" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Specifies whether the key store data should not be used when a trust store is otherwise undefined.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="requireClientAuthentication" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If a server socket is constructed directly, this attribute is used to determine whether client authentication is required. This does not apply to client connections.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsProtocolHandler, named as tls-protocol-handler -->
+    <xsd:complexType name="tlsProtocolHandler">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures the global Java protocol handler. WARNING - Untested.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="property" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Sets the java.protocol.handler.pkgs system property.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:simpleType name="propertyPlaceholderType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A type that defines a Mule-style property placeholder.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="(\#\[[^\]]+\]|\$\{[^\}]+\})"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableClass">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:NMTOKEN-like type that also allows for Ant-style property placeholders and a leading "[".
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:pattern value="\[?[A-Za-z0-9_\.$]+"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="nonBlankString">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:string-like type that cannot be empty.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:pattern value=".*[^ ]+.*"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableName">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:NMTOKEN type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutablePortNumber">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:int type that also allows for Ant-style property placeholders and restricts the int value to a valid port number.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:int">
+                    <xsd:minInclusive value="0"/>
+                    <xsd:maxInclusive value="65536"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableInt">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:int type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:int"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableLong">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:long type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:long"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableBoolean">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:boolean type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:boolean"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <!-- i found this a bit confusing, so here is some background...
+         this type is typically called from something like
+           <xsd:element name="properties" type="mapType/>
+         and the "properties" element generates a ChildMapDefinitionParser that
+         can "receive" the map entries generated by the embedded spring <entry..>
+         elements and which is then set via "setProperties" on the parent.
+         in other words, it's a map, and despite the name "properties" has
+         nothing to do with the spring <property ...> element.
+         spring elements like <entry...> are handled by
+         MuleHierarchicalBeanDefinitionParserDelegate which punts them to
+         the spring handler -->
+    <xsd:element name="properties" type="mapType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A map of Mule properties.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="mapType">
+        <xsd:complexContent>
+            <xsd:extension base="spring:mapType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:group name="propertiesGroup">
+        <xsd:sequence>
+            <xsd:element name="property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Sets a Mule property. This is a name/value pair that can be set on components, services, etc., and which provide a generic way of configuring the system. Typically, you shouldn't need to use a generic property like this, since almost all functionality is exposed via dedicated elements. However, it can be useful in configuring obscure or overlooked options and in configuring transports from the generic endpoint elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="properties" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:complexType name="listOrSetType">
+        <xsd:complexContent>
+            <xsd:extension base="spring:listOrSetType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="referenceType">
+        <xsd:attribute name="ref" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="keyType">
+        <xsd:attribute name="key" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="valueType">
+        <xsd:attribute name="value" type="xsd:string"/>
+        <xsd:attribute name="value-ref" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="keyValueType">
+        <xsd:complexContent>
+            <xsd:extension base="keyType">
+                <xsd:attribute name="value" type="xsd:string"/>
+                <xsd:attribute name="value-ref" type="xsd:NMTOKEN"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   Connector support                                          -->
+    <!--==============================================================-->
+
+    <xsd:complexType name="connectorType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractConnectorType">
+                <xsd:sequence>
+                    <!-- for normal connectors, this is for emergency use only, but it is
+                         critical for custom connector -->
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element name="receiver-threading-profile" type="threadingProfileType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The threading profile to use when a connector receives messages.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="dispatcher-threading-profile" type="threadingProfileType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The threading profile to use when a connector dispatches messages.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-exception-strategy" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The exception strategy to use when errors occur in the connector.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-retry-policy" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Retry policy that defines how Mule should retry if a receive/request/dispatch operation fails.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="service-overrides" type="serviceOverridesType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Service overrides allow the connector to be further configured/customized by allowing parts of the transport implementation to be overridden, for example, the message receiver or dispatcher implementation, or the message adaptor that is used.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="createMultipleTransactedReceivers" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether to create multiple concurrent receivers for this connector. This property is used by transports that support transactions, specifically receivers that extend the TransactedPollingMessageReceiver, and provides better throughput.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="numberOfConcurrentTransactedReceivers" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If createMultipleTransactedReceivers is set to true, the number of concurrent receivers that will be launched.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="dynamicNotification" type="substitutableBoolean" default="false">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Enables dynamic notifications for notifications fired by this connector. This allows listeners to be registered dynamically at runtime via the MuleContext, and the configured notification can be changed. This overrides the default value defined in the 'configuration' element.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="validateConnections" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Causes Mule to validate connections before use. Note that this is only a configuration hint,
+                            transport implementations may or may not make an extra effort to validate the connection. Default is true.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="serviceOverridesType">
+        <xsd:attribute name="messageReceiver" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="transactedMessageReceiver" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="xaTransactedMessageReceiver" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="dispatcherFactory" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="inboundTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="outboundTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="responseTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="endpointBuilder" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="messageAdapter" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="streamMessageAdapter" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="serviceFinder" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="sessionHandler" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   JNDI support                                               -->
+    <!--==============================================================-->
+
+    <xsd:complexType name="jndiConnectorType">
+        <xsd:complexContent>
+            <xsd:extension base="connectorType">
+                <xsd:sequence>
+                    <xsd:element name="jndi-provider-property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Direct setting of a JNDI property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="jndi-provider-properties" type="mapType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Direct setting of JNDI properties (allows access to the full Spring map entry).
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="jndiContext-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Set the complete context directly, via a bean reference.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiInitialFactory" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The initial context factory to use. The value of the property should be the fully qualified class name of the factory class that will create an initial context.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiProviderUrl" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The service provider to use. The value of the property should contain a URL string (such as "ldap://somehost:389").
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiUrlPkgPrefixes" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The list of package prefixes to use when loading in URL context factories. The value of the property should be a colon-separated list of package prefixes for the class name of the factory class that will create a URL context factory.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="dataReferenceType" mixed="true">
+        <xsd:attribute name="file" type="xsd:string"/>
+        <xsd:attribute name="ref" type="xsd:string"/>
+        <!--I don't like this flag, may be we could use content-type mappings... -->
+        <xsd:attribute name="binary" type="substitutableBoolean"/>
+    </xsd:complexType>
+
+    <!-- these cannot be references (unless we use qualified attribute names, which are ugly),
+         but serve as templates to cut+paste in individual transports
+
+    <xsd:attribute name="path" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A file location.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="user" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A username.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="password" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A password.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="host" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                An IP address (eg www.mulesource.com, localhost, 127.0.0.1).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="port" type="substitutablePortNumber">
+        <xsd:annotation>
+            <xsd:documentation>
+                A port number.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    -->
+
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MuleConfigValidation.xml b/xml/tests/testData/xml/MuleConfigValidation.xml
new file mode 100644
index 000000000000..2c3892279c2a
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigValidation.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mule xmlns="http://www.mulesource.org/schema/mule/core/2.2"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xmlns:spring="http://www.springframework.org/schema/beans"
+      xmlns:stdio="http://www.mulesource.org/schema/mule/stdio/2.2"
+      xsi:schemaLocation="
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+http://www.mulesource.org/schema/mule/core/2.2 http://www.mulesource.org/schema/mule/core/2.2/mule.xsd
+http://www.mulesource.org/schema/mule/stdio/2.2 http://www.mulesource.org/schema/mule/stdio/2.2/mule-stdio.xsd">
+
+    <model name="Test">
+
+        <service name="SimpleBridge">
+            <inbound>
+                <stdio:inbound-endpoint system="IN"/>
+            </inbound>
+
+            <outbound>
+                <pass-through-router>
+                    <stdio:outbound-endpoint system="OUT"/>
+                </pass-through-router>
+            </outbound>
+        </service>
+
+    </model>
+
+</mule>
diff --git a/xml/tests/testData/xml/MuleConfigValidationSchemas/mule-schemadoc.xsd b/xml/tests/testData/xml/MuleConfigValidationSchemas/mule-schemadoc.xsd
new file mode 100644
index 000000000000..d9ddeba024df
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigValidationSchemas/mule-schemadoc.xsd
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xsd:schema xmlns="http://www.mulesource.org/schema/mule/schemadoc/2.2"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://www.mulesource.org/schema/mule/schemadoc/2.2"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:annotation>
+        <xsd:documentation>This schema provides a schema doc extentions that can be embedded in Mule schemas. These
+            elements will be used to render additional wiki content associated with the element being annotated.
+            Elements within this schema should be embedded under 'xsd:element/xsd:annotation/xsd:appinfo'.
+            To stick to convention and to ensure that XSLs will work this schema should be included in other mule
+            schemas using the 'schemadoc' prefix namespace.
+        </xsd:documentation>
+        <xsd:appinfo>
+            <page-title>SchemaDoc Reference</page-title>
+        </xsd:appinfo>
+    </xsd:annotation>
+
+    <xsd:element name="snippet" type="snippetType">
+        <xsd:annotation>
+            <xsd:documentation>The snippet allows for code snippets to be associated with an element in a schema. This
+                is useful for surfacing documentation on the wiki. When the schema reference is generated for the wiki,
+                the code snippets will also be rendered when using the 'single-element-wike.xsl'.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="page-title" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>The page title to use when rendering this schema.</xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="short-name" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>The short name of the module or transport, i.e. 'xml' or 'tcp'.</xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="additional-documentation" type="additionalDocumentationType">
+        <xsd:annotation>
+            <xsd:documentation>Additional documentation that can be rendered with the schema. Note that this element can
+                only be used in {{/xsd:schema/xsd:annotation/xsd:appinfo}}, it will be ignorred if used anywhere else.
+                Enter
+                the documentation in the body of this element.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="additionalDocumentationType" mixed="true">
+        <xsd:attribute name="where" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The point at which the documentation is rendered.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="before-common-elements">
+                        <xsd:annotation>
+                            <xsd:documentation>The documentation will appear after any title text but before any of the
+                                common elements are rendered.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="after-common-elements">
+                        <xsd:annotation>
+                            <xsd:documentation>The documentation will appear right after common elements are rendered.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="before-specific-elements">
+                        <xsd:annotation>
+                            <xsd:documentation>The documentation will appear right before the elements specific to the
+                                schema are rendered.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="after-specific-elements">
+                        <xsd:annotation>
+                            <xsd:documentation>The documentation will appear right after the elements specific to the
+                                schema are rendered.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="before-single-element">
+                        <xsd:annotation>
+                            <xsd:documentation>If a specific element was named, this documentation will appear directly
+                                before the element. The mode is less useful but supported for completeness.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="after-single-element">
+                        <xsd:annotation>
+                            <xsd:documentation>If a specific element was named, this documentation will appear directly
+                                after the element. The mode is less useful but supported for completeness.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="snippetType" mixed="true">
+        <xsd:attribute name="id" type="xsd:NMTOKEN" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The ID of the snippet to embed in the wiki page. This ID is embedded in the source
+                    file using a START SNIPPET xxx comment.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="lang">
+            <xsd:annotation>
+                <xsd:documentation>The language format to use when rendering the content of the snippet on the wiki.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="xml"/>
+                    <xsd:enumeration value="java"/>
+                    <xsd:enumeration value="javadoc"/>
+                    <xsd:enumeration value="bash"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="sourcePath" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>This is the path to the source file. Note this should be relative to the project root
+                    directory i.e. transport/jms/src/main/resources/etc...
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="transport-features" type="transportFeaturesType">
+        <xsd:annotation>
+            <xsd:documentation>Defines meta information about transports such as whether they can send or receive events
+                and if they supprt transactions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="transportFeaturesType">
+        <xsd:sequence>
+            <xsd:element name="inboundMEPs" type="inboundMEPsType" minOccurs="1">
+                <xsd:annotation>
+                    <xsd:documentation>The Inbound MEPs that are supported by this Transport.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="outboundMEPs" type="outboundMEPsType" minOccurs="1">
+                <xsd:annotation>
+                    <xsd:documentation>The Outbound MEPs that are supported by this Transport.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="receiveEvents" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether the transport can receive events and thus can be used for an inbound
+                    endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="dispatchEvents" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Ehether the transport can be used to dispatch events and thus is supported as an
+                    outbound endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="requestEvents" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether the transport can be used to request events directly from the source.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="responseEvents" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether the transport can be used in request/response style messaging. This means
+                    that the transport provides a back-channel to the callee.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="transactions" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether transactions are supported by the transports. Transports that support (/)A
+                    transactions can be configured in a distributed 2 Phase Commit (Distributed) transaction.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="transactionTypes" type="xsd:string" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>A comma separated list of transaction types, i.e. local, XA</xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="streaming" type="xsd:boolean" use="required">
+            <xsd:annotation>
+                <xsd:documentation>Whether the transport supports streaming of the data is provides or publishes.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:complexType name="inboundMEPsType">
+        <xsd:attribute name="none" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="in-only" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="in-out" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="in-optional-out" type="xsd:boolean"></xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="outboundMEPsType">
+        <xsd:attribute name="none" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="out-only" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="out-in" type="xsd:boolean"></xsd:attribute>
+        <xsd:attribute name="out-optional-in" type="xsd:boolean"></xsd:attribute>
+    </xsd:complexType>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MuleConfigValidationSchemas/mule-stdio.xsd b/xml/tests/testData/xml/MuleConfigValidationSchemas/mule-stdio.xsd
new file mode 100644
index 000000000000..ca5379f4150c
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigValidationSchemas/mule-stdio.xsd
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xsd:schema xmlns="http://www.mulesource.org/schema/mule/stdio/2.2"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:mule="http://www.mulesource.org/schema/mule/core/2.2"
+            xmlns:schemadoc="http://www.mulesource.org/schema/mule/schemadoc/2.2" 
+            targetNamespace="http://www.mulesource.org/schema/mule/stdio/2.2"
+            elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:import namespace="http://www.mulesource.org/schema/mule/core/2.2" 
+                schemaLocation="http://www.mulesource.org/schema/mule/core/2.2/mule.xsd" />
+    <xsd:import namespace = "http://www.mulesource.org/schema/mule/schemadoc/2.2"
+                schemaLocation = "http://www.mulesource.org/schema/mule/schemadoc/2.2/mule-schemadoc.xsd"/>
+
+    <xsd:annotation>
+        <xsd:documentation>
+            The STDIO transport The STDIO Transport allows the reading and writing of streaming data to Java's System.out and System.in objects for debugging.
+        </xsd:documentation>
+        <xsd:appinfo>
+            <schemadoc:short-name>STDIO</schemadoc:short-name>
+            <schemadoc:page-title>STDIO Transport</schemadoc:page-title>
+            <schemadoc:transport-features receiveEvents="true" dispatchEvents="true" responseEvents="false"
+                                          requestEvents="true"
+                                          transactions="false" streaming="true">
+                <schemadoc:inboundMEPs in-only="true"/>
+                <schemadoc:outboundMEPs out-only="true"/>
+            </schemadoc:transport-features>
+        </xsd:appinfo>
+    </xsd:annotation>
+    <xsd:element name="connector" type="stdioConnectorType" substitutionGroup="mule:abstract-connector"/>
+
+    <xsd:complexType name="stdioConnectorType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:connectorType">
+                <xsd:attribute name="messageDelayTime" type="mule:substitutableLong">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Delay in milliseconds before printing the prompt to stdout.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="outputMessage" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Text printed to stdout when a message is sent.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="promptMessage" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Text printed to stdout when waiting for input.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="promptMessageCode" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Code used to retrieve prompt message from resource bundle.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="outputMessageCode" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Code used to retrieve output message from resource bundle.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="resourceBundle" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Resource bundle to provide prompt with promptMessageCode.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="inbound-endpoint" type="inboundEndpointType" substitutionGroup="mule:abstract-inbound-endpoint"/>
+    <xsd:complexType name="inboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:inboundEndpointType">
+                <xsd:attributeGroup ref="addressAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="outbound-endpoint" type="outboundEndpointType" substitutionGroup="mule:abstract-outbound-endpoint"/>
+    <xsd:complexType name="outboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:outboundEndpointType">
+                <xsd:attributeGroup ref="addressAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="endpoint" type="globalEndpointType" substitutionGroup="mule:abstract-global-endpoint"/>
+    <xsd:complexType name="globalEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:globalEndpointType">
+                <xsd:attributeGroup ref="addressAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:attributeGroup name="addressAttributes">
+        <xsd:attribute name="system">
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="IN"/>
+                    <xsd:enumeration value="OUT"/>
+                    <xsd:enumeration value="ERR"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MuleConfigValidationSchemas/mule.xsd b/xml/tests/testData/xml/MuleConfigValidationSchemas/mule.xsd
new file mode 100644
index 000000000000..8db431162dc6
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigValidationSchemas/mule.xsd
@@ -0,0 +1,4533 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xsd:schema xmlns="http://www.mulesource.org/schema/mule/core/2.2"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:spring="http://www.springframework.org/schema/beans"
+            xmlns:spring-context="http://www.springframework.org/schema/context"
+            targetNamespace="http://www.mulesource.org/schema/mule/core/2.2"
+            attributeFormDefault="unqualified"
+            elementFormDefault="qualified">
+
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:import namespace="http://www.springframework.org/schema/beans"
+                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"/>
+    <xsd:import namespace="http://www.springframework.org/schema/context"
+                schemaLocation="http://www.springframework.org/schema/context/spring-context-2.5.xsd"/>
+
+    <!--==============================================================-->
+    <!--   Structure                                                  -->
+    <!--==============================================================-->
+
+    <!-- This defines the structure in abstract terms (except for a few simple/unique things like
+         global properties).  We then provide some implementations below.  Other modules
+         can provide other implementations. -->
+
+    <xsd:element name="mule" type="muleType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Either the root element of a Mule configuration, or a "top-level" element in a Spring configuration that contains further Mule elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="muleType">
+        <xsd:sequence>
+            <xsd:element name="description" type="descriptionType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Holds any kind of documentation that accompanies this configuration file. It is intended to be "human readable" only and is not used by the system.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:group ref="springRootElements"/>
+                <xsd:group ref="muleRootElements"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="springRootElements">
+        <xsd:choice>
+            <xsd:element ref="spring:beans">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Allows the embedding of any Spring elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="spring:bean">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Allows Spring beans to be defined alongside Mule elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="spring-context:property-placeholder">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Allows Spring property placeholders to be configured directly in the Mule configuration file.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="muleRootElements">
+        <xsd:choice>
+            <xsd:element name="global-property" type="globalPropertyType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        A global property is a named string. It can be inserted in most attribute values using standard (ant-style) Spring placeholders.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="configuration" type="configurationType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Specifies defaults and general settings for the Mule instance.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="notifications" type="notificationManagerType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Registers listeners for notifications and associates interfaces with particular events.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-extension"/>
+            <xsd:element ref="abstract-security-manager"/>
+            <xsd:element ref="abstract-transaction-manager"/>
+            <xsd:element ref="abstract-connector"/>
+            <xsd:element ref="abstract-global-endpoint"/>
+            <xsd:element ref="abstract-transformer"/>
+            <xsd:element ref="abstract-filter"/>
+            <xsd:element ref="abstract-model"/>
+            <xsd:element ref="abstract-interceptor-stack"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="descriptionType">
+        <xsd:complexContent mixed="true">
+            <xsd:extension base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-extension" abstract="true" type="abstractExtensionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for arbitrary extensions as children of the 'mule' element. Other transports and modules can extend this if they need to add global elements to the configuration (but consider the more specific elements like abstract-connector first).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractExtensionType"/>
+
+    <xsd:element name="abstract-connector" abstract="true" type="abstractConnectorType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for connector elements. Connector elements allow properties to be configured across all endpoints that use the same transport. If multiple connectors are defined for the same transport, each endpoint must name which connector is being used.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractConnectorType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the connector so that other elements can reference it.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-global-endpoint" abstract="true" type="abstractGlobalEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for global endpoint elements. Global endpoints are named templates that allow you to define an endpoint once and refer to it in several places. The same template can be used for both inbound and outbound endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractGlobalEndpointType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the endpoint so that other elements can reference it. This name can also be referenced in the MuleClient.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-inbound-endpoint" abstract="true" type="abstractInboundEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for inbound endpoint elements. Inbound endpoints receive messages from the underlying transport. The message payload is then delivered to the component for processing.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInboundEndpointType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the endpoint in the registry. There is no need to set the 'name' attribute on inbound or outbound endpoints, only on global endpoints. 
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-outbound-endpoint" abstract="true" type="abstractOutboundEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for outbound endpoint elements. Outbound endpoints dispatch messages to the underlying transport.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractOutboundEndpointType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the endpoint in the registry. There is not need to set the 'name' attribute on inbound or outbound endpoints, only on global endpoints.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-transformer" abstract="true" type="abstractTransformerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transformer elements. Transformers convert message payloads.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransformerType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the transformer so that other elements can reference it. Required if the transformer is defined at the global level.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="returnClass" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class of the message generated by the transformer. This is used if transformers are auto-selected and to validate that the transformer returns the correct type.  Note that if you need to specify an array type you need postfix the class name with '[]'. For example, if you want return a an Orange[], you set the return class to 'org.mule.tck.testmodels.fruit.Orange[]'.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="ignoreBadInput" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Many transformers only accept certain classes. Such transformers are never called with inappropriate input (whatever the value of this attribute). If a transformer forms part of a chain and cannot accept the current message class, this flag controls whether the remaining part of the chain is evaluated. If true, the next transformer is called. If false the chain ends, keeping the result generated up to that point.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="globalPropertyType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the property. This is used inside Spring placeholders.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="value" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The value of the property. This replaces each occurence of a Spring placeholder.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- seemed pointless making these simple container types abstract -->
+    <xsd:complexType name="inboundCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-inbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-inbound-router" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-catch-all-strategy" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute name="matchAll" type="substitutableBoolean" default="true">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, the input message will be passed to all inbound routers. Otherwise, only the first matching router is used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-catch-all-strategy" abstract="true" type="abstractCatchAllStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for catch-all strategy elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractCatchAllStrategyType"/>
+
+    <xsd:element name="abstract-inbound-router" abstract="true" type="abstractInboundRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for inbound router elements, which control how incoming messages are handled.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInboundRouterType"/>
+
+    <xsd:element name="abstract-filter" abstract="true" type="abstractFilterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for filter elements, which control which messages are handled. 
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractFilterType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the filter so that other elements can reference it. Required if the filter is defined at the global level.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="not" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Inverts the filter condition.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="outboundCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-outbound-router" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-catch-all-strategy" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute name="matchAll" type="substitutableBoolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, the output message will be sent to all routers. Otherwise, only the first matching router is used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-outbound-router" abstract="true" type="abstractOutboundRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for outbound router elements, which control how outgoing messages are delivered to the outbound endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractOutboundRouterType"/>
+
+    <xsd:element name="abstract-transaction-manager" abstract="true" type="abstractTransactionManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transaction manager elements, which are used to coordinate transactions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransactionManagerType"/>
+
+    <xsd:complexType name="configurationType">
+        <xsd:sequence>
+            <xsd:element name="default-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default threading profile, used by components and by endpoints for dispatching and receiving if no more specific configuration is given.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-dispatcher-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default dispatching threading profile, which modifies the default-threading-profile values and is used by endpoints for dispatching messages. This can also be configured on connectors, in which case the connector configuration is used instead of this default.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-receiver-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default receiving threading profile, which modifies the default-threading-profile values and is used by endpoints for receiving messages. This can also be configured on connectors, in which case the connector configuration is used instead of this default.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-service-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default service threading profile, which modifies the default-threading-profile and is used by services for processing messages. This can also be configured on models or services, in which case these configurations will be used instead of this default.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-retry-policy" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default retry policy, used by connectors and endpoints. This can also be configured on connectors, in which case the connector configuration is used instead of this default.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="defaultSynchronousEndpoints" type="substitutableBoolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, all requests to endpoints will wait for a response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="defaultResponseTimeout" type="xsd:string" default="10000">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The default period (ms) to wait for a synchronous response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="defaultTransactionTimeout" type="xsd:string" default="30000">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The default timeout (ms) for transactions. This can also be configured on transactions, in which case the transaction configuration is used instead of this default.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="shutdownTimeout" type="substitutableInt" default="5000">
+            <xsd:annotation>
+                <xsd:documentation>
+                    (As of Mule 2.2.2) The time in milliseconds to wait for any in-progress messages to finish processing before Mule shuts down. After this threshold has been reached, Mule starts interrupting threads, and messages can be lost. If you have a very large number of services in the same Mule instance, if you have components that take more than a couple seconds to process, or if you are using large payloads and/or slower transports, you should increase this value to allow more time for graceful shutdown. The value you specify is applied to services and separately to dispatchers, so the default value of 5000 milliseconds specifies that Mule has ten seconds to process and dispatch messages gracefully after shutdown is initiated. 
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="notificationManagerType">
+        <xsd:sequence>
+            <xsd:element name="notification" type="defineNotificationType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Associates an event with an interface. Listeners that implement the interface will receive instances of the event.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="disable-notification" type="disableNotificationType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Blocks the association of an event with a particular interface. This filters events after the association with a particular interface (and so takes precedence).
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="notification-listener" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Registers a bean as a listener with the notification system. Events are dispatched by reflection - the listener will receive all events associated with any interfaces it implements. The relationship between interfaces and events is configured by the notification and disable-notification elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                    <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The bean that will receive notifications.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="subscription" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                An optional string that is compared with the event resource identifier. Only events with matching identifiers will be sent. If no value is given, all events are sent.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="dynamic" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If the notification manager is dynamic, listeners can be registered dynamically at runtime via the MuleContext, and the configured notification can be changed. Otherwise, some parts of Mule will cache notification configuration for efficiency and will not generate events for newly enabled notifications or listeners. The default value is false.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="defineNotificationType">
+        <xsd:attribute name="event-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class associated with a notification event that will be delivered to the interface. This can be used instead of the 'event' attribute to specify a custom class.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="event" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The notification event to deliver.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface (class name) that will receive the notification event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface that will receive the notification event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="disableNotificationType">
+        <xsd:attribute name="event-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class associated with an event that will no longer be delivered to any interface. This can be used instead of the 'event' attribute to specify a custom class.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="event" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The event you no longer want to deliver.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface (class name) that will no longer receive the event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface that will no longer receive the event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+
+    <xsd:simpleType name="notificationTypes">
+        <xsd:restriction base="xsd:NMTOKEN">
+            <xsd:enumeration value="CONTEXT"/>
+            <xsd:enumeration value="MODEL"/>
+            <xsd:enumeration value="SERVICE"/>
+            <xsd:enumeration value="SECURITY"/>
+            <xsd:enumeration value="ENDPOINT-MESSAGE"/>
+            <xsd:enumeration value="COMPONENT-MESSAGE"/>
+            <xsd:enumeration value="MANAGEMENT"/>
+            <xsd:enumeration value="CONNECTION"/>
+            <xsd:enumeration value="REGISTRY"/>
+            <xsd:enumeration value="CUSTOM"/>
+            <xsd:enumeration value="EXCEPTION"/>
+            <xsd:enumeration value="TRANSACTION"/>
+            <xsd:enumeration value="ROUTING"/>
+            <!-- DEPRECATED -->
+            <xsd:enumeration value="MESSAGE"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <!--==============================================================-->
+    <!-- Models                                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-model" abstract="true" type="abstractModelType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for model elements. A model provides basic settings and processing for all the services it contains.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractModelType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-exception-strategy" minOccurs="0"/>
+            <xsd:group ref="entryPointResolvers"/>
+            <xsd:element ref="abstract-service" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="nonBlankString">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name used to identify this model.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="seda-model" type="sedaModelType" substitutionGroup="abstract-model">
+        <xsd:annotation>
+            <xsd:documentation>
+                A staged event-driven architecture (SEDA) model has separate threads and queues for each service.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="sedaModelType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractModelType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-queue-profile" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="inherit" type="xsd:boolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If true, this model element is an extension of a previous model element with the same name.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="model" type="defaultModelType" substitutionGroup="abstract-model">
+        <xsd:annotation>
+            <xsd:documentation>
+                The container for a set of services, providing basic settings and processing for all the services it contains.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="defaultModelType">
+        <xsd:complexContent>
+            <xsd:extension base="sedaModelType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Model elements -->
+
+    <xsd:element name="abstract-queue-profile" abstract="true" type="abstractQueueProfileType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a queue profile, which controls how messages are queued.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractQueueProfileType"/>
+
+    <!-- to give a cleaner config we allow either a set or an individual entry (but not both).-->
+    <xsd:group name="entryPointResolvers">
+        <xsd:choice>
+            <xsd:element ref="abstract-entry-point-resolver-set" minOccurs="0"/>
+            <!-- we could allow many of these, but it looks ugly -->
+            <xsd:element ref="abstract-entry-point-resolver" minOccurs="0"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:element name="abstract-entry-point-resolver-set" abstract="true" type="abstractEntryPointResolverSetType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for entry point resolver set elements. These combine a group of entry point resolvers, trying them in turn until one succeeds.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractEntryPointResolverSetType"/>
+
+    <xsd:element name="legacy-entry-point-resolver-set" type="extensibleEntryPointResolverSet"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                An extensible set of entry point resolvers (which determine how a message is passed to a component in Java) that already contains resolvers to implement the standard logic. This is already provided by default and is only needed explicitly if it will be extended with other entry point resolvers. This element can be set on the model or component; the model value provides a default that individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="entry-point-resolver-set" type="extensibleEntryPointResolverSet"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                An extensible set of entry point resolvers. These determine how a message is passed to a component in Java. Each entry point resolver is tried in turn until one succeeds in delivering the message to the component. This element can be set on the model or component; the model value provides a default that individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="extensibleEntryPointResolverSet">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverSetType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-entry-point-resolver" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-entry-point-resolver-set" type="customEntryPointResolverSetType"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom entry point resolver set. This allows user-supplied code to determine how a message is passed to a component in Java. This element can be set on the model or component; the model value provides a default that individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customEntryPointResolverSetType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverSetType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the EntryPointResolverSet interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-entry-point-resolver" abstract="true" type="abstractEntryPointResolverType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an entry point resolver element. Entry point resolvers define how payloads are delivered to Java code by choosing the method to call.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="callable-entry-point-resolver" type="abstractEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                An entry point resolver for components that implement the Callable interface. This passes a MuleEventContext to the component. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractEntryPointResolverType"/>
+
+    <xsd:element name="custom-entry-point-resolver" type="customEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom entry point resolver. This allows user-supplied code to determine how a message is passed to a component in Java. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the EntryPointResolver interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverType">
+                <xsd:attribute name="transformFirst" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether the message should be transformed before being delivered to the component. By default, messages are transformed.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="acceptVoidMethods" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether the resolver should call void methods. By default, void methods are not considered as possible candidates for message delivery.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="property-entry-point-resolver" type="propertyEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Uses a message property to select the component method to be called. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="propertyEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:attribute name="property" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the message property used to select a method on the component.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="method-entry-point-resolver" type="methodEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Delivers the message to a named method. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="methodEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="include-entry-point" minOccurs="1" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="reflection-entry-point-resolver" type="reflectionEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Generates a list of candidate methods from the component via reflections. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="reflectionEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element name="exclude-object-methods" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                If specified, methods in the Java Object interface are not included in the list of possible methods that can receive the message.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="exclude-entry-point" type="methodType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Explicitly excludes a named method from receiving the message.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="array-entry-point-resolver" type="complexEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Delivers the message to a method that takes a single array as argument. This element can be set on the model or component; the model value provides a default that individual component values can override. This element can also be used directly or as part of a set of resolvers; the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="no-arguments-entry-point-resolver" type="complexEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Calls a method without arguments (the message is not passed to the component).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="complexEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="reflectionEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="include-entry-point" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="enableDiscovery" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If no method names are configured, attempts to discover the method to invoke based on the inbound message type.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="include-entry-point" type="methodType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A possible method for delivery.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="methodType">
+        <xsd:attribute name="method" type="nonBlankString">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the method.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--  Services                                                    -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-service" abstract="true" type="abstractServiceType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a service element. Services combine message routing with a component (typically a POJO).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractServiceType">
+        <xsd:attribute name="name" type="nonBlankString" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name used to identify this service.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseServiceType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Base support for a model-based wrapper around the POJO service (SEDA, Streaming, etc.)
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractServiceType">
+                <xsd:sequence>
+                    <xsd:element name="description" type="descriptionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                This can hold any kind of documentation related to the service. It is intended to be "human readable" only and is not used by the system.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="inbound" type="inboundCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within 'inbound' describe how a service receives messages.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <!-- minOccurs="0" to allow for <forwarding-router/> and/or default component -->
+                    <xsd:element ref="abstract-component" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The service component that is invoked when incoming messages are received. If this element is not present, the service simply bridges the inbound and outbound using a pass-through component.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="outbound" type="outboundCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within 'outbound' describe how a service sends or dispatches messages.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="async-reply" type="asyncReplyCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within 'async-reply' describe how asynchronous replies are handled.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-exception-strategy" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="initialState" default="started">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The initial state of the service. Usually a service is started automatically ("started"), but this attribute can be used to disable initial startup ("stopped") or start the service in a paused state ("paused").
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="started"/>
+                            <xsd:enumeration value="stopped"/>
+                            <xsd:enumeration value="paused"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-exception-strategy" abstract="true" type="abstractExceptionStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an exception strategy element. Exception strategies define how Mule should react to errors.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="abstractExceptionStrategyType">
+        <xsd:sequence>
+            <xsd:element name="commit-transaction" type="exceptionPatternType" maxOccurs="1" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>Defines when a current transaction gets committed based on the name of the exception caught. You can set a comma-separated list of wildcard patterns that will be matched against the fully qualified classname of the current exception. Patterns defined for this element will leave the current transaction (if any) untouched and allow it to be committed.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="rollback-transaction" type="exceptionPatternType" maxOccurs="1" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>Defines when a current transaction gets rolled back based on the name of the exception caught. You can set a comma-separated list of wildcard patterns that will be matched against the fully qualified classname of the current exception. Patterns defined for this element will roll back the current transaction (if any).
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="enableNotifications" type="xsd:boolean">
+            <xsd:annotation>
+                <xsd:documentation>Determines whether ExceptionNotifications will be fired from this strategy when an exception occurs.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="exceptionPatternType">
+        <xsd:attribute name="exception-pattern" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>A comma-separated list of wildcard expressions that will be matched against the fully qualified classname of the current exception received by the ExceptionStrategy.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-retry-policy" abstract="true" type="abstractRetryPolicyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a retry policy element. Retry policies define how Mule should retry a failed message send/dispatch/request.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractRetryPolicyType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-retry-notifier" minOccurs="0" maxOccurs="1"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-retry-notifier" abstract="true" type="abstractRetryNotifierType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a retry notifier element. The RetryNotifier interface is a callback that allows actions to be performed after each retry. For example, when retrying connections, Mule will fire server notification events on success or failure.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractRetryNotifierType"/>
+
+    <xsd:complexType name="asyncReplyCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-inbound-endpoint" minOccurs="1" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-async-reply-router" minOccurs="0" maxOccurs="1"/>
+            <!-- TODO leaving this commented here, but I do not think there should be a transformer here -->
+            <!--<xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>-->
+        </xsd:sequence>
+        <xsd:attribute name="timeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The timeout (ms) to wait for a reply.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="failOnTimeout" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If the router times out before all expected events have been received, specifies whether an exception should be thrown (true) or the current events should be returned for processing (false). The default is false.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-async-reply-router" abstract="true" type="abstractAsyncReplyRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an async reply router element. Asynchronous replies are handled via this router.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractAsyncReplyRouterType"/>
+
+    <xsd:element name="service" type="sedaServiceType" substitutionGroup="abstract-service">
+        <xsd:annotation>
+            <xsd:documentation>
+                Describes how to receive messages, deliver them to a component, and handle the results (if any).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="sedaServiceType">
+        <xsd:complexContent>
+            <xsd:extension base="baseServiceType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-service-threading-profile" minOccurs="0"/>
+                    <xsd:element ref="abstract-queue-profile" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="queueTimeout" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The timeout used when taking messages from the service queue.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-service" type="customServiceType" substitutionGroup="abstract-service">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented service (typically used only in testing).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customServiceType">
+        <xsd:complexContent>
+            <xsd:extension base="baseServiceType">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The class to use for the service.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-service-threading-profile" abstract="true"
+                 type="abstractServiceThreadingProfileType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for the service threading profile element. Threading profiles define how thread pools are used by a service.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractServiceThreadingProfileType"/>
+
+    <!--==============================================================-->
+    <!-- Components                                              -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-component" abstract="true" type="abstractComponentType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a component element. A component is invoked when inbound messages are received by the service.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractComponentType">
+        <xsd:group ref="interceptorGroup" minOccurs="0">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Interceptors that can be used to intercept component invocation.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:group>
+    </xsd:complexType>
+
+    <xsd:element name="component" type="defaultJavaComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                A simple POJO (Plain Old Java Object) component that will be invoked by Mule when a message is received. The class or object instance to be used can be specified using a child object factory element, or via the 'class' attribute.  If the 'class' attribute is used, an object factory cannot be configured as well. Using the 'class' attribute is equivilant to using the propotype object factory ('prototype-object' child element). 
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="defaultJavaComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractComponentType">
+                <xsd:sequence>
+                    <xsd:group ref="entryPointResolvers">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Entry point resolvers that are used to determine how a message is passed to a component.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:group>
+                    <xsd:element ref="abstract-object-factory" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Object factory used to obtain the object instance that will be used for the component implementation. The object factory is responsible for object creation and may implement different patterns, such as singleton or prototype, or look up an instance from other object containers.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-lifecycle-adapter-factory" minOccurs="0"/>
+                    <xsd:element name="binding" type="pojoBindingType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A binding associates a Mule endpoint with an injected Java interface. This is like using Spring to inject a bean, but instead of calling a method on the bean, a message is sent to an endpoint.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Specifies a component class. This is a shortcut that is equivalent to providing a 'prototype-object' element.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="pooled-component" type="pooledJavaComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                A pooled POJO (Plain Old Java Object) component that will be invoked by Mule when a message is received. The instance can be specified via a factory or a class.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="pooledJavaComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="defaultJavaComponentType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-pooling-profile" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>Characteristics of the object pool.</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:complexType name="pojoBindingType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-outbound-endpoint" minOccurs="1" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="interface" use="required" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface to be injected. A proxy will be created that implements this interface by calling out to the endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="method" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The method on the interface that should be used. This can be omitted if the interface has a single method.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractComponentType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="bridge-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                Transfers a message from inbound to outbound endpoints. This element is provided for backward compatibility - it is equivalent to not specifying any component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!-- don't expose this, it's not needed -->
+    <!-- xsd:element name="pass-through-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default, "do nothing" component.
+                The message is simply transferred from inbound to outbound endpoints.
+                This is the default and need not be specified.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element -->
+
+    <xsd:element name="echo-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                Logs the message and returns the payload as the result.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="log-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                Logs the message content (or content length if it is a large message).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="null-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                Throws an exception if it receives a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+
+    <!--==============================================================-->
+    <!--   Transactions                                               -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-transaction" abstract="true" type="abstractTransactionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transaction elements. Transactions allow a series of operations to be grouped together.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="abstract-xa-transaction" abstract="true" type="abstractTransactionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for XA transaction elements. XA transactions allow a series of operations to be grouped together spanning different transports, such as JMS and JDBC.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="abstract-multi-transaction" abstract="true" type="abstractTransactionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for multi-transaction elements.
+                Multi-transactions allow a series of operations to be grouped together spanning different
+                transports, e.g. JMS and JDBC, but without the overhead of XA. The trade-off is that XA
+                reliability guarantees aren't available, and services must be ready to handle duplicates.
+                This is very similar to a 1.5 PC concept. EE-only feature.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransactionType">
+        <xsd:attribute name="action" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The type of action the transaction should take, one of the following:
+                    NONE - Never participate in a transaction.
+                    ALWAYS_BEGIN - Always start a new transaction when receiving a message. An exception will be thrown if a transaction already exists.
+                    BEGIN_OR_JOIN - If a transaction is already in progress when a message is received, join the transaction if possible. Otherwise, start a new transaction.
+                    ALWAYS_JOIN - Always expects a transaction to be in progress when a message is received. If there is no transaction, an exception is thrown.
+                    JOIN_IF_POSSIBLE - Join the current transaction if one is available. Otherwise, no transaction is created.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="NONE"/>
+                    <xsd:enumeration value="ALWAYS_BEGIN"/>
+                    <xsd:enumeration value="BEGIN_OR_JOIN"/>
+                    <xsd:enumeration value="ALWAYS_JOIN"/>
+                    <xsd:enumeration value="JOIN_IF_POSSIBLE"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="timeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Timeout for the transaction (ms).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseTransactionType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-transaction" type="customTransactionType" substitutionGroup="abstract-transaction">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-defined or otherwise unsupported third-party transactions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransactionType">
+        <xsd:complexContent>
+            <xsd:extension base="baseTransactionType">
+                <xsd:attribute name="factory-class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the TransactionFactory interface that will be instantiated and used to generate a transaction. This attribute and the 'factory-ref' attribute are mutually exclusive; one of the two is required.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="factory-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A bean that implements the TransactionFactory interface that will be used to generate a transaction. This attribute and the 'factory-class' attribute are mutually exclusive; one of the two is required.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="xa-transaction" type="xaTransactionType" substitutionGroup="abstract-transaction">
+        <xsd:annotation>
+            <xsd:documentation>
+                An XA transaction.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="xaTransactionType">
+        <xsd:complexContent>
+            <xsd:extension base="baseTransactionType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="transactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionManagerType">
+                <xsd:attribute name="name" type="substitutableName" default="transactionManager" use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An optional name for the transaction manager. The default value is "transactionManager".
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="websphere-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The WebSphere transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="jboss-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The JBoss transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="jndiTransactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionManagerType">
+                <xsd:sequence>
+                    <xsd:element name="environment" type="mapType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The JNDI environment.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="weblogic-transaction-manager" type="jndiTransactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The WebLogic transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="jrun-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The JRun transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="resin-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The Resin transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="jndi-transaction-manager" substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                Retrieves a named transaction manager factory from JNDI.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jndiTransactionManagerType">
+                    <xsd:attribute name="jndiName" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The name of the manager factory to retrieve (such as java:/TransactionManager).
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="custom-transaction-manager" type="customTransactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="jndiTransactionManagerType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The class to instantiate to create a transaction manager.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--   Endpoint elements                                          -->
+    <!--==============================================================-->
+
+    <xsd:element name="endpoint" type="globalEndpointType" substitutionGroup="abstract-global-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                A global endpoint, which acts as a template that can be used to construct an inbound or outbound endpoint elsewhere in the configuration by referencing the global endpoint name. Each transport implements its own endpoint element, with a more friendly syntax, but this generic element can be used with any transport by supplying the correct address URI. For example, "vm://foo" describes a VM transport endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="globalEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractGlobalEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- extend this type for endpoints that support XA transactions -->
+    <xsd:complexType name="globalEndpointWithXaType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractGlobalEndpointType">
+                <xsd:group ref="defaultXaEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="inbound-endpoint" type="inboundEndpointType" substitutionGroup="abstract-inbound-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                An inbound endpoint receives messages via the associated transport. As with global endpoints, each transport implements its own inbound endpoint element.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="inboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInboundEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!-- extend this type for endpoints that support XA transactions -->
+    <xsd:complexType name="inboundEndpointWithXaType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInboundEndpointType">
+                <xsd:group ref="defaultXaEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="outbound-endpoint" type="outboundEndpointType" substitutionGroup="abstract-outbound-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                An outbound endpoint sends messages via the associated transport. As with global endpoints, each transport implements its own outbound endpoint element.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="outboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:complexType name="outboundEndpointWithXaType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundEndpointType">
+                <xsd:group ref="defaultXaEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- these include option/repeats - should be embedded once -->
+    <xsd:group name="defaultEndpointElements">
+        <xsd:sequence>
+            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                <xsd:group ref="endpointTransformers"/>
+                <xsd:element ref="abstract-transaction" minOccurs="0"/>
+                <xsd:element ref="abstract-filter" minOccurs="0"/>
+                <xsd:element ref="abstract-security-filter" minOccurs="0"/>
+                <xsd:element ref="abstract-retry-policy" minOccurs="0"/>
+                <xsd:element ref="abstract-multi-transaction" minOccurs="0"/>
+                <xsd:group ref="propertiesGroup"/>
+            </xsd:sequence>
+        </xsd:sequence>
+    </xsd:group>
+    <xsd:group name="defaultXaEndpointElements">
+        <xsd:sequence>
+            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                <xsd:group ref="endpointTransformers"/>
+                <xsd:element ref="abstract-transaction" minOccurs="0"/>
+                <xsd:element ref="abstract-xa-transaction" minOccurs="0"/>
+                <xsd:element ref="abstract-filter" minOccurs="0"/>
+                <xsd:element ref="abstract-security-filter" minOccurs="0"/>
+                <xsd:group ref="propertiesGroup"/>
+            </xsd:sequence>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:element name="abstract-security-filter" abstract="true" type="abstractSecurityFilterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for security filter elements, which control access to the system.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractSecurityFilterType"/>
+
+    <xsd:attributeGroup name="defaultEndpointAttributes">
+        <xsd:attributeGroup ref="restrictedEndpointAttributes"/>
+        <!-- these next two attributes are mutually exclusive and one is required.
+             but there is no way to define this in a schema... -->
+        <!-- endpoint references - dynamically checked to make sure not top level -->
+        <xsd:attribute name="ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A reference to a global endpoint, which is used as a template to construct this endpoint. A template fixes the address (protocol, path, host, etc.), and may specify initial values for various properties, but further properties can be defined locally (as long as they do not change the address in any way).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <!-- explicit or global endpoints -->
+        <xsd:attribute name="address" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The generic address for this endpoint. If this attribute is used, the protocol must be specified as part of the URI. Alternatively, most transports provide their own attributes for specifying the address (path, host, etc.). Note that the address attribute cannot be combined with 'ref' or with the transport-provided alternative attributes.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:attributeGroup name="restrictedEndpointAttributes">
+        <xsd:attribute name="synchronous" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, the result from the component processing the incoming message will be returned as a response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+
+        <xsd:attribute name="responseTimeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The timeout for a response if making a synchronous endpoint call
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="encoding" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    String encoding used for messages.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="connector-ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the connector associated with this endpoint. This must be specified if more than one connector is defined for this transport.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="transformer-refs" type="xsd:NMTOKENS">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of the transformers that will be applied (in order) to the message before it is delivered to the component.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="responseTransformer-refs" type="xsd:NMTOKENS">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of the transformers that will be applied (in order) to the synchronous response before it is returned via the transport.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:complexType name="endpointRefType">
+        <xsd:attribute name="address" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The destination address for a reply message.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The reference name of a global endpoint to use. If this EndpointRef will be associated to a message such as a Reply-To address, this endpoint ref has to be available on the remote Mule instance that reads the Reply-To address.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:group name="endpointTransformers">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows the user to specify either a simple list of normal transformers or separate bracketed lists of normal and response transformers.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:choice>
+            <xsd:group ref="transformersList"/>
+            <xsd:sequence>
+                <xsd:element name="transformers" minOccurs="0">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A list of transformer elements that will be applied to the message before it is delivered to the component. Note that a list of transformers can also be specified directly (without the 'transformers' element), but then it is not possible to also specify response transformers (using the 'response-transformers' element).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:complexType>
+                        <xsd:group ref="transformersList"/>
+                    </xsd:complexType>
+                </xsd:element>
+                <xsd:element name="response-transformers" minOccurs="0">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A list of transformer elements that will be applied to the response message returned from the component.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:complexType>
+                        <xsd:group ref="transformersList"/>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="transformersList">
+        <xsd:annotation>
+            <xsd:documentation>
+                A list of transformers - normal or response, depending on context.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <!--==============================================================-->
+    <!--   Filter elements                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="filter" type="refFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that is defined elsewhere (at the global level, or as a Spring bean).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="refFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the filter to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="not-filter" type="unitaryFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Inverts the enclosed filter. For example, if the filter would normally return true for a specific message, it will now return false, and vice versa.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="unitaryFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="and-filter" type="collectionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Returns true only if all the enclosed filters return true.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="or-filter" type="collectionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Returns true if any of the enclosed filters returns true.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="collectionFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter" minOccurs="2" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="wildcard-filter" type="wildcardFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches string messages against wildcards. It performs matches with "*", for example, "jms.events.*" would catch "jms.events.customer" and "jms.events.receipts". This filter accepts a comma-separated list of patterns, so more than one filter pattern can be matched for a given argument: "jms.events.*, jms.actions.*" will match "jms.events.system" and "jms.actions" but not "jms.queue".
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="wildcardFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="caseSensitivePatternFilterType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="expression-filter" type="expressionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that can evaluate a range of expressions. It supports some base expression types such as header, payload (payload type), regex, and wildcard.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="expressionFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="evaluator" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>The expression evaluator to use. The expression filter supports some types such as header, payload, exception, wildcard, and regex, that are built-in filters not registered with the ExpressionEvaluatorManager. All others are registered with the ExpressionEvaluatorManager. Where XPath, bean, and ONGL are used, the expression should be a boolean expression.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="substitutableName">
+                            <xsd:enumeration value="header"/>
+                            <xsd:enumeration value="payload-type"/>
+                            <xsd:enumeration value="exception-type"/>
+                            <xsd:enumeration value="wildcard"/>
+                            <xsd:enumeration value="regex"/>
+                            <xsd:enumeration value="ognl"/>
+                            <xsd:enumeration value="xpath"/>
+                            <xsd:enumeration value="jxpath"/>
+                            <xsd:enumeration value="groovy"/>
+                            <xsd:enumeration value="bean"/>
+                            <xsd:enumeration value="custom"/>
+                            <xsd:enumeration value="registry"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="expression" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>The expression that will be evaluated. This should always be a boolean expression. The syntax of the expression will be determined by the expression language being used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="customEvaluator" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>Must be set if the evaluator is set to custom. The custom evaluator must be registered with the ExpressionEvaluatorManager if it is to be used here.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="nullReturnsTrue" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>Whether the filter should return true if the specified expression returns null.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:element name="regex-filter" type="patternFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches string messages against a regular expression. The Java regular expression engine (java.util.regex.Pattern) is used.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="patternFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="pattern" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The property name and optionally a value to use when matching. If the expression is just a property name, the filter will check that the property exists. Users can also use '=' and '!=' to determine a specific value for a property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-property-filter" type="caseSensitivePatternFilterType"
+                 substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches properties on a message. This can be very useful, as the message properties represent all the meta information about the message from the underlying transport, so for a message received over HTTP, you can check for HTTP headers and so forth. The pattern should be expressed as a key/value pair, such as "propertyName=value". If you want to compare more than one property, you can use the logic filters for And, Or, and Not expressions. By default, the comparison is case sensitive, which you can override with the 'caseSensitive' property.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="caseSensitivePatternFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="patternFilterType">
+                <xsd:attribute name="caseSensitive" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If false, the comparison ignores case.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="exception-type-filter" type="typeFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches the type of an exception.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="payload-type-filter" type="typeFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches the type of the payload.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="typeFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="expectedType" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The expected class used in the comparison.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-filter" type="customFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented filter.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the Filter interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   Interceptor elements                                       -->
+    <!--==============================================================-->
+    <xsd:element name="abstract-interceptor-stack" abstract="true" type="abstractInterceptorStackType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for interceptor stack elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInterceptorStackType">
+        <xsd:sequence maxOccurs="unbounded">
+            <xsd:element ref="abstract-interceptor"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="nonBlankString" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name used to identify this interceptor stack.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+    <xsd:element name="interceptor-stack" type="abstractInterceptorStackType" substitutionGroup="abstract-interceptor-stack"/>
+
+
+    <xsd:element name="abstract-interceptor" abstract="true" type="abstractInterceptorType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an interceptor element.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInterceptorType"/>
+
+    <xsd:group name="interceptorGroup">
+        <xsd:sequence>
+            <xsd:choice maxOccurs="unbounded">
+                <xsd:element ref="abstract-interceptor"/>
+                <xsd:element name="interceptor-stack" type="refInterceptorStackType">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A reference to a stack of intereceptors defined globally.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:element>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:complexType name="refInterceptorStackType">
+        <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the interceptor stack to use.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="timer-interceptor" type="abstractInterceptorType" substitutionGroup="abstract-interceptor">
+        <xsd:annotation>
+            <xsd:documentation>
+                The timer interceptor (ported from 1.x).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="logging-interceptor" type="abstractInterceptorType" substitutionGroup="abstract-interceptor">
+        <xsd:annotation>
+            <xsd:documentation>
+                The logging interceptor (ported from 1.x).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="custom-interceptor" type="customInterceptorType" substitutionGroup="abstract-interceptor">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented interceptor.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customInterceptorType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInterceptorType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the Interceptor interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- security filters -->
+
+    <xsd:element name="encryption-security-filter" type="encryptionSecurityFilterType"
+                 substitutionGroup="abstract-security-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that provides password-based encyption.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="encryptionSecurityFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractSecurityFilterType">
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the encryption strategy to use. This should be configured using the 'password-encryption-strategy' element, inside a 'security-manager' element at the top level.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--   Transformer elements                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="transformer" type="refTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A reference to a transformer defined elsewhere.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="refTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the transformer to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="auto-transformer" type="abstractTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that uses the transform discovery mechanism to convert the message payload. This transformer works much better when transforming custom object types rather than Java types, because there is less chance for ambiguity.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="custom-transformer" type="customTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented transformer.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the Transformer interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-properties-transformer" type="messagePropertiesTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that can add or delete message properties.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="messagePropertiesTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:choice minOccurs="1" maxOccurs="unbounded">
+                    <xsd:element name="delete-message-property" type="keyType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Delete a message property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="add-message-property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Add a message property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="rename-message-property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Rename a message property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="add-message-properties" type="mapType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Add a set of message properties.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:choice>
+                <xsd:attribute name="overwrite" type="substitutableBoolean" use="optional" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If false, a property is not added if the message already contains a property with that name.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="no-action-transformer" type="abstractTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that has no effect.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="base64-encoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that base64 encodes a string or byte array message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="base64-decoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that base64 decodes a message to give an array of bytes.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="xml-entity-encoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that encodes a string using XML entities.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="xml-entity-decoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that decodes a string containing XML entities.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="gzip-compress-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that compresses a byte array using gzip.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="gzip-uncompress-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that uncompresses a byte array using gzip.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-hex-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to a string of hexadecimal digits.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="hex-string-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a string of hexadecimal digits to a byte array.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-object-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to an object (either deserializing or converting to a string).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="object-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that serializes all objects except strings (which are converted using getBytes()).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="object-to-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that gives a human-readable description of various types (useful for debugging).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-serializable-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to an object (deserializing the object).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="serializable-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts an object to a byte array (serializing the object).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to a string.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="string-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a string to a byte array.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="append-string-transformer" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that appends a string to a string payload.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="abstractTransformerType">
+                    <xsd:attribute name="message" type="xsd:string" use="required">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The string to append.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="encrypt-transformer" type="encryptionTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that encrypts a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="decrypt-transformer" type="encryptionTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that decrypts a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="encryptionTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the encryption strategy to use. This should be configured using the password-encryption-strategy element, inside a security-manager element at the top level.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="bean-builder-transformer" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that uses expressions to configure a simple bean object.  The user can specify a bean class or factory to create and one or more expressions that are used to configure properties on the bean.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="abstractTransformerType">
+                    <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+                        <xsd:element name="bean-property">
+                            <xsd:complexType>
+                                <xsd:attribute name="name" type="xsd:NMTOKEN" use="required">
+                                    <xsd:annotation>
+                                        <xsd:documentation>
+                                            The name of the bean property
+                                        </xsd:documentation>
+                                    </xsd:annotation>
+                                </xsd:attribute>
+                                <xsd:attributeGroup ref="expressionAttributes"/>
+                                <xsd:attribute name="optional" type="substitutableBoolean" use="optional">
+                                    <xsd:annotation>
+                                        <xsd:documentation>If the expression evaluates to null, whether to continue to the next expression without error.
+                                        </xsd:documentation>
+                                    </xsd:annotation>
+                                </xsd:attribute>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                    <xsd:attribute name="beanClass" type="xsd:NMTOKEN">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The bean class to create
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="beanFactory-ref" type="xsd:NMTOKEN">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A Bean factory to use when creating the bean object.  The factory must implement {{org.mule.api.object.ObjectFactory}}.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="expression-transformer" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that evaluates one or more expressions on the current message. Each expression equates to a parameter in the return message. The return message for two or more expressions will be an Object[].
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="abstractTransformerType">
+                    <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+                        <xsd:element name="return-argument">
+                            <xsd:annotation>
+                                <xsd:documentation>
+                                    A list of expressions, each of which is evaluated and equates to an element in the result message. If just one 'return-argument' is configured, the result will be the evaluation of that expression rather than an object array. 
+                                </xsd:documentation>
+                            </xsd:annotation>
+                            <xsd:complexType>
+                                <xsd:attributeGroup ref="expressionAttributes"/>
+                                <xsd:attribute name="optional" type="substitutableBoolean" use="optional">
+                                    <xsd:annotation>
+                                        <xsd:documentation>If the expression evaluates to null, specifies whether to continue to the next expression without error.
+                                        </xsd:documentation>
+                                    </xsd:annotation>
+                                </xsd:attribute>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                    <xsd:attribute name="returnSourceIfNull" type="xsd:boolean" use="optional">
+                        <xsd:annotation>
+                            <xsd:documentation>If all expressions return null on this transformer, this flag will cause the source payload to be returned without modification.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:attributeGroup name="expressionAttributes">
+        <xsd:attribute name="evaluator" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The expression evaluator to use. Expression evaluators must be registered with the ExpressionEvaluatorManager before they can be used. Using the custom evaluator allows you to define your own evaluator with the 'custom-evaluator' attribute. Note that some evaluators such as xpath, groovy, and bean are loaded from other Mule modules (XML and Scripting, respectively). These modules must be on your classpath before the evaluator can be used.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="substitutableName">
+                    <xsd:enumeration value="groovy"/>
+                    <xsd:enumeration value="header"/>
+                    <xsd:enumeration value="headers"/>
+                    <xsd:enumeration value="headers-list"/>
+                    <xsd:enumeration value="attachment"/>
+                    <xsd:enumeration value="attachments"/>
+                    <xsd:enumeration value="attachments-list"/>
+                    <xsd:enumeration value="message"/>
+                    <xsd:enumeration value="string"/>
+                    <xsd:enumeration value="map-payload"/>
+                    <xsd:enumeration value="payload"/>
+                    <xsd:enumeration value="mule"/>
+                    <xsd:enumeration value="xpath"/>
+                    <xsd:enumeration value="jxpath"/>
+                    <xsd:enumeration value="bean"/>
+                    <xsd:enumeration value="ognl"/>
+                    <xsd:enumeration value="function">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Foo Bar
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:enumeration>
+                    <xsd:enumeration value="custom"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="expression" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The expression to evaluate. The syntax of this attribute changes depending on the evaluator being used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="custom-evaluator" type="substitutableName" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>The name of the custom evaluator to use. This attribute is only used when the 'evaluator' attribute is set to "custom". You can plug in your own expression evaluators by registering them with the ExpressionEvaluatorManager.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <!--==============================================================-->
+    <!--   Shared elements                                             -->
+    <!--==============================================================-->
+
+    <xsd:element name="queue-profile" type="queueProfileType" substitutionGroup="abstract-queue-profile">
+        <xsd:annotation>
+            <xsd:documentation>
+                Specifies the properties of an internal Mule queue. Internal queues are used to queue messages for each component managed by Mule.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="queueProfileType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractQueueProfileType">
+                <xsd:attribute name="maxOutstandingMessages" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Defines the maximum number of messages that can be queued.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="persistent" type="substitutableBoolean" default="false">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether Mule messages are persisted to a store. Primarily, this is used for persisting queued messages to disk so that the internal state of the server is mirrored on disk in case the server fails and needs to be restarted. Default is false.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-security-manager" type="abstractSecurityManagerType" abstract="true">
+        <xsd:annotation>
+            <xsd:documentation>
+                A security manager is a container for security providers. More than one security manager may be configured; each contains providers from a particular module and has that module type. This element is abstract - a security-related module or transport will provide a suitable implementation.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="abstractSecurityManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                An empty holder that can be extended by modules that want to provide security managers. Typically it will contain elements called 'module:type-security-provider', which extend securityProviderType where "module" might be "acegi" and "type" might de "delegate", for example. It can also contain encryption strategies, which should follow a similar scheme and extend encryptionStrategyType.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="id" fixed="_muleSecurityManager"/>
+        <xsd:attribute name="name" fixed="_muleSecurityManager"/>
+    </xsd:complexType>
+
+    <xsd:element name="security-manager" type="securityManagerType" substitutionGroup="abstract-security-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default security manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="securityManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default security manager (type 'mule:defaultSecurityManagerType') provides basic support for security functions. Other modules (Acegi, JAAS, PGP) provide more advanced functionality.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractSecurityManagerType">
+                <xsd:sequence>
+                    <xsd:element name="custom-security-provider" type="customSecurityProviderType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A custom implementation of SecurityProvider.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="custom-encryption-strategy" type="customEncryptionStrategyType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A custom implementation of EncryptionStrategy.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="secret-key-encryption-strategy" type="secretKeyEncryptionStrategyType"
+                                 minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Provides secret key-based encryption using JCE.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="password-encryption-strategy" type="passwordEncryptionStrategyType"
+                                 minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Provides password-based encryption using JCE. Users must specify a password and optionally a salt and iteration count as well. The default algorithm is PBEWithMD5AndDES, but users can specify any valid algorithm supported by JCE.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="securityProviderType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A security provider is a source of specific security-related functionality.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="name" type="substitutableName" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="encryptionStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                An encryption strategy provides support for a specific encryption algorithm.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="name" type="substitutableName" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="customSecurityProviderType">
+        <xsd:complexContent>
+            <xsd:extension base="securityProviderType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="provider-ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the security provider to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="customEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A reference to the encryption strategy (which may be a Spring bean that implements the EncryptionStrategy interface).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="passwordEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:attribute name="password" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The password to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="salt" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The salt to use (this helps prevent dictionary attacks).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="iterationCount" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The number of iterations to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="secretKeyEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:attribute name="key" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The key to use. This and the 'keyFactory-ref' attribute are mutually exclusive.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="keyFactory-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the key factory to use. This should implement the ObjectFactory interface and return a byte array. This and the 'key' attribute are mutually exclusive.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="threading-profile" type="threadingProfileType"
+                 substitutionGroup="abstract-service-threading-profile">
+        <xsd:annotation>
+            <xsd:documentation>
+                The threading profile to use for the service.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <!-- this is a general threading type used by various elements here -->
+    <xsd:complexType name="threadingProfileType">
+        <xsd:complexContent>
+            <!-- this is a hack that allows us to use this general threading profile as a component threading profile
+                 without retyping everything -->
+            <xsd:extension base="abstractServiceThreadingProfileType">
+                <xsd:attribute name="maxThreadsActive" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The maximum number of threads that will be used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="maxThreadsIdle" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The maximum number of idle or inactive threads that can be in the pool before they are destroyed.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="threadTTL" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Determines how long an inactive thread is kept in the pool before being discarded.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="poolExhaustedAction">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            When the maximum pool size or queue size is bounded, this value determines how to handle incoming tasks. Possible values are: WAIT (wait until a thread becomes available; don't use this value if the minimum number of threads is zero, in which case a thread may never become available), DISCARD (throw away the current request and return), DISCARD_OLDEST (throw away the oldest request and return), ABORT (throw a RuntimeException), and RUN (the default; the thread making the execute request runs the task itself, which helps guard against lockup).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="WAIT"/>
+                            <xsd:enumeration value="DISCARD"/>
+                            <xsd:enumeration value="DISCARD_OLDEST"/>
+                            <xsd:enumeration value="ABORT"/>
+                            <xsd:enumeration value="RUN"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="threadWaitTimeout" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            How long to wait in milliseconds when the pool exhausted action is WAIT. If the value is negative, it will wait indefinitely.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="doThreading" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether threading should be used (default is true).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="maxBufferSize" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Determines how many requests are queued when the pool is at maximum usage capacity and the pool exhausted action is WAIT. The buffer is used as an overflow.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   Exception strategies                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="default-service-exception-strategy" type="endpointExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Provide default exception handling for a service via an endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="default-connector-exception-strategy" type="endpointExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Provide default exception handling for a connector via an endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="endpointExceptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractExceptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-exception-strategy" type="customExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-defined exception strategy.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customExceptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="endpointExceptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the ExceptionListener interface. In addition, if an 'outbound-endpoint' element is specified, it is set as an "endpoint" bean property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Custom connector element -->
+
+    <xsd:element name="custom-connector" type="customConnectorType" substitutionGroup="abstract-connector">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-defined connector.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customConnectorType">
+        <xsd:complexContent>
+            <xsd:extension base="connectorType">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the Connector interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--  Object stores                                                     -->
+    <!--==============================================================-->
+
+
+    <xsd:complexType name="abstractObjectStoreType"/>
+
+        <xsd:element name="abstract-object-store" abstract="true" type="abstractObjectStoreType">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A placeholder for an object store that can be used by routers to maintain state.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="in-memory-store" type="abstractMonitoredObjectStoreType"
+                     substitutionGroup="abstract-object-store">
+            <xsd:annotation>
+                <xsd:documentation>
+                    An optionally bounded in-memory store for message IDs with periodic expiry of old entries. The bounded size is a soft limit and is only enforced periodically by the expiry process. This means that the store may temporarily exceed its maximum size between expiry runs but will eventually shrink to its configured size.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:element>
+
+        <xsd:element name="simple-text-file-store" type="textFileObjectStoreType" substitutionGroup="abstract-object-store">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A simple object store that stores String objects by key to a text file. This store is only suitable for storing simple key value pair strings. This store is backed by an in-memory store and supports the ability to expire and apply TTL to objects in the store.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:element>
+
+        <xsd:complexType name="textFileObjectStoreType">
+            <xsd:complexContent>
+                <xsd:extension base="abstractMonitoredObjectStoreType">
+                    <xsd:attribute name="directory" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The file location (directory) where the object store will be saved. If this value is not set, Mule defaults to using 'mule.working.dir/objectstore'.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+
+        <xsd:complexType name="abstractMonitoredObjectStoreType">
+            <xsd:complexContent>
+                <xsd:extension base="abstractObjectStoreType">
+                    <xsd:attribute name="name" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                An ID for this store that can be used for logging and identification purposes.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="maxEntries" type="substitutableInt">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The maximum number of entries that this store keeps around. Specify '-1' if the store is supposed to be "unbounded".
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="entryTTL" type="substitutableInt">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The time-to-live for each message ID, specified in seconds, or '-1' for entries that should never expire. DO NOT combine this with an unbounded store!
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="expirationInterval" type="substitutableInt">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The interval for periodic bounded size enforcement and entry expiration, specified in seconds. Arbitrary positive values between one second and several hours or days are possible, but should be chosen carefully according to the expected message rate to prevent OutOfMemory conditions.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--  Routers                                                     -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-message-info-mapping" abstract="true" type="abstractMessageInfoMappingType">
+        <xsd:annotation>
+            <xsd:documentation>Maps the attributes of the current message to known message elements in Mule, namely Message ID and CorrrelationID.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractMessageInfoMappingType"/>
+
+    <!-- Inbound Router implementations -->
+
+    <xsd:complexType name="filteredInboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter" minOccurs="0"/>
+                    <!-- TODO this does not make sense here, need to re-visit <xsd:element ref="abstract-message-info-mapping" minOccurs="0"/>-->
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="idempotent-receiver-router" type="idempotentReceiverType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Ensures that only unique messages are received by a service by checking the unique ID of the incoming message. Note that the ID used can be generated from the message using an expression defined in the 'idExpression' attribute. By default, the expression used is '#[message:id]', which means the underlying endpoint must support unique message IDs for this to work. Otherwise, a UniqueIdNotSupportedException is thrown.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="idempotent-secure-hash-receiver-router" type="idempotentSecureHashReceiverType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Ensures that only unique messages are received by a service by calculating the hash of the message itself using a message digest algorithm. This provides a value with an infinitesimally small chance of a collision. This can be used to filter message duplicates. Keep in mind that the hash is calculated over the entire byte array representing the message, so any leading or trailing spaces or extraneous bytes (like padding) can produce different hash values for the same semantic message content. Care should be taken to ensure that messages do not contain extraneous bytes. This class is useful when the message does not support unique identifiers.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="idempotentReceiverType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-object-store" maxOccurs="1" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="idExpression" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Defines one or more expressions to use when extracting the ID from the message. For example, it would be possible to combine to headers as the ID of the message to provide idempotency: '#[headers:foo,bar]'. Or, you could combine the message ID with a header: '#[message:id]-#[header:foo]'. If this property is not set, '#[message:id]' will be used by default.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="idempotentSecureHashReceiverType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-object-store" maxOccurs="1" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="messageDigestAlgorithm" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The secure hashing algorithm to use. If not set, the default is SHA-256.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:element name="wire-tap-router" type="wireTapRouterType" substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                The WireTap inbound router allows you to route certain messages to a different endpoint as well as to the component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="wireTapRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="1" maxOccurs="1"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="forwarding-router" type="selectiveConsumerRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows messages to be forwarded to the outbound routers without first being processed by a component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="selective-consumer-router" type="selectiveConsumerRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Applies one or more filters to the incoming message. If the filters match, the message is forwarded to the component. Otherwise, the message is forwarded to the catch-all strategy on the router. If no catch-all strategy is configured, the message is ignored and a warning is logged.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="correlation-resequencer-router" type="baseAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Holds back a group of messages and resequences them using each message's correlation sequence property.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="selectiveConsumerRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="transformFirst" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Specifies whether transformations are applied before filtering occurs. The default is true.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-chunking-aggregator-router" type="messageChunkingAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Combines two or more messages into a single message by matching messages with a given Correlation ID. Correlation IDs are set on messages when they are dispatched by certain outbound routers, such as the Recipient List and Message Splitter routers. These messages can be aggregated back together again using this router.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="messageChunkingAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="baseAggregatorRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-message-info-mapping" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-correlation-aggregator-router" type="customCorrelationAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a custom message aggregator. Mule provides an abstract implementation that has a template method that performs the message aggregation. A common use of the aggregator router is to combine the results of multiple requests such as "ask this set of vendors for the best price of X".
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customCorrelationAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="messageChunkingAggregatorRouterType">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Fully qualified class name of the custom correlation aggregator router to be used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="collection-aggregator-router" type="baseAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a Collection Response Router. This will return a MuleMessageCollection message type that will contain all messages received for a each correlation group.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="custom-inbound-router" type="customInboundRouterType"
+                 substitutionGroup="abstract-inbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows for custom inbound routers to be configured.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="customInboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Spring-style property elements so that custom configuration can be configured on the custom router.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of InboundRouter (fully qualified Java class name)
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:attribute name="timeout" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Defines a timeout in Milliseconds to wait for events to be aggregated. By default the router will throw an exeception if the router is waiting for a correlation group and times out before all group enties are received.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="failOnTimeout" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            When false, incomplete aggregation groups will be forwarded to a component on timeout as a java.util.List. When true (default), a CorrelationTimeoutException is thrown and RoutingNotification.CORRELATION_TIMEOUT is fired. The component doesn't receive any messages in this case.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- ResponseRouters -->
+
+    <xsd:element name="single-async-reply-router" type="asyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a Single Response Router. This will return the first message it receives on a reply endpoint and will discard the rest.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="collection-async-reply-router" type="asyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a Collection Response Router. This will return a MuleMessageCollection message type that will contain all messages received for the current correlation.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="asyncReplyRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractAsyncReplyRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-inbound-endpoint" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The endpoint used to receive the response(s) on.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-message-info-mapping" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The message info mapper used to extract key bits of the message information, such as Message ID or Correlation ID.  these properties are used by some routers and this mapping information tells Mule where to get the information from in the current message.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-async-reply-router" type="customAsyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router"/>
+    <xsd:complexType name="customAsyncReplyRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="asyncReplyRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Spring-style property elements so that custom configuration can be configured on the custom router.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A fully qualified Java class name of the router to use. The router should either extend {{org.mule.routing.response.AbstractResponseRouter}} or {{org.mule.routing.response.AbstractResponseAggregator}}.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- Outbound Router implementations -->
+
+    <!-- Outbound router element and attribute groups -->
+
+    <xsd:group name="defaultOutboundRouterElements">
+        <xsd:sequence>
+            <xsd:element name="reply-to" type="endpointRefType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Defines where the message should be routed after the recipient of the message to which this service dispatches has finished with it.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-transaction" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Defines an overall transaction that will be used for all endpoints on this router.  This is only useful when you want to define an outbound only transaction that will commit all of the transactions defined on the outbound endpoints for this router.  Note that you must still define a transaction on each of the endpoints that should take part in the transaction.  These transactions should always be configured to JOIN the existing transaction.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-message-info-mapping" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The message info mapper used to extract key bits of the message information, such as Message ID or Correlation ID.  these properties are used by some routers and this mapping information tells Mule where to get the information from in the current message.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:group name="defaultFilteredOutboundRouterElements">
+        <xsd:sequence>
+            <xsd:group ref="defaultOutboundRouterElements" />
+            <xsd:element ref="abstract-filter" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Filters the messages to be processed by this router.
+                        @Deprecated since 2.2.  Configure the filter on the endpoint instead of the router.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Filters are applied before message transformations. A transformer can be configured here to transform messages before they are filtered.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:attributeGroup name="defaultOutboundRouterAttributes">
+        <xsd:attribute name="enableCorrelation" default="IF_NOT_SET">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Specifies whether Mule should give outgoing messages a correlation ID. The default behavior is to give messages a correlation ID only if they don't already have one, so that existing correlation IDs are maintained.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="ALWAYS" />
+                    <xsd:enumeration value="NEVER" />
+                    <xsd:enumeration value="IF_NOT_SET" />
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:attributeGroup name="defaultFilteredOutboundRouterAttributes">
+        <xsd:attributeGroup ref="defaultOutboundRouterAttributes"/>
+        <xsd:attribute name="transformer-refs" type="xsd:NMTOKENS">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of the transformers that will be applied to the message in order before it is delivered to the component.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <!-- Default Outbound Router Types -->
+    <xsd:complexType name="outboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint"/>
+                    <xsd:group ref="defaultOutboundRouterElements"/>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultOutboundRouterAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="filteringOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint"/>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+     <xsd:complexType name="multipleEndpointFilteringOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" maxOccurs="unbounded"/>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="singleEndpointFilteringOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" maxOccurs="1"/>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--  Concrete Outbound Routers -->
+
+    <xsd:element name="pass-through-router" type="outboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                This router always matches and simply sends or dispatches message via the endpoint that is configured.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!--  FilteringOutboundRouter only uses a single endpoint. For now this needs to support multiple endpoints for MessageBuilderComponent usage only. -->
+    <xsd:element name="filtering-router" type="singleEndpointFilteringOutboundRouterType" substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Uses filters to determine whether the message matches a particular criteria and if so will route the message to the endpoint configured on the router.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="template-endpoint-router" type="filteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows endpoints to be altered at runtime based on properties set on the current message or fallback values set on the endpoint properties. Templated values are expressed using square braces around a property name.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="chaining-router" type="multipleEndpointFilteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends the message through multiple endpoints using the result of the first invocation as the input for the next.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="exception-based-router" type="multipleEndpointFilteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends a message over an endpoint by selecting the first endpoint that can connect to the transport.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="multicasting-router" type="multipleEndpointFilteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends the same message over multiple endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="endpoint-selector-router" type="endpointSelectorRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Selects the outgoing endpoint based on an expression evaluator ("header:endpoint" by default). It will first try to match the endpoint by name and then by address. The endpoints to use can be set on the router itself or be global endpoint definitions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="endpointSelectorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="multipleEndpointFilteringOutboundRouterType">
+                <xsd:attributeGroup ref="expressionAttributes"/>
+                <xsd:attribute name="default" type="xsd:NMTOKEN" use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the default endpoint to use if the expression returns null. This can be used as an 'else' condition to route messages that don't contain the expected routing information.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Splitter routers -->
+
+    <!-- Extends AbstractMessageSplitter-->
+    <xsd:complexType name="messageSplitterOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="multipleEndpointFilteringOutboundRouterType">
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Extends AbstractRoundRobinMessageSplitter -->
+    <xsd:complexType name="roundRobinSplitterType">
+        <xsd:complexContent>
+            <xsd:extension base="messageSplitterOutboundRouterType">
+                <xsd:attribute name="deterministic" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If 'disableRoundRobin' is false and this option is true (the default) then the first message part will be routed to the first endpoint, the second part to the second endpoint, etc, with the nth part going to the (n modulo number of endpoints) endpoint. If false then the messages will be distributed equally amongst all endpoints.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="disableRoundRobin" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If filters are being used on endpoints then round robin behaviour is probably not desirable. This flag switches round robin behaviour off, it is on by default.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="failIfNoMatch" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If 'disableRoundRobin' is true, there may be situations where the current split message does not match any endpoints.  this flag controls whether an exception should be thrown when a match is not found.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="list-message-splitter-router" type="roundRobinSplitterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                The Filtering List Message Splitter accepts a list of objects that is split each object being routed to different endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="expression-splitter-router" type="expressionSplitterOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Splits the message based on an expression. The expression must return one or more message parts in order to be effective.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+
+    <xsd:complexType name="expressionSplitterOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="roundRobinSplitterType">
+                <xsd:attributeGroup ref="expressionAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Messgae chunking routers -->
+    <xsd:element name="message-chunking-router" type="chunkingRouterType" substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows you to split a single message into a number of fixed-length messages that will all be routed to the same endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="chunkingRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="multipleEndpointFilteringOutboundRouterType">
+                <xsd:attribute name="messageSize" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The message chunk size (in bytes) that the current message will be split into. Note that this is mutually exclusive to the 'numberOfMessages' property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="numberOfMessages" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The number of message peices to break the current message into.  This property is less useful than the 'message' size property since, usually messages are constricted by size. Note that this is mutually exclusive to the 'messageSize' property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- recipient List routers -->
+    <xsd:element name="static-recipient-list-router" type="staticRecipientListRouterType" substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends the same message to multiple endpoints over the same endpoint, or implements routing-slip behavior where the next destination for the message is determined from message properties or the payload. It uses a static list of recipient endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="staticRecipientListRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                    <xsd:element name="recipients" type="listOrSetType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Static list of recipients that the outgoing message is sent to. The default delimiter is ','.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+                <xsd:attribute name="recipientsProperty" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Defines a property name on the current message where a list of endpoint names (or URIs) can be obtained. This property can return a {{java.util.List}} of values or a delimited {{java.lang.String}}. If the 'recipientsProperty' returns a string then the 'recipientsDelimiter' property is used to split the string.
+                            If the entries in the String or List define endpoint names, these will be looked up at runtime. If the entries define endpoint URIs these endpoints will be created at runtime.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="recipientsDelimiter" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The delimiter to use when splitting a String list of recipients.  the default is ','. This property is only used with the 'recipientsProperty'.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="synchronous" type="xsd:boolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            This flag controls whether the message will be sent to the recipients synchronously. Unlike other routers th recipient list router doesn't have pre-configured endpoints so the synchronicity of the endpoint cannot be honoured.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="expression-recipient-list-router" type="expressionRecipientListRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Sends the same message to multiple endpoints over the same endpoint, or implements routing-slip behavior where the next destination for the message is determined from message properties or the payload. The recipients can be extracted from the message using an expression, or you can specify a static list of recipient endpoints. (As of version 2.1)
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="expressionRecipientListRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                    <xsd:element name="recipients" type="listOrSetType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A static list of endpoint names or URIs that will be used as recipients of the current message. If the expression on this router returns a list of endpoint names, the endpoints here will be checked as well as any global endpoints.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+                <xsd:attributeGroup ref="expressionAttributes"/>
+                <xsd:attribute name="synchronous" type="xsd:boolean">
+                    <xsd:annotation>
+                        <xsd:documentation>This flag controls whether the message will be sent to the recipients synchronously. Unlike other routers th recipient list router doesn't have pre-configured endpoints so the synchronicity of the endpoint cannot be honoured.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- custom router -->
+    <xsd:element name="custom-outbound-router" type="customOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows you to configure a custom outbound router by specifying the custom router class and by using Spring properties. 
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:group ref="defaultFilteredOutboundRouterElements"/>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Spring-style property elements so that custom configuration can be configured on the
+                                custom router.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attributeGroup ref="defaultFilteredOutboundRouterAttributes"/>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of OutboundRouter (fully qualified Java class name)
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- Catch all strategy implementations -->
+    <xsd:element name="logging-catch-all-strategy" type="loggingCatchAllStrategyType" substitutionGroup="abstract-catch-all-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Does nothing with the message but simply logs (using the WARN log level) the fact that the message was not dispatched because no routing path was defined.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="loggingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-catch-all-strategy" type="customCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy"/>
+    <xsd:complexType name="customCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Fully qualified class name of the custom catch-all strategy to be used.
+                        </xsd:documentation>
+                    </xsd:annotation>                
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="forwarding-catch-all-strategy" type="forwardingCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Forwards the message to the specified endpoint if no outbound routers match.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="forwardingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-forwarding-catch-all-strategy" type="customForwardingCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy"/>
+    <xsd:complexType name="customForwardingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="forwardingCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Fully qualified class name of the custom forwarding catch-all strategy to be used.
+                        </xsd:documentation>
+                    </xsd:annotation>                
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Message Info Mappers -->
+
+    <xsd:element name="expression-message-info-mapping" type="expressionMessageInfoMappingType"
+                 substitutionGroup="abstract-message-info-mapping">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows expressions to be configured to extract the message information.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="expressionMessageInfoMappingType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractMessageInfoMappingType">
+                <xsd:attribute name="messageIdExpression" type="xsd:string" use="required"/>
+                <xsd:attribute name="correlationIdExpression" type="xsd:string" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-message-info-mapping" type="customMessageInfoMappingType"
+                 substitutionGroup="abstract-message-info-mapping">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows configuraton of a custom implementation of MessageInfoMapping.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customMessageInfoMappingType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractMessageInfoMappingType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the MessageInfoMapping interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!--==============================================================-->
+    <!--  Lifecycle Adapters                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-lifecycle-adapter-factory" abstract="true" type="abstractLifecycleAdapterFactory"/>
+    <xsd:complexType name="abstractLifecycleAdapterFactory">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows a lifecycle adaptor factory to be implemented, which allows an alternative custom lifecycle adaptor to be used if required instead of the default implementation that propagates the Mule lifecycle to component implementations.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:complexType>
+    <xsd:complexType name="customLifecycleAdapterFactory">
+        <xsd:complexContent>
+            <xsd:extension base="abstractLifecycleAdapterFactory">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the LifecycleAdapter interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:element name="custom-lifecycle-adapter-factory" type="customLifecycleAdapterFactory"
+                 substitutionGroup="abstract-lifecycle-adapter-factory">
+        <xsd:annotation>
+            <xsd:documentation>
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!--==============================================================-->
+    <!--  Object Factories                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-object-factory" abstract="true" type="abstractObjectFactoryType"/>
+    <xsd:complexType name="abstractObjectFactoryType">
+        <xsd:annotation>
+            <xsd:documentation>
+                An object factory is used to obtain object instances. The object factory is responsible for object creation and can implement different patterns, such a singleton or prototype, or lookup an instance from other object containers.  
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:group ref="propertiesGroup">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Properties to be set on the created object.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:group>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="genericObjectFactoryType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-object-factory"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="spring-object" type="springBeanLookupType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="springBeanLookupType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Object factory used to obtain Spring bean instances. This object factory does not create any instances but rather looks them up from Spring.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="bean" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>Name of Spring bean to look up.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="singleton-object" type="singletonObjectFactoryType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="singletonObjectFactoryType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Object factory that creates and always returns a singleton object instance.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>Class name</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="prototype-object" type="prototypeObjectFactoryType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="prototypeObjectFactoryType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Object factory that creates and returns a new 'prototype' object instance every time it is called.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>Class name</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-pooling-profile" abstract="true" type="abstractPoolingProfileType"/>
+    <xsd:complexType name="abstractPoolingProfileType"/>
+
+    <xsd:element name="pooling-profile" type="poolingProfileType" substitutionGroup="abstract-pooling-profile"/>
+    <xsd:complexType name="poolingProfileType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A pooling profile is used to configure the pooling behaviour of Mule components. Each component can have its own pooling profile.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractPoolingProfileType">
+                <xsd:attribute name="maxActive" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>Controls the maximum number of Mule components that can be borrowed from a session at one time. When set to a negative value, there is no limit to the number of components that may be active at one time. When maxActive is exceeded, the pool is said to be exhausted.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="maxIdle" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>Controls the maximum number of Mule components that can sit idle in the pool at any time. When set to a negative value, there is no limit to the number of Mule components that may be idle at one time.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="initialisationPolicy" default="INITIALISE_ONE">
+                    <xsd:annotation>
+                        <xsd:documentation>Determines how components in a pool should be initialized. The possible values are: INITIALISE_NONE (will not load any components into the pool on startup), INITIALISE_ONE (will load one initial component into the pool on startup), or INITIALISE_ALL (will load all components in the pool on startup)</xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="INITIALISE_NONE"/>
+                            <xsd:enumeration value="INITIALISE_ONE"/>
+                            <xsd:enumeration value="INITIALISE_ALL"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="exhaustedAction" default="WHEN_EXHAUSTED_GROW">
+                    <xsd:annotation>
+                        <xsd:documentation>Specifies the behavior of the Mule component pool when the pool is exhausted. Possible values are: "WHEN_EXHAUSTED_FAIL", which will throw a NoSuchElementException, "WHEN_EXHAUSTED_WAIT", which will block by invoking Object.wait(long) until a new or idle object is available, or WHEN_EXHAUSTED_GROW, which will create a new Mule instance and return it, essentially making maxActive meaningless. If a positive maxWait value is supplied, it will block for at most that many milliseconds, after which a NoSuchElementException will be thrown. If maxThreadWait is a negative value, it will block indefinitely.</xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="WHEN_EXHAUSTED_GROW"/>
+                            <xsd:enumeration value="WHEN_EXHAUSTED_WAIT"/>
+                            <xsd:enumeration value="WHEN_EXHAUSTED_FAIL"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="maxWait" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>Specifies the number of milliseconds to wait for a pooled component to become available when the pool is exhausted and the exhaustedAction is set to WHEN_EXHAUSTED_BLOCK.</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <!-- <xsd:attribute name="factory" type="xsd:string" default="org.mule.config.pool.CommonsPoolFactory"/> -->
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--  Utils / Standard Types                                      -->
+    <!--==============================================================-->
+
+
+    <xsd:complexType name="abstractAgentType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for agents. Not used in core, but common to several modules.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractExtensionType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsIndirectKeyStore, named as tls-client in transport namespace -->
+    <xsd:complexType name="tlsClientKeyStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configure client key stores. TLS/SSL connections are made on behalf of an entity, which can be anonymous or identified by a certificate. This interface specifies how a keystore can be used to provide the certificates (and associated private keys) necessary for identification. This is also used as the trust store if no other trust store is specified and the explicitTrustStoreOnly parameter in the server trust store configuration is false. WARNING - due to restrictions in library implementations the values specified here typically apply to all connectors using this transport.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if possible) of the keystore that contains public certificates and private keys for identification.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the keystore.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The type of keystore used (a Java class name).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsDirectKeyStore, named as tls-key-store in transport namespace -->
+    <xsd:complexType name="tlsKeyStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures key stores. TLS/SSL connections are made on behalf of an entity, which can be anonymous or identified by a certificate. This interface specifies how a keystore can be used to provide the certificates (and associated private keys) necessary for identification.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if possible) of the keystore that contains public certificates and private keys for identification.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The type of keystore used (a Java class name).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="keyPassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the private key.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the keystore.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="algorithm" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The algorithm used by the key store.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsIndirectTrustStore, named as tls-trust-store in transport namespace -->
+    <xsd:complexType name="tlsTrustStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a trust store. TLS/SSL connections are made to trusted systems. The public certificates of trusted systems are stored in a keystore (called a trust store) and used to verify that the connection made to a remote system is the expected identity.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if possible) of the keystore that contains public certificates of trusted servers.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the trust store.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsDirectTrustStore, named as tls-server in transport namespace
+         note that this extends tlsTrustStoreType, so only one of the two is needed -->
+    <xsd:complexType name="tlsServerTrustStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures a direct trust store. TLS/SSL connections are made to trusted systems. The public certificates of trusted systems are stored in a keystore (called a trust store) and used to verify that the connection made to a remote system is the expected identity.
+            </xsd:documentation>
+        </xsd:annotation>    
+        <xsd:complexContent>
+            <xsd:extension base="tlsTrustStoreType">
+                <xsd:attribute name="class" type="substitutableClass"/>
+                <xsd:attribute name="algorithm" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The algorithm used by the trust store.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <!-- should be of type TrustManagerFactory -->
+                <xsd:attribute name="factory-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Reference to a TrustManagerFactory configured as a Spring bean.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="explicitOnly" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Specifies whether the key store data should not be used when a trust store is otherwise undefined.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="requireClientAuthentication" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If a server socket is constructed directly, this attribute is used to determine whether client authentication is required. This does not apply to client connections. 
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsProtocolHandler, named as tls-protocol-handler -->
+    <xsd:complexType name="tlsProtocolHandler">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configures the global Java protocol handler. WARNING - Untested.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="property" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Sets the java.protocol.handler.pkgs system property.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:simpleType name="propertyPlaceholderType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A type that defines a Mule-style property placeholder.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="(\#\[[^\]]+\]|\$\{[^\}]+\})"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableClass">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:NMTOKEN-like type that also allows for Ant-style property placeholders and a leading "[".
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:pattern value="\[?[A-Za-z0-9_\.$]+"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="nonBlankString">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:string-like type that cannot be empty.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:pattern value=".*[^ ]+.*"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableName">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:NMTOKEN type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutablePortNumber">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:int type that also allows for Ant-style property placeholders and restricts the int value to a valid port number.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:int">
+                    <xsd:minInclusive value="0"/>
+                    <xsd:maxInclusive value="65536"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableInt">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:int type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:int"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableLong">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:long type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:long"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableBoolean">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:boolean type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:boolean"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <!-- i found this a bit confusing, so here is some background...
+         this type is typically called from something like
+           <xsd:element name="properties" type="mapType/>
+         and the "properties" element generates a ChildMapDefinitionParser that
+         can "receive" the map entries generated by the embedded spring <entry..>
+         elements and which is then set via "setProperties" on the parent.
+         in other words, it's a map, and despite the name "properties" has
+         nothing to do with the spring <property ...> element.
+         spring elements like <entry...> are handled by
+         MuleHierarchicalBeanDefinitionParserDelegate which punts them to
+         the spring handler -->
+    <xsd:element name="properties" type="mapType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A map of Mule properties.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="mapType">
+        <xsd:complexContent>
+            <xsd:extension base="spring:mapType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:group name="propertiesGroup">
+        <xsd:sequence>
+            <xsd:element name="property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Sets a Mule property. This is a name/value pair that can be set on components, services, etc., and which provide a generic way of configuring the system. Typically, you shouldn't need to use a generic property like this, since almost all functionality is exposed via dedicated elements. However, it can be useful in configuring obscure or overlooked options and in configuring transports from the generic endpoint elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="properties" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:complexType name="listOrSetType">
+        <xsd:complexContent>
+            <xsd:extension base="spring:listOrSetType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="referenceType">
+        <xsd:attribute name="ref" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="keyType">
+        <xsd:attribute name="key" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="valueType">
+        <xsd:attribute name="value" type="xsd:string"/>
+        <xsd:attribute name="value-ref" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="keyValueType">
+        <xsd:complexContent>
+            <xsd:extension base="keyType">
+                <xsd:attribute name="value" type="xsd:string"/>
+                <xsd:attribute name="value-ref" type="xsd:NMTOKEN"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   Connector support                                          -->
+    <!--==============================================================-->
+
+    <xsd:complexType name="connectorType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractConnectorType">
+                <xsd:sequence>
+                    <!-- for normal connectors, this is for emergency use only, but it is
+                         critical for custom connector -->
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element name="receiver-threading-profile" type="threadingProfileType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The threading profile to use when a connector receives messages.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="dispatcher-threading-profile" type="threadingProfileType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The threading profile to use when a connector dispatches messages.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-exception-strategy" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The exception strategy to use when errors occur in the connector.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-retry-policy" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Retry policy that defines how Mule should retry if a receive/request/dispatch operation fails.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="service-overrides" type="serviceOverridesType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Service overrides allow the connector to be further configured/customized by allowing parts of the transport implementation to be overridden, for example, the message receiver or dispatcher implementation, or the message adaptor that is used.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="createMultipleTransactedReceivers" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether to create multiple concurrent receivers for this connector. This property is used by transports that support transactions, specifically receivers that extend the TransactedPollingMessageReceiver, and provides better throughput.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="numberOfConcurrentTransactedReceivers" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If createMultipleTransactedReceivers is set to true, the number of concurrent receivers that will be launched.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="dynamicNotification" type="substitutableBoolean" default="false">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Enables dynamic notifications for notifications fired by this connector. This allows listeners to be registered dynamically at runtime via the MuleContext, and the configured notification can be changed. This overrides the default value defined in the 'configuration' element.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="validateConnections" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Causes Mule to validate connections before use. Note that this is only a configuration hint,
+                            transport implementations may or may not make an extra effort to validate the connection. Default is true.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="serviceOverridesType">
+        <xsd:attribute name="messageReceiver" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="transactedMessageReceiver" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="xaTransactedMessageReceiver" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="dispatcherFactory" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="inboundTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="outboundTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="responseTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="endpointBuilder" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="messageAdapter" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="streamMessageAdapter" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="serviceFinder" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="sessionHandler" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   JNDI support                                               -->
+    <!--==============================================================-->
+
+    <xsd:complexType name="jndiConnectorType">
+        <xsd:complexContent>
+            <xsd:extension base="connectorType">
+                <xsd:sequence>
+                    <xsd:element name="jndi-provider-property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Direct setting of a JNDI property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="jndi-provider-properties" type="mapType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Direct setting of JNDI properties (allows access to the full Spring map entry).
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="jndiContext-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Set the complete context directly, via a bean reference.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiInitialFactory" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The initial context factory to use. The value of the property should be the fully qualified class name of the factory class that will create an initial context.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiProviderUrl" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The service provider to use. The value of the property should contain a URL string (such as "ldap://somehost:389").
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiUrlPkgPrefixes" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The list of package prefixes to use when loading in URL context factories. The value of the property should be a colon-separated list of package prefixes for the class name of the factory class that will create a URL context factory.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="dataReferenceType" mixed="true">
+        <xsd:attribute name="file" type="xsd:string"/>
+        <xsd:attribute name="ref" type="xsd:string"/>
+        <!--I don't like this flag, may be we could use content-type mappings... -->
+        <xsd:attribute name="binary" type="substitutableBoolean"/>
+    </xsd:complexType>
+
+    <!-- these cannot be references (unless we use qualified attribute names, which are ugly),
+         but serve as templates to cut+paste in individual transports
+
+    <xsd:attribute name="path" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A file location.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="user" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A username.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="password" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A password.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="host" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                An IP address (eg www.mulesource.com, localhost, 127.0.0.1).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="port" type="substitutablePortNumber">
+        <xsd:annotation>
+            <xsd:documentation>
+                A port number.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+    
+    -->
+
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MuleConfigValidationSchemas/spring-beans-2.5.xsd b/xml/tests/testData/xml/MuleConfigValidationSchemas/spring-beans-2.5.xsd
new file mode 100644
index 000000000000..769830c69dc5
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigValidationSchemas/spring-beans-2.5.xsd
@@ -0,0 +1,1164 @@
+<?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:element ref="description" minOccurs="0"/>
+			<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:element ref="description" minOccurs="0"/>
+					<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/xml/MuleConfigValidationSchemas/spring-context-2.5.xsd b/xml/tests/testData/xml/MuleConfigValidationSchemas/spring-context-2.5.xsd
new file mode 100644
index 000000000000..0cbb8da9273c
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigValidationSchemas/spring-context-2.5.xsd
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/context" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:beans="http://www.springframework.org/schema/beans"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/context" elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Defines the configuration elements for the Spring Framework's application
+	context support. Effects the activation of various configuration styles
+	for the containing Spring ApplicationContext.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:element name="property-placeholder">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Activates replacement of ${...} placeholders, resolved against the specified properties file or Properties object
+	(if any). Falls back to resolving placeholders against JVM system properties.
+	Alternatively, define a parameterized PropertyPlaceholderConfigurer bean in the context.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="location" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The location of the properties file to resolve placeholders against, as a Spring
+	resource location: a URL, a "classpath:" pseudo URL, or a relative file path.
+	Multiple locations may be specified, separated by commas. If neither location nor properties-ref is
+	specified, placeholders will be resolved against system properties.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="properties-ref" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation source="java:java.util.Properties"><![CDATA[
+	The bean name of a Java Properties object that will be used for property substitution.
+	If neither location nor properties-ref is specified, placeholders will be resolved against system properties.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="property-override">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Activates pushing of override values into bean properties, based on configuration
+	lines of the following format: beanName.property=value
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.beans.factory.config.PropertyOverrideConfigurer"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="location" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The location of the properties file to read property overrides from, as a Spring
+	resource location: a URL, a "classpath:" pseudo URL, or a relative file path.
+	Multiple locations may be specified, separated by commas.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="properties-ref" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation source="java:java.util.Properties"><![CDATA[
+	The bean name of a Java Properties object that will be used for property overrides.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="annotation-config">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Activates various annotations to be detected in bean classes: Spring's @Required and
+	@Autowired, as well as JSR 250's @PostConstruct, @PreDestroy and @Resource (if available),
+	JAX-WS's @WebServiceRef (if available), EJB3's @EJB (if available), and JPA's
+	@PersistenceContext and @PersistenceUnit (if available). Alternatively, you may
+	choose to activate the individual BeanPostProcessors for those annotations.
+
+	Note: This tag does not activate processing of Spring's @Transactional or EJB3's
+	@TransactionAttribute annotation. Consider the use of the <tx:annotation-driven>
+	tag for that purpose.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="component-scan">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Scans the classpath for annotated components that will be auto-registered as 
+	Spring beans. By default, the Spring-provided @Component, @Repository, 
+	@Service, and @Controller stereotypes will be detected.
+
+	Note: This tag implies the effects of the 'annotation-config' tag, activating @Required,
+	@Autowired, @PostConstruct, @PreDestroy, @Resource, @PersistenceContext and @PersistenceUnit
+	annotations in the component classes, which is usually desired for autodetected components
+	(without external configuration). Turn off the 'annotation-config' attribute to deactivate
+	this default behavior, for example in order to use custom BeanPostProcessor definitions
+	for handling those annotations.
+
+	Note: You may use placeholders in package paths, but only resolved against system
+	properties (analogous to resource paths). A component scan results in new bean definition
+	being registered; Spring's PropertyPlaceholderConfigurer will apply to those bean
+	definitions just like to regular bean definitions, but it won't apply to the component
+	scan settings themselves.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="include-filter" type="filterType" minOccurs="0" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+	Controls which eligible types to include for component scanning.
+							]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="exclude-filter" type="filterType" minOccurs="0" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+	Controls which eligible types to exclude for component scanning.
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="base-package" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The comma-separated list of packages to scan for annotated components.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="resource-pattern" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Controls the class files eligible for component detection. Defaults to "**/*.class", the recommended value.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="use-default-filters" type="xsd:boolean" default="true">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Indicates whether automatic detection of classes annotated with @Component, @Repository, @Service, or @Controller
+	should be enabled. Default is "true".
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="annotation-config" type="xsd:boolean" default="true">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Indicates whether the implicit AutowiredAnnotationBeanPostProcessor and CommonAnnotationBeanPostProcessor should
+	 be enabled. Default is "true".
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="name-generator" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The fully-qualified classname of the BeanNameGenerator to be used for naming detected components.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.beans.factory.support.BeanNameGenerator"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="scope-resolver" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The fully-qualified class name of the ScopeMetadataResolver to be used for resolving the scope of detected components.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.context.annotation.ScopeMetadataResolver"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="scoped-proxy">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Indicates whether proxies should be generated for detected components, which may be necessary when using certain
+	non-singleton scopes in a proxy-style fashion. Default is to generate no such proxies.
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="no"/>
+						<xsd:enumeration value="interfaces"/>
+						<xsd:enumeration value="targetClass"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="load-time-weaver">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Activates a Spring LoadTimeWeaver for this application context, available as
+	a bean with the name "loadTimeWeaver". Any bean that implements the
+	LoadTimeWeaverAware interface will then receive the LoadTimeWeaver reference
+	automatically; for example, Spring's JPA bootstrap support.
+
+	The default weaver is determined automatically. As of Spring 2.5: detecting
+	Sun's GlassFish, Oracle's OC4J, Spring's VM agent and any ClassLoader
+	supported by Spring's ReflectiveLoadTimeWeaver (for example, the
+	TomcatInstrumentableClassLoader).
+
+	The activation of AspectJ load-time weaving is specified via a simple flag
+	(the 'aspectj-weaving' attribute), with the AspectJ class transformer
+	registered through Spring's LoadTimeWeaver. AspectJ weaving will be activated
+	by default if a "META-INF/aop.xml" resource is present in the classpath.
+
+	This also activates the current application context for applying dependency
+	injection to non-managed classes that are instantiated outside of the Spring
+	bean factory (typically classes annotated with the @Configurable annotation).
+	This will only happen if the AnnotationBeanConfigurerAspect is on the classpath
+	(i.e. spring-aspects.jar), effectively activating "spring-configured" by default.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.instrument.classloading.LoadTimeWeaver"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="weaver-class" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The fully-qualified classname of the LoadTimeWeaver that is to be activated.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.instrument.classloading.LoadTimeWeaver"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="aspectj-weaving" default="autodetect">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="on">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Switches Spring-based AspectJ load-time weaving on.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:enumeration>
+						<xsd:enumeration value="off">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Switches Spring-based AspectJ load-time weaving off.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:enumeration>
+						<xsd:enumeration value="autodetect">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Switches AspectJ load-time weaving on if a "META-INF/aop.xml" resource
+	is present in the classpath. If there is no such resource, then AspectJ
+	load-time weaving will be switched off.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:enumeration>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="spring-configured">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect">
+				<![CDATA[
+	Signals the current application context to apply dependency injection
+	to non-managed classes that are instantiated outside of the Spring bean
+	factory (typically classes annotated with the @Configurable annotation).
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleType>
+			<xsd:restriction base="xsd:string"/>
+		</xsd:simpleType>
+	</xsd:element>
+
+	<xsd:element name="mbean-export">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.jmx.export.annotation.AnnotationMBeanExporter"><![CDATA[
+	Activates default exporting of MBeans by detecting standard MBeans in the Spring
+	context as well as @ManagedResource annotations on Spring-defined beans.
+
+	The resulting MBeanExporter bean is defined under the name "mbeanExporter".
+	Alternatively, consider defining a custom AnnotationMBeanExporter bean explicitly.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.jmx.export.annotation.MBeanExporter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="default-domain" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default domain to use when generating JMX ObjectNames.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="server" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The bean name of the MBeanServer to which MBeans should be exported.
+	Default is to use the platform's default MBeanServer (autodetecting
+	WebLogic 9+, WebSphere 5.1+ and the JDK 1.5+ platform MBeanServer).
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="registration">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The registration behavior, indicating how to deal with existing MBeans
+	of the same name: fail with an exception, ignore and keep the existing
+	MBean, or replace the existing one with the new MBean.
+
+	Default is to fail with an exception.
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:NMTOKEN">
+						<xsd:enumeration value="failOnExisting"/>
+						<xsd:enumeration value="ignoreExisting"/>
+						<xsd:enumeration value="replaceExisting"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="mbean-server">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.jmx.support.MBeanServerFactoryBean"><![CDATA[
+	Exposes a default MBeanServer for the current platform.
+	Autodetects WebLogic 9+, WebSphere 5.1+ and the JDK 1.5+ platform MBeanServer.
+
+	The default bean name for the exposed MBeanServer is "mbeanServer".
+	This may be customized through specifying the "id" attribute.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="javax.management.MBeanServer"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="beans:identifiedType">
+					<xsd:attribute name="agent-id" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The agent id of the target MBeanServer, if any.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:complexType name="filterType">
+		<xsd:attribute name="type" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+    Controls the type of filtering to apply to the expression.
+
+    "annotation" indicates an annotation to be present at the type level in target components;
+    "assignable" indicates a class (or interface) that the target components are assignable to (extend/implement);
+    "aspectj" indicates an AspectJ type expression to be matched by the target components;
+    "regex" indicates a regex expression to be matched by the target components' class names;
+    "custom" indicates a custom implementation of the org.springframework.core.type.TypeFilter interface.
+
+    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:string">
+					<xsd:enumeration value="annotation"/>
+					<xsd:enumeration value="assignable"/>
+					<xsd:enumeration value="aspectj"/>
+					<xsd:enumeration value="regex"/>
+					<xsd:enumeration value="custom"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="expression" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+    Indicates the filter expression, the type of which is indicated by "type".
+                ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/MuleConfigValidationSchemas/spring-tool-2.5.xsd b/xml/tests/testData/xml/MuleConfigValidationSchemas/spring-tool-2.5.xsd
new file mode 100644
index 000000000000..17bec6dbecc8
--- /dev/null
+++ b/xml/tests/testData/xml/MuleConfigValidationSchemas/spring-tool-2.5.xsd
@@ -0,0 +1,75 @@
+<?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:element name="registers-scope" type="registersScopeType" minOccurs="0" maxOccurs="unbounded"/>
+			</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><![CDATA[
+	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><![CDATA[
+	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><![CDATA[
+	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:complexType name="registersScopeType">
+		<xsd:attribute name="name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Defines the name of a custom bean scope that the annotated type registers, e.g. "conversation".
+	Such a scope will be available in addition to the standard "singleton" and "prototype" scopes
+	(plus "request", "session" and "globalSession" in a web application environment).
+		]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.dtd b/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.dtd
new file mode 100644
index 000000000000..ccd8e842c80e
--- /dev/null
+++ b/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.dtd
@@ -0,0 +1,2 @@
+<!ENTITY % my.mod SYSTEM "NavigateToDeclDefinedWithEntity.ent" >
+%my.mod;
diff --git a/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.ent b/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.ent
new file mode 100644
index 000000000000..ee773d57892d
--- /dev/null
+++ b/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.ent
@@ -0,0 +1,2 @@
+<!ELEMENT mapping (#PCDATA)>
+<!ATTLIST mapping id ID #IMPLIED>
diff --git a/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.xml b/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.xml
new file mode 100644
index 000000000000..5c9515956f42
--- /dev/null
+++ b/xml/tests/testData/xml/NavigateToDeclDefinedWithEntity.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapping SYSTEM "NavigateToDeclDefinedWithEntity.dtd">
+<mapping id="qq" />
diff --git a/xml/tests/testData/xml/NoNamespaceLocation.xml b/xml/tests/testData/xml/NoNamespaceLocation.xml
new file mode 100644
index 000000000000..b0875c15bddb
--- /dev/null
+++ b/xml/tests/testData/xml/NoNamespaceLocation.xml
@@ -0,0 +1,3 @@
+<aRoot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="NoNamespaceLocation.xsd">
+  <anElement xml:space="preserve" />
+</aRoot>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/NoNamespaceLocation.xsd b/xml/tests/testData/xml/NoNamespaceLocation.xsd
new file mode 100644
index 000000000000..c4dea060120e
--- /dev/null
+++ b/xml/tests/testData/xml/NoNamespaceLocation.xsd
@@ -0,0 +1,12 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xs:element name="aRoot" type="aRootType" />
+  <xs:complexType name="aRootType">
+    <xs:sequence>
+      <xs:element name="anElement" type="anElementType"/>
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="anElementType">
+    <xs:attribute ref="xml:space" />
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/NoRootTag.xml b/xml/tests/testData/xml/NoRootTag.xml
new file mode 100644
index 000000000000..9789bba655a6
--- /dev/null
+++ b/xml/tests/testData/xml/NoRootTag.xml
@@ -0,0 +1 @@
+<error descr="Top level element is not completed"> </error>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/NoSpaceBeforeAttrAndNoCdataEnd.xml b/xml/tests/testData/xml/NoSpaceBeforeAttrAndNoCdataEnd.xml
new file mode 100644
index 000000000000..e086faa7f0de
--- /dev/null
+++ b/xml/tests/testData/xml/NoSpaceBeforeAttrAndNoCdataEnd.xml
@@ -0,0 +1,5 @@
+<foo bar="xxx"<error></error>baz="yyy">
+  <![CDATA[
+  ]]>
+  <error>]]></error>
+</foo>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/NonEnumeratedValuesHighlighting.xml b/xml/tests/testData/xml/NonEnumeratedValuesHighlighting.xml
new file mode 100644
index 000000000000..cdeb507a9850
--- /dev/null
+++ b/xml/tests/testData/xml/NonEnumeratedValuesHighlighting.xml
@@ -0,0 +1,21 @@
+<xsl:stylesheet version="1.0"
+                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                 exclude-result-prefixes="<error>java</error>">
+   <xsl:template match="/">
+     <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/1999/XSL/Format fop.xsd">
+       <fo:layout-master-set>
+         <fo:simple-page-master
+             margin-top="60pt"
+             margin-bottom="18pt"
+             margin-left="1cm"
+             margin-right="1cm"
+             page-width="297mm"
+             page-height="210mm"
+             master-name="first">
+           <fo:region-body margin-bottom="24pt"/>
+           <fo:region-after extent="24pt"/>
+         </fo:simple-page-master>
+       </fo:layout-master-set>
+     </fo:root>
+   </xsl:template>
+ </xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting.xml b/xml/tests/testData/xml/OasisDocumentHighlighting.xml
new file mode 100644
index 000000000000..9ed7644b036d
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "concept.dtd">
+
+<concept id="concept_0E9B27D593814C37A7E1A58E91437303">
+    <title>Roles</title>
+    <shortdesc>
+      <apiname/>
+    </shortdesc>
+
+    <conbody>
+
+        <p></p>
+        <p>></p>
+    </conbody>
+</concept>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/bookmap.dtd b/xml/tests/testData/xml/OasisDocumentHighlighting/bookmap.dtd
new file mode 100644
index 000000000000..70430b215d80
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/bookmap.dtd
@@ -0,0 +1,120 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Bookmap DTD                                  -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//DTD DITA BookMap//EN"
+      Delivered as file "bookmap.dtd"                              -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    DTD to describe DITA Book Maps                    -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2004                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2006.                    -->
+<!--             (C) Copyright IBM Corporation 2004, 2005.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATIONS                 -->
+<!-- ============================================================= -->
+
+<!ENTITY % mapgroup-d-dec 
+                        PUBLIC 
+"-//OASIS//ENTITIES DITA Map Group Domain//EN" 
+"mapGroup.ent"                                                       >
+%mapgroup-d-dec;
+
+<!ENTITY % indexing-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Indexing Domain//EN" 
+"indexingDomain.ent"                                                 >
+%indexing-d-dec;
+
+<!ENTITY % xnaldomain-d-dec 
+                        PUBLIC 
+"-//OASIS//ENTITIES DITA XNAL Domain//EN" 
+"xnalDomain.ent"                                                     >
+%xnaldomain-d-dec;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE DECLARATIONS              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN EXTENSIONS                          -->
+<!-- ============================================================= -->
+<!--                    One for each extended base element, with
+                        the name of the domain(s) in which the
+                        extension was declared                     -->
+<!ENTITY % author       "author | %xnal-d-author;"                   >
+<!ENTITY % topicref     "topicref | %mapgroup-d-topicref;"           >
+<!ENTITY % index-base   "index-base | %indexing-d-index-base;"       >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE EXTENSIONS                -->
+<!-- ============================================================= -->
+<!ENTITY % props-attribute-extensions  ""                            >
+<!ENTITY % base-attribute-extensions   ""                            >
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+<!--                    Must be declared ahead of the DTDs, which
+                        puts @domains first in order               -->
+<!ENTITY included-domains "&mapgroup-d-att; &indexing-d-att; 
+                           &xnal-d-att;"                             >
+
+<!-- ============================================================= -->
+<!--                    MAP ELEMENT INTEGRATION                    -->
+<!-- ============================================================= -->
+
+<!ENTITY % map-type PUBLIC 
+"-//OASIS//ELEMENTS DITA Map//EN" 
+"map.mod"                                                            >
+%map-type;
+
+<!ENTITY % bookmap-type PUBLIC 
+"-//OASIS//ELEMENTS DITA BookMap//EN" 
+"bookmap.mod"                                                        >
+%bookmap-type;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ELEMENT INTEGRATION                 -->
+<!-- ============================================================= -->
+
+<!ENTITY % mapgroup-d-def  
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Map Group Domain//EN" 
+"mapGroup.mod"                                                       >
+%mapgroup-d-def;
+
+<!ENTITY % indexing-d-def
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Indexing Domain//EN" 
+"indexingDomain.mod"                                                 >
+%indexing-d-def;
+
+<!ENTITY % xnaldomain-d-def  
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA XNAL Domain//EN" 
+"xnalDomain.mod"                                                     >
+%xnaldomain-d-def;
+
+<!-- ================== End DITA Bookmap DTD  ==================== -->
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/bookmap.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/bookmap.mod
new file mode 100644
index 000000000000..894ee62ef507
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/bookmap.mod
@@ -0,0 +1,644 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Bookmap                                      -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA BookMap//EN" 
+      Delivered as file "bookmap.mod"                              -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Define elements and specialization atttributes    -->
+<!--             for Book Maps                                     -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2004                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2004, 2005.         -->
+<!--             All Rights Reserved.                              -->
+<!--  UPDATES:                                                     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+                               
+<!ENTITY % bookmap         "bookmap"                                 >
+
+<!ENTITY % abbrevlist      "abbrevlist"                              >
+<!ENTITY % bookabstract    "bookabstract"                            >
+<!ENTITY % amendments      "amendments"                              >
+<!ENTITY % appendix        "appendix"                                >
+<!ENTITY % approved        "approved"                                >
+<!ENTITY % backmatter      "backmatter"                              >
+<!ENTITY % bibliolist      "bibliolist"                              >
+<!ENTITY % bookchangehistory "bookchangehistory"                     >
+<!ENTITY % bookevent       "bookevent"                               >
+<!ENTITY % bookeventtype   "bookeventtype"                           >
+<!ENTITY % bookid          "bookid"                                  >
+<!ENTITY % booklibrary     "booklibrary"                             >
+<!ENTITY % booklist        "booklist"                                >
+<!ENTITY % booklists       "booklists"                               >
+<!ENTITY % bookmeta        "bookmeta"                                >
+<!ENTITY % booknumber      "booknumber"                              >
+<!ENTITY % bookowner       "bookowner"                               >
+<!ENTITY % bookpartno      "bookpartno"                              >
+<!ENTITY % bookrestriction "bookrestriction"                         >
+<!ENTITY % bookrights      "bookrights"                              >
+<!ENTITY % booktitle       "booktitle"                               >
+<!ENTITY % booktitlealt    "booktitlealt"                            >
+<!ENTITY % chapter         "chapter"                                 >
+<!ENTITY % colophon        "colophon"                                >
+<!ENTITY % completed       "completed"                               >
+<!ENTITY % copyrfirst      "copyrfirst"                              >
+<!ENTITY % copyrlast       "copyrlast"                               >
+<!ENTITY % day             "day"                                     >
+<!ENTITY % dedication      "dedication"                              >
+<!ENTITY % draftintro      "draftintro"                              >
+<!ENTITY % edited          "edited"                                  >
+<!ENTITY % edition         "edition"                                 >
+<!ENTITY % figurelist      "figurelist"                              >
+<!ENTITY % frontmatter     "frontmatter"                             >
+<!ENTITY % glossarylist    "glossarylist"                            >
+<!ENTITY % indexlist       "indexlist"                               >
+<!ENTITY % isbn            "isbn"                                    >
+<!ENTITY % mainbooktitle   "mainbooktitle"                           >
+<!ENTITY % maintainer      "maintainer"                              >
+<!ENTITY % month           "month"                                   >
+<!ENTITY % notices         "notices"                                 >
+<!ENTITY % organization    "organization"                            >
+<!ENTITY % part            "part"                                    >
+<!ENTITY % person          "person"                                  >
+<!ENTITY % preface         "preface"                                 >
+<!ENTITY % printlocation   "printlocation"                           >
+<!ENTITY % published       "published"                               >
+<!ENTITY % publisherinformation "publisherinformation"               >
+<!ENTITY % publishtype     "publishtype"                             >
+<!ENTITY % reviewed        "reviewed"                                >
+<!ENTITY % revisionid      "revisionid"                              >
+<!ENTITY % started         "started"                                 >
+<!ENTITY % summary         "summary"                                 >
+<!ENTITY % tablelist       "tablelist"                               >
+<!ENTITY % tested          "tested"                                  >
+<!ENTITY % trademarklist   "trademarklist"                           >
+<!ENTITY % toc             "toc"                                     >
+<!ENTITY % volume          "volume"                                  >
+<!ENTITY % year            "year"                                    >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY included-domains ""                                         >
+
+<!-- ============================================================= -->
+<!--                    COMMON ATTLIST SETS                        -->
+<!-- ============================================================= -->
+
+<!-- Currently: same as topicref, minus @query -->
+<!ENTITY % chapter-atts 
+            'navtitle   CDATA                             #IMPLIED
+             href       CDATA                             #IMPLIED
+             keyref     CDATA                             #IMPLIED
+             copy-to    CDATA                             #IMPLIED
+             outputclass 
+                        CDATA                             #IMPLIED
+             %topicref-atts;
+             %univ-atts;'                                            >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Book Map                        -->
+<!ELEMENT bookmap       (((%title;) | (%booktitle;))?,
+                         (%bookmeta;)?, 
+                         (%frontmatter;)?,
+                         (%chapter;)*, (%part;)*, (%appendix;)*,
+                         (%backmatter;)?,
+                         (%reltable;)*)                              >
+<!ATTLIST bookmap
+             id         ID                                #IMPLIED
+             conref     CDATA                             #IMPLIED
+             anchorref  CDATA                             #IMPLIED
+             outputclass 
+                        CDATA                             #IMPLIED
+             %localization-atts;
+             %arch-atts;
+             domains    CDATA                  "&included-domains;" 
+             %topicref-atts;
+             %select-atts;                                           >
+             
+
+<!--                    LONG NAME: Book Metadata                   -->
+<!ELEMENT  bookmeta    ((%linktext;)?, (%searchtitle;)?, 
+                         (%shortdesc;)?, (%author;)*, (%source;)?, 
+                         (%publisherinformation;)*,
+                         (%critdates;)?, (%permissions;)?, 
+                         (%audience;)*, (%category;)*, 
+                         (%keywords;)*, (%prodinfo;)*, (%othermeta;)*, 
+                         (%resourceid;)*, (%bookid;)?,
+                         (%bookchangehistory;)*,
+                         (%bookrights;)*,
+                         (%data;)*)                                  >
+<!ATTLIST  bookmeta
+             lockmeta   (yes | no)                        #IMPLIED
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Front Matter                    -->
+<!ELEMENT  frontmatter  (%booklists; | %notices; | %dedication; | 
+                         %colophon; | %bookabstract; | %draftintro; | 
+                         %preface; | %topicref;)*                    >
+<!ATTLIST  frontmatter
+             keyref     CDATA                             #IMPLIED
+             query      CDATA                             #IMPLIED
+             outputclass 
+                        CDATA                             #IMPLIED
+             %topicref-atts;
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Back Matter                     -->
+<!ELEMENT  backmatter   (%booklists; | %notices; | %dedication; | 
+                         %colophon; | %amendments; | %topicref;)*    >
+<!ATTLIST  backmatter
+             keyref     CDATA                             #IMPLIED
+             query      CDATA                             #IMPLIED
+             outputclass 
+                        CDATA                             #IMPLIED
+             %topicref-atts;
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Publisher Information           -->
+<!ELEMENT publisherinformation   
+                        (((%person;) | (%organization;))*, 
+                         (%printlocation;)*, (%published;)*, 
+                         (%data;)*)                                  >
+<!ATTLIST publisherinformation
+             href       CDATA                            #IMPLIED
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Person                          -->
+<!ELEMENT person        (%words.cnt;)*                               >
+<!ATTLIST person
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Organization                    -->
+<!ELEMENT organization  (%words.cnt;)*                               >
+<!ATTLIST organization
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Book Change History             -->
+<!ELEMENT bookchangehistory
+                        ((%reviewed;)*, (%edited;)*, (%tested;)*, 
+                         (%approved;)*, (%bookevent;)*)              >
+<!ATTLIST bookchangehistory
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Book ID                         -->
+<!ELEMENT bookid        ((%bookpartno;)*, (%edition;)?, (%isbn;)?, 
+                         (%booknumber;)?, (%volume;)*, 
+                         (%maintainer;)?)                            >
+<!ATTLIST bookid
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Summary                         -->
+<!ELEMENT summary       (%words.cnt;)*                               >
+<!ATTLIST summary
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Print Location                  -->
+<!ELEMENT printlocation (%words.cnt;)*                               >
+<!ATTLIST printlocation
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Published                       -->
+<!ELEMENT published     (((%person;) | (%organization;))*,
+                         (%publishtype;)?, (%revisionid;)?,
+                         (%started;)?, (%completed;)?, (%summary;)?, 
+                         (%data;)*)                                  >
+<!ATTLIST published
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Publish Type                    -->
+<!ELEMENT publishtype   EMPTY                                        >
+<!ATTLIST publishtype
+             %univ-atts;
+             name       CDATA                            #IMPLIED
+             datatype   CDATA                            #IMPLIED
+             href       CDATA                            #IMPLIED
+             format     CDATA                            #IMPLIED
+             type       CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass
+                        CDATA                            #IMPLIED
+             value      (beta|limited|general)           #REQUIRED   >
+             
+<!--                    LONG NAME: Revision ID                     -->
+<!ELEMENT revisionid    (#PCDATA)*>
+<!ATTLIST revisionid
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Start Date                      -->
+<!ELEMENT started       ( ((%year;), ((%month;), (%day;)?)?) | 
+                          ((%month;), (%day;)?, (%year;)) | 
+                          ((%day;), (%month;), (%year;)))            >
+<!ATTLIST started         
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Completion Date                 -->
+<!ELEMENT completed     ( ((%year;), ((%month;), (%day;)?)?) | 
+                          ((%month;), (%day;)?, (%year;)) | 
+                          ((%day;), (%month;), (%year;)))            >
+<!ATTLIST completed       
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Year                            -->
+<!ELEMENT year          (#PCDATA)*                                   >
+<!ATTLIST year
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Month                           -->
+<!ELEMENT month         (#PCDATA)*                                   >
+<!ATTLIST month
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Day                             -->
+<!ELEMENT day           (#PCDATA)*                                   >
+<!ATTLIST day
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Reviewed                        -->
+<!ELEMENT reviewed      (((%person;) | (%organization;))*, 
+                         (%revisionid;)?, (%started;)?, 
+                         (%completed;)?, (%summary;)?, (%data;)*)    >
+<!ATTLIST reviewed
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Editeded                        -->
+<!ELEMENT edited        (((%person;) | (%organization;))*, 
+                         (%revisionid;)?, (%started;)?, 
+                         (%completed;)?, (%summary;)?, (%data;)*)    >
+<!ATTLIST edited
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Tested                          -->
+<!ELEMENT tested        (((%person;) | (%organization;))*, 
+                         (%revisionid;)?, (%started;)?,
+                         (%completed;)?, (%summary;)?, (%data;)*)    >
+<!ATTLIST tested
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Approved                        -->
+<!ELEMENT approved      (((%person;) | (%organization;))*,
+                         (%revisionid;)?, (%started;)?, 
+                         (%completed;)?, (%summary;)?, (%data;)*)    >
+<!ATTLIST approved
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Book Event                      -->
+<!ELEMENT bookevent     ((%bookeventtype;)?, 
+                         ((%person;) | (%organization;))*,
+                         (%revisionid;)?, (%started;)?, 
+                         (%completed;)?, (%summary;)?, (%data;)*)    >
+<!ATTLIST bookevent 
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Book Event Type                 -->
+<!ELEMENT bookeventtype EMPTY                                        >
+<!-- Attributes are the same as on <data> except that @name is required -->
+<!ATTLIST bookeventtype 
+             %univ-atts;
+             datatype   CDATA                            #IMPLIED
+             value      CDATA                            #IMPLIED
+             href       CDATA                            #IMPLIED
+             format     CDATA                            #IMPLIED
+             type       CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass
+                        CDATA                            #IMPLIED
+             name       CDATA                            #REQUIRED   >
+
+<!--                    LONG NAME: Book Part Number                -->
+<!ELEMENT bookpartno    (%words.cnt;)*                               >
+<!ATTLIST bookpartno
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Edition                         -->
+<!ELEMENT edition       (#PCDATA)*                                   >
+<!ATTLIST edition
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: ISBN Number                     -->
+<!ELEMENT isbn          (#PCDATA)*                                   >
+<!ATTLIST isbn    
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Book Number                     -->
+<!ELEMENT booknumber    (%words.cnt;)*                               >
+<!ATTLIST booknumber   
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Volume                          -->
+<!ELEMENT volume        (#PCDATA)*                                   >
+<!ATTLIST volume
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Maintainer                      -->
+<!ELEMENT maintainer    (((%person;) | (%organization;))*, (%data;)*)>
+<!ATTLIST maintainer
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Book Rights                     -->
+<!ELEMENT bookrights    ((%copyrfirst;)?, (%copyrlast;)?,
+                         (%bookowner;), (%bookrestriction;)?, 
+                         (%summary;)?)                               >
+<!ATTLIST bookrights
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: First Copyright                 -->
+<!ELEMENT copyrfirst    (%year;)                                     >
+<!ATTLIST copyrfirst
+             %data-element-atts;                                     >
+                        
+<!--                    LONG NAME: Last Copyright                  -->
+<!ELEMENT copyrlast     (%year;)                                     >
+<!ATTLIST copyrlast
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Book Owner                      -->
+<!ELEMENT bookowner     ((%person;) | (%organization;))*             >
+<!ATTLIST bookowner 
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Book Restriction                -->
+<!ELEMENT bookrestriction   EMPTY                                        >
+<!-- Same attributes as data, except for @value -->
+<!ATTLIST bookrestriction
+             %univ-atts;
+             name       CDATA                            #IMPLIED
+             datatype   CDATA                            #IMPLIED
+             href       CDATA                            #IMPLIED
+             format     CDATA                            #IMPLIED
+             type       CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass
+                        CDATA                            #IMPLIED
+             value      (confidential|restricted|licensed|unclassified) #REQUIRED>
+
+<!--                    LONG NAME: Book Title                      -->
+<!ELEMENT booktitle     ((%booklibrary;)?,(%mainbooktitle;),
+                         (%booktitlealt;)*)                          >
+<!ATTLIST booktitle
+             %id-atts;
+             %localization-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!-- The following three elements are specialized from <ph>. They are
+     titles, which have a more limited content model than phrases. The
+     content model here matches title.cnt; that entity is not reused
+     in case it is expanded in the future to include something not
+     allowed in a phrase.                                          -->
+<!--                    LONG NAME: Library Title                   -->
+<!ELEMENT booklibrary   (#PCDATA | %basic.ph.noxref; | %image;)*     >  
+<!ATTLIST booklibrary              
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Main Book Title                 -->
+<!ELEMENT mainbooktitle (#PCDATA | %basic.ph.noxref; | %image;)*     >
+<!ATTLIST mainbooktitle              
+             keyref     CDATA                           #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                           #IMPLIED     >
+                        
+<!--                    LONG NAME: Alternate Book Title            -->
+<!ELEMENT booktitlealt  (#PCDATA | %basic.ph.noxref; | %image;)*     >
+<!ATTLIST booktitlealt              
+             keyref     CDATA                           #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                           #IMPLIED     >
+
+<!--                    LONG NAME: Draft Introduction              -->
+<!ELEMENT draftintro    ((%topicmeta;)?, (%topicref;)*)              >
+<!ATTLIST draftintro
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Book Abstract                   -->
+<!ELEMENT bookabstract  EMPTY                                        >
+<!ATTLIST bookabstract
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Dedication                      -->
+<!ELEMENT dedication    EMPTY                                        >
+<!ATTLIST dedication
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Preface                         -->
+<!ELEMENT preface       ((%topicmeta;)?, (%topicref;)*)              >
+<!ATTLIST preface
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Chapter                         -->
+<!ELEMENT chapter       ((%topicmeta;)?, (%topicref;)*)              >
+<!ATTLIST chapter
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Part                            -->
+<!ELEMENT part          ((%topicmeta;)?,
+                         ((%topicref;) | (%chapter;))* )             >
+<!ATTLIST part
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Appendix                        -->
+<!ELEMENT appendix      ((%topicmeta;)?, (%topicref;)*)              >
+<!ATTLIST appendix
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Notices                         -->
+<!ELEMENT notices       ((%topicmeta;)?, (%topicref;)*)              >
+<!ATTLIST notices
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Amendments                      -->
+<!ELEMENT amendments    EMPTY                                        >
+<!ATTLIST amendments
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Colophon                        -->
+<!ELEMENT colophon      EMPTY                                        >
+<!ATTLIST colophon
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Book Lists                      -->
+<!ELEMENT booklists     ((%toc;) |
+                         (%figurelist;) |
+                         (%tablelist;) |
+                         (%abbrevlist;) |
+                         (%trademarklist;) |
+                         (%bibliolist;) |
+                         (%glossarylist;) |
+                         (%indexlist;) |
+                         (%booklist;))*                              >
+<!ATTLIST booklists
+             keyref     CDATA                             #IMPLIED
+             %topicref-atts;
+             %id-atts;
+             %select-atts;
+             %localization-atts;                                     >
+
+<!--                    LONG NAME: Table of Contents               -->
+<!ELEMENT toc           EMPTY                                        >
+<!ATTLIST toc
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Figure List                     -->
+<!ELEMENT figurelist    EMPTY                                        >
+<!ATTLIST figurelist
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Table List                      -->
+<!ELEMENT tablelist     EMPTY                                        >
+<!ATTLIST tablelist
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Abbreviation List               -->
+<!ELEMENT abbrevlist    EMPTY                                        >
+<!ATTLIST abbrevlist
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Trademark List                  -->
+<!ELEMENT trademarklist EMPTY                                        >
+<!ATTLIST trademarklist
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Bibliography List               -->
+<!ELEMENT bibliolist    EMPTY                                        >
+<!ATTLIST bibliolist
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Glossary List                   -->
+<!ELEMENT glossarylist  ((%topicmeta;)?, (%topicref;)*)              >
+<!ATTLIST glossarylist
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Index List                      -->
+<!ELEMENT indexlist     EMPTY                                        >
+<!ATTLIST indexlist
+             %chapter-atts;                                          >
+
+<!--                    LONG NAME: Book List                       -->
+<!ELEMENT booklist      EMPTY                                        >
+<!ATTLIST booklist
+             %chapter-atts;                                          >
+
+                     
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ATTLIST bookmap     %global-atts; class CDATA "- map/map bookmap/bookmap ">
+<!ATTLIST abbrevlist  %global-atts; class CDATA "- map/topicref bookmap/abbrevlist ">
+<!ATTLIST amendments  %global-atts; class CDATA "- map/topicref bookmap/amendments ">
+<!ATTLIST appendix    %global-atts; class CDATA "- map/topicref bookmap/appendix ">
+<!ATTLIST approved    %global-atts; class CDATA "- topic/data bookmap/approved ">
+<!ATTLIST backmatter  %global-atts; class CDATA "- map/topicref bookmap/backmatter ">
+<!ATTLIST bibliolist  %global-atts; class CDATA "- map/topicref bookmap/bibliolist ">
+<!ATTLIST bookabstract %global-atts; class CDATA "- map/topicref bookmap/bookabstract ">
+<!ATTLIST bookchangehistory %global-atts; class CDATA "- topic/data bookmap/bookchangehistory ">
+<!ATTLIST bookevent   %global-atts; class CDATA "- topic/data bookmap/bookevent ">
+<!ATTLIST bookeventtype %global-atts; class CDATA "- topic/data bookmap/bookeventtype ">
+<!ATTLIST bookid      %global-atts; class CDATA "- topic/data bookmap/bookid ">
+<!ATTLIST booklibrary %global-atts;  class CDATA "- topic/ph bookmap/booklibrary ">
+<!ATTLIST booklist    %global-atts; class CDATA "- map/topicref bookmap/booklist ">
+<!ATTLIST booklists   %global-atts; class CDATA "- map/topicref bookmap/booklists ">
+<!ATTLIST bookmeta    %global-atts; class CDATA "- map/topicmeta bookmap/bookmeta ">
+<!ATTLIST booknumber  %global-atts; class CDATA "- topic/data bookmap/booknumber ">
+<!ATTLIST bookowner   %global-atts; class CDATA "- topic/data bookmap/bookowner ">
+<!ATTLIST bookpartno  %global-atts; class CDATA "- topic/data bookmap/bookpartno ">
+<!ATTLIST bookrestriction %global-atts; class CDATA "- topic/data bookmap/bookrestriction ">
+<!ATTLIST bookrights  %global-atts; class CDATA "- topic/data bookmap/bookrights ">
+<!ATTLIST booktitle   %global-atts;  class CDATA "- topic/title bookmap/booktitle ">
+<!ATTLIST booktitlealt %global-atts;  class CDATA "- topic/ph bookmap/booktitlealt ">
+<!ATTLIST chapter     %global-atts; class CDATA "- map/topicref bookmap/chapter ">
+<!ATTLIST colophon    %global-atts; class CDATA "- map/topicref bookmap/colophon ">
+<!ATTLIST completed   %global-atts; class CDATA "- topic/ph bookmap/completed ">
+<!ATTLIST copyrfirst  %global-atts; class CDATA "- topic/data bookmap/copyrfirst ">
+<!ATTLIST copyrlast   %global-atts; class CDATA "- topic/data bookmap/copyrlast ">
+<!ATTLIST day         %global-atts; class CDATA "- topic/ph bookmap/day ">
+<!ATTLIST dedication  %global-atts; class CDATA "- map/topicref bookmap/dedication ">
+<!ATTLIST draftintro  %global-atts; class CDATA "- map/topicref bookmap/draftintro ">
+<!ATTLIST edited      %global-atts; class CDATA "- topic/data bookmap/edited ">
+<!ATTLIST edition     %global-atts; class CDATA "- topic/data bookmap/edition ">
+<!ATTLIST figurelist  %global-atts; class CDATA "- map/topicref bookmap/figurelist ">
+<!ATTLIST frontmatter %global-atts; class CDATA "- map/topicref bookmap/frontmatter ">
+<!ATTLIST glossarylist %global-atts; class CDATA "- map/topicref bookmap/glossarylist ">
+<!ATTLIST indexlist   %global-atts; class CDATA "- map/topicref bookmap/indexlist ">
+<!ATTLIST isbn        %global-atts; class CDATA "- topic/data bookmap/isbn ">
+<!ATTLIST mainbooktitle %global-atts;  class CDATA "- topic/ph bookmap/mainbooktitle ">
+<!ATTLIST maintainer  %global-atts; class CDATA "- topic/data bookmap/maintainer ">
+<!ATTLIST month       %global-atts; class CDATA "- topic/ph bookmap/month ">
+<!ATTLIST notices     %global-atts; class CDATA "- map/topicref bookmap/notices ">
+<!ATTLIST organization %global-atts; class CDATA "- topic/data bookmap/organization ">
+<!ATTLIST part        %global-atts; class CDATA "- map/topicref bookmap/part ">
+<!ATTLIST person      %global-atts; class CDATA "- topic/data bookmap/person ">
+<!ATTLIST preface     %global-atts; class CDATA "- map/topicref bookmap/preface ">
+<!ATTLIST printlocation %global-atts; class CDATA "- topic/data bookmap/printlocation ">
+<!ATTLIST published   %global-atts; class CDATA "- topic/data bookmap/published ">
+<!ATTLIST publisherinformation %global-atts; class CDATA "- topic/publisher bookmap/publisherinformation ">
+<!ATTLIST publishtype %global-atts; class CDATA "- topic/data bookmap/publishtype ">
+<!ATTLIST reviewed    %global-atts; class CDATA "- topic/data bookmap/reviewed ">
+<!ATTLIST revisionid  %global-atts; class CDATA "- topic/ph bookmap/revisionid ">
+<!ATTLIST started     %global-atts; class CDATA "- topic/ph bookmap/started ">
+<!ATTLIST summary     %global-atts; class CDATA "- topic/ph bookmap/summary ">
+<!ATTLIST tablelist   %global-atts; class CDATA "- map/topicref bookmap/tablelist ">
+<!ATTLIST tested      %global-atts; class CDATA "- topic/data bookmap/tested ">
+<!ATTLIST toc         %global-atts; class CDATA "- map/topicref bookmap/toc ">
+<!ATTLIST trademarklist %global-atts; class CDATA "- map/topicref bookmap/trademarklist ">
+<!ATTLIST volume      %global-atts; class CDATA "- topic/data bookmap/volume ">
+<!ATTLIST year        %global-atts; class CDATA "- topic/ph bookmap/year ">
+
+
+
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.ent
new file mode 100644
index 000000000000..23e13de7584d
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.ent
@@ -0,0 +1,128 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Common Element Entities                      -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+PUBLIC"-//OASIS//ENTITIES DITA Common Elements//EN"
+      Delivered as file "commonElements.ent"                       -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the definitions for elements used in    -->
+<!--             both maps and topics                              -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             June 2006                                         -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT NAME ENTITIES                      -->
+<!-- ============================================================= -->
+
+<!--                    Elements in commonElements.mod             -->
+<!ENTITY % alt          "alt"                                        >
+<!ENTITY % boolean      "boolean"                                    >
+<!ENTITY % cite         "cite"                                       >
+<!ENTITY % data         "data"                                       >
+<!ENTITY % data-about   "data-about"                                 >
+<!ENTITY % dd           "dd"                                         >
+<!ENTITY % ddhd         "ddhd"                                       >
+<!ENTITY % desc         "desc"                                       >
+<!ENTITY % dl           "dl"                                         >
+<!ENTITY % dlentry      "dlentry"                                    >
+<!ENTITY % dlhead       "dlhead"                                     >
+<!ENTITY % draft-comment 
+                        "draft-comment"                              >
+<!ENTITY % dt           "dt"                                         >
+<!ENTITY % dthd         "dthd"                                       >
+<!ENTITY % fig          "fig"                                        >
+<!ENTITY % figgroup     "figgroup"                                   >
+<!ENTITY % fn           "fn"                                         >
+<!ENTITY % foreign      "foreign"                                    >
+<!ENTITY % image        "image"                                      >
+<!ENTITY % indexterm    "indexterm"                                  >
+<!ENTITY % index-base   "index-base"                                 >
+<!ENTITY % indextermref "indextermref"                               >
+<!ENTITY % itemgroup    "itemgroup"                                  >
+<!ENTITY % keyword      "keyword"                                    >
+<!ENTITY % li           "li"                                         >
+<!ENTITY % lines        "lines"                                      >
+<!ENTITY % lq           "lq"                                         >
+<!ENTITY % note         "note"                                       >
+<!ENTITY % object       "object"                                     >
+<!ENTITY % ol           "ol"                                         >
+<!ENTITY % p            "p"                                          > 
+<!ENTITY % param        "param"                                      >
+<!ENTITY % ph           "ph"                                         >
+<!ENTITY % pre          "pre"                                        >
+<!ENTITY % q            "q"                                          >
+<!ENTITY % required-cleanup     
+                        "required-cleanup"                           >
+<!ENTITY % sl           "sl"                                         > 
+<!ENTITY % sli          "sli"                                        >
+<!ENTITY % simpletable  "simpletable"                                >
+<!ENTITY % state        "state"                                      >
+<!ENTITY % stentry      "stentry"                                    >
+<!ENTITY % sthead       "sthead"                                     >
+<!ENTITY % strow        "strow"                                      >
+<!ENTITY % term         "term"                                       >
+<!ENTITY % title        "title"                                      >
+<!ENTITY % tm           "tm"                                         >
+<!ENTITY % ul           "ul"                                         >
+<!ENTITY % unknown      "unknown"                                    >
+<!ENTITY % xref         "xref"                                       >
+
+<!--                    Elements in tblDecl.mod                    -->
+<!ENTITY % table        "table"                                      >
+<!ENTITY % colspec      "colspec"                                    >
+<!ENTITY % entry        "entry"                                      >
+<!ENTITY % row          "row"                                        >
+<!ENTITY % tbody        "tbody"                                      >
+<!ENTITY % tgroup       "tgroup"                                     >
+<!ENTITY % thead        "thead"                                      >
+
+<!--                    Elements in metaDecl.mod                   -->
+<!ENTITY % audience     "audience"                                   >
+<!ENTITY % author       "author"                                     >
+<!ENTITY % brand        "brand"                                      >
+<!ENTITY % category     "category"                                   >
+<!ENTITY % component    "component"                                  >
+<!ENTITY % copyrholder  "copyrholder"                                >
+<!ENTITY % copyright    "copyright"                                  >
+<!ENTITY % copyryear    "copyryear"                                  >
+<!ENTITY % created      "created"                                    >
+<!ENTITY % critdates    "critdates"                                  >
+<!ENTITY % featnum      "featnum"                                    >
+<!ENTITY % keywords     "keywords"                                   >
+<!ENTITY % othermeta    "othermeta"                                  >
+<!ENTITY % permissions  "permissions"                                >
+<!ENTITY % platform     "platform"                                   >
+<!ENTITY % prodinfo     "prodinfo"                                   >
+<!ENTITY % prodname     "prodname"                                   >
+<!ENTITY % prognum      "prognum"                                    >
+<!ENTITY % publisher    "publisher"                                  >
+<!ENTITY % resourceid   "resourceid"                                 >
+<!ENTITY % revised      "revised"                                    >
+<!ENTITY % series       "series"                                     >
+<!ENTITY % source       "source"                                     >
+<!ENTITY % vrm          "vrm"                                        >
+<!ENTITY % vrmlist      "vrmlist"                                    >
+
+<!-- ================== End Common Element Entities ============== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.ent.rnc
new file mode 100644
index 000000000000..a94a749bf7b3
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.ent.rnc
@@ -0,0 +1,144 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Common Element Entities
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+# PUBLIC"-//OASIS//ENTITIES DITA Common Elements//EN"
+#       Delivered as file "commonElements.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the definitions for elements used in
+
+# both maps and topics
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# June 2006
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+# Elements in commonElements.mod
+
+alt = alt.element
+boolean = boolean.element
+cite = cite.element
+data = data.element
+data-about = data-about.element
+dd = dd.element
+ddhd = ddhd.element
+desc = desc.element
+dlentry = dlentry.element
+dlhead = dlhead.element
+draft-comment = draft-comment.element
+dt = dt.element
+dthd = dthd.element
+figgroup = figgroup.element
+fn = fn.element
+foreign = foreign.element
+image = image.element
+indexterm = indexterm.element
+indextermref = indextermref.element
+itemgroup = itemgroup.element
+li = li.element
+lines = lines.element
+lq = lq.element
+note = note.element
+object = object.element
+ol = ol.element
+p = p.element
+param = param.element
+q = q.element
+required-cleanup = required-cleanup.element
+sl = sl.element
+sli = sli.element
+simpletable = simpletable.element
+state = state.element
+stentry = stentry.element
+sthead = sthead.element
+strow = strow.element
+term = term.element
+title = title.element
+tm = tm.element
+ul = ul.element
+unknown = unknown.element
+xref = xref.element
+# Elements in tblDecl.mod
+table = table.element
+colspec = colspec.element
+entry = entry.element
+row = row.element
+tbody = tbody.element
+tgroup = tgroup.element
+thead = thead.element
+# Elements in metaDecl.mod
+audience = audience.element
+author = author.element
+brand = brand.element
+category = category.element
+component = component.element
+copyrholder = copyrholder.element
+copyright = copyright.element
+copyryear = copyryear.element
+created = created.element
+critdates = critdates.element
+featnum = featnum.element
+keywords = keywords.element
+othermeta = othermeta.element
+permissions = permissions.element
+platform = platform.element
+prodinfo = prodinfo.element
+prodname = prodname.element
+prognum = prognum.element
+publisher = publisher.element
+resourceid = resourceid.element
+revised = revised.element
+series = series.element
+source = source.element
+vrm = vrm.element
+vrmlist = vrmlist.element
+# ================== End Common Element Entities ==============
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.mod
new file mode 100644
index 000000000000..66ffdb07777a
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.mod
@@ -0,0 +1,764 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Common Elements                              -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Common Elements//EN"
+      Delivered as file "commonElements.mod"                       -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for content elements used in both      -->
+<!--             topics and maps.                                  -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             June 2006                                         -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2006.06.06 RDA: Add data element                           -->
+<!--    2006.06.07 RDA: Add @scale to image                        -->
+<!--    2006.06.07 RDA: Add index-base element                     -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!--    2006.06.07 RDA: Add unknown element                        -->
+<!--    2006.06.14 RDA: Add dir attribute to localization-atts     -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT NAME ENTITIES                      -->
+<!-- ============================================================= -->
+
+<!ENTITY % commonDefns   PUBLIC 
+                       "-//OASIS//ENTITIES DITA Common Elements//EN" 
+                       "commonElements.ent"                          >
+%commonDefns;
+
+<!-- ============================================================= -->
+<!--                    COMMON ATTLIST SETS                        -->
+<!-- ============================================================= -->
+
+
+<!--                   Phrase/inline elements of various classes   -->
+<!ENTITY % basic.ph    "%ph; | %term; | %xref; | %cite; | %q; |
+                        %boolean; | %state; | %keyword; | %tm;"      >
+
+<!--                   Elements common to most body-like contexts  -->
+<!ENTITY % basic.block "%p; | %lq; | %note; | %dl; | %ul; | %ol;|  
+                        %sl; | %pre; | %lines; | %fig; | %image; | 
+                        %object; |  %table; | %simpletable;">
+
+<!-- class groupings to preserve in a schema -->
+
+<!ENTITY % basic.phandblock     "%basic.ph; | %basic.block;"         >
+
+
+<!-- Exclusions: models modified by removing excluded content      -->
+<!ENTITY % basic.ph.noxref
+                      "%ph;|%term;|              %q;|%boolean;|%state;|%keyword;|%tm;">
+<!ENTITY % basic.ph.notm
+                      "%ph;|%term;|%xref;|%cite;|%q;|%boolean;|%state;|%keyword;     ">
+
+
+<!ENTITY % basic.block.notbl
+                      "%p;|%lq;|%note;|%dl;|%ul;|%ol;|%sl;|%pre;|%lines;|%fig;|%image;|%object;">
+<!ENTITY % basic.block.nonote
+                      "%p;|%lq;|       %dl;|%ul;|%ol;|%sl;|%pre;|%lines;|%fig;|%image;|%object;|%table;|%simpletable;">
+<!ENTITY % basic.block.nopara
+                      "    %lq;|%note;|%dl;|%ul;|%ol;|%sl;|%pre;|%lines;|%fig;|%image;|%object;|%table;|%simpletable;">
+<!ENTITY % basic.block.nolq
+                      "%p;|     %note;|%dl;|%ul;|%ol;|%sl;|%pre;|%lines;|%fig;|%image;|%object;|%table;|%simpletable;">
+<!ENTITY % basic.block.notbnofg
+                      "%p;|%lq;|%note;|%dl;|%ul;|%ol;|%sl;|%pre;|%lines;|      %image;|%object;">
+<!ENTITY % basic.block.notbfgobj
+                      "%p;|%lq;|%note;|%dl;|%ul;|%ol;|%sl;|%pre;|%lines;|      %image;">
+
+
+<!-- Inclusions: defined sets that can be added into appropriate models -->
+<!ENTITY % txt.incl             '%draft-comment;|%required-cleanup;|%fn;|%indextermref;|%indexterm;'>
+
+<!-- Metadata elements intended for specialization -->
+<!ENTITY % data.elements.incl   "%data;|%data-about;"                >
+<!ENTITY % foreign.unknown.incl "%foreign;|%unknown;"                >
+
+<!-- Predefined content model groups, based on the previous, element-only categories: -->
+<!-- txt.incl is appropriate for any mixed content definitions (those that have PCDATA) -->
+<!-- the context for blocks is implicitly an InfoMaster "containing_division" -->
+<!ENTITY % listitem.cnt         "#PCDATA | %basic.ph; | %basic.block; |%itemgroup;| %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % itemgroup.cnt        "#PCDATA | %basic.ph; | %basic.block; |             %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % title.cnt            "#PCDATA | %basic.ph.noxref; | %image; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % xreftext.cnt         "#PCDATA | %basic.ph.noxref; | %image; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % xrefph.cnt           "#PCDATA | %basic.ph.noxref; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % shortquote.cnt       "#PCDATA | %basic.ph; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % para.cnt             "#PCDATA | %basic.ph; | %basic.block.nopara; | %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % note.cnt             "#PCDATA | %basic.ph; | %basic.block.nonote; | %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % longquote.cnt        "#PCDATA | %basic.ph; | %basic.block.nolq;   | %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % tblcell.cnt          "#PCDATA | %basic.ph; | %basic.block.notbl;  | %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % desc.cnt             "#PCDATA | %basic.ph; | %basic.block.notbfgobj; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % ph.cnt               "#PCDATA | %basic.ph; | %image;              | %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % fn.cnt               "#PCDATA | %basic.ph; | %basic.block.notbl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % term.cnt             "#PCDATA | %basic.ph; | %image; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % defn.cnt             "#PCDATA | %basic.ph; | %basic.block; |%itemgroup;| %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % pre.cnt              "#PCDATA | %basic.ph; | %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % fig.cnt              "%basic.block.notbnofg; | %simpletable; | %xref; | %fn;| %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % words.cnt            "#PCDATA | %keyword; | %term; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % data.cnt             "%words.cnt;|%image;|%object;|%ph;|%title;">
+
+<!-- ============================================================= -->
+<!--                    COMMON ATTLIST SETS                        -->
+<!-- ============================================================= -->
+
+<!-- Copied into metaDecl.mod -->
+<!--<!ENTITY % date-format 'CDATA'                                       >-->
+
+<!ENTITY % display-atts  
+            'scale     (50|60|70|80|90|100|110|120|140|160|
+                        180|200)                           #IMPLIED
+             frame     (top | bottom |topbot | all | 
+                        sides | none)                      #IMPLIED
+             expanse   (page | column | textline)          #IMPLIED' >
+
+<!-- Provide a default of no attribute extensions -->
+<!ENTITY % props-attribute-extensions " ">
+<!ENTITY % base-attribute-extensions  " ">
+
+<!ENTITY % filter-atts
+            'props      CDATA                              #IMPLIED
+             base       CDATA                              #IMPLIED
+             platform   CDATA                              #IMPLIED
+             product    CDATA                              #IMPLIED
+             audience   CDATA                              #IMPLIED
+             otherprops CDATA                              #IMPLIED
+             %props-attribute-extensions;
+             %base-attribute-extensions;                           ' >
+
+<!ENTITY % select-atts   
+            '%filter-atts;
+             importance 
+                       (obsolete | deprecated | optional | 
+                        default | low | normal | high | 
+                        recommended | required | urgent )  #IMPLIED
+             rev        CDATA                              #IMPLIED
+             status    (new | changed | deleted | 
+                        unchanged)                         #IMPLIED' >
+
+<!ENTITY % id-atts  
+            'id         NMTOKEN                            #IMPLIED
+             conref     CDATA                              #IMPLIED' >
+
+<!-- Attributes related to localization that are used everywhere   -->
+<!ENTITY % localization-atts  
+            'translate (yes | no)                          #IMPLIED
+             xml:lang   NMTOKEN                            #IMPLIED
+             dir       (ltr | rtl | lro | rlo)             #IMPLIED' >
+<!-- The following entity should be used when defaulting a new
+     element to translate="no", so that other (or new) localization
+     attributes will always be included.   -->
+<!ENTITY % localization-atts-translate-no  
+            'translate (yes | no)                          "no"
+             xml:lang   NMTOKEN                            #IMPLIED
+             dir       (ltr | rtl | lro | rlo)             #IMPLIED' >
+             
+<!ENTITY % univ-atts     
+            '%id-atts;
+             %select-atts;
+             %localization-atts;' >
+<!ENTITY % univ-atts-translate-no     
+            '%id-atts;
+             %select-atts;
+             %localization-atts-translate-no;' >
+
+<!ENTITY % global-atts    
+            'xtrc       CDATA                              #IMPLIED
+             xtrf       CDATA                              #IMPLIED'>
+             
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+<!--                    LONG NAME: Data About                      -->
+<!ELEMENT data-about  ((%data;), (%data;|%data-about;)*)>
+<!ATTLIST data-about  %univ-atts;
+             href       CDATA                            #IMPLIED
+             format     CDATA                            #IMPLIED
+             type       CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!ENTITY % data-element-atts
+            '%univ-atts;
+             name       CDATA                            #IMPLIED
+             datatype   CDATA                            #IMPLIED
+             value      CDATA                            #IMPLIED
+             href       CDATA                            #IMPLIED
+             format     CDATA                            #IMPLIED
+             type       CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass
+                        CDATA                            #IMPLIED'   >
+             
+<!--                    LONG NAME: Data element                    -->
+<!ELEMENT data    (%data.cnt;)*>
+<!ATTLIST data    %data-element-atts;                                >
+
+<!--                    LONG NAME: Unknown element                 -->
+<!ELEMENT unknown ANY>
+<!ATTLIST unknown
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Foreign content element         -->
+<!ELEMENT foreign ANY>
+<!ATTLIST foreign
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Title                           -->
+<!--                    This is referenced inside CALS table       -->
+<!ELEMENT title         (%title.cnt;)*                               > 
+<!ATTLIST title         
+             %id-atts;
+             %localization-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Short Description               -->
+<!ELEMENT shortdesc     (%title.cnt;)*                               >
+<!ATTLIST shortdesc    
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Description                     -->
+<!--                    Desc is used in context with figure and 
+                        table titles and also for content models 
+                        within linkgroup and object (for 
+                        accessibility)                             -->
+<!ELEMENT desc          (%desc.cnt;)*                                >
+<!ATTLIST desc           
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!-- ============================================================= -->
+<!--                    BASIC DOCUMENT ELEMENT DECLARATIONS        -->
+<!--                    (rich text)                                -->
+<!-- ============================================================= -->
+
+<!--                    LONG NAME: Paragraph                       -->
+<!ELEMENT p             (%para.cnt;)*                                >
+<!ATTLIST p              
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Note                            -->
+<!ELEMENT note          (%note.cnt;)*                                >
+<!ATTLIST note            
+             type       (note | tip | fastpath | restriction |
+                         important | remember| attention|
+                         caution | danger| other)        #IMPLIED             
+             spectitle  CDATA                            #IMPLIED
+             othertype  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Long Quote (Excerpt)            -->
+<!ELEMENT lq            (%longquote.cnt;)*                           >
+<!ATTLIST lq              
+             href       CDATA                           #IMPLIED
+             keyref     CDATA                           #IMPLIED
+             type       (external | internal | 
+                         bibliographic)                 #IMPLIED
+             reftitle   CDATA                           #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Quoted text                     -->
+<!ELEMENT q             (%shortquote.cnt;)*                          >
+<!ATTLIST q              
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Simple List                     -->
+<!ELEMENT sl            (%sli;)+                                     >
+<!ATTLIST sl            
+             compact    (yes | no)                       #IMPLIED
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Simple List Item                -->
+<!ELEMENT sli           (%ph.cnt;)*                                  >
+<!ATTLIST sli             
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Unordered List                  -->
+<!ELEMENT ul            (%li;)+                                      >
+<!ATTLIST ul            
+             compact    (yes | no)                       #IMPLIED
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Ordered List                    -->
+<!ELEMENT ol            (%li;)+                                      >
+<!ATTLIST ol              
+             compact    (yes | no)                       #IMPLIED
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: List Item                       -->
+<!ELEMENT li            (%listitem.cnt;)*                            >
+<!ATTLIST li             
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Item Group                      -->
+<!ELEMENT itemgroup     (%itemgroup.cnt;)*                           >
+<!ATTLIST itemgroup       
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Definition List                 -->
+<!ELEMENT dl            ((%dlhead;)?, (%dlentry;)+)                  >
+<!ATTLIST dl              
+             compact    (yes | no)                       #IMPLIED
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Definition List Head            -->
+<!ELEMENT dlhead        ((%dthd;)?, (%ddhd;)? )                      >
+<!ATTLIST dlhead        
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Term Header                     -->
+<!ELEMENT dthd          (%title.cnt;)*                               >
+<!ATTLIST dthd           
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Definition Header               -->
+<!ELEMENT ddhd          (%title.cnt;)*                               >
+<!ATTLIST ddhd           
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Definition List Entry           -->
+<!ELEMENT dlentry       ((%dt;)+, (%dd;)+ )                          >
+<!ATTLIST dlentry       
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+
+<!--                    LONG NAME: Definition Term                 -->  
+<!ELEMENT dt            (%term.cnt;)*                                >
+<!ATTLIST dt            
+             keyref     CDATA                           #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Definition Description          -->
+<!ELEMENT dd            (%defn.cnt;)*                                >
+<!ATTLIST dd           
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Figure                          -->
+<!ELEMENT fig           ((%title;)?, (%desc;)?, 
+                         (%figgroup; | %fig.cnt;)* )                 >
+<!ATTLIST fig          
+             %display-atts;
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Figure Group                    -->
+<!ELEMENT figgroup      ((%title;)?, 
+                         (%figgroup; | %xref; | %fn; | %ph; | 
+                          %keyword;)* )                              >
+<!ATTLIST figgroup     
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Preformatted Text               -->
+<!ELEMENT pre           (%pre.cnt;)*                                 >                                
+<!ATTLIST pre          
+             %display-atts;
+             spectitle  CDATA                            #IMPLIED
+             xml:space  (preserve)               #FIXED 'preserve'
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Line Respecting Text            -->
+<!ELEMENT lines         (%pre.cnt;)*                                 >
+<!ATTLIST lines           
+             %display-atts;
+             spectitle  CDATA                            #IMPLIED
+             xml:space  (preserve)               #FIXED 'preserve'
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!-- ============================================================= -->
+<!--                   BASE FORM PHRASE TYPES                      -->
+<!-- ============================================================= -->
+
+<!--                    LONG NAME: Keyword                         -->
+<!ELEMENT keyword       (#PCDATA | %tm;)*                            >
+<!ATTLIST keyword       
+             keyref     CDATA                           #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                           #IMPLIED     >
+
+
+<!--                    LONG NAME: Term                            -->
+<!ELEMENT term          (#PCDATA | %tm;)*                            >
+<!ATTLIST term          
+             keyref     CDATA                           #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Phrase                          -->
+<!ELEMENT ph            (%ph.cnt;)*                                  >  
+<!ATTLIST ph              
+             keyref     CDATA                           #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Trade Mark                      -->
+<!ELEMENT tm            (#PCDATA | %tm;)*                            >
+<!ATTLIST tm
+             %univ-atts;
+             trademark  CDATA                           #IMPLIED
+             tmowner    CDATA                           #IMPLIED
+             tmtype     (tm | reg | service)            #REQUIRED
+             tmclass    CDATA                           #IMPLIED     >
+
+
+<!--                    LONG NAME: Boolean  (deprecated)           -->
+<!ELEMENT boolean       EMPTY                                        >
+<!ATTLIST boolean           
+             state      (yes | no)                      #REQUIRED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: State                           -->
+<!--                    A state can have a name and a string value, 
+                        even if empty or indeterminate             -->
+<!ELEMENT state         EMPTY                                        >
+<!ATTLIST state          
+             name       CDATA                            #REQUIRED
+             value      CDATA                            #REQUIRED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Image Data                      -->
+<!ELEMENT image         (%alt;)?                                     >
+<!ATTLIST image           
+             href       CDATA                            #REQUIRED
+             keyref     NMTOKEN                          #IMPLIED
+             alt        CDATA                            #IMPLIED
+             longdescref 
+                        CDATA                            #IMPLIED
+             height     NMTOKEN                          #IMPLIED
+             width      NMTOKEN                          #IMPLIED
+             align      CDATA                            #IMPLIED
+             scale      NMTOKEN                          #IMPLIED
+             placement  (inline|break)                   "inline"
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Alternate text                  -->
+<!ELEMENT alt            (%words.cnt;)*>
+<!ATTLIST alt             %univ-atts;
+                          outputclass CDATA #IMPLIED
+>
+
+<!--                    LONG NAME: Object (Streaming/Executable 
+                                   Data)                           -->
+<!ELEMENT object        ((%desc;)?, (%param;)*, 
+                         (%foreign.unknown.incl;)*)                  >
+<!ATTLIST object
+             declare    (declare)                        #IMPLIED
+             classid    CDATA                            #IMPLIED
+             codebase   CDATA                            #IMPLIED
+             data       CDATA                            #IMPLIED
+             type       CDATA                            #IMPLIED
+             codetype   CDATA                            #IMPLIED
+             archive    CDATA                            #IMPLIED
+             standby    CDATA                            #IMPLIED
+             height     NMTOKEN                          #IMPLIED
+             width      NMTOKEN                          #IMPLIED
+             usemap     CDATA                            #IMPLIED
+             name       CDATA                            #IMPLIED
+             tabindex   NMTOKEN                          #IMPLIED
+             longdescre CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Parameter                       -->
+<!ELEMENT param         EMPTY>
+<!ATTLIST param
+             %univ-atts;
+             name       CDATA                            #REQUIRED
+             value      CDATA                            #IMPLIED
+             valuetype  (data|ref|object)                #IMPLIED
+             type       CDATA                            #IMPLIED    >  
+
+
+<!--                    LONG NAME: Simple Table                    -->
+<!ELEMENT simpletable   ((%sthead;)?, (%strow;)+)                    >
+<!ATTLIST simpletable     
+             relcolwidth 
+                        CDATA                            #IMPLIED
+             keycol     NMTOKEN                          #IMPLIED
+             refcols    NMTOKENS                         #IMPLIED
+             %display-atts;
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Simple Table Head               -->
+<!ELEMENT sthead        (%stentry;)+                                 >
+<!ATTLIST sthead     
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Simple Table Row                -->
+<!ELEMENT strow         (%stentry;)*                                 >
+<!ATTLIST strow        
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Simple Table Cell (entry)       -->
+<!ELEMENT stentry       (%tblcell.cnt;)*                             >
+<!ATTLIST stentry 
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Review Comments Block           -->
+<!ELEMENT draft-comment (#PCDATA | %basic.phandblock; | 
+                         %data.elements.incl; | 
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST draft-comment   
+             author     CDATA                            #IMPLIED
+             time       CDATA                            #IMPLIED
+             disposition  
+                        (issue | open | accepted | rejected |
+                         deferred| duplicate | reopened|
+                         unassigned | completed)         #IMPLIED
+             %univ-atts-translate-no;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Required Cleanup Block          -->
+<!ELEMENT required-cleanup 
+                        ANY                                          >
+<!ATTLIST required-cleanup 
+             remap      CDATA                            #IMPLIED
+             %univ-atts-translate-no;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Footnote                        -->
+<!ELEMENT fn            (%fn.cnt;)*                                  >
+<!ATTLIST fn              
+             callout    CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Index Term                      -->
+<!ELEMENT indexterm     (%words.cnt;|%indexterm;|%index-base;)*      >
+<!ATTLIST indexterm
+             keyref     CDATA                             #IMPLIED
+             start      CDATA                             #IMPLIED
+             end        CDATA                             #IMPLIED
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Index Base                      -->
+<!ELEMENT index-base    (%words.cnt;|%indexterm;)*                   >
+<!ATTLIST index-base
+             keyref     CDATA                             #IMPLIED
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Index term reference            -->
+<!ELEMENT indextermref   EMPTY>
+<!ATTLIST indextermref    keyref CDATA #REQUIRED
+                          %univ-atts;
+>
+
+<!--                    LONG NAME: Citation (bibliographic source) -->
+<!ELEMENT cite          (%xrefph.cnt;)*                              >
+<!ATTLIST cite            
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Cross Reference/Link            -->
+<!ELEMENT xref          (%xreftext.cnt; | %desc;)*                   >
+<!ATTLIST xref            
+             href       CDATA                            #IMPLIED
+             keyref     CDATA                            #IMPLIED
+             type       CDATA                            #IMPLIED
+             %univ-atts;
+             format     CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!ENTITY % tableXML       PUBLIC  
+"-//OASIS//ELEMENTS DITA Exchange Table Model//EN" 
+"tblDecl.mod"                                                        >
+%tableXML;
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+             
+<!ATTLIST alt       %global-atts;  class CDATA "- topic/alt "        >
+<!ATTLIST boolean   %global-atts;  class CDATA "- topic/boolean "    >
+<!ATTLIST cite      %global-atts;  class CDATA "- topic/cite "       >
+<!ATTLIST dd        %global-atts;  class CDATA "- topic/dd "         >
+<!ATTLIST data      %global-atts;  class CDATA "- topic/data "       >
+<!ATTLIST data-about
+                    %global-atts;  class CDATA "- topic/data-about ">
+<!ATTLIST ddhd      %global-atts;  class CDATA "- topic/ddhd "       >
+<!ATTLIST desc      %global-atts;  class CDATA "- topic/desc "       >
+<!ATTLIST dl        %global-atts;  class CDATA "- topic/dl "         >
+<!ATTLIST dlentry   %global-atts;  class CDATA "- topic/dlentry "    >
+<!ATTLIST dlhead    %global-atts;  class CDATA "- topic/dlhead "     >
+<!ATTLIST draft-comment 
+                    %global-atts;  class CDATA "- topic/draft-comment ">
+<!ATTLIST dt        %global-atts;  class CDATA "- topic/dt "         >
+<!ATTLIST dthd      %global-atts;  class CDATA "- topic/dthd "       >
+<!ATTLIST fig       %global-atts;  class CDATA "- topic/fig "        >
+<!ATTLIST figgroup  %global-atts;  class CDATA "- topic/figgroup "   >
+<!ATTLIST fn        %global-atts;  class CDATA "- topic/fn "         >
+<!ATTLIST foreign   %global-atts;  class CDATA "- topic/foreign "    >
+<!ATTLIST image     %global-atts;  class CDATA "- topic/image "      >
+<!ATTLIST indexterm %global-atts;  class CDATA "- topic/indexterm "  >
+<!ATTLIST index-base %global-atts;  class CDATA "- topic/index-base ">
+<!ATTLIST indextermref 
+                    %global-atts;  class CDATA "- topic/indextermref ">
+<!ATTLIST itemgroup %global-atts;  class CDATA "- topic/itemgroup "  >
+<!ATTLIST keyword   %global-atts;  class CDATA "- topic/keyword "    >
+<!ATTLIST li        %global-atts;  class CDATA "- topic/li "         >
+<!ATTLIST lines     %global-atts;  class CDATA "- topic/lines "      >
+<!ATTLIST lq        %global-atts;  class CDATA "- topic/lq "         >
+<!ATTLIST note      %global-atts;  class CDATA "- topic/note "       >
+<!ATTLIST object    %global-atts;  class CDATA "- topic/object "     >
+<!ATTLIST ol        %global-atts;  class CDATA "- topic/ol "         >
+<!ATTLIST p         %global-atts;  class CDATA "- topic/p "          >
+<!ATTLIST param     %global-atts;  class CDATA "- topic/param "      >
+<!ATTLIST ph        %global-atts;  class CDATA "- topic/ph "         >
+<!ATTLIST pre       %global-atts;  class CDATA "- topic/pre "        >
+<!ATTLIST q         %global-atts;  class CDATA "- topic/q "          >
+<!ATTLIST required-cleanup 
+                    %global-atts;  class CDATA "- topic/required-cleanup ">
+<!ATTLIST simpletable 
+                    %global-atts;  class CDATA "- topic/simpletable ">
+<!ATTLIST sl        %global-atts;  class CDATA "- topic/sl "         >
+<!ATTLIST sli       %global-atts;  class CDATA "- topic/sli "        >
+<!ATTLIST state     %global-atts;  class CDATA "- topic/state "      >
+<!ATTLIST stentry   %global-atts;  class CDATA "- topic/stentry "    >
+<!ATTLIST sthead    %global-atts;  class CDATA "- topic/sthead "     >
+<!ATTLIST strow     %global-atts;  class CDATA "- topic/strow "      >
+<!ATTLIST term      %global-atts;  class CDATA "- topic/term "       >
+<!ATTLIST title     %global-atts;  class CDATA "- topic/title "      >
+<!ATTLIST tm        %global-atts;  class CDATA "- topic/tm "         >
+<!ATTLIST ul        %global-atts;  class CDATA "- topic/ul "         >
+<!ATTLIST unknown   %global-atts;  class CDATA "- topic/unknown "    >
+<!ATTLIST xref      %global-atts;  class CDATA "- topic/xref "       >
+
+
+<!-- ================== End Common Elements Module  ============== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.mod.rnc
new file mode 100644
index 000000000000..16fb9fa13f52
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/commonElements.mod.rnc
@@ -0,0 +1,920 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Common Elements
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Common Elements//EN"
+#       Delivered as file "commonElements.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for content elements used in both
+
+# topics and maps.
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# June 2006
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2006.06.06 RDA: Add data element
+
+# 2006.06.07 RDA: Add @scale to image
+
+# 2006.06.07 RDA: Add index-base element
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# 2006.06.07 RDA: Add unknown element
+
+# 2006.06.14 RDA: Add dir attribute to localization-atts
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+# =============================================================
+
+# COMMON ATTLIST SETS
+
+# =============================================================
+
+# Phrase/inline elements of various classes
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+basic.ph = ph | term | xref | cite | q | boolean | state | keyword | tm
+# Elements common to most body-like contexts
+basic.block =
+  p
+  | lq
+  | note
+  | dl
+  | ul
+  | ol
+  | sl
+  | pre
+  | lines
+  | fig
+  | image
+  | object
+  | table
+  | simpletable
+# class groupings to preserve in a schema
+basic.phandblock = basic.ph | basic.block
+# Exclusions: models modified by removing excluded content
+basic.ph.noxref = ph | term | q | boolean | state | keyword | tm
+basic.ph.notm = ph | term | xref | cite | q | boolean | state | keyword
+basic.block.notbl =
+  p | lq | note | dl | ul | ol | sl | pre | lines | fig | image | object
+basic.block.nonote =
+  p
+  | lq
+  | dl
+  | ul
+  | ol
+  | sl
+  | pre
+  | lines
+  | fig
+  | image
+  | object
+  | table
+  | simpletable
+basic.block.nopara =
+  lq
+  | note
+  | dl
+  | ul
+  | ol
+  | sl
+  | pre
+  | lines
+  | fig
+  | image
+  | object
+  | table
+  | simpletable
+basic.block.nolq =
+  p
+  | note
+  | dl
+  | ul
+  | ol
+  | sl
+  | pre
+  | lines
+  | fig
+  | image
+  | object
+  | table
+  | simpletable
+basic.block.notbnofg =
+  p | lq | note | dl | ul | ol | sl | pre | lines | image | object
+basic.block.notbfgobj =
+  p | lq | note | dl | ul | ol | sl | pre | lines | image
+# Inclusions: defined sets that can be added into appropriate models
+txt.incl =
+  draft-comment | required-cleanup | fn | indextermref | indexterm
+# Metadata elements intended for specialization
+data.elements.incl = data | data-about
+foreign.unknown.incl = foreign | unknown
+# Predefined content model groups, based on the previous, element-only categories:
+
+# txt.incl is appropriate for any mixed content definitions (those that have PCDATA)
+
+# the context for blocks is implicitly an InfoMaster "containing_division"
+listitem.cnt =
+  text
+  | basic.ph
+  | basic.block
+  | itemgroup
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+itemgroup.cnt =
+  text
+  | basic.ph
+  | basic.block
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+title.cnt =
+  text
+  | basic.ph.noxref
+  | image
+  | data.elements.incl
+  | foreign.unknown.incl
+xreftext.cnt =
+  text
+  | basic.ph.noxref
+  | image
+  | data.elements.incl
+  | foreign.unknown.incl
+xrefph.cnt =
+  text | basic.ph.noxref | data.elements.incl | foreign.unknown.incl
+shortquote.cnt =
+  text | basic.ph | data.elements.incl | foreign.unknown.incl
+para.cnt =
+  text
+  | basic.ph
+  | basic.block.nopara
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+note.cnt =
+  text
+  | basic.ph
+  | basic.block.nonote
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+longquote.cnt =
+  text
+  | basic.ph
+  | basic.block.nolq
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+tblcell.cnt =
+  text
+  | basic.ph
+  | basic.block.notbl
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+desc.cnt =
+  text
+  | basic.ph
+  | basic.block.notbfgobj
+  | data.elements.incl
+  | foreign.unknown.incl
+ph.cnt =
+  text
+  | basic.ph
+  | image
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+fn.cnt =
+  text
+  | basic.ph
+  | basic.block.notbl
+  | data.elements.incl
+  | foreign.unknown.incl
+term.cnt =
+  text | basic.ph | image | data.elements.incl | foreign.unknown.incl
+defn.cnt =
+  text
+  | basic.ph
+  | basic.block
+  | itemgroup
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+pre.cnt =
+  text | basic.ph | txt.incl | data.elements.incl | foreign.unknown.incl
+fig.cnt =
+  basic.block.notbnofg
+  | simpletable
+  | xref
+  | fn
+  | data.elements.incl
+  | foreign.unknown.incl
+words.cnt =
+  text | keyword | term | data.elements.incl | foreign.unknown.incl
+data.cnt = words.cnt | image | object | ph | title
+# =============================================================
+
+# COMMON ATTLIST SETS
+
+# =============================================================
+
+# Copied into metaDecl.mod
+
+# <!ENTITY % date-format 'CDATA'                                       >
+display-atts =
+  attribute scale {
+    "50"
+    | "60"
+    | "70"
+    | "80"
+    | "90"
+    | "100"
+    | "110"
+    | "120"
+    | "140"
+    | "160"
+    | "180"
+    | "200"
+  }?,
+  attribute frame {
+    "top" | "bottom" | "topbot" | "all" | "sides" | "none"
+  }?,
+  attribute expanse { "page" | "column" | "textline" }?
+# Provide a default of no attribute extensions
+filter-atts =
+  attribute props { text }?,
+  attribute base { text }?,
+  attribute platform { text }?,
+  attribute product { text }?,
+  attribute audience { text }?,
+  attribute otherprops { text }?,
+  props-attribute-extensions,
+  base-attribute-extensions
+select-atts =
+  filter-atts,
+  attribute importance {
+    "obsolete"
+    | "deprecated"
+    | "optional"
+    | "default"
+    | "low"
+    | "normal"
+    | "high"
+    | "recommended"
+    | "required"
+    | "urgent"
+  }?,
+  attribute rev { text }?,
+  attribute status { "new" | "changed" | "deleted" | "unchanged" }?
+id-atts =
+  attribute id { xsd:NMTOKEN }?,
+  attribute conref { text }?
+# Attributes related to localization that are used everywhere
+localization-atts =
+  attribute translate { "yes" | "no" }?,
+  attribute xml:lang { xsd:NMTOKEN }?,
+  attribute dir { "ltr" | "rtl" | "lro" | "rlo" }?
+# The following entity should be used when defaulting a new
+# element to translate="no", so that other (or new) localization
+# attributes will always be included.
+localization-atts-translate-no =
+  [ a:defaultValue = "no" ] attribute translate { "yes" | "no" }?,
+  attribute xml:lang { xsd:NMTOKEN }?,
+  attribute dir { "ltr" | "rtl" | "lro" | "rlo" }?
+univ-atts = id-atts, select-atts, localization-atts
+univ-atts-translate-no =
+  id-atts, select-atts, localization-atts-translate-no
+global-atts =
+  attribute xtrc { text }?,
+  attribute xtrf { text }?
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Data About
+data-about.element =
+  element data-about { data-about.attlist, data, (data | data-about)* }
+data-about.attlist &=
+  univ-atts,
+  attribute href { text }?,
+  attribute format { text }?,
+  attribute type { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute outputclass { text }?
+data-element-atts =
+  univ-atts,
+  attribute name { text }?,
+  attribute datatype { text }?,
+  attribute value { text }?,
+  attribute href { text }?,
+  attribute format { text }?,
+  attribute type { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute outputclass { text }?
+# LONG NAME: Data element
+data.element = element data { data.attlist, data.cnt* }
+data.attlist &= data-element-atts
+# LONG NAME: Unknown element
+unknown.element = element unknown { unknown.attlist, any }
+unknown.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Foreign content element
+foreign.element = element foreign { foreign.attlist, any }
+foreign.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Title
+
+# This is referenced inside CALS table
+title.element = element title { title.attlist, title.cnt* }
+title.attlist &=
+  id-atts,
+  localization-atts,
+  attribute outputclass { text }?
+# LONG NAME: Short Description
+shortdesc.element = element shortdesc { shortdesc.attlist, title.cnt* }
+shortdesc.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Description
+
+# Desc is used in context with figure and 
+# table titles and also for content models 
+# within linkgroup and object (for 
+# accessibility)
+desc.element = element desc { desc.attlist, desc.cnt* }
+desc.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# BASIC DOCUMENT ELEMENT DECLARATIONS
+
+# (rich text)
+
+# =============================================================
+
+# LONG NAME: Paragraph
+p.element = element p { p.attlist, para.cnt* }
+p.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Note
+note.element = element note { note.attlist, note.cnt* }
+note.attlist &=
+  attribute type {
+    "note"
+    | "tip"
+    | "fastpath"
+    | "restriction"
+    | "important"
+    | "remember"
+    | "attention"
+    | "caution"
+    | "danger"
+    | "other"
+  }?,
+  attribute spectitle { text }?,
+  attribute othertype { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Long Quote (Excerpt)
+lq.element = element lq { lq.attlist, longquote.cnt* }
+lq.attlist &=
+  attribute href { text }?,
+  attribute keyref { text }?,
+  attribute type { "external" | "internal" | "bibliographic" }?,
+  attribute reftitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Quoted text
+q.element = element q { q.attlist, shortquote.cnt* }
+q.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Simple List
+sl.element = element sl { sl.attlist, sli+ }
+sl.attlist &=
+  attribute compact { "yes" | "no" }?,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Simple List Item
+sli.element = element sli { sli.attlist, ph.cnt* }
+sli.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Unordered List
+ul.element = element ul { ul.attlist, li+ }
+ul.attlist &=
+  attribute compact { "yes" | "no" }?,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Ordered List
+ol.element = element ol { ol.attlist, li+ }
+ol.attlist &=
+  attribute compact { "yes" | "no" }?,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: List Item
+li.element = element li { li.attlist, listitem.cnt* }
+li.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Item Group
+itemgroup.element =
+  element itemgroup { itemgroup.attlist, itemgroup.cnt* }
+itemgroup.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Definition List
+dl.element = element dl { dl.attlist, dlhead?, dlentry+ }
+dl.attlist &=
+  attribute compact { "yes" | "no" }?,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Definition List Head
+dlhead.element = element dlhead { dlhead.attlist, dthd?, ddhd? }
+dlhead.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Term Header
+dthd.element = element dthd { dthd.attlist, title.cnt* }
+dthd.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Definition Header
+ddhd.element = element ddhd { ddhd.attlist, title.cnt* }
+ddhd.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Definition List Entry
+dlentry.element = element dlentry { dlentry.attlist, dt+, dd+ }
+dlentry.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Definition Term
+dt.element = element dt { dt.attlist, term.cnt* }
+dt.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Definition Description
+dd.element = element dd { dd.attlist, defn.cnt* }
+dd.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Figure
+fig.element =
+  element fig { fig.attlist, title?, desc?, (figgroup | fig.cnt)* }
+fig.attlist &=
+  display-atts,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Figure Group
+figgroup.element =
+  element figgroup {
+    figgroup.attlist, title?, (figgroup | xref | fn | ph | keyword)*
+  }
+figgroup.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Preformatted Text
+pre.element = element pre { pre.attlist, pre.cnt* }
+pre.attlist &=
+  display-atts,
+  attribute spectitle { text }?,
+  [ a:defaultValue = "preserve" ] attribute xml:space { "preserve" }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Line Respecting Text
+lines.element = element lines { lines.attlist, pre.cnt* }
+lines.attlist &=
+  display-atts,
+  attribute spectitle { text }?,
+  [ a:defaultValue = "preserve" ] attribute xml:space { "preserve" }?,
+  univ-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# BASE FORM PHRASE TYPES
+
+# =============================================================
+
+# LONG NAME: Keyword
+keyword.element = element keyword { keyword.attlist, (text | tm)* }
+keyword.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Term
+term.element = element term { term.attlist, (text | tm)* }
+term.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Phrase
+ph.element = element ph { ph.attlist, ph.cnt* }
+ph.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Trade Mark
+tm.element = element tm { tm.attlist, (text | tm)* }
+tm.attlist &=
+  univ-atts,
+  attribute trademark { text }?,
+  attribute tmowner { text }?,
+  attribute tmtype { "tm" | "reg" | "service" },
+  attribute tmclass { text }?
+# LONG NAME: Boolean  (deprecated)
+boolean.element = element boolean { boolean.attlist, empty }
+boolean.attlist &=
+  attribute state { "yes" | "no" },
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: State
+
+# A state can have a name and a string value, 
+# even if empty or indeterminate
+state.element = element state { state.attlist, empty }
+state.attlist &=
+  attribute name { text },
+  attribute value { text },
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Image Data
+image.element = element image { image.attlist, alt? }
+image.attlist &=
+  attribute href { text },
+  attribute keyref { xsd:NMTOKEN }?,
+  attribute alt { text }?,
+  attribute longdescref { text }?,
+  attribute height { xsd:NMTOKEN }?,
+  attribute width { xsd:NMTOKEN }?,
+  attribute align { text }?,
+  attribute scale { xsd:NMTOKEN }?,
+  [ a:defaultValue = "inline" ]
+  attribute placement { "inline" | "break" }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Alternate text
+alt.element = element alt { alt.attlist, words.cnt* }
+alt.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Object (Streaming/Executable 
+# Data)
+object.element =
+  element object {
+    object.attlist, desc?, param*, foreign.unknown.incl*
+  }
+object.attlist &=
+  attribute declare { "declare" }?,
+  attribute classid { text }?,
+  attribute codebase { text }?,
+  attribute data { text }?,
+  attribute type { text }?,
+  attribute codetype { text }?,
+  attribute archive { text }?,
+  attribute standby { text }?,
+  attribute height { xsd:NMTOKEN }?,
+  attribute width { xsd:NMTOKEN }?,
+  attribute usemap { text }?,
+  attribute name { text }?,
+  attribute tabindex { xsd:NMTOKEN }?,
+  attribute longdescre { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Parameter
+param.element = element param { param.attlist, empty }
+param.attlist &=
+  univ-atts,
+  attribute name { text },
+  attribute value { text }?,
+  attribute valuetype { "data" | "ref" | "object" }?,
+  attribute type { text }?
+# LONG NAME: Simple Table
+simpletable.element =
+  element simpletable { simpletable.attlist, sthead?, strow+ }
+simpletable.attlist &=
+  attribute relcolwidth { text }?,
+  attribute keycol { xsd:NMTOKEN }?,
+  attribute refcols { xsd:NMTOKENS }?,
+  display-atts,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Simple Table Head
+sthead.element = element sthead { sthead.attlist, stentry+ }
+sthead.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Simple Table Row
+strow.element = element strow { strow.attlist, stentry* }
+strow.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Simple Table Cell (entry)
+stentry.element = element stentry { stentry.attlist, tblcell.cnt* }
+stentry.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Review Comments Block
+draft-comment.element =
+  element draft-comment {
+    draft-comment.attlist,
+    (text
+     | basic.phandblock
+     | data.elements.incl
+     | foreign.unknown.incl)*
+  }
+draft-comment.attlist &=
+  attribute author { text }?,
+  attribute time { text }?,
+  attribute disposition {
+    "issue"
+    | "open"
+    | "accepted"
+    | "rejected"
+    | "deferred"
+    | "duplicate"
+    | "reopened"
+    | "unassigned"
+    | "completed"
+  }?,
+  univ-atts-translate-no,
+  attribute outputclass { text }?
+# LONG NAME: Required Cleanup Block
+required-cleanup.element =
+  element required-cleanup { required-cleanup.attlist, any }
+required-cleanup.attlist &=
+  attribute remap { text }?,
+  univ-atts-translate-no,
+  attribute outputclass { text }?
+# LONG NAME: Footnote
+fn.element = element fn { fn.attlist, fn.cnt* }
+fn.attlist &=
+  attribute callout { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Index Term
+indexterm.element =
+  element indexterm {
+    indexterm.attlist, (words.cnt | indexterm | index-base)*
+  }
+indexterm.attlist &=
+  attribute keyref { text }?,
+  attribute start { text }?,
+  attribute end { text }?,
+  univ-atts
+# LONG NAME: Index Base
+index-base.element =
+  element index-base { index-base.attlist, (words.cnt | indexterm)* }
+index-base.attlist &=
+  attribute keyref { text }?,
+  univ-atts
+# LONG NAME: Index term reference
+indextermref.element =
+  element indextermref { indextermref.attlist, empty }
+indextermref.attlist &=
+  attribute keyref { text },
+  univ-atts
+# LONG NAME: Citation (bibliographic source)
+cite.element = element cite { cite.attlist, xrefph.cnt* }
+cite.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Cross Reference/Link
+xref.element = element xref { xref.attlist, (xreftext.cnt | desc)* }
+xref.attlist &=
+  attribute href { text }?,
+  attribute keyref { text }?,
+  attribute type { text }?,
+  univ-atts,
+  attribute format { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute outputclass { text }?
+include "tblDecl.mod.rnc"
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+alt.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/alt " ] attribute class { text }?
+boolean.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/boolean " ] attribute class { text }?
+cite.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/cite " ] attribute class { text }?
+dd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/dd " ] attribute class { text }?
+data.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/data " ] attribute class { text }?
+data-about.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/data-about " ] attribute class { text }?
+ddhd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ddhd " ] attribute class { text }?
+desc.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/desc " ] attribute class { text }?
+dl.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/dl " ] attribute class { text }?
+dlentry.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/dlentry " ] attribute class { text }?
+dlhead.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/dlhead " ] attribute class { text }?
+draft-comment.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/draft-comment " ]
+  attribute class { text }?
+dt.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/dt " ] attribute class { text }?
+dthd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/dthd " ] attribute class { text }?
+fig.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/fig " ] attribute class { text }?
+figgroup.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/figgroup " ] attribute class { text }?
+fn.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/fn " ] attribute class { text }?
+foreign.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/foreign " ] attribute class { text }?
+image.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/image " ] attribute class { text }?
+indexterm.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/indexterm " ] attribute class { text }?
+index-base.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/index-base " ] attribute class { text }?
+indextermref.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/indextermref " ] attribute class { text }?
+itemgroup.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/itemgroup " ] attribute class { text }?
+keyword.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/keyword " ] attribute class { text }?
+li.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/li " ] attribute class { text }?
+lines.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/lines " ] attribute class { text }?
+lq.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/lq " ] attribute class { text }?
+note.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/note " ] attribute class { text }?
+object.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/object " ] attribute class { text }?
+ol.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ol " ] attribute class { text }?
+p.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/p " ] attribute class { text }?
+param.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/param " ] attribute class { text }?
+ph.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ph " ] attribute class { text }?
+pre.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/pre " ] attribute class { text }?
+q.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/q " ] attribute class { text }?
+required-cleanup.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/required-cleanup " ]
+  attribute class { text }?
+simpletable.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/simpletable " ] attribute class { text }?
+sl.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/sl " ] attribute class { text }?
+sli.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/sli " ] attribute class { text }?
+state.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/state " ] attribute class { text }?
+stentry.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry " ] attribute class { text }?
+sthead.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/sthead " ] attribute class { text }?
+strow.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/strow " ] attribute class { text }?
+term.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/term " ] attribute class { text }?
+title.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/title " ] attribute class { text }?
+tm.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/tm " ] attribute class { text }?
+ul.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ul " ] attribute class { text }?
+unknown.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/unknown " ] attribute class { text }?
+xref.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/xref " ] attribute class { text }?
+# ================== End Common Elements Module  ==============
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/concept.dtd b/xml/tests/testData/xml/OasisDocumentHighlighting/concept.dtd
new file mode 100644
index 000000000000..00e103f41213
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/concept.dtd
@@ -0,0 +1,176 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Concept DTD                                  -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//DTD DITA Concept//EN"
+      Delivered as file "concept.dtd"                              -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    DTD to describe DITA Concepts                     -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2006.06.07 RDA: Added indexing domain                      -->
+<!--    2006.06.21 RDA: Added props attribute extensions           -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATIONS                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA User Interface Domain//EN" 
+"uiDomain.ent"                                                       >
+%ui-d-dec;
+
+<!ENTITY % hi-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Highlight Domain//EN" 
+"highlightDomain.ent"                                                >
+%hi-d-dec;
+
+<!ENTITY % pr-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Programming Domain//EN" 
+"programmingDomain.ent"                                              >
+%pr-d-dec;
+
+<!ENTITY % sw-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Software Domain//EN" 
+"softwareDomain.ent"                                                 >
+%sw-d-dec;
+
+<!ENTITY % ut-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Utilities Domain//EN" 
+"utilitiesDomain.ent"                                                >
+%ut-d-dec;
+
+<!ENTITY % indexing-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Indexing Domain//EN" 
+"indexingDomain.ent"                                                 >
+%indexing-d-dec;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE DECLARATIONS              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN EXTENSIONS                          -->
+<!-- ============================================================= -->
+<!--                    One for each extended base element, with
+                        the name of the domain(s) in which the
+                        extension was declared                     -->
+
+<!ENTITY % pre          "pre     | %pr-d-pre;     | %sw-d-pre;     | 
+                                   %ui-d-pre;"                       >
+<!ENTITY % keyword      "keyword | %pr-d-keyword; | %sw-d-keyword; |
+                                   %ui-d-keyword;"                   >
+<!ENTITY % ph           "ph      | %pr-d-ph;      | %sw-d-ph;      | 
+                                    %hi-d-ph;     | %ui-d-ph;"       >
+<!ENTITY % fig          "fig     | %pr-d-fig;     | %ut-d-fig;"      >
+<!ENTITY % dl           "dl      | %pr-d-dl;"                        >
+<!ENTITY % index-base   "index-base | %indexing-d-index-base;"       >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE EXTENSIONS                -->
+<!-- ============================================================= -->
+<!ENTITY % props-attribute-extensions  ""                            >
+<!ENTITY % base-attribute-extensions   ""                            >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC NESTING OVERRIDE                     -->
+<!-- ============================================================= -->
+
+<!--                    Redefine the infotype entity to exclude 
+                        other topic types and disallow nesting     -->
+<!ENTITY % concept-info-types 
+                        "concept"                                    >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+<!--                    Must be declared ahead of the DTDs, which
+                        puts @domains first in order               -->
+
+<!ENTITY included-domains 
+                        "&ui-d-att; &hi-d-att; &pr-d-att; &sw-d-att;
+                         &ut-d-att; &indexing-d-att;"                >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC ELEMENT INTEGRATION                  -->
+<!-- ============================================================= -->
+
+<!--                    Embed topic to get generic elements        -->
+<!ENTITY % topic-type   PUBLIC 
+"-//OASIS//ELEMENTS DITA Topic//EN" 
+"topic.mod"                                                          >
+%topic-type;
+
+
+<!--                    Embed concept to get specific elements     -->
+<!ENTITY % concept-typemod 
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Concept//EN" 
+"concept.mod"                                                        >                                                     
+%concept-typemod;
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ELEMENT INTEGRATION                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA User Interface Domain//EN" 
+"uiDomain.mod"                                                       >
+%ui-d-def;
+
+<!ENTITY % hi-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Highlight Domain//EN" 
+"highlightDomain.mod"                                                >
+%hi-d-def;
+
+<!ENTITY % pr-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Programming Domain//EN" 
+"programmingDomain.mod"                                              >
+%pr-d-def;
+
+<!ENTITY % sw-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Software Domain//EN" 
+"softwareDomain.mod"                                                 >
+%sw-d-def;
+
+<!ENTITY % ut-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Utilities Domain//EN" 
+"utilitiesDomain.mod"                                                >
+%ut-d-def;
+
+<!ENTITY % indexing-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Indexing Domain//EN"
+"indexingDomain.mod"                                                 >
+%indexing-d-def;
+
+<!-- ================== End DITA Concept DTD  ==================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/concept.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/concept.mod
new file mode 100644
index 000000000000..482f4bb7d547
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/concept.mod
@@ -0,0 +1,127 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Concept                                      -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Concept//EN"
+      Delivered as file "concept.mod"                              -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Define elements and specialization atttributes    -->
+<!--             for Concepts                                      -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Removed old declaration for                -->
+<!--                    conceptClasses entity                      -->
+<!--    2006.06.07 RDA: Added <abstract> element                   -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ARCHITECTURE ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!-- default namespace prefix for DITAArchVersion attribute can be
+     overridden through predefinition in the document type shell   -->
+<!ENTITY % DITAArchNSPrefix
+                       "ditaarch"                                    >
+
+<!-- must be instanced on each topic type                          -->
+<!ENTITY % arch-atts "
+             xmlns:%DITAArchNSPrefix; 
+                        CDATA                              #FIXED
+                       'http://dita.oasis-open.org/architecture/2005/'
+             %DITAArchNSPrefix;:DITAArchVersion
+                        CDATA                              #FIXED
+                       '1.1'"                                        >
+
+
+<!-- ============================================================= -->
+<!--                   SPECIALIZATION OF DECLARED ELEMENTS         -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % concept-info-types "%info-types;">
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+ 
+
+<!ENTITY % concept     "concept"                                     >
+<!ENTITY % conbody     "conbody"                                     >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY included-domains ""                                         >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Concept                         -->
+<!ELEMENT concept       ((%title;), (%titlealts;)?,
+                         (%shortdesc; | %abstract;)?, 
+                         (%prolog;)?, (%conbody;)?, (%related-links;)?,
+                         (%concept-info-types;)* )                   >
+<!ATTLIST concept        
+             id         ID                               #REQUIRED
+             conref     CDATA                            #IMPLIED
+             %select-atts;
+             %localization-atts;
+             %arch-atts;
+             outputclass 
+                        CDATA                            #IMPLIED
+             domains    CDATA                "&included-domains;"    >
+
+
+<!--                    LONG NAME: Concept Body                    -->
+<!ELEMENT conbody       ((%body.cnt;)*, (%section;|%example;)* )     >
+<!ATTLIST conbody         
+             %id-atts;
+             %localization-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+             
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ATTLIST concept     %global-atts;  class CDATA "- topic/topic concept/concept ">
+<!ATTLIST conbody     %global-atts;  class CDATA "- topic/body  concept/conbody ">
+
+ 
+<!-- ================== End DITA Concept  ======================== -->
+
+
+
+
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/concept.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/concept.mod.rnc
new file mode 100644
index 000000000000..249d898283c9
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/concept.mod.rnc
@@ -0,0 +1,150 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Concept
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Concept//EN"
+#       Delivered as file "concept.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Define elements and specialization atttributes
+
+# for Concepts
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+# UPDATES:
+
+# 2005.11.15 RDA: Removed old declaration for
+
+# conceptClasses entity
+
+# 2006.06.07 RDA: Added <abstract> element
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# =============================================================
+
+# =============================================================
+
+# ARCHITECTURE ENTITIES
+
+# =============================================================
+
+# default namespace prefix for DITAArchVersion attribute can be
+# overridden through predefinition in the document type shell
+
+# must be instanced on each topic type
+
+# =============================================================
+
+# SPECIALIZATION OF DECLARED ELEMENTS
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+conbody = conbody.element
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Concept
+concept.element =
+  element concept {
+    concept.attlist,
+    title,
+    titlealts?,
+    (shortdesc | abstract)?,
+    prolog?,
+    conbody?,
+    related-links?,
+    concept-info-types*
+  }
+concept.attlist &=
+  attribute id { xsd:ID },
+  attribute conref { text }?,
+  select-atts,
+  localization-atts,
+  arch-atts,
+  attribute outputclass { text }?,
+  [
+    a:defaultValue =
+      "(topic ui-d) (topic hi-d) (topic pr-d) (topic sw-d)                          (topic ut-d) (topic indexing-d)"
+  ]
+  attribute domains { text }?
+# LONG NAME: Concept Body
+conbody.element =
+  element conbody { conbody.attlist, body.cnt*, (section | example)* }
+conbody.attlist &=
+  id-atts,
+  localization-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+concept.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/topic concept/concept " ]
+  attribute class { text }?
+conbody.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/body  concept/conbody " ]
+  attribute class { text }?
+# ================== End DITA Concept  ========================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/concept.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/concept.rnc
new file mode 100644
index 000000000000..0902b7a99251
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/concept.rnc
@@ -0,0 +1,148 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Concept DTD
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//DTD DITA Concept//EN"
+#       Delivered as file "concept.dtd"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    DTD to describe DITA Concepts
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2006.06.07 RDA: Added indexing domain
+
+# 2006.06.21 RDA: Added props attribute extensions
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN ENTITY DECLARATIONS
+
+# =============================================================
+
+include "uiDomain.ent.rnc"
+include "highlightDomain.ent.rnc"
+include "programmingDomain.ent.rnc"
+include "softwareDomain.ent.rnc"
+include "utilitiesDomain.ent.rnc"
+include "indexingDomain.ent.rnc"
+# =============================================================
+
+# DOMAIN ATTRIBUTE DECLARATIONS
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN EXTENSIONS
+
+# =============================================================
+
+# One for each extended base element, with
+# the name of the domain(s) in which the
+# extension was declared
+pre = pre.element | pr-d-pre | sw-d-pre | ui-d-pre
+keyword = keyword.element | pr-d-keyword | sw-d-keyword | ui-d-keyword
+ph = ph.element | pr-d-ph | sw-d-ph | hi-d-ph | ui-d-ph
+fig = fig.element | pr-d-fig | ut-d-fig
+dl = dl.element | pr-d-dl
+index-base = index-base.element | indexing-d-index-base
+# =============================================================
+
+# DOMAIN ATTRIBUTE EXTENSIONS
+
+# =============================================================
+props-attribute-extensions = empty
+base-attribute-extensions = empty
+# =============================================================
+
+# TOPIC NESTING OVERRIDE
+
+# =============================================================
+
+# Redefine the infotype entity to exclude 
+# other topic types and disallow nesting
+concept-info-types = concept.element
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# Must be declared ahead of the DTDs, which
+# puts @domains first in order
+
+# =============================================================
+
+# TOPIC ELEMENT INTEGRATION
+
+# =============================================================
+
+# Embed topic to get generic elements
+include "topic.mod.rnc"
+# Embed concept to get specific elements
+include "concept.mod.rnc"
+# =============================================================
+
+# DOMAIN ELEMENT INTEGRATION
+
+# =============================================================
+include "uiDomain.mod.rnc"
+include "highlightDomain.mod.rnc"
+include "programmingDomain.mod.rnc"
+include "softwareDomain.mod.rnc"
+include "utilitiesDomain.mod.rnc"
+include "indexingDomain.mod.rnc"
+start = no-topic-nesting.element
+any =
+  (element * {
+     attribute * { text }*,
+     any
+   }
+   | text)*
+# ================== End DITA Concept DTD  ====================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/ditabase.dtd b/xml/tests/testData/xml/OasisDocumentHighlighting/ditabase.dtd
new file mode 100644
index 000000000000..96eaddc2f9fc
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/ditabase.dtd
@@ -0,0 +1,214 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA BASE DTD                                     -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//DTD DITA Composite//EN"
+      Delivered as file "ditabase.dtd"                            -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Base DTD holds all the information types          -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Updated these comments to match template   -->
+<!--    2006.06.07 RDA: Added indexing domain                      -->
+<!--    2006.06.21 RDA: Added props attribute extensions           -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATIONS                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA User Interface Domain//EN" 
+"uiDomain.ent"                                                       >
+%ui-d-dec;
+
+<!ENTITY % hi-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Highlight Domain//EN" 
+"highlightDomain.ent"                                                >
+%hi-d-dec;
+
+<!ENTITY % pr-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Programming Domain//EN" 
+"programmingDomain.ent"                                              >
+%pr-d-dec;
+
+<!ENTITY % sw-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Software Domain//EN" 
+"softwareDomain.ent"                                                 >
+%sw-d-dec;
+
+<!ENTITY % ut-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Utilities Domain//EN" 
+"utilitiesDomain.ent"                                                >
+%ut-d-dec;
+
+<!ENTITY % indexing-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Indexing Domain//EN" 
+"indexingDomain.ent"                                                 >
+%indexing-d-dec;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE DECLARATIONS              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN EXTENSIONS                          -->
+<!-- ============================================================= -->
+<!--                    One for each extended base element, with
+                        the name of the domain(s) in which the
+                        extension was declared                     -->
+
+<!ENTITY % pre          "pre     | %pr-d-pre;     | %sw-d-pre;     | 
+                                   %ui-d-pre;"                       >
+<!ENTITY % keyword      "keyword | %pr-d-keyword; | %sw-d-keyword; |
+                                   %ui-d-keyword;"                   >
+<!ENTITY % ph           "ph      | %pr-d-ph;      | %sw-d-ph;      | 
+                                    %hi-d-ph;     | %ui-d-ph;"       >
+<!ENTITY % fig          "fig     | %pr-d-fig;     | %ut-d-fig;"      >
+<!ENTITY % dl           "dl      | %pr-d-dl;"                        >
+<!ENTITY % index-base   "index-base | %indexing-d-index-base;"       >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE EXTENSIONS                -->
+<!-- ============================================================= -->
+<!ENTITY % props-attribute-extensions  ""                            >
+<!ENTITY % base-attribute-extensions   ""                            >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC NESTING OVERRIDE                     -->
+<!-- ============================================================= -->
+
+<!--                    Redefine the infotype entity to exclude 
+                        other topic types and disallow nesting     -->
+<!ENTITY % glossentry-info-types 
+                        "no-topic-nesting"                           >
+<!ENTITY % info-types   "topic | concept | task | reference |
+                         glossentry"                                 >
+
+
+<!-- ============================================================= -->
+<!--                    LOCALLY DEFINED CONTAINMENT                -->
+<!-- ============================================================= -->
+<!--                    Define a containment for topics for editor 
+                        support                                    -->
+
+<!ELEMENT dita          (%info-types;)+                              >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+<!--                    Must be declared ahead of the DTDs, which
+                        puts @domains first in order               -->
+
+<!ENTITY included-domains 
+                        "&ui-d-att; &hi-d-att; &pr-d-att; &sw-d-att;
+                         &ut-d-att; &indexing-d-att;"                >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC ELEMENT INTEGRATION                  -->
+<!-- ============================================================= -->
+<!--                    Embed topic to get generic elements        -->
+<!ENTITY % topic-type   PUBLIC 
+"-//OASIS//ELEMENTS DITA Topic//EN" 
+"topic.mod"                                                          >
+%topic-type;
+
+
+<!--                    Embed concept to get specific elements     -->
+<!ENTITY % concept-typemod 
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Concept//EN" 
+"concept.mod"                                                        >                                                     
+%concept-typemod;
+
+<!--                    Embed task to get specific elements        -->
+<!ENTITY % task-typemod PUBLIC
+ "-//OASIS//ELEMENTS DITA Task//EN" 
+"task.mod"                                                           >
+%task-typemod;
+
+<!--                     Embed reference to get specific elements  -->
+<!ENTITY % reference-typemod 
+                         PUBLIC 
+"-//OASIS//ELEMENTS DITA Reference//EN" 
+"reference.mod"                                                      >
+%reference-typemod;
+
+<!--                    Embed glossary to get specific elements    -->
+<!ENTITY % glossary-typemod 
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Glossary//EN" 
+"glossary.mod"                                                       >                                                     
+%glossary-typemod;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ELEMENT INTEGRATION                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA User Interface Domain//EN" 
+"uiDomain.mod"                                                       >
+%ui-d-def;
+
+<!ENTITY % hi-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Highlight Domain//EN" 
+"highlightDomain.mod"                                                >
+%hi-d-def;
+
+<!ENTITY % pr-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Programming Domain//EN" 
+"programmingDomain.mod"                                              >
+%pr-d-def;
+
+<!ENTITY % sw-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Software Domain//EN" 
+"softwareDomain.mod"                                                 >
+%sw-d-def;
+
+<!ENTITY % ut-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Utilities Domain//EN" 
+"utilitiesDomain.mod"                                                >
+%ut-d-def;
+
+<!ENTITY % indexing-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Indexing Domain//EN" 
+"indexingDomain.mod"                                                 >
+%indexing-d-def;
+
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTES                  -->
+<!-- ============================================================= -->
+
+<!ATTLIST dita          %global-atts;                                >
+
+
+<!-- ================== End DITA Base DTD  ======================= -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/ditabase.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/ditabase.rnc
new file mode 100644
index 000000000000..d01a0eb7b880
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/ditabase.rnc
@@ -0,0 +1,177 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA BASE DTD
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//DTD DITA Composite//EN"
+#       Delivered as file "ditabase.dtd"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Base DTD holds all the information types
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Updated these comments to match template
+
+# 2006.06.07 RDA: Added indexing domain
+
+# 2006.06.21 RDA: Added props attribute extensions
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN ENTITY DECLARATIONS
+
+# =============================================================
+
+include "uiDomain.ent.rnc"
+include "highlightDomain.ent.rnc"
+include "programmingDomain.ent.rnc"
+include "softwareDomain.ent.rnc"
+include "utilitiesDomain.ent.rnc"
+include "indexingDomain.ent.rnc"
+# =============================================================
+
+# DOMAIN ATTRIBUTE DECLARATIONS
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN EXTENSIONS
+
+# =============================================================
+
+# One for each extended base element, with
+# the name of the domain(s) in which the
+# extension was declared
+pre = pre.element | pr-d-pre | sw-d-pre | ui-d-pre
+keyword = keyword.element | pr-d-keyword | sw-d-keyword | ui-d-keyword
+ph = ph.element | pr-d-ph | sw-d-ph | hi-d-ph | ui-d-ph
+fig = fig.element | pr-d-fig | ut-d-fig
+dl = dl.element | pr-d-dl
+index-base = index-base.element | indexing-d-index-base
+# =============================================================
+
+# DOMAIN ATTRIBUTE EXTENSIONS
+
+# =============================================================
+props-attribute-extensions = empty
+base-attribute-extensions = empty
+# =============================================================
+
+# TOPIC NESTING OVERRIDE
+
+# =============================================================
+
+# Redefine the infotype entity to exclude 
+# other topic types and disallow nesting
+glossentry-info-types = no-topic-nesting.element
+info-types =
+  topic.element
+  | concept.element
+  | task.element
+  | reference.element
+  | glossentry.element
+# =============================================================
+
+# LOCALLY DEFINED CONTAINMENT
+
+# =============================================================
+
+# Define a containment for topics for editor 
+# support
+dita.element = element dita { dita.attlist, info-types+ }
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# Must be declared ahead of the DTDs, which
+# puts @domains first in order
+
+# =============================================================
+
+# TOPIC ELEMENT INTEGRATION
+
+# =============================================================
+
+# Embed topic to get generic elements
+include "topic.mod.rnc"
+# Embed concept to get specific elements
+include "concept.mod.rnc"
+# Embed task to get specific elements
+include "task.mod.rnc"
+# Embed reference to get specific elements
+include "reference.mod.rnc"
+# Embed glossary to get specific elements
+include "glossary.mod.rnc"
+# =============================================================
+
+# DOMAIN ELEMENT INTEGRATION
+
+# =============================================================
+include "uiDomain.mod.rnc"
+include "highlightDomain.mod.rnc"
+include "programmingDomain.mod.rnc"
+include "softwareDomain.mod.rnc"
+include "utilitiesDomain.mod.rnc"
+include "indexingDomain.mod.rnc"
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTES
+
+# =============================================================
+dita.attlist &= global-atts
+start = dita.element
+any =
+  (element * {
+     attribute * { text }*,
+     any
+   }
+   | text)*
+# ================== End DITA Base DTD  =======================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.dtd b/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.dtd
new file mode 100644
index 000000000000..c6c090723542
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.dtd
@@ -0,0 +1,178 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Glossary DTD                                 -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//DTD DITA Glossary//EN"
+      Delivered as file "glossary.dtd"                             -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    DTD to describe DITA Glossary topics              -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             June 2006                                         -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2006.                    -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATIONS                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA User Interface Domain//EN" 
+"uiDomain.ent"                                                       >
+%ui-d-dec;
+
+<!ENTITY % hi-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Highlight Domain//EN" 
+"highlightDomain.ent"                                                >
+%hi-d-dec;
+
+<!ENTITY % pr-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Programming Domain//EN" 
+"programmingDomain.ent"                                              >
+%pr-d-dec;
+
+<!ENTITY % sw-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Software Domain//EN" 
+"softwareDomain.ent"                                                 >
+%sw-d-dec;
+
+<!ENTITY % ut-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Utilities Domain//EN" 
+"utilitiesDomain.ent"                                                >
+%ut-d-dec;
+
+<!ENTITY % indexing-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Indexing Domain//EN" 
+"indexingDomain.ent"                                                 >
+%indexing-d-dec;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE DECLARATIONS              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN EXTENSIONS                          -->
+<!-- ============================================================= -->
+<!--                    One for each extended base element, with
+                        the name of the domain(s) in which the
+                        extension was declared                     -->
+
+<!ENTITY % pre          "pre     | %pr-d-pre;     | %sw-d-pre;     | 
+                                   %ui-d-pre;"                       >
+<!ENTITY % keyword      "keyword | %pr-d-keyword; | %sw-d-keyword; |
+                                   %ui-d-keyword;"                   >
+<!ENTITY % ph           "ph      | %pr-d-ph;      | %sw-d-ph;      | 
+                                    %hi-d-ph;     | %ui-d-ph;"       >
+<!ENTITY % fig          "fig     | %pr-d-fig;     | %ut-d-fig;"      >
+<!ENTITY % dl           "dl      | %pr-d-dl;"                        >
+<!ENTITY % index-base   "index-base | %indexing-d-index-base;"       >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE EXTENSIONS                -->
+<!-- ============================================================= -->
+<!ENTITY % props-attribute-extensions  ""                            >
+<!ENTITY % base-attribute-extensions   ""                            >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC NESTING OVERRIDE                     -->
+<!-- ============================================================= -->
+
+<!--                    Redefine the infotype entity to exclude 
+                        other topic types and disallow nesting     -->
+<!ENTITY % glossentry-info-types 
+                        "no-topic-nesting"                           >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+<!--                    Must be declared ahead of the DTDs, which
+                        puts @domains first in order               -->
+
+<!ENTITY included-domains 
+                        "&ui-d-att; &hi-d-att; &pr-d-att; &sw-d-att;
+                         &ut-d-att; &indexing-d-att;"                >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC ELEMENT INTEGRATION                  -->
+<!-- ============================================================= -->
+
+<!--                    Embed topic to get generic elements        -->
+<!ENTITY % topic-type   PUBLIC 
+"-//OASIS//ELEMENTS DITA Topic//EN" 
+"topic.mod"                                                          >
+%topic-type;
+
+<!ENTITY % concept-typemod 
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Concept//EN" 
+"concept.mod"                                                        >                                                     
+%concept-typemod;
+
+<!--                    Embed glossary to get specific elements    -->
+<!ENTITY % glossary-typemod 
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Glossary//EN" 
+"glossary.mod"                                                       >                                                     
+%glossary-typemod;
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ELEMENT INTEGRATION                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA User Interface Domain//EN" 
+"uiDomain.mod"                                                       >
+%ui-d-def;
+
+<!ENTITY % hi-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Highlight Domain//EN" 
+"highlightDomain.mod"                                                >
+%hi-d-def;
+
+<!ENTITY % pr-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Programming Domain//EN" 
+"programmingDomain.mod"                                              >
+%pr-d-def;
+
+<!ENTITY % sw-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Software Domain//EN" 
+"softwareDomain.mod"                                                 >
+%sw-d-def;
+
+<!ENTITY % ut-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Utilities Domain//EN" 
+"utilitiesDomain.mod"                                                >
+%ut-d-def;
+
+<!ENTITY % indexing-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Indexing Domain//EN" 
+"indexingDomain.mod"                                                 >
+%indexing-d-def;
+
+<!-- ================== End DITA Glossary DTD  =================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.mod
new file mode 100644
index 000000000000..6a09c3a5b13b
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.mod
@@ -0,0 +1,129 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Glossary                                     -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Glossary//EN"
+      Delivered as file "glossary.mod"                             -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Define elements and specialization atttributes    -->
+<!--             for Glossary topics                               -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             June 2006                                         -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2006.                    -->
+<!--             All Rights Reserved.                              -->
+<!--  UPDATES:                                                     -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ARCHITECTURE ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!-- default namespace prefix for DITAArchVersion attribute can be
+     overridden through predefinition in the document type shell   -->
+<!ENTITY % DITAArchNSPrefix
+                       "ditaarch"                                    >
+
+<!-- must be instanced on each topic type                          -->
+<!ENTITY % arch-atts "
+             xmlns:%DITAArchNSPrefix; 
+                        CDATA                              #FIXED
+                       'http://dita.oasis-open.org/architecture/2005/'
+             %DITAArchNSPrefix;:DITAArchVersion
+                        CDATA                              #FIXED
+                       '1.1'"                                        >
+
+
+<!-- ============================================================= -->
+<!--                   SPECIALIZATION OF DECLARED ELEMENTS         -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % glossentry-info-types "no-topic-nesting">
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+ 
+
+<!ENTITY % glossentry  "glossentry"                                  >
+<!ENTITY % glossterm   "glossterm"                                   >
+<!ENTITY % glossdef    "glossdef"                                    >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY included-domains ""                                         >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Glossary Entry                  -->
+<!ELEMENT glossentry     ((%glossterm;), (%glossdef;), 
+                          (%related-links;)?,
+                          (%glossentry-info-types;)* )               >
+<!ATTLIST glossentry        
+             id         ID                               #REQUIRED
+             conref     CDATA                            #IMPLIED
+             %select-atts;
+             %localization-atts;
+             %arch-atts;
+             outputclass 
+                        CDATA                            #IMPLIED
+             domains    CDATA                "&included-domains;"    >
+
+
+<!--                    LONG NAME: Glossary Term                   -->
+<!ELEMENT glossterm     (%title.cnt;)*                               >
+<!ATTLIST glossterm         
+             %id-atts;
+             %localization-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Glossary Definition             -->
+<!ELEMENT glossdef      (%section.notitle.cnt; | %shortdesc;)*       >
+<!ATTLIST glossdef         
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+             
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ATTLIST glossentry  %global-atts;  class CDATA "- topic/topic concept/concept glossentry/glossentry ">
+<!ATTLIST glossterm   %global-atts;  class CDATA "- topic/title concept/title glossentry/glossterm ">
+<!ATTLIST glossdef    %global-atts;  class CDATA "- topic/abstract concept/abstract glossentry/glossdef ">
+
+ 
+<!-- ================== End DITA Glossary ======================== -->
+
+
+
+
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.mod.rnc
new file mode 100644
index 000000000000..f4cb07e0e1ed
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/glossary.mod.rnc
@@ -0,0 +1,155 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Glossary
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Glossary//EN"
+#       Delivered as file "glossary.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Define elements and specialization atttributes
+
+# for Glossary topics
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# June 2006
+
+#
+
+# (C) Copyright OASIS Open 2006.
+
+# All Rights Reserved.
+
+# UPDATES:
+
+# =============================================================
+
+# =============================================================
+
+# ARCHITECTURE ENTITIES
+
+# =============================================================
+
+# default namespace prefix for DITAArchVersion attribute can be
+# overridden through predefinition in the document type shell
+
+# must be instanced on each topic type
+
+# =============================================================
+
+# SPECIALIZATION OF DECLARED ELEMENTS
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+glossterm = glossterm.element
+glossdef = glossdef.element
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Glossary Entry
+glossentry.element =
+  element glossentry {
+    glossentry.attlist,
+    glossterm,
+    glossdef,
+    related-links?,
+    glossentry-info-types*
+  }
+glossentry.attlist &=
+  attribute id { xsd:ID },
+  attribute conref { text }?,
+  select-atts,
+  localization-atts,
+  arch-atts,
+  attribute outputclass { text }?,
+  [
+    a:defaultValue =
+      "(topic ui-d) (topic hi-d) (topic pr-d) (topic sw-d)                          (topic ut-d) (topic indexing-d)"
+  ]
+  attribute domains { text }?
+# LONG NAME: Glossary Term
+glossterm.element = element glossterm { glossterm.attlist, title.cnt* }
+glossterm.attlist &=
+  id-atts,
+  localization-atts,
+  attribute outputclass { text }?
+# LONG NAME: Glossary Definition
+glossdef.element =
+  element glossdef {
+    glossdef.attlist, (section.notitle.cnt | shortdesc)*
+  }
+glossdef.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+glossentry.attlist &=
+  global-atts,
+  [
+    a:defaultValue =
+      "- topic/topic concept/concept glossentry/glossentry "
+  ]
+  attribute class { text }?
+glossterm.attlist &=
+  global-atts,
+  [
+    a:defaultValue = "- topic/title concept/title glossentry/glossterm "
+  ]
+  attribute class { text }?
+glossdef.attlist &=
+  global-atts,
+  [
+    a:defaultValue =
+      "- topic/abstract concept/abstract glossentry/glossdef "
+  ]
+  attribute class { text }?
+# ================== End DITA Glossary ========================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.ent
new file mode 100644
index 000000000000..8e9b028b56a9
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.ent
@@ -0,0 +1,46 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Highlight Domain                             -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA Highlight Domain//EN"
+      Delivered as file "higlightDomain.ent"                       -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the substitution context and domain     -->
+<!--             entity declarations for the highlight domain      -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    HIGHLIGHT DOMAIN ENTITIES                  -->
+<!-- ============================================================= -->
+
+<!ENTITY % hi-d-ph      "b | u | i | tt | sup | sub"                 >
+
+<!ENTITY   hi-d-att     "(topic hi-d)"                               >
+
+
+<!-- ================== End Highlight Domain Entities ============ -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.ent.rnc
new file mode 100644
index 000000000000..7919e76f1d33
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.ent.rnc
@@ -0,0 +1,75 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Highlight Domain
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ENTITIES DITA Highlight Domain//EN"
+#       Delivered as file "higlightDomain.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the substitution context and domain
+
+# entity declarations for the highlight domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# HIGHLIGHT DOMAIN ENTITIES
+
+# =============================================================
+
+hi-d-ph =
+  b.element
+  | u.element
+  | i.element
+  | tt.element
+  | sup.element
+  | sub.element
+# ================== End Highlight Domain Entities ============
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.mod
new file mode 100644
index 000000000000..b0cd827e5c1a
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.mod
@@ -0,0 +1,122 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Highlight Domain                             -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Highlight Domain//EN"
+      Delivered as file "highlightDomain.mod"                      -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Define elements and specialization attributes     -->
+<!--             for Highlight Domain                              -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected descriptive names for all        -->
+<!--                    elements except bold                       -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!ENTITY % b           "b"                                           >
+<!ENTITY % i           "i"                                           >
+<!ENTITY % u           "u"                                           >     
+<!ENTITY % tt          "tt"                                          >
+<!ENTITY % sup         "sup"                                         >
+<!ENTITY % sub         "sub"                                         >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Bold                            -->
+<!ELEMENT b             (#PCDATA | %basic.ph; | %data.elements.incl; |
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST b              
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Underlined                      -->
+<!ELEMENT u             (#PCDATA | %basic.ph; | %data.elements.incl; |
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST u              
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Italic                          -->
+<!ELEMENT i             (#PCDATA | %basic.ph; | %data.elements.incl; |
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST i             
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Teletype (monospaced)           -->
+<!ELEMENT tt            (#PCDATA | %basic.ph; | %data.elements.incl; |
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST tt            
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Superscript                     -->
+<!ELEMENT sup           (#PCDATA | %basic.ph; | %data.elements.incl; |
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST sup          
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Subscript                       -->
+<!ELEMENT sub           (#PCDATA | %basic.ph; | %data.elements.incl; |
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST sub           
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+             
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ATTLIST b           %global-atts;  class CDATA "+ topic/ph hi-d/b "  >
+<!ATTLIST i           %global-atts;  class CDATA "+ topic/ph hi-d/i "  >
+<!ATTLIST sub         %global-atts;  class CDATA "+ topic/ph hi-d/sub ">
+<!ATTLIST sup         %global-atts;  class CDATA "+ topic/ph hi-d/sup ">
+<!ATTLIST tt          %global-atts;  class CDATA "+ topic/ph hi-d/tt " >
+<!ATTLIST u           %global-atts;  class CDATA "+ topic/ph hi-d/u "  >
+
+
+<!-- ================== DITA Highlight Domain ==================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.mod.rnc
new file mode 100644
index 000000000000..9aba8ceeb21d
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/highlightDomain.mod.rnc
@@ -0,0 +1,158 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Highlight Domain
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Highlight Domain//EN"
+#       Delivered as file "highlightDomain.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Define elements and specialization attributes
+
+# for Highlight Domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected descriptive names for all
+
+# elements except bold
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Bold
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+b.element =
+  element b {
+    b.attlist,
+    (text | basic.ph | data.elements.incl | foreign.unknown.incl)*
+  }
+b.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Underlined
+u.element =
+  element u {
+    u.attlist,
+    (text | basic.ph | data.elements.incl | foreign.unknown.incl)*
+  }
+u.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Italic
+i.element =
+  element i {
+    i.attlist,
+    (text | basic.ph | data.elements.incl | foreign.unknown.incl)*
+  }
+i.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Teletype (monospaced)
+tt.element =
+  element tt {
+    tt.attlist,
+    (text | basic.ph | data.elements.incl | foreign.unknown.incl)*
+  }
+tt.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Superscript
+sup.element =
+  element sup {
+    sup.attlist,
+    (text | basic.ph | data.elements.incl | foreign.unknown.incl)*
+  }
+sup.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Subscript
+sub.element =
+  element sub {
+    sub.attlist,
+    (text | basic.ph | data.elements.incl | foreign.unknown.incl)*
+  }
+sub.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+b.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph hi-d/b " ] attribute class { text }?
+i.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph hi-d/i " ] attribute class { text }?
+sub.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph hi-d/sub " ] attribute class { text }?
+sup.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph hi-d/sup " ] attribute class { text }?
+tt.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph hi-d/tt " ] attribute class { text }?
+u.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph hi-d/u " ] attribute class { text }?
+# ================== DITA Highlight Domain ====================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.ent
new file mode 100644
index 000000000000..6a104c32666f
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.ent
@@ -0,0 +1,48 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Indexing Domain Entities                     -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA Indexing Domain//EN"
+      Delivered as file "indexingDomain.ent"                       -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the substitution context and domain     -->
+<!--             entity declarations for the indexing domain       -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             June 2006                                         -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2006.                    -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    ELEMENT EXTENSION ENTITY DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ENTITY % indexing-d-index-base 
+     "index-see | index-see-also | index-sort-as">
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATION                  -->
+<!-- ============================================================= -->
+
+<!ENTITY indexing-d-att "(topic indexing-d)"                         >
+
+<!-- ================== End Indexing Domain Entities ============= -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.ent.rnc
new file mode 100644
index 000000000000..dc1a232b4c20
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.ent.rnc
@@ -0,0 +1,72 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Indexing Domain Entities
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ENTITIES DITA Indexing Domain//EN"
+#       Delivered as file "indexingDomain.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the substitution context and domain
+
+# entity declarations for the indexing domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# June 2006
+
+#
+
+# (C) Copyright OASIS Open 2006.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT EXTENSION ENTITY DECLARATIONS
+
+# =============================================================
+
+indexing-d-index-base =
+  index-see.element | index-see-also.element | index-sort-as.element
+# =============================================================
+
+# DOMAIN ENTITY DECLARATION
+
+# =============================================================
+
+# ================== End Indexing Domain Entities =============
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.mod
new file mode 100644
index 000000000000..e7d3be588290
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.mod
@@ -0,0 +1,83 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Indexing  Domain                             -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Indexing Domain//EN"
+      Delivered as file "indexingDomain.mod"                       -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the DITA Indexing Domain           -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             June 2006                                         -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2006.                    -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!ENTITY % index-see       "index-see"                               >
+<!ENTITY % index-see-also  "index-see-also"                          >
+<!ENTITY % index-sort-as   "index-sort-as"                           >
+
+
+<!-- ============================================================= -->
+<!--                    COMMON ATTLIST SETS                        -->
+<!-- ============================================================= -->
+
+
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS for IMAGEMAP          -->
+<!-- ============================================================= -->
+
+<!--                    LONG NAME: Index See                       -->
+<!ELEMENT index-see     (%words.cnt;|%indexterm;)*                   >
+<!ATTLIST index-see
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Index See Also                  -->
+<!ELEMENT index-see-also
+                        (%words.cnt;|%indexterm;)*                   >
+<!ATTLIST index-see-also
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Index Sort As                   -->
+<!ELEMENT index-sort-as (%words.cnt;)*                               >
+<!ATTLIST index-sort-as
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                             >
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ATTLIST index-see       %global-atts; class CDATA "+ topic/index-base indexing-d/index-see ">
+<!ATTLIST index-see-also  %global-atts; class CDATA "+ topic/index-base indexing-d/index-see-also ">
+<!ATTLIST index-sort-as   %global-atts; class CDATA "+ topic/index-base indexing-d/index-sort-as ">
+ 
+<!-- ================== End Indexing Domain ====================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.mod.rnc
new file mode 100644
index 000000000000..5171b7587b31
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/indexingDomain.mod.rnc
@@ -0,0 +1,116 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Indexing  Domain
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Indexing Domain//EN"
+#       Delivered as file "indexingDomain.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the DITA Indexing Domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# June 2006
+
+#
+
+# (C) Copyright OASIS Open 2006.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+# =============================================================
+
+# COMMON ATTLIST SETS
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS for IMAGEMAP
+
+# =============================================================
+
+# LONG NAME: Index See
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+index-see.element =
+  element index-see { index-see.attlist, (words.cnt | indexterm)* }
+index-see.attlist &=
+  attribute keyref { text }?,
+  univ-atts
+# LONG NAME: Index See Also
+index-see-also.element =
+  element index-see-also {
+    index-see-also.attlist, (words.cnt | indexterm)*
+  }
+index-see-also.attlist &=
+  attribute keyref { text }?,
+  univ-atts
+# LONG NAME: Index Sort As
+index-sort-as.element =
+  element index-sort-as { index-sort-as.attlist, words.cnt* }
+index-sort-as.attlist &=
+  attribute keyref { text }?,
+  univ-atts
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+index-see.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/index-base indexing-d/index-see " ]
+  attribute class { text }?
+index-see-also.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/index-base indexing-d/index-see-also " ]
+  attribute class { text }?
+index-sort-as.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/index-base indexing-d/index-sort-as " ]
+  attribute class { text }?
+# ================== End Indexing Domain ======================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/map.dtd b/xml/tests/testData/xml/OasisDocumentHighlighting/map.dtd
new file mode 100644
index 000000000000..d332a91cd8b0
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/map.dtd
@@ -0,0 +1,115 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA MAP DTD                                      -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                        TYPICAL INVOCATION                     -->
+<!--                                                               -->
+<!-- Refer to this file by the following public identifier or an
+     appropriate system identifier:
+PUBLIC "-//OASIS//DTD DITA Map//EN"
+     Delivered as file "map.dtd"                                   -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    DTD to describe DITA maps                         -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected public ID for map.mod            -->
+<!--    2005.11.15 RDA: Updated these comments to match template   -->
+<!--    2006.06.07 RDA: Added indexing domain                      -->
+<!--    2006.06.21 RDA: Added props attribute extensions           -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATIONS                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % mapgroup-d-dec 
+                        PUBLIC 
+"-//OASIS//ENTITIES DITA Map Group Domain//EN" 
+"mapGroup.ent"                                                       >
+%mapgroup-d-dec;
+
+<!ENTITY % indexing-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Indexing Domain//EN" 
+"indexingDomain.ent"                                                 >
+%indexing-d-dec;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE DECLARATIONS              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN EXTENSIONS                          -->
+<!-- ============================================================= -->
+<!--                    One for each extended base element, with
+                        the name of the domain(s) in which the
+                        extension was declared                     -->
+<!ENTITY % topicref     "topicref | (%mapgroup-d-topicref;)"         >
+<!ENTITY % index-base   "index-base | %indexing-d-index-base;"       >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE EXTENSIONS                -->
+<!-- ============================================================= -->
+<!ENTITY % props-attribute-extensions  ""                            >
+<!ENTITY % base-attribute-extensions   ""                            >
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+<!--                    Must be declared ahead of the DTDs, which
+                        puts @domains first in order               -->
+
+<!ENTITY included-domains 
+                        "&mapgroup-d-att; &indexing-d-att;"          >
+
+<!-- ============================================================= -->
+<!--                    MAP ELEMENT INTEGRATION                    -->
+<!-- ============================================================= -->
+
+
+<!--                    Embed map to get generic elements          -->
+<!--    2005.11.15 RDA: Corrected public ID for map.mod. It was    -->
+<!--             "-//OASIS//Elements DITA Map Group Domain//EN"    -->
+<!ENTITY % map-type     PUBLIC 
+"-//OASIS//ELEMENTS DITA Map//EN" 
+"map.mod"                                                            >
+%map-type;
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ELEMENT INTEGRATION                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % mapgroup-d-def  
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Map Group Domain//EN" 
+"mapGroup.mod"                                                       >
+%mapgroup-d-def;
+
+<!ENTITY % indexing-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Indexing Domain//EN" 
+"indexingDomain.mod"                                                 >
+%indexing-d-def;
+
+
+<!-- ================== End DITA Map DTD  ======================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/map.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/map.mod
new file mode 100644
index 000000000000..ea201f2557d5
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/map.mod
@@ -0,0 +1,322 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Map                                          -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Map//EN"
+      Delivered as file "map.mod"                                  -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the DITA Maps                      -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected public ID in the comment above   -->
+<!--    2005.11.15 RDA: Removed old declaration for topicreftypes  -->
+<!--                      entity                                   -->
+<!--    2006.06.06 RDA: Removed default locktitle="yes" from       -->
+<!--                      %topicref-atts-no-toc;                   -->
+<!--                    Remove keyword declaration                 -->
+<!--                    Add reference to commonElements            -->
+<!--                    Add title element to map                   -->
+<!--                    Add data element to topicmeta              -->
+<!--                    Remove shortdesc declaration               -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!--    2006.06.14 RDA: Add dir attribute to localization-atts     -->
+<!--    2006.06.14 RDA: Add outputclass attribute to most elemetns -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ARCHITECTURE ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!-- default namespace prefix for DITAArchVersion attribute can be
+     overridden through predefinition in the document type shell   -->
+<!ENTITY % DITAArchNSPrefix
+                       "ditaarch"                                    >
+
+<!-- must be instanced on each topic type                          -->
+<!ENTITY % arch-atts "
+             xmlns:%DITAArchNSPrefix; 
+                        CDATA                              #FIXED
+                       'http://dita.oasis-open.org/architecture/2005/'
+             %DITAArchNSPrefix;:DITAArchVersion
+                        CDATA                              #FIXED
+                       '1.1'"                                        >
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % map         "map"                                         >
+<!ENTITY % anchor      "anchor"                                      >
+<!ENTITY % linktext    "linktext"                                    >
+<!ENTITY % navref      "navref"                                      >
+<!ENTITY % relcell     "relcell"                                     >
+<!ENTITY % relcolspec  "relcolspec"                                  >
+<!ENTITY % relheader   "relheader"                                   >
+<!ENTITY % relrow      "relrow"                                      >
+<!ENTITY % reltable    "reltable"                                    >
+<!ENTITY % searchtitle "searchtitle"                                 >
+<!ENTITY % shortdesc   "shortdesc"                                   >
+<!ENTITY % topicmeta   "topicmeta"                                   >
+<!ENTITY % topicref    "topicref"                                    >
+
+
+<!-- ============================================================= -->
+<!--                    ENTITY DECLARATIONS FOR ATTRIBUTE VALUES   -->
+<!-- ============================================================= -->
+
+
+<!--                    DATE FORMAT                                -->
+<!-- Copied into metaDecl.mod -->
+<!--<!ENTITY % date-format  'CDATA'                               >-->
+
+
+<!-- ============================================================= -->
+<!--                    COMMON ATTLIST SETS                        -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % topicref-atts 
+            'collection-type 
+                        (choice | unordered | sequence | 
+                         family)                          #IMPLIED
+             type       CDATA                             #IMPLIED
+             scope      (local | peer | external)         #IMPLIED
+             locktitle  (yes|no)                          #IMPLIED
+             format     CDATA                             #IMPLIED
+             linking    (none | normal | sourceonly | targetonly)
+                                                          #IMPLIED
+             toc        (yes | no)                        #IMPLIED
+             print      (yes | no | printonly)            #IMPLIED
+             search     (yes | no)                        #IMPLIED
+             chunk      CDATA                             #IMPLIED'  >
+
+
+<!ENTITY % topicref-atts-no-toc 
+            'collection-type
+                        (choice | unordered | sequence | 
+                         family)                          #IMPLIED
+             type       CDATA                             #IMPLIED
+             scope      (local | peer | external)         #IMPLIED
+             locktitle  (yes|no)                          #IMPLIED
+             format     CDATA                             #IMPLIED
+             linking    (targetonly | sourceonly | 
+                         normal | none)                   #IMPLIED
+             toc        (yes | no)                        "no"
+             print      (yes | no | printonly)            #IMPLIED
+             search     (yes | no)                        #IMPLIED
+             chunk      CDATA                             #IMPLIED'  >
+
+
+
+<!-- ============================================================= -->
+<!--                    MODULES CALLS                              -->
+<!-- ============================================================= -->
+
+
+<!--                      Content elements common to map and topic -->
+<!ENTITY % commonElements      PUBLIC 
+"-//OASIS//ELEMENTS DITA Common Elements//EN" "commonElements.mod"   >
+%commonElements;
+
+<!--                      MetaData Elements                        -->
+<!ENTITY % metaXML      PUBLIC 
+"-//OASIS//ELEMENTS DITA Metadata//EN" "metaDecl.mod"                >
+%metaXML;
+  
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+
+<!ENTITY included-domains ""                                         >
+  
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+
+
+
+<!--                    LONG NAME: Map                             -->
+<!ELEMENT  map          ((%title;)?, (%topicmeta;)?, 
+                         (%navref;|%anchor;|%topicref;|%reltable;|
+                          %data.elements.incl;)* )                   >
+<!ATTLIST  map 
+             title      CDATA                             #IMPLIED
+             id         ID                                #IMPLIED
+             conref     CDATA                             #IMPLIED
+             anchorref  CDATA                             #IMPLIED
+             outputclass 
+                        CDATA                             #IMPLIED
+             %localization-atts;
+             %arch-atts;
+             domains    CDATA                  "&included-domains;" 
+             %topicref-atts;
+             %select-atts;                                           >
+
+
+<!--                    LONG NAME: Navigation Reference            -->
+<!ELEMENT  navref       EMPTY                                        >
+<!ATTLIST  navref
+             %univ-atts;
+             outputclass 
+                        CDATA                             #IMPLIED
+             mapref     CDATA                             #IMPLIED   >
+
+
+<!--                    LONG NAME: Topic Reference                 -->
+<!ELEMENT  topicref     ((%topicmeta;)?, 
+                         (%topicref; | %navref; | %anchor; |
+                          %data.elements.incl;)* )                   >
+<!ATTLIST  topicref
+             navtitle   CDATA                             #IMPLIED
+             href       CDATA                             #IMPLIED
+             keyref     CDATA                             #IMPLIED
+             query      CDATA                             #IMPLIED
+             copy-to    CDATA                             #IMPLIED
+             outputclass 
+                        CDATA                             #IMPLIED
+             %topicref-atts;
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Anchor                          -->
+<!ELEMENT  anchor       EMPTY                                        >
+<!ATTLIST  anchor
+             outputclass 
+                        CDATA                             #IMPLIED
+             %localization-atts;
+             id         ID                                #REQUIRED   
+             conref     CDATA                             #IMPLIED    
+             %select-atts;                                           >
+
+
+<!--                    LONG NAME: Relationship Table              -->
+<!ELEMENT  reltable     ((%topicmeta;)?, (%relheader;)?, 
+                         (%relrow;)+)                                >
+<!ATTLIST  reltable        
+             title      CDATA                             #IMPLIED
+             outputclass 
+                        CDATA                             #IMPLIED
+             %topicref-atts-no-toc;
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Relationship Header             -->
+<!ELEMENT  relheader    (%relcolspec;)+                              >
+<!ATTLIST  relheader
+             %univ-atts;                                             >        
+
+
+<!--                    LONG NAME: Relationship Column Specification
+                                                                   -->
+<!ELEMENT  relcolspec   (%topicmeta;)?                               >
+<!ATTLIST  relcolspec
+             outputclass 
+                        CDATA                             #IMPLIED
+             %topicref-atts;
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Relationship Table Row          -->
+<!ELEMENT relrow        (%relcell;)*                                 >
+<!ATTLIST relrow
+             outputclass 
+                        CDATA                             #IMPLIED
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Relationship Table Cell         -->
+<!ELEMENT relcell         ((%topicref;|%data.elements.incl;)*)>
+<!ATTLIST relcell
+             outputclass 
+                        CDATA                             #IMPLIED
+             %topicref-atts;
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Topic Metadata                  -->
+<!ELEMENT  topicmeta    ((%linktext;)?, (%searchtitle;)?, 
+                         (%shortdesc;)?, (%author;)*, (%source;)?, 
+                         (%publisher;)?, (%copyright;)*, 
+                         (%critdates;)?, (%permissions;)?, 
+                         (%audience;)*, (%category;)*, 
+                         (%keywords;)*, (%prodinfo;)*, (%othermeta;)*, 
+                         (%resourceid;)*, 
+                         (%data.elements.incl; | 
+                          %foreign.unknown.incl;)*)                  >
+<!ATTLIST  topicmeta
+             lockmeta   (yes | no)                        #IMPLIED
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Link Text                       -->
+<!ELEMENT  linktext     (%words.cnt;)*                               >
+<!ATTLIST  linktext
+             outputclass 
+                        CDATA                             #IMPLIED
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Search Title                    -->
+<!ELEMENT  searchtitle  (%words.cnt;)*                               >
+<!ATTLIST  searchtitle
+             outputclass 
+                        CDATA                             #IMPLIED
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Short Description               -->
+<!--<!ELEMENT  shortdesc    (%words.cnt;)*                        >-->
+         
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ATTLIST map         %global-atts;  class CDATA "- map/map "        >
+<!ATTLIST navref      %global-atts;  class CDATA "- map/navref "     >
+<!ATTLIST topicref    %global-atts;  class CDATA "- map/topicref "   >
+<!ATTLIST anchor      %global-atts;  class CDATA "- map/anchor "     >
+<!ATTLIST reltable    %global-atts;  class CDATA "- map/reltable "   >
+<!ATTLIST relheader   %global-atts;  class CDATA "- map/relheader "  >
+<!ATTLIST relcolspec  %global-atts;  class CDATA "- map/relcolspec " >
+<!ATTLIST relrow      %global-atts;  class CDATA "- map/relrow "     >
+<!ATTLIST relcell     %global-atts;  class CDATA "- map/relcell "    >
+<!ATTLIST topicmeta   %global-atts;  class CDATA "- map/topicmeta "  >
+<!ATTLIST linktext    %global-atts;  class CDATA "- map/linktext "   >
+<!ATTLIST searchtitle %global-atts;  class CDATA "- map/searchtitle ">
+
+<!-- Shortdesc in topic uses topic/shortdesc so this one must be 
+     included, even though the element is common. -->
+<!ATTLIST shortdesc   %global-atts;  class CDATA "- map/shortdesc "  >
+
+
+<!-- ================== End DITA Map ============================= -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/map.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/map.mod.rnc
new file mode 100644
index 000000000000..79228da6f43b
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/map.mod.rnc
@@ -0,0 +1,355 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Map
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Map//EN"
+#       Delivered as file "map.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the DITA Maps
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected public ID in the comment above
+
+# 2005.11.15 RDA: Removed old declaration for topicreftypes
+
+# entity
+
+# 2006.06.06 RDA: Removed default locktitle="yes" from
+
+# %topicref-atts-no-toc;
+
+# Remove keyword declaration
+
+# Add reference to commonElements
+
+# Add title element to map
+
+# Add data element to topicmeta
+
+# Remove shortdesc declaration
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# 2006.06.14 RDA: Add dir attribute to localization-atts
+
+# 2006.06.14 RDA: Add outputclass attribute to most elemetns
+
+# =============================================================
+
+# =============================================================
+
+# ARCHITECTURE ENTITIES
+
+# =============================================================
+
+# default namespace prefix for DITAArchVersion attribute can be
+# overridden through predefinition in the document type shell
+
+# must be instanced on each topic type
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace ditaarch = "http://dita.oasis-open.org/architecture/2005/"
+
+arch-atts =
+  [ a:defaultValue = "1.1" ]
+  attribute ditaarch:DITAArchVersion { string "1.1" }?
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+anchor = anchor.element
+linktext = linktext.element
+navref = navref.element
+relcell = relcell.element
+relcolspec = relcolspec.element
+relheader = relheader.element
+relrow = relrow.element
+reltable = reltable.element
+searchtitle = searchtitle.element
+shortdesc = shortdesc.element
+topicmeta = topicmeta.element
+# =============================================================
+
+# ENTITY DECLARATIONS FOR ATTRIBUTE VALUES
+
+# =============================================================
+
+# DATE FORMAT
+
+# Copied into metaDecl.mod
+
+# <!ENTITY % date-format  'CDATA'                               >
+
+# =============================================================
+
+# COMMON ATTLIST SETS
+
+# =============================================================
+topicref-atts =
+  attribute collection-type {
+    "choice" | "unordered" | "sequence" | "family"
+  }?,
+  attribute type { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute locktitle { "yes" | "no" }?,
+  attribute format { text }?,
+  attribute linking {
+    "none" | "normal" | "sourceonly" | "targetonly"
+  }?,
+  attribute toc { "yes" | "no" }?,
+  attribute print { "yes" | "no" | "printonly" }?,
+  attribute search { "yes" | "no" }?,
+  attribute chunk { text }?
+topicref-atts-no-toc =
+  attribute collection-type {
+    "choice" | "unordered" | "sequence" | "family"
+  }?,
+  attribute type { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute locktitle { "yes" | "no" }?,
+  attribute format { text }?,
+  attribute linking {
+    "targetonly" | "sourceonly" | "normal" | "none"
+  }?,
+  [ a:defaultValue = "no" ] attribute toc { "yes" | "no" }?,
+  attribute print { "yes" | "no" | "printonly" }?,
+  attribute search { "yes" | "no" }?,
+  attribute chunk { text }?
+# =============================================================
+
+# MODULES CALLS
+
+# =============================================================
+
+# Content elements common to map and topic
+include "commonElements.mod.rnc"
+# MetaData Elements
+include "metaDecl.mod.rnc"
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Map
+map.element =
+  element map {
+    map.attlist,
+    title?,
+    topicmeta?,
+    (navref | anchor | topicref | reltable | data.elements.incl)*
+  }
+map.attlist &=
+  attribute title { text }?,
+  attribute id { xsd:ID }?,
+  attribute conref { text }?,
+  attribute anchorref { text }?,
+  attribute outputclass { text }?,
+  localization-atts,
+  arch-atts,
+  [ a:defaultValue = "(map mapgroup-d) (topic indexing-d)" ]
+  attribute domains { text }?,
+  topicref-atts,
+  select-atts
+# LONG NAME: Navigation Reference
+navref.element = element navref { navref.attlist, empty }
+navref.attlist &=
+  univ-atts,
+  attribute outputclass { text }?,
+  attribute mapref { text }?
+# LONG NAME: Topic Reference
+topicref.element =
+  element topicref {
+    topicref.attlist,
+    topicmeta?,
+    (topicref | navref | anchor | data.elements.incl)*
+  }
+topicref.attlist &=
+  attribute navtitle { text }?,
+  attribute href { text }?,
+  attribute keyref { text }?,
+  attribute query { text }?,
+  attribute copy-to { text }?,
+  attribute outputclass { text }?,
+  topicref-atts,
+  univ-atts
+# LONG NAME: Anchor
+anchor.element = element anchor { anchor.attlist, empty }
+anchor.attlist &=
+  attribute outputclass { text }?,
+  localization-atts,
+  attribute id { xsd:ID },
+  attribute conref { text }?,
+  select-atts
+# LONG NAME: Relationship Table
+reltable.element =
+  element reltable { reltable.attlist, topicmeta?, relheader?, relrow+ }
+reltable.attlist &=
+  attribute title { text }?,
+  attribute outputclass { text }?,
+  topicref-atts-no-toc,
+  univ-atts
+# LONG NAME: Relationship Header
+relheader.element = element relheader { relheader.attlist, relcolspec+ }
+relheader.attlist &= univ-atts
+# LONG NAME: Relationship Column Specification
+relcolspec.element =
+  element relcolspec { relcolspec.attlist, topicmeta? }
+relcolspec.attlist &=
+  attribute outputclass { text }?,
+  topicref-atts,
+  univ-atts
+# LONG NAME: Relationship Table Row
+relrow.element = element relrow { relrow.attlist, relcell* }
+relrow.attlist &=
+  attribute outputclass { text }?,
+  univ-atts
+# LONG NAME: Relationship Table Cell
+relcell.element =
+  element relcell { relcell.attlist, (topicref | data.elements.incl)* }
+relcell.attlist &=
+  attribute outputclass { text }?,
+  topicref-atts,
+  univ-atts
+# LONG NAME: Topic Metadata
+topicmeta.element =
+  element topicmeta {
+    topicmeta.attlist,
+    linktext?,
+    searchtitle?,
+    shortdesc?,
+    author*,
+    source?,
+    publisher?,
+    copyright*,
+    critdates?,
+    permissions?,
+    audience*,
+    category*,
+    keywords*,
+    prodinfo*,
+    othermeta*,
+    resourceid*,
+    (data.elements.incl | foreign.unknown.incl)*
+  }
+topicmeta.attlist &=
+  attribute lockmeta { "yes" | "no" }?,
+  univ-atts
+# LONG NAME: Link Text
+linktext.element = element linktext { linktext.attlist, words.cnt* }
+linktext.attlist &=
+  attribute outputclass { text }?,
+  univ-atts
+# LONG NAME: Search Title
+searchtitle.element =
+  element searchtitle { searchtitle.attlist, words.cnt* }
+searchtitle.attlist &=
+  attribute outputclass { text }?,
+  univ-atts
+# LONG NAME: Short Description
+
+# <!ELEMENT  shortdesc    (%words.cnt;)*                        >
+
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+map.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/map " ] attribute class { text }?
+navref.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/navref " ] attribute class { text }?
+topicref.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/topicref " ] attribute class { text }?
+anchor.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/anchor " ] attribute class { text }?
+reltable.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/reltable " ] attribute class { text }?
+relheader.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/relheader " ] attribute class { text }?
+relcolspec.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/relcolspec " ] attribute class { text }?
+relrow.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/relrow " ] attribute class { text }?
+relcell.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/relcell " ] attribute class { text }?
+topicmeta.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/topicmeta " ] attribute class { text }?
+linktext.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/linktext " ] attribute class { text }?
+searchtitle.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/searchtitle " ] attribute class { text }?
+# Shortdesc in topic uses topic/shortdesc so this one must be 
+# included, even though the element is common.
+shortdesc.attlist &=
+  global-atts,
+  [ a:defaultValue = "- map/shortdesc " ] attribute class { text }?
+# ================== End DITA Map =============================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/map.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/map.rnc
new file mode 100644
index 000000000000..cce03e1b29d4
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/map.rnc
@@ -0,0 +1,133 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA MAP DTD
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an
+#      appropriate system identifier:
+# PUBLIC "-//OASIS//DTD DITA Map//EN"
+#      Delivered as file "map.dtd"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    DTD to describe DITA maps
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected public ID for map.mod
+
+# 2005.11.15 RDA: Updated these comments to match template
+
+# 2006.06.07 RDA: Added indexing domain
+
+# 2006.06.21 RDA: Added props attribute extensions
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN ENTITY DECLARATIONS
+
+# =============================================================
+
+include "mapGroup.ent.rnc"
+include "indexingDomain.ent.rnc"
+# =============================================================
+
+# DOMAIN ATTRIBUTE DECLARATIONS
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN EXTENSIONS
+
+# =============================================================
+
+# One for each extended base element, with
+# the name of the domain(s) in which the
+# extension was declared
+topicref = topicref.element | mapgroup-d-topicref
+index-base = index-base.element | indexing-d-index-base
+# =============================================================
+
+# DOMAIN ATTRIBUTE EXTENSIONS
+
+# =============================================================
+props-attribute-extensions = empty
+base-attribute-extensions = empty
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# Must be declared ahead of the DTDs, which
+# puts @domains first in order
+
+# =============================================================
+
+# MAP ELEMENT INTEGRATION
+
+# =============================================================
+
+# Embed map to get generic elements
+
+# 2005.11.15 RDA: Corrected public ID for map.mod. It was
+
+# "-//OASIS//Elements DITA Map Group Domain//EN"
+include "map.mod.rnc"
+# =============================================================
+
+# DOMAIN ELEMENT INTEGRATION
+
+# =============================================================
+include "mapGroup.mod.rnc"
+include "indexingDomain.mod.rnc"
+start = map.element
+any =
+  (element * {
+     attribute * { text }*,
+     any
+   }
+   | text)*
+# ================== End DITA Map DTD  ========================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.ent
new file mode 100644
index 000000000000..b9708a641474
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.ent
@@ -0,0 +1,51 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Map Group Domain Entities                    -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA Map Group Domain//EN"
+      Delivered as file "mapGroup.ent"                             -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the substitution context and domain     -->
+<!--             entity declarations for the map group domain      -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    ELEMENT EXTENSION ENTITY DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ENTITY % mapgroup-d-topicref 
+                        "topichead | topicgroup"                     >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATION                  -->
+<!-- ============================================================= -->
+
+<!ENTITY mapgroup-d-att "(map mapgroup-d)"                           >
+
+
+<!-- ================== End Map Group Domain Entities ============ -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.ent.rnc
new file mode 100644
index 000000000000..ce4725d8cd15
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.ent.rnc
@@ -0,0 +1,75 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Map Group Domain Entities
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ENTITIES DITA Map Group Domain//EN"
+#       Delivered as file "mapGroup.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the substitution context and domain
+
+# entity declarations for the map group domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT EXTENSION ENTITY DECLARATIONS
+
+# =============================================================
+
+mapgroup-d-topicref = topichead.element | topicgroup.element
+# =============================================================
+
+# DOMAIN ENTITY DECLARATION
+
+# =============================================================
+
+# ================== End Map Group Domain Entities ============
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.mod
new file mode 100644
index 000000000000..04d2aa3b5395
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.mod
@@ -0,0 +1,83 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Map Group Domain                             -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Map Group Domain//EN"
+      Delivered as file "mapGroup.mod"                             -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Define elements and specialization attributes     -->
+<!--             for Map Group Domain                              -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT NAME ENTITIES                      -->
+<!-- ============================================================= -->
+
+<!ENTITY % topichead    "topichead"                                  >
+<!ENTITY % topicgroup   "topicgroup"                                 >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Topic Head                      -->
+<!ELEMENT topichead     ((%topicmeta;)?, 
+                          (%topicref; | %navref; | %anchor; | 
+                           %data.elements.incl;)* )                  >
+<!ATTLIST topichead
+             navtitle   CDATA                            #REQUIRED
+             outputclass 
+                        CDATA                            #IMPLIED
+             %topicref-atts;
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Topic Group                     -->
+<!ELEMENT topicgroup    ((%topicmeta;)?, 
+                         (%topicref; | %navref; | %anchor; | 
+                          %data.elements.incl;)* )                   >
+<!ATTLIST topicgroup
+             outputclass 
+                        CDATA                            #IMPLIED
+             %topicref-atts;
+             %univ-atts;                                             >
+
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ATTLIST topichead     %global-atts;  class CDATA "+ map/topicref mapgroup-d/topichead ">
+<!ATTLIST topicgroup    %global-atts;  class CDATA "+ map/topicref mapgroup-d/topicgroup ">
+
+
+<!-- ================== DITA Map Group Domain  =================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.mod.rnc
new file mode 100644
index 000000000000..83ef515f0a8f
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/mapGroup.mod.rnc
@@ -0,0 +1,117 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Map Group Domain
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Map Group Domain//EN"
+#       Delivered as file "mapGroup.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Define elements and specialization attributes
+
+# for Map Group Domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Topic Head
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+topichead.element =
+  element topichead {
+    topichead.attlist,
+    topicmeta?,
+    (topicref | navref | anchor | data.elements.incl)*
+  }
+topichead.attlist &=
+  attribute navtitle { text },
+  attribute outputclass { text }?,
+  topicref-atts,
+  univ-atts
+# LONG NAME: Topic Group
+topicgroup.element =
+  element topicgroup {
+    topicgroup.attlist,
+    topicmeta?,
+    (topicref | navref | anchor | data.elements.incl)*
+  }
+topicgroup.attlist &=
+  attribute outputclass { text }?,
+  topicref-atts,
+  univ-atts
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+topichead.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ map/topicref mapgroup-d/topichead " ]
+  attribute class { text }?
+topicgroup.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ map/topicref mapgroup-d/topicgroup " ]
+  attribute class { text }?
+# ================== DITA Map Group Domain  ===================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/metaDecl.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/metaDecl.mod
new file mode 100644
index 000000000000..56006a0dbd4d
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/metaDecl.mod
@@ -0,0 +1,277 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Metadata                                     -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA Metadata//EN"
+      Delivered as file "metaDecl.mod"                             -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the DITA XML Metadata              -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!--    2006.06.06 RDA: Move indexterm into commonElements         -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT NAME ENTITIES                      -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % date-format 'CDATA'                                       >
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+<!--                    LONG NAME: Author                          -->
+<!ELEMENT author        (%words.cnt;)*                               >
+<!ATTLIST author 
+             %univ-atts;
+             href       CDATA                            #IMPLIED
+             keyref     CDATA                            #IMPLIED
+             type       (creator | contributor)          #IMPLIED    >
+
+
+<!--                     LONG NAME: Source                         -->
+<!ELEMENT source       (%words.cnt;)*                                >
+<!ATTLIST source 
+             %univ-atts;
+             href       CDATA                            #IMPLIED
+             keyref     CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Publisher                       -->
+<!ELEMENT publisher     (%words.cnt;)*                               >
+<!ATTLIST publisher
+             href       CDATA                            #IMPLIED
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Copyright                       -->
+<!ELEMENT copyright     ((%copyryear;)+, %copyrholder;)              >
+<!ATTLIST copyright 
+             %univ-atts;
+             type      (primary | secondary)             #IMPLIED    >
+
+
+<!--                    LONG NAME: Copyright Year                  -->
+<!ELEMENT copyryear     EMPTY                                        >
+<!ATTLIST copyryear
+             year       %date-format;                    #REQUIRED
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Copyright Holder                -->
+<!ELEMENT copyrholder   (%words.cnt;)*                               >
+<!ATTLIST copyrholder
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Critical Dates                  -->
+<!ELEMENT critdates     (%created;, (%revised;)*)                    >
+<!ATTLIST critdates
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Created Date                    -->
+<!ELEMENT created       EMPTY                                        >
+<!ATTLIST created 
+             %univ-atts;
+             date       %date-format;                    #REQUIRED
+             golive     %date-format;                    #IMPLIED
+             expiry     %date-format;                    #IMPLIED    >
+
+
+<!--                    LONG NAME: Revised Date                    -->
+<!ELEMENT revised       EMPTY                                        >
+<!ATTLIST revised  
+             modified   %date-format;                    #REQUIRED
+             golive     %date-format;                    #IMPLIED
+             expiry     %date-format;                    #IMPLIED
+             %univ-atts;                                             >
+
+
+<!--                     LONG NAME: Permissions                    -->
+<!ELEMENT permissions  EMPTY                                         >
+<!ATTLIST permissions
+             %univ-atts;
+             view       (internal | classified | all | 
+                         entitled)                       #REQUIRED   >
+
+
+<!--                    LONG NAME: Category                        -->
+<!ELEMENT category      (%words.cnt;)*                               >
+<!ATTLIST category     
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Audience                        -->
+<!ELEMENT audience      EMPTY                                        >
+<!ATTLIST audience
+             type       (user | purchaser | administrator |
+                        programmer | executive | services |
+                        other)                           #IMPLIED
+             othertype  CDATA                            #IMPLIED
+             job        (installing | customizing | 
+                         administering | programming |
+                         using| maintaining | troubleshooting |
+                         evaluating | planning | migrating |
+                         other)                          #IMPLIED
+             otherjob    CDATA                           #IMPLIED
+             experiencelevel
+                         (novice | general | expert)     #IMPLIED
+             name        NMTOKEN                         #IMPLIED
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Keywords                        -->
+<!ELEMENT keywords      (%indexterm; | %keyword;)*                   >
+<!ATTLIST keywords
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Product Information             -->
+<!ELEMENT prodinfo      ((%prodname;), (%vrmlist;),
+                         (%brand; | %series; | %platform; | 
+                          %prognum; | %featnum; | %component;)* )    >
+<!ATTLIST prodinfo
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Product Name                    -->
+<!ELEMENT prodname      (%words.cnt;)*                               > 
+<!ATTLIST prodname
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Version Release and Modification
+                                   List                            -->
+<!ELEMENT vrmlist       (%vrm;)+                                     >
+<!ATTLIST vrmlist
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Version Release and Modification-->
+<!ELEMENT vrm           EMPTY                                        >
+<!ATTLIST vrm
+             %univ-atts;               
+             version    CDATA                            #REQUIRED
+             release    CDATA                            #IMPLIED
+             modification 
+                        CDATA                            #IMPLIED    >
+             
+<!--                    LONG NAME: Brand                           -->
+<!ELEMENT brand         (%words.cnt;)*                               >
+<!ATTLIST brand
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Series                          -->
+<!ELEMENT series        (%words.cnt;)*                               >
+<!ATTLIST series
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Platform                        -->
+<!ELEMENT platform      (%words.cnt;)*                               >
+<!ATTLIST platform
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Program Number                  -->
+<!ELEMENT prognum       (%words.cnt;)*                               >
+<!ATTLIST prognum
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Feature Number                  -->
+<!ELEMENT featnum       (%words.cnt;)*                               >
+<!ATTLIST featnum
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Component                       -->
+<!ELEMENT component     (%words.cnt;)*                               >
+<!ATTLIST component
+             %univ-atts;                                             >                                     
+
+
+<!--                    LONG NAME: Other Metadata                  -->
+<!--                    NOTE: needs to be HTML-equiv, at least     -->
+<!ELEMENT othermeta     EMPTY                                        >
+<!ATTLIST othermeta 
+             name       CDATA                            #REQUIRED
+             content    CDATA                            #REQUIRED
+             translate-content
+                        (yes | no)                       #IMPLIED
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Resource Identifier             -->
+<!ELEMENT resourceid    EMPTY                                        >
+<!ATTLIST resourceid
+             %select-atts;
+             %localization-atts;
+             id         CDATA                            #REQUIRED
+             conref     CDATA                            #IMPLIED
+             appname    CDATA                            #IMPLIED    >
+
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+             
+
+<!ATTLIST author      %global-atts;  class CDATA "- topic/author "      >
+<!ATTLIST source      %global-atts;  class CDATA "- topic/source "      >
+<!ATTLIST publisher   %global-atts;  class CDATA "- topic/publisher "   >
+<!ATTLIST copyright   %global-atts;  class CDATA "- topic/copyright "   >
+<!ATTLIST copyryear   %global-atts;  class CDATA "- topic/copyryear "   >
+<!ATTLIST copyrholder %global-atts;  class CDATA "- topic/copyrholder " >
+<!ATTLIST critdates   %global-atts;  class CDATA "- topic/critdates "   >
+<!ATTLIST created     %global-atts;  class CDATA "- topic/created "     >
+<!ATTLIST revised     %global-atts;  class CDATA "- topic/revised "     >
+<!ATTLIST permissions %global-atts;  class CDATA "- topic/permissions " >
+<!ATTLIST category    %global-atts;  class CDATA "- topic/category "    >
+<!ATTLIST audience    %global-atts;  class CDATA "- topic/audience "    >
+<!ATTLIST keywords    %global-atts;  class CDATA "- topic/keywords "    >
+<!ATTLIST prodinfo    %global-atts;  class CDATA "- topic/prodinfo "    >
+<!ATTLIST prodname    %global-atts;  class CDATA "- topic/prodname "    >
+<!ATTLIST vrmlist     %global-atts;  class CDATA "- topic/vrmlist "     >
+<!ATTLIST vrm         %global-atts;  class CDATA "- topic/vrm "         >
+<!ATTLIST brand       %global-atts;  class CDATA "- topic/brand "       >
+<!ATTLIST series      %global-atts;  class CDATA "- topic/series "      >
+<!ATTLIST platform    %global-atts;  class CDATA "- topic/platform "    >
+<!ATTLIST prognum     %global-atts;  class CDATA "- topic/prognum "     >
+<!ATTLIST featnum     %global-atts;  class CDATA "- topic/featnum "     >
+<!ATTLIST component   %global-atts;  class CDATA "- topic/component "   >
+<!ATTLIST othermeta   %global-atts;  class CDATA "- topic/othermeta "   >
+<!ATTLIST resourceid  %global-atts;  class CDATA "- topic/resourceid "  >
+
+<!-- ================== End Metadata  ================================ -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/metaDecl.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/metaDecl.mod.rnc
new file mode 100644
index 000000000000..bbc0213fa25e
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/metaDecl.mod.rnc
@@ -0,0 +1,315 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Metadata
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ENTITIES DITA Metadata//EN"
+#       Delivered as file "metaDecl.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the DITA XML Metadata
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# 2006.06.06 RDA: Move indexterm into commonElements
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+date-format = string
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Author
+author.element = element author { author.attlist, words.cnt* }
+author.attlist &=
+  univ-atts,
+  attribute href { text }?,
+  attribute keyref { text }?,
+  attribute type { "creator" | "contributor" }?
+# LONG NAME: Source
+source.element = element source { source.attlist, words.cnt* }
+source.attlist &=
+  univ-atts,
+  attribute href { text }?,
+  attribute keyref { text }?
+# LONG NAME: Publisher
+publisher.element = element publisher { publisher.attlist, words.cnt* }
+publisher.attlist &=
+  attribute href { text }?,
+  attribute keyref { text }?,
+  univ-atts
+# LONG NAME: Copyright
+copyright.element =
+  element copyright { copyright.attlist, copyryear+, copyrholder }
+copyright.attlist &=
+  univ-atts,
+  attribute type { "primary" | "secondary" }?
+# LONG NAME: Copyright Year
+copyryear.element = element copyryear { copyryear.attlist, empty }
+copyryear.attlist &=
+  attribute year { date-format },
+  univ-atts
+# LONG NAME: Copyright Holder
+copyrholder.element =
+  element copyrholder { copyrholder.attlist, words.cnt* }
+copyrholder.attlist &= univ-atts
+# LONG NAME: Critical Dates
+critdates.element =
+  element critdates { critdates.attlist, created, revised* }
+critdates.attlist &= univ-atts
+# LONG NAME: Created Date
+created.element = element created { created.attlist, empty }
+created.attlist &=
+  univ-atts,
+  attribute date { date-format },
+  attribute golive { date-format }?,
+  attribute expiry { date-format }?
+# LONG NAME: Revised Date
+revised.element = element revised { revised.attlist, empty }
+revised.attlist &=
+  attribute modified { date-format },
+  attribute golive { date-format }?,
+  attribute expiry { date-format }?,
+  univ-atts
+# LONG NAME: Permissions
+permissions.element = element permissions { permissions.attlist, empty }
+permissions.attlist &=
+  univ-atts,
+  attribute view { "internal" | "classified" | "all" | "entitled" }
+# LONG NAME: Category
+category.element = element category { category.attlist, words.cnt* }
+category.attlist &= univ-atts
+# LONG NAME: Audience
+audience.element = element audience { audience.attlist, empty }
+audience.attlist &=
+  attribute type {
+    "user"
+    | "purchaser"
+    | "administrator"
+    | "programmer"
+    | "executive"
+    | "services"
+    | "other"
+  }?,
+  attribute othertype { text }?,
+  attribute job {
+    "installing"
+    | "customizing"
+    | "administering"
+    | "programming"
+    | "using"
+    | "maintaining"
+    | "troubleshooting"
+    | "evaluating"
+    | "planning"
+    | "migrating"
+    | "other"
+  }?,
+  attribute otherjob { text }?,
+  attribute experiencelevel { "novice" | "general" | "expert" }?,
+  attribute name { xsd:NMTOKEN }?,
+  univ-atts
+# LONG NAME: Keywords
+keywords.element =
+  element keywords { keywords.attlist, (indexterm | keyword)* }
+keywords.attlist &= univ-atts
+# LONG NAME: Product Information
+prodinfo.element =
+  element prodinfo {
+    prodinfo.attlist,
+    prodname,
+    vrmlist,
+    (brand | series | platform | prognum | featnum | component)*
+  }
+prodinfo.attlist &= univ-atts
+# LONG NAME: Product Name
+prodname.element = element prodname { prodname.attlist, words.cnt* }
+prodname.attlist &= univ-atts
+# LONG NAME: Version Release and Modification
+# List
+vrmlist.element = element vrmlist { vrmlist.attlist, vrm+ }
+vrmlist.attlist &= univ-atts
+#                     LONG NAME: Version Release and Modification
+vrm.element = element vrm { vrm.attlist, empty }
+vrm.attlist &=
+  univ-atts,
+  attribute version { text },
+  attribute release { text }?,
+  attribute modification { text }?
+# LONG NAME: Brand
+brand.element = element brand { brand.attlist, words.cnt* }
+brand.attlist &= univ-atts
+# LONG NAME: Series
+series.element = element series { series.attlist, words.cnt* }
+series.attlist &= univ-atts
+# LONG NAME: Platform
+platform.element = element platform { platform.attlist, words.cnt* }
+platform.attlist &= univ-atts
+# LONG NAME: Program Number
+prognum.element = element prognum { prognum.attlist, words.cnt* }
+prognum.attlist &= univ-atts
+# LONG NAME: Feature Number
+featnum.element = element featnum { featnum.attlist, words.cnt* }
+featnum.attlist &= univ-atts
+# LONG NAME: Component
+component.element = element component { component.attlist, words.cnt* }
+component.attlist &= univ-atts
+# LONG NAME: Other Metadata
+
+# NOTE: needs to be HTML-equiv, at least
+othermeta.element = element othermeta { othermeta.attlist, empty }
+othermeta.attlist &=
+  attribute name { text },
+  attribute content { text },
+  attribute translate-content { "yes" | "no" }?,
+  univ-atts
+# LONG NAME: Resource Identifier
+resourceid.element = element resourceid { resourceid.attlist, empty }
+resourceid.attlist &=
+  select-atts,
+  localization-atts,
+  attribute id { text },
+  attribute conref { text }?,
+  attribute appname { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+author.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/author " ] attribute class { text }?
+source.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/source " ] attribute class { text }?
+publisher.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/publisher " ] attribute class { text }?
+copyright.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/copyright " ] attribute class { text }?
+copyryear.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/copyryear " ] attribute class { text }?
+copyrholder.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/copyrholder " ] attribute class { text }?
+critdates.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/critdates " ] attribute class { text }?
+created.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/created " ] attribute class { text }?
+revised.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/revised " ] attribute class { text }?
+permissions.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/permissions " ] attribute class { text }?
+category.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/category " ] attribute class { text }?
+audience.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/audience " ] attribute class { text }?
+keywords.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/keywords " ] attribute class { text }?
+prodinfo.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/prodinfo " ] attribute class { text }?
+prodname.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/prodname " ] attribute class { text }?
+vrmlist.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/vrmlist " ] attribute class { text }?
+vrm.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/vrm " ] attribute class { text }?
+brand.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/brand " ] attribute class { text }?
+series.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/series " ] attribute class { text }?
+platform.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/platform " ] attribute class { text }?
+prognum.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/prognum " ] attribute class { text }?
+featnum.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/featnum " ] attribute class { text }?
+component.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/component " ] attribute class { text }?
+othermeta.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/othermeta " ] attribute class { text }?
+resourceid.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/resourceid " ] attribute class { text }?
+# ================== End Metadata  ================================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.ent
new file mode 100644
index 000000000000..f5b5f7ba5a61
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.ent
@@ -0,0 +1,55 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Programming Domain Entities                  -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      November 2005                                     -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA Programming Domain//EN"
+      Delivered as file "programmingDomain.ent"                    -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the substitution context and domain     -->
+<!--             entity declarations for the programming domain    -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Updated these comments to match template   -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    ELEMENT EXTENSION ENTITY DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % pr-d-ph      "codeph | synph"                             >
+<!ENTITY % pr-d-pre     "codeblock"                                  >
+<!ENTITY % pr-d-keyword "option | parmname | apiname"                >
+<!ENTITY % pr-d-fig     "syntaxdiagram"                              >
+<!ENTITY % pr-d-dl      "parml"                                      >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATION                  -->
+<!-- ============================================================= -->
+
+
+<!ENTITY pr-d-att "(topic pr-d)">
+
+<!-- ================== End Programming Domain Entities ========== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.ent.rnc
new file mode 100644
index 000000000000..db75cfa280ab
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.ent.rnc
@@ -0,0 +1,81 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Programming Domain Entities
+
+# VERSION:   1.1
+
+# DATE:      November 2005
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ENTITIES DITA Programming Domain//EN"
+#       Delivered as file "programmingDomain.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the substitution context and domain
+
+# entity declarations for the programming domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Updated these comments to match template
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT EXTENSION ENTITY DECLARATIONS
+
+# =============================================================
+
+pr-d-ph = codeph.element | synph.element
+pr-d-pre = codeblock.element
+pr-d-keyword = option.element | parmname.element | apiname.element
+pr-d-fig = syntaxdiagram.element
+pr-d-dl = parml.element
+# =============================================================
+
+# DOMAIN ENTITY DECLARATION
+
+# =============================================================
+
+# ================== End Programming Domain Entities ==========
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.mod
new file mode 100644
index 000000000000..0775934198e1
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.mod
@@ -0,0 +1,381 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA DITA Programming Domain                      -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Programming Domain//EN"
+      Delivered as file "programmingDomain.mod"                    -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the Programming Domain             -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Updated these comments to match template   -->
+<!--    2005.11.15 RDA: Corrected Long Names for syntax groups,    -->
+<!--                    codeph, and kwd                            -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT NAME ENTITIES                      -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % apiname      "apiname"                                    >
+<!ENTITY % codeblock    "codeblock"                                  >
+<!ENTITY % codeph       "codeph"                                     >
+<!ENTITY % delim        "delim"                                      >
+<!ENTITY % kwd          "kwd"                                        >
+<!ENTITY % oper         "oper"                                       >
+<!ENTITY % option       "option"                                     >
+<!ENTITY % parmname     "parmname"                                   >
+<!ENTITY % sep          "sep"                                        >
+<!ENTITY % synph        "synph"                                      >
+<!ENTITY % var          "var"                                        >
+
+<!ENTITY % parml        "parml"                                      >
+<!ENTITY % pd           "pd"                                         >
+<!ENTITY % plentry      "plentry"                                    >
+<!ENTITY % pt           "pt"                                         >
+
+<!ENTITY % fragment     "fragment"                                   >
+<!ENTITY % fragref      "fragref"                                    >
+<!ENTITY % groupchoice  "groupchoice"                                >
+<!ENTITY % groupcomp    "groupcomp"                                  >
+<!ENTITY % groupseq     "groupseq"                                   >
+<!ENTITY % repsep       "repsep"                                     >
+<!ENTITY % synblk       "synblk"                                     >
+<!ENTITY % synnote      "synnote"                                    >
+<!ENTITY % synnoteref   "synnoteref"                                 >
+<!ENTITY % syntaxdiagram 
+                        "syntaxdiagram"                              >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Universal Attributes Local
+                                   Importance                      -->
+<!--                    Povide an alternative set of univ-atts that 
+                        allows importance to be redefined locally  -->
+<!ENTITY % univ-atts-no-importance
+            '%id-atts;
+             %filter-atts;
+             rev        CDATA                            #IMPLIED
+             status     (new | changed | deleted |
+                         unchanged)                      #IMPLIED
+             %localization-atts;                                 '   > 
+
+
+<!--                    LONG NAME: Code Phrase                     -->
+<!ELEMENT codeph        (#PCDATA | %basic.ph.notm; | 
+                         %data.elements.incl; | 
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST codeph      
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Code Block                      -->
+<!ELEMENT codeblock     (#PCDATA | %basic.ph.notm; | %txt.incl; |
+                         %data.elements.incl; | 
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST codeblock       
+             %display-atts;
+             spectitle  CDATA                            #IMPLIED
+             xml:space  (preserve)                  #FIXED 'preserve'
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Option                          -->
+<!ELEMENT option         (#PCDATA)>
+<!ATTLIST  option          keyref CDATA #IMPLIED
+                          %univ-atts;
+                          outputclass CDATA #IMPLIED                 >
+
+
+<!--                    LONG NAME: Variable                        -->
+<!ELEMENT var           (%words.cnt;)*                               >
+<!ATTLIST var         
+             importance (optional | required | default)  #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Parameter Name                  -->
+<!ELEMENT parmname      (#PCDATA)                                    >
+<!ATTLIST  parmname        
+             keyref      CDATA #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Syntax Phrase                   -->
+<!ELEMENT synph         (#PCDATA | %codeph; | %option; | %parmname; |
+                         %var; | %kwd; | %oper; | %delim; | %sep; | 
+                         %synph;)*                                   >
+<!ATTLIST  synph   
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Operator                        -->
+<!ELEMENT oper          (%words.cnt;)*                               >
+<!ATTLIST oper            
+             importance (optional | required | default)   #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                             #IMPLIED   >
+
+
+<!--                    LONG NAME: Delimiter                       -->
+<!ELEMENT delim         (%words.cnt;)*                               >
+<!ATTLIST delim           
+             importance   (optional | required)           #IMPLIED
+             %univ-atts-no-importance;
+             outputclass
+                        CDATA                             #IMPLIED   >
+
+
+<!--                    LONG NAME: Separator                       -->
+<!ELEMENT sep           (%words.cnt;)*                               >
+<!ATTLIST sep             
+             importance (optional | required)            #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: API Name                        -->
+<!ELEMENT apiname       (#PCDATA)                                    >
+<!ATTLIST apiname         
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Parameter List                  -->
+<!ELEMENT parml         (%plentry;)+                                 >
+<!ATTLIST parml           
+             compact   (yes | no)                        #IMPLIED
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Parameter List Entry            -->
+<!ELEMENT plentry       ((%pt;)+, (%pd;)+)                           >
+<!ATTLIST plentry       
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Parameter Term                  -->
+<!ELEMENT pt            (%term.cnt;)*                                > 
+<!ATTLIST pt           
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Parameter Description           -->
+<!ELEMENT pd            (%defn.cnt;)*                                >
+<!ATTLIST pd             
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Syntax Diagram                  -->
+<!ELEMENT syntaxdiagram ((%title;)?,
+                         (%groupseq; | %groupchoice; | %groupcomp; |
+                          %fragref; | %fragment; | %synblk; |
+                          %synnote; | %synnoteref;)* )               >
+<!ATTLIST syntaxdiagram   
+             %display-atts;
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Syntax Block                    -->
+<!ELEMENT synblk        ((%title;)?, 
+                         (%groupseq; | %groupchoice; | %groupcomp; |
+                          %fragref; | %fragment;| %synnote; |
+                          %synnoteref;)* )                           >
+<!ATTLIST synblk
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Sequence Group                  -->
+<!ELEMENT groupseq      ((%title;)?, (%repsep;)?,
+                         (%groupseq; | %groupchoice; | %groupcomp; |
+                          %fragref; | %kwd; | %var; | %delim; | 
+                          %oper; | %sep; | %synnote; | 
+                          %synnoteref;)* )                           >
+<!ATTLIST groupseq        
+             importance (optional | required | default)    
+                                                      #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice Group                    -->
+<!ELEMENT groupchoice   ((%title;)?, (%repsep;)?,
+                         (%groupseq; | %groupchoice; | %groupcomp; |
+                          %fragref;| %kwd; | %var; | %delim; |
+                          %oper; | %sep; | %synnote; | 
+                          %synnoteref;)* )                           > 
+<!ATTLIST  groupchoice     
+             importance (optional | required | default)    
+                                                      #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Composite group                 -->
+<!ELEMENT groupcomp     ((%title;)?, (%repsep;)?,
+                         (%groupseq; | %groupchoice; | %groupcomp; |
+                          %fragref; | %kwd; | %var; | %delim; |
+                          %oper; | %sep; | %synnote; | 
+                          %synnoteref;)* )                           > 
+<!ATTLIST  groupcomp       
+             importance (optional | required | default)    
+                                                      #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Fragment                        -->
+<!ELEMENT fragment      ((%title;)?, 
+                         (%groupseq; | %groupchoice; | %groupcomp; |
+                          %fragref; | %synnote; | %synnoteref;)* )   >
+<!ATTLIST fragment        
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+  
+
+
+<!--                    LONG NAME: Fragment Reference              -->
+<!ELEMENT fragref       (%xrefph.cnt;)*><!--xref-->
+<!ATTLIST fragref         
+             href       CDATA                            #IMPLIED
+             importance (optional | required)            #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Syntax Diagram Note             -->
+<!ELEMENT synnote       (#PCDATA | %basic.ph;)*                      >     
+<!ATTLIST synnote        
+             callout    CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Syntax Note Reference           -->
+<!ELEMENT synnoteref     EMPTY >
+<!ATTLIST synnoteref      
+             href       CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Repeat Separator                -->
+<!ELEMENT repsep         (%words.cnt;)*                              >
+<!ATTLIST repsep          
+            importance  (optional | required)  #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Syntax Keyword                  -->
+<!ELEMENT kwd           (#PCDATA)                                    >
+<!ATTLIST kwd             
+             keyref     CDATA                            #IMPLIED
+             importance (optional | required | default)  #IMPLIED
+             %univ-atts-no-importance;                             
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+             
+
+<!ATTLIST  apiname    %global-atts; class CDATA "+ topic/keyword pr-d/apiname "  >
+<!ATTLIST  codeblock  %global-atts; class CDATA "+ topic/pre pr-d/codeblock "    >
+<!ATTLIST  codeph     %global-atts; class CDATA "+ topic/ph pr-d/codeph "        >
+<!ATTLIST  delim      %global-atts; class CDATA "+ topic/ph pr-d/delim "         >
+<!ATTLIST  fragment   %global-atts; class CDATA "+ topic/figgroup pr-d/fragment ">
+<!ATTLIST  fragref    %global-atts; class CDATA "+ topic/xref pr-d/fragref "     >
+<!ATTLIST  groupchoice 
+                      %global-atts; class CDATA "+ topic/figgroup pr-d/groupchoice ">
+<!ATTLIST  groupcomp  %global-atts; class CDATA "+ topic/figgroup pr-d/groupcomp ">
+<!ATTLIST  groupseq   %global-atts; class CDATA "+ topic/figgroup pr-d/groupseq ">
+<!ATTLIST  kwd        %global-atts; class CDATA "+ topic/keyword pr-d/kwd "      >
+<!ATTLIST  oper       %global-atts; class CDATA "+ topic/ph pr-d/oper "          >
+<!ATTLIST  option     %global-atts; class CDATA "+ topic/keyword pr-d/option "   >
+<!ATTLIST  parml      %global-atts; class CDATA "+ topic/dl pr-d/parml "         >
+<!ATTLIST  parmname   %global-atts; class CDATA "+ topic/keyword pr-d/parmname " >
+<!ATTLIST  pd         %global-atts; class CDATA "+ topic/dd pr-d/pd "            >
+<!ATTLIST  plentry    %global-atts; class CDATA "+ topic/dlentry pr-d/plentry "  >
+<!ATTLIST  pt         %global-atts; class CDATA "+ topic/dt pr-d/pt "            >
+<!ATTLIST  repsep     %global-atts; class CDATA "+ topic/ph pr-d/repsep "        >
+<!ATTLIST  sep        %global-atts; class CDATA "+ topic/ph pr-d/sep "           >
+<!ATTLIST  synblk     %global-atts; class CDATA "+ topic/figgroup pr-d/synblk "  >
+<!ATTLIST  synnote    %global-atts; class CDATA "+ topic/fn pr-d/synnote "       >
+<!ATTLIST  synnoteref %global-atts; class CDATA "+ topic/xref pr-d/synnoteref "  >
+<!ATTLIST  synph      %global-atts; class CDATA "+ topic/ph pr-d/synph "         >
+<!ATTLIST  syntaxdiagram 
+                      %global-atts; class CDATA "+ topic/fig pr-d/syntaxdiagram ">
+<!ATTLIST  var        %global-atts; class CDATA "+ topic/ph pr-d/var "           >
+
+
+<!-- ================== End Programming Domain  ====================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.mod.rnc
new file mode 100644
index 000000000000..bb242357ba78
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/programmingDomain.mod.rnc
@@ -0,0 +1,475 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA DITA Programming Domain
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Programming Domain//EN"
+#       Delivered as file "programmingDomain.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the Programming Domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Updated these comments to match template
+
+# 2005.11.15 RDA: Corrected Long Names for syntax groups,
+
+# codeph, and kwd
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+codeph = codeph.element
+delim = delim.element
+kwd = kwd.element
+oper = oper.element
+option = option.element
+parmname = parmname.element
+sep = sep.element
+synph = synph.element
+var = var.element
+pd = pd.element
+plentry = plentry.element
+pt = pt.element
+fragment = fragment.element
+fragref = fragref.element
+groupchoice = groupchoice.element
+groupcomp = groupcomp.element
+groupseq = groupseq.element
+repsep = repsep.element
+synblk = synblk.element
+synnote = synnote.element
+synnoteref = synnoteref.element
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Universal Attributes Local
+# Importance
+
+# Povide an alternative set of univ-atts that 
+# allows importance to be redefined locally
+univ-atts-no-importance =
+  id-atts,
+  filter-atts,
+  attribute rev { text }?,
+  attribute status { "new" | "changed" | "deleted" | "unchanged" }?,
+  localization-atts
+# LONG NAME: Code Phrase
+codeph.element =
+  element codeph {
+    codeph.attlist,
+    (text | basic.ph.notm | data.elements.incl | foreign.unknown.incl)*
+  }
+codeph.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Code Block
+codeblock.element =
+  element codeblock {
+    codeblock.attlist,
+    (text
+     | basic.ph.notm
+     | txt.incl
+     | data.elements.incl
+     | foreign.unknown.incl)*
+  }
+codeblock.attlist &=
+  display-atts,
+  attribute spectitle { text }?,
+  [ a:defaultValue = "preserve" ] attribute xml:space { "preserve" }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Option
+option.element = element option { option.attlist, text }
+option.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Variable
+var.element = element var { var.attlist, words.cnt* }
+var.attlist &=
+  attribute importance { "optional" | "required" | "default" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: Parameter Name
+parmname.element = element parmname { parmname.attlist, text }
+parmname.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Syntax Phrase
+synph.element =
+  element synph {
+    synph.attlist,
+    (text
+     | codeph
+     | option
+     | parmname
+     | var
+     | kwd
+     | oper
+     | delim
+     | sep
+     | synph)*
+  }
+synph.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Operator
+oper.element = element oper { oper.attlist, words.cnt* }
+oper.attlist &=
+  attribute importance { "optional" | "required" | "default" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: Delimiter
+delim.element = element delim { delim.attlist, words.cnt* }
+delim.attlist &=
+  attribute importance { "optional" | "required" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: Separator
+sep.element = element sep { sep.attlist, words.cnt* }
+sep.attlist &=
+  attribute importance { "optional" | "required" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: API Name
+apiname.element = element apiname { apiname.attlist, text }
+apiname.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Parameter List
+parml.element = element parml { parml.attlist, plentry+ }
+parml.attlist &=
+  attribute compact { "yes" | "no" }?,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Parameter List Entry
+plentry.element = element plentry { plentry.attlist, pt+, pd+ }
+plentry.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Parameter Term
+pt.element = element pt { pt.attlist, term.cnt* }
+pt.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Parameter Description
+pd.element = element pd { pd.attlist, defn.cnt* }
+pd.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Syntax Diagram
+syntaxdiagram.element =
+  element syntaxdiagram {
+    syntaxdiagram.attlist,
+    title?,
+    (groupseq
+     | groupchoice
+     | groupcomp
+     | fragref
+     | fragment
+     | synblk
+     | synnote
+     | synnoteref)*
+  }
+syntaxdiagram.attlist &=
+  display-atts,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Syntax Block
+synblk.element =
+  element synblk {
+    synblk.attlist,
+    title?,
+    (groupseq
+     | groupchoice
+     | groupcomp
+     | fragref
+     | fragment
+     | synnote
+     | synnoteref)*
+  }
+synblk.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Sequence Group
+groupseq.element =
+  element groupseq {
+    groupseq.attlist,
+    title?,
+    repsep?,
+    (groupseq
+     | groupchoice
+     | groupcomp
+     | fragref
+     | kwd
+     | var
+     | delim
+     | oper
+     | sep
+     | synnote
+     | synnoteref)*
+  }
+groupseq.attlist &=
+  attribute importance { "optional" | "required" | "default" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: Choice Group
+groupchoice.element =
+  element groupchoice {
+    groupchoice.attlist,
+    title?,
+    repsep?,
+    (groupseq
+     | groupchoice
+     | groupcomp
+     | fragref
+     | kwd
+     | var
+     | delim
+     | oper
+     | sep
+     | synnote
+     | synnoteref)*
+  }
+groupchoice.attlist &=
+  attribute importance { "optional" | "required" | "default" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: Composite group
+groupcomp.element =
+  element groupcomp {
+    groupcomp.attlist,
+    title?,
+    repsep?,
+    (groupseq
+     | groupchoice
+     | groupcomp
+     | fragref
+     | kwd
+     | var
+     | delim
+     | oper
+     | sep
+     | synnote
+     | synnoteref)*
+  }
+groupcomp.attlist &=
+  attribute importance { "optional" | "required" | "default" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: Fragment
+fragment.element =
+  element fragment {
+    fragment.attlist,
+    title?,
+    (groupseq
+     | groupchoice
+     | groupcomp
+     | fragref
+     | synnote
+     | synnoteref)*
+  }
+fragment.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Fragment Reference
+fragref.element = element fragref { fragref.attlist, xrefph.cnt* }
+# xref
+fragref.attlist &=
+  attribute href { text }?,
+  attribute importance { "optional" | "required" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: Syntax Diagram Note
+synnote.element =
+  element synnote { synnote.attlist, (text | basic.ph)* }
+synnote.attlist &=
+  attribute callout { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Syntax Note Reference
+synnoteref.element = element synnoteref { synnoteref.attlist, empty }
+synnoteref.attlist &=
+  attribute href { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Repeat Separator
+repsep.element = element repsep { repsep.attlist, words.cnt* }
+repsep.attlist &=
+  attribute importance { "optional" | "required" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# LONG NAME: Syntax Keyword
+kwd.element = element kwd { kwd.attlist, text }
+kwd.attlist &=
+  attribute keyref { text }?,
+  attribute importance { "optional" | "required" | "default" }?,
+  univ-atts-no-importance,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+apiname.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword pr-d/apiname " ]
+  attribute class { text }?
+codeblock.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/pre pr-d/codeblock " ]
+  attribute class { text }?
+codeph.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph pr-d/codeph " ]
+  attribute class { text }?
+delim.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph pr-d/delim " ]
+  attribute class { text }?
+fragment.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/figgroup pr-d/fragment " ]
+  attribute class { text }?
+fragref.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/xref pr-d/fragref " ]
+  attribute class { text }?
+groupchoice.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/figgroup pr-d/groupchoice " ]
+  attribute class { text }?
+groupcomp.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/figgroup pr-d/groupcomp " ]
+  attribute class { text }?
+groupseq.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/figgroup pr-d/groupseq " ]
+  attribute class { text }?
+kwd.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword pr-d/kwd " ]
+  attribute class { text }?
+oper.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph pr-d/oper " ] attribute class { text }?
+option.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword pr-d/option " ]
+  attribute class { text }?
+parml.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/dl pr-d/parml " ]
+  attribute class { text }?
+parmname.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword pr-d/parmname " ]
+  attribute class { text }?
+pd.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/dd pr-d/pd " ] attribute class { text }?
+plentry.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/dlentry pr-d/plentry " ]
+  attribute class { text }?
+pt.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/dt pr-d/pt " ] attribute class { text }?
+repsep.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph pr-d/repsep " ]
+  attribute class { text }?
+sep.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph pr-d/sep " ] attribute class { text }?
+synblk.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/figgroup pr-d/synblk " ]
+  attribute class { text }?
+synnote.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/fn pr-d/synnote " ]
+  attribute class { text }?
+synnoteref.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/xref pr-d/synnoteref " ]
+  attribute class { text }?
+synph.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph pr-d/synph " ]
+  attribute class { text }?
+syntaxdiagram.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/fig pr-d/syntaxdiagram " ]
+  attribute class { text }?
+var.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph pr-d/var " ] attribute class { text }?
+# ================== End Programming Domain  ======================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/reference.dtd b/xml/tests/testData/xml/OasisDocumentHighlighting/reference.dtd
new file mode 100644
index 000000000000..fbfdfa4105db
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/reference.dtd
@@ -0,0 +1,176 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Reference DTD                                -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//DTD DITA Reference//EN"
+      Delivered as file "reference.dtd"                            -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    DTD to describe DITA References                   -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2006.06.07 RDA: Added indexing domain                      -->
+<!--    2006.06.21 RDA: Added props attribute extensions           -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATIONS                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA User Interface Domain//EN" 
+"uiDomain.ent"                                                       >
+%ui-d-dec;
+
+<!ENTITY % hi-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Highlight Domain//EN" 
+"highlightDomain.ent"                                                >
+%hi-d-dec;
+
+<!ENTITY % pr-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Programming Domain//EN" 
+"programmingDomain.ent"                                              >
+%pr-d-dec;
+
+<!ENTITY % sw-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Software Domain//EN" 
+"softwareDomain.ent"                                                 >
+%sw-d-dec;
+
+<!ENTITY % ut-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Utilities Domain//EN" 
+"utilitiesDomain.ent"                                                >
+%ut-d-dec;
+
+<!ENTITY % indexing-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Indexing Domain//EN" 
+"indexingDomain.ent"                                                 >
+%indexing-d-dec;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE DECLARATIONS              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN EXTENSIONS                          -->
+<!-- ============================================================= -->
+<!--                    One for each extended base element, with
+                        the name of the domain(s) in which the
+                        extension was declared                     -->
+
+<!ENTITY % pre          "pre     | %pr-d-pre;     | %sw-d-pre;     | 
+                                   %ui-d-pre;"                       >
+<!ENTITY % keyword      "keyword | %pr-d-keyword; | %sw-d-keyword; |
+                                   %ui-d-keyword;"                   >
+<!ENTITY % ph           "ph      | %pr-d-ph;      | %sw-d-ph;      | 
+                                    %hi-d-ph;     | %ui-d-ph;"       >
+<!ENTITY % fig          "fig     | %pr-d-fig;     | %ut-d-fig;"      >
+<!ENTITY % dl           "dl      | %pr-d-dl;"                        >
+<!ENTITY % index-base   "index-base | %indexing-d-index-base;"       >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE EXTENSIONS                -->
+<!-- ============================================================= -->
+<!ENTITY % props-attribute-extensions  ""                            >
+<!ENTITY % base-attribute-extensions   ""                            >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC NESTING OVERRIDE                     -->
+<!-- ============================================================= -->
+
+<!--                    Redefine the infotype entity to exclude 
+                        other topic types and disallow nesting     -->
+<!ENTITY % reference-info-types 
+                        "reference"                                  >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+<!--                    Must be declared ahead of the DTDs, which
+                        puts @domains first in order               -->
+
+<!ENTITY included-domains 
+                        "&ui-d-att; &hi-d-att; &pr-d-att; &sw-d-att;
+                         &ut-d-att; &indexing-d-att;"                >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC ELEMENT INTEGRATION                  -->
+<!-- ============================================================= -->
+
+<!--                    Embed topic to get generic elements        -->
+<!ENTITY % topic-type   PUBLIC 
+"-//OASIS//ELEMENTS DITA Topic//EN" 
+"topic.mod"                                                          >
+%topic-type;
+
+<!--                     Embed reference to get specific elements  -->
+<!ENTITY % reference-typemod 
+                        PUBLIC 
+"-//OASIS//ELEMENTS DITA Reference//EN" 
+"reference.mod"                                                      >
+ %reference-typemod;
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ELEMENT INTEGRATION                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA User Interface Domain//EN" 
+"uiDomain.mod"                                                       >
+%ui-d-def;
+
+<!ENTITY % hi-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Highlight Domain//EN" 
+"highlightDomain.mod"                                                >
+%hi-d-def;
+
+<!ENTITY % pr-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Programming Domain//EN" 
+"programmingDomain.mod"                                              >
+%pr-d-def;
+
+<!ENTITY % sw-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Software Domain//EN" 
+"softwareDomain.mod"                                                 >
+%sw-d-def;
+
+<!ENTITY % ut-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Utilities Domain//EN" 
+"utilitiesDomain.mod"                                                >
+%ut-d-def;
+
+<!ENTITY % indexing-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Indexing Domain//EN" 
+"indexingDomain.mod"                                                 >
+%indexing-d-def;
+
+
+<!-- ================== End DITA Reference DTD  ================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/reference.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/reference.mod
new file mode 100644
index 000000000000..dabaace1562c
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/reference.mod
@@ -0,0 +1,246 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Reference                                    -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Reference//EN"
+      Delivered as file "reference.mod"                            -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for Reference                          -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Removed old declaration for                -->
+<!--                    referenceClasses entity                    -->
+<!--    2005.11.15 RDA: Corrected LONG NAME for propdeschd         -->
+<!--    2006.06.07 RDA: Added <abstract> element                   -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ARCHITECTURE ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!-- default namespace prefix for DITAArchVersion attribute can be
+     overridden through predefinition in the document type shell   -->
+<!ENTITY % DITAArchNSPrefix
+                       "ditaarch"                                    >
+
+<!-- must be instanced on each topic type                          -->
+<!ENTITY % arch-atts "
+             xmlns:%DITAArchNSPrefix; 
+                        CDATA                              #FIXED
+                       'http://dita.oasis-open.org/architecture/2005/'
+             %DITAArchNSPrefix;:DITAArchVersion
+                        CDATA                              #FIXED
+                       '1.1'"                                        >
+
+
+<!-- ============================================================= -->
+<!--                   SPECIALIZATION OF DECLARED ELEMENTS         -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % reference-info-types 
+                      "%info-types;"                                 >
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % reference   "reference"                                   >
+<!ENTITY % refbody     "refbody"                                     >
+<!ENTITY % refsyn      "refsyn"                                      >
+<!ENTITY % properties  "properties"                                  >
+<!ENTITY % property    "property"                                    >
+<!ENTITY % proptype    "proptype"                                    >
+<!ENTITY % propvalue   "propvalue"                                   >
+<!ENTITY % propdesc    "propdesc"                                    >
+<!ENTITY % prophead    "prophead"                                    >
+<!ENTITY % proptypehd  "proptypehd"                                  >
+<!ENTITY % propvaluehd "propvaluehd"                                 >
+<!ENTITY % propdeschd  "propdeschd"                                  >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY included-domains ""                                         >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Reference                       -->
+<!ELEMENT reference     ((%title;), (%titlealts;)?,
+                         (%shortdesc; | %abstract;)?, 
+                         (%prolog;)?, (%refbody;)?, (%related-links;)?, 
+                         (%reference-info-types;)* )                 >
+<!ATTLIST reference
+             id         ID                               #REQUIRED
+             conref     CDATA                            #IMPLIED
+             %select-atts;
+             %localization-atts;
+             %arch-atts;
+             domains    CDATA                  "&included-domains;"
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Reference Body                  -->
+<!ELEMENT refbody       ((%section; | %refsyn; | %example; | %table; | 
+                          %simpletable; |  %properties; | 
+                          %data.elements.incl; | 
+                          %foreign.unknown.incl;)* )                 >
+<!ATTLIST refbody         
+             %id-atts;
+             %localization-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Reference Syntax                -->
+<!ELEMENT refsyn        (%section.cnt;)*                             >  
+<!ATTLIST refsyn          
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Properties                      -->
+<!ELEMENT properties    ((%prophead;)?, (%property;)+)               >
+<!ATTLIST properties      
+             relcolwidth 
+                        CDATA                           #IMPLIED
+             keycol     NMTOKEN                         #IMPLIED
+             refcols    NMTOKENS                        #IMPLIED
+             spectitle  CDATA                           #IMPLIED
+             %display-atts;
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME:  Property Head                  -->
+<!ELEMENT prophead      ((%proptypehd;)?, (%propvaluehd;)?, 
+                         (%propdeschd;)?)                            >
+<!ATTLIST prophead       
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Property Type Head              -->
+<!ELEMENT proptypehd    (%tblcell.cnt;)*                             >
+<!ATTLIST proptypehd     
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Property Value Head             -->
+<!ELEMENT propvaluehd   (%tblcell.cnt;)*                             >
+<!ATTLIST propvaluehd     
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Property Description Head       -->
+<!ELEMENT propdeschd    (%tblcell.cnt;)*                             >
+<!ATTLIST propdeschd    
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Property                        -->
+<!ELEMENT property      ((%proptype;)?, (%propvalue;)?, 
+                         (%propdesc;)?)                              >
+<!ATTLIST property       
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Property Type                   -->
+<!ELEMENT proptype      (%ph.cnt;)*                                  >
+<!ATTLIST proptype       
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Property Value                  -->
+<!ELEMENT propvalue     (%ph.cnt;)*                                  >
+<!ATTLIST propvalue      
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Property Descrption             -->
+<!ELEMENT propdesc      (%desc.cnt;)*                                >
+<!ATTLIST propdesc        
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+             
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ATTLIST reference   %global-atts;  class  CDATA "- topic/topic       reference/reference " >
+<!ATTLIST refbody     %global-atts;  class  CDATA "- topic/body        reference/refbody "   >
+<!ATTLIST refsyn      %global-atts;  class  CDATA "- topic/section     reference/refsyn "    >
+<!ATTLIST properties  %global-atts;  class  CDATA "- topic/simpletable reference/properties ">
+<!ATTLIST property    %global-atts;  class  CDATA "- topic/strow       reference/property "  >
+<!ATTLIST proptype    %global-atts;  class  CDATA "- topic/stentry     reference/proptype "  >
+<!ATTLIST propvalue   %global-atts;  class  CDATA "- topic/stentry     reference/propvalue " >
+<!ATTLIST propdesc    %global-atts;  class  CDATA "- topic/stentry     reference/propdesc "  >
+
+<!ATTLIST prophead    %global-atts;  class  CDATA "- topic/sthead      reference/prophead "  >
+<!ATTLIST proptypehd  %global-atts;  class  CDATA "- topic/stentry     reference/proptypehd ">
+<!ATTLIST propvaluehd %global-atts;  class  CDATA "- topic/stentry     reference/propvaluehd ">
+<!ATTLIST propdeschd  %global-atts;  class  CDATA "- topic/stentry     reference/propdeschd ">
+
+ 
+<!-- ================== End DITA Reference  =========================== -->
+
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/reference.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/reference.mod.rnc
new file mode 100644
index 000000000000..177990e82e5e
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/reference.mod.rnc
@@ -0,0 +1,286 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Reference
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Reference//EN"
+#       Delivered as file "reference.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for Reference
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Removed old declaration for
+
+# referenceClasses entity
+
+# 2005.11.15 RDA: Corrected LONG NAME for propdeschd
+
+# 2006.06.07 RDA: Added <abstract> element
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# =============================================================
+
+# =============================================================
+
+# ARCHITECTURE ENTITIES
+
+# =============================================================
+
+# default namespace prefix for DITAArchVersion attribute can be
+# overridden through predefinition in the document type shell
+
+# must be instanced on each topic type
+
+# =============================================================
+
+# SPECIALIZATION OF DECLARED ELEMENTS
+
+# =============================================================
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+reference-info-types = info-types
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+refbody = refbody.element
+refsyn = refsyn.element
+properties = properties.element
+property = property.element
+proptype = proptype.element
+propvalue = propvalue.element
+propdesc = propdesc.element
+prophead = prophead.element
+proptypehd = proptypehd.element
+propvaluehd = propvaluehd.element
+propdeschd = propdeschd.element
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Reference
+reference.element =
+  element reference {
+    reference.attlist,
+    title,
+    titlealts?,
+    (shortdesc | abstract)?,
+    prolog?,
+    refbody?,
+    related-links?,
+    reference-info-types*
+  }
+reference.attlist &=
+  attribute id { xsd:ID },
+  attribute conref { text }?,
+  select-atts,
+  localization-atts,
+  arch-atts,
+  [
+    a:defaultValue =
+      "(topic ui-d) (topic hi-d) (topic pr-d) (topic sw-d)                          (topic ut-d) (topic indexing-d)"
+  ]
+  attribute domains { text }?,
+  attribute outputclass { text }?
+# LONG NAME: Reference Body
+refbody.element =
+  element refbody {
+    refbody.attlist,
+    (section
+     | refsyn
+     | example
+     | table
+     | simpletable
+     | properties
+     | data.elements.incl
+     | foreign.unknown.incl)*
+  }
+refbody.attlist &=
+  id-atts,
+  localization-atts,
+  attribute outputclass { text }?
+# LONG NAME: Reference Syntax
+refsyn.element = element refsyn { refsyn.attlist, section.cnt* }
+refsyn.attlist &=
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Properties
+properties.element =
+  element properties { properties.attlist, prophead?, property+ }
+properties.attlist &=
+  attribute relcolwidth { text }?,
+  attribute keycol { xsd:NMTOKEN }?,
+  attribute refcols { xsd:NMTOKENS }?,
+  attribute spectitle { text }?,
+  display-atts,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME:  Property Head
+prophead.element =
+  element prophead {
+    prophead.attlist, proptypehd?, propvaluehd?, propdeschd?
+  }
+prophead.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Property Type Head
+proptypehd.element =
+  element proptypehd { proptypehd.attlist, tblcell.cnt* }
+proptypehd.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Property Value Head
+propvaluehd.element =
+  element propvaluehd { propvaluehd.attlist, tblcell.cnt* }
+propvaluehd.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Property Description Head
+propdeschd.element =
+  element propdeschd { propdeschd.attlist, tblcell.cnt* }
+propdeschd.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Property
+property.element =
+  element property {
+    property.attlist, proptype?, propvalue?, propdesc?
+  }
+property.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Property Type
+proptype.element = element proptype { proptype.attlist, ph.cnt* }
+proptype.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Property Value
+propvalue.element = element propvalue { propvalue.attlist, ph.cnt* }
+propvalue.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Property Descrption
+propdesc.element = element propdesc { propdesc.attlist, desc.cnt* }
+propdesc.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+reference.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/topic       reference/reference " ]
+  attribute class { text }?
+refbody.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/body        reference/refbody " ]
+  attribute class { text }?
+refsyn.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/section     reference/refsyn " ]
+  attribute class { text }?
+properties.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/simpletable reference/properties " ]
+  attribute class { text }?
+property.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/strow       reference/property " ]
+  attribute class { text }?
+proptype.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry     reference/proptype " ]
+  attribute class { text }?
+propvalue.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry     reference/propvalue " ]
+  attribute class { text }?
+propdesc.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry     reference/propdesc " ]
+  attribute class { text }?
+prophead.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/sthead      reference/prophead " ]
+  attribute class { text }?
+proptypehd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry     reference/proptypehd " ]
+  attribute class { text }?
+propvaluehd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry     reference/propvaluehd " ]
+  attribute class { text }?
+propdeschd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry     reference/propdeschd " ]
+  attribute class { text }?
+# ================== End DITA Reference  ===========================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/reference.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/reference.rnc
new file mode 100644
index 000000000000..fc415dd563ec
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/reference.rnc
@@ -0,0 +1,148 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Reference DTD
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//DTD DITA Reference//EN"
+#       Delivered as file "reference.dtd"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    DTD to describe DITA References
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2006.06.07 RDA: Added indexing domain
+
+# 2006.06.21 RDA: Added props attribute extensions
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN ENTITY DECLARATIONS
+
+# =============================================================
+
+include "uiDomain.ent.rnc"
+include "highlightDomain.ent.rnc"
+include "programmingDomain.ent.rnc"
+include "softwareDomain.ent.rnc"
+include "utilitiesDomain.ent.rnc"
+include "indexingDomain.ent.rnc"
+# =============================================================
+
+# DOMAIN ATTRIBUTE DECLARATIONS
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN EXTENSIONS
+
+# =============================================================
+
+# One for each extended base element, with
+# the name of the domain(s) in which the
+# extension was declared
+pre = pre.element | pr-d-pre | sw-d-pre | ui-d-pre
+keyword = keyword.element | pr-d-keyword | sw-d-keyword | ui-d-keyword
+ph = ph.element | pr-d-ph | sw-d-ph | hi-d-ph | ui-d-ph
+fig = fig.element | pr-d-fig | ut-d-fig
+dl = dl.element | pr-d-dl
+index-base = index-base.element | indexing-d-index-base
+# =============================================================
+
+# DOMAIN ATTRIBUTE EXTENSIONS
+
+# =============================================================
+props-attribute-extensions = empty
+base-attribute-extensions = empty
+# =============================================================
+
+# TOPIC NESTING OVERRIDE
+
+# =============================================================
+
+# Redefine the infotype entity to exclude 
+# other topic types and disallow nesting
+reference-info-types = reference.element
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# Must be declared ahead of the DTDs, which
+# puts @domains first in order
+
+# =============================================================
+
+# TOPIC ELEMENT INTEGRATION
+
+# =============================================================
+
+# Embed topic to get generic elements
+include "topic.mod.rnc"
+# Embed reference to get specific elements
+include "reference.mod.rnc"
+# =============================================================
+
+# DOMAIN ELEMENT INTEGRATION
+
+# =============================================================
+include "uiDomain.mod.rnc"
+include "highlightDomain.mod.rnc"
+include "programmingDomain.mod.rnc"
+include "softwareDomain.mod.rnc"
+include "utilitiesDomain.mod.rnc"
+include "indexingDomain.mod.rnc"
+start = no-topic-nesting.element
+any =
+  (element * {
+     attribute * { text }*,
+     any
+   }
+   | text)*
+# ================== End DITA Reference DTD  ==================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.ent
new file mode 100644
index 000000000000..82c6575dee2c
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.ent
@@ -0,0 +1,53 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Software Domain Entities                     -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA Software Domain//EN"
+      Delivered as file "softwareDomain.ent"                       -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the substitution context and domain     -->
+<!--             entity declarations for the software domain       -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Updated these comments to match template   -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    ELEMENT EXTENSION ENTITY DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ENTITY % sw-d-pre     "msgblock"                                   >
+<!ENTITY % sw-d-ph      "filepath | msgph  | userinput |systemoutput">
+<!ENTITY % sw-d-keyword "cmdname  | msgnum | varname"                >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATION                  -->
+<!-- ============================================================= -->
+
+<!ENTITY sw-d-att       "(topic sw-d)"                               >
+
+
+<!-- ================== End Software Domain Entities ============= -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.ent.rnc
new file mode 100644
index 000000000000..eeb9b5320438
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.ent.rnc
@@ -0,0 +1,83 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Software Domain Entities
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ENTITIES DITA Software Domain//EN"
+#       Delivered as file "softwareDomain.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the substitution context and domain
+
+# entity declarations for the software domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Updated these comments to match template
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT EXTENSION ENTITY DECLARATIONS
+
+# =============================================================
+
+sw-d-pre = msgblock.element
+sw-d-ph =
+  filepath.element
+  | msgph.element
+  | userinput.element
+  | systemoutput.element
+sw-d-keyword = cmdname.element | msgnum.element | varname.element
+# =============================================================
+
+# DOMAIN ENTITY DECLARATION
+
+# =============================================================
+
+# ================== End Software Domain Entities =============
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.mod
new file mode 100644
index 000000000000..6fb09e7efff2
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.mod
@@ -0,0 +1,145 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Software Domain                              -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Software Domain//EN"
+      Delivered as file "softwareDomain.mod"                       -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the Software Domain                -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected the PURPOSE in this comment      -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % msgph       "msgph"                                       >
+<!ENTITY % msgblock    "msgblock"                                    >
+<!ENTITY % msgnum      "msgnum"                                      >
+<!ENTITY % cmdname     "cmdname"                                     >
+<!ENTITY % varname     "varname"                                     >
+<!ENTITY % filepath    "filepath"                                    >
+<!ENTITY % userinput   "userinput"                                   >
+<!ENTITY % systemoutput 
+                       "systemoutput"                                >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Message Phrase                  -->
+<!ELEMENT msgph         (%words.cnt;)*                               >
+<!ATTLIST msgph          
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Message Block                   -->
+<!ELEMENT msgblock      (%words.cnt;)*                               >
+<!ATTLIST msgblock        
+             %display-atts;
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    
+             xml:space  (preserve)                #FIXED "preserve"  >
+
+
+<!--                    LONG NAME: Message Number                  -->
+<!ELEMENT msgnum         (#PCDATA)                                   >
+<!ATTLIST msgnum          
+             keyref      CDATA                           #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Command Name                    -->
+<!ELEMENT cmdname       (#PCDATA)                                    >
+<!ATTLIST cmdname       
+             keyref      CDATA                           #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Variable Name                   -->
+<!ELEMENT varname       (#PCDATA)                                    >
+<!ATTLIST varname         
+             keyref      CDATA                           #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: File Path                       -->
+<!ELEMENT filepath      (%words.cnt;)*                               >
+<!ATTLIST filepath       
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: User Input                      -->
+<!ELEMENT userinput     (%words.cnt;)*                               >
+<!ATTLIST userinput      
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: System Output                   -->
+<!ELEMENT systemoutput  (%words.cnt;)*                               >
+<!ATTLIST systemoutput   
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+             
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+             
+
+<!ATTLIST cmdname     %global-atts;  class CDATA "+ topic/keyword sw-d/cmdname ">
+<!ATTLIST filepath    %global-atts;  class CDATA "+ topic/ph sw-d/filepath "    >
+<!ATTLIST msgblock    %global-atts;  class CDATA "+ topic/pre sw-d/msgblock "   >
+<!ATTLIST msgnum      %global-atts;  class CDATA "+ topic/keyword sw-d/msgnum " >
+<!ATTLIST msgph       %global-atts;  class CDATA "+ topic/ph sw-d/msgph "       >
+<!ATTLIST systemoutput
+                      %global-atts;  class CDATA "+ topic/ph sw-d/systemoutput ">
+<!ATTLIST userinput   %global-atts;  class CDATA "+ topic/ph sw-d/userinput "   >
+<!ATTLIST varname     %global-atts;  class CDATA "+ topic/keyword sw-d/varname ">
+
+ 
+<!-- ================== End Software Domain ====================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.mod.rnc
new file mode 100644
index 000000000000..b90d24f0868d
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/softwareDomain.mod.rnc
@@ -0,0 +1,163 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Software Domain
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Software Domain//EN"
+#       Delivered as file "softwareDomain.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the Software Domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected the PURPOSE in this comment
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Message Phrase
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+msgph.element = element msgph { msgph.attlist, words.cnt* }
+msgph.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Message Block
+msgblock.element = element msgblock { msgblock.attlist, words.cnt* }
+msgblock.attlist &=
+  display-atts,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?,
+  [ a:defaultValue = "preserve" ] attribute xml:space { "preserve" }?
+# LONG NAME: Message Number
+msgnum.element = element msgnum { msgnum.attlist, text }
+msgnum.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Command Name
+cmdname.element = element cmdname { cmdname.attlist, text }
+cmdname.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Variable Name
+varname.element = element varname { varname.attlist, text }
+varname.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: File Path
+filepath.element = element filepath { filepath.attlist, words.cnt* }
+filepath.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: User Input
+userinput.element = element userinput { userinput.attlist, words.cnt* }
+userinput.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: System Output
+systemoutput.element =
+  element systemoutput { systemoutput.attlist, words.cnt* }
+systemoutput.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+cmdname.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword sw-d/cmdname " ]
+  attribute class { text }?
+filepath.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph sw-d/filepath " ]
+  attribute class { text }?
+msgblock.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/pre sw-d/msgblock " ]
+  attribute class { text }?
+msgnum.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword sw-d/msgnum " ]
+  attribute class { text }?
+msgph.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph sw-d/msgph " ]
+  attribute class { text }?
+systemoutput.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph sw-d/systemoutput " ]
+  attribute class { text }?
+userinput.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph sw-d/userinput " ]
+  attribute class { text }?
+varname.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword sw-d/varname " ]
+  attribute class { text }?
+# ================== End Software Domain ======================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/task.dtd b/xml/tests/testData/xml/OasisDocumentHighlighting/task.dtd
new file mode 100644
index 000000000000..fb44f71cc7c2
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/task.dtd
@@ -0,0 +1,174 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Task DTD                                     -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+PUBLIC "-//OASIS//DTD DITA Task//EN"
+      Delivered as file "task.dtd"                                 -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    DTD to describe DITA Tasks                        -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2006.06.07 RDA: Added indexing domain                      -->
+<!--    2006.06.21 RDA: Added props attribute extensions           -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATIONS                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA User Interface Domain//EN" 
+"uiDomain.ent"                                                       >
+%ui-d-dec;
+
+<!ENTITY % hi-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Highlight Domain//EN" 
+"highlightDomain.ent"                                                >
+%hi-d-dec;
+
+<!ENTITY % pr-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Programming Domain//EN" 
+"programmingDomain.ent"                                              >
+%pr-d-dec;
+
+<!ENTITY % sw-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Software Domain//EN" 
+"softwareDomain.ent"                                                 >
+%sw-d-dec;
+
+<!ENTITY % ut-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Utilities Domain//EN" 
+"utilitiesDomain.ent"                                                >
+%ut-d-dec;
+
+<!ENTITY % indexing-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Indexing Domain//EN" 
+"indexingDomain.ent"                                                 >
+%indexing-d-dec;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE DECLARATIONS              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN EXTENSIONS                          -->
+<!-- ============================================================= -->
+<!--                    One for each extended base element, with
+                        the name of the domain(s) in which the
+                        extension was declared                     -->
+
+<!ENTITY % pre          "pre     | %pr-d-pre;     | %sw-d-pre;     | 
+                                   %ui-d-pre;"                       >
+<!ENTITY % keyword      "keyword | %pr-d-keyword; | %sw-d-keyword; |
+                                   %ui-d-keyword;"                   >
+<!ENTITY % ph           "ph      | %pr-d-ph;      | %sw-d-ph;      | 
+                                    %hi-d-ph;     | %ui-d-ph;"       >
+<!ENTITY % fig          "fig     | %pr-d-fig;     | %ut-d-fig;"      >
+<!ENTITY % dl           "dl      | %pr-d-dl;"                        >
+<!ENTITY % index-base   "index-base | %indexing-d-index-base;"       >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE EXTENSIONS                -->
+<!-- ============================================================= -->
+<!ENTITY % props-attribute-extensions  ""                            >
+<!ENTITY % base-attribute-extensions   ""                            >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC NESTING OVERRIDE                     -->
+<!-- ============================================================= -->
+
+<!--                    Redefine the infotype entity to exclude 
+                        other topic types and disallow nesting     -->
+<!ENTITY % task-info-types 
+                        "task"                                       >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+<!--                    Must be declared ahead of the DTDs, which
+                        puts @domains first in order               -->
+
+<!ENTITY included-domains 
+                        "&ui-d-att; &hi-d-att; &pr-d-att; &sw-d-att;
+                         &ut-d-att; &indexing-d-att;"                >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC ELEMENT INTEGRATION                  -->
+<!-- ============================================================= -->
+
+<!--                    Embed topic to get generic elements        -->
+<!ENTITY % topic-type   PUBLIC 
+"-//OASIS//ELEMENTS DITA Topic//EN" 
+"topic.mod"                                                          >
+%topic-type;
+        
+<!--                    Embed task to get specific elements        -->
+<!ENTITY % task-typemod PUBLIC 
+"-//OASIS//ELEMENTS DITA Task//EN" 
+"task.mod"                                                           >
+%task-typemod;
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ELEMENT INTEGRATION                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA User Interface Domain//EN" 
+"uiDomain.mod"                                                       >
+%ui-d-def;
+
+<!ENTITY % hi-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Highlight Domain//EN" 
+"highlightDomain.mod"                                                >
+%hi-d-def;
+
+<!ENTITY % pr-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Programming Domain//EN" 
+"programmingDomain.mod"                                              >
+%pr-d-def;
+
+<!ENTITY % sw-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Software Domain//EN" 
+"softwareDomain.mod"                                                 >
+%sw-d-def;
+
+<!ENTITY % ut-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Utilities Domain//EN" 
+"utilitiesDomain.mod"                                                >
+%ut-d-def;
+
+<!ENTITY % indexing-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Indexing Domain//EN" 
+"indexingDomain.mod"                                                 >
+%indexing-d-def;
+
+
+<!-- ================== End DITA Task DTD  ======================= -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/task.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/task.mod
new file mode 100644
index 000000000000..e77a8bb3eff6
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/task.mod
@@ -0,0 +1,409 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Task                                         -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Task//EN"
+      Delivered as file "task.mod"                                 -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the DITA Tasks                     -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Removed old declaration for                -->
+<!--                    taskClasses entity                         -->
+<!--    2005.11.15 RDA: Corrected LONG NAME for chdeschd           -->
+<!--    2006.06.06 RDA: Changed model of choice to listitem.cnt    -->
+<!--                    for completeness                           -->
+<!--    2006.06.07 RDA: Added <abstract> element                   -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ARCHITECTURE ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!-- default namespace prefix for DITAArchVersion attribute can be
+     overridden through predefinition in the document type shell   -->
+<!ENTITY % DITAArchNSPrefix
+                       "ditaarch"                                    >
+
+<!-- must be instanced on each topic type                          -->
+<!ENTITY % arch-atts "
+             xmlns:%DITAArchNSPrefix; 
+                        CDATA                              #FIXED
+                       'http://dita.oasis-open.org/architecture/2005/'
+             %DITAArchNSPrefix;:DITAArchVersion
+                        CDATA                              #FIXED
+                       '1.1'"                                        >
+
+
+<!-- ============================================================= -->
+<!--                   SPECIALIZATION OF DECLARED ELEMENTS         -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!ENTITY % task        "task"                                        >
+<!ENTITY % taskbody    "taskbody"                                    >
+<!ENTITY % steps       "steps"                                       >
+<!ENTITY % steps-unordered 
+                       "steps-unordered"                             >
+<!ENTITY % step        "step"                                        >
+<!ENTITY % cmd         "cmd"                                         >
+<!ENTITY % substeps    "substeps"                                    >
+<!ENTITY % substep     "substep"                                     >
+<!ENTITY % tutorialinfo 
+                       "tutorialinfo"                                >
+<!ENTITY % info        "info"                                        >
+<!ENTITY % stepxmp     "stepxmp"                                     >
+<!ENTITY % stepresult  "stepresult"                                  >
+<!ENTITY % choices     "choices"                                     >
+<!ENTITY % choice      "choice"                                      >
+<!ENTITY % result      "result"                                      >
+<!ENTITY % prereq      "prereq"                                      >
+<!ENTITY % postreq     "postreq"                                     >
+<!ENTITY % context     "context"                                     >
+<!ENTITY % choicetable "choicetable"                                 >
+<!ENTITY % chhead      "chhead"                                      >
+<!ENTITY % chrow       "chrow"                                       >
+<!ENTITY % choptionhd  "choptionhd"                                  >
+<!ENTITY % chdeschd    "chdeschd"                                    >
+<!ENTITY % choption    "choption"                                    >
+<!ENTITY % chdesc      "chdesc"                                      >
+
+
+<!-- ============================================================= -->
+<!--                    SHARED ATTRIBUTE LISTS                     -->
+<!-- ============================================================= -->
+
+
+<!--                    Provide an alternative set of univ-atts 
+                        that allows importance to be redefined 
+                        locally                                    -->
+<!ENTITY % univ-atts-no-importance-task
+            '%id-atts;
+             %filter-atts;
+             rev        CDATA                            #IMPLIED
+             status     (new | changed | deleted |   
+                         unchanged)                      #IMPLIED
+             %localization-atts;                                 '   >
+
+<!ENTITY % task-info-types 
+                        "%info-types;"                               >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY included-domains ""                                         >
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Task                            -->
+<!ELEMENT task          ((%title;), (%titlealts;)?,
+                         (%shortdesc; | %abstract;)?, 
+                         (%prolog;)?, (%taskbody;)?, 
+                         (%related-links;)?, (%task-info-types;)* )  >
+<!ATTLIST task            
+             id         ID                               #REQUIRED
+             conref     CDATA                            #IMPLIED
+             %select-atts;
+             %localization-atts;
+             %arch-atts;
+             outputclass 
+                        CDATA                            #IMPLIED
+             domains    CDATA                "&included-domains;"    >
+
+
+<!--                    LONG NAME: Task Body                       -->
+<!ELEMENT taskbody      ((%prereq;)?, (%context;)?, 
+                         (%steps; | %steps-unordered;)?, 
+                         (%result;)?, (%example;)?, (%postreq;)?)    >
+<!ATTLIST taskbody        
+             %id-atts;
+             %localization-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Prerequisites                   -->
+<!ELEMENT prereq        (%section.notitle.cnt;)*                     >
+<!ATTLIST prereq        
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Context                         -->
+<!ELEMENT context       (%section.notitle.cnt;)*                     >
+<!ATTLIST context        
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Steps                           -->
+<!ELEMENT steps         ((%step;)+)                                  >
+<!ATTLIST steps         
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Steps: Unordered                -->
+<!ELEMENT steps-unordered 
+                        ((%step;)+)                                  >
+<!ATTLIST steps-unordered 
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Step                            -->
+<!ELEMENT step          (%cmd;, 
+                         (%info;  |%substeps; | %tutorialinfo; |
+                          %stepxmp; | %choicetable; | %choices;)*, 
+                         (%stepresult;)? )                           >
+<!ATTLIST step            
+             importance (optional | required)            #IMPLIED
+             %univ-atts-no-importance-task;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--ATTLIST step          
+               importance (optional | required)          #IMPLIED  -->
+
+
+<!--                    LONG NAME: Command                         -->
+<!ELEMENT cmd            (%ph.cnt;)* >
+<!ATTLIST cmd             
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Information                     -->
+<!ELEMENT info          (%itemgroup.cnt;)*                           >
+<!ATTLIST info           
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Sub-steps                       -->
+<!ELEMENT substeps      (%substep;)+                                 >
+<!ATTLIST substeps       
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Sub-step                        -->
+<!ELEMENT substep       (%cmd;, 
+                         (%info; | %tutorialinfo; | %stepxmp;)*, 
+                         (%stepresult;)? )                           >
+<!ATTLIST substep         
+             importance (optional | required)            #IMPLIED
+             %univ-atts-no-importance-task;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--ATTLIST substep       
+               importance 
+                        (optional | required)            #IMPLIED  -->
+
+
+<!--                    LONG NAME: Tutorial Information            -->
+<!ELEMENT tutorialinfo  (%itemgroup.cnt;)*                           >
+<!ATTLIST tutorialinfo   
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Step Example                    -->
+<!ELEMENT stepxmp       (%itemgroup.cnt;)*                           >
+<!ATTLIST stepxmp       
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choices                         -->
+<!ELEMENT choices       ((%choice;)+)                                >
+<!ATTLIST choices       
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice                          -->
+<!ELEMENT choice        (%listitem.cnt;)*                            >
+<!ATTLIST choice          
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice Table                    -->
+<!ELEMENT choicetable   ((%chhead;)?, (%chrow;)+ )                   >
+<!ATTLIST choicetable     
+             relcolwidth 
+                        CDATA                            #IMPLIED
+             keycol     NMTOKEN                          "1"
+             refcols    NMTOKENS                         #IMPLIED
+             spectitle  CDATA                            #IMPLIED
+             %display-atts;
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice Head                     -->
+<!ELEMENT chhead        ((%choptionhd;), (%chdeschd;) )              >
+<!ATTLIST chhead         
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice Option Head              -->
+<!ELEMENT choptionhd    (%tblcell.cnt;)*                             >
+<!ATTLIST choptionhd     
+             specentry  CDATA                           #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice Description Head         -->
+<!ELEMENT chdeschd      (%tblcell.cnt;)*                             >
+<!ATTLIST chdeschd      
+             specentry  CDATA                           #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice Row                      -->
+<!ELEMENT chrow         ((%choption;), (%chdesc;) )                  >
+<!ATTLIST chrow        
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice Option                   -->
+<!ELEMENT choption      (%tblcell.cnt;)*>
+<!ATTLIST choption        
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Choice Description              -->
+<!ELEMENT chdesc        (%tblcell.cnt;)*>
+<!ATTLIST chdesc                
+             specentry  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Step Result                     -->
+<!ELEMENT stepresult    (%itemgroup.cnt;)*                           >
+<!ATTLIST stepresult    
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Result                          -->
+<!ELEMENT result        (%section.notitle.cnt;)*                     >
+<!ATTLIST result         
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Post Requirements               -->
+<!ELEMENT postreq       (%section.notitle.cnt;)*                     >
+<!ATTLIST postreq        
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+             
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ATTLIST task        %global-atts;  class  CDATA "- topic/topic task/task "        >
+<!ATTLIST taskbody    %global-atts;  class  CDATA "- topic/body task/taskbody "     >
+<!ATTLIST steps       %global-atts;  class  CDATA "- topic/ol task/steps "          >
+<!ATTLIST steps-unordered 
+                      %global-atts;  class  CDATA "- topic/ul task/steps-unordered ">
+<!ATTLIST step        %global-atts;  class  CDATA "- topic/li task/step "           >
+<!ATTLIST cmd         %global-atts;  class  CDATA "- topic/ph task/cmd "            >
+<!ATTLIST substeps    %global-atts;  class  CDATA "- topic/ol task/substeps "       >
+<!ATTLIST substep     %global-atts;  class  CDATA "- topic/li task/substep "        >
+<!ATTLIST tutorialinfo 
+                      %global-atts;  class  CDATA "- topic/itemgroup task/tutorialinfo ">
+<!ATTLIST info        %global-atts;  class  CDATA "- topic/itemgroup task/info "    >
+<!ATTLIST stepxmp     %global-atts;  class  CDATA "- topic/itemgroup task/stepxmp " >
+<!ATTLIST stepresult  %global-atts;  class  CDATA "- topic/itemgroup task/stepresult ">
+
+<!ATTLIST choices     %global-atts;  class  CDATA "- topic/ul task/choices "        >
+<!ATTLIST choice      %global-atts;  class  CDATA "- topic/li task/choice "         >
+<!ATTLIST result       %global-atts;  class  CDATA "- topic/section task/result "   >
+<!ATTLIST prereq      %global-atts;  class  CDATA "- topic/section task/prereq "    >
+<!ATTLIST postreq     %global-atts;  class  CDATA "- topic/section task/postreq "   >
+<!ATTLIST context     %global-atts;  class  CDATA "- topic/section task/context "   >
+
+<!ATTLIST choicetable %global-atts;  class  CDATA "- topic/simpletable task/choicetable ">
+<!ATTLIST chhead      %global-atts;  class  CDATA "- topic/sthead task/chhead "     >
+<!ATTLIST chrow       %global-atts;  class  CDATA "- topic/strow task/chrow "       >
+<!ATTLIST choptionhd  %global-atts;  class  CDATA "- topic/stentry task/choptionhd ">
+<!ATTLIST chdeschd    %global-atts;  class  CDATA "- topic/stentry task/chdeschd "  >
+<!ATTLIST choption    %global-atts;  class  CDATA "- topic/stentry task/choption "  >
+<!ATTLIST chdesc      %global-atts;  class  CDATA "- topic/stentry task/chdesc "    >
+
+ 
+<!-- ================== End DITA Task  =========================== -->
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/task.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/task.mod.rnc
new file mode 100644
index 000000000000..499aa4086066
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/task.mod.rnc
@@ -0,0 +1,445 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Task
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Task//EN"
+#       Delivered as file "task.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the DITA Tasks
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Removed old declaration for
+
+# taskClasses entity
+
+# 2005.11.15 RDA: Corrected LONG NAME for chdeschd
+
+# 2006.06.06 RDA: Changed model of choice to listitem.cnt
+
+# for completeness
+
+# 2006.06.07 RDA: Added <abstract> element
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# =============================================================
+
+# =============================================================
+
+# ARCHITECTURE ENTITIES
+
+# =============================================================
+
+# default namespace prefix for DITAArchVersion attribute can be
+# overridden through predefinition in the document type shell
+
+# must be instanced on each topic type
+
+# =============================================================
+
+# SPECIALIZATION OF DECLARED ELEMENTS
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+taskbody = taskbody.element
+steps = steps.element
+steps-unordered = steps-unordered.element
+step = step.element
+cmd = cmd.element
+substeps = substeps.element
+substep = substep.element
+tutorialinfo = tutorialinfo.element
+info = info.element
+stepxmp = stepxmp.element
+stepresult = stepresult.element
+choices = choices.element
+choice = choice.element
+result = result.element
+prereq = prereq.element
+postreq = postreq.element
+context = context.element
+choicetable = choicetable.element
+chhead = chhead.element
+chrow = chrow.element
+choptionhd = choptionhd.element
+chdeschd = chdeschd.element
+choption = choption.element
+chdesc = chdesc.element
+# =============================================================
+
+# SHARED ATTRIBUTE LISTS
+
+# =============================================================
+
+# Provide an alternative set of univ-atts 
+# that allows importance to be redefined 
+# locally
+univ-atts-no-importance-task =
+  id-atts,
+  filter-atts,
+  attribute rev { text }?,
+  attribute status { "new" | "changed" | "deleted" | "unchanged" }?,
+  localization-atts
+task-info-types = info-types
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Task
+task.element =
+  element task {
+    task.attlist,
+    title,
+    titlealts?,
+    (shortdesc | abstract)?,
+    prolog?,
+    taskbody?,
+    related-links?,
+    task-info-types*
+  }
+task.attlist &=
+  attribute id { xsd:ID },
+  attribute conref { text }?,
+  select-atts,
+  localization-atts,
+  arch-atts,
+  attribute outputclass { text }?,
+  [
+    a:defaultValue =
+      "(topic ui-d) (topic hi-d) (topic pr-d) (topic sw-d)                          (topic ut-d) (topic indexing-d)"
+  ]
+  attribute domains { text }?
+# LONG NAME: Task Body
+taskbody.element =
+  element taskbody {
+    taskbody.attlist,
+    prereq?,
+    context?,
+    (steps | steps-unordered)?,
+    result?,
+    example?,
+    postreq?
+  }
+taskbody.attlist &=
+  id-atts,
+  localization-atts,
+  attribute outputclass { text }?
+# LONG NAME: Prerequisites
+prereq.element = element prereq { prereq.attlist, section.notitle.cnt* }
+prereq.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Context
+context.element =
+  element context { context.attlist, section.notitle.cnt* }
+context.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Steps
+steps.element = element steps { steps.attlist, step+ }
+steps.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Steps: Unordered
+steps-unordered.element =
+  element steps-unordered { steps-unordered.attlist, step+ }
+steps-unordered.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Step
+step.element =
+  element step {
+    step.attlist,
+    cmd,
+    (info | substeps | tutorialinfo | stepxmp | choicetable | choices)*,
+    stepresult?
+  }
+step.attlist &=
+  attribute importance { "optional" | "required" }?,
+  univ-atts-no-importance-task,
+  attribute outputclass { text }?
+# ATTLIST step          
+# importance (optional | required)          #IMPLIED
+
+# LONG NAME: Command
+cmd.element = element cmd { cmd.attlist, ph.cnt* }
+cmd.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Information
+info.element = element info { info.attlist, itemgroup.cnt* }
+info.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Sub-steps
+substeps.element = element substeps { substeps.attlist, substep+ }
+substeps.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Sub-step
+substep.element =
+  element substep {
+    substep.attlist, cmd, (info | tutorialinfo | stepxmp)*, stepresult?
+  }
+substep.attlist &=
+  attribute importance { "optional" | "required" }?,
+  univ-atts-no-importance-task,
+  attribute outputclass { text }?
+# ATTLIST substep       
+# importance 
+#          (optional | required)            #IMPLIED
+
+# LONG NAME: Tutorial Information
+tutorialinfo.element =
+  element tutorialinfo { tutorialinfo.attlist, itemgroup.cnt* }
+tutorialinfo.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Step Example
+stepxmp.element = element stepxmp { stepxmp.attlist, itemgroup.cnt* }
+stepxmp.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choices
+choices.element = element choices { choices.attlist, choice+ }
+choices.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choice
+choice.element = element choice { choice.attlist, listitem.cnt* }
+choice.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choice Table
+choicetable.element =
+  element choicetable { choicetable.attlist, chhead?, chrow+ }
+choicetable.attlist &=
+  attribute relcolwidth { text }?,
+  [ a:defaultValue = "1" ] attribute keycol { xsd:NMTOKEN }?,
+  attribute refcols { xsd:NMTOKENS }?,
+  attribute spectitle { text }?,
+  display-atts,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choice Head
+chhead.element = element chhead { chhead.attlist, choptionhd, chdeschd }
+chhead.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choice Option Head
+choptionhd.element =
+  element choptionhd { choptionhd.attlist, tblcell.cnt* }
+choptionhd.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choice Description Head
+chdeschd.element = element chdeschd { chdeschd.attlist, tblcell.cnt* }
+chdeschd.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choice Row
+chrow.element = element chrow { chrow.attlist, choption, chdesc }
+chrow.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choice Option
+choption.element = element choption { choption.attlist, tblcell.cnt* }
+choption.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Choice Description
+chdesc.element = element chdesc { chdesc.attlist, tblcell.cnt* }
+chdesc.attlist &=
+  attribute specentry { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Step Result
+stepresult.element =
+  element stepresult { stepresult.attlist, itemgroup.cnt* }
+stepresult.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Result
+result.element = element result { result.attlist, section.notitle.cnt* }
+result.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Post Requirements
+postreq.element =
+  element postreq { postreq.attlist, section.notitle.cnt* }
+postreq.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+task.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/topic task/task " ]
+  attribute class { text }?
+taskbody.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/body task/taskbody " ]
+  attribute class { text }?
+steps.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ol task/steps " ]
+  attribute class { text }?
+steps-unordered.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ul task/steps-unordered " ]
+  attribute class { text }?
+step.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/li task/step " ] attribute class { text }?
+cmd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ph task/cmd " ] attribute class { text }?
+substeps.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ol task/substeps " ]
+  attribute class { text }?
+substep.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/li task/substep " ]
+  attribute class { text }?
+tutorialinfo.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/itemgroup task/tutorialinfo " ]
+  attribute class { text }?
+info.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/itemgroup task/info " ]
+  attribute class { text }?
+stepxmp.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/itemgroup task/stepxmp " ]
+  attribute class { text }?
+stepresult.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/itemgroup task/stepresult " ]
+  attribute class { text }?
+choices.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/ul task/choices " ]
+  attribute class { text }?
+choice.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/li task/choice " ]
+  attribute class { text }?
+result.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/section task/result " ]
+  attribute class { text }?
+prereq.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/section task/prereq " ]
+  attribute class { text }?
+postreq.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/section task/postreq " ]
+  attribute class { text }?
+context.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/section task/context " ]
+  attribute class { text }?
+choicetable.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/simpletable task/choicetable " ]
+  attribute class { text }?
+chhead.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/sthead task/chhead " ]
+  attribute class { text }?
+chrow.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/strow task/chrow " ]
+  attribute class { text }?
+choptionhd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry task/choptionhd " ]
+  attribute class { text }?
+chdeschd.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry task/chdeschd " ]
+  attribute class { text }?
+choption.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry task/choption " ]
+  attribute class { text }?
+chdesc.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/stentry task/chdesc " ]
+  attribute class { text }?
+# ================== End DITA Task  ===========================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/task.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/task.rnc
new file mode 100644
index 000000000000..9bd734653c8d
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/task.rnc
@@ -0,0 +1,147 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Task DTD
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+# PUBLIC "-//OASIS//DTD DITA Task//EN"
+#       Delivered as file "task.dtd"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    DTD to describe DITA Tasks
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2006.06.07 RDA: Added indexing domain
+
+# 2006.06.21 RDA: Added props attribute extensions
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN ENTITY DECLARATIONS
+
+# =============================================================
+
+include "uiDomain.ent.rnc"
+include "highlightDomain.ent.rnc"
+include "programmingDomain.ent.rnc"
+include "softwareDomain.ent.rnc"
+include "utilitiesDomain.ent.rnc"
+include "indexingDomain.ent.rnc"
+# =============================================================
+
+# DOMAIN ATTRIBUTE DECLARATIONS
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN EXTENSIONS
+
+# =============================================================
+
+# One for each extended base element, with
+# the name of the domain(s) in which the
+# extension was declared
+pre = pre.element | pr-d-pre | sw-d-pre | ui-d-pre
+keyword = keyword.element | pr-d-keyword | sw-d-keyword | ui-d-keyword
+ph = ph.element | pr-d-ph | sw-d-ph | hi-d-ph | ui-d-ph
+fig = fig.element | pr-d-fig | ut-d-fig
+dl = dl.element | pr-d-dl
+index-base = index-base.element | indexing-d-index-base
+# =============================================================
+
+# DOMAIN ATTRIBUTE EXTENSIONS
+
+# =============================================================
+props-attribute-extensions = empty
+base-attribute-extensions = empty
+# =============================================================
+
+# TOPIC NESTING OVERRIDE
+
+# =============================================================
+
+# Redefine the infotype entity to exclude 
+# other topic types and disallow nesting
+task-info-types = task.element
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# Must be declared ahead of the DTDs, which
+# puts @domains first in order
+
+# =============================================================
+
+# TOPIC ELEMENT INTEGRATION
+
+# =============================================================
+
+# Embed topic to get generic elements
+include "topic.mod.rnc"
+# Embed task to get specific elements
+include "task.mod.rnc"
+# =============================================================
+
+# DOMAIN ELEMENT INTEGRATION
+
+# =============================================================
+include "uiDomain.mod.rnc"
+include "highlightDomain.mod.rnc"
+include "programmingDomain.mod.rnc"
+include "softwareDomain.mod.rnc"
+include "utilitiesDomain.mod.rnc"
+include "indexingDomain.mod.rnc"
+start = no-topic-nesting.element
+any =
+  (element * {
+     attribute * { text }*,
+     any
+   }
+   | text)*
+# ================== End DITA Task DTD  =======================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/tblDecl.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/tblDecl.mod
new file mode 100644
index 000000000000..963daa80e6ff
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/tblDecl.mod
@@ -0,0 +1,380 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    XML EXCHANGE TABLE MODEL DECLARATION MODULE       -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+
+<!-- ============================================================= -->
+<!--  Delivered as file "tblDecl.mod"                              -->
+<!-- ============================================================= -->
+
+
+<!-- XML EXCHANGE TABLE MODEL DECLARATION MODULE                   -->
+
+<!-- OASIS DITA 1.0 notes:
+     The Exchange Table Model replaces the original CALS-based model
+     used in development versions of the DITA definition.
+     This set of declarations defines the XML version of the Exchange
+     Table Model as adapted for OASIS DITA version 1.0.
+     The base for the DITA version of the Exchange Table Model is
+     defined at http://www.oasis-open.org/specs/tm9901.htm .
+     The DITA version specifically extends this model with these DITA-
+     specific content and attribute adaptations to the DITA processing
+     requirements:
+
+STRUCTURE:
+
+Introduce the DITA-unique <desc> element (optional after <title>); this element
+enables more consistent presentation of both figures and tables.
+
+
+ATTRIBUTES:
+
+For the <table> element, add:
+  %univ-atts; which consists of:
+    %select-atts; [for selection, conditional processing]
+    %id-atts; [for conref and linking]
+    %localization-atts (@translate + @xml:lang) [for NLS processing support]
+    %global-atts; (@xtrf + @xtrc) [for tracing and messaging support in processors]
+    @class [for specialization support]
+  @outputclass [for role designation (ie, styles, future migrations)]
+  @rowheader [for accessibility support in processing]
+  %display-atts; which consists of:
+    @scale [for presentational equivalence with other scaled exhibits: fig, pre, lines, simpletable]
+    @frame (already part of table)
+    @pgwide (already part of table, same intent as original @expanse)
+
+For <tgroup>, <thead>, <tbody>, and <row>, add:
+  %univ-atts;
+  %global-atts;
+  @class
+  @outputclass [for role designation (ie, styles, future migrations)]
+
+For <entry>, add:
+  %id-atts;
+  %global-atts
+  @class
+  @outputclass [for role designation (ie, styles, future migrations)]
+  @rev [for indication of revised content for flag-based processing]
+
+-->
+
+<!-- DITA specialization support: element redefinition for expansion -->
+
+<!ENTITY % table "table">
+<!ENTITY % tgroup "tgroup">
+<!ENTITY % colspec "colspec">
+<!ENTITY % thead "thead">
+<!ENTITY % tbody "tbody">
+<!ENTITY % row "row">
+<!ENTITY % entry "entry">
+
+<!-- The Formal Public Identifier (FPI) for this DITA adaptation of
+     the Exchange Table Model shall be:
+
+     "-//OASIS//ELEMENTS DITA Exchange Table Model//EN"
+
+     This set of declarations may be referred to using a public external
+     entity declaration and reference as shown in the following three
+     lines:
+
+     <!ENTITY % tableXML
+       PUBLIC "-//OASIS//ELEMENTS DITA Exchange Table Model//EN">
+       %tableXML;
+-->
+
+
+
+<!-- In order to use the Exchange table model, various parameter entity
+     declarations are required.  A brief description is as follows:
+
+     ENTITY NAME      WHERE USED              WHAT IT IS
+
+     %yesorno         In ATTLIST of:          An attribute declared value
+                      almost all elements     for a "boolean" attribute
+
+     %paracon         In content model of:    The "text" (logical content)
+                      <entry>                 of the model group for <entry>
+
+     %titles          In content model of:    The "title" part of the model
+                      table element           group for the table element
+
+     %tbl.table.name  In declaration of:      The name of the "table"
+                      table element           element
+
+     %tbl.table-titles.mdl In content model of: The model group for the title
+                      table elements          part of the content model for
+                                              table element
+
+     %tbl.table.mdl   In content model of:    The model group for the content
+                      table elements          model for table element,
+                                              often (and by default) defined
+                                              in terms of %tbl.table-titles.mdl
+                                              and tgroup
+
+     %tbl.table.att   In ATTLIST of:          Additional attributes on the
+                      table element           table element
+
+     %bodyatt         In ATTLIST of:          Additional attributes on the
+                      table element           table element (for backward
+                                              compatibility with the SGML
+                                              model)
+
+     %tbl.tgroup.mdl  In content model of:    The model group for the content
+                      <tgroup>                model for <tgroup>
+
+     %tbl.tgroup.att  In ATTLIST of:          Additional attributes on the
+                      <tgroup>                <tgroup> element
+
+     %tbl.thead.att   In ATTLIST of:          Additional attributes on the
+                      <thead>                 <thead> element
+
+     %tbl.tbody.att   In ATTLIST of:          Additional attributes on the
+                      <tbody>                 <tbody> element
+
+     %tbl.colspec.att In ATTLIST of:          Additional attributes on the
+                      <colspec>               <colspec> element
+
+     %tbl.row.mdl     In content model of:    The model group for the content
+                      <row>                   model for <row>
+
+     %tbl.row.att     In ATTLIST of:          Additional attributes on the
+                      <row>                   <row> element
+
+     %tbl.entry.mdl   In content model of:    The model group for the content
+                      <entry>                 model for <entry>
+
+     %tbl.entry.att   In ATTLIST of:          Additional attributes on the
+                      <entry>                 <entry> element
+
+     This set of declarations will use the default definitions shown below
+     for any of these parameter entities that are not declared before this
+     set of declarations is referenced.
+
+     Note that DITA properties are added in cumulative declarations at the end.
+-->
+
+<!-- These definitions are not directly related to the table model, but are
+     used in the default CALS table model and may be defined elsewhere (and
+     prior to the inclusion of this table module) in the referencing DTD. -->
+
+<!ENTITY % yesorno 'NMTOKEN'> <!-- no if zero(s), yes if any other value -->
+<!ENTITY % titles  'title?'>
+<!ENTITY % paracon '%tblcell.cnt;'> <!-- default for use in entry content -->
+
+<!--
+The parameter entities as defined below change and simplify the CALS table
+model as published (as part of the Example DTD) in MIL-HDBK-28001.  The
+resulting simplified DTD has support from the SGML Open vendors and is
+therefore more interoperable among different systems.
+
+These following declarations provide the Exchange default definitions
+for these entities.  However, these entities can be redefined (by giving
+the appropriate parameter entity declaration(s) prior to the reference
+to this Table Model declaration set entity) to fit the needs of the
+current application.
+
+Note, however, that changes may have significant effect on the ability to
+interchange table information.  These changes may manifest themselves
+in useability, presentation, and possible structure information degradation.
+-->
+
+<!ENTITY % tbl.table.name       "table">
+<!ENTITY % tbl.table-titles.mdl "((%title;)?, (%desc;)?)?,">
+<!ENTITY % tbl.table-main.mdl   "(%tgroup;)+">
+<!ENTITY % tbl.table.mdl        "%tbl.table-titles.mdl; %tbl.table-main.mdl;">
+<!ENTITY % tbl.table.att        "
+    pgwide      %yesorno;       #IMPLIED ">
+<!ENTITY % bodyatt              "">
+<!ENTITY % tbl.tgroup.mdl       "(%colspec;)*, (%thead;)?, %tbody;">
+<!ENTITY % tbl.tgroup.att       "">
+<!ENTITY % tbl.thead.att        "">
+<!ENTITY % tbl.tbody.att        "">
+<!ENTITY % tbl.colspec.att      "">
+<!ENTITY % tbl.row.mdl          "(%entry;)+">
+<!ENTITY % tbl.row.att          "">
+<!ENTITY % tbl.entry.mdl        "(%paracon;)*">
+<!ENTITY % tbl.entry.att        "">
+
+<!-- =====  Element and attribute declarations follow. =====  -->
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.table.name       "table"
+     ENTITY % tbl.table-titles.mdl "%titles;,"
+     ENTITY % tbl.table.mdl        "%tbl.table-titles; tgroup+"
+     ENTITY % tbl.table.att        "
+                        pgwide          %yesorno;       #IMPLIED "
+-->
+
+<!ELEMENT %tbl.table.name; (%tbl.table.mdl;)>
+
+<!ATTLIST %tbl.table.name;
+        frame           (top|bottom|topbot|all|sides|none)      #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        %tbl.table.att;
+        %bodyatt;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.tgroup.mdl    "colspec*,thead?,tbody"
+     ENTITY % tbl.tgroup.att    ""
+-->
+
+<!ELEMENT tgroup (%tbl.tgroup.mdl;) >
+
+<!ATTLIST tgroup
+        cols            NMTOKEN                                 #REQUIRED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        %tbl.tgroup.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.colspec.att   ""
+-->
+
+<!ELEMENT colspec EMPTY >
+
+<!ATTLIST colspec
+        colnum          NMTOKEN                                 #IMPLIED
+        colname         NMTOKEN                                 #IMPLIED
+        colwidth        CDATA                                   #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         NMTOKEN                                 #IMPLIED
+        %tbl.colspec.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.thead.att      ""
+-->
+
+<!ELEMENT thead ((%row;)+)>
+
+<!ATTLIST thead
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.thead.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.tbody.att     ""
+-->
+
+<!ELEMENT tbody (%row;)+>
+
+<!ATTLIST tbody
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.tbody.att;
+>
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % tbl.row.mdl       "entry+"
+     ENTITY % tbl.row.att       ""
+-->
+
+<!ELEMENT row (%tbl.row.mdl;)>
+
+<!ATTLIST row
+        rowsep          %yesorno;                               #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.row.att;
+>
+
+
+<!--
+     Default declarations previously defined in this entity and
+     referenced below include:
+     ENTITY % paracon           "#PCDATA"
+     ENTITY % tbl.entry.mdl     "(%paracon;)*"
+     ENTITY % tbl.entry.att     ""
+-->
+
+<!ELEMENT entry %tbl.entry.mdl;>
+
+<!ATTLIST entry
+        colname         NMTOKEN                                 #IMPLIED
+        namest          NMTOKEN                                 #IMPLIED
+        nameend         NMTOKEN                                 #IMPLIED
+        morerows        NMTOKEN                                 #IMPLIED
+        colsep          %yesorno;                               #IMPLIED
+        rowsep          %yesorno;                               #IMPLIED
+        align           (left|right|center|justify|char)        #IMPLIED
+        char            CDATA                                   #IMPLIED
+        charoff         NMTOKEN                                 #IMPLIED
+        valign          (top|middle|bottom)                     #IMPLIED
+        %tbl.entry.att;
+>
+
+
+<!-- ============================================================= -->
+<!--                    DITA BEHAVIOR ATTRIBUTES                   -->
+<!-- ============================================================= -->
+
+<!ATTLIST %tbl.table.name;
+        rowheader   (firstcol | norowheader) #IMPLIED
+        scale (50|60|70|80|90|100|110|120|140|160|180|200) #IMPLIED
+        %univ-atts;
+        outputclass CDATA #IMPLIED>
+<!ATTLIST tgroup
+        %univ-atts;
+        outputclass CDATA #IMPLIED>
+<!ATTLIST thead
+        %univ-atts;
+        outputclass CDATA #IMPLIED>
+<!ATTLIST tbody
+        %univ-atts;
+        outputclass CDATA #IMPLIED>
+<!ATTLIST row
+        %univ-atts;
+        outputclass CDATA #IMPLIED>
+<!ATTLIST entry
+        %id-atts;
+        %localization-atts;
+        rev CDATA #IMPLIED
+        outputclass CDATA #IMPLIED>
+<!ATTLIST colspec
+        %id-atts;
+        %localization-atts;>
+
+<!-- ============================================================= -->
+<!--                    DITA SPECIALIZATION ATTRIBUTE DECLARATIONS -->
+<!-- ============================================================= -->
+
+<!ATTLIST table    %global-atts;  class CDATA "- topic/table "       >
+<!ATTLIST tgroup   %global-atts;  class CDATA "- topic/tgroup "      >
+<!ATTLIST colspec  %global-atts;  class CDATA "- topic/colspec "     >
+<!ATTLIST thead    %global-atts;  class CDATA "- topic/thead "       >
+<!ATTLIST tbody    %global-atts;  class CDATA "- topic/tbody "       >
+<!ATTLIST row      %global-atts;  class CDATA "- topic/row "         >
+<!ATTLIST entry    %global-atts;  class CDATA "- topic/entry "       >
+
+
+<!-- ================== End XML Exchange Table Model ============= -->
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/tblDecl.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/tblDecl.mod.rnc
new file mode 100644
index 000000000000..0ba1e32f91f6
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/tblDecl.mod.rnc
@@ -0,0 +1,361 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    XML EXCHANGE TABLE MODEL DECLARATION MODULE
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# =============================================================
+
+# Delivered as file "tblDecl.mod"
+
+# =============================================================
+
+# XML EXCHANGE TABLE MODEL DECLARATION MODULE
+
+# OASIS DITA 1.0 notes:
+#      The Exchange Table Model replaces the original CALS-based model
+#      used in development versions of the DITA definition.
+#      This set of declarations defines the XML version of the Exchange
+#      Table Model as adapted for OASIS DITA version 1.0.
+#      The base for the DITA version of the Exchange Table Model is
+#      defined at http://www.oasis-open.org/specs/tm9901.htm .
+#      The DITA version specifically extends this model with these DITA-
+#      specific content and attribute adaptations to the DITA processing
+#      requirements:
+# 
+# STRUCTURE:
+# 
+# Introduce the DITA-unique <desc> element (optional after <title>); this element
+# enables more consistent presentation of both figures and tables.
+# 
+# 
+# ATTRIBUTES:
+# 
+# For the <table> element, add:
+#   %univ-atts; which consists of:
+#     %select-atts; [for selection, conditional processing]
+#     %id-atts; [for conref and linking]
+#     %localization-atts (@translate + @xml:lang) [for NLS processing support]
+#     %global-atts; (@xtrf + @xtrc) [for tracing and messaging support in processors]
+#     @class [for specialization support]
+#   @outputclass [for role designation (ie, styles, future migrations)]
+#   @rowheader [for accessibility support in processing]
+#   %display-atts; which consists of:
+#     @scale [for presentational equivalence with other scaled exhibits: fig, pre, lines, simpletable]
+#     @frame (already part of table)
+#     @pgwide (already part of table, same intent as original @expanse)
+# 
+# For <tgroup>, <thead>, <tbody>, and <row>, add:
+#   %univ-atts;
+#   %global-atts;
+#   @class
+#   @outputclass [for role designation (ie, styles, future migrations)]
+# 
+# For <entry>, add:
+#   %id-atts;
+#   %global-atts
+#   @class
+#   @outputclass [for role designation (ie, styles, future migrations)]
+#   @rev [for indication of revised content for flag-based processing]
+#
+
+# DITA specialization support: element redefinition for expansion
+
+# The Formal Public Identifier (FPI) for this DITA adaptation of
+# the Exchange Table Model shall be:
+# 
+# "-//OASIS//ELEMENTS DITA Exchange Table Model//EN"
+# 
+# This set of declarations may be referred to using a public external
+# entity declaration and reference as shown in the following three
+# lines:
+# 
+# <!ENTITY % tableXML
+#   PUBLIC "-//OASIS//ELEMENTS DITA Exchange Table Model//EN">
+#   %tableXML;
+
+# In order to use the Exchange table model, various parameter entity
+# declarations are required.  A brief description is as follows:
+# 
+# ENTITY NAME      WHERE USED              WHAT IT IS
+# 
+# %yesorno         In ATTLIST of:          An attribute declared value
+#                  almost all elements     for a "boolean" attribute
+# 
+# %paracon         In content model of:    The "text" (logical content)
+#                  <entry>                 of the model group for <entry>
+# 
+# %titles          In content model of:    The "title" part of the model
+#                  table element           group for the table element
+# 
+# %tbl.table.name  In declaration of:      The name of the "table"
+#                  table element           element
+# 
+# %tbl.table-titles.mdl In content model of: The model group for the title
+#                  table elements          part of the content model for
+#                                          table element
+# 
+# %tbl.table.mdl   In content model of:    The model group for the content
+#                  table elements          model for table element,
+#                                          often (and by default) defined
+#                                          in terms of %tbl.table-titles.mdl
+#                                          and tgroup
+# 
+# %tbl.table.att   In ATTLIST of:          Additional attributes on the
+#                  table element           table element
+# 
+# %bodyatt         In ATTLIST of:          Additional attributes on the
+#                  table element           table element (for backward
+#                                          compatibility with the SGML
+#                                          model)
+# 
+# %tbl.tgroup.mdl  In content model of:    The model group for the content
+#                  <tgroup>                model for <tgroup>
+# 
+# %tbl.tgroup.att  In ATTLIST of:          Additional attributes on the
+#                  <tgroup>                <tgroup> element
+# 
+# %tbl.thead.att   In ATTLIST of:          Additional attributes on the
+#                  <thead>                 <thead> element
+# 
+# %tbl.tbody.att   In ATTLIST of:          Additional attributes on the
+#                  <tbody>                 <tbody> element
+# 
+# %tbl.colspec.att In ATTLIST of:          Additional attributes on the
+#                  <colspec>               <colspec> element
+# 
+# %tbl.row.mdl     In content model of:    The model group for the content
+#                  <row>                   model for <row>
+# 
+# %tbl.row.att     In ATTLIST of:          Additional attributes on the
+#                  <row>                   <row> element
+# 
+# %tbl.entry.mdl   In content model of:    The model group for the content
+#                  <entry>                 model for <entry>
+# 
+# %tbl.entry.att   In ATTLIST of:          Additional attributes on the
+#                  <entry>                 <entry> element
+# 
+# This set of declarations will use the default definitions shown below
+# for any of these parameter entities that are not declared before this
+# set of declarations is referenced.
+# 
+# Note that DITA properties are added in cumulative declarations at the end.
+
+# These definitions are not directly related to the table model, but are
+# used in the default CALS table model and may be defined elsewhere (and
+# prior to the inclusion of this table module) in the referencing DTD.
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+yesorno = xsd:NMTOKEN
+# no if zero(s), yes if any other value
+paracon = tblcell.cnt
+# default for use in entry content
+
+# The parameter entities as defined below change and simplify the CALS table
+# model as published (as part of the Example DTD) in MIL-HDBK-28001.  The
+# resulting simplified DTD has support from the SGML Open vendors and is
+# therefore more interoperable among different systems.
+# 
+# These following declarations provide the Exchange default definitions
+# for these entities.  However, these entities can be redefined (by giving
+# the appropriate parameter entity declaration(s) prior to the reference
+# to this Table Model declaration set entity) to fit the needs of the
+# current application.
+# 
+# Note, however, that changes may have significant effect on the ability to
+# interchange table information.  These changes may manifest themselves
+# in useability, presentation, and possible structure information degradation.
+tbl.table-titles.mdl = (title?, desc?)?
+tbl.table-main.mdl = tgroup+
+tbl.table.mdl = tbl.table-titles.mdl | tbl.table-main.mdl
+tbl.table.att = attribute pgwide { yesorno }?
+bodyatt = empty
+tbl.tgroup.mdl = colspec*, thead?, tbody
+tbl.tgroup.att = empty
+tbl.thead.att = empty
+tbl.tbody.att = empty
+tbl.colspec.att = empty
+tbl.row.mdl = entry+
+tbl.row.att = empty
+tbl.entry.mdl = paracon*
+tbl.entry.att = empty
+# =====  Element and attribute declarations follow. =====
+
+# Default declarations previously defined in this entity and
+# referenced below include:
+# ENTITY % tbl.table.name       "table"
+# ENTITY % tbl.table-titles.mdl "%titles;,"
+# ENTITY % tbl.table.mdl        "%tbl.table-titles; tgroup+"
+# ENTITY % tbl.table.att        "
+#                    pgwide          %yesorno;       #IMPLIED "
+table.element = element table { table.attlist, tbl.table.mdl }
+table.attlist &=
+  attribute frame {
+    "top" | "bottom" | "topbot" | "all" | "sides" | "none"
+  }?,
+  attribute colsep { yesorno }?,
+  attribute rowsep { yesorno }?,
+  tbl.table.att,
+  bodyatt
+# Default declarations previously defined in this entity and
+# referenced below include:
+# ENTITY % tbl.tgroup.mdl    "colspec*,thead?,tbody"
+# ENTITY % tbl.tgroup.att    ""
+tgroup.element = element tgroup { tgroup.attlist, tbl.tgroup.mdl }
+tgroup.attlist &=
+  attribute cols { xsd:NMTOKEN },
+  attribute colsep { yesorno }?,
+  attribute rowsep { yesorno }?,
+  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
+  tbl.tgroup.att
+# Default declarations previously defined in this entity and
+# referenced below include:
+# ENTITY % tbl.colspec.att   ""
+colspec.element = element colspec { colspec.attlist, empty }
+colspec.attlist &=
+  attribute colnum { xsd:NMTOKEN }?,
+  attribute colname { xsd:NMTOKEN }?,
+  attribute colwidth { text }?,
+  attribute colsep { yesorno }?,
+  attribute rowsep { yesorno }?,
+  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
+  attribute char { text }?,
+  attribute charoff { xsd:NMTOKEN }?,
+  tbl.colspec.att
+# Default declarations previously defined in this entity and
+# referenced below include:
+# ENTITY % tbl.thead.att      ""
+thead.element = element thead { thead.attlist, row+ }
+thead.attlist &=
+  attribute valign { "top" | "middle" | "bottom" }?,
+  tbl.thead.att
+# Default declarations previously defined in this entity and
+# referenced below include:
+# ENTITY % tbl.tbody.att     ""
+tbody.element = element tbody { tbody.attlist, row+ }
+tbody.attlist &=
+  attribute valign { "top" | "middle" | "bottom" }?,
+  tbl.tbody.att
+# Default declarations previously defined in this entity and
+# referenced below include:
+# ENTITY % tbl.row.mdl       "entry+"
+# ENTITY % tbl.row.att       ""
+row.element = element row { row.attlist, tbl.row.mdl }
+row.attlist &=
+  attribute rowsep { yesorno }?,
+  attribute valign { "top" | "middle" | "bottom" }?,
+  tbl.row.att
+# Default declarations previously defined in this entity and
+# referenced below include:
+# ENTITY % paracon           "#PCDATA"
+# ENTITY % tbl.entry.mdl     "(%paracon;)*"
+# ENTITY % tbl.entry.att     ""
+entry.element = element entry { entry.attlist, tbl.entry.mdl }
+entry.attlist &=
+  attribute colname { xsd:NMTOKEN }?,
+  attribute namest { xsd:NMTOKEN }?,
+  attribute nameend { xsd:NMTOKEN }?,
+  attribute morerows { xsd:NMTOKEN }?,
+  attribute colsep { yesorno }?,
+  attribute rowsep { yesorno }?,
+  attribute align { "left" | "right" | "center" | "justify" | "char" }?,
+  attribute char { text }?,
+  attribute charoff { xsd:NMTOKEN }?,
+  attribute valign { "top" | "middle" | "bottom" }?,
+  tbl.entry.att
+# =============================================================
+
+# DITA BEHAVIOR ATTRIBUTES
+
+# =============================================================
+table.attlist &=
+  attribute rowheader { "firstcol" | "norowheader" }?,
+  attribute scale {
+    "50"
+    | "60"
+    | "70"
+    | "80"
+    | "90"
+    | "100"
+    | "110"
+    | "120"
+    | "140"
+    | "160"
+    | "180"
+    | "200"
+  }?,
+  univ-atts,
+  attribute outputclass { text }?
+tgroup.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+thead.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+tbody.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+row.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+entry.attlist &=
+  id-atts,
+  localization-atts,
+  attribute rev { text }?,
+  attribute outputclass { text }?
+colspec.attlist &= id-atts, localization-atts
+# =============================================================
+
+# DITA SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+table.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/table " ] attribute class { text }?
+tgroup.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/tgroup " ] attribute class { text }?
+colspec.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/colspec " ] attribute class { text }?
+thead.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/thead " ] attribute class { text }?
+tbody.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/tbody " ] attribute class { text }?
+row.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/row " ] attribute class { text }?
+entry.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/entry " ] attribute class { text }?
+# ================== End XML Exchange Table Model =============
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/topic.dtd b/xml/tests/testData/xml/OasisDocumentHighlighting/topic.dtd
new file mode 100644
index 000000000000..d2ac39081267
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/topic.dtd
@@ -0,0 +1,168 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Topic DTD                                    -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//DTD DITA Topic//EN"
+      Delivered as file "topic.dtd"                                -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    DTD to describe DITA Topics                       -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2006.06.07 RDA: Added indexing domain                      -->
+<!--    2006.06.21 RDA: Added props attribute extensions           -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATIONS                 -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % ui-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA User Interface Domain//EN" 
+"uiDomain.ent"                                                       >
+%ui-d-dec;
+
+<!ENTITY % hi-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Highlight Domain//EN" 
+"highlightDomain.ent"                                                >
+%hi-d-dec;
+
+<!ENTITY % pr-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Programming Domain//EN" 
+"programmingDomain.ent"                                              >
+%pr-d-dec;
+
+<!ENTITY % sw-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Software Domain//EN" 
+"softwareDomain.ent"                                                 >
+%sw-d-dec;
+
+<!ENTITY % ut-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Utilities Domain//EN" 
+"utilitiesDomain.ent"                                                >
+%ut-d-dec;
+
+<!ENTITY % indexing-d-dec     PUBLIC 
+"-//OASIS//ENTITIES DITA Indexing Domain//EN" 
+"indexingDomain.ent"                                                 >
+%indexing-d-dec;
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE DECLARATIONS              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN EXTENSIONS                          -->
+<!-- ============================================================= -->
+<!--                    One for each extended base element, with
+                        the name of the domain(s) in which the
+                        extension was declared                     -->
+
+<!ENTITY % pre          "pre     | %pr-d-pre;     | %sw-d-pre;     | 
+                                   %ui-d-pre;"                       >
+<!ENTITY % keyword      "keyword | %pr-d-keyword; | %sw-d-keyword; |
+                                   %ui-d-keyword;"                   >
+<!ENTITY % ph           "ph      | %pr-d-ph;      | %sw-d-ph;      | 
+                                    %hi-d-ph;     | %ui-d-ph;"       >
+<!ENTITY % fig          "fig     | %pr-d-fig;     | %ut-d-fig;"      >
+<!ENTITY % dl           "dl      | %pr-d-dl;"                        >
+<!ENTITY % index-base   "index-base | %indexing-d-index-base;"       >
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ATTRIBUTE EXTENSIONS                -->
+<!-- ============================================================= -->
+<!ENTITY % props-attribute-extensions  ""                            >
+<!ENTITY % base-attribute-extensions   ""                            >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC NESTING OVERRIDE                     -->
+<!-- ============================================================= -->
+
+<!--                    Redefine the infotype entity to exclude 
+                        other topic types and disallow nesting     -->
+<!ENTITY % topic-info-types 
+                        "topic"                                      >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+<!--                    Must be declared ahead of the DTDs, which
+                        puts @domains first in order               -->
+
+<!ENTITY included-domains 
+                        "&ui-d-att; &hi-d-att; &pr-d-att; &sw-d-att;
+                         &ut-d-att; &indexing-d-att;"                >
+
+
+<!-- ============================================================= -->
+<!--                    TOPIC ELEMENT INTEGRATION                  -->
+<!-- ============================================================= -->
+
+<!--                    Embed topic to get generic elements        -->
+<!ENTITY % topic-type   PUBLIC 
+"-//OASIS//ELEMENTS DITA Topic//EN" 
+"topic.mod"                                                          >
+%topic-type;
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ELEMENT INTEGRATION                 -->
+<!-- ============================================================= -->
+
+<!ENTITY % ui-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA User Interface Domain//EN" 
+"uiDomain.mod"                                                       >
+%ui-d-def;
+
+<!ENTITY % hi-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Highlight Domain//EN" 
+"highlightDomain.mod"                                                >
+%hi-d-def;
+
+<!ENTITY % pr-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Programming Domain//EN" 
+"programmingDomain.mod"                                              >
+%pr-d-def;
+
+<!ENTITY % sw-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Software Domain//EN" 
+"softwareDomain.mod"                                                 >
+%sw-d-def;
+
+<!ENTITY % ut-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Utilities Domain//EN" 
+"utilitiesDomain.mod"                                                >
+%ut-d-def;
+
+<!ENTITY % indexing-d-def     PUBLIC 
+"-//OASIS//ELEMENTS DITA Indexing Domain//EN" 
+"indexingDomain.mod"                                                 >
+%indexing-d-def;
+
+
+<!-- ================== End DITA Topic DTD  ====================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/topic.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/topic.mod
new file mode 100644
index 000000000000..cd834c4fd960
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/topic.mod
@@ -0,0 +1,416 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA DITA Topic                                   -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Topic//EN"
+      Delivered as file "topic.mod"                                -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the base Topic type                -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected the public ID for tblDecl.mod    -->
+<!--    2005.11.15 RDA: Removed old declaration for topicreftypes  -->
+<!--                    entity                                     -->
+<!--    2005.11.15 RDA: Corrected the PURPOSE in this comment      -->
+<!--    2005.11.15 RDA: Corrected Long Names for alt, indextermref -->
+<!--    2006.06.06 RDA: Bug fixes:                                 -->
+<!--                    Added xref and fn to fig.cnt               -->
+<!--                    Remove xmlns="" from global-atts           -->
+<!--    2006.06.06 RDA: Moved shared items to commonElements file  -->
+<!--    2006.06.07 RDA: Added <abstract> element                   -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!--    2006.06.14 RDA: Add dir attribute to localization-atts     -->
+<!--    2006.06.20 RDA: defn.cnt now explicitly sets its content   -->
+<!--    2006.07.06 RDA: Moved class attributes in from topicAttr   -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ARCHITECTURE ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!-- default namespace prefix for DITAArchVersion attribute can be
+     overridden through predefinition in the document type shell   -->
+<!ENTITY % DITAArchNSPrefix
+                       "ditaarch"                                    >
+
+<!-- must be instanced on each topic type                          -->
+<!ENTITY % arch-atts "
+             xmlns:%DITAArchNSPrefix; 
+                        CDATA                              #FIXED
+                       'http://dita.oasis-open.org/architecture/2005/'
+             %DITAArchNSPrefix;:DITAArchVersion
+                        CDATA                              #FIXED
+                       '1.1'"                                        >
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!--                    Definitions of declared elements           -->
+<!ENTITY % topicDefns   PUBLIC 
+                       "-//OASIS//ENTITIES DITA Topic Definitions//EN" 
+                       "topicDefn.ent"                              >
+%topicDefns;
+
+<!--                      Content elements common to map and topic -->
+<!ENTITY % commonElements      PUBLIC 
+"-//OASIS//ELEMENTS DITA Common Elements//EN" "commonElements.mod"   >
+%commonElements;
+
+<!--                       MetaData Elements, plus indexterm       -->
+<!ENTITY % metaXML         PUBLIC 
+"-//OASIS//ELEMENTS DITA Metadata//EN" 
+"metaDecl.mod"                                                       >
+%metaXML;
+
+
+<!-- ============================================================= -->
+<!--                    ENTITY DECLARATIONS FOR ATTRIBUTE VALUES   -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    COMMON ATTLIST SETS                        -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % body.cnt             "%basic.block; | %required-cleanup; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % section.cnt          "#PCDATA | %basic.ph; | %basic.block; | %title; |  %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+<!ENTITY % section.notitle.cnt  "#PCDATA | %basic.ph; | %basic.block; |             %txt.incl; | %data.elements.incl; | %foreign.unknown.incl;">
+
+
+<!-- ============================================================= -->
+<!--                COMMON ENTITY DECLARATIONS                     -->
+<!-- ============================================================= -->
+
+<!-- for use within the DTD and supported topics; these will NOT work
+     outside of this DTD or dtds that specialize from it!          -->
+<!ENTITY nbsp                   "&#160;"                             >
+
+
+<!-- ============================================================= -->
+<!--                    NOTATION DECLARATIONS                      -->
+<!-- ============================================================= -->
+<!--                    DITA uses the direct reference model; 
+                        notations may be added later as required   -->
+
+
+<!-- ============================================================= -->
+<!--                    STRUCTURAL MEMBERS                         -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % info-types    'topic'                                     > 
+
+
+<!-- ============================================================= -->
+<!--                    COMMON ATTLIST SETS                        -->
+<!-- ============================================================= -->
+
+<!-- Copied into metaDecl.mod -->
+<!--<!ENTITY % date-format 'CDATA'                                >-->
+
+<!ENTITY % rel-atts      
+            'type       CDATA                              #IMPLIED
+             role      (parent | child | sibling | 
+                        friend | next | previous | cousin | 
+                        ancestor | descendant | sample | 
+                        external | other)                  #IMPLIED
+             otherrole  CDATA                              #IMPLIED' >
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION OF DECLARED ELEMENTS        -->
+<!-- ============================================================= -->
+
+<!ENTITY % topic-info-types "%info-types;">
+
+
+<!-- ============================================================= -->
+<!--                    DOMAINS ATTRIBUTE OVERRIDE                 -->
+<!-- ============================================================= -->
+
+<!ENTITY included-domains ""                                         >
+  
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+
+<!--                    LONG NAME: Topic                           -->
+<!ELEMENT topic         ((%title;), (%titlealts;)?,
+                         (%shortdesc; | %abstract;)?, 
+                         (%prolog;)?, (%body;)?, (%related-links;)?,
+                         (%topic-info-types;)* )                     >
+<!ATTLIST topic           
+             id         ID                                 #REQUIRED
+             conref     CDATA                              #IMPLIED
+             %select-atts;
+             %localization-atts;
+             outputclass 
+                        CDATA                              #IMPLIED
+             %arch-atts;
+             domains    CDATA                    "&included-domains;">
+
+
+<!--                    LONG NAME: Title Alternatives              -->
+<!ELEMENT titlealts     ((%navtitle;)?, (%searchtitle;)?)            >
+<!ATTLIST titlealts      
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Navigation Title                -->
+<!ELEMENT navtitle      (%words.cnt;)*                               >
+<!ATTLIST navtitle     
+             %univ-atts;                                             >
+
+<!--                    LONG NAME: Search Title                    -->
+<!ELEMENT searchtitle   (%words.cnt;)*                               >
+<!ATTLIST searchtitle     
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Abstract                        -->
+<!ELEMENT abstract      (%section.notitle.cnt; | %shortdesc;)*       >
+<!ATTLIST abstract         
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+                        
+<!--                    LONG NAME: Short Description               -->
+<!--
+<!ELEMENT shortdesc     (%title.cnt;)*                               >
+<!ATTLIST shortdesc    
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+-->
+
+
+<!--                    LONG NAME: Body                            -->
+<!ELEMENT body          (%body.cnt; | %section; | %example;)*        >
+<!ATTLIST body            
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: No Topic nesting                -->
+<!ELEMENT no-topic-nesting EMPTY                                     >
+
+
+<!--                    LONG NAME: Section                         -->
+<!ELEMENT section       (%section.cnt;)*                             >
+<!ATTLIST section         
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Example                         -->
+<!ELEMENT example       (%section.cnt;)*                             >
+<!ATTLIST example         
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Description                     -->
+<!--                    Desc is used in context with figure and 
+                        table titles and also for content models 
+                        within linkgroup and object (for 
+                        accessibility)                             -->
+<!--
+<!ELEMENT desc          (%desc.cnt;)*                                >
+<!ATTLIST desc           
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+-->
+
+<!-- ============================================================= -->
+<!--                    PROLOG (METADATA FOR TOPICS)               -->
+<!--                    TYPED DATA ELEMENTS                        -->
+<!-- ============================================================= -->
+<!--                    typed content definitions                  -->
+<!--                    typed, localizable content                 -->
+
+<!--                    LONG NAME: Prolog                          -->
+<!ELEMENT prolog        ((%author;)*, (%source;)?, (%publisher;)?,
+                         (%copyright;)*, (%critdates;)?,
+                         (%permissions;)?, (%metadata;)*, 
+                         (%resourceid;)*,
+                         (%data.elements.incl; | 
+                          %foreign.unknown.incl;)*)                  >
+<!ATTLIST prolog        
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Metadata                        -->
+<!ELEMENT metadata       ((%audience;)*, (%category;)*, (%keywords;)*,
+                          (%prodinfo;)*, (%othermeta;)*, 
+                          (%data.elements.incl; |
+                           %foreign.unknown.incl;)*)                 >
+<!ATTLIST metadata
+              %univ-atts;        
+              mapkeyref CDATA                             #IMPLIED   >
+
+
+
+<!-- ============================================================= -->
+<!--                    BASIC DOCUMENT ELEMENT DECLARATIONS        -->
+<!--                    (rich text)                                -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   BASE FORM PHRASE TYPES                      -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                      LINKING GROUPING                         -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Related Links                   -->
+<!ELEMENT related-links (%link; | %linklist; | %linkpool;)+          >
+<!ATTLIST related-links  
+             %rel-atts;
+             %univ-atts;
+             format     CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Link                            -->
+<!ELEMENT link          ((%linktext;)?, (%desc;)?)                   >
+<!ATTLIST link            
+             href       CDATA                            #IMPLIED
+             keyref     CDATA                            #IMPLIED
+             query      CDATA                            #IMPLIED
+             %rel-atts;
+             %univ-atts;
+             format     CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Link Text                       -->
+<!ELEMENT linktext      (%words.cnt;)*                               >
+<!ATTLIST linktext        
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Link List                       -->
+<!ELEMENT linklist      ((%title;)?, (%desc;)?,
+                         (%linklist; | %link;)*, (%linkinfo;)?)      >
+<!ATTLIST linklist        
+            collection-type 
+                        (unordered | sequence | choice |
+                         tree | family)                   #IMPLIED
+             duplicates (yes | no)                        #IMPLIED
+                          mapkeyref CDATA #IMPLIED
+             %rel-atts;
+             %univ-atts;
+             spectitle  CDATA                            #IMPLIED
+             format     CDATA                            #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Link Information                -->
+<!ELEMENT linkinfo      (%desc.cnt;)*                                >
+<!ATTLIST linkinfo        
+             %univ-atts;                                             >
+
+
+<!--                    LONG NAME: Link Pool                       -->
+<!ELEMENT linkpool      (%linkpool; | %link;)*                       >
+<!ATTLIST linkpool        
+             collection-type 
+                        (unordered | sequence | choice |
+                         tree | family)                   #IMPLIED
+             duplicates (yes | no)                        #IMPLIED
+             mapkeyref  CDATA                             #IMPLIED
+             %rel-atts;
+             %univ-atts;
+             format     CDATA   #IMPLIED
+             scope      (local | peer | external)        #IMPLIED
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+
+<!-- ============================================================= -->
+<!--                    MODULES CALLS                              -->
+<!-- ============================================================= -->
+
+
+<!--                      Table Elements                           -->
+<!--    2005.11.15 RDA: Corrected the public ID for tblDecl.mod,   -->
+<!--  from the old value "-//OASIS//ELEMENTS DITA CALS Tables//EN" -->
+<!-- Tables are now part of commonElements -->
+<!--<!ENTITY % tableXML       PUBLIC  
+"-//OASIS//ELEMENTS DITA Exchange Table Model//EN" 
+"tblDecl.mod"                                                        >
+%tableXML;-->
+
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+            
+<!ATTLIST abstract  %global-atts;  class CDATA "- topic/abstract "   >
+<!ATTLIST body      %global-atts;  class CDATA "- topic/body "       >
+<!ATTLIST example   %global-atts;  class CDATA "- topic/example "    >
+<!ATTLIST link      %global-atts;  class CDATA "- topic/link "       >
+<!ATTLIST linkinfo  %global-atts;  class CDATA "- topic/linkinfo "   >
+<!ATTLIST linklist  %global-atts;  class CDATA "- topic/linklist "   >
+<!ATTLIST linkpool  %global-atts;  class CDATA "- topic/linkpool "   >
+<!ATTLIST linktext  %global-atts;  class CDATA "- topic/linktext "   >
+<!ATTLIST metadata  %global-atts;  class CDATA "- topic/metadata "   >
+<!ATTLIST navtitle  %global-atts;  class CDATA "- topic/navtitle "   >
+<!ATTLIST no-topic-nesting 
+                    %global-atts;  class CDATA "- topic/no-topic-nesting ">
+<!ATTLIST prolog    %global-atts;  class CDATA "- topic/prolog "     >
+<!ATTLIST related-links 
+                    %global-atts;  class CDATA "- topic/related-links ">
+<!ATTLIST searchtitle 
+                    %global-atts;  class CDATA "- topic/searchtitle ">
+<!ATTLIST section   %global-atts;  class CDATA "- topic/section "    >
+<!ATTLIST titlealts %global-atts;  class CDATA "- topic/titlealts "  >
+<!ATTLIST topic     %global-atts;  class CDATA "- topic/topic "      >
+
+<!-- Shortdesc in map uses map/shortdesc so this one must be 
+     included, even though the element is common. -->
+<!ATTLIST shortdesc   %global-atts;  class CDATA "- topic/shortdesc ">
+
+<!-- ================== End DITA Topic  ========================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/topic.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/topic.mod.rnc
new file mode 100644
index 000000000000..4ebbfa97149f
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/topic.mod.rnc
@@ -0,0 +1,505 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA DITA Topic
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Topic//EN"
+#       Delivered as file "topic.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the base Topic type
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected the public ID for tblDecl.mod
+
+# 2005.11.15 RDA: Removed old declaration for topicreftypes
+
+# entity
+
+# 2005.11.15 RDA: Corrected the PURPOSE in this comment
+
+# 2005.11.15 RDA: Corrected Long Names for alt, indextermref
+
+# 2006.06.06 RDA: Bug fixes:
+
+# Added xref and fn to fig.cnt
+
+# Remove xmlns="" from global-atts
+
+# 2006.06.06 RDA: Moved shared items to commonElements file
+
+# 2006.06.07 RDA: Added <abstract> element
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# 2006.06.14 RDA: Add dir attribute to localization-atts
+
+# 2006.06.20 RDA: defn.cnt now explicitly sets its content
+
+# 2006.07.06 RDA: Moved class attributes in from topicAttr
+
+# =============================================================
+
+# =============================================================
+
+# ARCHITECTURE ENTITIES
+
+# =============================================================
+
+# default namespace prefix for DITAArchVersion attribute can be
+# overridden through predefinition in the document type shell
+
+# must be instanced on each topic type
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace ditaarch = "http://dita.oasis-open.org/architecture/2005/"
+
+arch-atts =
+  [ a:defaultValue = "1.1" ]
+  attribute ditaarch:DITAArchVersion { string "1.1" }?
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+# Definitions of declared elements
+include "topicDefn.ent.rnc"
+# Content elements common to map and topic
+include "commonElements.mod.rnc"
+# MetaData Elements, plus indexterm
+include "metaDecl.mod.rnc"
+# =============================================================
+
+# ENTITY DECLARATIONS FOR ATTRIBUTE VALUES
+
+# =============================================================
+
+# =============================================================
+
+# COMMON ATTLIST SETS
+
+# =============================================================
+body.cnt =
+  basic.block
+  | required-cleanup
+  | data.elements.incl
+  | foreign.unknown.incl
+section.cnt =
+  text
+  | basic.ph
+  | basic.block
+  | title
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+section.notitle.cnt =
+  text
+  | basic.ph
+  | basic.block
+  | txt.incl
+  | data.elements.incl
+  | foreign.unknown.incl
+# =============================================================
+
+# COMMON ENTITY DECLARATIONS
+
+# =============================================================
+
+# for use within the DTD and supported topics; these will NOT work
+# outside of this DTD or dtds that specialize from it!
+
+# =============================================================
+
+# NOTATION DECLARATIONS
+
+# =============================================================
+
+# DITA uses the direct reference model; 
+# notations may be added later as required
+
+# =============================================================
+
+# STRUCTURAL MEMBERS
+
+# =============================================================
+info-types = topic.element
+# =============================================================
+
+# COMMON ATTLIST SETS
+
+# =============================================================
+
+# Copied into metaDecl.mod
+
+# <!ENTITY % date-format 'CDATA'                                >
+rel-atts =
+  attribute type { text }?,
+  attribute role {
+    "parent"
+    | "child"
+    | "sibling"
+    | "friend"
+    | "next"
+    | "previous"
+    | "cousin"
+    | "ancestor"
+    | "descendant"
+    | "sample"
+    | "external"
+    | "other"
+  }?,
+  attribute otherrole { text }?
+# =============================================================
+
+# SPECIALIZATION OF DECLARED ELEMENTS
+
+# =============================================================
+topic-info-types = info-types
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: Topic
+topic.element =
+  element topic {
+    topic.attlist,
+    title,
+    titlealts?,
+    (shortdesc | abstract)?,
+    prolog?,
+    body?,
+    related-links?,
+    topic-info-types*
+  }
+topic.attlist &=
+  attribute id { xsd:ID },
+  attribute conref { text }?,
+  select-atts,
+  localization-atts,
+  attribute outputclass { text }?,
+  arch-atts,
+  [
+    a:defaultValue =
+      "(topic ui-d) (topic hi-d) (topic pr-d) (topic sw-d)                          (topic ut-d) (topic indexing-d)"
+  ]
+  attribute domains { text }?
+# LONG NAME: Title Alternatives
+titlealts.element =
+  element titlealts { titlealts.attlist, navtitle?, searchtitle? }
+titlealts.attlist &= univ-atts
+# LONG NAME: Navigation Title
+navtitle.element = element navtitle { navtitle.attlist, words.cnt* }
+navtitle.attlist &= univ-atts
+# LONG NAME: Search Title
+searchtitle.element =
+  element searchtitle { searchtitle.attlist, words.cnt* }
+searchtitle.attlist &= univ-atts
+# LONG NAME: Abstract
+abstract.element =
+  element abstract {
+    abstract.attlist, (section.notitle.cnt | shortdesc)*
+  }
+abstract.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Short Description
+
+# <!ELEMENT shortdesc     (%title.cnt;)*                               >
+# <!ATTLIST shortdesc    
+#              %univ-atts;
+#              outputclass 
+#                         CDATA                            #IMPLIED    >
+
+# LONG NAME: Body
+body.element =
+  element body { body.attlist, (body.cnt | section | example)* }
+body.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: No Topic nesting
+no-topic-nesting.element =
+  element no-topic-nesting { no-topic-nesting.attlist, empty }
+# LONG NAME: Section
+section.element = element section { section.attlist, section.cnt* }
+section.attlist &=
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Example
+example.element = element example { example.attlist, section.cnt* }
+example.attlist &=
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Description
+
+# Desc is used in context with figure and 
+# table titles and also for content models 
+# within linkgroup and object (for 
+# accessibility)
+
+# <!ELEMENT desc          (%desc.cnt;)*                                >
+# <!ATTLIST desc           
+#              %univ-atts;
+#              outputclass 
+#                         CDATA                            #IMPLIED    >
+
+# =============================================================
+
+# PROLOG (METADATA FOR TOPICS)
+
+# TYPED DATA ELEMENTS
+
+# =============================================================
+
+# typed content definitions
+
+# typed, localizable content
+
+# LONG NAME: Prolog
+prolog.element =
+  element prolog {
+    prolog.attlist,
+    author*,
+    source?,
+    publisher?,
+    copyright*,
+    critdates?,
+    permissions?,
+    metadata*,
+    resourceid*,
+    (data.elements.incl | foreign.unknown.incl)*
+  }
+prolog.attlist &= univ-atts
+# LONG NAME: Metadata
+metadata.element =
+  element metadata {
+    metadata.attlist,
+    audience*,
+    category*,
+    keywords*,
+    prodinfo*,
+    othermeta*,
+    (data.elements.incl | foreign.unknown.incl)*
+  }
+metadata.attlist &=
+  univ-atts,
+  attribute mapkeyref { text }?
+# =============================================================
+
+# BASIC DOCUMENT ELEMENT DECLARATIONS
+
+# (rich text)
+
+# =============================================================
+
+# =============================================================
+
+# BASE FORM PHRASE TYPES
+
+# =============================================================
+
+# =============================================================
+
+# LINKING GROUPING
+
+# =============================================================
+
+# LONG NAME: Related Links
+related-links.element =
+  element related-links {
+    related-links.attlist, (link | linklist | linkpool)+
+  }
+related-links.attlist &=
+  rel-atts,
+  univ-atts,
+  attribute format { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute outputclass { text }?
+# LONG NAME: Link
+link.element = element link { link.attlist, linktext?, desc? }
+link.attlist &=
+  attribute href { text }?,
+  attribute keyref { text }?,
+  attribute query { text }?,
+  rel-atts,
+  univ-atts,
+  attribute format { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute outputclass { text }?
+# LONG NAME: Link Text
+linktext.element = element linktext { linktext.attlist, words.cnt* }
+linktext.attlist &= univ-atts
+# LONG NAME: Link List
+linklist.element =
+  element linklist {
+    linklist.attlist, title?, desc?, (linklist | link)*, linkinfo?
+  }
+linklist.attlist &=
+  attribute collection-type {
+    "unordered" | "sequence" | "choice" | "tree" | "family"
+  }?,
+  attribute duplicates { "yes" | "no" }?,
+  attribute mapkeyref { text }?,
+  rel-atts,
+  univ-atts,
+  attribute spectitle { text }?,
+  attribute format { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute outputclass { text }?
+# LONG NAME: Link Information
+linkinfo.element = element linkinfo { linkinfo.attlist, desc.cnt* }
+linkinfo.attlist &= univ-atts
+# LONG NAME: Link Pool
+linkpool.element =
+  element linkpool { linkpool.attlist, (linkpool | link)* }
+linkpool.attlist &=
+  attribute collection-type {
+    "unordered" | "sequence" | "choice" | "tree" | "family"
+  }?,
+  attribute duplicates { "yes" | "no" }?,
+  attribute mapkeyref { text }?,
+  rel-atts,
+  univ-atts,
+  attribute format { text }?,
+  attribute scope { "local" | "peer" | "external" }?,
+  attribute outputclass { text }?
+# =============================================================
+
+# MODULES CALLS
+
+# =============================================================
+
+# Table Elements
+
+# 2005.11.15 RDA: Corrected the public ID for tblDecl.mod,
+
+# from the old value "-//OASIS//ELEMENTS DITA CALS Tables//EN"
+
+# Tables are now part of commonElements
+
+# <!ENTITY % tableXML       PUBLIC  
+# "-//OASIS//ELEMENTS DITA Exchange Table Model//EN" 
+# "tblDecl.mod"                                                        >
+# %tableXML;
+
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+abstract.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/abstract " ] attribute class { text }?
+body.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/body " ] attribute class { text }?
+example.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/example " ] attribute class { text }?
+link.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/link " ] attribute class { text }?
+linkinfo.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/linkinfo " ] attribute class { text }?
+linklist.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/linklist " ] attribute class { text }?
+linkpool.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/linkpool " ] attribute class { text }?
+linktext.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/linktext " ] attribute class { text }?
+metadata.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/metadata " ] attribute class { text }?
+navtitle.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/navtitle " ] attribute class { text }?
+no-topic-nesting.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/no-topic-nesting " ]
+  attribute class { text }?
+prolog.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/prolog " ] attribute class { text }?
+related-links.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/related-links " ]
+  attribute class { text }?
+searchtitle.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/searchtitle " ] attribute class { text }?
+section.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/section " ] attribute class { text }?
+titlealts.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/titlealts " ] attribute class { text }?
+topic.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/topic " ] attribute class { text }?
+# Shortdesc in map uses map/shortdesc so this one must be 
+# included, even though the element is common.
+shortdesc.attlist &=
+  global-atts,
+  [ a:defaultValue = "- topic/shortdesc " ] attribute class { text }?
+# ================== End DITA Topic  ==========================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/topic.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/topic.rnc
new file mode 100644
index 000000000000..59a22493df4e
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/topic.rnc
@@ -0,0 +1,146 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Topic DTD
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//DTD DITA Topic//EN"
+#       Delivered as file "topic.dtd"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    DTD to describe DITA Topics
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2006.06.07 RDA: Added indexing domain
+
+# 2006.06.21 RDA: Added props attribute extensions
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN ENTITY DECLARATIONS
+
+# =============================================================
+
+include "uiDomain.ent.rnc"
+include "highlightDomain.ent.rnc"
+include "programmingDomain.ent.rnc"
+include "softwareDomain.ent.rnc"
+include "utilitiesDomain.ent.rnc"
+include "indexingDomain.ent.rnc"
+# =============================================================
+
+# DOMAIN ATTRIBUTE DECLARATIONS
+
+# =============================================================
+
+# =============================================================
+
+# DOMAIN EXTENSIONS
+
+# =============================================================
+
+# One for each extended base element, with
+# the name of the domain(s) in which the
+# extension was declared
+pre = pre.element | pr-d-pre | sw-d-pre | ui-d-pre
+keyword = keyword.element | pr-d-keyword | sw-d-keyword | ui-d-keyword
+ph = ph.element | pr-d-ph | sw-d-ph | hi-d-ph | ui-d-ph
+fig = fig.element | pr-d-fig | ut-d-fig
+dl = dl.element | pr-d-dl
+index-base = index-base.element | indexing-d-index-base
+# =============================================================
+
+# DOMAIN ATTRIBUTE EXTENSIONS
+
+# =============================================================
+props-attribute-extensions = empty
+base-attribute-extensions = empty
+# =============================================================
+
+# TOPIC NESTING OVERRIDE
+
+# =============================================================
+
+# Redefine the infotype entity to exclude 
+# other topic types and disallow nesting
+topic-info-types = topic.element
+# =============================================================
+
+# DOMAINS ATTRIBUTE OVERRIDE
+
+# =============================================================
+
+# Must be declared ahead of the DTDs, which
+# puts @domains first in order
+
+# =============================================================
+
+# TOPIC ELEMENT INTEGRATION
+
+# =============================================================
+
+# Embed topic to get generic elements
+include "topic.mod.rnc"
+# =============================================================
+
+# DOMAIN ELEMENT INTEGRATION
+
+# =============================================================
+include "uiDomain.mod.rnc"
+include "highlightDomain.mod.rnc"
+include "programmingDomain.mod.rnc"
+include "softwareDomain.mod.rnc"
+include "utilitiesDomain.mod.rnc"
+include "indexingDomain.mod.rnc"
+start = no-topic-nesting.element
+any =
+  (element * {
+     attribute * { text }*,
+     any
+   }
+   | text)*
+# ================== End DITA Topic DTD  ======================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/topicAttr.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/topicAttr.mod
new file mode 100644
index 000000000000..6bccf81339fe
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/topicAttr.mod
@@ -0,0 +1,69 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Topic Class Entities                         -->
+<!--  VERSION:   1.0.1                                             -->
+<!--  DATE:      November 2005                                     -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA Topic Class//EN"
+      Delivered as file "topicAttr.mod"                            -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the Topic specialization attributes     -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005.                    -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Removed extra declaration for <title>      -->
+<!--                    attributes                                 -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!--    2006.05.05 RDA: Moved shared items to commonElements file  --> 
+<!--    2006.06.07 RDA: Added <abstract> element                   -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ATTLIST abstract  %global-atts;  class CDATA "- topic/abstract "   >
+<!ATTLIST body      %global-atts;  class CDATA "- topic/body "       >
+<!ATTLIST example   %global-atts;  class CDATA "- topic/example "    >
+<!ATTLIST link      %global-atts;  class CDATA "- topic/link "       >
+<!ATTLIST linkinfo  %global-atts;  class CDATA "- topic/linkinfo "   >
+<!ATTLIST linklist  %global-atts;  class CDATA "- topic/linklist "   >
+<!ATTLIST linkpool  %global-atts;  class CDATA "- topic/linkpool "   >
+<!ATTLIST linktext  %global-atts;  class CDATA "- topic/linktext "   >
+<!ATTLIST metadata  %global-atts;  class CDATA "- topic/metadata "   >
+<!ATTLIST navtitle  %global-atts;  class CDATA "- topic/navtitle "   >
+<!ATTLIST no-topic-nesting 
+                    %global-atts;  class CDATA "- topic/no-topic-nesting ">
+<!ATTLIST prolog    %global-atts;  class CDATA "- topic/prolog "     >
+<!ATTLIST related-links 
+                    %global-atts;  class CDATA "- topic/related-links ">
+<!ATTLIST searchtitle 
+                    %global-atts;  class CDATA "- topic/searchtitle ">
+<!ATTLIST section   %global-atts;  class CDATA "- topic/section "    >
+<!ATTLIST titlealts %global-atts;  class CDATA "- topic/titlealts "  >
+<!ATTLIST topic     %global-atts;  class CDATA "- topic/topic "      >
+
+<!-- Shortdesc in map uses map/shortdesc so this one must be 
+     included, even though it is common. -->
+<!ATTLIST shortdesc   %global-atts;  class CDATA "- topic/shortdesc "  >
+
+<!-- ================== End Topic Class Entities ================= -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/topicDefn.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/topicDefn.ent
new file mode 100644
index 000000000000..b7062c0068d5
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/topicDefn.ent
@@ -0,0 +1,72 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Topic Definitions                            -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+PUBLIC"-//OASIS//ENTITIES DITA Topic Definitions//EN"
+      Delivered as file "topicDefn.ent"                            -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the topic definitions                   -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Removed old declarations for spanspec and  -->
+<!--                    tfoot entities                             -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!--    2006.07.06 RDA: Moved common elements to the module        -->
+<!--                    commonElements.ent                         -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT NAME ENTITIES                      -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % topic        "topic"                                      >
+<!ENTITY % abstract     "abstract"                                   >
+<!ENTITY % body         "body"                                       >
+<!ENTITY % example      "example"                                    >
+<!ENTITY % link         "link"                                       >
+<!ENTITY % linkinfo     "linkinfo"                                   >
+<!ENTITY % linklist     "linklist"                                   >
+<!ENTITY % linkpool     "linkpool"                                   >
+<!ENTITY % linktext     "linktext"                                   >
+<!ENTITY % metadata     "metadata"                                   >
+<!ENTITY % navtitle     "navtitle"                                   >
+<!ENTITY % no-topic-nesting     
+                        "no-topic-nesting"                           >
+<!ENTITY % prolog       "prolog"                                     >
+<!ENTITY % related-links     
+                        "related-links"                              >
+<!ENTITY % searchtitle  "searchtitle"                                >
+<!ENTITY % section      "section"                                    >
+<!ENTITY % shortdesc    "shortdesc"                                  >
+<!ENTITY % titlealts    "titlealts"                                  >
+
+<!--                    Also include common elements used in topics
+                        and maps                                   -->
+<!ENTITY % commonDefns   PUBLIC 
+                       "-//OASIS//ENTITIES DITA Common Elements//EN" 
+                       "commonElements.ent"                          >
+%commonDefns;
+
+<!-- ================== End Topic Definitions Entities =========== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/topicDefn.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/topicDefn.ent.rnc
new file mode 100644
index 000000000000..22d1316404ce
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/topicDefn.ent.rnc
@@ -0,0 +1,92 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Topic Definitions
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+# PUBLIC"-//OASIS//ENTITIES DITA Topic Definitions//EN"
+#       Delivered as file "topicDefn.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the topic definitions
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Removed old declarations for spanspec and
+
+# tfoot entities
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# 2006.07.06 RDA: Moved common elements to the module
+
+# commonElements.ent
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+abstract = abstract.element
+body = body.element
+example = example.element
+link = link.element
+linkinfo = linkinfo.element
+linklist = linklist.element
+linkpool = linkpool.element
+linktext = linktext.element
+metadata = metadata.element
+navtitle = navtitle.element
+prolog = prolog.element
+related-links = related-links.element
+searchtitle = searchtitle.element
+section = section.element
+shortdesc = shortdesc.element
+titlealts = titlealts.element
+# Also include common elements used in topics
+# and maps
+include "commonElements.ent.rnc"
+# ================== End Topic Definitions Entities ===========
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.ent
new file mode 100644
index 000000000000..94e9b4307816
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.ent
@@ -0,0 +1,54 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA User Interface Domain Entities               -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA User Interface Domain//EN"
+      Delivered as file "uiDomain.ent"                             -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the substitution context and domain     -->
+<!--             entity declarations for the User Interface Domain -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Updated these comments to match template   -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    ELEMENT EXTENSION ENTITY DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ENTITY % ui-d-keyword "wintitle"                                   >
+<!ENTITY % ui-d-ph      "uicontrol | menucascade"                    >
+<!ENTITY % ui-d-pre     "screen"                                     >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATION                  -->
+<!-- ============================================================= -->
+
+
+<!ENTITY ui-d-att "(topic ui-d)">
+
+
+<!-- ================== End User Interface Domain Entities ======= -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.ent.rnc
new file mode 100644
index 000000000000..14711e391a45
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.ent.rnc
@@ -0,0 +1,79 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA User Interface Domain Entities
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ENTITIES DITA User Interface Domain//EN"
+#       Delivered as file "uiDomain.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the substitution context and domain
+
+# entity declarations for the User Interface Domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Updated these comments to match template
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT EXTENSION ENTITY DECLARATIONS
+
+# =============================================================
+
+ui-d-keyword = wintitle.element
+ui-d-ph = uicontrol.element | menucascade.element
+ui-d-pre = screen.element
+# =============================================================
+
+# DOMAIN ENTITY DECLARATION
+
+# =============================================================
+
+# ================== End User Interface Domain Entities =======
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.mod
new file mode 100644
index 000000000000..3254efaa7954
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.mod
@@ -0,0 +1,117 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA User Interface Domain                        -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA User Interface Domain//EN"
+      Delivered as file "uiDomain.mod"                             -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the User Interface Domain          -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Corrected LONG NAME for screen             -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+  
+<!ENTITY % uicontrol   "uicontrol"                                   >
+<!ENTITY % wintitle    "wintitle"                                    >
+<!ENTITY % menucascade "menucascade"                                 >
+<!ENTITY % shortcut    "shortcut"                                    >
+<!ENTITY % screen      "screen"                                      >
+
+
+<!-- ============================================================= -->
+<!--                    UI KEYWORD TYPES ELEMENT DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: User Interface Control          -->
+<!ELEMENT uicontrol     (%words.cnt; | %image; | %shortcut;)*        >
+<!ATTLIST uicontrol       
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Window Title                    -->
+<!ELEMENT wintitle      (#PCDATA)                                    >
+<!ATTLIST wintitle        
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+
+<!--                    LONG NAME: Menu Cascade                    -->
+<!ELEMENT menucascade   (%uicontrol;)+                               >
+<!ATTLIST menucascade     
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Short Cut                       -->
+<!ELEMENT shortcut      (#PCDATA)                                    >
+<!ATTLIST shortcut        
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Text Screen Capture             -->
+<!ELEMENT screen        (#PCDATA | %basic.ph.notm; | %txt.incl; |
+                         %data.elements.incl; | 
+                         %foreign.unknown.incl;)*                    >
+<!ATTLIST screen          
+             %display-atts;
+             spectitle  CDATA                            #IMPLIED
+             xml:space  (preserve)               #FIXED 'preserve'
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+             
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+             
+
+<!ATTLIST menucascade %global-atts;  class CDATA "+ topic/ph ui-d/menucascade "  >
+<!ATTLIST screen      %global-atts;  class CDATA "+ topic/pre ui-d/screen "      >
+<!ATTLIST shortcut    %global-atts;  class CDATA "+ topic/keyword ui-d/shortcut ">
+<!ATTLIST uicontrol   %global-atts;  class CDATA "+ topic/ph ui-d/uicontrol "    >
+<!ATTLIST wintitle    %global-atts;  class CDATA "+ topic/keyword ui-d/wintitle ">
+
+ 
+<!-- ================== End DITA User Interface Domain =========== -->
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.mod.rnc
new file mode 100644
index 000000000000..634a57e4a967
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/uiDomain.mod.rnc
@@ -0,0 +1,149 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA User Interface Domain
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA User Interface Domain//EN"
+#       Delivered as file "uiDomain.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the User Interface Domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Corrected LONG NAME for screen
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+uicontrol = uicontrol.element
+shortcut = shortcut.element
+# =============================================================
+
+# UI KEYWORD TYPES ELEMENT DECLARATIONS
+
+# =============================================================
+
+# LONG NAME: User Interface Control
+uicontrol.element =
+  element uicontrol {
+    uicontrol.attlist, (words.cnt | image | shortcut)*
+  }
+uicontrol.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Window Title
+wintitle.element = element wintitle { wintitle.attlist, text }
+wintitle.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Menu Cascade
+menucascade.element =
+  element menucascade { menucascade.attlist, uicontrol+ }
+menucascade.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Short Cut
+shortcut.element = element shortcut { shortcut.attlist, text }
+shortcut.attlist &=
+  attribute keyref { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Text Screen Capture
+screen.element =
+  element screen {
+    screen.attlist,
+    (text
+     | basic.ph.notm
+     | txt.incl
+     | data.elements.incl
+     | foreign.unknown.incl)*
+  }
+screen.attlist &=
+  display-atts,
+  attribute spectitle { text }?,
+  [ a:defaultValue = "preserve" ] attribute xml:space { "preserve" }?,
+  univ-atts,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+menucascade.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph ui-d/menucascade " ]
+  attribute class { text }?
+screen.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/pre ui-d/screen " ]
+  attribute class { text }?
+shortcut.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword ui-d/shortcut " ]
+  attribute class { text }?
+uicontrol.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph ui-d/uicontrol " ]
+  attribute class { text }?
+wintitle.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword ui-d/wintitle " ]
+  attribute class { text }?
+# ================== End DITA User Interface Domain ===========
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.ent
new file mode 100644
index 000000000000..afda6b124e01
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.ent
@@ -0,0 +1,53 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Utilities Domain Entities                    -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA Utilities Domain//EN"
+      Delivered as file "utilitiesDomain.ent"                      -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the substitution context and domain     -->
+<!--             entity declarations for the utilities domain      -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Removed entity "ut-d-simpletable"          -->
+<!--    2005.11.15 RDA: Updated these comments to match template   -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    ELEMENT EXTENSION ENTITY DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ENTITY % ut-d-fig     "imagemap"                                   >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATION                  -->
+<!-- ============================================================= -->
+
+  
+<!ENTITY ut-d-att       "(topic ut-d)"                               >
+
+
+<!-- ================== End Utilities Domain Entities ============ -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.ent.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.ent.rnc
new file mode 100644
index 000000000000..c8ff8dd9de39
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.ent.rnc
@@ -0,0 +1,79 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Utilities Domain Entities
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an 
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ENTITIES DITA Utilities Domain//EN"
+#       Delivered as file "utilitiesDomain.ent"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the substitution context and domain
+
+# entity declarations for the utilities domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Removed entity "ut-d-simpletable"
+
+# 2005.11.15 RDA: Updated these comments to match template
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT EXTENSION ENTITY DECLARATIONS
+
+# =============================================================
+
+ut-d-fig = imagemap.element
+# =============================================================
+
+# DOMAIN ENTITY DECLARATION
+
+# =============================================================
+
+# ================== End Utilities Domain Entities ============
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.mod
new file mode 100644
index 000000000000..405513ade3df
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.mod
@@ -0,0 +1,119 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA Utilities Domain                             -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA Utilities Domain//EN"
+      Delivered as file "utilitiesDomain.mod"                      -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the DITA Utilities Domain          -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             March 2001                                        -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2005, 2006.              -->
+<!--             (C) Copyright IBM Corporation 2001, 2004.         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    2005.11.15 RDA: Updated these comments to match template   -->
+<!--    2005.11.15 RDA: Corrected the "Delivered as" system ID     -->
+<!--    2006.06.07 RDA: Make universal attributes universal        -->
+<!--                      (DITA 1.1 proposal #12)                  -->
+<!--    2006.06.14 RDA: Move univ-atts-translate-no into topic.mod -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                   ELEMENT NAME ENTITIES                       -->
+<!-- ============================================================= -->
+
+<!ENTITY % imagemap    "imagemap"                                    >
+<!ENTITY % area        "area"                                        >
+<!ENTITY % shape       "shape"                                       >
+<!ENTITY % coords      "coords"                                      >
+
+
+<!-- ============================================================= -->
+<!--                    COMMON ATTLIST SETS                        -->
+<!-- ============================================================= -->
+
+
+<!--                    Provide an alternative univ-atts that sets 
+                        translate to default 'no'                  -->
+<!-- Now uses the definition from topic.mod                        -->
+<!--<!ENTITY % univ-atts-translate-no
+            '%id-atts;
+             %select-atts;
+             translate  (yes | no)                       "no"
+             xml:lang   NMTOKEN                          #IMPLIED
+             dir       (ltr | rtl | lro | rlo)           #IMPLIED'   >-->
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS for IMAGEMAP          -->
+<!-- ============================================================= -->
+
+
+<!--                    LONG NAME: Imagemap                        -->
+<!ELEMENT imagemap      ((%image;), (%area;)+)                       >           
+<!ATTLIST imagemap        
+             %display-atts;
+             spectitle  CDATA                            #IMPLIED
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Hoptspot Area Description       -->
+<!ELEMENT area          ((%shape;), (%coords;), (%xref;))            >
+<!ATTLIST area         
+             %univ-atts;                                  
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Shape of the Hotspot            -->
+<!ELEMENT shape         (#PCDATA)                                    >
+<!ATTLIST shape           
+             keyref     CDATA                            #IMPLIED
+             %univ-atts-translate-no;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+
+<!--                    LONG NAME: Coordinates of the Hotspot      -->
+<!ELEMENT coords        (%words.cnt;)*                               >
+<!ATTLIST coords          
+             keyref     CDATA                            #IMPLIED
+             %univ-atts-translate-no;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+             
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+
+<!ATTLIST imagemap %global-atts;  class CDATA "+ topic/fig ut-d/imagemap " >
+<!ATTLIST area     %global-atts;  class CDATA "+ topic/figgroup ut-d/area ">
+<!ATTLIST shape    %global-atts;  class CDATA "+ topic/keyword ut-d/shape ">
+<!ATTLIST coords   %global-atts;  class CDATA "+ topic/ph ut-d/coords "    >
+
+ 
+<!-- ================== End Utilities Domain ====================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.mod.rnc b/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.mod.rnc
new file mode 100644
index 000000000000..f7d3abaad853
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/utilitiesDomain.mod.rnc
@@ -0,0 +1,150 @@
+# =============================================================
+
+# HEADER
+
+# =============================================================
+
+# MODULE:    DITA Utilities Domain
+
+# VERSION:   1.1
+
+# DATE:      June 2006
+
+#
+
+# =============================================================
+
+# =============================================================
+
+# PUBLIC DOCUMENT TYPE DEFINITION
+
+# TYPICAL INVOCATION
+
+#
+
+# Refer to this file by the following public identifier or an
+#       appropriate system identifier 
+# PUBLIC "-//OASIS//ELEMENTS DITA Utilities Domain//EN"
+#       Delivered as file "utilitiesDomain.mod"
+
+# =============================================================
+
+# SYSTEM:     Darwin Information Typing Architecture (DITA)
+
+#
+
+# PURPOSE:    Declaring the elements and specialization
+
+# attributes for the DITA Utilities Domain
+
+#
+
+# ORIGINAL CREATION DATE:
+
+# March 2001
+
+#
+
+# (C) Copyright OASIS Open 2005, 2006.
+
+# (C) Copyright IBM Corporation 2001, 2004.
+
+# All Rights Reserved.
+
+#
+
+# UPDATES:
+
+# 2005.11.15 RDA: Updated these comments to match template
+
+# 2005.11.15 RDA: Corrected the "Delivered as" system ID
+
+# 2006.06.07 RDA: Make universal attributes universal
+
+# (DITA 1.1 proposal #12)
+
+# 2006.06.14 RDA: Move univ-atts-translate-no into topic.mod
+
+# =============================================================
+
+# =============================================================
+
+# ELEMENT NAME ENTITIES
+
+# =============================================================
+
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+
+area = area.element
+shape = shape.element
+coords = coords.element
+# =============================================================
+
+# COMMON ATTLIST SETS
+
+# =============================================================
+
+# Provide an alternative univ-atts that sets 
+# translate to default 'no'
+
+# Now uses the definition from topic.mod
+
+# <!ENTITY % univ-atts-translate-no
+# '%id-atts;
+#  %select-atts;
+#  translate  (yes | no)                       "no"
+#  xml:lang   NMTOKEN                          #IMPLIED
+#  dir       (ltr | rtl | lro | rlo)           #IMPLIED'   >
+
+# =============================================================
+
+# ELEMENT DECLARATIONS for IMAGEMAP
+
+# =============================================================
+
+# LONG NAME: Imagemap
+imagemap.element = element imagemap { imagemap.attlist, image, area+ }
+imagemap.attlist &=
+  display-atts,
+  attribute spectitle { text }?,
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Hoptspot Area Description
+area.element = element area { area.attlist, shape, coords, xref }
+area.attlist &=
+  univ-atts,
+  attribute outputclass { text }?
+# LONG NAME: Shape of the Hotspot
+shape.element = element shape { shape.attlist, text }
+shape.attlist &=
+  attribute keyref { text }?,
+  univ-atts-translate-no,
+  attribute outputclass { text }?
+# LONG NAME: Coordinates of the Hotspot
+coords.element = element coords { coords.attlist, words.cnt* }
+coords.attlist &=
+  attribute keyref { text }?,
+  univ-atts-translate-no,
+  attribute outputclass { text }?
+# =============================================================
+
+# SPECIALIZATION ATTRIBUTE DECLARATIONS
+
+# =============================================================
+imagemap.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/fig ut-d/imagemap " ]
+  attribute class { text }?
+area.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/figgroup ut-d/area " ]
+  attribute class { text }?
+shape.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/keyword ut-d/shape " ]
+  attribute class { text }?
+coords.attlist &=
+  global-atts,
+  [ a:defaultValue = "+ topic/ph ut-d/coords " ]
+  attribute class { text }?
+# ================== End Utilities Domain ======================
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/xnalDomain.ent b/xml/tests/testData/xml/OasisDocumentHighlighting/xnalDomain.ent
new file mode 100644
index 000000000000..9a4617c2d57f
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/xnalDomain.ent
@@ -0,0 +1,46 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    DITA XNAL Domain Entities                         -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identfier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ENTITIES DITA XNAL Domain//EN"
+      Delivered as file "xnalDomain.ent"                           -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the substitution context and domain     -->
+<!--             entity declarations for the XNAL domain           -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             June 2006                                         -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2006.                    -->
+<!--             All Rights Reserved.                              -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    ELEMENT EXTENSION ENTITY DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ENTITY % xnal-d-author "authorinformation"                         >
+
+
+<!-- ============================================================= -->
+<!--                    DOMAIN ENTITY DECLARATION                  -->
+<!-- ============================================================= -->
+
+<!ENTITY xnal-d-att "(topic xnal-d)"                                 >
+
+
+<!-- ================== End XNAL Domain Entities ================= -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/OasisDocumentHighlighting/xnalDomain.mod b/xml/tests/testData/xml/OasisDocumentHighlighting/xnalDomain.mod
new file mode 100644
index 000000000000..3c25fef6dd97
--- /dev/null
+++ b/xml/tests/testData/xml/OasisDocumentHighlighting/xnalDomain.mod
@@ -0,0 +1,276 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    XNAL Domain                                       -->
+<!--  VERSION:   1.1                                               -->
+<!--  DATE:      June 2006                                         -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identfier or an 
+      appropriate system identifier 
+PUBLIC "-//OASIS//ELEMENTS DITA XNAL Domain//EN"
+      Delivered as file "xnalDomain.mod"                           -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Darwin Information Typing Architecture (DITA)     -->
+<!--                                                               -->
+<!-- PURPOSE:    Define elements and specialization atttributed    -->
+<!--             for the XNAL Domain                               -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             June 2006                                         -->
+<!--                                                               -->
+<!--             (C) Copyright OASIS Open 2006.                    -->
+<!--             All Rights Reserved.                              -->
+<!-- ============================================================= -->
+
+
+<!-- ============================================================= -->
+<!--                    ELEMENT NAME ENTITIES                      -->
+<!-- ============================================================= -->
+
+
+<!ENTITY % authorinformation "authorinformation"                     >
+<!ENTITY % addressdetails  "addressdetails"                          >
+<!ENTITY % administrativearea "administrativearea"                   >
+<!ENTITY % contactnumber   "contactnumber"                           >
+<!ENTITY % contactnumbers  "contactnumbers"                          >
+<!ENTITY % country         "country"                                 >
+<!ENTITY % emailaddress    "emailaddress"                            >
+<!ENTITY % emailaddresses  "emailaddresses"                          >
+<!ENTITY % firstname       "firstname"                               >
+<!ENTITY % generationidentifier "generationidentifier"               >
+<!ENTITY % honorific       "honorific"                               >
+<!ENTITY % lastname        "lastname"                                >
+<!ENTITY % locality        "locality"                                >
+<!ENTITY % localityname    "localityname"                            >
+<!ENTITY % middlename      "middlename"                              >
+<!ENTITY % namedetails     "namedetails"                             >
+<!ENTITY % organizationinfo "organizationinfo"                       >
+<!ENTITY % organizationname "organizationname"                       >
+<!ENTITY % organizationnamedetails "organizationnamedetails"         >
+<!ENTITY % otherinfo       "otherinfo"                               >
+<!ENTITY % personinfo      "personinfo"                              >
+<!ENTITY % personname      "personname"                              >
+<!ENTITY % postalcode      "postalcode"                              >
+<!ENTITY % thoroughfare    "thoroughfare"                            >
+<!ENTITY % url             "url"                                     >
+<!ENTITY % urls            "urls"                                    >
+
+<!-- ============================================================= -->
+<!--                    ELEMENT DECLARATIONS                       -->
+<!-- ============================================================= -->
+                      
+<!--                    LONG NAME: Author Information              -->
+<!ELEMENT authorinformation
+                        ((%personinfo; | %organizationinfo;)*)       >
+<!ATTLIST authorinformation     
+             %univ-atts;
+             href       CDATA                            #IMPLIED
+             keyref     CDATA                            #IMPLIED
+             type       (creator | contributor)          #IMPLIED    >
+
+<!--                    LONG NAME: Name Details                    -->
+<!ELEMENT namedetails   ((%personname; | %organizationnamedetails;)*)>
+<!ATTLIST namedetails
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Organization Details            -->
+<!ELEMENT organizationnamedetails      
+                        ((%organizationname;)?, (%otherinfo;)*)      >
+<!ATTLIST organizationnamedetails              
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Organization Name               -->
+<!ELEMENT organizationname
+                        (%ph.cnt;)*                                  >
+<!ATTLIST organizationname
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Person Name                     -->
+<!ELEMENT personname    ((%honorific;)?, 
+                         (%firstname;)*,(%middlename;)*,(%lastname;)*,
+                         (%generationidentifier;)?, (%otherinfo;)*)  >
+<!ATTLIST personname
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Honorific                       -->
+<!ELEMENT honorific     (#PCDATA)*                                   >
+<!ATTLIST honorific
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: First Name                      -->
+<!ELEMENT firstname     (#PCDATA)*                                   >
+<!ATTLIST firstname
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Middle Name                     -->
+<!ELEMENT middlename    (#PCDATA)*                                   >
+<!ATTLIST middlename
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Last Name                       -->
+<!ELEMENT lastname      (#PCDATA)*                                   >
+<!ATTLIST lastname
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Generation Identifier           -->
+<!ELEMENT generationidentifier
+                        (#PCDATA)*                                   >
+<!ATTLIST generationidentifier
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Other Information               -->
+<!ELEMENT otherinfo     (%words.cnt;)*>
+<!ATTLIST otherinfo
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Address Details                 -->
+<!ELEMENT addressdetails
+                        (%words.cnt;|%locality;|%administrativearea;|
+                         %thoroughfare;|%country;)*                  >
+<!ATTLIST addressdetails              
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Locality                        -->
+<!ELEMENT locality      (%words.cnt;|%localityname;|%postalcode;)*   >
+<!ATTLIST locality
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Locality Name                   -->
+<!ELEMENT localityname  (%words.cnt;)*                               >
+<!ATTLIST localityname
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Administrative Area             -->
+<!ELEMENT administrativearea
+                        (%words.cnt;)*                               >
+<!ATTLIST administrativearea
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass 
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Thoroughfare                    -->
+<!ELEMENT thoroughfare  (%words.cnt;)*                               >
+<!ATTLIST thoroughfare
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Postal Code                     -->
+<!ELEMENT postalcode    (#PCDATA)*                                   >
+<!ATTLIST postalcode
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Country                         -->
+<!ELEMENT country       (#PCDATA)*                                   >
+<!ATTLIST country
+             keyref     CDATA                            #IMPLIED
+             %univ-atts;
+             outputclass
+                        CDATA                            #IMPLIED    >
+
+<!--                    LONG NAME: Person Information              -->
+<!ELEMENT personinfo    ((%namedetails;)?, (%addressdetails;)?,
+                         (%contactnumbers;)?, (%emailaddresses;)?)   >
+<!ATTLIST personinfo
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Organization Information        -->
+<!ELEMENT organizationinfo
+                        ((%namedetails;)?, (%addressdetails;)?, 
+                         (%contactnumbers;)?, (%emailaddresses;)?,
+                         (%urls;)?)                                  >  
+<!ATTLIST organizationinfo 
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Contact Numbers                 -->
+<!ELEMENT contactnumbers
+                        (%contactnumber;)*                           >
+<!ATTLIST contactnumbers
+             %data-element-atts;                                     >
+                        
+<!--                    LONG NAME: Contact Number                  -->
+<!--                    Note: set the type of number using @type   -->
+<!ELEMENT contactnumber (#PCDATA)*                                   >  
+<!ATTLIST contactnumber
+             %data-element-atts;                                     >            
+                        
+<!--                    LONG NAME: Email Addresses                 -->
+<!ELEMENT emailaddresses
+                        (%emailaddress;)*                            >
+<!ATTLIST emailaddresses
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: Email Address                   -->
+<!ELEMENT emailaddress  (%words.cnt;)*                               >
+<!ATTLIST emailaddress
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: URLs                            -->
+<!ELEMENT urls          (%url;)*                                     >  
+<!ATTLIST urls
+             %data-element-atts;                                     >
+
+<!--                    LONG NAME: URL                             -->
+<!ELEMENT url           (%words.cnt;)*                               >  
+<!ATTLIST url
+             %data-element-atts;                                     >
+
+<!-- ============================================================= -->
+<!--                    SPECIALIZATION ATTRIBUTE DECLARATIONS      -->
+<!-- ============================================================= -->
+
+<!ATTLIST addressdetails %global-atts; class CDATA "+ topic/ph xnal-d/addressdetails ">
+<!ATTLIST administrativearea %global-atts; class CDATA "+ topic/ph xnal-d/administrativearea ">
+<!ATTLIST authorinformation %global-atts; class CDATA "+ topic/author xnal-d/authorinformation ">
+<!ATTLIST contactnumber %global-atts; class CDATA "+ topic/data xnal-d/contactnumber ">
+<!ATTLIST contactnumbers %global-atts; class CDATA "+ topic/data xnal-d/contactnumbers ">
+<!ATTLIST country     %global-atts; class CDATA "+ topic/ph xnal-d/country ">
+<!ATTLIST emailaddress %global-atts; class CDATA "+ topic/data xnal-d/emailaddress ">
+<!ATTLIST emailaddresses %global-atts; class CDATA "+ topic/data xnal-d/emailaddresses ">
+<!ATTLIST firstname   %global-atts; class CDATA "+ topic/data xnal-d/firstname ">
+<!ATTLIST generationidentifier %global-atts; class CDATA "+ topic/data xnal-d/generationidentifier ">
+<!ATTLIST honorific   %global-atts; class CDATA "+ topic/data xnal-d/honorific ">
+<!ATTLIST lastname    %global-atts; class CDATA "+ topic/data xnal-d/lastname ">
+<!ATTLIST locality    %global-atts; class CDATA "+ topic/ph xnal-d/locality ">
+<!ATTLIST localityname %global-atts; class CDATA "+ topic/ph xnal-d/localityname ">
+<!ATTLIST middlename  %global-atts; class CDATA "+ topic/data xnal-d/middlename ">
+<!ATTLIST namedetails %global-atts; class CDATA "+ topic/data xnal-d/namedetails ">
+<!ATTLIST organizationinfo %global-atts; class CDATA "+ topic/data xnal-d/organizationinfo ">
+<!ATTLIST organizationname %global-atts;  class CDATA "+ topic/ph xnal-d/organizationname ">
+<!ATTLIST organizationnamedetails %global-atts; class CDATA "+ topic/ph xnal-d/organizationnamedetails ">
+<!ATTLIST otherinfo   %global-atts; class CDATA "+ topic/data xnal-d/otherinfo ">
+<!ATTLIST personinfo  %global-atts; class CDATA "+ topic/data xnal-d/personinfo ">
+<!ATTLIST personname  %global-atts; class CDATA "+ topic/data xnal-d/personname ">
+<!ATTLIST postalcode  %global-atts; class CDATA "+ topic/ph xnal-d/postalcode ">
+<!ATTLIST thoroughfare %global-atts; class CDATA "+ topic/ph xnal-d/thoroughfare ">
+<!ATTLIST url         %global-atts; class CDATA "+ topic/data xnal-d/url ">
+<!ATTLIST urls        %global-atts; class CDATA "+ topic/data xnal-d/urls ">
+
+<!-- ================== End DITA XNAL Domain  =================== -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/PluginXml.xml b/xml/tests/testData/xml/PluginXml.xml
new file mode 100644
index 000000000000..62a7c4dcefec
--- /dev/null
+++ b/xml/tests/testData/xml/PluginXml.xml
@@ -0,0 +1,36 @@
+<!DOCTYPE idea-plugin PUBLIC "Plugin/DTD" "http://plugins.intellij.net/plugin.dtd">
+<idea-plugin version="2">
+    <name>Inspection Gadgets</name>
+    <id>InspectionGadgets</id>
+    <vendor>InspectionGadgets Software</vendor>
+
+    <category>inspection</category>
+    <version>1.0</version>
+    <idea-version min="4.0" max="6.0" since-build="2200"/>
+
+    <resource-bundle>com.siyeh.InspectionGadgetsBundle</resource-bundle>
+
+    <extensions defaultExtensionNs="com.intellij" xmlns="<error>com.intellij</error>">
+      <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>
+      <!--<appStarter implementation="com.intellij.diagnostic.ITNReporter"/>-->
+      <!--<formInspectionTool implementation="com.intellij.diagnostic.ITNReporter"/>-->
+      <!--<invalidPropertyKeyInspectionTool implementation="com.intellij.diagnostic.ITNReporter"/>-->
+      <!--<i18nInspectionTool implementation="com.intellij.diagnostic.ITNReporter"/>-->
+      <!--<java15InspectionTool implementation="com.intellij.diagnostic.ITNReporter"/>-->
+      <!--<junitPatcher implementation="com.intellij.diagnostic.ITNReporter"/>-->
+      <indexPatternProvider implementation="com.intellij.diagnostic.ITNReporter"/>
+      <!--<component implementation="com.intellij.diagnostic.ITNReporter"/>-->
+    </extensions>
+
+    <application-components>
+        <component>
+            <implementation-class>com.siyeh.ig.InspectionGadgetsPlugin</implementation-class>
+        </component>
+    </application-components>
+    <project-components>
+        <component>
+            <implementation-class>com.siyeh.ig.InspectionGadgetsProjectComponent</implementation-class>
+        </component>
+    </project-components>
+
+</idea-plugin>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ProblemWithImportedNsReference.xsd b/xml/tests/testData/xml/ProblemWithImportedNsReference.xsd
new file mode 100644
index 000000000000..b5ad5e30f80b
--- /dev/null
+++ b/xml/tests/testData/xml/ProblemWithImportedNsReference.xsd
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsd:schema version="1.0"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:p="urn:aaa"
+            elementFormDefault="qualified"
+  >
+  <xsd:import namespace="urn:aaa" schemaLocation="<error>urn:zzz</error>"/>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ProblemWithMemberTypes.xsd b/xml/tests/testData/xml/ProblemWithMemberTypes.xsd
new file mode 100644
index 000000000000..f9b1864f04de
--- /dev/null
+++ b/xml/tests/testData/xml/ProblemWithMemberTypes.xsd
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<xsd:schema
+    targetNamespace="http://www.something.com/2006/stuff"
+    elementFormDefault="qualified"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+    <xsd:complexType name="typeExecutable" mixed="true">
+        <xsd:attribute name="type" default="application/xml">
+            <xsd:simpleType>
+                <xsd:union memberTypes="xsd:integer	xsd:float" />
+            </xsd:simpleType>
+        </xsd:attribute>
+    </xsd:complexType>
+
+</xsd:schema>
+
diff --git a/xml/tests/testData/xml/RedefineBaseType.xml b/xml/tests/testData/xml/RedefineBaseType.xml
new file mode 100644
index 000000000000..2d24e88b39d7
--- /dev/null
+++ b/xml/tests/testData/xml/RedefineBaseType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<a:a xmlns:a="http://www.cadence.com/a" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://www.cadence.com/a RedefineBaseType_2.xsd">
+
+
+     <e1>ddd</e1>
+      <e3>dddd</e3>
+    <e2>rrr</e2>
+</a:a>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/RedefineBaseType.xsd b/xml/tests/testData/xml/RedefineBaseType.xsd
new file mode 100644
index 000000000000..7f38ba7fe95e
--- /dev/null
+++ b/xml/tests/testData/xml/RedefineBaseType.xsd
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+xmlns:a="http://www.cadence.com/a"
+targetNamespace="http://www.cadence.com/a"
+elementFormDefault="unqualified"
+attributeFormDefault="unqualified">
+
+<xs:complexType name="baseType">
+<xs:sequence>
+<xs:element name="e1" type="xs:string"/>
+</xs:sequence>
+</xs:complexType>
+
+<xs:complexType name="aType">
+    <xs:complexContent>
+        <xs:extension base="a:baseType">
+            <xs:sequence>
+                <xs:element name="e2" type="xs:string"/>
+            </xs:sequence>
+        </xs:extension>
+    </xs:complexContent>
+</xs:complexType>
+
+<xs:element name="a" type="a:aType"/>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/RedefineBaseType_2.xsd b/xml/tests/testData/xml/RedefineBaseType_2.xsd
new file mode 100644
index 000000000000..5a9c5c181fd3
--- /dev/null
+++ b/xml/tests/testData/xml/RedefineBaseType_2.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:a="http://www.cadence.com/a"
+           targetNamespace="http://www.cadence.com/a"
+           elementFormDefault="unqualified"
+           attributeFormDefault="unqualified">
+
+    <xs:redefine schemaLocation="RedefineBaseType.xsd">
+        <xs:complexType name="baseType">
+            <xs:complexContent>
+                <xs:extension base="a:baseType">
+                    <xs:sequence>
+                        <xs:element name="e3"/>
+                    </xs:sequence>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+
+    </xs:redefine>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/RedefineQualifiedType.xml b/xml/tests/testData/xml/RedefineQualifiedType.xml
new file mode 100644
index 000000000000..e4e3b50e958b
--- /dev/null
+++ b/xml/tests/testData/xml/RedefineQualifiedType.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<a:a xmlns:a="http://www.cadence.com/a" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://www.cadence.com/a RedefineQualifiedType_2.xsd">
+
+     <e1>eee</e1>
+     <e2>zzz</e2>
+</a:a>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/RedefineQualifiedType.xsd b/xml/tests/testData/xml/RedefineQualifiedType.xsd
new file mode 100644
index 000000000000..de4127ce3546
--- /dev/null
+++ b/xml/tests/testData/xml/RedefineQualifiedType.xsd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+xmlns:a="http://www.cadence.com/a"
+targetNamespace="http://www.cadence.com/a"
+elementFormDefault="unqualified"
+attributeFormDefault="unqualified">
+
+
+    <xs:complexType name="aType">
+        <xs:sequence>
+            <xs:element name="e1" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:element name="a" type="a:aType"/>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/RedefineQualifiedType_2.xsd b/xml/tests/testData/xml/RedefineQualifiedType_2.xsd
new file mode 100644
index 000000000000..05f6cbb16fe4
--- /dev/null
+++ b/xml/tests/testData/xml/RedefineQualifiedType_2.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+xmlns:a="http://www.cadence.com/a"
+targetNamespace="http://www.cadence.com/a"
+elementFormDefault="unqualified"
+attributeFormDefault="unqualified">
+
+
+    <xs:redefine schemaLocation="RedefineQualifiedType.xsd">
+        <xs:complexType name="aType">
+            <xs:complexContent>
+                <xs:extension base="a:aType">
+                    <xs:sequence>
+                        <xs:element name="e2" type="xs:string"/>
+                    </xs:sequence>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:redefine>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ReferencingTargetNamespace.xml b/xml/tests/testData/xml/ReferencingTargetNamespace.xml
new file mode 100644
index 000000000000..501b3bd0bdc4
--- /dev/null
+++ b/xml/tests/testData/xml/ReferencingTargetNamespace.xml
@@ -0,0 +1,9 @@
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="1.4">
+  <annotation/>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ResolveEntityUrl.xml b/xml/tests/testData/xml/ResolveEntityUrl.xml
new file mode 100644
index 000000000000..58f399504b77
--- /dev/null
+++ b/xml/tests/testData/xml/ResolveEntityUrl.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping SYSTEM
+			"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"
+[
+<!ENTITY % globals SYSTEM "classpath://entities.dtd">
+%globals;
+]>
+
+<hibernate-mapping <error>zzz</error>="&idgenerator;">
+  
+</hibernate-mapping>
diff --git a/xml/tests/testData/xml/ResolvedDtdElementReferences.dtd b/xml/tests/testData/xml/ResolvedDtdElementReferences.dtd
new file mode 100644
index 000000000000..2711d45ca6b8
--- /dev/null
+++ b/xml/tests/testData/xml/ResolvedDtdElementReferences.dtd
@@ -0,0 +1,2 @@
+<!ELEMENT aaa EMPTY>
+<!ELEMENT name (aaa)>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/ResolvingEntitiesInDtd.xml b/xml/tests/testData/xml/ResolvingEntitiesInDtd.xml
new file mode 100644
index 000000000000..499dfce43ff2
--- /dev/null
+++ b/xml/tests/testData/xml/ResolvingEntitiesInDtd.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!DOCTYPE RatingServiceSelectionRequest SYSTEM "RatingandServiceSelectionRequest.dtd" >
+<RatingServiceSelectionRequest xml:lang="en-US">
+  <Request>
+    <TransactionReference>
+      <XpciVersion>1.0001</XpciVersion>
+    </TransactionReference>
+    <RequestAction>Rate</RequestAction>
+    <RequestOption>Rate</RequestOption>
+  </Request>
+  <Shipment>
+    <Shipper>
+      <Address>
+        <PostalCode>XXXXX</PostalCode>
+        <CountryCode>US</CountryCode>
+      </Address>
+    </Shipper>
+    <ShipTo>
+      <Address>
+        <PostalCode>XXXXX</PostalCode>
+        <CountryCode>US</CountryCode>
+      </Address>
+    </ShipTo>
+    <ShipFrom>
+      <Address>
+        <PostalCode>XXXXX</PostalCode>
+        <CountryCode>US</CountryCode>
+      </Address>
+    </ShipFrom>
+    <Service>
+      <Code>XX</Code>
+    </Service>
+    <Package>
+      <PackagingType>
+        <Code>XX</Code>
+      </PackagingType>
+      <Dimensions>
+        <UnitOfMeasurement>
+          <Code>IN</Code>
+        </UnitOfMeasurement>
+        <Length>XX</Length>
+        <Width>XX</Width>
+        <Height>XX</Height>
+      </Dimensions>
+      <PackageWeight>
+        <UnitOfMeasurement>
+          <Code>LBS</Code>
+        </UnitOfMeasurement>
+        <Weight>XX</Weight>
+      </PackageWeight>
+    </Package>
+  </Shipment>
+</RatingServiceSelectionRequest>
+
diff --git a/xml/tests/testData/xml/ResolvingEntitiesInDtd/RatingandServiceSelectionRequest.dtd b/xml/tests/testData/xml/ResolvingEntitiesInDtd/RatingandServiceSelectionRequest.dtd
new file mode 100644
index 000000000000..e05c7ad28e7c
--- /dev/null
+++ b/xml/tests/testData/xml/ResolvingEntitiesInDtd/RatingandServiceSelectionRequest.dtd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XML Spy v3.5 NT beta 1 build Nov 10 2000 (http://www.xmlspy.com) by Stephanie (UPS) -->
+<!-- Copyright (c) 2000 United Parcel Service of America, Inc. All rights reserved. -->
+<!-- XPCI Rating and Service Selection Request -->
+<!--version="1.0"							 -->
+<!-- Include the standard messaging elements 		-->
+<!ENTITY % Interchange SYSTEM "XpciInterchange.dtd">
+%Interchange;
+<!-- Include the standard vocabulary elements 		-->
+<!ENTITY % Vocabulary SYSTEM "Xpcivocabulary.dtd">
+%Vocabulary;
+<!-- Rating and Service Selection Request elements -->
+<!ELEMENT RatingServiceSelectionRequest (Request, PickupType?, Shipment)>
+<!ATTLIST RatingServiceSelectionRequest
+	xml:lang NMTOKEN #IMPLIED
+>
diff --git a/xml/tests/testData/xml/ResolvingEntitiesInDtd/XpciInterchange.dtd b/xml/tests/testData/xml/ResolvingEntitiesInDtd/XpciInterchange.dtd
new file mode 100644
index 000000000000..cc1bdd1b6d7d
--- /dev/null
+++ b/xml/tests/testData/xml/ResolvingEntitiesInDtd/XpciInterchange.dtd
@@ -0,0 +1,63 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!--Generated by XML Authority-->
+
+<!-- Xpci Static Release Information -->
+<!-- Change History  10/21/2000 By Hal Trebes - Updated Interchange Version to 1.0001 to reflect new vocabulary entries made under this version -->
+<!-- Change History 02/09/01 By Stephanie Weaver - Update Interchange Version 1.0002 to allow for upcoming Production Release, IntegrationIndicator optional element was added to the Request Element-->
+<!ELEMENT XpciVersion (#PCDATA)>
+
+<!--<!ATTLIST XpciVersion  Version CDATA  #FIXED '1.0001' >
+-->
+<!ELEMENT AccessLicenseNumber (#PCDATA)>
+
+<!ELEMENT AccessLicenseText (#PCDATA)>
+
+<!ELEMENT CustomerContext EMPTY>
+
+<!ELEMENT Error (ErrorSeverity , ErrorCode , ErrorDescription? , MinimumRetrySeconds? , ErrorLocation* , ErrorDigest*)>
+
+<!ELEMENT ErrorCode (#PCDATA)>
+
+<!ELEMENT ErrorDescription (#PCDATA)>
+
+<!ELEMENT ErrorDigest (#PCDATA)>
+
+<!ELEMENT ErrorLocation (ErrorLocationElementName? , ErrorLocationElementReference? , ErrorLocationAttributeName?)>
+
+<!ELEMENT ErrorLocationAttributeName (#PCDATA)>
+
+<!ELEMENT ErrorLocationElementReference (#PCDATA)>
+
+<!ELEMENT ErrorLocationElementName (#PCDATA)>
+
+<!ELEMENT ErrorSeverity (#PCDATA)>
+
+<!ELEMENT IntegrationIndicator EMPTY>
+
+<!ELEMENT MinimumRetrySeconds (#PCDATA)>
+
+<!ELEMENT OnLineTool (ToolID , ToolVersion)>
+
+<!ELEMENT Password (#PCDATA)>
+
+<!ELEMENT Request (TransactionReference? , RequestAction , RequestOption* , IntegrationIndicator?)>
+
+<!ELEMENT RequestAction (#PCDATA)>
+
+<!ELEMENT RequestOption (#PCDATA)>
+
+<!ELEMENT Response (TransactionReference? , ResponseStatusCode , ResponseStatusDescription? , Error*)>
+
+<!ELEMENT ResponseStatusCode (#PCDATA)>
+
+<!ELEMENT ResponseStatusDescription (#PCDATA)>
+
+<!ELEMENT ToolID (#PCDATA)>
+
+<!ELEMENT ToolVersion (#PCDATA)>
+
+<!ELEMENT TransactionReference (CustomerContext? , XpciVersion? , ToolVersion?)>
+
+<!ELEMENT UserId (#PCDATA)>
+
diff --git a/xml/tests/testData/xml/ResolvingEntitiesInDtd/Xpcivocabulary.dtd b/xml/tests/testData/xml/ResolvingEntitiesInDtd/Xpcivocabulary.dtd
new file mode 100644
index 000000000000..782806e74ec7
--- /dev/null
+++ b/xml/tests/testData/xml/ResolvingEntitiesInDtd/Xpcivocabulary.dtd
@@ -0,0 +1,533 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Generated by Turbo XML 2.3.0.100.-->
+<!-- Copyright (c) 2000 United Parcel Service of America, 
+Inc. All rights reserved. -->
+<!-- Xpci Library Version 1.0003-->
+<!--  XPCI Version 1.0002 accommodated AVLite, WWTNT and DOL-->
+<!--XPCI Version 1.0003 accommodated Local teams enhancements to PreparePickupRequest, two new DTDs,  PSBServiceRequest and PSBServiceResponse-->
+<!--XPCI Version 1.0004 accommodate changes made to the Tracking DTDs for the ATS project-->
+<!--XPCI Version 1.0005 accommodate functional requirements for the ROW September Release-->
+<!--XPCI Version 1.0006 accommodate functional requirements for the BCDN Phase II Enhancements-->
+<!--XPCI Version 1.0007 accommodate functional requirements for the Quantum View Schema-->
+<!--XPCI Version 1.0008 accommodate functional requirements for the ROW February release-->
+<!--XPCI Version 1.0009 accommodate functional requirements for the Quantum View Autoload Fall 2002 release-->
+<!--XPCI Version 1.0010 accommodate functional requirements for ROW, Shipping and Label Recovery enhancements for January 2003-->
+<!--Parameters-->
+<!ENTITY % AddressArtifacts "(ConsigneeName? , StreetNumberLow? , StreetNumberHigh? , StreetNumberOddEven? , StreetPrefix? , StreetName? , StreetType? , StreetSuffix? , BuildingName? , AddressExtendedInformation* , PoliticalDivision4? , PoliticalDivision3? , PoliticalDivision2? , PoliticalDivision1? , Country? , CountryCode? , PostcodePrimaryHigh? , PostcodePrimaryLow? , PostcodeExtendedHigh? , PostcodeExtendedLow? , ResidentialAddressIndicator?)">
+<!ENTITY % AddressInputFormat "(AddressLabelFormat |AddressKeyFormat |AddressArtifactFormat |AddressRegionalFormat)">
+<!ENTITY % AddressResultsType "(ValidAddressIndicator |AmbiguousAddressIndicator |NoCandidatesIndicator 
+|OperationCompletedIndicator )">
+<!ENTITY % EMailMessage "(EMailAddress+, Memo?, Subject?, ReplyToEMailAddress?, FromEMailAddress, FromName?, UndeliverableEMailAddress?, MessageBody+)">
+<!ENTITY % FlexAddress "(Address | AddressArtifactFormat | AddressKeyFormat | AddressTokenFormat | AddressLabelFormat | AddressRegionalFormat)">
+<!ENTITY % OddEvenChoices "(OddIndicator | EvenIndicator | BothIndicator)">
+<!ENTITY % CandidateOutputFormat "((ArtifactFormatIndicator , KeyFormatIndicator?) | (ArtifactFormatIndicator? , KeyFormatIndicator))">
+<!ENTITY % RequestedOutputIndicators "(((%CandidateOutputFormat;)?) , ReformatInputIndicator? , ModifiedRequestIndicator?)">
+<!ENTITY % BehaviorIndicators "(((CandidateListIndicator , %CandidateOutputFormat; , MaximumListSize?) | (BinaryIndicator)) , ReformatInputIndicator? , IncludeUPSPreferredIndicator?)">
+<!--Deprecated Vocabulary Elements-->
+<!ELEMENT AdditionalHandling EMPTY>
+<!ELEMENT DocumentsOnly EMPTY>
+<!ELEMENT ExtendedDestination EMPTY>
+<!ELEMENT HoldForPickup EMPTY>
+<!ELEMENT Hundredweight EMPTY>
+<!ELEMENT Modify EMPTY>
+<!ELEMENT OtherDocuments EMPTY>
+<!ELEMENT ResidentialAddress EMPTY>
+<!ELEMENT SaturdayDelivery EMPTY>
+<!ELEMENT SaturdayPickup EMPTY>
+<!ELEMENT ShipperExportDeclaration EMPTY>
+<!ELEMENT SignatureRequired EMPTY>
+<!ELEMENT Void EMPTY>
+<!ELEMENT WaybillPrint EMPTY>
+<!--Base Vocabulary-->
+<!ELEMENT AccountName (#PCDATA)>
+<!ELEMENT AccountNumber (#PCDATA)>
+<!ELEMENT AccessLicenseProfile (CountryCode, LanguageCode, AccessLicenseText?)>
+<!ELEMENT AccessLicenseText (#PCDATA)>
+<!ELEMENT Activity (ActivityLocation?, Status?, Date?, Time?)>
+<!ELEMENT ActiveThreadCount (#PCDATA)>
+<!ELEMENT ActivityLocation ((Address | AddressArtifactFormat), Code?, Description?, SignedForByName?, SignatureImage?, HTMLImage?)>
+<!ELEMENT AdditionalChargeIndicator EMPTY>
+<!ELEMENT AdditionalHandlingIndicator EMPTY>
+<!ELEMENT AdditionalHandlingCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT AdditionalServices (#PCDATA)>
+<!ELEMENT Address (ConsigneeName?, AddressLine1?, AddressLine2?, AddressLine3?, City?, StateProvinceCode?, PostalCode?, CountryCode?, (ResidentialAddress | ResidentialAddressIndicator)?)>
+<!ELEMENT AddressArtifactFormat (%AddressArtifacts;)>
+<!ELEMENT AddressExtendedInformation (Type, Low, High?, (%OddEvenChoices;)?)>
+<!ELEMENT AddressKeyFormat (ConsigneeName?, BuildingName?, AddressLine*, (Region? | (PoliticalDivision2?, PoliticalDivision1?, PostcodePrimaryLow?, PostcodeExtendedLow?)), Urbanization?, CountryCode, ResidentialAddressIndicator?)>
+<!ELEMENT AddressLabelFormat (UserInput+, CountryCode)>
+<!ELEMENT AddressLine (#PCDATA)>
+<!ELEMENT AddressLine1 (#PCDATA)>
+<!ELEMENT AddressLine2 (#PCDATA)>
+<!ELEMENT AddressLine3 (#PCDATA)>
+<!ELEMENT AddressRegionalFormat (((Region, Urbanization?)? | (PoliticalDivision4?, PoliticalDivision3?, PoliticalDivision2?, PoliticalDivision1?, PostcodePrimaryLow?)), CountryCode, ResidentialAddressIndicator?)>
+<!ELEMENT AddressTokenFormat (#PCDATA)>
+<!ELEMENT AddShippingChargesToCODIndicator EMPTY>
+<!ELEMENT AirIndicator EMPTY>
+<!ELEMENT AlternateDeliveryTime (#PCDATA)>
+<!ELEMENT AlternateDeliveryDate (#PCDATA)>
+<!ELEMENT AlternateNumber (#PCDATA | StructuredPhoneNumber)*>
+<!ELEMENT AlternateProfileAccessNumber (#PCDATA)>
+<!ELEMENT AmbiguousAddressIndicator EMPTY>
+<!ELEMENT ArtifactFormatIndicator EMPTY>
+<!ELEMENT ASOLocationIndicator EMPTY>
+<!ELEMENT AttentionName (#PCDATA)>
+<!ELEMENT Attribute (Name, Value)>
+<!ELEMENT AutoDutyCode (#PCDATA)>
+<!ELEMENT AddressValidationOperationCommands ((QueryIndicator, %BehaviorIndicators;) | ParseAndStandardizeIndicator)>
+<!ELEMENT BarCodeDeliveryNumber (#PCDATA)>
+<!ELEMENT BarCodeIndicator EMPTY>
+<!ELEMENT BCDNPackage (Activity*, Shipper, Service, TrackingNumber?, DeliveryAttemptDate?, DeliveryAttemptTime?, RescheduledDeliveryDate?, RescheduledDeliveryTime?, ScheduledDeliveryDate?, ScheduledDeliveryTime?, COD?, DCREligibility)>
+<!ELEMENT BeginDate (#PCDATA)>
+<!ELEMENT BillDutyTaxShipChargestoShipper (BillShipper | BillThirdPartyShipper)>
+<!ELEMENT BillImporter (ImporterOfRecord, (AccountNumber | CreditCard))>
+<!ELEMENT BillingWeight (UnitOfMeasurement?, Weight)>
+<!ELEMENT BillReceiver ((AccountNumber | CreditCard), Address?)>
+<!ELEMENT BillShipper ((AccountNumber | CreditCard))>
+<!ELEMENT BillThirdParty (BillThirdPartyShipper | BillThirdPartyConsignee)>
+<!ELEMENT BillThirdPartyConsignee (ThirdParty, AccountNumber)>
+<!ELEMENT BillThirdPartyShipper (ThirdParty, AccountNumber)>
+<!ELEMENT BinaryIndicator EMPTY>
+<!ELEMENT BookNumber (#PCDATA)>
+<!ELEMENT BothIndicator EMPTY>
+<!ELEMENT BrokerCode (#PCDATA)>
+<!ELEMENT BuildingName (#PCDATA)>
+<!ELEMENT BusinessTransitDays (#PCDATA)>
+<!ELEMENT CallTagARS (Number?, Code?, ScheduledPickupDate?)>
+<!ELEMENT CallTagARSCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT Candidate (AddressArtifactFormat?, AddressKeyFormat?, AddressTokenFormat?)>
+<!ELEMENT CandidateListIndicator EMPTY>
+<!ELEMENT CarNumber (#PCDATA)>
+<!ELEMENT CertificateOfOrigin (Type?, Number?, Code?, COCode?)>
+<!-- New Element CharSet-->
+<!ELEMENT CharSet (#PCDATA)>
+<!ELEMENT City (#PCDATA)>
+<!ELEMENT ClientSoftwareProfile (SoftwareInstaller, SoftwareProductName, SoftwareProvider, SoftwareVersionNumber)>
+<!ELEMENT ClosedIndicator EMPTY>
+<!ELEMENT ClosedTime (#PCDATA)>
+<!ELEMENT COCode (#PCDATA)>
+<!ELEMENT COD (CODFundsCode?, CODCode?, CODAmount, ControlNumber?, CODStatus?, AddShippingChargesToCODIndicator?)>
+<!ELEMENT CODAmount (CurrencyCode?, MonetaryValue)>
+<!ELEMENT CODCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT CODCode (#PCDATA)>
+<!ELEMENT Code (#PCDATA)>
+<!ELEMENT CODFundsCode (#PCDATA)>
+<!ELEMENT CODStatus (#PCDATA)>
+<!ELEMENT Comments (#PCDATA)>
+<!ELEMENT Commodity (OriginCountryCode, CommodityCode?, PartNumber?, CurrencyCode?, TotalAmount, LineUnitAmountPrice?, Quantity, UnitOfMeasurement, MerchandiseDescription+)>
+<!ELEMENT CommodityCode (#PCDATA)>
+<!ELEMENT CompanyName (#PCDATA)>
+<!ELEMENT CompanyURL (#PCDATA)>
+<!ELEMENT CompleteSystemIndicator EMPTY>
+<!ELEMENT ConcurrentConnections (#PCDATA)>
+<!ELEMENT ConfigurationInformation (#PCDATA)>
+<!ELEMENT ConsigneeName (#PCDATA)>
+<!ELEMENT ConsigneeBilled ((AccountNumber | CreditCard)?)>
+<!ELEMENT ConsolidatedClearanceQuantity (#PCDATA)>
+<!ELEMENT Contact (Name?, Title?, EMailAddress?, PhoneNumber?, FaxNumber?, AlternateNumber?)>
+<!ELEMENT ContactInfo (Name?, PhoneNumber?)>
+<!ELEMENT ContactPhoneNumber (PhoneNumber)>
+<!ELEMENT ControlNumber (#PCDATA)>
+<!ELEMENT ControlLogReceipt (ImageFormat, GraphicImage)>
+<!ELEMENT CostAndFreight ((BillShipper | BillThirdPartyShipper), (BillImporter | BillReceiver | BillThirdPartyConsignee))>
+<!ELEMENT Country (#PCDATA)>
+<!ELEMENT CountryCode (#PCDATA)>
+<!ELEMENT CreditCard (Type, Number, ExpirationDate)>
+<!ELEMENT CurrencyCode (#PCDATA)>
+<!ELEMENT CurrentRequestBacklog (#PCDATA)>
+<!ELEMENT CustomerCenterCutoff (#PCDATA)>
+<!ELEMENT CustomerClassification (Code, Description?)>
+<!ELEMENT CustomsInvoice (Commodity, InvoiceLineTotal, CurrencyCode?, InvoiceNumber?, PONumber?, SubTotal, TotalInvoiceAmount, TermsOfShipment?, ReasonForExport, FreightCharges?, InsuranceCharges?, DiscountRebate?, OtherCharges?, Comments?)>
+<!ELEMENT DatabasesOnlyIndicator EMPTY>
+<!ELEMENT Date (#PCDATA)>
+<!ELEMENT DateTimeStamp (#PCDATA)>
+<!ELEMENT DayOfWeek (#PCDATA)>
+<!ELEMENT DCISType (#PCDATA)>
+<!ELEMENT DCISNumber (#PCDATA)>
+<!ELEMENT DCRCutoffDateInUTC (#PCDATA)>
+<!ELEMENT DCRCutoffTimeInUTC (#PCDATA)>
+<!ELEMENT DCREligibility (EligibilityError*, ModificationStatus?, EligibilityStatus?, DeliveryAttempt, DCROptions, UniquePackageIdentifier)>
+<!ELEMENT DCROptions (SameDayWillCall*, WillCall*, ReturnToSender*, FutureDelivery*)>
+<!ELEMENT DeclarationStatement (#PCDATA)>
+<!ELEMENT DelayCount (#PCDATA)>
+<!ELEMENT DelDutyPaidVATUnPaid ((BillShipper | BillThirdPartyShipper), (BillImporter | BillReceiver | BillThirdPartyConsignee))>
+<!ELEMENT DeliveryAttempt (Date?, Number?, Driver?, SLIC?, Region?, ShipperNumber?, AddressArtifactFormat, PackageCenter)>
+<!ELEMENT DeliveryAttemptDate (#PCDATA)>
+<!ELEMENT DeliveryAttemptTime (#PCDATA)>
+<!ELEMENT DeliveryConfirmation (DCISType, DCISNumber?)>
+<!ELEMENT DeliveryConfirmationCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT DeliveryStop (BarCodeDeliveryNumber, NumberBCDNPackages?, ShipTo?, ScheduledDeliveryDate?, ScheduledDeliveryTime?, RescheduledDeliveryDate?, RescheduledDeliveryTime?, BCDNPackage+)>
+<!ELEMENT DeliveryZone (#PCDATA)>
+<!ELEMENT Description (#PCDATA)>
+<!ELEMENT DescriptionOfGoods (#PCDATA)>
+<!ELEMENT DestinationControl (#PCDATA)>
+<!ELEMENT DestinationCountryCode (#PCDATA)>
+<!ELEMENT DestinationPostalCode (#PCDATA)>
+<!ELEMENT DeveloperLicenseNumber (#PCDATA)>
+<!ELEMENT DimensionalWeight (UnitOfMeasurement?, Weight)>
+<!ELEMENT Dimensions (UnitOfMeasurement?, Length, Width, Height)>
+<!ELEMENT Disclaimer (#PCDATA)>
+<!ELEMENT DiscountRebate (#PCDATA)>
+<!ELEMENT Distance (Value, UnitOfMeasurement)>
+<!ELEMENT DocumentCode (#PCDATA)>
+<!ELEMENT DocumentsOnlyIndicator EMPTY>
+<!ELEMENT Directions (Segment, Distance?, Time?)>
+<!ELEMENT Driver (Name?, Number?, CarNumber?)>
+<!ELEMENT DrivingDirection (Directions*, TotalDistance, TotalTime)>
+<!ELEMENT DropLocation (LocationID, IVR?, AddressKeyFormat, PhoneNumber+, FaxNumber?, EMailAddress?, Disclaimer*, LocationType, Distance, SpecialInstructions*, LatestGroundDropOffTime*, LatestAirDropOffTime*, AdditionalChargeIndicator?, AdditionalServices*, Service*, NonStandardHoursOfOperation?, StandardHoursOfOperation?)>
+<!ELEMENT EarliestDeliveryTime (#PCDATA)>
+<!ELEMENT EarliestTimeReady (#PCDATA)>
+<!ELEMENT EligibilityError (Type, Number)>
+<!ELEMENT EligibilityStatus (Code, Description?)>
+<!ELEMENT EMailAddress (#PCDATA)>
+<!ELEMENT EMailContent (#PCDATA)>
+<!ELEMENT EMailMessage (EMailAddress+, Memo?, Subject?, SubjectCode?, FromEMailAddress?, FromName?, UndeliverableEMailAddress?, MessageBody*)>
+<!ELEMENT EmployerIdentificationNumber (#PCDATA)>
+<!ELEMENT EndDate (#PCDATA)>
+<!ELEMENT EstimatedArrival (BusinessTransitDays, Time?, Date, DayOfWeek?, PickupDate?, PickupTime?, TotalTransitDays?, CustomerCenterCutoff?, RestDays?, HolidayCount?, DelayCount?)>
+<!ELEMENT ExpirationDate (#PCDATA)>
+<!ELEMENT ExportCommodityControlNumber (#PCDATA)>
+<!ELEMENT ExportLicenseInformation (#PCDATA)>
+<!ELEMENT ExtendedDestinationIndicator EMPTY>
+<!ELEMENT EvenIndicator EMPTY>
+<!ELEMENT FaxDestination (FaxDestinationIndicator, FaxNumber)>
+<!ELEMENT FaxDestinationIndicator (#PCDATA)>
+<!ELEMENT FaxNumber (#PCDATA | StructuredPhoneNumber)*>
+<!ELEMENT FileName (#PCDATA)>
+<!ELEMENT FlatRate (CurrencyCode?, MonetaryValue)>
+<!ELEMENT FloorID (#PCDATA)>
+<!ELEMENT FreeOnBoard ((BillShipper | BillThirdPartyShipper), (BillImporter | BillReceiver | BillThirdPartyConsignee))>
+<!ELEMENT FreightCharges (CurrencyCode?, MonetaryValue)>
+<!ELEMENT FreightCollect (BillReceiver | BillImporter | BillThirdPartyConsignee)>
+<!--New Element FromEMailAddress-->
+<!ELEMENT FromEMailAddress (#PCDATA)>
+<!ELEMENT FromName (#PCDATA)>
+<!ELEMENT FutureDelivery (Date, DayOfWeek?)>
+<!ELEMENT Geocode (Latitude, Longitude, Quality?)>
+<!ELEMENT GeocodeCandidate (AddressKeyFormat, Geocode, LandmarkName?)>
+<!ELEMENT GraphicImage (#PCDATA)>
+<!ELEMENT GroupNumber (#PCDATA)>
+<!ELEMENT GroundIndicator EMPTY>
+<!ELEMENT Guaranteed (Code, Description?)>
+<!ELEMENT GuaranteedDaysToDelivery (#PCDATA)>
+<!ELEMENT HandlingCharge (FlatRate | Percentage)>
+<!ELEMENT HandlingChargeAmount (CurrencyCode?, MonetaryValue)>
+<!ELEMENT HazardousMaterialsCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT HazardousMaterialsCode (#PCDATA)>
+<!ELEMENT HeartBeatStatus (ActiveThreadCount, ConcurrentConnections, MaximumConcurrentConnections, CurrentRequestBacklog, MaximumBacklog, ConfigurationInformation)>
+<!ELEMENT HeartBeatStatusCheckCommand EMPTY>
+<!ELEMENT Height (#PCDATA)>
+<!ELEMENT High (#PCDATA)>
+<!ELEMENT HoldForPickupIndicator EMPTY>
+<!ELEMENT HolidayHours (#PCDATA)>
+<!ELEMENT HTMLImage (#PCDATA)>
+<!ELEMENT HTTPUserAgent (#PCDATA)>
+<!ELEMENT HolidayCount (#PCDATA)>
+<!ELEMENT HundredWeightIndicator EMPTY>
+<!ELEMENT Image (ImageFormat, GraphicImage)>
+<!ELEMENT ImageFormat (Code, Description?)>
+<!ELEMENT ImageMap (LocationID, XCoordinate, YCoordinate)>
+<!ELEMENT ImporterOfRecord (CompanyName?, AttentionName?, PhoneNumber?, FaxDestination, Address)>
+<!ELEMENT IncludeUPSPreferredIndicator EMPTY>
+<!ELEMENT InformationLevel (#PCDATA)>
+<!ELEMENT InformationSourceCode (#PCDATA)>
+<!ELEMENT InquiryDataSource (#PCDATA)>
+<!ELEMENT InsuranceCharges (CurrencyCode?, MonetaryValue)>
+<!ELEMENT InsuredValue (CurrencyCode?, MonetaryValue)>
+<!ELEMENT InsuredValueCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT InternationalSignatureGraphicImage (#PCDATA)>
+<!ELEMENT InvoiceLineTotal (CurrencyCode?, MonetaryValue)>
+<!ELEMENT InvoiceNumber (#PCDATA)>
+<!ELEMENT ItemizedPackageCharges (AdditionalHandlingCharge?, CODCharge?, DeliveryConfirmationCharge?, HazardousMaterialsCharge?, InsuredValueCharge?, ShipmentNotificationCharge*, VerbalConfirmationCharge?)>
+<!ELEMENT ItemizedShipmentCharges (CallTagARSCharge?, InsuredValueCharge?, SaturdayDeliveryCharge?, SaturdayPickupCharge?, ShipmentNotificationCharge*)>
+<!ELEMENT IVR (PhraseID?, TextToSpeechIndicator?)>
+<!ELEMENT KeyFormatIndicator EMPTY>
+<!ELEMENT LabelControlNumber (ProductName, ProductVersion, PrinterMakeAndModel?, PrinterDriverVersion?)>
+<!ELEMENT LabelDelivery (EMailMessage?, LabelLinkIndicator?, ResendEMailIndicator?)>
+<!ELEMENT LabelDeliveryOptions (LabelDelivery)>
+<!ELEMENT LabelImage (LabelImageFormat, GraphicImage, HTMLImage?, PDF417?, InternationalSignatureGraphicImage?, URL?)>
+<!ELEMENT LabelImageFormat (Code, Description?)>
+<!ELEMENT LabelLinkIndicator EMPTY>
+<!ELEMENT LabelPrintMethod (Code, Description?)>
+<!ELEMENT LabelResults (TrackingNumber, LabelImage?, Receipt?)>
+<!ELEMENT LabelSpecification (LabelPrintMethod?, HTTPUserAgent?, LabelStockSize?, LabelImageFormat, LabelControlNumber?)>
+<!ELEMENT LabelStockSize (UnitOfMeasurement?, Height, Width)>
+<!ELEMENT LandmarkCode (#PCDATA)>
+<!ELEMENT LandmarkName (#PCDATA)>
+<!ELEMENT LanguageCode (#PCDATA)>
+<!ELEMENT LatestAirDropOffTime (#PCDATA)>
+<!ELEMENT LatestGroundDropOffTime (#PCDATA)>
+<!ELEMENT LatestTimeReady (#PCDATA)>
+<!ELEMENT Latitude (#PCDATA)>
+<!ELEMENT Length (#PCDATA)>
+<!ELEMENT LicenseExpirationDate (#PCDATA)>
+<!ELEMENT LicenseInformation (#PCDATA)>
+<!ELEMENT LineMonetaryTotals (CurrencyCode?, MonetaryValue)>
+<!ELEMENT LineNumber (#PCDATA)>
+<!ELEMENT LineUnitAmountPrice (CurrencyCode?, MonetaryValue)>
+<!ELEMENT Location (#PCDATA)>
+<!ELEMENT LocationCriteria (LocationType*, MaximumListSize?, SearchRadius?, ServiceSearch*)>
+<!ELEMENT LocationID (#PCDATA)>
+<!ELEMENT LocationType (UPSCentersIndicator?, UPSDesignatedIndicator?, UPSLetterCentersIndicator?, ASOLocationIndicator?, LocationSubType?, UPSGoldShieldIndicator?)>
+<!ELEMENT LocationSubType (Code, Description?)>
+<!ELEMENT Longitude (#PCDATA)>
+<!ELEMENT LoopPositionNumber (#PCDATA)>
+<!ELEMENT Low (#PCDATA)>
+<!ELEMENT MapDimensions (Height, Width)>
+<!ELEMENT MapID (#PCDATA)>
+<!ELEMENT MapNavigation (Number?, MapDimensions?, ZoomFactor?, PanX?, PanY?, MapID?, MapURL?, ImageMap*)>
+<!ELEMENT MapURL (#PCDATA)>
+<!ELEMENT MarksAndNumbers (#PCDATA)>
+<!ELEMENT MaximumBacklog (#PCDATA)>
+<!ELEMENT MaximumConcurrentConnections (#PCDATA)>
+<!ELEMENT MaximumListSize (#PCDATA)>
+<!ELEMENT Message (Code, Description?)>
+<!ELEMENT Memo (#PCDATA)>
+<!ELEMENT MerchandiseDescription (#PCDATA)>
+<!ELEMENT MessageBody (MIMEType, (EMailContent | Image), CharSet?, FileName?)>
+<!ELEMENT Method (#PCDATA)>
+<!--<!ATTLIST MessageBody  id    ID     #IMPLIED
+                         idref IDREF  #IMPLIED >-->
+<!ELEMENT MIMEType (#PCDATA)>
+<!-- MIMEType must conform to RFC-822-->
+<!ELEMENT ModificationOccurredIndicator EMPTY>
+<!ELEMENT ModificationRequestIndicator EMPTY>
+<!ELEMENT ModificationStatus (Code, Description?)>
+<!ELEMENT ModifyIndicator EMPTY>
+<!ELEMENT MonetaryValue (#PCDATA)>
+<!ELEMENT Name (#PCDATA)>
+<!ELEMENT NextDayPickupIndicator EMPTY>
+<!ELEMENT NoCandidatesIndicator EMPTY>
+<!ELEMENT NoMapIndicator EMPTY>
+<!ELEMENT NonStandardHoursOfOperation (#PCDATA)>
+<!ELEMENT NotificationCode (#PCDATA)>
+<!ELEMENT Notification (NotificationCode?, AttentionName?, CompanyName?, FaxDestination?, EMailMessage?, PhoneNumber?)>
+<!ELEMENT Number (#PCDATA)>
+<!ELEMENT NumberBCDNPackages (#PCDATA)>
+<!ELEMENT NumberOfPackagesPerCommodity (#PCDATA)>
+<!ELEMENT OddIndicator EMPTY>
+<!ELEMENT OffsetToUTC (#PCDATA)>
+<!ELEMENT OnCallAir (PickupDetails?, Schedule?)>
+<!ELEMENT OpenTime (#PCDATA)>
+<!ELEMENT OperationCompletedIndicator EMPTY>
+<!ELEMENT OriginAddress (LandmarkCode?, PhoneNumber?, Geocode?, AddressKeyFormat, MaximumListSize?)>
+<!ELEMENT OriginCountryCode (#PCDATA)>
+<!ELEMENT OtherCharges (CurrencyCode?, MonetaryValue)>
+<!ELEMENT OtherDocumentsIndicator EMPTY>
+<!ELEMENT OversizePackage (#PCDATA)>
+<!ELEMENT Package (Activity*, Message*, PackagingType?, Description?, Dimensions?, DimensionalWeight?, PackageWeight?, OversizePackage?, TrackingNumber?, ReferenceNumber*, RescheduledDeliveryDate?, RescheduledDeliveryTime?, PackageServiceOptions?, AdditionalHandling?, Void?)>
+<!ELEMENT PackageActivityStatusCode (#PCDATA)>
+<!ELEMENT PackageCenter (UTCSign?, OffsetToUTC?, DCRCutoffDateInUTC?, DCRCutoffTimeInUTC?)>
+<!ELEMENT PackageDeliveryChange (DateTimeStamp, TrackingNumber, DCROptions*, DeliveryAttempt?, UniquePackageIdentifier?, Contact?)>
+<!ELEMENT PackageResults (TrackingNumber, OversizePackage?, TransportationCharges, ServiceOptionsCharges?, TotalPackageCharges?, ItemizedPackageCharges?, LabelImage?, Receipt?, CODAmount?)>
+<!ELEMENT PackageSequenceNumber (#PCDATA)>
+<!ELEMENT PackageServiceOptions (DeliveryConfirmation?, COD?, InsuredValue?, EarliestDeliveryTime?, HazardousMaterialsCode?, SignatureRequired?, HoldForPickup?, VerbalConfirmation?, LabelDelivery?, Notification*, ShipmentNotification*, ShipperReleaseIndicator?)>
+<!ELEMENT PackageWeight (UnitOfMeasurement?, Weight)>
+<!ELEMENT PackagingType (Code, Description?)>
+<!ELEMENT PageNumber (#PCDATA)>
+<!ELEMENT PanX (#PCDATA)>
+<!ELEMENT PanY (#PCDATA)>
+<!ELEMENT ParseAndStandardizeIndicator EMPTY>
+<!ELEMENT PartNumber (#PCDATA)>
+<!ELEMENT PartiesToTransaction (#PCDATA)>
+<!ELEMENT PaymentInformation ((Prepaid | FreightCollect | BillThirdParty | FreeOnBoard | CostAndFreight | DelDutyPaidVATUnPaid | BillDutyTaxShipChargestoShipper | ConsigneeBilled))>
+<!ELEMENT PaymentTerms (#PCDATA)>
+<!ELEMENT PDF417 (#PCDATA)>
+<!ELEMENT Percentage (#PCDATA)>
+<!ELEMENT PhoneExtension (#PCDATA)>
+<!ELEMENT PhoneCountryCode (#PCDATA)>
+<!ELEMENT PhoneDialPlanNumber (#PCDATA)>
+<!ELEMENT PhoneLineNumber (#PCDATA)>
+<!ELEMENT PhoneNumber (#PCDATA | StructuredPhoneNumber)*>
+<!ELEMENT PhraseID (#PCDATA)>
+<!ELEMENT PickupCountryCode (#PCDATA)>
+<!ELEMENT PickupDate (#PCDATA)>
+<!ELEMENT PickupDateRange (BeginDate, EndDate)>
+<!ELEMENT PickupDetails (PickupDate, EarliestTimeReady?, LatestTimeReady?, SuiteRoomID?, FloorID?, Location?, ContactInfo?)>
+<!ELEMENT PickupPostalCode (#PCDATA)>
+<!ELEMENT PickupSummary (Attribute+)>
+<!ELEMENT PickupTime (#PCDATA)>
+<!ELEMENT PickupType (Code, Description?)>
+<!ELEMENT PLDData (#PCDATA)>
+<!ELEMENT PODDays (#PCDATA)>
+<!ELEMENT PODDate (#PCDATA)>
+<!ELEMENT PoliticalDivision4 (#PCDATA)>
+<!ELEMENT PoliticalDivision3 (#PCDATA)>
+<!ELEMENT PoliticalDivision2 (#PCDATA)>
+<!ELEMENT PoliticalDivision1 (#PCDATA)>
+<!ELEMENT PONumber (#PCDATA)>
+<!ELEMENT PostalCode (#PCDATA)>
+<!ELEMENT PostcodeExtendedLow (#PCDATA)>
+<!ELEMENT PostcodeExtendedHigh (#PCDATA)>
+<!ELEMENT PostalCodeHighEnd (#PCDATA)>
+<!ELEMENT PostalCodeLowEnd (#PCDATA)>
+<!ELEMENT PostcodePrimaryLow (#PCDATA)>
+<!ELEMENT PostcodePrimaryHigh (#PCDATA)>
+<!ELEMENT PrepPickupTransactionId (#PCDATA)>
+<!ELEMENT Prepaid ((BillShipper | BillThirdPartyShipper), (BillImporter | BillReceiver | BillThirdPartyConsignee)?)>
+<!ELEMENT PrimaryContact (Name?, Title?, EMailAddress?, PhoneNumber?, FaxNumber?)>
+<!ELEMENT PrinterMakeAndModel (#PCDATA)>
+<!ELEMENT PrinterDriverVersion (#PCDATA)>
+<!ELEMENT ProductName (#PCDATA)>
+<!ELEMENT ProductVersion (#PCDATA)>
+<!ELEMENT ProofOfDeliveryReplyType (#PCDATA)>
+<!ELEMENT Quality (#PCDATA)>
+<!ELEMENT Quantity (#PCDATA)>
+<!ELEMENT QuantityScheduleBUnits (#PCDATA)>
+<!ELEMENT QueryIndicator EMPTY>
+<!ELEMENT Rank (#PCDATA)>
+<!ELEMENT RatedShipmentWarning (#PCDATA)>
+<!ELEMENT ReasonForExport (#PCDATA)>
+<!ELEMENT Receipt (URL?, HTMLImage?, Image?)>
+<!ELEMENT Receiver (Address, SignedForByName?)>
+<!ELEMENT ReferenceNumber (BarCodeIndicator?, Number?, Code?, Value)>
+<!ELEMENT ReformatInputIndicator EMPTY>
+<!ELEMENT Region (#PCDATA)>
+<!ELEMENT RegionalRequestIndicator EMPTY>
+<!ELEMENT RegistrationInformation (UserName, Title?, CompanyName, Address, PhoneNumber, PhoneExtension?, EMailAddress, ((ShipperNumber, PickupPostalCode, PickupCountryCode) | ShipperAccount*))>
+<!ELEMENT Remarks (#PCDATA)>
+<!ELEMENT RescheduledDeliveryDate (#PCDATA)>
+<!ELEMENT RescheduledDeliveryTime (#PCDATA)>
+<!ELEMENT ResendPLDTransactionId (#PCDATA)>
+<!ELEMENT ResidentialAddressIndicator EMPTY>
+<!ELEMENT RestDays (#PCDATA)>
+<!ELEMENT ResultsCode (#PCDATA)>
+<!ELEMENT ResultsDescription (#PCDATA)>
+<!ELEMENT ReturnService (Code)>
+<!ELEMENT ReturnToSender (Code, Description?)>
+<!ELEMENT SameDayWillCall (Date, DayOfWeek?)>
+<!ELEMENT SaturdayDeliveryIndicator EMPTY>
+<!ELEMENT SaturdayDeliveryCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT SaturdayPickupIndicator EMPTY>
+<!ELEMENT SaturdayPickupCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT Schedule (PickupDay?, Method?)>
+<!ELEMENT ScheduledDeliveryDate (#PCDATA)>
+<!ELEMENT ScheduledDeliveryTime (#PCDATA)>
+<!ELEMENT ScheduledPickupDate (Date)>
+<!ELEMENT SearchRadius (#PCDATA)>
+<!ELEMENT SearchResults (GeocodeCandidate+ | (Disclaimer?, DropLocation+, MapNavigation?, DrivingDirection*))>
+<!ELEMENT Segment (#PCDATA)>
+<!ELEMENT SequenceNumber (#PCDATA)>
+<!ELEMENT Service (Code, Description?)>
+<!ELEMENT ServiceOptionsCharges (CurrencyCode?, MonetaryValue)>
+<!ELEMENT ServiceSearch (Time?, GroundIndicator?, AirIndicator?, SaturdayPickupIndicator?)>
+<!ELEMENT ShipCandidate (Address)>
+<!ELEMENT ShipFrom (CompanyName?, AttentionName?, PhoneNumber?, FaxNumber?, EMailAddress?, Address?)>
+<!ELEMENT ShipTo (ShipperAssignedIdentificationNumber?, CompanyName?, AttentionName?, PhoneNumber?, TaxIdentificationNumber?, FaxNumber?, EMailAddress?, Address?, LocationID?)>
+<!ELEMENT Shipment (Description?, Shipper, ShipTo, ShipFrom?, SoldTo?, DeliveryZone?, ShipmentWeight?, PaymentInformation?, ShipmentIdentificationNumber?, ReferenceNumber*, Service?, PickupDate?, ScheduledDeliveryDate?, ScheduledDeliveryTime?, AlternateDeliveryTime?, AlternateDeliveryDate?, ReturnService?, InvoiceLineTotal?, DocumentsOnly?, Package+, ShipmentServiceOptions?, HandlingCharge?)>
+<!ELEMENT ShipmentCharges (TransportationCharges, ServiceOptionsCharges, ItemizedShipmentCharges?, HandlingChargeAmount?, TotalCharges)>
+<!ELEMENT ShipmentDigest (#PCDATA)>
+<!ELEMENT ShipmentIdentificationNumber (#PCDATA)>
+<!ELEMENT ShipmentInsuredValue (CurrencyCode?, MonetaryValue)>
+<!ELEMENT ShipmentNotification (NotificationCode?, AttentionName?, CompanyName?, FaxDestination?, EMailMessage?, PhoneNumber?, Memo?)>
+<!ELEMENT ShipmentNotificationCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT ShipmentResults (DeliveryZone?, ShipmentCharges?, BillingWeight, ShipmentIdentificationNumber, ControlLogReceipt?, PackageResults+)>
+<!ELEMENT ShipmentSEDCASNumber (#PCDATA)>
+<!ELEMENT ShipmentServiceOptions (SaturdayPickup?, SaturdayDelivery?, OnCallAir?, CallTagARS?, ShipmentNotification*, Hundredweight?, COD?, LabelDelivery?, Notification*, CustomsInvoice?)>
+<!-- ShipmentNotification, within ShipmentServiceOptions is flagged for deprication-->
+<!ELEMENT ShipmentWeight (UnitOfMeasurement?, Weight)>
+<!ELEMENT Shipper (Name?, AttentionName?, TaxIdentificationNumber?, PhoneNumber?, FaxNumber?, ShipperNumber?, EMailAddress?, Address?)>
+<!ELEMENT ShipperAccount (ShipperNumber, PickupPostalCode, PickupCountryCode, AccountName)>
+<!ELEMENT ShipperAssignedIdentificationNumber (#PCDATA)>
+<!ELEMENT ShipperExportDeclarationIndicator EMPTY>
+<!ELEMENT ShipperExportDeclarationCode (#PCDATA)>
+<!ELEMENT ShipperExportDeclarationLineAmount (#PCDATA)>
+<!ELEMENT ShipperInformation (ShipperNumber, ShipperProperty*)>
+<!ELEMENT ShipperNumber (#PCDATA)>
+<!ELEMENT ShipperProperty (Name, Value?)>
+<!ELEMENT ShipperQuery (ShipperNumber, ShipperProperty*)>
+<!ELEMENT ShipperReleaseIndicator EMPTY>
+<!ELEMENT SignatureImage (ImageFormat, GraphicImage)>
+<!ELEMENT SignatureRequiredIndicator EMPTY>
+<!ELEMENT SignedForByName (#PCDATA)>
+<!ELEMENT SLIC (#PCDATA)>
+<!ELEMENT SoftwareInstaller (#PCDATA)>
+<!ELEMENT SoftwareProductName (#PCDATA)>
+<!ELEMENT SoftwareProvider (#PCDATA)>
+<!ELEMENT SoftwareVersionNumber (#PCDATA)>
+<!ELEMENT SoldTo (CompanyName, TaxIdentificationNumber?, Address, PhoneNumber?)>
+<!ELEMENT SpecialInstructions (Segment+)>
+<!ELEMENT StandardHoursOfOperation (#PCDATA)>
+<!ELEMENT StateProvinceCode (#PCDATA)>
+<!ELEMENT Status (StatusType, StatusCode?)>
+<!ELEMENT StatusCode (Code, Description?)>
+<!ELEMENT StatusType (Code, Description?)>
+<!ELEMENT StopSequenceNumber (#PCDATA)>
+<!ELEMENT StreetName (#PCDATA)>
+<!ELEMENT StreetNumberLow (#PCDATA)>
+<!ELEMENT StreetNumberHigh (#PCDATA)>
+<!ELEMENT StreetNumberOddEven (%OddEvenChoices;)>
+<!ELEMENT StreetPrefix (#PCDATA)>
+<!ELEMENT StreetSuffix (#PCDATA)>
+<!ELEMENT StreetType (#PCDATA)>
+<!ELEMENT StructuredPhoneNumber (PhoneCountryCode?, PhoneDialPlanNumber, PhoneLineNumber, PhoneExtension?)>
+<!ELEMENT Subject (#PCDATA)>
+<!ELEMENT SubjectCode (#PCDATA)>
+<!ELEMENT SubTotal (CurrencyCode?, MonetaryValue)>
+<!ELEMENT SuiteRoomID (#PCDATA)>
+<!ELEMENT ServiceSummary (Service, Guaranteed*, Disclaimer*, EstimatedArrival)>
+<!ELEMENT TaxIdentificationNumber (#PCDATA)>
+<!ELEMENT TermsOfShipment (#PCDATA)>
+<!ELEMENT TextToSpeechIndicator EMPTY>
+<!ELEMENT ThirdParty (CompanyName?, AttentionName?, PhoneNumber?, FaxDestination?, Address, TaxIdentificationNumber?)>
+<!ELEMENT Time (#PCDATA)>
+<!ELEMENT Title (#PCDATA)>
+<!ELEMENT TokenFormatIndicator EMPTY>
+<!ELEMENT Total (#PCDATA)>
+<!ELEMENT TotalAmount (#PCDATA)>
+<!ELEMENT TotalCharges (CurrencyCode?, MonetaryValue)>
+<!ELEMENT TotalDistance (Distance)>
+<!ELEMENT TotalPackageCharges (CurrencyCode?, MonetaryValue)>
+<!ELEMENT TotalCost (CurrencyCode?, MonetaryValue)>
+<!ELEMENT TotalInvoiceAmount (#PCDATA)>
+<!ELEMENT TotalPackagesDelivered (#PCDATA)>
+<!ELEMENT TotalPackagesInShipment (#PCDATA)>
+<!ELEMENT TotalShipments (#PCDATA)>
+<!ELEMENT TotalTime (#PCDATA)>
+<!ELEMENT TotalTransitDays (#PCDATA)>
+<!ELEMENT TrackingCandidate (TrackingNumber, DestinationPostalCode?, DestinationCountryCode?, PickupDateRange?)>
+<!ELEMENT TrackingNumber (#PCDATA)>
+<!ELEMENT TradeAgreementType (#PCDATA)>
+<!ELEMENT TransactionID (#PCDATA)>
+<!ELEMENT Translate (LanguageCode, DialectCode?, Code*)>
+<!ELEMENT TransitFrom (%FlexAddress;)>
+<!ELEMENT TransitFromList (Candidate+)>
+<!ELEMENT TransitResponse (PickupDate, TransitFrom, TransitTo, DocumentsOnlyIndicator?, AutoDutyCode?, ShipmentWeight?, InvoiceLineTotal?, Disclaimer*, ServiceSummary*, MaximumListSize?)>
+<!ELEMENT TransitTo (%FlexAddress;)>
+<!ELEMENT TransitToList (Candidate+)>
+<!ELEMENT TransportationCharges (CurrencyCode?, MonetaryValue)>
+<!ELEMENT Type (#PCDATA)>
+<!ELEMENT TypeDestinationCode (#PCDATA)>
+<!ELEMENT UltimateDestinationCountryCode (#PCDATA)>
+<!ELEMENT UndeliverableEMailAddress (#PCDATA)>
+<!ELEMENT UniquePackageIdentifier (SLIC?, CountryCode?, InformationSourceCode?, LoopPositionNumber?, GroupNumber?, StopSequenceNumber?, PackageSequenceNumber?, PackageActivityStatusCode?)>
+<!ELEMENT UnitOfMeasurement (Code, Description?)>
+<!ELEMENT UPSCentersIndicator EMPTY>
+<!ELEMENT UPSDesignatedIndicator EMPTY>
+<!ELEMENT UPSLetterCentersIndicator EMPTY>
+<!ELEMENT UPSPreferredAddress (%AddressArtifacts;)>
+<!ELEMENT Urbanization (#PCDATA)>
+<!ELEMENT URL (#PCDATA)>
+<!ELEMENT UserInput (#PCDATA)>
+<!ELEMENT UserName (#PCDATA)>
+<!ELEMENT UTCSign (#PCDATA)>
+<!ELEMENT ValidAddressIndicator EMPTY>
+<!ELEMENT ValidationRulesOnlyIndicator EMPTY>
+<!ELEMENT Value (#PCDATA)>
+<!ELEMENT VerbalConfirmation (ContactInfo?, Name?, PhoneNumber?)>
+<!ELEMENT VerbalConfirmationCharge (CurrencyCode?, MonetaryValue)>
+<!ELEMENT Version (#PCDATA)>
+<!ELEMENT VoidIndicator EMPTY>
+<!ELEMENT WaybillNumber (#PCDATA)>
+<!ELEMENT WayBillPrintIndicator EMPTY>
+<!ELEMENT Weight (#PCDATA)>
+<!ELEMENT Width (#PCDATA)>
+<!ELEMENT WillCall (Date, DayOfWeek?)>
+<!ELEMENT WillCallSearch (SLIC, PostcodePrimaryLow, CountryCode)>
+<!ELEMENT YCoordinate (#PCDATA)>
+<!ELEMENT XCoordinate (#PCDATA)>
+<!ELEMENT ZoomFactor (#PCDATA)>
+<!ELEMENT Town (#PCDATA)>
+<!ELEMENT DialectCode (#PCDATA)>
+<!ELEMENT ResendEMailIndicator EMPTY>
+<!ELEMENT UPSGoldShieldIndicator (#PCDATA)>
+<!ELEMENT PickupDay (#PCDATA)>
diff --git a/xml/tests/testData/xml/SchemaImportHighlightingAndResolve.xsd b/xml/tests/testData/xml/SchemaImportHighlightingAndResolve.xsd
new file mode 100644
index 000000000000..966bd24fc8a4
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaImportHighlightingAndResolve.xsd
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.mycompany.com/schema/myns"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:beans="http://www.springframework.org/schema/beans"
+            targetNamespace="http://www.mycompany.com/schema/myns"
+            elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+  <xsd:import namespace="http://www.springframework.org/schema/beans"/>
+  <xsd:import namespace="<error>http://www.springframework.org/schema/beans2</error>"/>
+
+  <xsd:element name="dateformat">
+    <xsd:complexType>
+      <xsd:complexContent>
+        <xsd:extension base="beans:identifiedType">
+          <xsd:attribute name="lenient" type="xsd:boolean"/>
+          <xsd:attribute name="pattern" type="xsd:string" use="required"/>
+        </xsd:extension>
+      </xsd:complexContent>
+    </xsd:complexType>
+  </xsd:element>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaReferencesValidation.xsd b/xml/tests/testData/xml/SchemaReferencesValidation.xsd
new file mode 100644
index 000000000000..dabe7c315ea3
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaReferencesValidation.xsd
@@ -0,0 +1,31 @@
+<schema targetNamespace="http://www.emc.com/schemas/celerra/xml_api"
+    elementFormDefault="qualified" 
+    attributeFormDefault="unqualified"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:api="http://www.emc.com/schemas/celerra/xml_api"
+  >
+    <element name="Indication">
+        <complexType>
+            <group ref="api:<error>MyGroup</error>"/>
+            <group ref="api:aaa"/>
+          <attribute ref="xml:lang"/>
+          <attribute ref="xml:base"/>
+          <attribute ref="xml:space"/>
+          <attribute ref="xml:<error>lang1</error>"/>
+        </complexType>
+    </element>
+    <group name="aaa"></group>
+  
+    <simpleType name="string" id="string">
+      <restriction base="anySimpleType">
+        <whiteSpace value="preserve" id=<error>"string.preserve"</error>/>
+      </restriction>
+    </simpleType>
+    <simpleType name="string" id="string2">
+      <restriction base="xs:anySimpleType">
+        <whiteSpace value="preserve" id=<error>"string.preserve"</error>/>
+      </restriction>
+    </simpleType>
+</schema>
+
diff --git a/xml/tests/testData/xml/SchemaUpdate.xml b/xml/tests/testData/xml/SchemaUpdate.xml
new file mode 100644
index 000000000000..a782c7112be9
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaUpdate.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<xs:book xmlns:xs="http://example.org/ns/books/" isbn="1234">
+
+  <title2>Alice in Wonderland
+  </title2>
+  <author>C S Lewis</author>
+
+  <character>
+    <name>Alice</name>
+  </character>
+
+</xs:book>
diff --git a/xml/tests/testData/xml/SchemaUpdate.xsd b/xml/tests/testData/xml/SchemaUpdate.xsd
new file mode 100644
index 000000000000..3a6285eb7456
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaUpdate.xsd
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://example.org/ns/books/"
+           elementFormDefault="unqualified">
+  <xsd:element name="book">
+    <xsd:complexType>
+
+
+      <xsd:sequence>
+        <xsd:element name="title2" type="xsd:string"/>
+        <xsd:element name="author" type="xsd:string"/>
+        <xsd:element name="character" minOccurs="0" maxOccurs="unbounded">
+          <xsd:complexType>
+            <xsd:sequence>
+              <xsd:element name="name" type="xsd:string"/>
+              <xsd:element name="friend-of" type="xsd:string" minOccurs="0"
+                          maxOccurs="unbounded"/>
+              <xsd:element name="since" type="xsd:date"/>
+              <xsd:element name="qualification" type="xsd:string"/>
+            </xsd:sequence>
+          </xsd:complexType>
+        </xsd:element>
+      </xsd:sequence>
+      <xsd:attribute name="isbn" type="xsd:string"/>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
+
diff --git a/xml/tests/testData/xml/SchemaValidation.xml b/xml/tests/testData/xml/SchemaValidation.xml
new file mode 100644
index 000000000000..e74e0492ea00
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.4"
+         xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+         <<error>aaa</error>></<error>aaa</error>>
+</web-app>
diff --git a/xml/tests/testData/xml/SchemaValidation2.xml b/xml/tests/testData/xml/SchemaValidation2.xml
new file mode 100644
index 000000000000..44cd564406a7
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	  xsi:noNamespaceSchemaLocation="SchemaValidation2.xsd">
+        <Test xsi:type="<caret>Y">
+		<Foo>Foo</Foo>
+	</Test>
+	<Test xsi:type="Z">
+		<Bar>Foo</Bar>
+	</Test>
+        <Test xsi:type="<error>Z2</error>">
+		<<error>Bar</error>>Foo</<error>Bar</error>>
+	</Test>
+</Root>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaValidation2.xsd b/xml/tests/testData/xml/SchemaValidation2.xsd
new file mode 100644
index 000000000000..6fd649e6cb07
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation2.xsd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema
+		xmlns:xs="http://www.w3.org/2001/XMLSchema"
+		elementFormDefault="qualified"
+		attributeFormDefault="unqualified">
+
+	<xs:complexType name="X" abstract="true"/>
+
+	<xs:complexType name="Y">
+		<xs:complexContent>
+			<xs:extension base="X">
+				<xs:sequence>
+					<xs:element name="Foo" type="xs:string"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:complexType name="Z">
+		<xs:complexContent>
+			<xs:extension base="X">
+				<xs:sequence>
+					<xs:element name="Bar" type="xs:string"/>
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
+	<xs:element name="Root">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="Test" type="X" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/SchemaValidation3.xml b/xml/tests/testData/xml/SchemaValidation3.xml
new file mode 100644
index 000000000000..6a1b19be62f0
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation3.xml
@@ -0,0 +1,5 @@
+<c:root xmlns:p="parent" xmlns:c="child">
+    <p:parent-element/>
+    
+    <c:child-element/>
+</c:root>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaValidation3.xsd b/xml/tests/testData/xml/SchemaValidation3.xsd
new file mode 100644
index 000000000000..6f7fc3145029
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation3.xsd
@@ -0,0 +1,12 @@
+<xs:schema targetNamespace="parent"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:p="parent"
+    elementFormDefault="qualified">
+
+<xs:complexType name="Parent">
+        <xs:sequence>
+            <xs:element name="parent-element" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaValidation3_2.xsd b/xml/tests/testData/xml/SchemaValidation3_2.xsd
new file mode 100644
index 000000000000..7f682c844c96
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation3_2.xsd
@@ -0,0 +1,20 @@
+<xs:schema targetNamespace="child"
+        xmlns:p="parent"
+        xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        elementFormDefault="qualified">
+
+<xs:import namespace="parent" schemaLocation="SchemaValidation3.xsd"/>
+
+<xs:element name="root">
+        <xs:complexType>
+            <xs:complexContent>
+                <xs:extension base="p:Parent">
+                    <xs:sequence>
+                        <xs:element name="child-element" type="xs:string"/>
+                    </xs:sequence>
+                </xs:extension>
+            </xs:complexContent>
+        </xs:complexType>
+    </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaValidation4.xml b/xml/tests/testData/xml/SchemaValidation4.xml
new file mode 100644
index 000000000000..1473b5fdeae6
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation4.xml
@@ -0,0 +1,5 @@
+<<error>project</error> xmlns="SchemaValidation4.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+<pomVersion>3</pomVersion>
+</<error>project</error>>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaValidation4.xsd b/xml/tests/testData/xml/SchemaValidation4.xsd
new file mode 100644
index 000000000000..ba767f659d98
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation4.xsd
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
+  elementFormDefault="qualified">
+  <xs:element name="project">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="extend" minOccurs="0"/>
+        <xs:element ref="pomVersion"/>
+        <xs:element ref="id"/>
+        <xs:element ref="name"/>
+        <xs:element ref="groupId" minOccurs="0"/>
+        <xs:element ref="currentVersion"/>
+        <xs:element ref="organization"/>
+        <xs:element ref="inceptionYear"/>
+        <xs:element ref="package" minOccurs="0"/>
+        <xs:element ref="logo" minOccurs="0"/>
+        <xs:element ref="gumpRepositoryId" minOccurs="0"/>
+        <xs:element ref="description" minOccurs="0"/>
+        <xs:element ref="shortDescription"/>
+        <xs:element ref="url" minOccurs="0" />
+        <xs:element ref="issueTrackingUrl" minOccurs="0"/>
+        <xs:element ref="siteAddress" minOccurs="0"/>
+        <xs:element ref="siteDirectory" minOccurs="0"/>
+        <xs:element ref="distributionSite" minOccurs="0"/>
+        <xs:element ref="distributionDirectory" minOccurs="0"/>
+        <xs:element ref="repository" minOccurs="0"/>
+        <xs:element ref="versions" minOccurs="0"/>
+        <xs:element ref="branches" minOccurs="0"/>
+        <xs:element ref="mailingLists" minOccurs="0"/>
+        <xs:element ref="developers"/>
+        <xs:element ref="contributors" minOccurs="0"/>
+        <xs:element ref="licenses" minOccurs="0"/>
+        <xs:element ref="dependencies" minOccurs="0"/>
+        <xs:element ref="build"/>
+        <xs:element ref="reports" minOccurs="0"/>
+        <xs:element ref="properties" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="extend" type='xs:string'/>
+  <xs:element name="connection" type='xs:string'/>
+  <xs:element name="developerConnection" type='xs:string'/>
+  <xs:element name="currentVersion" type='xs:string'/>
+  <xs:element name="description" type='xs:string'/>
+  <xs:element name="distributionSite" type='xs:string'/>
+  <xs:element name="distributionDirectory" type='xs:string'/>
+  <xs:element name="name" type='xs:string'/>
+  <xs:element name="groupId" type='xs:string'/>
+  <xs:element name="artifactId" type='xs:string'/>
+  <xs:element name="gumpRepositoryId" type='xs:string'/>
+  <xs:element name="id" type='xs:string'/>
+  <xs:element name="inceptionYear" type='xs:gYear'/>
+  <!-- not anyURI as it can contain ${pom....} -->
+  <xs:element name="issueTrackingUrl" type='xs:string'/>
+  <xs:element name="logo" type='xs:string'/>
+  <xs:element name="package" type='xs:string'/>
+  <xs:element name="pomVersion" type='xs:string'/>
+  <xs:element name="shortDescription" type='xs:string'/>
+  <xs:element name="siteAddress" type='xs:string'/>
+  <xs:element name="siteDirectory" type='xs:string'/>
+  <!-- not anyURI as it can contain ${pom....} -->
+  <xs:element name="url" type='xs:string'/>
+
+  <!-- /repository element -->
+  <xs:element name="repository">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="connection"/>
+        <xs:element ref="developerConnection" minOccurs="0"/>
+        <xs:element ref="url" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- /organization element -->
+  <xs:element name="organization">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="name"/>
+        <xs:element ref="url" minOccurs="0" />
+        <xs:element ref="logo" minOccurs="0" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- /versions element -->
+  <xs:element name="versions">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="version" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /versions/version element -->
+  <xs:element name="version">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="id"/>
+        <xs:element ref="name"/>
+        <xs:element ref="tag"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /versions/version/tag and branches/branch/tag-->
+  <xs:element name="tag" type='xs:string'/>
+  
+  <!-- /branches element -->
+  <xs:element name="branches">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="branch" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /branches/branch element -->
+  <xs:element name="branch">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tag"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /mailingLists element -->
+  <xs:element name="mailingLists">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="mailingList" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /mailingLists/mailingList element -->
+  <xs:element name="mailingList">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="name"/>
+        <xs:element ref="subscribe"/>
+        <xs:element ref="unsubscribe"/>
+        <xs:element ref="archive" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- /mailingLists/mailingList/subscribe element -->  
+  <xs:element name="subscribe" type='xs:string'/>
+  <!-- /mailingLists/mailingList/unsubscribe element -->  
+  <xs:element name="unsubscribe" type='xs:string'/>
+  <!-- /mailingLists/mailingList/archive element -->  
+  <xs:element name="archive" type='xs:string'/>
+  
+  <!-- /developers element -->
+  <xs:element name="developers">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="developer" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /developers/developer element -->
+  <xs:element name="developer">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="name"/>
+        <xs:element ref="id"/>
+        <xs:group ref="contactDetails" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- /developers/developer/contactDetails group and
+       /contributors/contributor/contactDetails group -->
+  <xs:group name="contactDetails">
+      <xs:sequence>
+        <xs:element ref="email"/>
+        <xs:element name="organization" type='xs:string' minOccurs="0"/>
+        <xs:element ref="roles" minOccurs="0" />
+        <xs:element ref="url" minOccurs="0" />
+        <xs:element ref="timezone" minOccurs="0" />
+      </xs:sequence>
+  </xs:group>
+
+  <!-- contactDetails/email element -->
+  <xs:element name="email" type='xs:string'/>
+
+  <!-- contactDetails/roles element -->
+  <xs:element name="roles">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="role" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- contactDetails/roles/role element -->
+  <xs:element name="role" type='xs:string'/>
+
+  <!-- type for contactDetails/roles/timezone element -->  
+  <xs:simpleType name="timezoneType">
+    <xs:restriction base="xs:decimal">
+      <xs:minInclusive value="-14"/>
+      <xs:maxInclusive value="+14"/>
+    </xs:restriction>
+  </xs:simpleType> 
+  
+  <!-- contactDetails/roles/timezone element
+       Stores a decimal that is the offset to GMT.
+    -->  
+  <xs:element name="timezone" type='timezoneType'/>
+
+  <!-- /contributors element -->  
+  <xs:element name="contributors">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="contributor" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /contributors/contributor element -->
+  <xs:element name="contributor">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="name"/>
+        <xs:group ref="contactDetails" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- /licenses element -->
+  <xs:element name="licenses">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="license" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /licenses/license element -->
+  <xs:element name="license">
+    <xs:complexType>
+      <xs:sequence>
+        <!-- name of the license, e.g. ASL 1.1 -->
+        <xs:element ref="name" minOccurs="0"/>
+        <!-- fetchable version of the license -->
+        <xs:element ref="url" minOccurs="0" />
+        <!-- 'manual' or 'repo' -->
+        <xs:element ref="distribution" minOccurs="0" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <!-- /licenses/license/distribution element -->
+  <xs:element name="distribution">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:pattern value="manual|repo"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+  
+  <!-- /dependencies element -->
+  <xs:element name="dependencies">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="dependency" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /dependencies/dependency element -->
+  <xs:element name="dependency">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="id" minOccurs="0" />
+        <xs:element ref="groupId" minOccurs="0" />
+        <xs:element ref="artifactId" minOccurs="0" />
+        <xs:element name="version" type="xs:string" />
+        <xs:element ref="jar" minOccurs="0"/>
+        <xs:element ref="type" minOccurs="0"/>
+        <xs:element ref="url" minOccurs="0"/>
+        <xs:element ref="properties" minOccurs="0" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- /dependencies/dependency/type element -->
+  <xs:element name="type" type='xs:string'/>
+  <!-- /dependencies/dependency/jar element -->
+  <xs:element name="jar" type='xs:string'/>
+  
+  <!-- /build element -->
+  <xs:element name="build">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="nagEmailAddress" minOccurs="0"/>
+        <xs:element ref="sourceDirectory" minOccurs="0"/>
+        <xs:element ref="sourceModifications" minOccurs="0"/>
+        <xs:element ref="unitTestSourceDirectory" minOccurs="0"/>
+        <xs:element ref="integrationUnitTestSourceDirectory" minOccurs="0"/>
+        <xs:element ref="aspectSourceDirectory" minOccurs="0"/>
+        <xs:element ref="unitTest" minOccurs="0"/>
+        <!-- no longer appears in build.java 
+        <xs:element ref="integrationUnitTest" minOccurs="0"/>
+        -->
+        <xs:element ref="resources" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="nagEmailAddress" type='xs:string'/>
+
+  <xs:element name="sourceDirectory" type='xs:string'/>
+  
+  <xs:element name="sourceModifications">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="sourceModification" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  
+  <xs:element name="sourceModification">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="className" type='xs:string'/>
+        <xs:element ref="includes" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="excludes" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  
+  <xs:element name="unitTestSourceDirectory" type='xs:string'/>
+  <xs:element name="integrationUnitTestSourceDirectory" type='xs:string'/>
+  <xs:element name="aspectSourceDirectory" type='xs:string'/>
+  
+  <xs:element name="unitTest">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="includes" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="excludes" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="resources" minOccurs="0" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="includes">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="include" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="excludes">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="exclude" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="include" type='xs:string'/>
+  <xs:element name="exclude" type='xs:string'/>
+  
+  <!-- no longer appears in build.java
+  <xs:element name="integrationUnitTest">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="includes" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="excludes" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  -->
+  <xs:element name="resources">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="resource" minOccurs="0" maxOccurs="unbounded"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="directory" type='xs:string'/>
+  <xs:element name="targetPath" type='xs:string'/>
+  <xs:element name="filtering" type="xs:boolean" />
+
+  <xs:element name="resource">
+    <xs:complexType>
+      <xs:sequence>
+        <!-- FIXME: I think that this defaults to basedir, need a check -->
+        <xs:element ref="directory" minOccurs="0"/>
+        <xs:element ref="targetPath" minOccurs="0"/>
+        <xs:element ref="includes" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="excludes" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="filtering" minOccurs="0" maxOccurs="1"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element> 
+
+  <xs:element name="reports">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="report" minOccurs="0" maxOccurs="unbounded" 
+          type="xs:string"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  
+  <xs:element name="properties">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="classloader">
+    <xs:simpleType>
+      <xs:restriction base="xs:string">
+        <xs:pattern value="root|root.maven"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:element>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/SchemaValidation5.xsd b/xml/tests/testData/xml/SchemaValidation5.xsd
new file mode 100644
index 000000000000..2c4f8c72a724
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation5.xsd
@@ -0,0 +1,41 @@
+<xs:schema targetNamespace="http://www.example.com/test"
+           xmlns="http://www.example.com/test"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+   <xs:complexType name="TestType4">
+      <xs:sequence>
+         <xs:element name="testelement" type="TestType11"/>
+      </xs:sequence>
+   </xs:complexType>
+
+   <xs:complexType name="TestType11">
+      <xs:sequence>
+         <xs:element name="testelement" type="TestType2"/>
+      </xs:sequence>
+   </xs:complexType>
+
+    <xs:complexType name="TestType12">
+      <xs:sequence>
+         <xs:element name="testelement" type="TestType4"/>
+      </xs:sequence>
+   </xs:complexType>
+
+   <xs:simpleType name="TestType3">
+      <xs:restriction base="TestType2">
+      </xs:restriction>
+   </xs:simpleType>
+
+   <xs:simpleType name="TestType2">
+      <xs:restriction></xs:restriction>
+   </xs:simpleType>
+
+  <xs:element name="MyElement">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="MyElement"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaValidation6.xml b/xml/tests/testData/xml/SchemaValidation6.xml
new file mode 100644
index 000000000000..496e5c97b561
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation6.xml
@@ -0,0 +1,3 @@
+<userrole xmlns="aaa">
+  <label key="aaa"></label>
+</userrole>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaValidation6.xsd b/xml/tests/testData/xml/SchemaValidation6.xsd
new file mode 100644
index 000000000000..84f24cfcbbc8
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaValidation6.xsd
@@ -0,0 +1,21 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="aaa">
+<xs:element name="userrole">
+<xs:complexType mixed="true">
+<xs:sequence minOccurs="0">
+<xs:any namespace="http://www.w3.org/1999/xhtml ##targetNamespace" minOccurs="0" maxOccurs="unbounded"></xs:any>
+</xs:sequence>
+</xs:complexType>
+</xs:element>
+
+<xs:element name="label">
+<xs:complexType>
+<xs:attribute name="key" use="required">
+<xs:simpleType>
+<xs:restriction base="xs:string">
+<xs:whiteSpace value="collapse"/>
+</xs:restriction>
+</xs:simpleType>
+</xs:attribute>
+</xs:complexType>
+</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SchemaWithXmlId.xml b/xml/tests/testData/xml/SchemaWithXmlId.xml
new file mode 100644
index 000000000000..358173a3f46f
--- /dev/null
+++ b/xml/tests/testData/xml/SchemaWithXmlId.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsd:schema version="1.0"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:xml="http://www.w3.org/XML/1998/namespace"
+            elementFormDefault="qualified"
+  >
+  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+  <xsd:element name="build" type="buildType" />
+
+  <xsd:complexType name="buildType" mixed="true">
+    <xsd:sequence>
+      <xsd:element name="statusInfo" type="statusInfoType" minOccurs="0" />
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:complexType name="statusInfoType">
+    <xsd:attribute ref="xml:id" use="optional"/>
+  </xsd:complexType>
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/Semantic.xsd b/xml/tests/testData/xml/Semantic.xsd
new file mode 100644
index 000000000000..57b2d4dc12b2
--- /dev/null
+++ b/xml/tests/testData/xml/Semantic.xsd
@@ -0,0 +1,1562 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema elementFormDefault="qualified" attributeFormDefault="unqualified"
+	xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" 
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+	targetNamespace="http://www.omg.org/spec/BPMN/20100524/MODEL">
+	
+	<xsd:element name="activity" type="tActivity"/>
+	<xsd:complexType name="tActivity" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowNode">
+				<xsd:sequence>
+					<xsd:element ref="ioSpecification" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="property" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="dataInputAssociation" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="dataOutputAssociation" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="loopCharacteristics" minOccurs="0"/>
+				</xsd:sequence>
+				<xsd:attribute name="isForCompensation" type="xsd:boolean" default="false"/>
+				<xsd:attribute name="startQuantity" type="xsd:integer" default="1"/>
+				<xsd:attribute name="completionQuantity" type="xsd:integer" default="1"/>
+				<xsd:attribute name="default" type="xsd:IDREF" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="adHocSubProcess" type="tAdHocSubProcess" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tAdHocSubProcess">
+		<xsd:complexContent>
+			<xsd:extension base="tSubProcess">
+				<xsd:sequence>
+					<xsd:element name="completionCondition" type="tExpression" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="cancelRemainingInstances" type="xsd:boolean" default="true"/>
+				<xsd:attribute name="ordering" type="tAdHocOrdering"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:simpleType name="tAdHocOrdering">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="Parallel"/>
+			<xsd:enumeration value="Sequential"/>
+		</xsd:restriction>
+	</xsd:simpleType>	
+
+	<xsd:element name="artifact" type="tArtifact"/>
+	<xsd:complexType name="tArtifact" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="assignment" type="tAssignment" />
+	<xsd:complexType name="tAssignment">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="from" type="tExpression" minOccurs="1" maxOccurs="1"/>
+					<xsd:element name="to" type="tExpression" minOccurs="1" maxOccurs="1"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="association" type="tAssociation" substitutionGroup="artifact"/>
+	<xsd:complexType name="tAssociation">
+		<xsd:complexContent>
+			<xsd:extension base="tArtifact">
+				<xsd:attribute name="sourceRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="targetRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="associationDirection" type="tAssociationDirection" default="None"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:simpleType name="tAssociationDirection">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="None"/>
+			<xsd:enumeration value="One"/>
+			<xsd:enumeration value="Both"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:element name="auditing" type="tAuditing"/>
+	<xsd:complexType name="tAuditing">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="baseElement" type="tBaseElement"/>
+	<xsd:complexType name="tBaseElement" abstract="true">
+		<xsd:sequence>
+			<xsd:element ref="documentation" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="extensionElements" minOccurs="0" maxOccurs="1" /> 
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	
+	<xsd:element name="baseElementWithMixedContent" type="tBaseElementWithMixedContent"/>
+	<xsd:complexType name="tBaseElementWithMixedContent" abstract="true" mixed="true">
+		<xsd:sequence>
+			<xsd:element ref="documentation" minOccurs="0" maxOccurs="unbounded"/>
+			<xsd:element ref="extensionElements" minOccurs="0" maxOccurs="1" /> 
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+
+	<xsd:element name="boundaryEvent" type="tBoundaryEvent" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tBoundaryEvent">
+		<xsd:complexContent>
+			<xsd:extension base="tCatchEvent">
+				<xsd:attribute name="cancelActivity" type="xsd:boolean" default="true"/>
+				<xsd:attribute name="attachedToRef" type="xsd:QName" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>			
+
+	<xsd:element name="businessRuleTask" type="tBusinessRuleTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tBusinessRuleTask">
+		<xsd:complexContent>
+			<xsd:extension base="tTask">
+				<xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="callableElement" type="tCallableElement"/>
+	<xsd:complexType name="tCallableElement">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element name="supportedInterfaceRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="ioSpecification" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="ioBinding" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="callActivity" type="tCallActivity" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tCallActivity">
+		<xsd:complexContent>
+			<xsd:extension base="tActivity">
+				<xsd:attribute name="calledElement" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="callChoreography" type="tCallChoreography" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tCallChoreography">
+		<xsd:complexContent>
+			<xsd:extension base="tChoreographyActivity">
+				<xsd:sequence>
+					<xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="calledChoreographyRef" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="callConversation" type="tCallConversation" substitutionGroup="conversationNode"/>
+	<xsd:complexType name="tCallConversation">
+		<xsd:complexContent>
+			<xsd:extension base="tConversationNode">
+				<xsd:sequence>
+					<xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="calledCollaborationRef" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="cancelEventDefinition" type="tCancelEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tCancelEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="catchEvent" type="tCatchEvent"/>
+	<xsd:complexType name="tCatchEvent" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tEvent">
+				<xsd:sequence>
+					<xsd:element ref="dataOutput" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="dataOutputAssociation" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="outputSet" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="eventDefinition" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="eventDefinitionRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="parallelMultiple" type="xsd:boolean" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="category" type="tCategory" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tCategory">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element ref="categoryValue" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="categoryValue" type="tCategoryValue"/>
+	<xsd:complexType name="tCategoryValue">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:attribute name="value" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="choreography" type="tChoreography" substitutionGroup="collaboration"/>
+	<xsd:complexType name="tChoreography">
+		<xsd:complexContent>
+			<xsd:extension base="tCollaboration">
+				<xsd:sequence>
+					<xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="choreographyActivity" type="tChoreographyActivity"/>
+	<xsd:complexType name="tChoreographyActivity" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowNode">
+				<xsd:sequence>
+					<xsd:element name="participantRef" type="xsd:QName" minOccurs="2" maxOccurs="unbounded"/>
+					<xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="initiatingParticipantRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="loopType" type="tChoreographyLoopType" default="None"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:simpleType name="tChoreographyLoopType">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="None"/>
+			<xsd:enumeration value="Standard"/>
+			<xsd:enumeration value="MultiInstanceSequential"/>
+			<xsd:enumeration value="MultiInstanceParallel"/>
+		</xsd:restriction>
+	</xsd:simpleType>	
+	
+	<xsd:element name="choreographyTask" type="tChoreographyTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tChoreographyTask">
+		<xsd:complexContent>
+			<xsd:extension base="tChoreographyActivity">
+				<xsd:sequence>
+					<xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="1" maxOccurs="2"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="collaboration" type="tCollaboration" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tCollaboration">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element ref="participant" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="messageFlow" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="conversationNode" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="conversationAssociation" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="participantAssociation" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="messageFlowAssociation" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="choreographyRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="conversationLink" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="isClosed" type="xsd:boolean" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="compensateEventDefinition" type="tCompensateEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tCompensateEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition">
+				<xsd:attribute name="waitForCompletion" type="xsd:boolean"/>
+				<xsd:attribute name="activityRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="complexBehaviorDefinition" type="tComplexBehaviorDefinition"/>
+	<xsd:complexType name="tComplexBehaviorDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="condition" type="tFormalExpression" minOccurs="1" maxOccurs="1"/>
+					<xsd:element name="event" type="tImplicitThrowEvent" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="complexGateway" type="tComplexGateway" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tComplexGateway">
+		<xsd:complexContent>
+			<xsd:extension base="tGateway">
+				<xsd:sequence>
+					<xsd:element name="activationCondition" type="tExpression" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="default" type="xsd:IDREF"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="conditionalEventDefinition" type="tConditionalEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tConditionalEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition">
+				<xsd:sequence>
+					<xsd:element name="condition" type="tExpression"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="conversation" type="tConversation" substitutionGroup="conversationNode"/>
+	<xsd:complexType name="tConversation">
+		<xsd:complexContent>
+			<xsd:extension base="tConversationNode"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="conversationAssociation" type="tConversationAssociation"/>
+	<xsd:complexType name="tConversationAssociation">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:attribute name="innerConversationNodeRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="outerConversationNodeRef" type="xsd:QName" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="conversationLink" type="tConversationLink"/> 
+	<xsd:complexType name="tConversationLink"> 
+		<xsd:complexContent> 
+			<xsd:extension base="tBaseElement"> 
+				<xsd:attribute name="name" type="xsd:string" use="optional"/> 
+				<xsd:attribute name="sourceRef" type="xsd:QName" use="required"/> 
+				<xsd:attribute name="targetRef" type="xsd:QName" use="required"/> 
+			</xsd:extension> 
+		</xsd:complexContent> 
+	</xsd:complexType>
+  
+	<xsd:element name="conversationNode" type="tConversationNode"/>
+	<xsd:complexType name="tConversationNode" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="messageFlowRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="correlationKey" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="correlationKey" type="tCorrelationKey"/>
+	<xsd:complexType name="tCorrelationKey">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="correlationPropertyRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="correlationProperty" type="tCorrelationProperty" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tCorrelationProperty">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element ref="correlationPropertyRetrievalExpression" minOccurs="1" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="optional"/>
+				<xsd:attribute name="type" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="correlationPropertyBinding" type="tCorrelationPropertyBinding"/>
+	<xsd:complexType name="tCorrelationPropertyBinding">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="dataPath" type="tFormalExpression" minOccurs="1" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="correlationPropertyRef" type="xsd:QName" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="correlationPropertyRetrievalExpression" type="tCorrelationPropertyRetrievalExpression"/>
+	<xsd:complexType name="tCorrelationPropertyRetrievalExpression">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="messagePath" type="tFormalExpression" minOccurs="1" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="messageRef" type="xsd:QName" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="correlationSubscription" type="tCorrelationSubscription"/>
+	<xsd:complexType name="tCorrelationSubscription">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="correlationPropertyBinding" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="correlationKeyRef" type="xsd:QName" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="dataAssociation" type="tDataAssociation" />
+	<xsd:complexType name="tDataAssociation">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="sourceRef" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="targetRef" type="xsd:IDREF" minOccurs="1" maxOccurs="1"/>
+					<xsd:element name="transformation" type="tFormalExpression" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="assignment" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="dataInput" type="tDataInput" />
+	<xsd:complexType name="tDataInput">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="optional"/>
+				<xsd:attribute name="itemSubjectRef" type="xsd:QName" />
+				<xsd:attribute name="isCollection" type="xsd:boolean" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="dataInputAssociation" type="tDataInputAssociation" />
+	<xsd:complexType name="tDataInputAssociation">
+		<xsd:complexContent>
+			<xsd:extension base="tDataAssociation"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="dataObject" type="tDataObject" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tDataObject">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowElement">
+				<xsd:sequence>
+					<xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="itemSubjectRef" type="xsd:QName"/>
+				<xsd:attribute name="isCollection" type="xsd:boolean" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="dataObjectReference" type="tDataObjectReference" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tDataObjectReference">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowElement">
+				<xsd:sequence>
+					<xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="itemSubjectRef" type="xsd:QName"/>
+				<xsd:attribute name="dataObjectRef" type="xsd:IDREF"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="dataOutput" type="tDataOutput" />
+	<xsd:complexType name="tDataOutput">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="optional" />
+				<xsd:attribute name="itemSubjectRef" type="xsd:QName"/>
+				<xsd:attribute name="isCollection" type="xsd:boolean" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="dataOutputAssociation" type="tDataOutputAssociation" />
+	<xsd:complexType name="tDataOutputAssociation">
+		<xsd:complexContent>
+			<xsd:extension base="tDataAssociation"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="dataState" type="tDataState" />
+	<xsd:complexType name="tDataState">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="dataStore" type="tDataStore" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tDataStore">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="capacity" type="xsd:integer"/>
+				<xsd:attribute name="isUnlimited" type="xsd:boolean" default="true"/>
+				<xsd:attribute name="itemSubjectRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="dataStoreReference" type="tDataStoreReference" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tDataStoreReference">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowElement">
+				<xsd:sequence>
+					<xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="itemSubjectRef" type="xsd:QName"/>
+				<xsd:attribute name="dataStoreRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="documentation" type="tDocumentation"/>
+	<xsd:complexType name="tDocumentation" mixed="true">
+		<xsd:sequence>
+			<xsd:any namespace="##any" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:ID" use="optional"/>
+		<xsd:attribute name="textFormat" type="xsd:string" default="text/plain"/>
+	</xsd:complexType>
+	
+	<xsd:element name="endEvent" type="tEndEvent" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tEndEvent">
+		<xsd:complexContent>
+			<xsd:extension base="tThrowEvent"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="endPoint" type="tEndPoint" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tEndPoint">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>		
+	
+	<xsd:element name="error" type="tError" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tError">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="errorCode" type="xsd:string"/>
+				<xsd:attribute name="structureRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="errorEventDefinition" type="tErrorEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tErrorEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition">
+				<xsd:attribute name="errorRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="escalation" type="tEscalation" substitutionGroup="rootElement"/>	
+	<xsd:complexType name="tEscalation">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="escalationCode" type="xsd:string"/>
+				<xsd:attribute name="structureRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="escalationEventDefinition" type="tEscalationEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tEscalationEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition">
+				<xsd:attribute name="escalationRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="event" type="tEvent" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tEvent" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowNode">
+				<xsd:sequence>
+					<xsd:element ref="property" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="eventBasedGateway" type="tEventBasedGateway" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tEventBasedGateway">
+		<xsd:complexContent>
+			<xsd:extension base="tGateway">
+				<xsd:attribute name="instantiate" type="xsd:boolean" default="false"/>
+				<xsd:attribute name="eventGatewayType" type="tEventBasedGatewayType" default="Exclusive"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:simpleType name="tEventBasedGatewayType">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="Exclusive"/>
+			<xsd:enumeration value="Parallel"/>
+		</xsd:restriction>
+	</xsd:simpleType>	
+
+	<xsd:element name="eventDefinition" type="tEventDefinition" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tEventDefinition" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>			
+
+	<xsd:element name="exclusiveGateway" type="tExclusiveGateway" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tExclusiveGateway">
+		<xsd:complexContent>
+			<xsd:extension base="tGateway">
+				<xsd:attribute name="default" type="xsd:IDREF" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="expression" type="tExpression"/>
+	<xsd:complexType name="tExpression">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElementWithMixedContent"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="extension" type="tExtension"/>
+	<xsd:complexType name="tExtension">
+		<xsd:sequence>
+			<xsd:element ref="documentation" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:attribute name="definition" type="xsd:QName"/>
+		<xsd:attribute name="mustUnderstand" type="xsd:boolean" use="optional" default="false"/>
+	</xsd:complexType>
+	
+	<xsd:element name="extensionElements" type="tExtensionElements" /> 
+	<xsd:complexType name="tExtensionElements">
+		<xsd:sequence>
+			<xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded" /> 
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:element name="flowElement" type="tFlowElement"/>
+	<xsd:complexType name="tFlowElement" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="auditing" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="monitoring" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="categoryValueRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="flowNode" type="tFlowNode"/>
+	<xsd:complexType name="tFlowNode" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowElement">
+				<xsd:sequence>
+					<xsd:element name="incoming" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="outgoing" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="formalExpression" type="tFormalExpression" substitutionGroup="expression"/>
+	<xsd:complexType name="tFormalExpression">
+		<xsd:complexContent>
+			<xsd:extension base="tExpression">
+				<xsd:attribute name="language" type="xsd:anyURI" use="optional"/>
+				<xsd:attribute name="evaluatesToTypeRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="gateway" type="tGateway" abstract="true"/>
+	<xsd:complexType name="tGateway">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowNode">
+				<xsd:attribute name="gatewayDirection" type="tGatewayDirection" default="Unspecified"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:simpleType name="tGatewayDirection">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="Unspecified"/>
+			<xsd:enumeration value="Converging"/>
+			<xsd:enumeration value="Diverging"/>
+			<xsd:enumeration value="Mixed"/>
+		</xsd:restriction>
+	</xsd:simpleType>	
+	
+	<xsd:element name="globalBusinessRuleTask" type="tGlobalBusinessRuleTask" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tGlobalBusinessRuleTask">
+		<xsd:complexContent>
+			<xsd:extension base="tGlobalTask">
+				<xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="globalChoreographyTask" type="tGlobalChoreographyTask" substitutionGroup="choreography"/>
+	<xsd:complexType name="tGlobalChoreographyTask">
+		<xsd:complexContent>
+			<xsd:extension base="tChoreography">
+				<xsd:attribute name="initiatingParticipantRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	<xsd:element name="globalConversation" type="tGlobalConversation" substitutionGroup="collaboration"/>
+	<xsd:complexType name="tGlobalConversation">
+		<xsd:complexContent>
+			<xsd:extension base="tCollaboration"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="globalManualTask" type="tGlobalManualTask" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tGlobalManualTask">
+		<xsd:complexContent>
+			<xsd:extension base="tGlobalTask"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="globalScriptTask" type="tGlobalScriptTask"  substitutionGroup="rootElement"/>
+	<xsd:complexType name="tGlobalScriptTask">
+		<xsd:complexContent>
+			<xsd:extension base="tGlobalTask">
+				<xsd:sequence>
+					<xsd:element ref="script" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="scriptLanguage" type="xsd:anyURI"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="globalTask" type="tGlobalTask" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tGlobalTask">
+		<xsd:complexContent>
+			<xsd:extension base="tCallableElement">
+				<xsd:sequence>
+					<xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="globalUserTask" type="tGlobalUserTask" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tGlobalUserTask">
+		<xsd:complexContent>
+			<xsd:extension base="tGlobalTask">
+				<xsd:sequence>
+					<xsd:element ref="rendering" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="group" type="tGroup" substitutionGroup="artifact"/>
+	<xsd:complexType name="tGroup">
+		<xsd:complexContent>
+			<xsd:extension base="tArtifact">
+				<xsd:attribute name="categoryValueRef" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="humanPerformer" type="tHumanPerformer" substitutionGroup="performer"/>
+	<xsd:complexType name="tHumanPerformer">
+		<xsd:complexContent>
+			<xsd:extension base="tPerformer"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:simpleType name="tImplementation">
+		<xsd:union memberTypes="xsd:anyURI">
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:token">
+					<xsd:enumeration value="##unspecified" /> 
+					<xsd:enumeration value="##WebService" />
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:union>
+	</xsd:simpleType>
+
+	<xsd:element name="implicitThrowEvent" type="tImplicitThrowEvent" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tImplicitThrowEvent">
+		<xsd:complexContent>
+			<xsd:extension base="tThrowEvent"/>
+		</xsd:complexContent>
+	</xsd:complexType>				
+	
+	<xsd:element name="inclusiveGateway" type="tInclusiveGateway" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tInclusiveGateway">
+		<xsd:complexContent>
+			<xsd:extension base="tGateway">
+				<xsd:attribute name="default" type="xsd:IDREF" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="inputSet" type="tInputSet" />
+	<xsd:complexType name="tInputSet">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="dataInputRefs" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="optionalInputRefs" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="whileExecutingInputRefs" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="outputSetRefs" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" />
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="interface" type="tInterface" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tInterface">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element ref="operation" minOccurs="1" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="required"/>
+				<xsd:attribute name="implementationRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="intermediateCatchEvent" type="tIntermediateCatchEvent" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tIntermediateCatchEvent">
+		<xsd:complexContent>
+			<xsd:extension base="tCatchEvent"/>
+		</xsd:complexContent>
+	</xsd:complexType>			
+
+	<xsd:element name="intermediateThrowEvent" type="tIntermediateThrowEvent" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tIntermediateThrowEvent">
+		<xsd:complexContent>
+			<xsd:extension base="tThrowEvent"/>
+		</xsd:complexContent>
+	</xsd:complexType>				
+
+	<xsd:element name="ioBinding" type="tInputOutputBinding" />
+	<xsd:complexType name="tInputOutputBinding">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:attribute name="operationRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="inputDataRef" type="xsd:IDREF" use="required"/>
+				<xsd:attribute name="outputDataRef" type="xsd:IDREF" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="ioSpecification" type="tInputOutputSpecification" />
+	<xsd:complexType name="tInputOutputSpecification">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="dataInput" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="dataOutput" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="inputSet" minOccurs="1" maxOccurs="unbounded"/>
+					<xsd:element ref="outputSet" minOccurs="1" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="itemDefinition" type="tItemDefinition" substitutionGroup="rootElement"/>	
+	<xsd:complexType name="tItemDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:attribute name="structureRef" type="xsd:QName"/>
+				<xsd:attribute name="isCollection" type="xsd:boolean" default="false"/>
+				<xsd:attribute name="itemKind" type="tItemKind" default="Information"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>		
+	
+	<xsd:simpleType name="tItemKind">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="Information"/>
+			<xsd:enumeration value="Physical"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:element name="lane" type="tLane"/>
+	<xsd:complexType name="tLane">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="partitionElement" type="tBaseElement" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="flowNodeRef" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="childLaneSet" type="tLaneSet" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="partitionElementRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="laneSet" type="tLaneSet"/>
+	<xsd:complexType name="tLaneSet">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="lane" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="linkEventDefinition" type="tLinkEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tLinkEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition">
+				<xsd:sequence>
+					<xsd:element name="source" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="target" type="xsd:QName" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="loopCharacteristics" type="tLoopCharacteristics"/>
+	<xsd:complexType name="tLoopCharacteristics" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="manualTask" type="tManualTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tManualTask">
+		<xsd:complexContent>
+			<xsd:extension base="tTask"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="message" type="tMessage" substitutionGroup="rootElement"/>	
+	<xsd:complexType name="tMessage">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="itemRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>		
+	
+	<xsd:element name="messageEventDefinition" type="tMessageEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tMessageEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition">
+				<xsd:sequence>
+					<xsd:element name="operationRef" type="xsd:QName" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="messageRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="messageFlow" type="tMessageFlow"/>
+	<xsd:complexType name="tMessageFlow">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:attribute name="name" type="xsd:string" use="optional"/>
+				<xsd:attribute name="sourceRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="targetRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="messageRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="messageFlowAssociation" type="tMessageFlowAssociation"/>
+	<xsd:complexType name="tMessageFlowAssociation">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:attribute name="innerMessageFlowRef" type="xsd:QName" use="required"/>
+				<xsd:attribute name="outerMessageFlowRef" type="xsd:QName" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="monitoring" type="tMonitoring"/>
+	<xsd:complexType name="tMonitoring">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="multiInstanceLoopCharacteristics" type="tMultiInstanceLoopCharacteristics"  substitutionGroup="loopCharacteristics"/>
+	<xsd:complexType name="tMultiInstanceLoopCharacteristics">
+		<xsd:complexContent>
+			<xsd:extension base="tLoopCharacteristics">
+				<xsd:sequence>
+					<xsd:element name="loopCardinality" type="tExpression" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="loopDataInputRef" type="xsd:QName" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="loopDataOutputRef" type="xsd:QName" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="inputDataItem" type="tDataInput" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="outputDataItem" type="tDataOutput" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="complexBehaviorDefinition" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="completionCondition" type="tExpression" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="isSequential" type="xsd:boolean" default="false"/>
+				<xsd:attribute name="behavior" type="tMultiInstanceFlowCondition" default="All"/>
+				<xsd:attribute name="oneBehaviorEventRef" type="xsd:QName" use="optional"/>
+				<xsd:attribute name="noneBehaviorEventRef" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:simpleType name="tMultiInstanceFlowCondition">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="None"/>
+			<xsd:enumeration value="One"/>
+			<xsd:enumeration value="All"/>
+			<xsd:enumeration value="Complex"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	
+	<xsd:element name="operation" type="tOperation"/>
+	<xsd:complexType name="tOperation">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="inMessageRef" type="xsd:QName" minOccurs="1" maxOccurs="1"/>
+					<xsd:element name="outMessageRef" type="xsd:QName" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="errorRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="required"/>
+				<xsd:attribute name="implementationRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="outputSet" type="tOutputSet" />
+	<xsd:complexType name="tOutputSet">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="dataOutputRefs" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="optionalOutputRefs" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="whileExecutingOutputRefs" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="inputSetRefs" type="xsd:IDREF" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="parallelGateway" type="tParallelGateway" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tParallelGateway">
+		<xsd:complexContent>
+			<xsd:extension base="tGateway"/>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="participant" type="tParticipant"/>
+	<xsd:complexType name="tParticipant">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="interfaceRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="endPointRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="participantMultiplicity" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="processRef" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="participantAssociation" type="tParticipantAssociation"/>
+	<xsd:complexType name="tParticipantAssociation">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="innerParticipantRef" type="xsd:QName" minOccurs="1" maxOccurs="1"/>
+					<xsd:element name="outerParticipantRef" type="xsd:QName" minOccurs="1" maxOccurs="1"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="participantMultiplicity" type="tParticipantMultiplicity"/>
+	<xsd:complexType name="tParticipantMultiplicity">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:attribute name="minimum" type="xsd:int" default="0"/>
+				<xsd:attribute name="maximum" type="xsd:int" default="1"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="partnerEntity" type="tPartnerEntity" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tPartnerEntity">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="partnerRole" type="tPartnerRole" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tPartnerRole">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element name="participantRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="performer" type="tPerformer" substitutionGroup="resourceRole"/>
+	<xsd:complexType name="tPerformer">
+		<xsd:complexContent>
+			<xsd:extension base="tResourceRole"/>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="potentialOwner" type="tPotentialOwner" substitutionGroup="performer"/>
+	<xsd:complexType name="tPotentialOwner">
+		<xsd:complexContent>
+			<xsd:extension base="tHumanPerformer"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+    <xsd:element name="process" type="tProcess" substitutionGroup="rootElement"/>
+    <xsd:complexType name="tProcess">
+        <xsd:complexContent>
+            <xsd:extension base="tCallableElement">
+                <xsd:sequence>
+                    <xsd:element ref="auditing" minOccurs="0" maxOccurs="1"/>
+                    <xsd:element ref="monitoring" minOccurs="0" maxOccurs="1"/>
+                    <xsd:element ref="property" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element ref="laneSet" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element ref="resourceRole" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element ref="correlationSubscription" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element name="supports" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="processType" type="tProcessType" default="None"/>
+                <xsd:attribute name="isClosed" type="xsd:boolean" default="false"/>
+                <xsd:attribute name="isExecutable" type="xsd:boolean"/>
+                <xsd:attribute name="definitionalCollaborationRef" type="xsd:QName" use="optional"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+	<xsd:simpleType name="tProcessType">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="None"/>
+			<xsd:enumeration value="Public"/>
+			<xsd:enumeration value="Private"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:element name="property" type="tProperty" />
+	<xsd:complexType name="tProperty">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="dataState" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="itemSubjectRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="receiveTask" type="tReceiveTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tReceiveTask">
+		<xsd:complexContent>
+			<xsd:extension base="tTask">
+				<xsd:attribute name="implementation" type="tImplementation" default="##WebService"/>
+				<xsd:attribute name="instantiate" type="xsd:boolean" default="false"/>
+				<xsd:attribute name="messageRef" type="xsd:QName" use="optional"/>
+				<xsd:attribute name="operationRef" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="relationship" type="tRelationship"/>
+	<xsd:complexType name="tRelationship">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element name="source" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/>
+					<xsd:element name="target" type="xsd:QName" minOccurs="1" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="type" type="xsd:string" use="required"/>
+				<xsd:attribute name="direction" type="tRelationshipDirection"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:simpleType name="tRelationshipDirection">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="None"/>
+			<xsd:enumeration value="Forward"/>
+			<xsd:enumeration value="Backward"/>
+			<xsd:enumeration value="Both"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	
+	<xsd:element name="rendering" type="tRendering"/>
+	<xsd:complexType name="tRendering">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="resource" type="tResource" substitutionGroup="rootElement"/>
+	<xsd:complexType name="tResource">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:sequence>
+					<xsd:element ref="resourceParameter" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="name" type="xsd:string" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="resourceAssignmentExpression" type="tResourceAssignmentExpression"/>
+	<xsd:complexType name="tResourceAssignmentExpression">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="expression" minOccurs="1" maxOccurs="1"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="resourceParameter" type="tResourceParameter"/>
+	<xsd:complexType name="tResourceParameter">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="type" type="xsd:QName"/>
+				<xsd:attribute name="isRequired" type="xsd:boolean"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="resourceParameterBinding" type="tResourceParameterBinding"/>
+	<xsd:complexType name="tResourceParameterBinding">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement">
+				<xsd:sequence>
+					<xsd:element ref="expression" minOccurs="1" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="parameterRef" type="xsd:QName" use="required"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="resourceRole" type="tResourceRole"/>
+	<xsd:complexType name="tResourceRole"> 
+		<xsd:complexContent> 
+			<xsd:extension base="tBaseElement"> 
+				<xsd:choice> 
+					<xsd:sequence> 
+						<xsd:element name="resourceRef" type="xsd:QName"/> 
+						<xsd:element ref="resourceParameterBinding" minOccurs="0" maxOccurs="unbounded"/> 
+					</xsd:sequence> 
+					<xsd:element ref="resourceAssignmentExpression" minOccurs="0" maxOccurs="1"/> 
+				</xsd:choice>
+				<xsd:attribute name="name" type="xsd:string"/>
+			</xsd:extension> 
+		</xsd:complexContent> 
+	</xsd:complexType>
+
+	<xsd:element name="rootElement" type="tRootElement"/>
+	<xsd:complexType name="tRootElement" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tBaseElement"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="scriptTask" type="tScriptTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tScriptTask">
+		<xsd:complexContent>
+			<xsd:extension base="tTask">
+				<xsd:sequence>
+					<xsd:element ref="script" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="scriptFormat" type="xsd:string"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>		
+	
+	<xsd:element name="script" type="tScript"/>
+	<xsd:complexType name="tScript" mixed="true">
+		<xsd:sequence>
+			<xsd:any namespace="##any" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>	
+
+	<xsd:element name="sendTask" type="tSendTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tSendTask">
+		<xsd:complexContent>
+			<xsd:extension base="tTask">
+				<xsd:attribute name="implementation" type="tImplementation" default="##WebService"/>
+				<xsd:attribute name="messageRef" type="xsd:QName" use="optional"/>
+				<xsd:attribute name="operationRef" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="sequenceFlow" type="tSequenceFlow" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tSequenceFlow">
+		<xsd:complexContent>
+			<xsd:extension base="tFlowElement">
+				<xsd:sequence>
+					<xsd:element name="conditionExpression"  type="tExpression" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="sourceRef" type="xsd:IDREF" use="required"/>
+				<xsd:attribute name="targetRef" type="xsd:IDREF" use="required"/>
+				<xsd:attribute name="isImmediate" type="xsd:boolean" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="serviceTask" type="tServiceTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tServiceTask">
+		<xsd:complexContent>
+			<xsd:extension base="tTask">
+				<xsd:attribute name="implementation" type="tImplementation" default="##WebService"/>
+				<xsd:attribute name="operationRef" type="xsd:QName" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+	
+	<xsd:element name="signal" type="tSignal" substitutionGroup="rootElement"/>	
+	<xsd:complexType name="tSignal">
+		<xsd:complexContent>
+			<xsd:extension base="tRootElement">
+				<xsd:attribute name="name" type="xsd:string"/>
+				<xsd:attribute name="structureRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="signalEventDefinition" type="tSignalEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tSignalEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition">
+				<xsd:attribute name="signalRef" type="xsd:QName"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="standardLoopCharacteristics" type="tStandardLoopCharacteristics"  substitutionGroup="loopCharacteristics"/>
+	<xsd:complexType name="tStandardLoopCharacteristics">
+		<xsd:complexContent>
+			<xsd:extension base="tLoopCharacteristics">
+				<xsd:sequence>
+					<xsd:element name="loopCondition" type="tExpression" minOccurs="0"/>
+				</xsd:sequence>
+				<xsd:attribute name="testBefore" type="xsd:boolean" default="false"/>
+				<xsd:attribute name="loopMaximum" type="xsd:integer" use="optional"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>	
+
+	<xsd:element name="startEvent" type="tStartEvent" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tStartEvent">
+		<xsd:complexContent>
+			<xsd:extension base="tCatchEvent">
+				<xsd:attribute name="isInterrupting" type="xsd:boolean" default="true"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>			
+	
+	<xsd:element name="subChoreography" type="tSubChoreography" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tSubChoreography">
+		<xsd:complexContent>
+			<xsd:extension base="tChoreographyActivity">
+				<xsd:sequence>
+					<xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="subConversation" type="tSubConversation" substitutionGroup="conversationNode"/>
+	<xsd:complexType name="tSubConversation">
+		<xsd:complexContent>
+			<xsd:extension base="tConversationNode">
+				<xsd:sequence>
+					<xsd:element ref="conversationNode" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="subProcess" type="tSubProcess" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tSubProcess">
+		<xsd:complexContent>
+			<xsd:extension base="tActivity">
+				<xsd:sequence>
+					<xsd:element ref="laneSet" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="flowElement" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="artifact" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="triggeredByEvent" type="xsd:boolean" default="false"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="task" type="tTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tTask">
+		<xsd:complexContent>
+			<xsd:extension base="tActivity"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:element name="terminateEventDefinition" type="tTerminateEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tTerminateEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition"/>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="textAnnotation" type="tTextAnnotation" substitutionGroup="artifact"/>
+	<xsd:complexType name="tTextAnnotation">
+		<xsd:complexContent>
+			<xsd:extension base="tArtifact">
+				<xsd:sequence>
+					<xsd:element ref="text" minOccurs="0" maxOccurs="1"/>
+				</xsd:sequence>
+				<xsd:attribute name="textFormat" type="xsd:string" default="text/plain"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="text" type="tText"/>
+	<xsd:complexType name="tText" mixed="true">
+		<xsd:sequence>
+			<xsd:any namespace="##any" processContents="lax" minOccurs="0"/>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:element name="throwEvent" type="tThrowEvent"/>
+	<xsd:complexType name="tThrowEvent" abstract="true">
+		<xsd:complexContent>
+			<xsd:extension base="tEvent">
+				<xsd:sequence>
+					<xsd:element ref="dataInput" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="dataInputAssociation" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element ref="inputSet" minOccurs="0" maxOccurs="1"/>
+					<xsd:element ref="eventDefinition" minOccurs="0" maxOccurs="unbounded"/>
+					<xsd:element name="eventDefinitionRef" type="xsd:QName" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>			
+	
+	<xsd:element name="timerEventDefinition" type="tTimerEventDefinition" substitutionGroup="eventDefinition"/>
+	<xsd:complexType name="tTimerEventDefinition">
+		<xsd:complexContent>
+			<xsd:extension base="tEventDefinition">
+				<xsd:choice>
+					<xsd:element name="timeDate" type="tExpression" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="timeDuration" type="tExpression" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="timeCycle" type="tExpression" minOccurs="0" maxOccurs="1"/>
+				</xsd:choice>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+	<xsd:element name="transaction" type="tTransaction" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tTransaction">
+		<xsd:complexContent>
+			<xsd:extension base="tSubProcess">
+				<xsd:attribute name="method" type="tTransactionMethod" default="##Compensate"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+	
+	<xsd:simpleType name="tTransactionMethod">
+		<xsd:union memberTypes="xsd:anyURI">
+			<xsd:simpleType>
+				<xsd:restriction base="xsd:token">
+					<xsd:enumeration value="##Compensate" /> 
+					<xsd:enumeration value="##Image" />
+					<xsd:enumeration value="##Store" />
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:union>
+	</xsd:simpleType>
+
+	<xsd:element name="userTask" type="tUserTask" substitutionGroup="flowElement"/>
+	<xsd:complexType name="tUserTask">
+		<xsd:complexContent>
+			<xsd:extension base="tTask">
+				<xsd:sequence>
+					<xsd:element ref="rendering" minOccurs="0" maxOccurs="unbounded"/>
+				</xsd:sequence>
+				<xsd:attribute name="implementation" type="tImplementation" default="##unspecified"/>
+			</xsd:extension>
+		</xsd:complexContent>
+	</xsd:complexType>
+
+</xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SgmlDTD.dtd b/xml/tests/testData/xml/SgmlDTD.dtd
new file mode 100644
index 000000000000..fbe45bc6b94e
--- /dev/null
+++ b/xml/tests/testData/xml/SgmlDTD.dtd
@@ -0,0 +1,871 @@
+<!--
+    This is HTML 4.01 Strict DTD, which excludes the presentation
+    attributes and elements that W3C expects to phase out as
+    support for style sheets matures. Authors should use the Strict
+    DTD when possible, but may use the Transitional DTD when support
+    for presentation attribute and elements is required.
+
+    HTML 4 includes mechanisms for style sheets, scripting,
+    embedding objects, improved support for right to left and mixed
+    direction text, and enhancements to forms for improved
+    accessibility for people with disabilities.
+
+          Draft: $Date: 1999/12/24 23:37:49 $
+
+          Authors:
+              Dave Raggett <dsr@w3.org>
+              Arnaud Le Hors <lehors@w3.org>
+              Ian Jacobs <ij@w3.org>
+
+    Further information about HTML 4.01 is available at:
+
+        http://www.w3.org/TR/1999/REC-html401-19991224
+
+
+    The HTML 4.01 specification includes additional
+    syntactic constraints that cannot be expressed within
+    the DTDs.
+
+-->
+<!--
+    Typical usage:
+
+    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+            "http://www.w3.org/TR/html4/strict.dtd">
+    <html>
+    <head>
+    ...
+    </head>
+    <body>
+    ...
+    </body>
+    </html>
+
+    The URI used as a system identifier with the public identifier allows
+    the user agent to download the DTD and entity sets as needed.
+
+    The FPI for the Transitional HTML 4.01 DTD is:
+
+        "-//W3C//DTD HTML 4.01 Transitional//EN"
+
+    This version of the transitional DTD is:
+
+        http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd
+
+    If you are writing a document that includes frames, use
+    the following FPI:
+
+        "-//W3C//DTD HTML 4.01 Frameset//EN"
+
+    This version of the frameset DTD is:
+
+        http://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd
+
+    Use the following (relative) URIs to refer to
+    the DTDs and entity definitions of this specification:
+
+    "strict.dtd"
+    "loose.dtd"
+    "frameset.dtd"
+    "HTMLlat1.ent"
+    "HTMLsymbol.ent"
+    "HTMLspecial.ent"
+
+-->
+
+<!--================== Imported Names ====================================-->
+<!-- Feature Switch for frameset documents -->
+<!ENTITY % HTML.Frameset "IGNORE">
+
+<!ENTITY % ContentType "CDATA"
+    -- media type, as per [RFC2045]
+    -->
+
+<!ENTITY % ContentTypes "CDATA"
+    -- comma-separated list of media types, as per [RFC2045]
+    -->
+
+<!ENTITY % Charset "CDATA"
+    -- a character encoding, as per [RFC2045]
+    -->
+
+<!ENTITY % Charsets "CDATA"
+    -- a space-separated list of character encodings, as per [RFC2045]
+    -->
+
+<!ENTITY % LanguageCode "NAME"
+    -- a language code, as per [RFC1766]
+    -->
+
+<!ENTITY % Character "CDATA"
+    -- a single character from [ISO10646]
+    -->
+
+<!ENTITY % LinkTypes "CDATA"
+    -- space-separated list of link types
+    -->
+
+<!ENTITY % MediaDesc "CDATA"
+    -- single or comma-separated list of media descriptors
+    -->
+
+<!ENTITY % URI "CDATA"
+    -- a Uniform Resource Identifier,
+       see [URI]
+    -->
+
+<!ENTITY % Datetime "CDATA" -- date and time information. ISO date format -->
+
+
+<!ENTITY % Script "CDATA" -- script expression -->
+
+<!ENTITY % StyleSheet "CDATA" -- style sheet data -->
+
+
+
+<!ENTITY % Text "CDATA">
+
+
+<!-- Parameter Entities -->
+
+<!ENTITY % head.misc "SCRIPT|STYLE|META|LINK|OBJECT" -- repeatable head elements -->
+
+<!ENTITY % heading "H1|H2|H3|H4|H5|H6">
+
+<!ENTITY % list "UL | OL">
+
+<!ENTITY % preformatted "PRE">
+
+
+<!--================ Character mnemonic entities =========================-->
+
+<!ENTITY % HTMLlat1 PUBLIC
+   "-//W3C//ENTITIES Latin1//EN//HTML"
+   "<error descr="Cannot resolve file 'HTMLlat1.ent'">HTMLlat1.ent</error>">
+%HTMLlat1;
+
+<!ENTITY % HTMLsymbol PUBLIC
+   "-//W3C//ENTITIES Symbols//EN//HTML"
+   "<error descr="Cannot resolve file 'HTMLsymbol.ent'">HTMLsymbol.ent</error>">
+%HTMLsymbol;
+
+<!ENTITY % HTMLspecial PUBLIC
+   "-//W3C//ENTITIES Special//EN//HTML"
+   "<error descr="Cannot resolve file 'HTMLspecial.ent'">HTMLspecial.ent</error>">
+%HTMLspecial;
+<!--=================== Generic Attributes ===============================-->
+
+<!ENTITY % coreattrs
+ "id          ID             #IMPLIED  -- document-wide unique id --
+  class       CDATA          #IMPLIED  -- space-separated list of classes --
+  style       %StyleSheet;   #IMPLIED  -- associated style info --
+  title       %Text;         #IMPLIED  -- advisory title --"
+  >
+
+<!ENTITY % i18n
+ "lang        %LanguageCode; #IMPLIED  -- language code --
+  dir         (ltr|rtl)      #IMPLIED  -- direction for weak/neutral text --"
+  >
+
+<!ENTITY % events
+ "onclick     %Script;       #IMPLIED  -- a pointer button was clicked --
+  ondblclick  %Script;       #IMPLIED  -- a pointer button was double clicked--
+  onmousedown %Script;       #IMPLIED  -- a pointer button was pressed down --
+  onmouseup   %Script;       #IMPLIED  -- a pointer button was released --
+  onmouseover %Script;       #IMPLIED  -- a pointer was moved onto --
+  onmousemove %Script;       #IMPLIED  -- a pointer was moved within --
+  onmouseout  %Script;       #IMPLIED  -- a pointer was moved away --
+  onkeypress  %Script;       #IMPLIED  -- a key was pressed and released --
+  onkeydown   %Script;       #IMPLIED  -- a key was pressed down --
+  onkeyup     %Script;       #IMPLIED  -- a key was released --"
+  >
+
+<!-- Reserved Feature Switch -->
+<!ENTITY % HTML.Reserved "IGNORE">
+
+<!-- The following attributes are reserved for possible future use -->
+<![ %HTML.Reserved; [
+<!ENTITY % reserved
+ "datasrc     %URI;          #IMPLIED  -- a single or tabular Data Source --
+  datafld     CDATA          #IMPLIED  -- the property or column name --
+  dataformatas (plaintext|html) plaintext -- text or html --"
+  >
+]]>
+
+<!ENTITY % reserved "">
+
+<!ENTITY % attrs "%coreattrs; %i18n; %events;">
+
+
+<!--=================== Text Markup ======================================-->
+
+<!ENTITY % fontstyle
+ "TT | I | B | BIG | SMALL">
+
+<!ENTITY % phrase "EM | STRONG | DFN | CODE |
+                   SAMP | KBD | VAR | CITE | ABBR | ACRONYM" >
+
+<!ENTITY % special
+   "A | IMG | OBJECT | BR | SCRIPT | MAP | Q | SUB | SUP | SPAN | BDO">
+
+<!ENTITY % formctrl "INPUT | SELECT | TEXTAREA | LABEL | BUTTON">
+
+<!-- %inline; covers inline or "text-level" elements -->
+<!ENTITY % inline "#PCDATA | %fontstyle; | %phrase; | %special; | %formctrl;">
+
+<!ELEMENT (%fontstyle;|%phrase;) - - (%inline;)*>
+<!ATTLIST (%fontstyle;|%phrase;)
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!ELEMENT (SUB|SUP) - - (%inline;)*    -- subscript, superscript -->
+<!ATTLIST (SUB|SUP)
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!ELEMENT SPAN - - (%inline;)*         -- generic language/style container -->
+<!ATTLIST SPAN
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  %reserved;                   -- reserved for possible future use --
+  >
+
+<!ELEMENT BDO - - (%inline;)*          -- I18N BiDi over-ride -->
+<!ATTLIST BDO
+  %coreattrs;                          -- id, class, style, title --
+  lang        %LanguageCode; #IMPLIED  -- language code --
+  dir         (ltr|rtl)      #REQUIRED -- directionality --
+  >
+
+
+<!ELEMENT BR - O EMPTY                 -- forced line break -->
+<!ATTLIST BR
+  %coreattrs;                          -- id, class, style, title --
+  >
+
+<!--================== HTML content models ===============================-->
+
+<!--
+    HTML has two basic content models:
+
+        %inline;     character level elements and text strings
+        %block;      block-like elements e.g. paragraphs and lists
+-->
+
+<!ENTITY % block
+     "P | %heading; | %list; | %preformatted; | DL | DIV | NOSCRIPT |
+      BLOCKQUOTE | FORM | HR | TABLE | FIELDSET | ADDRESS">
+
+<!ENTITY % flow "%block; | %inline;">
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT BODY O O (%block;|SCRIPT)+ +(<error descr="Unresolved Dtd Element Reference INS">INS</error>|<error descr="Unresolved Dtd Element Reference DEL">DEL</error>) -- document body -->
+<!ATTLIST BODY
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  onload          %Script;   #IMPLIED  -- the document has been loaded --
+  onunload        %Script;   #IMPLIED  -- the document has been removed --
+  >
+
+<!ELEMENT ADDRESS - - (%inline;)* -- information on author -->
+<!ATTLIST ADDRESS
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!ELEMENT DIV - - (%flow;)*            -- generic language/style container -->
+<!ATTLIST DIV
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  %reserved;                           -- reserved for possible future use --
+  >
+
+
+<!--================== The Anchor Element ================================-->
+
+<!ENTITY % Shape "(rect|circle|poly|default)">
+<!ENTITY % Coords "CDATA" -- comma-separated list of lengths -->
+
+<!ELEMENT A - - (%inline;)* -(A)       -- anchor -->
+<!ATTLIST A
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
+  type        %ContentType;  #IMPLIED  -- advisory content type --
+  name        CDATA          #IMPLIED  -- named link end --
+  href        %URI;          #IMPLIED  -- URI for linked resource --
+  hreflang    %LanguageCode; #IMPLIED  -- language code --
+  rel         %LinkTypes;    #IMPLIED  -- forward link types --
+  rev         %LinkTypes;    #IMPLIED  -- reverse link types --
+  accesskey   %Character;    #IMPLIED  -- accessibility key character --
+  shape       %Shape;        rect      -- for use with client-side image maps --
+  coords      %Coords;       #IMPLIED  -- for use with client-side image maps --
+  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+  onfocus     %Script;       #IMPLIED  -- the element got the focus --
+  onblur      %Script;       #IMPLIED  -- the element lost the focus --
+  >
+
+<!--================== Client-side image maps ============================-->
+
+<!-- These can be placed in the same document or grouped in a
+     separate document although this isn't yet widely supported -->
+
+<!ELEMENT MAP - - ((%block;) | AREA)+ -- client-side image map -->
+<!ATTLIST MAP
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  name        CDATA          #REQUIRED -- for reference by usemap --
+  >
+
+<!ELEMENT AREA - O EMPTY               -- client-side image map area -->
+<!ATTLIST AREA
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  shape       %Shape;        rect      -- controls interpretation of coords --
+  coords      %Coords;       #IMPLIED  -- comma-separated list of lengths --
+  href        %URI;          #IMPLIED  -- URI for linked resource --
+  nohref      (nohref)       #IMPLIED  -- this region has no action --
+  alt         %Text;         #REQUIRED -- short description --
+  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+  accesskey   %Character;    #IMPLIED  -- accessibility key character --
+  onfocus     %Script;       #IMPLIED  -- the element got the focus --
+  onblur      %Script;       #IMPLIED  -- the element lost the focus --
+  >
+
+<!--================== The LINK Element ==================================-->
+
+<!--
+  Relationship values can be used in principle:
+
+   a) for document specific toolbars/menus when used
+      with the LINK element in document head e.g.
+        start, contents, previous, next, index, end, help
+   b) to link to a separate style sheet (rel=stylesheet)
+   c) to make a link to a script (rel=script)
+   d) by stylesheets to control how collections of
+      html nodes are rendered into printed documents
+   e) to make a link to a printable version of this document
+      e.g. a postscript or pdf version (rel=alternate media=print)
+-->
+
+<!ELEMENT LINK - O EMPTY               -- a media-independent link -->
+<!ATTLIST LINK
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
+  href        %URI;          #IMPLIED  -- URI for linked resource --
+  hreflang    %LanguageCode; #IMPLIED  -- language code --
+  type        %ContentType;  #IMPLIED  -- advisory content type --
+  rel         %LinkTypes;    #IMPLIED  -- forward link types --
+  rev         %LinkTypes;    #IMPLIED  -- reverse link types --
+  media       %MediaDesc;    #IMPLIED  -- for rendering on these media --
+  >
+
+<!--=================== Images ===========================================-->
+
+<!-- Length defined in strict DTD for cellpadding/cellspacing -->
+<!ENTITY % Length "CDATA" -- nn for pixels or nn% for percentage length -->
+<!ENTITY % MultiLength "CDATA" -- pixel, percentage, or relative -->
+
+<![ %HTML.Frameset; [
+<!ENTITY % MultiLengths "CDATA" -- comma-separated list of MultiLength -->
+]]>
+
+<!ENTITY % Pixels "CDATA" -- integer representing length in pixels -->
+
+
+<!-- To avoid problems with text-only UAs as well as
+   to make image content understandable and navigable
+   to users of non-visual UAs, you need to provide
+   a description with ALT, and avoid server-side image maps -->
+<!ELEMENT IMG - O EMPTY                -- Embedded image -->
+<!ATTLIST IMG
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  src         %URI;          #REQUIRED -- URI of image to embed --
+  alt         %Text;         #REQUIRED -- short description --
+  longdesc    %URI;          #IMPLIED  -- link to long description
+                                          (complements alt) --
+  name        CDATA          #IMPLIED  -- name of image for scripting --
+  height      %Length;       #IMPLIED  -- override height --
+  width       %Length;       #IMPLIED  -- override width --
+  usemap      %URI;          #IMPLIED  -- use client-side image map --
+  ismap       (ismap)        #IMPLIED  -- use server-side image map --
+  >
+
+<!-- USEMAP points to a MAP element which may be in this document
+  or an external document, although the latter is not widely supported -->
+
+<!--==================== OBJECT ======================================-->
+<!--
+  OBJECT is used to embed objects as part of HTML pages
+  PARAM elements should precede other content. SGML mixed content
+  model technicality precludes specifying this formally ...
+-->
+
+<!ELEMENT OBJECT - - (PARAM | %flow;)*
+ -- generic embedded object -->
+<!ATTLIST OBJECT
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  declare     (declare)      #IMPLIED  -- declare but don't instantiate flag --
+  classid     %URI;          #IMPLIED  -- identifies an implementation --
+  codebase    %URI;          #IMPLIED  -- base URI for classid, data, archive--
+  data        %URI;          #IMPLIED  -- reference to object's data --
+  type        %ContentType;  #IMPLIED  -- content type for data --
+  codetype    %ContentType;  #IMPLIED  -- content type for code --
+  archive     CDATA          #IMPLIED  -- space-separated list of URIs --
+  standby     %Text;         #IMPLIED  -- message to show while loading --
+  height      %Length;       #IMPLIED  -- override height --
+  width       %Length;       #IMPLIED  -- override width --
+  usemap      %URI;          #IMPLIED  -- use client-side image map --
+  name        CDATA          #IMPLIED  -- submit as part of form --
+  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+  %reserved;                           -- reserved for possible future use --
+  >
+
+<!ELEMENT PARAM - O EMPTY              -- named property value -->
+<!ATTLIST PARAM
+  id          ID             #IMPLIED  -- document-wide unique id --
+  name        CDATA          #REQUIRED -- property name --
+  value       CDATA          #IMPLIED  -- property value --
+  valuetype   (DATA|REF|OBJECT) DATA   -- How to interpret value --
+  type        %ContentType;  #IMPLIED  -- content type for value
+                                          when valuetype=ref --
+  >
+
+
+<!--=================== Horizontal Rule ==================================-->
+
+<!ELEMENT HR - O EMPTY -- horizontal rule -->
+<!ATTLIST HR
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT P - O (%inline;)*            -- paragraph -->
+<!ATTLIST P
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!--=================== Headings =========================================-->
+
+<!--
+  There are six levels of headings from H1 (the most important)
+  to H6 (the least important).
+-->
+
+<!ELEMENT (%heading;)  - - (%inline;)* -- heading -->
+<!ATTLIST (%heading;)
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- excludes markup for images and changes in font size -->
+<!ENTITY % pre.exclusion "IMG|OBJECT|BIG|SMALL|SUB|SUP">
+
+<!ELEMENT PRE - - (%inline;)* -(%pre.exclusion;) -- preformatted text -->
+<!ATTLIST PRE
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!--===================== Inline Quotes ==================================-->
+
+<!ELEMENT Q - - (%inline;)*            -- short inline quotation -->
+<!ATTLIST Q
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  cite        %URI;          #IMPLIED  -- URI for source document or msg --
+  >
+
+<!--=================== Block-like Quotes ================================-->
+
+<!ELEMENT BLOCKQUOTE - - (%block;|SCRIPT)+ -- long quotation -->
+<!ATTLIST BLOCKQUOTE
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  cite        %URI;          #IMPLIED  -- URI for source document or msg --
+  >
+
+<!--=================== Inserted/Deleted Text ============================-->
+
+
+<!-- INS/DEL are handled by inclusion on BODY -->
+<!ELEMENT (INS|DEL) - - (%flow;)*      -- inserted text, deleted text -->
+<!ATTLIST (INS|DEL)
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  cite        %URI;          #IMPLIED  -- info on reason for change --
+  datetime    %Datetime;     #IMPLIED  -- date and time of change --
+  >
+
+<!--=================== Lists ============================================-->
+
+<!-- definition lists - DT for term, DD for its definition -->
+
+<!ELEMENT DL - - (DT|DD)+              -- definition list -->
+<!ATTLIST DL
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!ELEMENT DT - O (%inline;)*           -- definition term -->
+<!ELEMENT DD - O (%flow;)*             -- definition description -->
+<!ATTLIST (DT|DD)
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+
+<!ELEMENT OL - - (LI)+                 -- ordered list -->
+<!ATTLIST OL
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!-- Unordered Lists (UL) bullet styles -->
+<!ELEMENT UL - - (LI)+                 -- unordered list -->
+<!ATTLIST UL
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+
+
+<!ELEMENT LI - O (%flow;)*             -- list item -->
+<!ATTLIST LI
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!--================ Forms ===============================================-->
+<!ELEMENT FORM - - (%block;|SCRIPT)+ -(FORM) -- interactive form -->
+<!ATTLIST FORM
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  action      %URI;          #REQUIRED -- server-side form handler --
+  method      (GET|POST)     GET       -- HTTP method used to submit the form--
+  enctype     %ContentType;  "application/x-www-form-urlencoded"
+  accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
+  name        CDATA          #IMPLIED  -- name of form for scripting --
+  onsubmit    %Script;       #IMPLIED  -- the form was submitted --
+  onreset     %Script;       #IMPLIED  -- the form was reset --
+  accept-charset %Charsets;  #IMPLIED  -- list of supported charsets --
+  >
+
+<!-- Each label must not contain more than ONE field -->
+<!ELEMENT LABEL - - (%inline;)* -(LABEL) -- form field label text -->
+<!ATTLIST LABEL
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  for         IDREF          #IMPLIED  -- matches field ID value --
+  accesskey   %Character;    #IMPLIED  -- accessibility key character --
+  onfocus     %Script;       #IMPLIED  -- the element got the focus --
+  onblur      %Script;       #IMPLIED  -- the element lost the focus --
+  >
+
+<!ENTITY % InputType
+  "(TEXT | PASSWORD | CHECKBOX |
+    RADIO | SUBMIT | RESET |
+    FILE | HIDDEN | IMAGE | BUTTON)"
+   >
+
+<!-- attribute name required for all but submit and reset -->
+<!ELEMENT INPUT - O EMPTY              -- form control -->
+<!ATTLIST INPUT
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  type        %InputType;    TEXT      -- what kind of widget is needed --
+  name        CDATA          #IMPLIED  -- submit as part of form --
+  value       CDATA          #IMPLIED  -- Specify for radio buttons and checkboxes --
+  checked     (checked)      #IMPLIED  -- for radio buttons and check boxes --
+  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
+  readonly    (readonly)     #IMPLIED  -- for text and passwd --
+  size        CDATA          #IMPLIED  -- specific to each type of field --
+  maxlength   NUMBER         #IMPLIED  -- max chars for text fields --
+  src         %URI;          #IMPLIED  -- for fields with images --
+  alt         CDATA          #IMPLIED  -- short description --
+  usemap      %URI;          #IMPLIED  -- use client-side image map --
+  ismap       (ismap)        #IMPLIED  -- use server-side image map --
+  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+  accesskey   %Character;    #IMPLIED  -- accessibility key character --
+  onfocus     %Script;       #IMPLIED  -- the element got the focus --
+  onblur      %Script;       #IMPLIED  -- the element lost the focus --
+  onselect    %Script;       #IMPLIED  -- some text was selected --
+  onchange    %Script;       #IMPLIED  -- the element value was changed --
+  accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
+  %reserved;                           -- reserved for possible future use --
+  >
+
+<!ELEMENT SELECT - - (OPTGROUP|OPTION)+ -- option selector -->
+<!ATTLIST SELECT
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  name        CDATA          #IMPLIED  -- field name --
+  size        NUMBER         #IMPLIED  -- rows visible --
+  multiple    (multiple)     #IMPLIED  -- default is single selection --
+  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
+  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+  onfocus     %Script;       #IMPLIED  -- the element got the focus --
+  onblur      %Script;       #IMPLIED  -- the element lost the focus --
+  onchange    %Script;       #IMPLIED  -- the element value was changed --
+  %reserved;                           -- reserved for possible future use --
+  >
+
+<!ELEMENT OPTGROUP - - (OPTION)+ -- option group -->
+<!ATTLIST OPTGROUP
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
+  label       %Text;         #REQUIRED -- for use in hierarchical menus --
+  >
+
+<!ELEMENT OPTION - O (#PCDATA)         -- selectable choice -->
+<!ATTLIST OPTION
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  selected    (selected)     #IMPLIED
+  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
+  label       %Text;         #IMPLIED  -- for use in hierarchical menus --
+  value       CDATA          #IMPLIED  -- defaults to element content --
+  >
+
+<!ELEMENT TEXTAREA - - (#PCDATA)       -- multi-line text field -->
+<!ATTLIST TEXTAREA
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  name        CDATA          #IMPLIED
+  rows        NUMBER         #REQUIRED
+  cols        NUMBER         #REQUIRED
+  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
+  readonly    (readonly)     #IMPLIED
+  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+  accesskey   %Character;    #IMPLIED  -- accessibility key character --
+  onfocus     %Script;       #IMPLIED  -- the element got the focus --
+  onblur      %Script;       #IMPLIED  -- the element lost the focus --
+  onselect    %Script;       #IMPLIED  -- some text was selected --
+  onchange    %Script;       #IMPLIED  -- the element value was changed --
+  %reserved;                           -- reserved for possible future use --
+  >
+
+<!--
+  #PCDATA is to solve the mixed content problem,
+  per specification only whitespace is allowed there!
+ -->
+<!ELEMENT FIELDSET - - (#PCDATA,LEGEND,(%flow;)*) -- form control group -->
+<!ATTLIST FIELDSET
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!ELEMENT LEGEND - - (%inline;)*       -- fieldset legend -->
+
+<!ATTLIST LEGEND
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  accesskey   %Character;    #IMPLIED  -- accessibility key character --
+  >
+
+<!ELEMENT BUTTON - -
+     (%flow;)* -(A|%formctrl;|FORM|FIELDSET)
+     -- push button -->
+<!ATTLIST BUTTON
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  name        CDATA          #IMPLIED
+  value       CDATA          #IMPLIED  -- sent to server when submitted --
+  type        (button|submit|reset) submit -- for use as form button --
+  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
+  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
+  accesskey   %Character;    #IMPLIED  -- accessibility key character --
+  onfocus     %Script;       #IMPLIED  -- the element got the focus --
+  onblur      %Script;       #IMPLIED  -- the element lost the focus --
+  %reserved;                           -- reserved for possible future use --
+  >
+
+<!--======================= Tables =======================================-->
+
+<!-- IETF HTML table standard, see [RFC1942] -->
+
+<!--
+ The BORDER attribute sets the thickness of the frame around the
+ table. The default units are screen pixels.
+
+ The FRAME attribute specifies which parts of the frame around
+ the table should be rendered. The values are not the same as
+ CALS to avoid a name clash with the VALIGN attribute.
+
+ The value "border" is included for backwards compatibility with
+ <TABLE BORDER> which yields frame=border and border=implied
+ For <TABLE BORDER=1> you get border=1 and frame=implied. In this
+ case, it is appropriate to treat this as frame=border for backwards
+ compatibility with deployed browsers.
+-->
+<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
+
+<!--
+ The RULES attribute defines which rules to draw between cells:
+
+ If RULES is absent then assume:
+     "none" if BORDER is absent or BORDER=0 otherwise "all"
+-->
+
+<!ENTITY % TRules "(none | groups | rows | cols | all)">
+
+<!-- horizontal placement of table relative to document -->
+<!ENTITY % TAlign "(left|center|right)">
+
+<!-- horizontal alignment attributes for cell contents -->
+<!ENTITY % cellhalign
+  "align      (left|center|right|justify|char) #IMPLIED
+   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    %Length;       #IMPLIED  -- offset for alignment char --"
+  >
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign
+  "valign     (top|middle|bottom|baseline) #IMPLIED"
+  >
+
+<!ELEMENT TABLE - -
+     (CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+)>
+<!ELEMENT CAPTION  - - (%inline;)*     -- table caption -->
+<!ELEMENT THEAD    - O (TR)+           -- table header -->
+<!ELEMENT TFOOT    - O (TR)+           -- table footer -->
+<!ELEMENT TBODY    O O (TR)+           -- table body -->
+<!ELEMENT COLGROUP - O (COL)*          -- table column group -->
+<!ELEMENT COL      - O EMPTY           -- table column -->
+<!ELEMENT TR       - O (<error descr="Unresolved Dtd Element Reference TH">TH</error>|<error descr="Unresolved Dtd Element Reference TD">TD</error>)+        -- table row -->
+<!ELEMENT (TH|TD)  - O (%flow;)*       -- table header cell, table data cell-->
+
+<!ATTLIST TABLE                        -- table element --
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  summary     %Text;         #IMPLIED  -- purpose/structure for speech output--
+  width       %Length;       #IMPLIED  -- table width --
+  border      %Pixels;       #IMPLIED  -- controls frame width around table --
+  frame       %TFrame;       #IMPLIED  -- which parts of frame to render --
+  rules       %TRules;       #IMPLIED  -- rulings between rows and cols --
+  cellspacing %Length;       #IMPLIED  -- spacing between cells --
+  cellpadding %Length;       #IMPLIED  -- spacing within cells --
+  %reserved;                           -- reserved for possible future use --
+  datapagesize CDATA         #IMPLIED  -- reserved for possible future use --
+  >
+
+
+<!ATTLIST CAPTION
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!--
+COLGROUP groups a set of COL elements. It allows you to group
+several semantically related columns together.
+-->
+<!ATTLIST COLGROUP
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  span        NUMBER         1         -- default number of columns in group --
+  width       %MultiLength;  #IMPLIED  -- default width for enclosed COLs --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
+  >
+
+<!--
+ COL elements define the alignment properties for cells in
+ one or more columns.
+
+ The WIDTH attribute specifies the width of the columns, e.g.
+
+     width=64        width in screen pixels
+     width=0.5*      relative width of 0.5
+
+ The SPAN attribute causes the attributes of one
+ COL element to apply to more than one column.
+-->
+<!ATTLIST COL                          -- column groups and properties --
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  span        NUMBER         1         -- COL attributes affect N columns --
+  width       %MultiLength;  #IMPLIED  -- column width specification --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
+  >
+
+<!--
+    Use THEAD to duplicate headers when breaking table
+    across page boundaries, or for static headers when
+    TBODY sections are rendered in scrolling panel.
+
+    Use TFOOT to duplicate footers when breaking table
+    across page boundaries, or for static footers when
+    TBODY sections are rendered in scrolling panel.
+
+    Use multiple TBODY sections when rules are needed
+    between groups of table rows.
+-->
+<!ATTLIST (THEAD|TBODY|TFOOT)          -- table section --
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
+  >
+
+<!ATTLIST TR                           -- table row --
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
+  >
+
+
+
+<!-- Scope is simpler than headers attribute for common tables -->
+<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
+
+<!-- TH is for headers, TD for data, but for cells acting as both use TD -->
+<!ATTLIST (TH|TD)                      -- header or data cell --
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  abbr        %Text;         #IMPLIED  -- abbreviation for header cell --
+  axis        CDATA          #IMPLIED  -- comma-separated list of related headers--
+  headers     IDREFS         #IMPLIED  -- list of id's for header cells --
+  scope       %Scope;        #IMPLIED  -- scope covered by header cells --
+  rowspan     NUMBER         1         -- number of rows spanned by cell --
+  colspan     NUMBER         1         -- number of cols spanned by cell --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
+  >
+
+
+<!--================ Document Head =======================================-->
+<!-- %head.misc; defined earlier on as "SCRIPT|STYLE|META|LINK|OBJECT" -->
+<!ENTITY % head.content "TITLE & BASE?">
+
+<!ELEMENT HEAD O O (%head.content;) +(%head.misc;) -- document head -->
+<!ATTLIST HEAD
+  %i18n;                               -- lang, dir --
+  profile     %URI;          #IMPLIED  -- named dictionary of meta info --
+  >
+
+<!-- The TITLE element is not considered part of the flow of text.
+       It should be displayed, for example as the page header or
+       window title. Exactly one title is required per document.
+    -->
+<!ELEMENT TITLE - - (#PCDATA) -(%head.misc;) -- document title -->
+<!ATTLIST TITLE %i18n>
+
+
+<!ELEMENT BASE - O EMPTY               -- document base URI -->
+<!ATTLIST BASE
+  href        %URI;          #REQUIRED -- URI that acts as base URI --
+  >
+
+<!ELEMENT META - O EMPTY               -- generic metainformation -->
+<!ATTLIST META
+  %i18n;                               -- lang, dir, for use with content --
+  http-equiv  NAME           #IMPLIED  -- HTTP response header name  --
+  name        NAME           #IMPLIED  -- metainformation name --
+  content     CDATA          #REQUIRED -- associated information --
+  scheme      CDATA          #IMPLIED  -- select form of content --
+  >
+
+<!ELEMENT STYLE - - %StyleSheet;        -- style info -->
+<!ATTLIST STYLE
+  %i18n;                               -- lang, dir, for use with title --
+  type        %ContentType;  #REQUIRED -- content type of style language --
+  media       %MediaDesc;    #IMPLIED  -- designed for use with these media --
+  title       %Text;         #IMPLIED  -- advisory title --
+  >
+
+<!ELEMENT SCRIPT - - %Script;          -- script statements -->
+<!ATTLIST SCRIPT
+  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
+  type        %ContentType;  #REQUIRED -- content type of script language --
+  src         %URI;          #IMPLIED  -- URI for an external script --
+  defer       (defer)        #IMPLIED  -- UA may defer execution of script --
+  event       CDATA          #IMPLIED  -- reserved for possible future use --
+  for         %URI;          #IMPLIED  -- reserved for possible future use --
+  >
+
+<!ELEMENT NOSCRIPT - - (%block;)+
+  -- alternate content container for non script-based rendering -->
+<!ATTLIST NOSCRIPT
+  %attrs;                              -- %coreattrs, %i18n, %events --
+  >
+
+<!--================ Document Structure ==================================-->
+<!ENTITY % html.content "HEAD, BODY">
+
+<!ELEMENT HTML O O (%html.content;)    -- document root element -->
+<!ATTLIST HTML
+  %i18n;                               -- lang, dir --
+  >
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix.xml b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix.xml
new file mode 100644
index 000000000000..914c11d91f62
--- /dev/null
+++ b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="<error>http://java.sun.<caret>com/xml/ns/j2ee</error>"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix2.xml b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix2.xml
new file mode 100644
index 000000000000..4d315d4ed5b3
--- /dev/null
+++ b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix2.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:q="<error>aaa</error>" xsi:schemaLocation="<error>aaa</error> aaa" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="<error>http://java.sun.<caret>com/xml/ns/j2ee</error>"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix2_after.xml b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix2_after.xml
new file mode 100644
index 000000000000..d148dabdd660
--- /dev/null
+++ b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix2_after.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:q="aaa" xsi:schemaLocation="aaa aaa
+http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix3.xml b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix3.xml
new file mode 100644
index 000000000000..e1de2c6cda84
--- /dev/null
+++ b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix3.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xxx xmlns="<error>a<caret>aa</error>"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix3_after.xml b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix3_after.xml
new file mode 100644
index 000000000000..669c8b2f8973
--- /dev/null
+++ b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix3_after.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xxx xmlns="aaa" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="aaa <caret>"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix_after.xml b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix_after.xml
new file mode 100644
index 000000000000..66c517712815
--- /dev/null
+++ b/xml/tests/testData/xml/SpecifyXsiSchemaLocationQuickFix_after.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/StackOverflow.xml b/xml/tests/testData/xml/StackOverflow.xml
new file mode 100644
index 000000000000..39800e78c825
--- /dev/null
+++ b/xml/tests/testData/xml/StackOverflow.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<grammar xmlns="http://relaxng.org/ns/structure/fake/1.0">
+
+</grammar>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/StackOverflow2.xsd b/xml/tests/testData/xml/StackOverflow2.xsd
new file mode 100644
index 000000000000..6bc2fa0ce9be
--- /dev/null
+++ b/xml/tests/testData/xml/StackOverflow2.xsd
@@ -0,0 +1,4 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:redefine schemaLocation="urn:aaa" xsi:schemaLocation="" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+<xs:element name="book" type="xs:string"/>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/Tapestry_3_0.dtd b/xml/tests/testData/xml/Tapestry_3_0.dtd
new file mode 100644
index 000000000000..d08bf36f6b79
--- /dev/null
+++ b/xml/tests/testData/xml/Tapestry_3_0.dtd
@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: Tapestry_3_0.dtd,v 1.1 2004/12/30 16:18:31 Maxim.Mossienko Exp $ -->
+<!--
+
+The DTD for Tapestry application, library, page and component specifications.
+Associated with the public identifier:
+
+	-//Apache Software Foundation//Tapestry Specification 3.0//EN
+
+The canonical location for the DTD is:
+
+	http://jakarta.apache.org/tapestry/dtd/Tapestry_3_0.dtd
+
+For application specifications, the root element is application.
+
+For component specifications, the root element is component-specification.
+
+For page specifications, the root element is page-specification.
+
+For library specifiations, the root element is library-specification.
+
+This DTD is backwards compatible with the 1.3 DTD, with the following exceptions:
+- <field-binding> has been removed
+- attribute class of <component-specification> and <page-specification is now optional
+- attributes name and engine-class of <application> are now optional
+- added value attribute to <static-binding>
+- added value attribute to <property>
+- renamed <component-alias> to <component-type>
+- rename <set-string-property> to <set-message-property>
+- added <listener-binding> element
+- added <property-specification> element
+- renamed java-type to type inside <parameter>
+- allow values to be specified as attributes or wrapped character data in many elements
+- allow only a single <description> per element
+-->
+<!-- =======================================================
+Entity: attribute-flag
+
+For entity attributes that take a boolean value, defines 'yes' and 'no'.
+The default varies, so isn't included here.
+-->
+<!ENTITY % attribute-flag "(yes|no)">
+<!-- =======================================================
+Entity: static-value-type
+
+For entity attributes that take a string but convert it to a real
+type.  Defaults to String.
+
+-->
+<!ENTITY % static-value-type "(boolean|int|long|double|String) 'String'">
+<!ENTITY % library-content "(description?, property*, (page|component-type|service|library|extension)*)">
+<!-- =======================================================
+Element: application
+Root element
+
+Defines a Tapestry application.
+
+Attributes:
+  name: A textual name used to uniquely identify the application.
+  engine-class:  The Java class to instantiate as the application engine.
+-->
+<!ELEMENT application %library-content;>
+<!ATTLIST application
+	name CDATA #IMPLIED
+	engine-class CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: bean
+Appears in: component-specification, page-specification
+
+Defines a JavaBean that will be used in some way by the component.  Beans
+are accessible via the components' beans property (which contains a property
+for each bean).  Beans are created as needed, and are discarded based on
+the lifecycle attribute.  Beans are typically used to extend the
+implementation of a component via aggregation.
+
+Attributes:
+  name: the name of the bean
+  class: the Java class to instantiate
+  lifecycle: when the reference to the bean should be discard
+  	"none" no lifecycle, the bean is created and returned, but not stored
+  	"request" the bean is retained until the end of the request cycle
+  	"page" the bean is retained for the lifespan of the page
+  	"render" the bean is retained until the end of the current page render
+
+Nothing prevents a bean for storing state; however, such state will
+not be associated with any particular session (unlike persistant page
+properties).  Further, because of page pooling, subsequent requests
+from the same client may be serviced by different instances of a page and
+(therefore) different bean instances.
+
+Beans that have the "request" lifecycle may be stored into a pool
+for later re-use (in the same or different page).
+
+The bean may have its properties set.  Properties are set on both
+newly instantiated beans, and beans that are retrieved from a pool.
+
+-->
+<!ELEMENT bean (description?, property*, (set-property | set-message-property)*)>
+<!ATTLIST bean
+	name CDATA #REQUIRED
+	class CDATA #REQUIRED
+	lifecycle (none | request | page | render) "request"
+>
+<!-- =======================================================
+Element: binding
+Appears in: component
+
+Binds a parameter of the component to a OGNL expression, relative
+to its container.  The expression may be provided as an attribute, or
+as the body of the element.  The latter case is useful when the
+expression is long, or uses problematic characters (such as a
+mix of single and double quotes).
+
+Attributes:
+  name: The name of the component parameter to bind.
+  expression: The OGNL expression.
+-->
+<!ELEMENT binding (#PCDATA)>
+<!ATTLIST binding
+	name CDATA #REQUIRED
+	expression CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: configure
+Appears in: extension
+
+Configures one JavaBean property of an extension.
+
+Attributes:
+  property-name:  The name of the property to configure.
+  type: Conversion of property value.
+  value: The value to be converted and applied.  If not
+    specified, the element's character data is
+    used.
+
+-->
+<!ELEMENT configure (#PCDATA)>
+<!ATTLIST configure
+	property-name CDATA #REQUIRED
+	type %static-value-type;
+	value CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: component
+Contained by: component-specification, page-specification
+
+Defines a component contained by the component being specified.
+
+Attribute:
+  id: A unique identifier for the component within the container.
+  type: The type of component, either a well known logical name, or the complete path
+    to the component's specification.
+  copy-of: The id of a previously defined component; this component will be a copy
+    of the other component.
+
+The Tapestry page loader ensures that either type or copy-of is specified, but not both.
+-->
+<!ELEMENT component (property*, (binding | inherited-binding | listener-binding | static-binding | message-binding)*)>
+<!ATTLIST component
+	id ID #REQUIRED
+	type CDATA #IMPLIED
+	copy-of IDREF #IMPLIED
+	inherit-informal-parameters %attribute-flag; "no"
+>
+<!-- =======================================================
+Element: component-type
+Contained by: application
+
+Establishes a short logic name for a particular component that is used
+within the application.
+
+Attributes:
+  type: The logical name for the component.
+  specification-path:  The complete path to the component's specification.
+-->
+<!ELEMENT component-type EMPTY>
+<!ATTLIST component-type
+	type CDATA #REQUIRED
+	specification-path CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: component-specification
+Root element
+
+A component specification.  It's attributes define the Java class to
+instantiate, whether the component may wrap other elements, and whether
+informal (undeclared) parameters are allowed.  Very similar to a page-specification,
+except that component-specification allows for parameters (formal and informal).
+
+Attributes:
+  class: The Java class to instantiate for the component.
+  allow-body:  If yes (the default), the component may wrap other elements (have a body).
+  allow-informal-parameters:  If yes (the default), informal parameters (parameters that are not
+    explictily defined) are allowed.
+-->
+<!ELEMENT component-specification (description?, parameter*, reserved-parameter*, property*, (bean | component | external-asset | context-asset | private-asset | property-specification)*)>
+<!ATTLIST component-specification
+	class CDATA #IMPLIED
+	allow-body %attribute-flag; "yes"
+	allow-informal-parameters %attribute-flag; "yes"
+>
+<!-- =======================================================
+Element: context-asset
+Contained by: component-specification, page-specification
+
+An asset located in the same web application context as the running
+application.
+
+Attributes:
+  name: The name of the asset.
+  path: The path, relative to the web application context, of the resource.
+-->
+<!ELEMENT context-asset (property*)>
+<!ATTLIST context-asset
+	name CDATA #REQUIRED
+	path CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: description
+Appears in: many
+
+Several elements may contain descriptions; these descriptions are
+optional.  The eventual goal is to provide help in some form of IDE.
+Currently, descriptions are optional and ignored.
+
+-->
+<!ELEMENT description (#PCDATA)>
+<!-- =======================================================
+Element: extension
+Contained by: application, library-specification
+
+Defines an extension, an object that is instantiated and configured
+(like a helper bean) and is then accessible, by name, from the
+containing library (or application).
+
+Attributes:
+  name: Name of the extension.
+  class: Java class to instantiate.
+  immediate: If true, the extension is instantiated early instead of as-needed.
+
+-->
+<!ELEMENT extension (property*, configure*)>
+<!ATTLIST extension
+	name CDATA #REQUIRED
+	class CDATA #REQUIRED
+	immediate %attribute-flag; "no"
+>
+<!-- =======================================================
+Element: external-asset
+Contained by: component-specification, page-specification
+
+Defines an asset at some external source.
+
+Attributes:
+  name: The name of the asset.
+  URL: The URL used to reference the asset.
+-->
+<!ELEMENT external-asset (property*)>
+<!ATTLIST external-asset
+	name CDATA #REQUIRED
+	URL CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: inherited-binding
+Appears in: component
+
+Binds a parameter of the component to a parameter of the container.
+
+Attributes:
+  name: The name of the component parameter to bind.
+  parameter-name: The name of the container parameter to bind the
+    component parameter to.
+-->
+<!ELEMENT inherited-binding EMPTY>
+<!ATTLIST inherited-binding
+	name CDATA #REQUIRED
+	parameter-name CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: library
+Appears in: application-specification, library-specification
+
+Defines a library used in the construction of the container
+(either another library, or the application itself).
+
+Attributes:
+  id: An identifier used to reference pages and components
+    provided by the library.
+  specification-path: The path to the resource that provides
+    the library specification.
+-->
+<!ELEMENT library EMPTY>
+<!ATTLIST library
+	id CDATA #REQUIRED
+	specification-path CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: library-specification
+Root element
+
+Defines a library that may be used in the construction
+of an application (or another library).  An application can
+be thought of as a specialized kind of library.
+
+-->
+<!ELEMENT library-specification %library-content;>
+<!-- =======================================================
+Element: page
+Contained by: application, library-specification
+
+Defines a single page within the application.  Each application will contain
+at least one of these, to define the Home page.
+
+Attributes:
+  name: A unique name for the application.
+  specification-path:  The resource classpath of the component specification
+    for the page.
+-->
+<!ELEMENT page EMPTY>
+<!ATTLIST page
+	name CDATA #REQUIRED
+	specification-path CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: listener-binding
+Appears in: component
+
+Defines an in-place script using the scripting language
+supported by Bean Scripting Framework (http://jakarta.apache.org/bsf).
+The script itself is the element's character data (often, inside
+a CDATA block).
+
+The default language is jython, though this can be overridden.
+
+Attributes:
+  name: The name of the component parameter to bind.
+  language: The language the script is written in.
+-->
+<!ELEMENT listener-binding (#PCDATA)>
+<!ATTLIST listener-binding
+	name CDATA #REQUIRED
+	language CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: page-specification
+Root element
+
+A page specification.  It's attributes define the Java class to
+instantiate.  Pages are like components, except they always allow
+a body, and never allow parameters (formal or otherwise).
+
+Attributes:
+  class: The Java class to instantiate for the component.
+-->
+<!ELEMENT page-specification (description?, property*, (bean | component | external-asset | context-asset | private-asset | property-specification)*)>
+<!ATTLIST page-specification
+	class CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: parameter
+Contained by: component-specification
+
+Defines a formal parameter for the component.
+
+Attributes:
+  name: A unique name for the parameter.
+  type: The name of a Java class or primitive type expected by the parameter.
+  required: If yes, then the parameter must be bound.  If no (the default),
+    then the parameter is optional.
+  property-name: The name to use, instead of the parameter name, for the
+    JavaBean property connected to this parameter.
+  direction: The normal flow of data through the component
+  			(in, form, custom, auto).
+  default-value: Specifies the default value for the parameter,
+  				if the parameter is not bound.
+-->
+<!ELEMENT parameter (description?)>
+<!ATTLIST parameter
+	name CDATA #REQUIRED
+	type CDATA #IMPLIED
+	required %attribute-flag; "no"
+	property-name CDATA #IMPLIED
+	default-value CDATA #IMPLIED
+	direction (in | form | custom | auto) "custom"
+>
+<!-- =======================================================
+Element: private-asset
+Contained by: component-specification, page-specification
+
+An asset available within the Java classpath (i.e., bundled inside a JAR or WAR).
+
+Attributes:
+  name: The name of the asset.
+  resource-path: The complete pathname of the resource.
+-->
+<!ELEMENT private-asset (property*)>
+<!ATTLIST private-asset
+	name CDATA #REQUIRED
+	resource-path CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: property
+Contained by: (many other elements)
+
+Defines a key/value pair associated with the application or component specification.  Properties
+are used to capture information that doesn't fit into the DTD.  The value for the property is
+the PCDATA wrapped by the property tag (which is trimmed of leading and trailing whitespace).
+
+This should not be confused with several other tags which are used to set JavaBeans properties
+of various objects.  The <property> tag exists to allow meta-data to be stored in the specification.
+
+Attributes:
+  name: The name of the property to set.
+  value: If specified, is the value of the property, otherwise, the PCDATA is used.
+
+-->
+<!ELEMENT property (#PCDATA)>
+<!ATTLIST property
+	name CDATA #REQUIRED
+	value CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: property-specification
+Appears in: page-specification, component-specification
+
+Identifies a transient or persistent property.
+
+Attributes:
+  name: The name of the property.
+  type: The type of the value, either the name of a scalar type,
+    or the fully qualified name of a class.  If omitted,
+    java.lang.Object is used.
+  persistent: If "yes", the value will be made persistant.  Default
+    is "no".
+  initial-value:  If provided, this is an OGNL expression used
+    to initialize the property.  If not specified, the
+    body of the element is used as the initial value.
+
+-->
+<!ELEMENT property-specification (#PCDATA)>
+<!ATTLIST property-specification
+	name CDATA #REQUIRED
+	type CDATA #IMPLIED
+	persistent %attribute-flag; "no"
+	initial-value CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: reserved-parameter
+Appears in: component-specification
+
+Identifies a name which may not be used as an informal parameter.
+Informal parameters are typically HTML attribute names; this
+list identifies HTML attributes that are written exclusively
+by the component and may not be affected by informal parameters.
+
+Attributes:
+  name: The parameter name to reserve.
+-->
+<!ELEMENT reserved-parameter EMPTY>
+<!ATTLIST reserved-parameter
+	name CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: service
+Appears in: application
+
+Defines an engine service.  You may override the default
+set of engine services or provide completely new services.
+
+Attributes:
+  name: The name of the service.
+  class: The Java class to instantiate for the service.
+
+-->
+<!ELEMENT service EMPTY>
+<!ATTLIST service
+	name CDATA #REQUIRED
+	class CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: set-property
+Appears in: bean
+
+Used to initialize a property of a helper bean.  An OGNL expression
+is provided as the expression attribute, or as wrapped
+character data.
+
+Attributes:
+  name: The name of the property to be set.
+  expression: The OGNL expression that provides a value.
+-->
+<!ELEMENT set-property (#PCDATA)>
+<!ATTLIST set-property
+	name CDATA #REQUIRED
+	expression CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: set-message-property
+Appears in: bean
+
+A localized string.
+
+Attributes:
+  key:  Sets a property of a string from a localized string.
+
+-->
+<!ELEMENT set-message-property EMPTY>
+<!ATTLIST set-message-property
+	name CDATA #REQUIRED
+	key CDATA #REQUIRED
+>
+<!-- =======================================================
+Element: static-binding
+Appears in: component
+
+Binds a parameter of the component to a static value defined directly
+within this specification. The value either the value ttribute, or
+the PCDATA wrapped by the element (with leading and trailing whitespace removed).
+
+Attributes:
+  name: The name of the component parameter to bind.
+  value: The value of the binding.  If not specied, the PCDATA wrapped
+    by the element is the binding.
+-->
+<!ELEMENT static-binding (#PCDATA)>
+<!ATTLIST static-binding
+	name CDATA #REQUIRED
+	value CDATA #IMPLIED
+>
+<!-- =======================================================
+Element: message-binding
+Appears in: component
+
+Binds a parameter of the component to a localized message of
+its container.
+
+Attributes:
+  name: The name of the component parameter to bind.
+  key: The key used to access a localized string.
+
+-->
+<!ELEMENT message-binding EMPTY>
+<!ATTLIST message-binding
+	name CDATA #REQUIRED
+	key CDATA #REQUIRED
+>
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting.xml b/xml/tests/testData/xml/UnboundNsHighlighting.xml
new file mode 100644
index 000000000000..41b129b00159
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting.xml
@@ -0,0 +1,6 @@
+<<error>a</error>:b>
+  <<error>a</error>:c/>
+  <xml:a></xml:a>
+  <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"/>
+  <jsp:root xmlns:jsp="<error></error>" version="2.0"/>
+</<error>a</error>:b>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting2.xml b/xml/tests/testData/xml/UnboundNsHighlighting2.xml
new file mode 100644
index 000000000000..1ca02e1cbb82
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting2.xml
@@ -0,0 +1 @@
+<<error>xs<caret>d</error>:schema/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting2_after.xml b/xml/tests/testData/xml/UnboundNsHighlighting2_after.xml
new file mode 100644
index 000000000000..54a7be16449e
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting2_after.xml
@@ -0,0 +1 @@
+<xs<caret>d:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting3.xml b/xml/tests/testData/xml/UnboundNsHighlighting3.xml
new file mode 100644
index 000000000000..a89134c768c4
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting3.xml
@@ -0,0 +1 @@
+<html <error>x<caret>xx</error>:something="blubb" />
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting3_after.xml b/xml/tests/testData/xml/UnboundNsHighlighting3_after.xml
new file mode 100644
index 000000000000..7f3c2d7b8025
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting3_after.xml
@@ -0,0 +1 @@
+<html xxx:something="blubb" xmlns:xxx="<caret><selection>someuri</selection>"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting4.dtd b/xml/tests/testData/xml/UnboundNsHighlighting4.dtd
new file mode 100644
index 000000000000..4f35c2f8f8a8
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting4.dtd
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!-- Authors: Chris Taylor, Ceki Gulcu. -->
+
+<!-- A configuration element consists of optional renderer
+elements,appender elements, categories and an optional root
+element. -->
+
+<!ELEMENT log4j:configuration (renderer*, appender*,category*,root?)>
+
+<!-- The disable attribute takes a priority value such that all -->
+<!-- logging statements with a prioroty equal or below this value are -->
+<!-- disabled. -->
+
+<!-- The disableOverride attribute allows the user to override any   -->
+<!-- BasicConfigurator.disable invocations made from within the      -->
+<!-- application.                                                    -->
+
+<!-- By default, disableOverride is "null", meaning that we          -->
+<!-- do not touch the disable flag.                                  -->
+
+<!-- Setting the "debug" or "configDebug" attributes enable the printing -->
+<!-- of internal log4j logging statements.                               -->
+<!-- The "debug" and "configDebug" attributes are equivalent altough     -->
+<!-- the latter is deprecated and should no longer be used.              -->
+<!-- By default, debug and configDebug attributes are "null", meaning    -->
+<!-- that we not touch internal log4j logging settings.                  -->
+
+
+<!ATTLIST log4j:configuration
+  xmlns:log4j              CDATA #FIXED "http://jakarta.apache.org/log4j/"
+  disable                  (debug|info|warn|error|fatal|null)  "null"
+  disableOverride          (true|false|null)  "null"
+  debug                    (true|false|null)  "null"
+  configDebug              (true|false|null)  "null"
+>
+
+
+<!-- DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED -->
+<!-- WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING   -->
+<!-- DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED -->
+
+<!-- Use "log4j:configuration" above instead of the "configuration" -->
+<!-- element. -->
+
+<!-- DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED -->
+<!-- WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING   -->
+<!-- DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED DEPRECATED -->
+
+<!ELEMENT configuration (renderer*, appender*,category*,root?)>
+<!ATTLIST configuration
+  disable                  (debug|info|warn|error|fatal|null)  "null"
+  disableOverride          (true|false|null)  "null"
+  configDebug              (true|false|null)  "null"
+>
+
+
+<!-- renderer elements allow the user to customize the conversion of  -->
+<!-- message objects to String.                                       -->
+
+<!ELEMENT renderer EMPTY>
+<!ATTLIST renderer
+  renderedClass  CDATA #REQUIRED
+  renderingClass CDATA #REQUIRED
+>
+
+<!-- Appenders must have a name and a class. -->
+<!-- Appenders may contain an error handler, a layout, optional parameters -->
+<!-- and filters. They may also reference (or include) other appenders. -->
+<!ELEMENT appender (errorHandler?, param*, layout?, filter*, appender-ref*)>
+<!ATTLIST appender
+  name 		ID 	#REQUIRED
+  class 	CDATA	#REQUIRED
+>
+
+<!ELEMENT layout (param*)>
+<!ATTLIST layout
+  class		CDATA	#REQUIRED
+>
+
+
+
+<!ELEMENT filter (param*)>
+<!ATTLIST filter
+  class		CDATA	#REQUIRED
+>
+
+
+<!-- ErrorHandlers can be of any class. They can admit any number of -->
+<!-- parameters. -->
+
+<!ELEMENT errorHandler (param*)>
+<!ATTLIST errorHandler
+   class        CDATA   #REQUIRED
+>
+
+
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+  name		CDATA   #REQUIRED
+  value		CDATA	#REQUIRED
+>
+
+<!-- The priority class is org.apache.log4j.Priority by default -->
+<!ELEMENT priority (param*)>
+<!ATTLIST priority
+  class   CDATA	#IMPLIED
+  value	  CDATA #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of the named category. -->
+<!ELEMENT category (param*, priority?, appender-ref*)>
+<!ATTLIST category
+  class         CDATA   #IMPLIED
+  name		CDATA	#REQUIRED
+  additivity	(true|false) "true"
+>
+
+<!ELEMENT appender-ref EMPTY>
+<!ATTLIST appender-ref
+  ref IDREF #REQUIRED
+>
+
+<!-- If no priority element is specified, then the configurator MUST not -->
+<!-- touch the priority of root. -->
+<!-- The root category always exists and cannot be subclassed. -->
+<!ELEMENT root (param*, priority?, appender-ref*)>
+
+
+
+<!-- ==================================================================== -->
+<!--                       A logging event                                -->
+<!-- ==================================================================== -->
+<!ELEMENT log4j:eventSet (log4j:event*)>
+<!ATTLIST log4j:eventSet
+  includesLocationInfo   (true|false) "true"
+>
+
+
+
+<!ELEMENT log4j:event (log4j:message, log4j:NDC?, log4j:throwable?,
+                       log4j:locationInfo?) >
+
+<!-- The timestamp format is application dependent. -->
+<!ATTLIST log4j:event
+    category   CDATA #REQUIRED
+    priority   CDATA #REQUIRED
+    thread     CDATA #REQUIRED
+    timestamp  CDATA #REQUIRED
+>
+
+<!ELEMENT log4j:message (#PCDATA)>
+<!ELEMENT log4j:NDC (#PCDATA)>
+
+<!ELEMENT log4j:throwable (#PCDATA)>
+
+<!ELEMENT log4j:locationInfo EMPTY>
+<!ATTLIST log4j:locationInfo
+  class  CDATA	#REQUIRED
+  method CDATA	#REQUIRED
+  file   CDATA	#REQUIRED
+  line   CDATA	#REQUIRED
+>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting4.xml b/xml/tests/testData/xml/UnboundNsHighlighting4.xml
new file mode 100644
index 000000000000..c14e8f8c4e7a
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting4.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='ISO-8859-1' ?>
+<!DOCTYPE log4j:configuration SYSTEM "file:./UnboundNsHighlighting4.dtd">
+
+<log4j:configuration>
+  <appender name="CONSOLE-WARN" class="org.apache.log4j.ConsoleAppender">
+    <param name="target" value="System.err"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="[%7r] %6p - %30.30c - %m \n"/>
+    </layout>
+    <filter class="org.apache.log4j.varia.LevelRangeFilter">
+      <param name="LevelMin" value="WARN"/>
+    </filter>
+  </appender>
+
+  <root>
+    <priority value="INFO"/>
+    <appender-ref ref="CONSOLE-WARN"/>
+  </root>
+</log4j:configuration>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting5.xml b/xml/tests/testData/xml/UnboundNsHighlighting5.xml
new file mode 100644
index 000000000000..12f636e1b23c
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting5.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='ISO-8859-1' ?>
+<<error>x</error>:web-app version="2.4"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting5_after.xml b/xml/tests/testData/xml/UnboundNsHighlighting5_after.xml
new file mode 100644
index 000000000000..3352b3584e99
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting5_after.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='ISO-8859-1' ?>
+<x:web-app version="2.4" xmlns:x="http://java.sun.com/xml/ns/j2ee"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting6.xml b/xml/tests/testData/xml/UnboundNsHighlighting6.xml
new file mode 100644
index 000000000000..2d2f7a4bf43b
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting6.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='ISO-8859-1' ?>
+<<info>web-app</info> version="2.4"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnboundNsHighlighting6_after.xml b/xml/tests/testData/xml/UnboundNsHighlighting6_after.xml
new file mode 100644
index 000000000000..4b8a1ca33744
--- /dev/null
+++ b/xml/tests/testData/xml/UnboundNsHighlighting6_after.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='ISO-8859-1' ?>
+<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"/>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnqualifiedAttributePsi.xml b/xml/tests/testData/xml/UnqualifiedAttributePsi.xml
new file mode 100644
index 000000000000..38e842cf3064
--- /dev/null
+++ b/xml/tests/testData/xml/UnqualifiedAttributePsi.xml
@@ -0,0 +1,3 @@
+<x xmlns='<error>foo</error>' a='bar' xmlns:z='<error>foo2</error>' z:b='bar'>
+  <z2:x xmlns='<error>foo3</error>' a2='bar' xmlns:z2='<error>foo4</error>' z2:b2='bar2'/>
+</x>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferences.dtd b/xml/tests/testData/xml/UnresolvedDtdElementReferences.dtd
new file mode 100644
index 000000000000..cc9443a8cc85
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferences.dtd
@@ -0,0 +1,2 @@
+<!ELEMENT name (<error>aaa</error>)>
+<!ELEMENT name2 (&<error>entity</error>;)>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml.xml
new file mode 100644
index 000000000000..140bd0f7ec5a
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE name [
+  <!ELEMENT name (<error>aaa</error>)>
+  <!ELEMENT name2 (%<error>entity</error>;)>
+]>
+<name></name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2.xml
new file mode 100644
index 000000000000..a26e9368a76e
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2.xml
@@ -0,0 +1 @@
+<name>&<error>entity</error>;</name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_2.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_2.xml
new file mode 100644
index 000000000000..cf0334c2bc76
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_2.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<name>&<error>entity</error>;</name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_2_after.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_2_after.xml
new file mode 100644
index 000000000000..9a20e10ea1b9
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_2_after.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE name [
+<!ENTITY entity <caret>>
+]>
+<name>&entity;</name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_after.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_after.xml
new file mode 100644
index 000000000000..5031383acb64
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml2_after.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE name [
+<!ENTITY entity <caret>>
+]>
+<name>&entity;</name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml3.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml3.xml
new file mode 100644
index 000000000000..661fa5f1ccab
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml3.xml
@@ -0,0 +1,2 @@
+<!DOCTYPE name SYSTEM "<error>aaa</error>">
+<name>&<error>entity</error>;</name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml3_after.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml3_after.xml
new file mode 100644
index 000000000000..190d62b47a91
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml3_after.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE name SYSTEM "aaa" [
+<!ENTITY entity <caret>>
+]>
+<name>&entity;</name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml_after.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml_after.xml
new file mode 100644
index 000000000000..db6e29794e4a
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml_after.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE name [
+  <!ELEMENT aaa <caret>>
+  <!ELEMENT name (aaa)>
+  <!ELEMENT name2 (%entity;)>
+]>
+<name></name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml_after2.xml b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml_after2.xml
new file mode 100644
index 000000000000..8748a689a523
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferencesInXml_after2.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE name [
+  <!ELEMENT aaa >
+  <!ELEMENT name (aaa)>
+  <!ENTITY % entity <caret>>
+  <!ELEMENT name2 (%entity;)>
+]>
+<name></name>
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferences_after.dtd b/xml/tests/testData/xml/UnresolvedDtdElementReferences_after.dtd
new file mode 100644
index 000000000000..073c8ffccd03
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferences_after.dtd
@@ -0,0 +1,3 @@
+<!ELEMENT aaa <caret>>
+<!ELEMENT name (aaa)>
+<!ELEMENT name2 (&entity;)>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnresolvedDtdElementReferences_after2.dtd b/xml/tests/testData/xml/UnresolvedDtdElementReferences_after2.dtd
new file mode 100644
index 000000000000..3d2a25a294b6
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdElementReferences_after2.dtd
@@ -0,0 +1,4 @@
+<!ELEMENT aaa >
+<!ELEMENT name (aaa)>
+<!ENTITY entity <caret>>
+<!ELEMENT name2 (&entity;)>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnresolvedDtdEntityReference.dtd b/xml/tests/testData/xml/UnresolvedDtdEntityReference.dtd
new file mode 100644
index 000000000000..09a77fd7a2cc
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdEntityReference.dtd
@@ -0,0 +1 @@
+%<error>entity</error>;
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnresolvedDtdEntityReference_after.dtd b/xml/tests/testData/xml/UnresolvedDtdEntityReference_after.dtd
new file mode 100644
index 000000000000..b15d3fab12d5
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedDtdEntityReference_after.dtd
@@ -0,0 +1,2 @@
+<!ENTITY % entity <caret>>
+%entity;
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UnresolvedSymbolForForAttribute.xml b/xml/tests/testData/xml/UnresolvedSymbolForForAttribute.xml
new file mode 100644
index 000000000000..e37ad3f8847d
--- /dev/null
+++ b/xml/tests/testData/xml/UnresolvedSymbolForForAttribute.xml
@@ -0,0 +1 @@
+<x:foo for="abc" xmlns:x="<error>foo</error>" />
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UsingDtdReference.dtd b/xml/tests/testData/xml/UsingDtdReference.dtd
new file mode 100644
index 000000000000..cda7865afb8b
--- /dev/null
+++ b/xml/tests/testData/xml/UsingDtdReference.dtd
@@ -0,0 +1,2 @@
+<!ENTITY % test2 SYSTEM "UsingDtdReference2.dtd">
+%test2;
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UsingDtdReference.xml b/xml/tests/testData/xml/UsingDtdReference.xml
new file mode 100644
index 000000000000..c5e2d2a28161
--- /dev/null
+++ b/xml/tests/testData/xml/UsingDtdReference.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE root [
+ <!ENTITY % testDTD SYSTEM "UsingDtdReference.dtd">
+        %testDTD;
+]>
+<root>
+  <entry>blah</entry>
+</root>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UsingDtdReference2.dtd b/xml/tests/testData/xml/UsingDtdReference2.dtd
new file mode 100644
index 000000000000..464de8ee0851
--- /dev/null
+++ b/xml/tests/testData/xml/UsingDtdReference2.dtd
@@ -0,0 +1,3 @@
+<!ELEMENT root (entry+)>
+
+<!ELEMENT entry (#PCDATA)>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/UsingSchemaDtd.xsd b/xml/tests/testData/xml/UsingSchemaDtd.xsd
new file mode 100644
index 000000000000..6a8854c031b4
--- /dev/null
+++ b/xml/tests/testData/xml/UsingSchemaDtd.xsd
@@ -0,0 +1,318 @@
+<?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/xml/ValidationOfDtdFile.dtd b/xml/tests/testData/xml/ValidationOfDtdFile.dtd
new file mode 100644
index 000000000000..4c8525c87070
--- /dev/null
+++ b/xml/tests/testData/xml/ValidationOfDtdFile.dtd
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!ELEMENT idea-plugin EMPTY>
+<!ATTLIST idea-plugin
+    url CDATA #IMPLIED>
diff --git a/xml/tests/testData/xml/WebApp.xml b/xml/tests/testData/xml/WebApp.xml
new file mode 100644
index 000000000000..2982ee10fdfc
--- /dev/null
+++ b/xml/tests/testData/xml/WebApp.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN' 'http://java.sun.com/dtd/ejb-jar_2_0.dtd'>
+<ejb-jar>
+  <<error>enterprise-beans</error>>
+  </<error>enterprise-beans</error>>
+</ejb-jar>
diff --git a/xml/tests/testData/xml/WrongRegExpInSchema.xsd b/xml/tests/testData/xml/WrongRegExpInSchema.xsd
new file mode 100644
index 000000000000..d458eff2bd7d
--- /dev/null
+++ b/xml/tests/testData/xml/WrongRegExpInSchema.xsd
@@ -0,0 +1,13 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:simpleType name="TestType">
+<xs:restriction base="xs:string">
+<xs:pattern value="<error>[0-9]+-([0-9]+|*)</error>"/>
+</xs:restriction>
+</xs:simpleType>
+<xs:simpleType name="TestType2">
+  <xs:restriction base="xs:string">
+  <xs:pattern value="[0-9]+-([0-9]+|.*)"/>
+  </xs:restriction>
+</xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/WrongRegExpInSchema2.xsd b/xml/tests/testData/xml/WrongRegExpInSchema2.xsd
new file mode 100644
index 000000000000..1e149efb3b2c
--- /dev/null
+++ b/xml/tests/testData/xml/WrongRegExpInSchema2.xsd
@@ -0,0 +1,17 @@
+<schema xmlns="http://www.w3.org/2001/XMLSchema">
+  <simpleType name="element-names">
+      <list>
+        <simpleType>
+          <union memberTypes="QName">
+            <simpleType>
+              <restriction base="string">
+                <pattern value="\*"/>
+                <pattern value="\i\l\c*:\*"/>
+                <pattern value="\\l\\c*:\*"/>
+              </restriction>
+            </simpleType>
+          </union>
+        </simpleType>
+      </list>
+    </simpleType>
+</schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/WsdlValidation.wsdl b/xml/tests/testData/xml/WsdlValidation.wsdl
new file mode 100644
index 000000000000..f9edec661adf
--- /dev/null
+++ b/xml/tests/testData/xml/WsdlValidation.wsdl
@@ -0,0 +1,353 @@
+<?xml version="1.0" ?>
+
+<definitions targetNamespace="urn:PegaRULES:SOAP:Ticketing:V20100113"
+	xmlns:tns="urn:PegaRULES:SOAP:Ticketing:V20100113"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+	xmlns:ns1="urn:Ticketing-Data-Service-CreateTicketRequest:pyXMLPage"
+	xmlns:ns2="urn:Ticketing-Data-Service-CreateTicketResponse:pyXMLPage"
+	xmlns:ns3="urn:Ticketing-Data-Service-RetrieveTicketRequest:pyXMLPage"
+	xmlns:ns4="urn:Ticketing-Data-Service-RetrieveTicketResponse:pyXMLPage"
+	xmlns:ns5="urn:Ticketing-Data-Service-searchTicketRequest:pyXMLPage"
+	xmlns:ns6="urn:Ticketing-Data-Service-searchTicketResponse:pyXMLPage"
+	xmlns:ns7="urn:Ticketing-Data-Service-ApplicationData:pyDefault"
+	xmlns:ns8="urn:Ticketing-Data-Service-TicketingData:pyDefault"
+	xmlns:ns9="urn:Ticketing-Data-Service-TicketingException:pyDefault"
+	xmlns:ns10="urn:Ticketing-Data-Service-Contact:pyDefault"
+	xmlns:ns11="urn:Ticketing-Data-Service-TicketSubject:pyDefault"
+	xmlns:ns12="urn:Ticketing-Data-Service-TicketSummary:pyDefault"
+	xmlns:ns13="urn:Ticketing-Data-Service-AppDataElement:pyDefault"
+	xmlns:ns14="urn:Ticketing-Data-Service-AppDataTable:pyDefault"
+	xmlns:ns15="urn:Ticketing-Data-Service-AppDataRow:pyDefault"
+	xmlns="http://schemas.xmlsoap.org/wsdl/">
+
+	<types>
+		<schema targetNamespace="urn:Ticketing-Data-Service-CreateTicketRequest:pyXMLPage"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-ApplicationData:pyDefault"/>
+			<import namespace="urn:Ticketing-Data-Service-TicketingData:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="appData" minOccurs="0" type="ns7:pagedata"/>
+					<element name="ticketingData" minOccurs="0" type="ns8:pagedata"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-CreateTicketResponse:pyXMLPage"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-TicketingException:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="caseId" minOccurs="0" type="xsd:string"/>
+					<element name="errorResponse" minOccurs="0" maxOccurs="unbounded" type="ns9:pagedata"/>
+					<element name="ticketId" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-RetrieveTicketRequest:pyXMLPage"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<complexType name="pagedata">
+				<sequence>
+					<element name="ticketId" minOccurs="0" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-RetrieveTicketResponse:pyXMLPage"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-ApplicationData:pyDefault"/>
+			<import namespace="urn:Ticketing-Data-Service-TicketingException:pyDefault"/>
+			<import namespace="urn:Ticketing-Data-Service-TicketingData:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="appData" minOccurs="0" type="ns7:pagedata"/>
+					<element name="errorResponse" minOccurs="0" maxOccurs="unbounded" type="ns9:pagedata"/>
+					<element name="status" minOccurs="0" type="xsd:string"/>
+					<element name="statusDateTime" minOccurs="0" type="xsd:dateTime"/>
+					<element name="ticketId" minOccurs="0" type="xsd:string"/>
+					<element name="ticketingData" minOccurs="0" type="ns8:pagedata"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-searchTicketRequest:pyXMLPage"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-Contact:pyDefault"/>
+			<import namespace="urn:Ticketing-Data-Service-TicketSubject:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="businessDomain" minOccurs="0" type="xsd:string"/>
+					<element name="creator" minOccurs="0" type="ns10:pagedata"/>
+					<element name="requestor" minOccurs="0" type="ns10:pagedata"/>
+					<element name="ticketSubject" minOccurs="0" type="ns11:pagedata"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-searchTicketResponse:pyXMLPage"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-TicketingException:pyDefault"/>
+			<import namespace="urn:Ticketing-Data-Service-TicketSummary:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="errorResponse" minOccurs="0" maxOccurs="unbounded" type="ns9:pagedata"/>
+					<element name="summary" minOccurs="0" maxOccurs="unbounded" type="ns12:pagedata"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-ApplicationData:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-AppDataElement:pyDefault"/>
+			<import namespace="urn:Ticketing-Data-Service-AppDataTable:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="dataElement" minOccurs="0" maxOccurs="unbounded" type="ns13:pagedata"/>
+					<element name="tableElement" minOccurs="0" maxOccurs="unbounded" type="ns14:pagedata"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-TicketingData:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-Contact:pyDefault"/>
+			<import namespace="urn:Ticketing-Data-Service-TicketSubject:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="businessDomain" minOccurs="0" type="xsd:string"/>
+					<element name="comment" minOccurs="0" type="xsd:string"/>
+					<element name="creator" minOccurs="0" type="ns10:pagedata"/>
+					<element name="event" minOccurs="0" type="xsd:string"/>
+					<element name="eventSubType" minOccurs="0" type="xsd:string"/>
+					<element name="longDescription" minOccurs="0" type="xsd:string"/>
+					<element name="referenceTag" minOccurs="0" type="xsd:string"/>
+					<element name="requestor" minOccurs="0" type="ns10:pagedata"/>
+					<element name="shortDescription" minOccurs="0" type="xsd:string"/>
+					<element name="templateName" minOccurs="0" type="xsd:string"/>
+					<element name="ticketPriority" minOccurs="0" type="xsd:string"/>
+					<element name="ticketSubject" minOccurs="0" type="ns11:pagedata"/>
+					<element name="ticketType" minOccurs="0" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-TicketingException:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<complexType name="pagedata">
+				<sequence>
+					<element name="code" minOccurs="0" type="xsd:string"/>
+					<element name="message" minOccurs="0" type="xsd:string"/>
+					<element name="severity" minOccurs="0" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-Contact:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<complexType name="pagedata">
+				<sequence>
+					<element name="alternatePhone" minOccurs="0" type="xsd:string"/>
+					<element name="contactId" minOccurs="0" type="xsd:string"/>
+					<element name="contactName" minOccurs="0" type="xsd:string"/>
+					<element name="contactType" minOccurs="0" type="xsd:string"/>
+					<element name="eMail" minOccurs="0" type="xsd:string"/>
+					<element name="phoneContactPreferred" minOccurs="0" type="xsd:boolean"/>
+					<element name="primaryPhone" minOccurs="0" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-TicketSubject:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<complexType name="pagedata">
+				<sequence>
+					<element name="accountId" minOccurs="0" type="xsd:string"/>
+					<element name="clientId" minOccurs="0" type="xsd:string"/>
+					<element name="domainKey" minOccurs="0" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-TicketSummary:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-Contact:pyDefault"/>
+			<import namespace="urn:Ticketing-Data-Service-TicketSubject:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="businessDomain" minOccurs="0" type="xsd:string"/>
+					<element name="creator" minOccurs="0" type="ns10:pagedata"/>
+					<element name="requestor" minOccurs="0" type="ns10:pagedata"/>
+					<element name="shortDescription" minOccurs="0" type="xsd:string"/>
+					<element name="ticketId" minOccurs="0" type="xsd:string"/>
+					<element name="ticketSubject" minOccurs="0" type="ns11:pagedata"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-AppDataElement:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<complexType name="pagedata">
+				<sequence>
+					<element name="Value" minOccurs="0" type="xsd:string"/>
+					<element name="label" minOccurs="0" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-AppDataTable:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-AppDataRow:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="dataRow" minOccurs="0" maxOccurs="unbounded" type="ns15:pagedata"/>
+					<element name="label" minOccurs="0" type="xsd:string"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:Ticketing-Data-Service-AppDataRow:pyDefault"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-AppDataElement:pyDefault"/>
+			<complexType name="pagedata">
+				<sequence>
+					<element name="columnData" minOccurs="0" maxOccurs="unbounded" type="ns13:pagedata"/>
+					<element name="rowId" minOccurs="0" type="xsd:long"/>
+				</sequence>
+			</complexType>
+		</schema>
+		<schema targetNamespace="urn:PegaRULES:SOAP:Ticketing:V20100113"
+			elementFormDefault="unqualified"
+			xmlns="http://www.w3.org/2001/XMLSchema">
+			<import namespace="urn:Ticketing-Data-Service-CreateTicketRequest:pyXMLPage"/>
+			<import namespace="urn:Ticketing-Data-Service-CreateTicketResponse:pyXMLPage"/>
+			<import namespace="urn:Ticketing-Data-Service-RetrieveTicketRequest:pyXMLPage"/>
+			<import namespace="urn:Ticketing-Data-Service-RetrieveTicketResponse:pyXMLPage"/>
+			<import namespace="urn:Ticketing-Data-Service-searchTicketRequest:pyXMLPage"/>
+			<import namespace="urn:Ticketing-Data-Service-searchTicketResponse:pyXMLPage"/>
+			<element name="CreateTicket">
+				<complexType>
+					<sequence>
+							<element name="RequestData" type="ns1:pagedata"/>
+					</sequence>
+				</complexType>
+			</element>
+			<element name="CreateTicketResponse">
+				<complexType>
+					<sequence>
+							<element name="ResponseData" type="ns2:pagedata"/>
+					</sequence>
+				</complexType>
+			</element>
+			<element name="RetrieveTicket">
+				<complexType>
+					<sequence>
+							<element name="RequestData" type="ns3:pagedata"/>
+					</sequence>
+				</complexType>
+			</element>
+			<element name="RetrieveTicketResponse">
+				<complexType>
+					<sequence>
+							<element name="ResponseData" type="ns4:pagedata"/>
+					</sequence>
+				</complexType>
+			</element>
+			<element name="SearchTicket">
+				<complexType>
+					<sequence>
+							<element name="RequestData" type="ns5:pagedata"/>
+					</sequence>
+				</complexType>
+			</element>
+			<element name="SearchTicketResponse">
+				<complexType>
+					<sequence>
+							<element name="ResponseData" type="ns6:pagedata"/>
+					</sequence>
+				</complexType>
+			</element>
+		</schema>
+	</types>
+
+	<message name="CreateTicket">
+		<part name="parameters" element="tns:CreateTicket"/>
+	</message>
+
+	<message name="CreateTicketResponse">
+		<part name="parameters" element="tns:CreateTicketResponse"/>
+	</message>
+
+	<message name="RetrieveTicket">
+		<part name="parameters" element="tns:RetrieveTicket"/>
+	</message>
+
+	<message name="RetrieveTicketResponse">
+		<part name="parameters" element="tns:RetrieveTicketResponse"/>
+	</message>
+
+	<message name="SearchTicket">
+		<part name="parameters" element="tns:SearchTicket"/>
+	</message>
+
+	<message name="SearchTicketResponse">
+		<part name="parameters" element="tns:SearchTicketResponse"/>
+	</message>
+
+	<portType name="V20100113Type">
+		<operation name="CreateTicket">
+			<input message="tns:CreateTicket"/>
+			<output message="tns:CreateTicketResponse"/>
+		</operation>
+		<operation name="RetrieveTicket">
+			<input message="tns:RetrieveTicket"/>
+			<output message="tns:RetrieveTicketResponse"/>
+		</operation>
+		<operation name="SearchTicket">
+			<input message="tns:SearchTicket"/>
+			<output message="tns:SearchTicketResponse"/>
+		</operation>
+	</portType>
+
+	<binding name="V20100113Binding" type="tns:V20100113Type">
+		<soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="CreateTicket">
+			<soap:operation style="document" soapAction="urn:PegaRULES:SOAP:Ticketing:V20100113#CreateTicket"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation>
+		<operation name="RetrieveTicket">
+			<soap:operation style="document" soapAction="urn:PegaRULES:SOAP:Ticketing:V20100113#RetrieveTicket"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation>
+		<operation name="SearchTicket">
+			<soap:operation style="document" soapAction="urn:PegaRULES:SOAP:Ticketing:V20100113#SearchTicket"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+		</operation>
+	</binding>
+
+	<service name="V20100113Service">
+		<port name="V20100113Port" binding="tns:V20100113Binding">
+			<soap:address location="http://tstw02-marish.tdbfg.com:8099/prweb/PRSOAPServlet"/>
+		</port>
+	</service>
+
+</definitions>
diff --git a/xml/tests/testData/xml/XHtmlValidation.xml b/xml/tests/testData/xml/XHtmlValidation.xml
new file mode 100644
index 000000000000..60848604a1be
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation.xml
@@ -0,0 +1,10 @@
+<!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">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>Untitled Document</title>
+</head>
+
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XHtmlValidation2.xml b/xml/tests/testData/xml/XHtmlValidation2.xml
new file mode 100644
index 000000000000..2429ef5e0f17
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation2.xml
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "<error>http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd</error>">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>Untitled Document</title>
+</head>
+
+<body>
+</body>
+</html>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XHtmlValidation3.xml b/xml/tests/testData/xml/XHtmlValidation3.xml
new file mode 100644
index 000000000000..d2cd59f719c9
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE html PUBLIC
+ "-//W3C//DTD XHTML Basic 1.1//EN"
+ "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">
+ <html xml:lang="en">
+ 
+ <head>
+ <title>City CarShare Reservation System</title>
+ </head>
+ <body>
+ <form <error>name</error>="loginForm" method="post" action="<%= request.getContextPath() %>/mlogin.do">
+ <table>
+ <tr>
+ <td align="right">Member ID:</td>
+ <td align="left"><input inputmode="latin digits" name="userid" value="" <error>CDATA</error>="aaa" <error>input</error>="zzz"/></td>
+ </tr>
+ </table>
+ </form>
+ </body>
+ </html>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-attribs-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-attribs-1.mod
new file mode 100644
index 000000000000..839425e47bac
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-attribs-1.mod
@@ -0,0 +1,142 @@
+<!-- ...................................................................... -->
+<!-- XHTML Common Attributes Module  ...................................... -->
+<!-- file: xhtml-attribs-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-attribs-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
+       SYSTEM "xhtml-attribs-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Common Attributes
+
+     This module declares many of the common attributes for the XHTML DTD.
+     %NS.decl.attrib; is declared in the XHTML Qname module.
+
+	 Note that this file was extended in XHTML Modularization Second Edition to 
+	 include declarations of "global" versions of the attribute collections.
+	 The global versions of the attributes are for use on elements in other 
+	 namespaces.  The global version of "common" includes the xmlns declaration
+	 for the prefixed version of the xhtml namespace.  If you are only using a
+	 specific attribute or an individual attribute collection, you must also
+	 include the XHTML.xmlns.attrib.prefixed PE on your elements.
+-->
+
+<!ENTITY % id.attrib
+     "id           ID                       #IMPLIED"
+>
+
+<![%XHTML.global.attrs.prefixed;[
+<!ENTITY % XHTML.global.id.attrib
+     "%XHTML.prefix;:id           ID        #IMPLIED"
+>
+]]>
+
+<!ENTITY % class.attrib
+     "class        NMTOKENS                 #IMPLIED"
+>
+
+<![%XHTML.global.attrs.prefixed;[
+<!ENTITY % XHTML.global.class.attrib
+     "%XHTML.prefix;:class        NMTOKENS                 #IMPLIED"
+>
+]]>
+
+<!ENTITY % title.attrib
+     "title        %Text.datatype;          #IMPLIED"
+>
+
+<![%XHTML.global.attrs.prefixed;[
+<!ENTITY % XHTML.global.title.attrib
+     "%XHTML.prefix;:title        %Text.datatype;          #IMPLIED"
+>
+]]>
+
+<!ENTITY % Core.extra.attrib "" >
+
+<!ENTITY % Core.attrib
+     "%XHTML.xmlns.attrib;
+      %id.attrib;
+      %class.attrib;
+      %title.attrib;
+      xml:space    ( preserve )             #FIXED 'preserve'
+      %Core.extra.attrib;"
+>
+
+<!ENTITY % XHTML.global.core.extra.attrib "" >
+
+<![%XHTML.global.attrs.prefixed;[
+
+<!ENTITY % XHTML.global.core.attrib
+     "%XHTML.global.id.attrib;
+      %XHTML.global.class.attrib;
+      %XHTML.global.title.attrib;
+      %XHTML.global.core.extra.attrib;"
+>
+]]>
+
+<!ENTITY % XHTML.global.core.attrib "" >
+
+
+<!ENTITY % lang.attrib
+     "xml:lang     %LanguageCode.datatype;  #IMPLIED"
+>
+
+<![%XHTML.bidi;[
+<!ENTITY % dir.attrib
+     "dir          ( ltr | rtl )            #IMPLIED"
+>
+
+<!ENTITY % I18n.attrib
+     "%dir.attrib;
+      %lang.attrib;"
+>
+
+<![%XHTML.global.attrs.prefixed;[
+<!ENTITY XHTML.global.i18n.attrib
+     "%XHTML.prefix;:dir          ( ltr | rtl )            #IMPLIED
+      %lang.attrib;"
+>
+]]>
+<!ENTITY XHTML.global.i18n.attrib "" >
+
+]]>
+<!ENTITY % I18n.attrib
+     "%lang.attrib;"
+>
+<!ENTITY % XHTML.global.i18n.attrib
+     "%lang.attrib;"
+>
+
+<!ENTITY % Common.extra.attrib "" >
+<!ENTITY % XHTML.global.common.extra.attrib "" >
+
+<!-- intrinsic event attributes declared previously
+-->
+<!ENTITY % Events.attrib "" >
+
+<!ENTITY % XHTML.global.events.attrib "" >
+
+<!ENTITY % Common.attrib
+     "%Core.attrib;
+      %I18n.attrib;
+      %Events.attrib;
+      %Common.extra.attrib;"
+>
+
+<!ENTITY % XHTML.global.common.attrib
+     "%XHTML.xmlns.attrib.prefixed;
+      %XHTML.global.core.attrib;
+	  %XHTML.global.i18n.attrib;
+	  %XHTML.global.events.attrib;
+	  %XHTML.global.common.extra.attrib;"
+>
+
+<!-- end of xhtml-attribs-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-base-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-base-1.mod
new file mode 100644
index 000000000000..47eed9f1b3fc
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-base-1.mod
@@ -0,0 +1,53 @@
+<!-- ...................................................................... -->
+<!-- XHTML Base Element Module  ........................................... -->
+<!-- file: xhtml-base-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-base-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
+       SYSTEM "xhtml-base-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Base element
+
+        base
+
+     This module declares the base element type and its attributes,
+     used to define a base URI against which relative URIs in the
+     document will be resolved.
+
+     Note that this module also redeclares the content model for
+     the head element to include the base element.
+-->
+
+<!-- base: Document Base URI ........................... -->
+
+<!ENTITY % base.element  "INCLUDE" >
+<![%base.element;[
+<!ENTITY % base.content  "EMPTY" >
+<!ENTITY % base.qname  "base" >
+<!ELEMENT %base.qname;  %base.content; >
+<!-- end of base.element -->]]>
+
+<!ENTITY % base.attlist  "INCLUDE" >
+<![%base.attlist;[
+<!ATTLIST %base.qname;
+      %XHTML.xmlns.attrib;
+      href         %URI.datatype;           #REQUIRED
+>
+<!-- end of base.attlist -->]]>
+
+<!ENTITY % head.content
+    "( %HeadOpts.mix;,
+     ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
+     | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
+>
+
+<!-- end of xhtml-base-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic-table-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic-table-1.mod
new file mode 100644
index 000000000000..ea733080e765
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic-table-1.mod
@@ -0,0 +1,167 @@
+<!-- ....................................................................... -->
+<!-- XHTML Basic Table Module  ............................................. -->
+<!-- file: xhtml-basic-table-1.mod
+
+     This is XHTML Basic, a proper subset of XHTML.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-basic-table-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
+       SYSTEM "xhtml-basic-table-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Basic Tables
+
+        table, caption, tr, th, td
+
+     This table module declares elements and attributes defining
+     a table model based fundamentally on features found in the
+     widely-deployed HTML 3.2 table model.  While this module
+     mimics the content model and table attributes of HTML 3.2
+     tables, the element types declared herein also includes all
+     HTML 4 common and most of the HTML 4 table attributes.
+-->
+
+<!-- declare qualified element type names:
+-->
+<!ENTITY % table.qname  "table" >
+<!ENTITY % caption.qname  "caption" >
+<!ENTITY % tr.qname  "tr" >
+<!ENTITY % th.qname  "th" >
+<!ENTITY % td.qname  "td" >
+
+<!-- horizontal alignment attributes for cell contents
+-->
+<!ENTITY % CellHAlign.attrib
+     "align        ( left
+                   | center
+                   | right )                #IMPLIED"
+>
+
+<!-- vertical alignment attributes for cell contents
+-->
+<!ENTITY % CellVAlign.attrib
+     "valign       ( top
+                   | middle
+                   | bottom )               #IMPLIED"
+>
+
+<!-- scope is simpler than axes attribute for common tables
+-->
+<!ENTITY % scope.attrib
+     "scope        ( row | col  )           #IMPLIED"
+>
+
+<!-- table: Table Element .............................. -->
+
+<!ENTITY % table.element  "INCLUDE" >
+<![%table.element;[
+<!ENTITY % table.content
+     "( %caption.qname;?, %tr.qname;+ )"
+>
+<!ELEMENT %table.qname;  %table.content; >
+<!-- end of table.element -->]]>
+
+<!ENTITY % table.attlist  "INCLUDE" >
+<![%table.attlist;[
+<!ATTLIST %table.qname;
+      %Common.attrib;
+      summary      %Text.datatype;          #IMPLIED
+      width        %Length.datatype;        #IMPLIED
+>
+<!-- end of table.attlist -->]]>
+
+<!-- caption: Table Caption ............................ -->
+
+<!ENTITY % caption.element  "INCLUDE" >
+<![%caption.element;[
+<!ENTITY % caption.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ELEMENT %caption.qname;  %caption.content; >
+<!-- end of caption.element -->]]>
+
+<!ENTITY % caption.attlist  "INCLUDE" >
+<![%caption.attlist;[
+<!ATTLIST %caption.qname;
+      %Common.attrib;
+>
+<!-- end of caption.attlist -->]]>
+
+<!-- tr: Table Row ..................................... -->
+
+<!ENTITY % tr.element  "INCLUDE" >
+<![%tr.element;[
+<!ENTITY % tr.content  "( %th.qname; | %td.qname; )+" >
+<!ELEMENT %tr.qname;  %tr.content; >
+<!-- end of tr.element -->]]>
+
+<!ENTITY % tr.attlist  "INCLUDE" >
+<![%tr.attlist;[
+<!ATTLIST %tr.qname;
+      %Common.attrib;
+      %CellHAlign.attrib;
+      %CellVAlign.attrib;
+>
+<!-- end of tr.attlist -->]]>
+
+<!-- th: Table Header Cell ............................. -->
+
+<!-- th is for header cells, td for data,
+     but for cells acting as both use td
+-->
+
+<!ENTITY % th.element  "INCLUDE" >
+<![%th.element;[
+<!ENTITY % th.content
+     "( #PCDATA | %FlowNoTable.mix; )*"
+>
+<!ELEMENT %th.qname;  %th.content; >
+<!-- end of th.element -->]]>
+
+<!ENTITY % th.attlist  "INCLUDE" >
+<![%th.attlist;[
+<!ATTLIST %th.qname;
+      %Common.attrib;
+      abbr         %Text.datatype;          #IMPLIED
+      axis         CDATA                    #IMPLIED
+      headers      IDREFS                   #IMPLIED
+      %scope.attrib;
+      rowspan      %Number.datatype;        '1'
+      colspan      %Number.datatype;        '1'
+      %CellHAlign.attrib;
+      %CellVAlign.attrib;
+>
+<!-- end of th.attlist -->]]>
+
+<!-- td: Table Data Cell ............................... -->
+
+<!ENTITY % td.element  "INCLUDE" >
+<![%td.element;[
+<!ENTITY % td.content
+     "( #PCDATA | %FlowNoTable.mix; )*"
+>
+<!ELEMENT %td.qname;  %td.content; >
+<!-- end of td.element -->]]>
+
+<!ENTITY % td.attlist  "INCLUDE" >
+<![%td.attlist;[
+<!ATTLIST %td.qname;
+      %Common.attrib;
+      abbr         %Text.datatype;          #IMPLIED
+      axis         CDATA                    #IMPLIED
+      headers      IDREFS                   #IMPLIED
+      %scope.attrib;
+      rowspan      %Number.datatype;        '1'
+      colspan      %Number.datatype;        '1'
+      %CellHAlign.attrib;
+      %CellVAlign.attrib;
+>
+<!-- end of td.attlist -->]]>
+
+<!-- end of xhtml-basic-table-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic11-model-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic11-model-1.mod
new file mode 100644
index 000000000000..7fdacd0b6a88
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic11-model-1.mod
@@ -0,0 +1,161 @@
+<!-- ....................................................................... -->
+<!-- XHTML Basic 1.1 Document Model Module  .................................... -->
+<!-- file: xhtml-basic11-model-1.mod
+
+     This is XHTML Basic, a proper subset of XHTML.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-basic11-model-1.mod,v 1.1 2006/07/05 16:29:09 matthieu Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ENTITIES XHTML Basic 1.1 Document Model 1.0//EN"
+       SYSTEM "xhtml-basic11-model-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- XHTML Basic Document Model
+
+     This module describes the groupings of elements that make up
+     common content models for XHTML elements.
+-->
+
+<!-- Optional Elements in head  .............. -->
+
+<!ENTITY % HeadOpts.mix
+     "( %script.qname; | %style.qname; | %meta.qname; 
+      | %link.qname; | %object.qname; )*" >
+
+<!-- script and noscript are used to contain scripts
+     and alternative content
+-->
+<!ENTITY % Script.class "| %script.qname; | %noscript.qname;" >
+
+<!-- Miscellaneous Elements  ................. -->
+
+<!ENTITY % Misc.extra "" >
+
+<!-- These elements are neither block nor inline, and can
+     essentially be used anywhere in the document body.
+-->
+<!ENTITY % Misc.class
+     "%Script.class;
+      %Misc.extra;"
+>
+
+<!-- Inline Elements  ........................ -->
+
+<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
+
+<!ENTITY % InlPhras.class
+     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
+      | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
+      | %abbr.qname; | %acronym.qname; | %q.qname;" >
+
+<!ENTITY % InlPres.class "" >
+
+<!ENTITY % I18n.class "" >
+
+<!ENTITY % Anchor.class "| %a.qname;" >
+
+<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
+
+<!ENTITY % InlForm.class
+     "| %input.qname; | %select.qname; | %textarea.qname;
+      | %label.qname; | %button.qname;" >
+
+<!ENTITY % Inline.extra "" >
+
+<!ENTITY % Inline.class
+     "%InlStruct.class;
+      %InlPhras.class;
+      %Anchor.class;
+      %InlSpecial.class;
+      %InlForm.class;
+      %Inline.extra;"
+>
+
+<!ENTITY % InlNoAnchor.class
+     "%InlStruct.class;
+      %InlPhras.class;
+      %InlSpecial.class;
+      %InlForm.class;
+      %Inline.extra;"
+>
+
+<!ENTITY % InlNoAnchor.mix
+     "%InlNoAnchor.class;
+      %Misc.class;"
+>
+
+<!ENTITY % Inline.mix
+     "%Inline.class;
+      %Misc.class;"
+>
+
+<!-- Block Elements  ......................... -->
+
+<!ENTITY % Heading.class
+     "%h1.qname; | %h2.qname; | %h3.qname;
+      | %h4.qname; | %h5.qname; | %h6.qname;"
+>
+<!ENTITY % List.class  "%ul.qname; | %ol.qname; | %dl.qname;" >
+
+<!ENTITY % Table.class "| %table.qname;" >
+
+<!ENTITY % Form.class  "| %form.qname;" >
+
+<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
+
+<!ENTITY % BlkPhras.class
+     "| %pre.qname; | %blockquote.qname; | %address.qname;"
+>
+
+<!ENTITY % BlkPres.class "" >
+
+<!ENTITY % BlkSpecial.class
+     "%Table.class;
+      %Form.class;"
+>
+
+<!ENTITY % Block.extra "" >
+
+<!ENTITY % Block.class
+     "%BlkStruct.class;
+      %BlkPhras.class;
+      %BlkSpecial.class;
+      %Block.extra;"
+>
+
+<!ENTITY % Block.mix
+     "%Heading.class;
+      | %List.class;
+      | %Block.class;
+      %Misc.class;"
+>
+
+<!-- All Content Elements  ................... -->
+
+<!-- declares all content except tables
+-->
+<!ENTITY % FlowNoTable.mix
+     "%Heading.class;
+      | %List.class;
+      | %BlkStruct.class;
+      %BlkPhras.class;
+      %Form.class;
+      %Block.extra;
+      | %Inline.class;
+      %Misc.class;"
+>
+
+<!ENTITY % Flow.mix
+     "%Heading.class;
+      | %List.class;
+      | %Block.class;
+      | %Inline.class;
+      %Misc.class;"
+>
+
+<!-- end of xhtml-basic11-model-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic11.dtd b/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic11.dtd
new file mode 100644
index 000000000000..bd64bbd40c3f
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-basic11.dtd
@@ -0,0 +1,221 @@
+<!-- XHTML Basic 1.1 DTD  ...................................................... -->
+<!-- file: xhtml-basic10.dtd -->
+
+<!-- XHTML Basic 1.1 DTD
+
+     This is XHTML Basic, a proper subset of XHTML.
+
+     The Extensible HyperText Markup Language (XHTML)
+     Copyright 1998-2005 World Wide Web Consortium
+        (Massachusetts Institute of Technology, European Research Consortium
+         for Informatics and Mathematics, Keio University).
+         All Rights Reserved.
+
+     Permission to use, copy, modify and distribute the XHTML Basic DTD
+     and its accompanying documentation for any purpose and without fee is
+     hereby granted in perpetuity, provided that the above copyright notice
+     and this paragraph appear in all copies.  The copyright holders make
+     no representation about the suitability of the DTD for any purpose.
+
+     It is provided "as is" without expressed or implied warranty.
+
+        Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
+                    Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
+        Revision:   $Id: xhtml-basic11.dtd,v 1.1 2006/07/05 16:29:53 matthieu Exp $ SMI
+
+-->
+<!-- This is the driver file for version 1.1 of the XHTML Basic DTD.
+
+     This DTD is identified by the PUBLIC and SYSTEM identifiers:
+
+     PUBLIC: "-//W3C//DTD XHTML Basic 1.1//EN"
+     SYSTEM: "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"
+-->
+<!ENTITY % XHTML.version  "-//W3C//DTD XHTML Basic 1.1//EN" >
+
+<!-- Use this URI to identify the default namespace:
+
+         "http://www.w3.org/1999/xhtml"
+
+     See the Qualified Names module for information
+     on the use of namespace prefixes in the DTD.
+-->
+<!ENTITY % NS.prefixed "IGNORE" >
+<!ENTITY % XHTML.prefix  "" >
+
+<!-- Reserved for use with the XLink namespace:
+-->
+<!ENTITY % XLINK.xmlns "" >
+<!ENTITY % XLINK.xmlns.attrib "" >
+
+<!-- For example, if you are using XHTML Basic 1.1 directly, use
+     the public identifier in the DOCTYPE declaration, with the namespace
+     declaration on the document element to identify the default namespace:
+
+         <?xml version="1.0"?>
+         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN"
+             "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd" >
+         <html xmlns="http://www.w3.org/1999/xhtml"
+               xml:lang="en" >
+         ...
+         </html>
+-->
+
+<!-- reserved for future use with document profiles -->
+<!ENTITY % XHTML.profile  "" >
+
+<!-- Bidirectional Text features
+     This feature-test entity is used to declare elements
+     and attributes used for bidirectional text support.
+-->
+<!ENTITY % XHTML.bidi  "IGNORE" >
+
+<?doc type="doctype" role="title" { XHTML Basic 1.1 } ?>
+
+<!-- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
+
+<!ENTITY % xhtml-events.module   "INCLUDE" >
+<!ENTITY % xhtml-bdo.module      "%XHTML.bidi;" >
+
+<!ENTITY % xhtml-model.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Basic 1.1 Document Model 1.0//EN"
+            "xhtml-basic11-model-1.mod" >
+
+<!ENTITY % xhtml-framework.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
+            "xhtml-framework-1.mod" >
+%xhtml-framework.mod;
+
+<!ENTITY % pre.content
+     "( #PCDATA
+      | %InlStruct.class;
+      %InlPhras.class;
+      %Anchor.class;
+      %Inline.extra; )*"
+>
+
+<!ENTITY % xhtml-text.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
+            "xhtml-text-1.mod" >
+%xhtml-text.mod;
+
+<!ENTITY % xhtml-hypertext.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
+            "xhtml-hypertext-1.mod" >
+%xhtml-hypertext.mod;
+
+<!ENTITY % xhtml-list.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
+            "xhtml-list-1.mod" >
+%xhtml-list.mod;
+
+<!-- Add in the value attribute to the li element -->
+<!ATTLIST %li.qname;
+      value        %Number.datatype;         #IMPLIED
+>
+
+<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
+
+<!-- Scripting Module  ........................................... -->
+<!ENTITY % xhtml-script.module "INCLUDE" >
+<![%xhtml-script.module;[
+<!ENTITY % xhtml-script.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
+            "xhtml-script-1.mod" >
+%xhtml-script.mod;]]>
+
+<!-- Style Sheets Module  ......................................... -->
+<!ENTITY % xhtml-style.module "INCLUDE" >
+<![%xhtml-style.module;[
+<!ENTITY % xhtml-style.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
+            "xhtml-style-1.mod" >
+%xhtml-style.mod;]]>
+
+<!-- Image Module  ............................................... -->
+<!ENTITY % xhtml-image.module "INCLUDE" >
+<![%xhtml-image.module;[
+<!ENTITY % xhtml-image.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
+            "xhtml-image-1.mod" >
+%xhtml-image.mod;]]>
+
+<!-- Tables Module ............................................... -->
+<!ENTITY % xhtml-table.module "INCLUDE" >
+<![%xhtml-table.module;[
+<!ENTITY % xhtml-table.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
+            "xhtml-basic-table-1.mod" >
+%xhtml-table.mod;]]>
+
+<!-- Forms Module  ............................................... -->
+<!ENTITY % xhtml-form.module "INCLUDE" >
+<![%xhtml-form.module;[
+<!ENTITY % xhtml-form.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
+            "xhtml-form-1.mod" >
+%xhtml-form.mod;]]>
+
+<!-- Link Element Module  ........................................ -->
+<!ENTITY % xhtml-link.module "INCLUDE" >
+<![%xhtml-link.module;[
+<!ENTITY % xhtml-link.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
+            "xhtml-link-1.mod" >
+%xhtml-link.mod;]]>
+
+<!-- Document Metainformation Module  ............................ -->
+<!ENTITY % xhtml-meta.module "INCLUDE" >
+<![%xhtml-meta.module;[
+<!ENTITY % xhtml-meta.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
+            "xhtml-meta-1.mod" >
+%xhtml-meta.mod;]]>
+
+<!-- Base Element Module  ........................................ -->
+<!ENTITY % xhtml-base.module "INCLUDE" >
+<![%xhtml-base.module;[
+<!ENTITY % xhtml-base.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
+            "xhtml-base-1.mod" >
+%xhtml-base.mod;]]>
+
+<!-- Param Element Module  ....................................... -->
+<!ENTITY % xhtml-param.module "INCLUDE" >
+<![%xhtml-param.module;[
+<!ENTITY % xhtml-param.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
+            "xhtml-param-1.mod" >
+%xhtml-param.mod;]]>
+
+<!-- Embedded Object Module  ..................................... -->
+<!ENTITY % xhtml-object.module "INCLUDE" >
+<![%xhtml-object.module;[
+<!ENTITY % xhtml-object.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
+            "xhtml-object-1.mod" >
+%xhtml-object.mod;]]>
+
+<!-- Inputmode Attribute Module  .................................. -->
+<!ENTITY % xhtml-inputmode.module "INCLUDE" >
+<![%xhtml-inputmode.module;[
+<!ENTITY % xhtml-inputmode.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Inputmode 1.0//EN"
+            "xhtml-inputmode-1.mod" >
+%xhtml-inputmode.mod;]]>
+
+<!-- Target Attribute Module  .................................... -->
+<!ENTITY % xhtml-target.module "INCLUDE" >
+<![%xhtml-target.module;[
+<!ENTITY % xhtml-target.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
+            "xhtml-target-1.mod" >
+%xhtml-target.mod;]]>
+
+
+<!ENTITY % xhtml-struct.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
+            "xhtml-struct-1.mod" >
+%xhtml-struct.mod;
+
+<!-- end of XHTML Basic 1.1 DTD  ........................................... -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-blkphras-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-blkphras-1.mod
new file mode 100644
index 000000000000..fcbaf6de65cd
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-blkphras-1.mod
@@ -0,0 +1,163 @@
+<!-- ...................................................................... -->
+<!-- XHTML Block Phrasal Module  .......................................... -->
+<!-- file: xhtml-blkphras-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-blkphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
+       SYSTEM "xhtml-blkphras-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Block Phrasal
+
+        address, blockquote, pre, h1, h2, h3, h4, h5, h6
+
+     This module declares the elements and their attributes used to
+     support block-level phrasal markup.
+-->
+
+<!ENTITY % address.element  "INCLUDE" >
+<![%address.element;[
+<!ENTITY % address.content
+     "( #PCDATA | %Inline.mix; )*" >
+<!ENTITY % address.qname  "address" >
+<!ELEMENT %address.qname;  %address.content; >
+<!-- end of address.element -->]]>
+
+<!ENTITY % address.attlist  "INCLUDE" >
+<![%address.attlist;[
+<!ATTLIST %address.qname;
+      %Common.attrib;
+>
+<!-- end of address.attlist -->]]>
+
+<!ENTITY % blockquote.element  "INCLUDE" >
+<![%blockquote.element;[
+<!ENTITY % blockquote.content
+     "( %Block.mix; )+"
+>
+<!ENTITY % blockquote.qname  "blockquote" >
+<!ELEMENT %blockquote.qname;  %blockquote.content; >
+<!-- end of blockquote.element -->]]>
+
+<!ENTITY % blockquote.attlist  "INCLUDE" >
+<![%blockquote.attlist;[
+<!ATTLIST %blockquote.qname;
+      %Common.attrib;
+      cite         %URI.datatype;           #IMPLIED
+>
+<!-- end of blockquote.attlist -->]]>
+
+<!ENTITY % pre.element  "INCLUDE" >
+<![%pre.element;[
+<!ENTITY % pre.content
+     "( #PCDATA
+      | %InlStruct.class;
+      %InlPhras.class;
+      | %tt.qname; | %i.qname; | %b.qname;
+      %I18n.class;
+      %Anchor.class;
+      | %script.qname; | %map.qname;
+      %Inline.extra; )*"
+>
+<!ENTITY % pre.qname  "pre" >
+<!ELEMENT %pre.qname;  %pre.content; >
+<!-- end of pre.element -->]]>
+
+<!ENTITY % pre.attlist  "INCLUDE" >
+<![%pre.attlist;[
+<!ATTLIST %pre.qname;
+      %Common.attrib;
+>
+<!-- end of pre.attlist -->]]>
+
+<!-- ...................  Heading Elements  ................... -->
+
+<!ENTITY % Heading.content  "( #PCDATA | %Inline.mix; )*" >
+
+<!ENTITY % h1.element  "INCLUDE" >
+<![%h1.element;[
+<!ENTITY % h1.qname  "h1" >
+<!ELEMENT %h1.qname;  %Heading.content; >
+<!-- end of h1.element -->]]>
+
+<!ENTITY % h1.attlist  "INCLUDE" >
+<![%h1.attlist;[
+<!ATTLIST %h1.qname;
+      %Common.attrib;
+>
+<!-- end of h1.attlist -->]]>
+
+<!ENTITY % h2.element  "INCLUDE" >
+<![%h2.element;[
+<!ENTITY % h2.qname  "h2" >
+<!ELEMENT %h2.qname;  %Heading.content; >
+<!-- end of h2.element -->]]>
+
+<!ENTITY % h2.attlist  "INCLUDE" >
+<![%h2.attlist;[
+<!ATTLIST %h2.qname;
+      %Common.attrib;
+>
+<!-- end of h2.attlist -->]]>
+
+<!ENTITY % h3.element  "INCLUDE" >
+<![%h3.element;[
+<!ENTITY % h3.qname  "h3" >
+<!ELEMENT %h3.qname;  %Heading.content; >
+<!-- end of h3.element -->]]>
+
+<!ENTITY % h3.attlist  "INCLUDE" >
+<![%h3.attlist;[
+<!ATTLIST %h3.qname;
+      %Common.attrib;
+>
+<!-- end of h3.attlist -->]]>
+
+<!ENTITY % h4.element  "INCLUDE" >
+<![%h4.element;[
+<!ENTITY % h4.qname  "h4" >
+<!ELEMENT %h4.qname;  %Heading.content; >
+<!-- end of h4.element -->]]>
+
+<!ENTITY % h4.attlist  "INCLUDE" >
+<![%h4.attlist;[
+<!ATTLIST %h4.qname;
+      %Common.attrib;
+>
+<!-- end of h4.attlist -->]]>
+
+<!ENTITY % h5.element  "INCLUDE" >
+<![%h5.element;[
+<!ENTITY % h5.qname  "h5" >
+<!ELEMENT %h5.qname;  %Heading.content; >
+<!-- end of h5.element -->]]>
+
+<!ENTITY % h5.attlist  "INCLUDE" >
+<![%h5.attlist;[
+<!ATTLIST %h5.qname;
+      %Common.attrib;
+>
+<!-- end of h5.attlist -->]]>
+
+<!ENTITY % h6.element  "INCLUDE" >
+<![%h6.element;[
+<!ENTITY % h6.qname  "h6" >
+<!ELEMENT %h6.qname;  %Heading.content; >
+<!-- end of h6.element -->]]>
+
+<!ENTITY % h6.attlist  "INCLUDE" >
+<![%h6.attlist;[
+<!ATTLIST %h6.qname;
+      %Common.attrib;
+>
+<!-- end of h6.attlist -->]]>
+
+<!-- end of xhtml-blkphras-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-blkstruct-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-blkstruct-1.mod
new file mode 100644
index 000000000000..0d7ae0cf1aea
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-blkstruct-1.mod
@@ -0,0 +1,57 @@
+<!-- ...................................................................... -->
+<!-- XHTML Block Structural Module  ....................................... -->
+<!-- file: xhtml-blkstruct-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-blkstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
+       SYSTEM "xhtml-blkstruct-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Block Structural
+
+        div, p
+
+     This module declares the elements and their attributes used to
+     support block-level structural markup.
+-->
+
+<!ENTITY % div.element  "INCLUDE" >
+<![%div.element;[
+<!ENTITY % div.content
+     "( #PCDATA | %Flow.mix; )*"
+>
+<!ENTITY % div.qname  "div" >
+<!ELEMENT %div.qname;  %div.content; >
+<!-- end of div.element -->]]>
+
+<!ENTITY % div.attlist  "INCLUDE" >
+<![%div.attlist;[
+<!ATTLIST %div.qname;
+      %Common.attrib;
+>
+<!-- end of div.attlist -->]]>
+
+<!ENTITY % p.element  "INCLUDE" >
+<![%p.element;[
+<!ENTITY % p.content
+     "( #PCDATA | %Inline.mix; )*" >
+<!ENTITY % p.qname  "p" >
+<!ELEMENT %p.qname;  %p.content; >
+<!-- end of p.element -->]]>
+
+<!ENTITY % p.attlist  "INCLUDE" >
+<![%p.attlist;[
+<!ATTLIST %p.qname;
+      %Common.attrib;
+>
+<!-- end of p.attlist -->]]>
+
+<!-- end of xhtml-blkstruct-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-charent-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-charent-1.mod
new file mode 100644
index 000000000000..45fea101a9c5
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-charent-1.mod
@@ -0,0 +1,39 @@
+<!-- ...................................................................... -->
+<!-- XHTML Character Entities Module  ......................................... -->
+<!-- file: xhtml-charent-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-charent-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
+       SYSTEM "xhtml-charent-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Character Entities for XHTML
+
+     This module declares the set of character entities for XHTML,
+     including the Latin 1, Symbol and Special character collections.
+-->
+
+<!ENTITY % xhtml-lat1
+    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+           "xhtml-lat1.ent" >
+%xhtml-lat1;
+
+<!ENTITY % xhtml-symbol
+    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
+           "xhtml-symbol.ent" >
+%xhtml-symbol;
+
+<!ENTITY % xhtml-special
+    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
+           "xhtml-special.ent" >
+%xhtml-special;
+
+<!-- end of xhtml-charent-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-datatypes-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-datatypes-1.mod
new file mode 100644
index 000000000000..21e04dc466f3
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-datatypes-1.mod
@@ -0,0 +1,85 @@
+<!-- ...................................................................... -->
+<!-- XHTML Datatypes Module  .............................................. -->
+<!-- file: xhtml-datatypes-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-datatypes-1.mod,v 4.1 2001/04/06 19:23:32 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
+       SYSTEM "xhtml-datatypes-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Datatypes
+
+     defines containers for the following datatypes, many of
+     these imported from other specifications and standards.
+-->
+
+<!-- Length defined for cellpadding/cellspacing -->
+
+<!-- nn for pixels or nn% for percentage length -->
+<!ENTITY % Length.datatype "CDATA" >
+
+<!-- space-separated list of link types -->
+<!ENTITY % LinkTypes.datatype "NMTOKENS" >
+
+<!-- single or comma-separated list of media descriptors -->
+<!ENTITY % MediaDesc.datatype "CDATA" >
+
+<!-- pixel, percentage, or relative -->
+<!ENTITY % MultiLength.datatype "CDATA" >
+
+<!-- one or more digits (NUMBER) -->
+<!ENTITY % Number.datatype "CDATA" >
+
+<!-- integer representing length in pixels -->
+<!ENTITY % Pixels.datatype "CDATA" >
+
+<!-- script expression -->
+<!ENTITY % Script.datatype "CDATA" >
+
+<!-- textual content -->
+<!ENTITY % Text.datatype "CDATA" >
+
+<!-- Imported Datatypes ................................ -->
+
+<!-- a single character from [ISO10646] -->
+<!ENTITY % Character.datatype "CDATA" >
+
+<!-- a character encoding, as per [RFC2045] -->
+<!ENTITY % Charset.datatype "CDATA" >
+
+<!-- a space separated list of character encodings, as per [RFC2045] -->
+<!ENTITY % Charsets.datatype "CDATA" >
+
+<!-- Color specification using color name or sRGB (#RRGGBB) values -->
+<!ENTITY % Color.datatype "CDATA" >
+
+<!-- media type, as per [RFC2045] -->
+<!ENTITY % ContentType.datatype "CDATA" >
+
+<!-- comma-separated list of media types, as per [RFC2045] -->
+<!ENTITY % ContentTypes.datatype "CDATA" >
+
+<!-- date and time information. ISO date format -->
+<!ENTITY % Datetime.datatype "CDATA" >
+
+<!-- formal public identifier, as per [ISO8879] -->
+<!ENTITY % FPI.datatype "CDATA" >
+
+<!-- a language code, as per [RFC3066] or its successor -->
+<!ENTITY % LanguageCode.datatype "CDATA" >
+
+<!-- a Uniform Resource Identifier, see [URI] -->
+<!ENTITY % URI.datatype "CDATA" >
+
+<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
+<!ENTITY % URIs.datatype "CDATA" >
+
+<!-- end of xhtml-datatypes-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-form-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-form-1.mod
new file mode 100644
index 000000000000..ae9038b895f8
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-form-1.mod
@@ -0,0 +1,291 @@
+<!-- ...................................................................... -->
+<!-- XHTML Forms Module  .................................................. -->
+<!-- file: xhtml-form-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-form-1.mod,v 4.1 2001/04/10 09:42:30 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
+       SYSTEM "xhtml-form-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Forms
+
+        form, label, input, select, optgroup, option,
+        textarea, fieldset, legend, button
+
+     This module declares markup to provide support for online
+     forms, based on the features found in HTML 4 forms.
+-->
+
+<!-- declare qualified element type names:
+-->
+<!ENTITY % form.qname  "form" >
+<!ENTITY % label.qname  "label" >
+<!ENTITY % input.qname  "input" >
+<!ENTITY % select.qname  "select" >
+<!ENTITY % optgroup.qname  "optgroup" >
+<!ENTITY % option.qname  "option" >
+<!ENTITY % textarea.qname  "textarea" >
+<!ENTITY % fieldset.qname  "fieldset" >
+<!ENTITY % legend.qname  "legend" >
+<!ENTITY % button.qname  "button" >
+
+<!-- %BlkNoForm.mix; includes all non-form block elements,
+     plus %Misc.class;
+-->
+<!ENTITY % BlkNoForm.mix
+     "%Heading.class;
+      | %List.class;
+      | %BlkStruct.class;
+      %BlkPhras.class;
+      %BlkPres.class;
+      %Table.class;
+      %Block.extra;
+      %Misc.class;"
+>
+
+<!-- form: Form Element ................................ -->
+
+<!ENTITY % form.element  "INCLUDE" >
+<![%form.element;[
+<!ENTITY % form.content
+     "( %BlkNoForm.mix;
+      | %fieldset.qname; )+"
+>
+<!ELEMENT %form.qname;  %form.content; >
+<!-- end of form.element -->]]>
+
+<!ENTITY % form.attlist  "INCLUDE" >
+<![%form.attlist;[
+<!ATTLIST %form.qname;
+      %Common.attrib;
+      action       %URI.datatype;           #REQUIRED
+      method       ( get | post )           'get'
+      enctype      %ContentType.datatype;   'application/x-www-form-urlencoded'
+      accept-charset %Charsets.datatype;    #IMPLIED
+      accept       %ContentTypes.datatype;  #IMPLIED
+>
+<!-- end of form.attlist -->]]>
+
+<!-- label: Form Field Label Text ...................... -->
+
+<!-- Each label must not contain more than ONE field
+-->
+
+<!ENTITY % label.element  "INCLUDE" >
+<![%label.element;[
+<!ENTITY % label.content
+     "( #PCDATA
+      | %input.qname; | %select.qname; | %textarea.qname; | %button.qname;
+      | %InlStruct.class;
+      %InlPhras.class;
+      %I18n.class;
+      %InlPres.class;
+      %Anchor.class;
+      %InlSpecial.class;
+      %Inline.extra;
+      %Misc.class; )*"
+>
+<!ELEMENT %label.qname;  %label.content; >
+<!-- end of label.element -->]]>
+
+<!ENTITY % label.attlist  "INCLUDE" >
+<![%label.attlist;[
+<!ATTLIST %label.qname;
+      %Common.attrib;
+      for          IDREF                    #IMPLIED
+      accesskey    %Character.datatype;     #IMPLIED
+>
+<!-- end of label.attlist -->]]>
+
+<!-- input: Form Control ............................... -->
+
+<!ENTITY % input.element  "INCLUDE" >
+<![%input.element;[
+<!ENTITY % input.content  "EMPTY" >
+<!ELEMENT %input.qname;  %input.content; >
+<!-- end of input.element -->]]>
+
+<!ENTITY % input.attlist  "INCLUDE" >
+<![%input.attlist;[
+<!ENTITY % InputType.class
+     "( text | password | checkbox | radio | submit
+      | reset | file | hidden | image | button )"
+>
+<!-- attribute 'name' required for all but submit & reset
+-->
+<!ATTLIST %input.qname;
+      %Common.attrib;
+      type         %InputType.class;        'text'
+      name         CDATA                    #IMPLIED
+      value        CDATA                    #IMPLIED
+      checked      ( checked )              #IMPLIED
+      disabled     ( disabled )             #IMPLIED
+      readonly     ( readonly )             #IMPLIED
+      size         %Number.datatype;        #IMPLIED
+      maxlength    %Number.datatype;        #IMPLIED
+      src          %URI.datatype;           #IMPLIED
+      alt          %Text.datatype;          #IMPLIED
+      tabindex     %Number.datatype;        #IMPLIED
+      accesskey    %Character.datatype;     #IMPLIED
+      accept       %ContentTypes.datatype;  #IMPLIED
+>
+<!-- end of input.attlist -->]]>
+
+<!-- select: Option Selector ........................... -->
+
+<!ENTITY % select.element  "INCLUDE" >
+<![%select.element;[
+<!ENTITY % select.content
+     "( %optgroup.qname; | %option.qname; )+"
+>
+<!ELEMENT %select.qname;  %select.content; >
+<!-- end of select.element -->]]>
+
+<!ENTITY % select.attlist  "INCLUDE" >
+<![%select.attlist;[
+<!ATTLIST %select.qname;
+      %Common.attrib;
+      name         CDATA                    #IMPLIED
+      size         %Number.datatype;        #IMPLIED
+      multiple     ( multiple )             #IMPLIED
+      disabled     ( disabled )             #IMPLIED
+      tabindex     %Number.datatype;        #IMPLIED
+>
+<!-- end of select.attlist -->]]>
+
+<!-- optgroup: Option Group ............................ -->
+
+<!ENTITY % optgroup.element  "INCLUDE" >
+<![%optgroup.element;[
+<!ENTITY % optgroup.content  "( %option.qname; )+" >
+<!ELEMENT %optgroup.qname;  %optgroup.content; >
+<!-- end of optgroup.element -->]]>
+
+<!ENTITY % optgroup.attlist  "INCLUDE" >
+<![%optgroup.attlist;[
+<!ATTLIST %optgroup.qname;
+      %Common.attrib;
+      disabled     ( disabled )             #IMPLIED
+      label        %Text.datatype;          #REQUIRED
+>
+<!-- end of optgroup.attlist -->]]>
+
+<!-- option: Selectable Choice ......................... -->
+
+<!ENTITY % option.element  "INCLUDE" >
+<![%option.element;[
+<!ENTITY % option.content  "( #PCDATA )" >
+<!ELEMENT %option.qname;  %option.content; >
+<!-- end of option.element -->]]>
+
+<!ENTITY % option.attlist  "INCLUDE" >
+<![%option.attlist;[
+<!ATTLIST %option.qname;
+      %Common.attrib;
+      selected     ( selected )             #IMPLIED
+      disabled     ( disabled )             #IMPLIED
+      label        %Text.datatype;          #IMPLIED
+      value        CDATA                    #IMPLIED
+>
+<!-- end of option.attlist -->]]>
+
+<!-- textarea: Multi-Line Text Field ................... -->
+
+<!ENTITY % textarea.element  "INCLUDE" >
+<![%textarea.element;[
+<!ENTITY % textarea.content  "( #PCDATA )" >
+<!ELEMENT %textarea.qname;  %textarea.content; >
+<!-- end of textarea.element -->]]>
+
+<!ENTITY % textarea.attlist  "INCLUDE" >
+<![%textarea.attlist;[
+<!ATTLIST %textarea.qname;
+      %Common.attrib;
+      name         CDATA                    #IMPLIED
+      rows         %Number.datatype;        #REQUIRED
+      cols         %Number.datatype;        #REQUIRED
+      disabled     ( disabled )             #IMPLIED
+      readonly     ( readonly )             #IMPLIED
+      tabindex     %Number.datatype;        #IMPLIED
+      accesskey    %Character.datatype;     #IMPLIED
+>
+<!-- end of textarea.attlist -->]]>
+
+<!-- fieldset: Form Control Group ...................... -->
+
+<!-- #PCDATA is to solve the mixed content problem,
+     per specification only whitespace is allowed
+-->
+
+<!ENTITY % fieldset.element  "INCLUDE" >
+<![%fieldset.element;[
+<!ENTITY % fieldset.content
+     "( #PCDATA | %legend.qname; | %Flow.mix; )*"
+>
+<!ELEMENT %fieldset.qname;  %fieldset.content; >
+<!-- end of fieldset.element -->]]>
+
+<!ENTITY % fieldset.attlist  "INCLUDE" >
+<![%fieldset.attlist;[
+<!ATTLIST %fieldset.qname;
+      %Common.attrib;
+>
+<!-- end of fieldset.attlist -->]]>
+
+<!-- legend: Fieldset Legend ........................... -->
+
+<!ENTITY % legend.element  "INCLUDE" >
+<![%legend.element;[
+<!ENTITY % legend.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ELEMENT %legend.qname;  %legend.content; >
+<!-- end of legend.element -->]]>
+
+<!ENTITY % legend.attlist  "INCLUDE" >
+<![%legend.attlist;[
+<!ATTLIST %legend.qname;
+      %Common.attrib;
+      accesskey    %Character.datatype;     #IMPLIED
+>
+<!-- end of legend.attlist -->]]>
+
+<!-- button: Push Button ............................... -->
+
+<!ENTITY % button.element  "INCLUDE" >
+<![%button.element;[
+<!ENTITY % button.content
+     "( #PCDATA
+      | %BlkNoForm.mix;
+      | %InlStruct.class;
+      %InlPhras.class;
+      %InlPres.class;
+      %I18n.class;
+      %InlSpecial.class;
+      %Inline.extra; )*"
+>
+<!ELEMENT %button.qname;  %button.content; >
+<!-- end of button.element -->]]>
+
+<!ENTITY % button.attlist  "INCLUDE" >
+<![%button.attlist;[
+<!ATTLIST %button.qname;
+      %Common.attrib;
+      name         CDATA                    #IMPLIED
+      value        CDATA                    #IMPLIED
+      type         ( button | submit | reset ) 'submit'
+      disabled     ( disabled )             #IMPLIED
+      tabindex     %Number.datatype;        #IMPLIED
+      accesskey    %Character.datatype;     #IMPLIED
+>
+<!-- end of button.attlist -->]]>
+
+<!-- end of xhtml-form-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-framework-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-framework-1.mod
new file mode 100644
index 000000000000..c6a22acb20a2
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-framework-1.mod
@@ -0,0 +1,98 @@
+<!-- ...................................................................... -->
+<!-- XHTML Modular Framework Module  ...................................... -->
+<!-- file: xhtml-framework-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-framework-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
+       SYSTEM "xhtml-framework-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Modular Framework
+
+     This required module instantiates the modules needed
+     to support the XHTML modularization model, including:
+
+        +  notations
+        +  datatypes
+        +  namespace-qualified names
+        +  common attributes
+        +  document model
+        +  character entities
+
+     The Intrinsic Events module is ignored by default but
+     occurs in this module because it must be instantiated
+     prior to Attributes but after Datatypes.
+-->
+
+<!ENTITY % xhtml-arch.module "IGNORE" >
+<![%xhtml-arch.module;[
+<!ENTITY % xhtml-arch.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
+            "xhtml-arch-1.mod" >
+%xhtml-arch.mod;]]>
+
+<!ENTITY % xhtml-notations.module "INCLUDE" >
+<![%xhtml-notations.module;[
+<!ENTITY % xhtml-notations.mod
+     PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
+            "xhtml-notations-1.mod" >
+%xhtml-notations.mod;]]>
+
+<!ENTITY % xhtml-datatypes.module "INCLUDE" >
+<![%xhtml-datatypes.module;[
+<!ENTITY % xhtml-datatypes.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
+            "xhtml-datatypes-1.mod" >
+%xhtml-datatypes.mod;]]>
+
+<!-- placeholder for XLink support module -->
+<!ENTITY % xhtml-xlink.mod "" >
+%xhtml-xlink.mod;
+
+<!ENTITY % xhtml-qname.module "INCLUDE" >
+<![%xhtml-qname.module;[
+<!ENTITY % xhtml-qname.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
+            "xhtml-qname-1.mod" >
+%xhtml-qname.mod;]]>
+
+<!ENTITY % xhtml-events.module "IGNORE" >
+<![%xhtml-events.module;[
+<!ENTITY % xhtml-events.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
+            "xhtml-events-1.mod" >
+%xhtml-events.mod;]]>
+
+<!ENTITY % xhtml-attribs.module "INCLUDE" >
+<![%xhtml-attribs.module;[
+<!ENTITY % xhtml-attribs.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
+            "xhtml-attribs-1.mod" >
+%xhtml-attribs.mod;]]>
+
+<!-- placeholder for content model redeclarations -->
+<!ENTITY % xhtml-model.redecl "" >
+%xhtml-model.redecl;
+
+<!ENTITY % xhtml-model.module "INCLUDE" >
+<![%xhtml-model.module;[
+<!-- instantiate the Document Model module declared in the DTD driver
+-->
+%xhtml-model.mod;]]>
+
+<!ENTITY % xhtml-charent.module "INCLUDE" >
+<![%xhtml-charent.module;[
+<!ENTITY % xhtml-charent.mod
+     PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
+            "xhtml-charent-1.mod" >
+%xhtml-charent.mod;]]>
+
+<!-- end of xhtml-framework-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-hypertext-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-hypertext-1.mod
new file mode 100644
index 000000000000..160c7b80fba8
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-hypertext-1.mod
@@ -0,0 +1,54 @@
+<!-- ...................................................................... -->
+<!-- XHTML Hypertext Module  .............................................. -->
+<!-- file: xhtml-hypertext-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-hypertext-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
+       SYSTEM "xhtml-hypertext-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Hypertext
+
+        a
+
+     This module declares the anchor ('a') element type, which
+     defines the source of a hypertext link. The destination
+     (or link 'target') is identified via its 'id' attribute
+     rather than the 'name' attribute as was used in HTML.
+-->
+
+<!-- ............  Anchor Element  ............ -->
+
+<!ENTITY % a.element  "INCLUDE" >
+<![%a.element;[
+<!ENTITY % a.content
+     "( #PCDATA | %InlNoAnchor.mix; )*"
+>
+<!ENTITY % a.qname  "a" >
+<!ELEMENT %a.qname;  %a.content; >
+<!-- end of a.element -->]]>
+
+<!ENTITY % a.attlist  "INCLUDE" >
+<![%a.attlist;[
+<!ATTLIST %a.qname;
+      %Common.attrib;
+      href         %URI.datatype;           #IMPLIED
+      charset      %Charset.datatype;       #IMPLIED
+      type         %ContentType.datatype;   #IMPLIED
+      hreflang     %LanguageCode.datatype;  #IMPLIED
+      rel          %LinkTypes.datatype;     #IMPLIED
+      rev          %LinkTypes.datatype;     #IMPLIED
+      accesskey    %Character.datatype;     #IMPLIED
+      tabindex     %Number.datatype;        #IMPLIED
+>
+<!-- end of a.attlist -->]]>
+
+<!-- end of xhtml-hypertext-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-image-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-image-1.mod
new file mode 100644
index 000000000000..251bcecbff67
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-image-1.mod
@@ -0,0 +1,50 @@
+<!-- ...................................................................... -->
+<!-- XHTML Images Module  ................................................. -->
+<!-- file: xhtml-image-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Rovision: $Id: xhtml-image-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
+       SYSTEM "xhtml-image-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Images
+
+        img
+
+     This module provides markup to support basic image embedding.
+-->
+
+<!-- To avoid problems with text-only UAs as well as to make
+     image content understandable and navigable to users of
+     non-visual UAs, you need to provide a description with
+     the 'alt' attribute, and avoid server-side image maps.
+-->
+
+<!ENTITY % img.element  "INCLUDE" >
+<![%img.element;[
+<!ENTITY % img.content  "EMPTY" >
+<!ENTITY % img.qname  "img" >
+<!ELEMENT %img.qname;  %img.content; >
+<!-- end of img.element -->]]>
+
+<!ENTITY % img.attlist  "INCLUDE" >
+<![%img.attlist;[
+<!ATTLIST %img.qname;
+      %Common.attrib;
+      src          %URI.datatype;           #REQUIRED
+      alt          %Text.datatype;          #REQUIRED
+      longdesc     %URI.datatype;           #IMPLIED
+      height       %Length.datatype;        #IMPLIED
+      width        %Length.datatype;        #IMPLIED
+>
+<!-- end of img.attlist -->]]>
+
+<!-- end of xhtml-image-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-inlphras-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-inlphras-1.mod
new file mode 100644
index 000000000000..6c7b87f85c6c
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-inlphras-1.mod
@@ -0,0 +1,203 @@
+<!-- ...................................................................... -->
+<!-- XHTML Inline Phrasal Module  ......................................... -->
+<!-- file: xhtml-inlphras-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-inlphras-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
+       SYSTEM "xhtml-inlphras-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Inline Phrasal
+
+        abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
+
+     This module declares the elements and their attributes used to
+     support inline-level phrasal markup.
+-->
+
+<!ENTITY % abbr.element  "INCLUDE" >
+<![%abbr.element;[
+<!ENTITY % abbr.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % abbr.qname  "abbr" >
+<!ELEMENT %abbr.qname;  %abbr.content; >
+<!-- end of abbr.element -->]]>
+
+<!ENTITY % abbr.attlist  "INCLUDE" >
+<![%abbr.attlist;[
+<!ATTLIST %abbr.qname;
+      %Common.attrib;
+>
+<!-- end of abbr.attlist -->]]>
+
+<!ENTITY % acronym.element  "INCLUDE" >
+<![%acronym.element;[
+<!ENTITY % acronym.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % acronym.qname  "acronym" >
+<!ELEMENT %acronym.qname;  %acronym.content; >
+<!-- end of acronym.element -->]]>
+
+<!ENTITY % acronym.attlist  "INCLUDE" >
+<![%acronym.attlist;[
+<!ATTLIST %acronym.qname;
+      %Common.attrib;
+>
+<!-- end of acronym.attlist -->]]>
+
+<!ENTITY % cite.element  "INCLUDE" >
+<![%cite.element;[
+<!ENTITY % cite.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % cite.qname  "cite" >
+<!ELEMENT %cite.qname;  %cite.content; >
+<!-- end of cite.element -->]]>
+
+<!ENTITY % cite.attlist  "INCLUDE" >
+<![%cite.attlist;[
+<!ATTLIST %cite.qname;
+      %Common.attrib;
+>
+<!-- end of cite.attlist -->]]>
+
+<!ENTITY % code.element  "INCLUDE" >
+<![%code.element;[
+<!ENTITY % code.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % code.qname  "code" >
+<!ELEMENT %code.qname;  %code.content; >
+<!-- end of code.element -->]]>
+
+<!ENTITY % code.attlist  "INCLUDE" >
+<![%code.attlist;[
+<!ATTLIST %code.qname;
+      %Common.attrib;
+>
+<!-- end of code.attlist -->]]>
+
+<!ENTITY % dfn.element  "INCLUDE" >
+<![%dfn.element;[
+<!ENTITY % dfn.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % dfn.qname  "dfn" >
+<!ELEMENT %dfn.qname;  %dfn.content; >
+<!-- end of dfn.element -->]]>
+
+<!ENTITY % dfn.attlist  "INCLUDE" >
+<![%dfn.attlist;[
+<!ATTLIST %dfn.qname;
+      %Common.attrib;
+>
+<!-- end of dfn.attlist -->]]>
+
+<!ENTITY % em.element  "INCLUDE" >
+<![%em.element;[
+<!ENTITY % em.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % em.qname  "em" >
+<!ELEMENT %em.qname;  %em.content; >
+<!-- end of em.element -->]]>
+
+<!ENTITY % em.attlist  "INCLUDE" >
+<![%em.attlist;[
+<!ATTLIST %em.qname;
+      %Common.attrib;
+>
+<!-- end of em.attlist -->]]>
+
+<!ENTITY % kbd.element  "INCLUDE" >
+<![%kbd.element;[
+<!ENTITY % kbd.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % kbd.qname  "kbd" >
+<!ELEMENT %kbd.qname;  %kbd.content; >
+<!-- end of kbd.element -->]]>
+
+<!ENTITY % kbd.attlist  "INCLUDE" >
+<![%kbd.attlist;[
+<!ATTLIST %kbd.qname;
+      %Common.attrib;
+>
+<!-- end of kbd.attlist -->]]>
+
+<!ENTITY % q.element  "INCLUDE" >
+<![%q.element;[
+<!ENTITY % q.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % q.qname  "q" >
+<!ELEMENT %q.qname;  %q.content; >
+<!-- end of q.element -->]]>
+
+<!ENTITY % q.attlist  "INCLUDE" >
+<![%q.attlist;[
+<!ATTLIST %q.qname;
+      %Common.attrib;
+      cite         %URI.datatype;           #IMPLIED
+>
+<!-- end of q.attlist -->]]>
+
+<!ENTITY % samp.element  "INCLUDE" >
+<![%samp.element;[
+<!ENTITY % samp.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % samp.qname  "samp" >
+<!ELEMENT %samp.qname;  %samp.content; >
+<!-- end of samp.element -->]]>
+
+<!ENTITY % samp.attlist  "INCLUDE" >
+<![%samp.attlist;[
+<!ATTLIST %samp.qname;
+      %Common.attrib;
+>
+<!-- end of samp.attlist -->]]>
+
+<!ENTITY % strong.element  "INCLUDE" >
+<![%strong.element;[
+<!ENTITY % strong.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % strong.qname  "strong" >
+<!ELEMENT %strong.qname;  %strong.content; >
+<!-- end of strong.element -->]]>
+
+<!ENTITY % strong.attlist  "INCLUDE" >
+<![%strong.attlist;[
+<!ATTLIST %strong.qname;
+      %Common.attrib;
+>
+<!-- end of strong.attlist -->]]>
+
+<!ENTITY % var.element  "INCLUDE" >
+<![%var.element;[
+<!ENTITY % var.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % var.qname  "var" >
+<!ELEMENT %var.qname;  %var.content; >
+<!-- end of var.element -->]]>
+
+<!ENTITY % var.attlist  "INCLUDE" >
+<![%var.attlist;[
+<!ATTLIST %var.qname;
+      %Common.attrib;
+>
+<!-- end of var.attlist -->]]>
+
+<!-- end of xhtml-inlphras-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-inlstruct-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-inlstruct-1.mod
new file mode 100644
index 000000000000..6e277a21f3b5
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-inlstruct-1.mod
@@ -0,0 +1,62 @@
+<!-- ...................................................................... -->
+<!-- XHTML Inline Structural Module  ...................................... -->
+<!-- file: xhtml-inlstruct-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-inlstruct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
+       SYSTEM "xhtml-inlstruct-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Inline Structural
+
+        br, span
+
+     This module declares the elements and their attributes
+     used to support inline-level structural markup.
+-->
+
+<!-- br: forced line break ............................. -->
+
+<!ENTITY % br.element  "INCLUDE" >
+<![%br.element;[
+
+<!ENTITY % br.content  "EMPTY" >
+<!ENTITY % br.qname  "br" >
+<!ELEMENT %br.qname;  %br.content; >
+
+<!-- end of br.element -->]]>
+
+<!ENTITY % br.attlist  "INCLUDE" >
+<![%br.attlist;[
+<!ATTLIST %br.qname;
+      %Core.attrib;
+>
+<!-- end of br.attlist -->]]>
+
+<!-- span: generic inline container .................... -->
+
+<!ENTITY % span.element  "INCLUDE" >
+<![%span.element;[
+<!ENTITY % span.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ENTITY % span.qname  "span" >
+<!ELEMENT %span.qname;  %span.content; >
+<!-- end of span.element -->]]>
+
+<!ENTITY % span.attlist  "INCLUDE" >
+<![%span.attlist;[
+<!ATTLIST %span.qname;
+      %Common.attrib;
+>
+<!-- end of span.attlist -->]]>
+
+<!-- end of xhtml-inlstruct-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-inputmode-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-inputmode-1.mod
new file mode 100644
index 000000000000..fb5a69b5e543
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-inputmode-1.mod
@@ -0,0 +1,39 @@
+<!-- ...................................................................... -->
+<!-- XHTML Inputmode Module  .............................................. -->
+<!-- file: xhtml-inputmode-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-inputmode-1.mod,v 1.1 2006/07/05 16:29:09 matthieu Exp $
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Inputmode 1.0//EN"
+       SYSTEM "xhtml-inputmode-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Inputmode 
+
+        inputmode
+
+     This module declares the 'inputmode' attribute used for suggesting the
+     input mode associated with an input or textarea element.
+-->
+
+<!-- render in this frame --> 
+<!ENTITY % Inputmode.datatype "CDATA" >
+
+<!-- add 'inputmode' attribute to 'input' element -->
+<!ATTLIST %input.qname;
+      inputmode       %Inputmode.datatype;   #IMPLIED
+>
+
+<!-- add 'inputmode' attribute to 'textarea' element -->
+<!ATTLIST %textarea.qname;
+      inputmode       %Inputmode.datatype;   #IMPLIED
+>
+
+<!-- end of xhtml-inputmode-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-lat1.ent b/xml/tests/testData/xml/XHtmlValidation3/xhtml-lat1.ent
new file mode 100644
index 000000000000..ffee223eb105
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-lat1.ent
@@ -0,0 +1,196 @@
+<!-- Portions (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+-->
+<!-- Character entity set. Typical invocation:
+    <!ENTITY % HTMLlat1 PUBLIC
+       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
+    %HTMLlat1;
+-->
+
+<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
+                                  U+00A0 ISOnum -->
+<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
+<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
+<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
+<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
+<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
+<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
+                                  U+00A6 ISOnum -->
+<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
+<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
+                                  U+00A8 ISOdia -->
+<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
+<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
+<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
+                                  = left pointing guillemet, U+00AB ISOnum -->
+<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
+                                  U+00AC ISOnum -->
+<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
+                                  U+00AD ISOnum -->
+<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
+                                  U+00AE ISOnum -->
+<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
+                                  = APL overbar, U+00AF ISOdia -->
+<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
+<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
+                                  U+00B1 ISOnum -->
+<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
+                                  = squared, U+00B2 ISOnum -->
+<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
+                                  = cubed, U+00B3 ISOnum -->
+<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
+                                  U+00B4 ISOdia -->
+<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
+<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
+                                  U+00B6 ISOnum -->
+<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
+                                  = Greek middle dot, U+00B7 ISOnum -->
+<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
+<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
+                                  U+00B9 ISOnum -->
+<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
+                                  U+00BA ISOnum -->
+<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
+                                  = right pointing guillemet, U+00BB ISOnum -->
+<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
+                                  = fraction one quarter, U+00BC ISOnum -->
+<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
+                                  = fraction one half, U+00BD ISOnum -->
+<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
+                                  = fraction three quarters, U+00BE ISOnum -->
+<!ENTITY iquest "&#191;"> <!-- inverted question mark
+                                  = turned question mark, U+00BF ISOnum -->
+<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
+                                  = latin capital letter A grave,
+                                  U+00C0 ISOlat1 -->
+<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
+                                  U+00C1 ISOlat1 -->
+<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
+                                  U+00C2 ISOlat1 -->
+<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
+                                  U+00C3 ISOlat1 -->
+<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
+                                  U+00C4 ISOlat1 -->
+<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
+                                  = latin capital letter A ring,
+                                  U+00C5 ISOlat1 -->
+<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
+                                  = latin capital ligature AE,
+                                  U+00C6 ISOlat1 -->
+<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
+                                  U+00C7 ISOlat1 -->
+<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
+                                  U+00C8 ISOlat1 -->
+<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
+                                  U+00C9 ISOlat1 -->
+<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
+                                  U+00CA ISOlat1 -->
+<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
+                                  U+00CB ISOlat1 -->
+<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
+                                  U+00CC ISOlat1 -->
+<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
+                                  U+00CD ISOlat1 -->
+<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
+                                  U+00CE ISOlat1 -->
+<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
+                                  U+00CF ISOlat1 -->
+<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
+<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
+                                  U+00D1 ISOlat1 -->
+<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
+                                  U+00D2 ISOlat1 -->
+<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
+                                  U+00D3 ISOlat1 -->
+<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
+                                  U+00D4 ISOlat1 -->
+<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
+                                  U+00D5 ISOlat1 -->
+<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
+                                  U+00D6 ISOlat1 -->
+<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
+<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
+                                  = latin capital letter O slash,
+                                  U+00D8 ISOlat1 -->
+<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
+                                  U+00D9 ISOlat1 -->
+<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
+                                  U+00DA ISOlat1 -->
+<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
+                                  U+00DB ISOlat1 -->
+<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
+                                  U+00DC ISOlat1 -->
+<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
+                                  U+00DD ISOlat1 -->
+<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
+                                  U+00DE ISOlat1 -->
+<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
+                                  U+00DF ISOlat1 -->
+<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
+                                  = latin small letter a grave,
+                                  U+00E0 ISOlat1 -->
+<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
+                                  U+00E1 ISOlat1 -->
+<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
+                                  U+00E2 ISOlat1 -->
+<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
+                                  U+00E3 ISOlat1 -->
+<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
+                                  U+00E4 ISOlat1 -->
+<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
+                                  = latin small letter a ring,
+                                  U+00E5 ISOlat1 -->
+<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
+                                  = latin small ligature ae, U+00E6 ISOlat1 -->
+<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
+                                  U+00E7 ISOlat1 -->
+<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
+                                  U+00E8 ISOlat1 -->
+<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
+                                  U+00E9 ISOlat1 -->
+<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
+                                  U+00EA ISOlat1 -->
+<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
+                                  U+00EB ISOlat1 -->
+<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
+                                  U+00EC ISOlat1 -->
+<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
+                                  U+00ED ISOlat1 -->
+<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
+                                  U+00EE ISOlat1 -->
+<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
+                                  U+00EF ISOlat1 -->
+<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
+<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
+                                  U+00F1 ISOlat1 -->
+<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
+                                  U+00F2 ISOlat1 -->
+<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
+                                  U+00F3 ISOlat1 -->
+<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
+                                  U+00F4 ISOlat1 -->
+<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
+                                  U+00F5 ISOlat1 -->
+<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
+                                  U+00F6 ISOlat1 -->
+<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
+<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
+                                  = latin small letter o slash,
+                                  U+00F8 ISOlat1 -->
+<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
+                                  U+00F9 ISOlat1 -->
+<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
+                                  U+00FA ISOlat1 -->
+<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
+                                  U+00FB ISOlat1 -->
+<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
+                                  U+00FC ISOlat1 -->
+<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
+                                  U+00FD ISOlat1 -->
+<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn,
+                                  U+00FE ISOlat1 -->
+<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
+                                  U+00FF ISOlat1 -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-link-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-link-1.mod
new file mode 100644
index 000000000000..a7587a612cb0
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-link-1.mod
@@ -0,0 +1,59 @@
+<!-- ...................................................................... -->
+<!-- XHTML Link Element Module  ........................................... -->
+<!-- file: xhtml-link-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-link-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
+       SYSTEM "xhtml-link-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Link element
+
+        link
+
+     This module declares the link element type and its attributes,
+     which could (in principle) be used to define document-level links
+     to external resources such as:
+
+     a) for document specific toolbars/menus, e.g. start, contents,
+        previous, next, index, end, help
+     b) to link to a separate style sheet (rel="stylesheet")
+     c) to make a link to a script (rel="script")
+     d) by style sheets to control how collections of html nodes are
+        rendered into printed documents
+     e) to make a link to a printable version of this document
+        e.g. a postscript or pdf version (rel="alternate" media="print")
+-->
+
+<!-- link: Media-Independent Link ...................... -->
+
+<!ENTITY % link.element  "INCLUDE" >
+<![%link.element;[
+<!ENTITY % link.content  "EMPTY" >
+<!ENTITY % link.qname  "link" >
+<!ELEMENT %link.qname;  %link.content; >
+<!-- end of link.element -->]]>
+
+<!ENTITY % link.attlist  "INCLUDE" >
+<![%link.attlist;[
+<!ATTLIST %link.qname;
+      %Common.attrib;
+      charset      %Charset.datatype;       #IMPLIED
+      href         %URI.datatype;           #IMPLIED
+      hreflang     %LanguageCode.datatype;  #IMPLIED
+      type         %ContentType.datatype;   #IMPLIED
+      rel          %LinkTypes.datatype;     #IMPLIED
+      rev          %LinkTypes.datatype;     #IMPLIED
+      media        %MediaDesc.datatype;     #IMPLIED
+>
+<!-- end of link.attlist -->]]>
+
+<!-- end of xhtml-link-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-list-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-list-1.mod
new file mode 100644
index 000000000000..4c73ab58d519
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-list-1.mod
@@ -0,0 +1,129 @@
+<!-- ...................................................................... -->
+<!-- XHTML Lists Module  .................................................. -->
+<!-- file: xhtml-list-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-list-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
+       SYSTEM "xhtml-list-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Lists
+
+        dl, dt, dd, ol, ul, li
+
+     This module declares the list-oriented element types
+     and their attributes.
+-->
+
+<!ENTITY % dl.qname  "dl" >
+<!ENTITY % dt.qname  "dt" >
+<!ENTITY % dd.qname  "dd" >
+<!ENTITY % ol.qname  "ol" >
+<!ENTITY % ul.qname  "ul" >
+<!ENTITY % li.qname  "li" >
+
+<!-- dl: Definition List ............................... -->
+
+<!ENTITY % dl.element  "INCLUDE" >
+<![%dl.element;[
+<!ENTITY % dl.content  "( %dt.qname; | %dd.qname; )+" >
+<!ELEMENT %dl.qname;  %dl.content; >
+<!-- end of dl.element -->]]>
+
+<!ENTITY % dl.attlist  "INCLUDE" >
+<![%dl.attlist;[
+<!ATTLIST %dl.qname;
+      %Common.attrib;
+>
+<!-- end of dl.attlist -->]]>
+
+<!-- dt: Definition Term ............................... -->
+
+<!ENTITY % dt.element  "INCLUDE" >
+<![%dt.element;[
+<!ENTITY % dt.content
+     "( #PCDATA | %Inline.mix; )*"
+>
+<!ELEMENT %dt.qname;  %dt.content; >
+<!-- end of dt.element -->]]>
+
+<!ENTITY % dt.attlist  "INCLUDE" >
+<![%dt.attlist;[
+<!ATTLIST %dt.qname;
+      %Common.attrib;
+>
+<!-- end of dt.attlist -->]]>
+
+<!-- dd: Definition Description ........................ -->
+
+<!ENTITY % dd.element  "INCLUDE" >
+<![%dd.element;[
+<!ENTITY % dd.content
+     "( #PCDATA | %Flow.mix; )*"
+>
+<!ELEMENT %dd.qname;  %dd.content; >
+<!-- end of dd.element -->]]>
+
+<!ENTITY % dd.attlist  "INCLUDE" >
+<![%dd.attlist;[
+<!ATTLIST %dd.qname;
+      %Common.attrib;
+>
+<!-- end of dd.attlist -->]]>
+
+<!-- ol: Ordered List (numbered styles) ................ -->
+
+<!ENTITY % ol.element  "INCLUDE" >
+<![%ol.element;[
+<!ENTITY % ol.content  "( %li.qname; )+" >
+<!ELEMENT %ol.qname;  %ol.content; >
+<!-- end of ol.element -->]]>
+
+<!ENTITY % ol.attlist  "INCLUDE" >
+<![%ol.attlist;[
+<!ATTLIST %ol.qname;
+      %Common.attrib;
+>
+<!-- end of ol.attlist -->]]>
+
+<!-- ul: Unordered List (bullet styles) ................ -->
+
+<!ENTITY % ul.element  "INCLUDE" >
+<![%ul.element;[
+<!ENTITY % ul.content  "( %li.qname; )+" >
+<!ELEMENT %ul.qname;  %ul.content; >
+<!-- end of ul.element -->]]>
+
+<!ENTITY % ul.attlist  "INCLUDE" >
+<![%ul.attlist;[
+<!ATTLIST %ul.qname;
+      %Common.attrib;
+>
+<!-- end of ul.attlist -->]]>
+
+<!-- li: List Item ..................................... -->
+
+<!ENTITY % li.element  "INCLUDE" >
+<![%li.element;[
+<!ENTITY % li.content
+     "( #PCDATA | %Flow.mix; )*"
+>
+<!ELEMENT %li.qname;  %li.content; >
+<!-- end of li.element -->]]>
+
+<!ENTITY % li.attlist  "INCLUDE" >
+<![%li.attlist;[
+<!ATTLIST %li.qname;
+      %Common.attrib;
+>
+<!-- end of li.attlist -->]]>
+
+<!-- end of xhtml-list-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-meta-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-meta-1.mod
new file mode 100644
index 000000000000..a0200f70bd5a
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-meta-1.mod
@@ -0,0 +1,47 @@
+<!-- ...................................................................... -->
+<!-- XHTML Document Metainformation Module  ............................... -->
+<!-- file: xhtml-meta-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-meta-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
+       SYSTEM "xhtml-meta-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Meta Information
+
+        meta
+
+     This module declares the meta element type and its attributes,
+     used to provide declarative document metainformation.
+-->
+
+<!-- meta: Generic Metainformation ..................... -->
+
+<!ENTITY % meta.element  "INCLUDE" >
+<![%meta.element;[
+<!ENTITY % meta.content  "EMPTY" >
+<!ENTITY % meta.qname  "meta" >
+<!ELEMENT %meta.qname;  %meta.content; >
+<!-- end of meta.element -->]]>
+
+<!ENTITY % meta.attlist  "INCLUDE" >
+<![%meta.attlist;[
+<!ATTLIST %meta.qname;
+      %XHTML.xmlns.attrib;
+      %I18n.attrib;
+      http-equiv   NMTOKEN                  #IMPLIED
+      name         NMTOKEN                  #IMPLIED
+      content      CDATA                    #REQUIRED
+      scheme       CDATA                    #IMPLIED
+>
+<!-- end of meta.attlist -->]]>
+
+<!-- end of xhtml-meta-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-notations-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-notations-1.mod
new file mode 100644
index 000000000000..ac970b6ea0d6
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-notations-1.mod
@@ -0,0 +1,114 @@
+<!-- ...................................................................... -->
+<!-- XHTML Notations Module  .............................................. -->
+<!-- file: xhtml-notations-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-notations-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
+       SYSTEM "xhtml-notations-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Notations
+
+     defines the following notations, many of these imported from
+     other specifications and standards. When an existing FPI is
+     known, it is incorporated here.
+-->
+
+<!-- XML Notations ..................................... -->
+<!-- SGML and XML Notations ............................ -->
+
+<!-- W3C XML 1.0 Recommendation -->
+<!NOTATION w3c-xml
+     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
+
+<!-- XML 1.0 CDATA -->
+<!NOTATION cdata
+     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
+
+<!-- SGML Formal Public Identifiers -->
+<!NOTATION fpi
+     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
+
+<!-- XHTML Notations ................................... -->
+
+<!-- Length defined for cellpadding/cellspacing -->
+
+<!-- nn for pixels or nn% for percentage length -->
+<!NOTATION length
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
+
+<!-- space-separated list of link types -->
+<!NOTATION linkTypes
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
+
+<!-- single or comma-separated list of media descriptors -->
+<!NOTATION mediaDesc
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
+
+<!-- pixel, percentage, or relative -->
+<!NOTATION multiLength
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
+
+<!-- one or more digits (NUMBER) -->
+<!NOTATION number
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
+
+<!-- integer representing length in pixels -->
+<!NOTATION pixels
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
+
+<!-- script expression -->
+<!NOTATION script
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
+
+<!-- textual content -->
+<!NOTATION text
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
+
+<!-- Imported Notations ................................ -->
+
+<!-- a single character from [ISO10646] -->
+<!NOTATION character
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
+
+<!-- a character encoding, as per [RFC2045] -->
+<!NOTATION charset
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
+
+<!-- a space separated list of character encodings, as per [RFC2045] -->
+<!NOTATION charsets
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
+
+<!-- media type, as per [RFC2045] -->
+<!NOTATION contentType
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
+
+<!-- comma-separated list of media types, as per [RFC2045] -->
+<!NOTATION contentTypes
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
+
+<!-- date and time information. ISO date format -->
+<!NOTATION datetime
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
+
+<!-- a language code, as per [RFC3066] -->
+<!NOTATION languageCode
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
+
+<!-- a Uniform Resource Identifier, see [URI] -->
+<!NOTATION uri
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
+
+<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
+<!NOTATION uris
+    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
+
+<!-- end of xhtml-notations-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-object-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-object-1.mod
new file mode 100644
index 000000000000..744f0e76d4ec
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-object-1.mod
@@ -0,0 +1,60 @@
+<!-- ...................................................................... -->
+<!-- XHTML Embedded Object Module  ........................................ -->
+<!-- file: xhtml-object-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-object-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
+       SYSTEM "xhtml-object-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Embedded Objects
+
+        object
+
+     This module declares the object element type and its attributes, used
+     to embed external objects as part of XHTML pages. In the document,
+     place param elements prior to other content within the object element.
+
+     Note that use of this module requires instantiation of the Param
+     Element Module.
+-->
+
+<!-- object: Generic Embedded Object ................... -->
+
+<!ENTITY % object.element  "INCLUDE" >
+<![%object.element;[
+<!ENTITY % object.content
+     "( #PCDATA | %Flow.mix; | %param.qname; )*"
+>
+<!ENTITY % object.qname  "object" >
+<!ELEMENT %object.qname;  %object.content; >
+<!-- end of object.element -->]]>
+
+<!ENTITY % object.attlist  "INCLUDE" >
+<![%object.attlist;[
+<!ATTLIST %object.qname;
+      %Common.attrib;
+      declare      ( declare )              #IMPLIED
+      classid      %URI.datatype;           #IMPLIED
+      codebase     %URI.datatype;           #IMPLIED
+      data         %URI.datatype;           #IMPLIED
+      type         %ContentType.datatype;   #IMPLIED
+      codetype     %ContentType.datatype;   #IMPLIED
+      archive      %URIs.datatype;          #IMPLIED
+      standby      %Text.datatype;          #IMPLIED
+      height       %Length.datatype;        #IMPLIED
+      width        %Length.datatype;        #IMPLIED
+      name         CDATA                    #IMPLIED
+      tabindex     %Number.datatype;        #IMPLIED
+>
+<!-- end of object.attlist -->]]>
+
+<!-- end of xhtml-object-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-param-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-param-1.mod
new file mode 100644
index 000000000000..4d1fd2e40c1a
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-param-1.mod
@@ -0,0 +1,48 @@
+<!-- ...................................................................... -->
+<!-- XHTML Param Element Module  ..................................... -->
+<!-- file: xhtml-param-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-param-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
+       SYSTEM "xhtml-param-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Parameters for Java Applets and Embedded Objects
+
+        param
+
+     This module provides declarations for the param element,
+     used to provide named property values for the applet
+     and object elements.
+-->
+
+<!-- param: Named Property Value ....................... -->
+
+<!ENTITY % param.element  "INCLUDE" >
+<![%param.element;[
+<!ENTITY % param.content  "EMPTY" >
+<!ENTITY % param.qname  "param" >
+<!ELEMENT %param.qname;  %param.content; >
+<!-- end of param.element -->]]>
+
+<!ENTITY % param.attlist  "INCLUDE" >
+<![%param.attlist;[
+<!ATTLIST %param.qname;
+      %XHTML.xmlns.attrib;
+      %id.attrib;
+      name         CDATA                    #REQUIRED
+      value        CDATA                    #IMPLIED
+      valuetype    ( data | ref | object )  'data'
+      type         %ContentType.datatype;   #IMPLIED
+>
+<!-- end of param.attlist -->]]>
+
+<!-- end of xhtml-param-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-qname-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-qname-1.mod
new file mode 100644
index 000000000000..5e8b3788fe23
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-qname-1.mod
@@ -0,0 +1,318 @@
+<!-- ....................................................................... -->
+<!-- XHTML Qname Module  ................................................... -->
+<!-- file: xhtml-qname-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-qname-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
+       SYSTEM "xhtml-qname-1.mod"
+
+     Revisions:
+#2000-10-22: added qname declarations for ruby elements
+     ....................................................................... -->
+
+<!-- XHTML Qname (Qualified Name) Module
+
+     This module is contained in two parts, labeled Section 'A' and 'B':
+
+       Section A declares parameter entities to support namespace-
+       qualified names, namespace declarations, and name prefixing
+       for XHTML and extensions.
+
+       Section B declares parameter entities used to provide
+       namespace-qualified names for all XHTML element types:
+
+         %applet.qname;   the xmlns-qualified name for <applet>
+         %base.qname;     the xmlns-qualified name for <base>
+         ...
+
+     XHTML extensions would create a module similar to this one.
+     Included in the XHTML distribution is a template module
+     ('template-qname-1.mod') suitable for this purpose.
+-->
+
+<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
+
+<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
+        to activate namespace prefixing. The default value should
+        inherit '%NS.prefixed;' from the DTD driver, so that unless
+        overridden, the default behaviour follows the overall DTD
+        prefixing scheme.
+-->
+<!ENTITY % NS.prefixed "IGNORE" >
+<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
+
+<!-- By default, we always permit XHTML attribute collections to have
+     namespace-qualified prefixes as well.
+-->
+<!ENTITY % XHTML.global.attrs.prefixed "INCLUDE" >
+<!-- By default, we allow the XML Schema attributes on the root
+     element.
+-->
+<!ENTITY % XHTML.xsi.attrs "INCLUDE" >
+
+<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
+        the URI reference used to identify the XHTML namespace:
+-->
+<!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
+
+<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
+        the default namespace prefix string(s) to use when prefixing
+        is enabled. This may be overridden in the DTD driver or the
+        internal subset of an document instance. If no default prefix
+        is desired, this may be declared as an empty string.
+
+     NOTE: As specified in [XMLNAMES], the namespace prefix serves
+     as a proxy for the URI reference, and is not in itself significant.
+-->
+<!ENTITY % XHTML.prefix  "xhtml" >
+
+<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
+        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
+        prefixing is active, an empty string when it is not.
+-->
+<![%XHTML.prefixed;[
+<!ENTITY % XHTML.pfx  "%XHTML.prefix;:" >
+]]>
+<!ENTITY % XHTML.pfx  "" >
+
+<!-- declare qualified name extensions here ............ -->
+<!ENTITY % xhtml-qname-extra.mod "" >
+%xhtml-qname-extra.mod;
+
+<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
+        redeclared to contain any non-XHTML namespace declaration
+        attributes for namespaces embedded in XHTML. The default
+        is an empty string.  XLink should be included here if used
+        in the DTD.
+-->
+<!ENTITY % XHTML.xmlns.extra.attrib "" >
+
+<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
+
+<!-- Declare a parameter entity %NS.decl.attrib; containing
+     all XML Namespace declarations used in the DTD, plus the
+     xmlns declaration for XHTML, its form dependent on whether
+     prefixing is active.
+-->
+<!ENTITY % XHTML.xmlns.attrib.prefixed
+     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'"
+>
+<![%XHTML.prefixed;[
+<!ENTITY % NS.decl.attrib
+     "%XHTML.xmlns.attrib.prefixed;
+      %XHTML.xmlns.extra.attrib;"
+>
+]]>
+<!ENTITY % NS.decl.attrib
+     "%XHTML.xmlns.extra.attrib;"
+>
+
+<!-- Declare a parameter entity %XSI.prefix as a prefix to use for XML
+     Schema Instance attributes.
+-->
+<!ENTITY % XSI.prefix "xsi" >
+
+<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
+
+<!-- Declare a parameter entity %XSI.xmlns.attrib as support for the
+     schemaLocation attribute, since this is legal throughout the DTD.
+-->
+<!ENTITY % XSI.xmlns.attrib
+     "xmlns:%XSI.prefix;  %URI.datatype;   #FIXED '%XSI.xmlns;'" >
+
+<!-- This is a placeholder for future XLink support.
+-->
+<!ENTITY % XLINK.xmlns.attrib "" >
+
+<!-- This is the attribute for the XML Schema namespace - XHTML
+     Modularization is also expressed in XML Schema, and it needs to
+	 be legal to declare the XML Schema namespace and the
+	 schemaLocation attribute on the root element of XHTML family
+	 documents.
+-->
+<![%XHTML.xsi.attrs;[
+<!ENTITY % XSI.prefix "xsi" >
+<!ENTITY % XSI.pfx "%XSI.prefix;:" >
+<!ENTITY % XSI.xmlns "http://www.w3.org/2001/XMLSchema-instance" >
+
+<!ENTITY % XSI.xmlns.attrib
+     "xmlns:%XSI.prefix;  %URI.datatype;    #FIXED '%XSI.xmlns;'"
+>
+]]>
+<!ENTITY % XSI.prefix "" >
+<!ENTITY % XSI.pfx "" >
+<!ENTITY % XSI.xmlns.attrib "" >
+
+
+<!-- Declare a parameter entity %NS.decl.attrib; containing all
+     XML namespace declaration attributes used by XHTML, including
+     a default xmlns attribute when prefixing is inactive.
+-->
+<![%XHTML.prefixed;[
+<!ENTITY % XHTML.xmlns.attrib
+     "%NS.decl.attrib;
+      %XSI.xmlns.attrib;
+      %XLINK.xmlns.attrib;"
+>
+]]>
+<!ENTITY % XHTML.xmlns.attrib
+     "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
+      %NS.decl.attrib;
+      %XSI.xmlns.attrib;
+      %XLINK.xmlns.attrib;"
+>
+
+<!-- placeholder for qualified name redeclarations -->
+<!ENTITY % xhtml-qname.redecl "" >
+%xhtml-qname.redecl;
+
+<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
+
+<!-- 6. This section declares parameter entities used to provide
+        namespace-qualified names for all XHTML element types.
+-->
+
+<!-- module:  xhtml-applet-1.mod -->
+<!ENTITY % applet.qname  "%XHTML.pfx;applet" >
+
+<!-- module:  xhtml-base-1.mod -->
+<!ENTITY % base.qname    "%XHTML.pfx;base" >
+
+<!-- module:  xhtml-bdo-1.mod -->
+<!ENTITY % bdo.qname     "%XHTML.pfx;bdo" >
+
+<!-- module:  xhtml-blkphras-1.mod -->
+<!ENTITY % address.qname "%XHTML.pfx;address" >
+<!ENTITY % blockquote.qname  "%XHTML.pfx;blockquote" >
+<!ENTITY % pre.qname     "%XHTML.pfx;pre" >
+<!ENTITY % h1.qname      "%XHTML.pfx;h1" >
+<!ENTITY % h2.qname      "%XHTML.pfx;h2" >
+<!ENTITY % h3.qname      "%XHTML.pfx;h3" >
+<!ENTITY % h4.qname      "%XHTML.pfx;h4" >
+<!ENTITY % h5.qname      "%XHTML.pfx;h5" >
+<!ENTITY % h6.qname      "%XHTML.pfx;h6" >
+
+<!-- module:  xhtml-blkpres-1.mod -->
+<!ENTITY % hr.qname      "%XHTML.pfx;hr" >
+
+<!-- module:  xhtml-blkstruct-1.mod -->
+<!ENTITY % div.qname     "%XHTML.pfx;div" >
+<!ENTITY % p.qname       "%XHTML.pfx;p" >
+
+<!-- module:  xhtml-edit-1.mod -->
+<!ENTITY % ins.qname     "%XHTML.pfx;ins" >
+<!ENTITY % del.qname     "%XHTML.pfx;del" >
+
+<!-- module:  xhtml-form-1.mod -->
+<!ENTITY % form.qname    "%XHTML.pfx;form" >
+<!ENTITY % label.qname   "%XHTML.pfx;label" >
+<!ENTITY % input.qname   "%XHTML.pfx;input" >
+<!ENTITY % select.qname  "%XHTML.pfx;select" >
+<!ENTITY % optgroup.qname  "%XHTML.pfx;optgroup" >
+<!ENTITY % option.qname  "%XHTML.pfx;option" >
+<!ENTITY % textarea.qname  "%XHTML.pfx;textarea" >
+<!ENTITY % fieldset.qname  "%XHTML.pfx;fieldset" >
+<!ENTITY % legend.qname  "%XHTML.pfx;legend" >
+<!ENTITY % button.qname  "%XHTML.pfx;button" >
+
+<!-- module:  xhtml-hypertext-1.mod -->
+<!ENTITY % a.qname       "%XHTML.pfx;a" >
+
+<!-- module:  xhtml-image-1.mod -->
+<!ENTITY % img.qname     "%XHTML.pfx;img" >
+
+<!-- module:  xhtml-inlphras-1.mod -->
+<!ENTITY % abbr.qname    "%XHTML.pfx;abbr" >
+<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
+<!ENTITY % cite.qname    "%XHTML.pfx;cite" >
+<!ENTITY % code.qname    "%XHTML.pfx;code" >
+<!ENTITY % dfn.qname     "%XHTML.pfx;dfn" >
+<!ENTITY % em.qname      "%XHTML.pfx;em" >
+<!ENTITY % kbd.qname     "%XHTML.pfx;kbd" >
+<!ENTITY % q.qname       "%XHTML.pfx;q" >
+<!ENTITY % samp.qname    "%XHTML.pfx;samp" >
+<!ENTITY % strong.qname  "%XHTML.pfx;strong" >
+<!ENTITY % var.qname     "%XHTML.pfx;var" >
+
+<!-- module:  xhtml-inlpres-1.mod -->
+<!ENTITY % b.qname       "%XHTML.pfx;b" >
+<!ENTITY % big.qname     "%XHTML.pfx;big" >
+<!ENTITY % i.qname       "%XHTML.pfx;i" >
+<!ENTITY % small.qname   "%XHTML.pfx;small" >
+<!ENTITY % sub.qname     "%XHTML.pfx;sub" >
+<!ENTITY % sup.qname     "%XHTML.pfx;sup" >
+<!ENTITY % tt.qname      "%XHTML.pfx;tt" >
+
+<!-- module:  xhtml-inlstruct-1.mod -->
+<!ENTITY % br.qname      "%XHTML.pfx;br" >
+<!ENTITY % span.qname    "%XHTML.pfx;span" >
+
+<!-- module:  xhtml-ismap-1.mod (also csismap, ssismap) -->
+<!ENTITY % map.qname     "%XHTML.pfx;map" >
+<!ENTITY % area.qname    "%XHTML.pfx;area" >
+
+<!-- module:  xhtml-link-1.mod -->
+<!ENTITY % link.qname    "%XHTML.pfx;link" >
+
+<!-- module:  xhtml-list-1.mod -->
+<!ENTITY % dl.qname      "%XHTML.pfx;dl" >
+<!ENTITY % dt.qname      "%XHTML.pfx;dt" >
+<!ENTITY % dd.qname      "%XHTML.pfx;dd" >
+<!ENTITY % ol.qname      "%XHTML.pfx;ol" >
+<!ENTITY % ul.qname      "%XHTML.pfx;ul" >
+<!ENTITY % li.qname      "%XHTML.pfx;li" >
+
+<!-- module:  xhtml-meta-1.mod -->
+<!ENTITY % meta.qname    "%XHTML.pfx;meta" >
+
+<!-- module:  xhtml-param-1.mod -->
+<!ENTITY % param.qname   "%XHTML.pfx;param" >
+
+<!-- module:  xhtml-object-1.mod -->
+<!ENTITY % object.qname  "%XHTML.pfx;object" >
+
+<!-- module:  xhtml-script-1.mod -->
+<!ENTITY % script.qname  "%XHTML.pfx;script" >
+<!ENTITY % noscript.qname  "%XHTML.pfx;noscript" >
+
+<!-- module:  xhtml-struct-1.mod -->
+<!ENTITY % html.qname    "%XHTML.pfx;html" >
+<!ENTITY % head.qname    "%XHTML.pfx;head" >
+<!ENTITY % title.qname   "%XHTML.pfx;title" >
+<!ENTITY % body.qname    "%XHTML.pfx;body" >
+
+<!-- module:  xhtml-style-1.mod -->
+<!ENTITY % style.qname   "%XHTML.pfx;style" >
+
+<!-- module:  xhtml-table-1.mod -->
+<!ENTITY % table.qname   "%XHTML.pfx;table" >
+<!ENTITY % caption.qname "%XHTML.pfx;caption" >
+<!ENTITY % thead.qname   "%XHTML.pfx;thead" >
+<!ENTITY % tfoot.qname   "%XHTML.pfx;tfoot" >
+<!ENTITY % tbody.qname   "%XHTML.pfx;tbody" >
+<!ENTITY % colgroup.qname  "%XHTML.pfx;colgroup" >
+<!ENTITY % col.qname     "%XHTML.pfx;col" >
+<!ENTITY % tr.qname      "%XHTML.pfx;tr" >
+<!ENTITY % th.qname      "%XHTML.pfx;th" >
+<!ENTITY % td.qname      "%XHTML.pfx;td" >
+
+<!-- module:  xhtml-ruby-1.mod -->
+
+<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
+<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
+<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
+<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
+<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
+<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
+
+<!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
+
+<!-- module:  xhtml-image-2.mod -->
+<!ENTITY % alt.qname     "%XHTML.pfx;alt" >
+
+<!-- end of xhtml-qname-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-script-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-script-1.mod
new file mode 100644
index 000000000000..ab74c92765ca
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-script-1.mod
@@ -0,0 +1,66 @@
+<!-- ...................................................................... -->
+<!-- XHTML Document Scripting Module  ..................................... -->
+<!-- file: xhtml-script-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-script-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
+       SYSTEM "xhtml-script-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Scripting
+
+        script, noscript
+
+     This module declares element types and attributes used to provide
+     support for executable scripts as well as an alternate content
+     container where scripts are not supported.
+-->
+
+<!-- script: Scripting Statement ....................... -->
+
+<!ENTITY % script.element  "INCLUDE" >
+<![%script.element;[
+<!ENTITY % script.content  "( #PCDATA )" >
+<!ENTITY % script.qname  "script" >
+<!ELEMENT %script.qname;  %script.content; >
+<!-- end of script.element -->]]>
+
+<!ENTITY % script.attlist  "INCLUDE" >
+<![%script.attlist;[
+<!ATTLIST %script.qname;
+      %XHTML.xmlns.attrib;
+	  %id.attrib;
+      charset      %Charset.datatype;       #IMPLIED
+      type         %ContentType.datatype;   #REQUIRED
+      src          %URI.datatype;           #IMPLIED
+      defer        ( defer )                #IMPLIED
+>
+<!-- end of script.attlist -->]]>
+
+<!-- noscript: No-Script Alternate Content ............. -->
+
+<!ENTITY % noscript.element  "INCLUDE" >
+<![%noscript.element;[
+<!ENTITY % noscript.content
+     "( %Block.mix; )+"
+>
+<!ENTITY % noscript.qname  "noscript" >
+<!ELEMENT %noscript.qname;  %noscript.content; >
+<!-- end of noscript.element -->]]>
+
+<!ENTITY % noscript.attlist  "INCLUDE" >
+<![%noscript.attlist;[
+<!ATTLIST %noscript.qname;
+      %Common.attrib;
+>
+<!-- end of noscript.attlist -->]]>
+
+<!-- end of xhtml-script-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-special.ent b/xml/tests/testData/xml/XHtmlValidation3/xhtml-special.ent
new file mode 100644
index 000000000000..ca358b2fec72
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-special.ent
@@ -0,0 +1,80 @@
+<!-- Special characters for XHTML -->
+
+<!-- Character entity set. Typical invocation:
+     <!ENTITY % HTMLspecial PUBLIC
+        "-//W3C//ENTITIES Special for XHTML//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
+     %HTMLspecial;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+     New names (i.e., not in ISO 8879 list) do not clash with any
+     existing ISO 8879 entity names. ISO 10646 character numbers
+     are given for each character, in hex. values are decimal
+     conversions of the ISO 10646 values and refer to the document
+     character set. Names are Unicode names. 
+-->
+
+<!-- C0 Controls and Basic Latin -->
+<!ENTITY quot    "&#34;"> <!--  quotation mark, U+0022 ISOnum -->
+<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
+<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
+<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
+<!ENTITY apos	 "&#39;"> <!--  apostrophe = APL quote, U+0027 ISOnum -->
+
+<!-- Latin Extended-A -->
+<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
+                                    U+0152 ISOlat2 -->
+<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
+<!-- ligature is a misnomer, this is a separate character in some languages -->
+<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
+                                    U+0160 ISOlat2 -->
+<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
+                                    U+0161 ISOlat2 -->
+<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
+                                    U+0178 ISOlat2 -->
+
+<!-- Spacing Modifier Letters -->
+<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
+                                    U+02C6 ISOpub -->
+<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
+
+<!-- General Punctuation -->
+<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
+<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
+<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
+<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
+                                    U+200C NEW RFC 2070 -->
+<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
+<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
+<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
+<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
+<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
+<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
+                                    U+2018 ISOnum -->
+<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
+                                    U+2019 ISOnum -->
+<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
+<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
+                                    U+201C ISOnum -->
+<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
+                                    U+201D ISOnum -->
+<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
+<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
+<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
+<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
+<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
+                                    U+2039 ISO proposed -->
+<!-- lsaquo is proposed but not yet ISO standardized -->
+<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
+                                    U+203A ISO proposed -->
+<!-- rsaquo is proposed but not yet ISO standardized -->
+
+<!-- Currency Symbols -->
+<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-struct-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-struct-1.mod
new file mode 100644
index 000000000000..7e6013c2f238
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-struct-1.mod
@@ -0,0 +1,139 @@
+<!-- ...................................................................... -->
+<!-- XHTML Structure Module  .............................................. -->
+<!-- file: xhtml-struct-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-struct-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
+       SYSTEM "xhtml-struct-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Document Structure
+
+        title, head, body, html
+
+     The Structure Module defines the major structural elements and
+     their attributes.
+
+     Note that the content model of the head element type is redeclared
+     when the Base Module is included in the DTD.
+
+     The parameter entity containing the XML namespace URI value used
+     for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
+-->
+
+<!-- title: Document Title ............................. -->
+
+<!-- The title element is not considered part of the flow of text.
+     It should be displayed, for example as the page header or
+     window title. Exactly one title is required per document.
+-->
+
+<!ENTITY % title.element  "INCLUDE" >
+<![%title.element;[
+<!ENTITY % title.content  "( #PCDATA )" >
+<!ENTITY % title.qname  "title" >
+<!ELEMENT %title.qname;  %title.content; >
+<!-- end of title.element -->]]>
+
+<!ENTITY % title.attlist  "INCLUDE" >
+<![%title.attlist;[
+<!ATTLIST %title.qname;
+      %XHTML.xmlns.attrib;
+      %I18n.attrib;
+>
+<!-- end of title.attlist -->]]>
+
+<!-- head: Document Head ............................... -->
+
+<!ENTITY % head.element  "INCLUDE" >
+<![%head.element;[
+<!ENTITY % head.content
+    "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
+>
+<!ENTITY % head.qname  "head" >
+<!ELEMENT %head.qname;  %head.content; >
+<!-- end of head.element -->]]>
+
+<!ENTITY % head.attlist  "INCLUDE" >
+<![%head.attlist;[
+<!-- reserved for future use with document profiles
+-->
+<!ENTITY % profile.attrib
+     "profile      %URI.datatype;           '%XHTML.profile;'"
+>
+
+<!ATTLIST %head.qname;
+      %XHTML.xmlns.attrib;
+      %I18n.attrib;
+      %profile.attrib;
+>
+<!-- end of head.attlist -->]]>
+
+<!-- body: Document Body ............................... -->
+
+<!ENTITY % body.element  "INCLUDE" >
+<![%body.element;[
+<!ENTITY % body.content
+     "( %Block.mix; )+"
+>
+<!ENTITY % body.qname  "body" >
+<!ELEMENT %body.qname;  %body.content; >
+<!-- end of body.element -->]]>
+
+<!ENTITY % body.attlist  "INCLUDE" >
+<![%body.attlist;[
+<!ATTLIST %body.qname;
+      %Common.attrib;
+>
+<!-- end of body.attlist -->]]>
+
+<!-- html: XHTML Document Element ...................... -->
+
+<!ENTITY % html.element  "INCLUDE" >
+<![%html.element;[
+<!ENTITY % html.content  "( %head.qname;, %body.qname; )" >
+<!ENTITY % html.qname  "html" >
+<!ELEMENT %html.qname;  %html.content; >
+<!-- end of html.element -->]]>
+
+<![%XHTML.xsi.attrs;[
+<!-- define a parameter for the XSI schemaLocation attribute -->
+<!ENTITY % XSI.schemaLocation.attrib
+     "%XSI.pfx;schemaLocation  %URIs.datatype;    #IMPLIED"
+>
+]]>
+<!ENTITY % XSI.schemaLocation.attrib "">
+
+<!ENTITY % html.attlist  "INCLUDE" >
+<![%html.attlist;[
+<!-- version attribute value defined in driver
+-->
+<!ENTITY % XHTML.version.attrib
+     "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
+>
+<!-- schemaLocation attribute from XML Schema
+-->
+<!ENTITY % XSI.schemaLocation.attrib
+     "schemaLocation   %URIs.datatype;      #IMPLIED"
+>
+
+<!-- see the Qualified Names module for information
+     on how to extend XHTML using XML namespaces
+-->
+<!ATTLIST %html.qname;
+      %XHTML.xmlns.attrib;
+      %XSI.schemaLocation.attrib;
+      %XHTML.version.attrib;
+      %I18n.attrib;
+>
+<!-- end of html.attlist -->]]>
+
+<!-- end of xhtml-struct-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-style-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-style-1.mod
new file mode 100644
index 000000000000..3fa8c7becd61
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-style-1.mod
@@ -0,0 +1,47 @@
+<!-- ...................................................................... -->
+<!-- XHTML Document Style Sheet Module  ................................... -->
+<!-- file: xhtml-style-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-style-1.mod,v 4.1 2001/04/05 06:57:40 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
+       SYSTEM "xhtml-style-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Style Sheets
+
+        style
+
+     This module declares the style element type and its attributes,
+     used to embed style sheet information in the document head element.
+-->
+
+<!-- style: Style Sheet Information .................... -->
+
+<!ENTITY % style.element  "INCLUDE" >
+<![%style.element;[
+<!ENTITY % style.content  "( #PCDATA )" >
+<!ENTITY % style.qname  "style" >
+<!ELEMENT %style.qname;  %style.content; >
+<!-- end of style.element -->]]>
+
+<!ENTITY % style.attlist  "INCLUDE" >
+<![%style.attlist;[
+<!ATTLIST %style.qname;
+      %XHTML.xmlns.attrib;
+      %id.attrib;
+      %title.attrib;
+      %I18n.attrib;
+      type         %ContentType.datatype;   #REQUIRED
+      media        %MediaDesc.datatype;     #IMPLIED
+>
+<!-- end of style.attlist -->]]>
+
+<!-- end of xhtml-style-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-symbol.ent b/xml/tests/testData/xml/XHtmlValidation3/xhtml-symbol.ent
new file mode 100644
index 000000000000..185cea637670
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-symbol.ent
@@ -0,0 +1,204 @@
+<!-- ...................................................................... -->
+<!-- ISO Math, Greek and Symbolic Character Entity Set for XHTML .......... -->
+<!-- file: xhtml-symbol.ent
+
+     Typical invocation:
+
+       <!ENTITY % xhtml-symbol
+           PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
+                  "xhtml-symbol.ent" >
+       %xhtml-symbol;
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
+       SYSTEM "http://www.w3.org/TR/MarkUp/DTD/xhtml-symbol.ent"
+
+     Revision:  $Id: xhtml-symbol.ent,v 4.1 2001/04/10 09:34:14 altheim Exp $ SMI
+
+     Portions (C) International Organization for Standardization 1986:
+     Permission to copy in any form is granted for use with conforming
+     SGML systems and applications as defined in ISO 8879, provided
+     this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+     New names (i.e., not in ISO 8879 [SGML] list) do not clash with
+     any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
+     numbers are given for each character, in hex. Entity values are
+     decimal conversions of the ISO 10646 values and refer to the
+     document character set. Names are Unicode [UNICODE] names.
+-->
+
+<!-- Latin Extended-B -->
+<!ENTITY fnof     "&#402;" ><!-- latin small f with hook = function
+                              = florin, U+0192 ISOtech -->
+
+<!-- Greek -->
+<!ENTITY Alpha    "&#913;" ><!-- greek capital letter alpha, U+0391 -->
+<!ENTITY Beta     "&#914;" ><!-- greek capital letter beta, U+0392 -->
+<!ENTITY Gamma    "&#915;" ><!-- greek capital letter gamma, U+0393 ISOgrk3 -->
+<!ENTITY Delta    "&#916;" ><!-- greek capital letter delta, U+0394 ISOgrk3 -->
+<!ENTITY Epsilon  "&#917;" ><!-- greek capital letter epsilon, U+0395 -->
+<!ENTITY Zeta     "&#918;" ><!-- greek capital letter zeta, U+0396 -->
+<!ENTITY Eta      "&#919;" ><!-- greek capital letter eta, U+0397 -->
+<!ENTITY Theta    "&#920;" ><!-- greek capital letter theta, U+0398 ISOgrk3 -->
+<!ENTITY Iota     "&#921;" ><!-- greek capital letter iota, U+0399 -->
+<!ENTITY Kappa    "&#922;" ><!-- greek capital letter kappa, U+039A -->
+<!ENTITY Lambda   "&#923;" ><!-- greek capital letter lambda, U+039B ISOgrk3 -->
+<!ENTITY Mu       "&#924;" ><!-- greek capital letter mu, U+039C -->
+<!ENTITY Nu       "&#925;" ><!-- greek capital letter nu, U+039D -->
+<!ENTITY Xi       "&#926;" ><!-- greek capital letter xi, U+039E ISOgrk3 -->
+<!ENTITY Omicron  "&#927;" ><!-- greek capital letter omicron, U+039F -->
+<!ENTITY Pi       "&#928;" ><!-- greek capital letter pi, U+03A0 ISOgrk3 -->
+<!ENTITY Rho      "&#929;" ><!-- greek capital letter rho, U+03A1 -->
+<!-- there is no Sigmaf, and no U+03A2 character either -->
+<!ENTITY Sigma    "&#931;" ><!-- greek capital letter sigma, U+03A3 ISOgrk3 -->
+<!ENTITY Tau      "&#932;" ><!-- greek capital letter tau, U+03A4 -->
+<!ENTITY Upsilon  "&#933;" ><!-- greek capital letter upsilon,
+                              U+03A5 ISOgrk3 -->
+<!ENTITY Phi      "&#934;" ><!-- greek capital letter phi, U+03A6 ISOgrk3 -->
+<!ENTITY Chi      "&#935;" ><!-- greek capital letter chi, U+03A7 -->
+<!ENTITY Psi      "&#936;" ><!-- greek capital letter psi, U+03A8 ISOgrk3 -->
+<!ENTITY Omega    "&#937;" ><!-- greek capital letter omega, U+03A9 ISOgrk3 -->
+<!ENTITY alpha    "&#945;" ><!-- greek small letter alpha, U+03B1 ISOgrk3 -->
+<!ENTITY beta     "&#946;" ><!-- greek small letter beta, U+03B2 ISOgrk3 -->
+<!ENTITY gamma    "&#947;" ><!-- greek small letter gamma, U+03B3 ISOgrk3 -->
+<!ENTITY delta    "&#948;" ><!-- greek small letter delta, U+03B4 ISOgrk3 -->
+<!ENTITY epsilon  "&#949;" ><!-- greek small letter epsilon, U+03B5 ISOgrk3 -->
+<!ENTITY zeta     "&#950;" ><!-- greek small letter zeta, U+03B6 ISOgrk3 -->
+<!ENTITY eta      "&#951;" ><!-- greek small letter eta, U+03B7 ISOgrk3 -->
+<!ENTITY theta    "&#952;" ><!-- greek small letter theta, U+03B8 ISOgrk3 -->
+<!ENTITY iota     "&#953;" ><!-- greek small letter iota, U+03B9 ISOgrk3 -->
+<!ENTITY kappa    "&#954;" ><!-- greek small letter kappa, U+03BA ISOgrk3 -->
+<!ENTITY lambda   "&#955;" ><!-- greek small letter lambda, U+03BB ISOgrk3 -->
+<!ENTITY mu       "&#956;" ><!-- greek small letter mu, U+03BC ISOgrk3 -->
+<!ENTITY nu       "&#957;" ><!-- greek small letter nu, U+03BD ISOgrk3 -->
+<!ENTITY xi       "&#958;" ><!-- greek small letter xi, U+03BE ISOgrk3 -->
+<!ENTITY omicron  "&#959;" ><!-- greek small letter omicron, U+03BF NEW -->
+<!ENTITY pi       "&#960;" ><!-- greek small letter pi, U+03C0 ISOgrk3 -->
+<!ENTITY rho      "&#961;" ><!-- greek small letter rho, U+03C1 ISOgrk3 -->
+<!ENTITY sigmaf   "&#962;" ><!-- greek small letter final sigma, U+03C2 ISOgrk3 -->
+<!ENTITY sigma    "&#963;" ><!-- greek small letter sigma, U+03C3 ISOgrk3 -->
+<!ENTITY tau      "&#964;" ><!-- greek small letter tau, U+03C4 ISOgrk3 -->
+<!ENTITY upsilon  "&#965;" ><!-- greek small letter upsilon, U+03C5 ISOgrk3 -->
+<!ENTITY phi      "&#966;" ><!-- greek small letter phi, U+03C6 ISOgrk3 -->
+<!ENTITY chi      "&#967;" ><!-- greek small letter chi, U+03C7 ISOgrk3 -->
+<!ENTITY psi      "&#968;" ><!-- greek small letter psi, U+03C8 ISOgrk3 -->
+<!ENTITY omega    "&#969;" ><!-- greek small letter omega, U+03C9 ISOgrk3 -->
+<!ENTITY thetasym "&#977;" ><!-- greek small letter theta symbol, U+03D1 NEW -->
+<!ENTITY upsih    "&#978;" ><!-- greek upsilon with hook symbol, U+03D2 NEW -->
+<!ENTITY piv      "&#982;" ><!-- greek pi symbol, U+03D6 ISOgrk3 -->
+
+<!-- General Punctuation -->
+<!ENTITY bull     "&#8226;" ><!-- bullet = black small circle, U+2022 ISOpub  -->
+<!-- bullet is NOT the same as bullet operator, U+2219 -->
+<!ENTITY hellip   "&#8230;" ><!-- horizontal ellipsis = three dot leader, U+2026 ISOpub  -->
+<!ENTITY prime    "&#8242;" ><!-- prime = minutes = feet, U+2032 ISOtech -->
+<!ENTITY Prime    "&#8243;" ><!-- double prime = seconds = inches, U+2033 ISOtech -->
+<!ENTITY oline    "&#8254;" ><!-- overline = spacing overscore, U+203E NEW -->
+<!ENTITY frasl    "&#8260;" ><!-- fraction slash, U+2044 NEW -->
+
+<!-- Letterlike Symbols -->
+<!ENTITY weierp   "&#8472;" ><!-- script capital P = power set = Weierstrass p, U+2118 ISOamso -->
+<!ENTITY image    "&#8465;" ><!-- blackletter capital I = imaginary part, U+2111 ISOamso -->
+<!ENTITY real     "&#8476;" ><!-- blackletter capital R = real part symbol, U+211C ISOamso -->
+<!ENTITY trade    "&#8482;" ><!-- trade mark sign, U+2122 ISOnum -->
+<!ENTITY alefsym  "&#8501;" ><!-- alef symbol = first transfinite cardinal, U+2135 NEW -->
+<!-- alef symbol is NOT the same as hebrew letter alef, U+05D0 although
+     the same glyph could be used to depict both characters -->
+
+<!-- Arrows -->
+<!ENTITY larr     "&#8592;" ><!-- leftwards arrow, U+2190 ISOnum -->
+<!ENTITY uarr     "&#8593;" ><!-- upwards arrow, U+2191 ISOnum-->
+<!ENTITY rarr     "&#8594;" ><!-- rightwards arrow, U+2192 ISOnum -->
+<!ENTITY darr     "&#8595;" ><!-- downwards arrow, U+2193 ISOnum -->
+<!ENTITY harr     "&#8596;" ><!-- left right arrow, U+2194 ISOamsa -->
+<!ENTITY crarr    "&#8629;" ><!-- downwards arrow with corner leftwards
+                               = carriage return, U+21B5 NEW -->
+<!ENTITY lArr     "&#8656;" ><!-- leftwards double arrow, U+21D0 ISOtech -->
+<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
+    but also does not have any other character for that function. So ? lArr can
+    be used for 'is implied by' as ISOtech suggests -->
+<!ENTITY uArr     "&#8657;" ><!-- upwards double arrow, U+21D1 ISOamsa -->
+<!ENTITY rArr     "&#8658;" ><!-- rightwards double arrow, U+21D2 ISOtech -->
+<!-- Unicode does not say this is the 'implies' character but does not have
+     another character with this function so ?
+     rArr can be used for 'implies' as ISOtech suggests -->
+<!ENTITY dArr     "&#8659;" ><!-- downwards double arrow, U+21D3 ISOamsa -->
+<!ENTITY hArr     "&#8660;" ><!-- left right double arrow, U+21D4 ISOamsa -->
+
+<!-- Mathematical Operators -->
+<!ENTITY forall   "&#8704;" ><!-- for all, U+2200 ISOtech -->
+<!ENTITY part     "&#8706;" ><!-- partial differential, U+2202 ISOtech  -->
+<!ENTITY exist    "&#8707;" ><!-- there exists, U+2203 ISOtech -->
+<!ENTITY empty    "&#8709;" ><!-- empty set = null set, U+2205 ISOamso -->
+<!ENTITY nabla    "&#8711;" ><!-- nabla = backward difference, U+2207 ISOtech -->
+<!ENTITY isin     "&#8712;" ><!-- element of, U+2208 ISOtech -->
+<!ENTITY notin    "&#8713;" ><!-- not an element of, U+2209 ISOtech -->
+<!ENTITY ni       "&#8715;" ><!-- contains as member, U+220B ISOtech -->
+<!-- should there be a more memorable name than 'ni'? -->
+<!ENTITY prod     "&#8719;" ><!-- n-ary product = product sign, U+220F ISOamsb -->
+<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
+     the same glyph might be used for both -->
+<!ENTITY sum      "&#8721;" ><!-- n-ary sumation, U+2211 ISOamsb -->
+<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
+     though the same glyph might be used for both -->
+<!ENTITY minus    "&#8722;" ><!-- minus sign, U+2212 ISOtech -->
+<!ENTITY lowast   "&#8727;" ><!-- asterisk operator, U+2217 ISOtech -->
+<!ENTITY radic    "&#8730;" ><!-- square root = radical sign, U+221A ISOtech -->
+<!ENTITY prop     "&#8733;" ><!-- proportional to, U+221D ISOtech -->
+<!ENTITY infin    "&#8734;" ><!-- infinity, U+221E ISOtech -->
+<!ENTITY ang      "&#8736;" ><!-- angle, U+2220 ISOamso -->
+<!ENTITY and      "&#8743;" ><!-- logical and = wedge, U+2227 ISOtech -->
+<!ENTITY or       "&#8744;" ><!-- logical or = vee, U+2228 ISOtech -->
+<!ENTITY cap      "&#8745;" ><!-- intersection = cap, U+2229 ISOtech -->
+<!ENTITY cup      "&#8746;" ><!-- union = cup, U+222A ISOtech -->
+<!ENTITY int      "&#8747;" ><!-- integral, U+222B ISOtech -->
+<!ENTITY there4   "&#8756;" ><!-- therefore, U+2234 ISOtech -->
+<!ENTITY sim      "&#8764;" ><!-- tilde operator = varies with = similar to, U+223C ISOtech -->
+<!-- tilde operator is NOT the same character as the tilde, U+007E,
+     although the same glyph might be used to represent both  -->
+<!ENTITY cong     "&#8773;" ><!-- approximately equal to, U+2245 ISOtech -->
+<!ENTITY asymp    "&#8776;" ><!-- almost equal to = asymptotic to, U+2248 ISOamsr -->
+<!ENTITY ne       "&#8800;" ><!-- not equal to, U+2260 ISOtech -->
+<!ENTITY equiv    "&#8801;" ><!-- identical to, U+2261 ISOtech -->
+<!ENTITY le       "&#8804;" ><!-- less-than or equal to, U+2264 ISOtech -->
+<!ENTITY ge       "&#8805;" ><!-- greater-than or equal to, U+2265 ISOtech -->
+<!ENTITY sub      "&#8834;" ><!-- subset of, U+2282 ISOtech -->
+<!ENTITY sup      "&#8835;" ><!-- superset of, U+2283 ISOtech -->
+<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
+     font encoding and is not included. Should it be, for symmetry?
+     It is in ISOamsn  -->
+<!ENTITY nsub     "&#8836;" ><!-- not a subset of, U+2284 ISOamsn -->
+<!ENTITY sube     "&#8838;" ><!-- subset of or equal to, U+2286 ISOtech -->
+<!ENTITY supe     "&#8839;" ><!-- superset of or equal to, U+2287 ISOtech -->
+<!ENTITY oplus    "&#8853;" ><!-- circled plus = direct sum, U+2295 ISOamsb -->
+<!ENTITY otimes   "&#8855;" ><!-- circled times = vector product, U+2297 ISOamsb -->
+<!ENTITY perp     "&#8869;" ><!-- up tack = orthogonal to = perpendicular, U+22A5 ISOtech -->
+<!ENTITY sdot     "&#8901;" ><!-- dot operator, U+22C5 ISOamsb -->
+<!-- dot operator is NOT the same character as U+00B7 middle dot -->
+
+<!-- Miscellaneous Technical -->
+<!ENTITY lceil    "&#8968;" ><!-- left ceiling = apl upstile, U+2308 ISOamsc  -->
+<!ENTITY rceil    "&#8969;" ><!-- right ceiling, U+2309 ISOamsc  -->
+<!ENTITY lfloor   "&#8970;" ><!-- left floor = apl downstile, U+230A ISOamsc  -->
+<!ENTITY rfloor   "&#8971;" ><!-- right floor, U+230B ISOamsc  -->
+<!ENTITY lang     "&#9001;" ><!-- left-pointing angle bracket = bra, U+2329 ISOtech -->
+<!-- lang is NOT the same character as U+003C 'less than'
+     or U+2039 'single left-pointing angle quotation mark' -->
+<!ENTITY rang     "&#9002;" ><!-- right-pointing angle bracket = ket, U+232A ISOtech -->
+<!-- rang is NOT the same character as U+003E 'greater than'
+     or U+203A 'single right-pointing angle quotation mark' -->
+
+<!-- Geometric Shapes -->
+<!ENTITY loz      "&#9674;" ><!-- lozenge, U+25CA ISOpub -->
+
+<!-- Miscellaneous Symbols -->
+<!ENTITY spades   "&#9824;" ><!-- black spade suit, U+2660 ISOpub -->
+<!-- black here seems to mean filled as opposed to hollow -->
+<!ENTITY clubs    "&#9827;" ><!-- black club suit = shamrock, U+2663 ISOpub -->
+<!ENTITY hearts   "&#9829;" ><!-- black heart suit = valentine, U+2665 ISOpub -->
+<!ENTITY diams    "&#9830;" ><!-- black diamond suit, U+2666 ISOpub -->
+
+<!-- end of xhtml-symbol.ent -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-target-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-target-1.mod
new file mode 100644
index 000000000000..533138646ce5
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-target-1.mod
@@ -0,0 +1,53 @@
+<!-- ...................................................................... -->
+<!-- XHTML Target Module  ................................................. -->
+<!-- file: xhtml-target-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-target-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Target 1.0//EN"
+       SYSTEM "xhtml-target-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Target 
+
+        target
+
+     This module declares the 'target' attribute used for opening windows
+-->
+
+<!-- render in this frame --> 
+<!ENTITY % FrameTarget.datatype "CDATA" >
+
+<!-- add 'target' attribute to 'a' element -->
+<!ATTLIST %a.qname;
+      target       %FrameTarget.datatype;   #IMPLIED
+>
+
+<!-- add 'target' attribute to 'area' element -->
+<!ATTLIST %area.qname;
+      target       %FrameTarget.datatype;   #IMPLIED
+>
+
+<!-- add 'target' attribute to 'link' element -->
+<!ATTLIST %link.qname;
+      target       %FrameTarget.datatype;   #IMPLIED
+>
+
+<!-- add 'target' attribute to 'form' element -->
+<!ATTLIST %form.qname;
+      target       %FrameTarget.datatype;   #IMPLIED
+>
+
+<!-- add 'target' attribute to 'base' element -->
+<!ATTLIST %base.qname;
+      target       %FrameTarget.datatype;   #IMPLIED
+>
+
+<!-- end of xhtml-target-1.mod -->
diff --git a/xml/tests/testData/xml/XHtmlValidation3/xhtml-text-1.mod b/xml/tests/testData/xml/XHtmlValidation3/xhtml-text-1.mod
new file mode 100644
index 000000000000..78f45c4320ab
--- /dev/null
+++ b/xml/tests/testData/xml/XHtmlValidation3/xhtml-text-1.mod
@@ -0,0 +1,52 @@
+<!-- ...................................................................... -->
+<!-- XHTML Text Module  ................................................... -->
+<!-- file: xhtml-text-1.mod
+
+     This is XHTML, a reformulation of HTML as a modular XML application.
+     Copyright 1998-2005 W3C (MIT, ERCIM, Keio), All Rights Reserved.
+     Revision: $Id: xhtml-text-1.mod,v 4.0 2001/04/02 22:42:49 altheim Exp $ SMI
+
+     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
+
+       PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
+       SYSTEM "xhtml-text-1.mod"
+
+     Revisions:
+     (none)
+     ....................................................................... -->
+
+<!-- Textual Content
+
+     The Text module includes declarations for all core
+     text container elements and their attributes.
+-->
+
+<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
+<![%xhtml-inlstruct.module;[
+<!ENTITY % xhtml-inlstruct.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
+            "xhtml-inlstruct-1.mod" >
+%xhtml-inlstruct.mod;]]>
+
+<!ENTITY % xhtml-inlphras.module "INCLUDE" >
+<![%xhtml-inlphras.module;[
+<!ENTITY % xhtml-inlphras.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
+            "xhtml-inlphras-1.mod" >
+%xhtml-inlphras.mod;]]>
+
+<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
+<![%xhtml-blkstruct.module;[
+<!ENTITY % xhtml-blkstruct.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
+            "xhtml-blkstruct-1.mod" >
+%xhtml-blkstruct.mod;]]>
+
+<!ENTITY % xhtml-blkphras.module "INCLUDE" >
+<![%xhtml-blkphras.module;[
+<!ENTITY % xhtml-blkphras.mod
+     PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
+            "xhtml-blkphras-1.mod" >
+%xhtml-blkphras.mod;]]>
+
+<!-- end of xhtml-text-1.mod -->
diff --git a/xml/tests/testData/xml/XInclude-inc.xml b/xml/tests/testData/xml/XInclude-inc.xml
new file mode 100644
index 000000000000..f126b9d96652
--- /dev/null
+++ b/xml/tests/testData/xml/XInclude-inc.xml
@@ -0,0 +1,5 @@
+<persistence-unit xmlns="http://example.com/persistence"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                  xsi:schemaLocation="http://example.com/persistence XIncludeTestSchema.xsd">
+    <class>java.lang.String</class>
+</persistence-unit>
diff --git a/xml/tests/testData/xml/XInclude.xml b/xml/tests/testData/xml/XInclude.xml
new file mode 100644
index 000000000000..361b59fd218e
--- /dev/null
+++ b/xml/tests/testData/xml/XInclude.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<persistence xmlns="http://example.com/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:xi="http://www.w3.org/2001/XInclude"
+             xsi:schemaLocation="http://example.com/persistence XIncludeTestSchema.xsd
+             http://www.w3.org/2001/XInclude http://www.w3.org/2001/XInclude.xsd"
+             >
+  <xi:include href="XInclude-inc.xml"/>
+  <xi:include href="oxf:/apps/somefile.xml"/>
+</persistence>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XIncludeTestSchema.xsd b/xml/tests/testData/xml/XIncludeTestSchema.xsd
new file mode 100644
index 000000000000..f264824a7081
--- /dev/null
+++ b/xml/tests/testData/xml/XIncludeTestSchema.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema targetNamespace="http://example.com/persistence"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:persistence="http://example.com/persistence"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified"
+  version="1.0">
+  <xsd:element name="persistence">
+    <xsd:complexType>
+      <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+         <xsd:element ref="persistence:persistence-unit"/>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+  <xsd:element name="persistence-unit">
+    <xsd:complexType>
+      <xsd:sequence>
+        <xsd:element name="class" type="xsd:string"
+                     minOccurs="0" maxOccurs="unbounded">
+        </xsd:element>
+      </xsd:sequence>
+    </xsd:complexType>
+  </xsd:element>
+</xsd:schema>
diff --git a/xml/tests/testData/xml/XercesCachingProblem.dtd b/xml/tests/testData/xml/XercesCachingProblem.dtd
new file mode 100644
index 000000000000..bdc654eaabbc
--- /dev/null
+++ b/xml/tests/testData/xml/XercesCachingProblem.dtd
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!ENTITY test "This is a test">
+
+<!ELEMENT root (#PCDATA)>
diff --git a/xml/tests/testData/xml/XercesCachingProblem.xml b/xml/tests/testData/xml/XercesCachingProblem.xml
new file mode 100644
index 000000000000..c54d00d4f3bc
--- /dev/null
+++ b/xml/tests/testData/xml/XercesCachingProblem.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE root PUBLIC "urn:test" "http://www.test.com/test">
+
+<root>
+    &test;
+    &test;
+</root>
diff --git a/xml/tests/testData/xml/XercesMessageOnDtd.xml b/xml/tests/testData/xml/XercesMessageOnDtd.xml
new file mode 100644
index 000000000000..0a0e5d3745f0
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessageOnDtd.xml
@@ -0,0 +1,8 @@
+<!DOCTYPE ejb-jar [
+<!ELEMENT display-name (#PCDATA)>
+<!ELEMENT ejb-jar (display-name)*>
+<error><!ELEMENT ejb-jar (display-name)*></error>
+]>
+<ejb-jar>
+    <display-name></display-name>
+</ejb-jar>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XercesMessageOnPI.xml b/xml/tests/testData/xml/XercesMessageOnPI.xml
new file mode 100644
index 000000000000..7f30de8bfd7b
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessageOnPI.xml
@@ -0,0 +1,5 @@
+<!-- bad comment before PI -->
+<error><?xml version="1.0" encoding="UTF-8"?></error>
+<!DOCTYPE weblogic-ejb-jar PUBLIC "-//BEA Systems, Inc.//DTD WebLogic 7.0.0 EJB//EN" "http://www.bea.com/servers/wls700/dtd/weblogic-ejb-jar.dtd" >
+<weblogic-ejb-jar/>
+
diff --git a/xml/tests/testData/xml/XercesMessagesBinding.xml b/xml/tests/testData/xml/XercesMessagesBinding.xml
new file mode 100644
index 000000000000..d6f8c058dcec
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+    <!--
+    <!<error>-</error>-
+    -->
+</web-app>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XercesMessagesBinding2.xml b/xml/tests/testData/xml/XercesMessagesBinding2.xml
new file mode 100644
index 000000000000..7321c88c6a0b
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding2.xml
@@ -0,0 +1,8 @@
+<database xmlns="XercesMessagesBinding2.xsd">
+   <table>
+       <description><p/></description>
+       <col <error>name</error>="aaa" <error>size</error>="-1">
+         <description> <p/> </description>
+       </col>
+   </table>
+</database>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XercesMessagesBinding2.xsd b/xml/tests/testData/xml/XercesMessagesBinding2.xsd
new file mode 100644
index 000000000000..f6b0b9b30134
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding2.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema targetNamespace="XercesMessagesBinding2.xsd"
+  xmlns:su="XercesMessagesBinding2.xsd"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified"
+  attributeFormDefault="qualified">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is a schema for SQLUTils version 3.4
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="database" type="su:Database">
+    <xs:key name="TableKeyColumn">
+      <xs:selector xpath="table"/>
+      <xs:field xpath="@name"/>
+    </xs:key>
+
+    <xs:keyref name="TableKeyColumnRef" refer="su:TableKeyColumn">
+      <xs:selector xpath="col" />
+      <xs:field xpath="@ref" />
+    </xs:keyref>
+
+    <xs:key name="TableKeyColumns">
+      <xs:selector xpath="table"/>
+      <xs:field xpath="@name"/>
+    </xs:key>
+
+    <xs:keyref name="TableKeyColumnsRef" refer="su:TableKeyColumns">
+      <xs:selector xpath="key" />
+      <xs:field xpath="@ref" />
+    </xs:keyref>
+  </xs:element>
+
+  <xs:complexType name="Database">
+    <xs:sequence>
+      <xs:element name="description" type="su:Description" minOccurs="0"/>
+      <xs:element name="table" type="su:Table" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="dsn" type="xs:string" use="optional"/>
+    <xs:attribute name="username" type="xs:string" use="optional"/>
+    <xs:attribute name="password" type="xs:string" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="Table">
+    <xs:sequence>
+      <xs:element name="description" type="su:Description"/>
+      <xs:element name="col" type="su:Column" maxOccurs="unbounded"/>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="key" type="su:Key"/>
+        <xs:element name="index" type="su:Index"/>
+      </xs:choice>
+    </xs:sequence>
+    <xs:attribute name="dataUri" type="xs:string"/>
+    <xs:attribute name="name" type="xs:string"/>
+  </xs:complexType>
+
+  <xs:complexType name="Column">
+    <xs:sequence>
+       <xs:element name="description" type="su:Description"/>
+    </xs:sequence>
+    <xs:attribute name="name" type="xs:string" use="required"/>
+    
+    <xs:attribute name="type" type="xs:string" use="optional"/>
+    <xs:attribute name="null" type="xs:boolean" use="optional"/>
+    <xs:attribute name="size" type="xs:nonNegativeInteger" use="optional"/>
+    <xs:attribute name="constraint" type="xs:string" use="optional"/>
+    <xs:attribute name="pk" type="xs:boolean" use="optional"/>
+    <xs:attribute name="ref" type="xs:string" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="Index">
+    <xs:attribute name="name" type="xs:string" use="optional"/>
+    <xs:attribute name="unique" type="xs:boolean" use="required"/>
+    <xs:attribute name="cols" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="Key">
+    <xs:attribute name="name" type="xs:string" use="optional"/>
+    <xs:attribute name="type" type="su:KeyType" use="required"/>
+    <xs:attribute name="ref" type="xs:string" use="optional"/>
+    <xs:attribute name="cols" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:simpleType name="KeyType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="foreign"/>
+      <xs:enumeration value="primary"/>
+      <xs:enumeration value="unique"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="Description" mixed="true">
+    <xs:sequence>
+       <xs:element name="p">
+          <xs:complexType>
+             <xs:sequence>
+                <xs:any processContents="skip" namespace="##local" minOccurs="0" maxOccurs="unbounded"/>
+             </xs:sequence>
+          </xs:complexType>
+       </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/xml/tests/testData/xml/XercesMessagesBinding2_2.xml b/xml/tests/testData/xml/XercesMessagesBinding2_2.xml
new file mode 100644
index 000000000000..9016cdc7ae73
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding2_2.xml
@@ -0,0 +1,8 @@
+<database xmlns="XercesMessagesBinding2_2.xsd">
+   <table>
+       <description><p/></description>
+       <<error>col</error> size=<error>"-1"</error> name="aaa">
+         <description> <p/> </description>
+       </<error>col</error>>
+   </table>
+</database>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XercesMessagesBinding2_2.xsd b/xml/tests/testData/xml/XercesMessagesBinding2_2.xsd
new file mode 100644
index 000000000000..dbb6efc88c74
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding2_2.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xs:schema targetNamespace="XercesMessagesBinding2_2.xsd"
+  xmlns:su="XercesMessagesBinding2_2.xsd"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  elementFormDefault="qualified"
+  attributeFormDefault="unqualified">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is a schema for SQLUTils version 3.4
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="database" type="su:Database">
+    <xs:key name="TableKeyColumn">
+      <xs:selector xpath="table"/>
+      <xs:field xpath="@name"/>
+    </xs:key>
+
+    <xs:keyref name="TableKeyColumnRef" refer="su:TableKeyColumn">
+      <xs:selector xpath="col" />
+      <xs:field xpath="@ref" />
+    </xs:keyref>
+
+    <xs:key name="TableKeyColumns">
+      <xs:selector xpath="table"/>
+      <xs:field xpath="@name"/>
+    </xs:key>
+
+    <xs:keyref name="TableKeyColumnsRef" refer="su:TableKeyColumns">
+      <xs:selector xpath="key" />
+      <xs:field xpath="@ref" />
+    </xs:keyref>
+  </xs:element>
+
+  <xs:complexType name="Database">
+    <xs:sequence>
+      <xs:element name="description" type="su:Description" minOccurs="0"/>
+      <xs:element name="table" type="su:Table" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name="dsn" type="xs:string" use="optional"/>
+    <xs:attribute name="username" type="xs:string" use="optional"/>
+    <xs:attribute name="password" type="xs:string" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="Table">
+    <xs:sequence>
+      <xs:element name="description" type="su:Description"/>
+      <xs:element name="col" type="su:Column" maxOccurs="unbounded"/>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element name="key" type="su:Key"/>
+        <xs:element name="index" type="su:Index"/>
+      </xs:choice>
+    </xs:sequence>
+    <xs:attribute name="dataUri" type="xs:string"/>
+    <xs:attribute name="name" type="xs:string"/>
+  </xs:complexType>
+
+  <xs:complexType name="Column">
+    <xs:sequence>
+       <xs:element name="description" type="su:Description"/>
+    </xs:sequence>
+    <xs:attribute name="name" type="xs:string" use="required"/>
+    
+    <xs:attribute name="type" type="xs:string" use="optional"/>
+    <xs:attribute name="null" type="xs:boolean" use="optional"/>
+    <xs:attribute name="size" type="xs:nonNegativeInteger" use="optional"/>
+    <xs:attribute name="constraint" type="xs:string" use="optional"/>
+    <xs:attribute name="pk" type="xs:boolean" use="optional"/>
+    <xs:attribute name="ref" type="xs:string" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="Index">
+    <xs:attribute name="name" type="xs:string" use="optional"/>
+    <xs:attribute name="unique" type="xs:boolean" use="required"/>
+    <xs:attribute name="cols" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:complexType name="Key">
+    <xs:attribute name="name" type="xs:string" use="optional"/>
+    <xs:attribute name="type" type="su:KeyType" use="required"/>
+    <xs:attribute name="ref" type="xs:string" use="optional"/>
+    <xs:attribute name="cols" type="xs:string" use="required"/>
+  </xs:complexType>
+
+  <xs:simpleType name="KeyType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="foreign"/>
+      <xs:enumeration value="primary"/>
+      <xs:enumeration value="unique"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:complexType name="Description" mixed="true">
+    <xs:sequence>
+       <xs:element name="p">
+          <xs:complexType>
+             <xs:sequence>
+                <xs:any processContents="skip" namespace="##local" minOccurs="0" maxOccurs="unbounded"/>
+             </xs:sequence>
+          </xs:complexType>
+       </xs:element>
+    </xs:sequence>
+  </xs:complexType>
+</xs:schema>
diff --git a/xml/tests/testData/xml/XercesMessagesBinding3.xml b/xml/tests/testData/xml/XercesMessagesBinding3.xml
new file mode 100644
index 000000000000..1757ff475bbd
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding3.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE struts-config PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+        "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+
+<struts-config>
+
+    <data-sources>
+        <<error>data-source</error> id="  " key="fhgfh"
+                     className="java.lang.String" type="java.lang.String">
+        </<error>data-source</error>>
+    </data-sources>
+</struts-config>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XercesMessagesBinding4.xml b/xml/tests/testData/xml/XercesMessagesBinding4.xml
new file mode 100644
index 000000000000..95993b83c9ce
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding4.xml
@@ -0,0 +1,30 @@
+<project name="nc-server" default="war" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+    <property environment="env" />
+    <property file="${user.home}/<error descr="'nc_build.properties' does not exist">nc_build.properties</error>" />
+    <property file="${basedir}/<error descr="'build.properties' does not exist">build.properties</error>" />
+    <property name="build.dir" value="${basedir}/target" />
+    <property name="compile.dir" value="${build.dir}/classes" />
+    <property name="src.gen.dir" value="${build.dir}/generated-source" />
+    <property name="lib.dir" value="${basedir}/lib" />
+    <<error descr="Failed to load type(s):
+Resource \\"org/apache/maven/artifact/ant/antlib.xml\\" not found in the classpath">typedef</error> resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant">
+        <classpath>
+            <pathelement location="${lib.dir}/maven-artifact-ant-2.0.4-dep.jar" />
+        </classpath>
+    </typedef>
+    <target name="clean" description="Cleans the build">
+        <delete dir="${build.dir}" />
+    </target>
+    <target name="init">
+        <mkdir dir="${compile.dir}" />
+        <mkdir dir="${src.gen.dir}" />
+    </target>
+    <target name="war" depends="compile">
+        <echo message="I will do something here"/>
+    </target>
+    <target name="compile" depends="init" description="Compile the java source code">
+        <echo level="verbose">Compiling Java Code</echo>
+    </target>
+    <target name="compile.schema" depends="init">
+    </target>
+</project>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XercesMessagesBinding4.xsd b/xml/tests/testData/xml/XercesMessagesBinding4.xsd
new file mode 100644
index 000000000000..a2097d7dff88
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding4.xsd
@@ -0,0 +1 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"></xsd:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XercesMessagesBinding5.xml b/xml/tests/testData/xml/XercesMessagesBinding5.xml
new file mode 100644
index 000000000000..387da7be7805
--- /dev/null
+++ b/xml/tests/testData/xml/XercesMessagesBinding5.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE ejb-jar [
+<!ELEMENT display-name (#PCDATA)>
+<!ELEMENT ejb-jar (display-name)*>
+]>
+<ejb-jar<error> </error>,
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XmlPsi.xml b/xml/tests/testData/xml/XmlPsi.xml
new file mode 100644
index 000000000000..ecf089ce1cf7
--- /dev/null
+++ b/xml/tests/testData/xml/XmlPsi.xml
@@ -0,0 +1,6 @@
+ <test xmlns:a='abc' >
+   <foo xmlns:b='abc' b:xxx='xxx'>
+     <bar a:yyy='yyy' zzz='zzz'/>
+     <bar2 a:yyy='yyy' xmlns="def" zzz='zzz'/>
+   </foo>
+</test>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XsiSchemaLocation.xml b/xml/tests/testData/xml/XsiSchemaLocation.xml
new file mode 100644
index 000000000000..4f746c5ebd48
--- /dev/null
+++ b/xml/tests/testData/xml/XsiSchemaLocation.xml
@@ -0,0 +1,4 @@
+<rap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="myschema <error>http://www.inversoft.com/schemas/rap/rap-config-1.0.xsd</error>"
+    xsi:noNamespaceSchemaLocation="<error>http://www.inversoft.com/schemas/rap/rap-config-1.0.xsd</error>">
+</rap>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XsiSchemaLocation2.xml b/xml/tests/testData/xml/XsiSchemaLocation2.xml
new file mode 100644
index 000000000000..651454a4bad4
--- /dev/null
+++ b/xml/tests/testData/xml/XsiSchemaLocation2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tst:test xmlns:tst="urn:schemas-dig-de:tst" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:test2="urn:schemas-dig-de:test2" xmlns:test3="urn:schemas-dig-de:test3"
+xmlns="http://www.w3.org/1999/xhtml" xsi:schemaLocation="urn:schemas-dig-de:tst XsiSchemaLocation2_1.xsd  urn:schemas-dig-de:test2 XsiSchemaLocation2_2.xsd urn:schemas-dig-de:test3 XsiSchemaLocation2_3.xsd">
+    <table>
+        <tr>
+            <td>
+                <<error>test2:control</error> id="xx">
+                	<test3:superControl id="xx"/>
+                        <test2:my id="id"></test2:my>
+                </<error>test2:control</error>>
+            </td>
+        </tr>
+    </table>
+</tst:test>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XsiSchemaLocation2_1.xsd b/xml/tests/testData/xml/XsiSchemaLocation2_1.xsd
new file mode 100644
index 000000000000..4971c39a2883
--- /dev/null
+++ b/xml/tests/testData/xml/XsiSchemaLocation2_1.xsd
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:schemas-dig-de:tst">
+	<xs:element name="test" >
+		<xs:complexType>
+			<xs:sequence>
+				<xs:any namespace="http://www.w3.org/1999/xhtml" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+
+</xs:schema>
diff --git a/xml/tests/testData/xml/XsiSchemaLocation2_2.xsd b/xml/tests/testData/xml/XsiSchemaLocation2_2.xsd
new file mode 100644
index 000000000000..08f6a2b939ec
--- /dev/null
+++ b/xml/tests/testData/xml/XsiSchemaLocation2_2.xsd
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" xmlns:test2="urn:schemas-dig-de:test2" xmlns:test3="urn:schemas-dig-de:test3" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:schemas-dig-de:test2">
+    <xs:include schemaLocation="XsiSchemaLocation2_2.xsd"/>
+    <xs:import namespace="urn:schemas-dig-de:test3" schemaLocation="XsiSchemaLocation2_3.xsd"/>
+
+    <xs:complexType name="annotated">
+    </xs:complexType>
+    
+    <xs:attributeGroup name="occurs">
+    </xs:attributeGroup>
+    
+    <xs:element name="control">
+        <xs:annotation>
+            <xs:documentation>The string field</xs:documentation>
+        </xs:annotation>
+        <xs:complexType mixed="true">
+            <xs:sequence>
+                <xs:element ref="test3:superControl" minOccurs="1" maxOccurs="unbounded"/>
+                <xs:element name="my" type="test3:superControlType" minOccurs="1" maxOccurs="unbounded"/>
+            </xs:sequence>
+            <xs:attribute name="id" type="xs:string" use="required"/>
+            <xs:attribute name="flag" type="test3:Bool" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+    <xs:simpleType name = "Length">
+      <xs:restriction base = "test3:Bool">
+        <xs:pattern value = "true"/>
+      </xs:restriction>
+    </xs:simpleType>
+   <xs:simpleType name = "Length">
+     <xs:restriction base = "xs:string">
+       <xs:pattern value = "111"/>
+     </xs:restriction>
+   </xs:simpleType>
+  <xs:complexType name="aaa">
+      <xs:sequence>
+          <xs:group ref = "test3:group" minOccurs = "0" maxOccurs = "unbounded"/>
+      </xs:sequence>
+      <xs:attributeGroup ref = "test3:group2" minOccurs = "0" maxOccurs = "unbounded"/>
+   </xs:complexType>
+  
+    <xs:element name="control2" type="xs:annotated"/>
+        
+    <xs:complexType name="bbb">
+      <xs:attributeGroup ref = "xs:occurs" minOccurs = "0" maxOccurs = "unbounded"/>
+      <xs:attribute ref="test3:myattribute" />
+   </xs:complexType>
+</xs:schema>
diff --git a/xml/tests/testData/xml/XsiSchemaLocation2_3.xsd b/xml/tests/testData/xml/XsiSchemaLocation2_3.xsd
new file mode 100644
index 000000000000..177bd9d7d6c1
--- /dev/null
+++ b/xml/tests/testData/xml/XsiSchemaLocation2_3.xsd
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified"  attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:schemas-dig-de:test3">
+
+    <xs:element name="superControl">
+        <xs:annotation>
+            <xs:documentation>The super field</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+                <xs:attribute name="_sortable" type="xs:boolean" use="optional"/>
+                <xs:attribute name="_checkbox" type="xs:boolean" use="optional"/>
+                <xs:attribute name="id" type="xs:string" use="required"/>
+                <xs:attribute name="style" type="xs:string" use="optional"/>
+        </xs:complexType>
+    </xs:element>
+
+  <xs:complexType name="superControlType">
+          <xs:attribute name="_sortable" type="xs:boolean" use="optional"/>
+          <xs:attribute name="_checkbox" type="xs:boolean" use="optional"/>
+          <xs:attribute name="id" type="xs:string" use="required"/>
+          <xs:attribute name="style" type="xs:string" use="optional"/>
+  </xs:complexType>
+  
+  <xs:group name="group">
+    <xs:annotation>
+      <xs:documentation>
+        Fake empty group to check resolve
+      </xs:documentation>
+    </xs:annotation>
+  </xs:group>
+  
+  <xs:attributeGroup name="group2">
+    <xs:annotation>
+      <xs:documentation>
+        Fake group to check resolve
+      </xs:documentation>
+    </xs:annotation>
+  </xs:attributeGroup>
+  
+  <xs:simpleType name = "Bool">
+    <xs:annotation>
+      <xs:documentation>
+        Bool would be boolean except it does not accept 1 and 0.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base = "xs:NMTOKEN" >
+      <xs:enumeration value = "true"/>
+      <xs:enumeration value = "false"/>
+    </xs:restriction>     
+  </xs:simpleType>
+  <xs:attribute name="myattribute"/>
+</xs:schema>
diff --git a/xml/tests/testData/xml/XsiSchemaLocation3.xsd b/xml/tests/testData/xml/XsiSchemaLocation3.xsd
new file mode 100644
index 000000000000..3c93233109bc
--- /dev/null
+++ b/xml/tests/testData/xml/XsiSchemaLocation3.xsd
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:schemas-dig-de:test2">
+    <xs:import namespace="urn:schemas-dig-de:test3" schemaLocation="<error>XsiSchemaLocation2.xsd</error>"/>
+    <xs:include schemaLocation="<error>XsiSchemaLocation2.xsd</error>"/>
+    <xs:import namespace="urn:schemas-dig-de:test3" schemaLocation="XsiSchemaLocation3.xsd"/>
+    <xs:include schemaLocation="XsiSchemaLocation3.xsd"/>
+    <xs:include schemaLocation="http://www.w3.org/1999/XSL/Transform"/>
+</xs:schema>
diff --git a/xml/tests/testData/xml/XsiSchemaLocation_2.xml b/xml/tests/testData/xml/XsiSchemaLocation_2.xml
new file mode 100644
index 000000000000..e0e985792ee4
--- /dev/null
+++ b/xml/tests/testData/xml/XsiSchemaLocation_2.xml
@@ -0,0 +1,34 @@
+<xs:schema 
+    targetNamespace="http://www.w3.org/2001/xml-events" 
+    xmlns:ev="http://www.w3.org/2001/xml-events" 
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://www.w3.org/2001/XMLSchema 
+                        http://www.w3.org/2001/XMLSchema.xsd" 
+    elementFormDefault="unqualified" 
+    blockDefault="#all" 
+    finalDefault="#all" 
+    attributeFormDefault="unqualified">
+
+  <xs:annotation>
+    <xs:documentation>
+      This is the XML Schema for XML Events global attributes
+
+      URI: http://www.w3.org/MarkUp/SCHEMA/xml-events-attribs-1.xsd
+      $Id: xml-events-attribs-1.xsd,v 1.5 2003/08/02 09:36:54 mimasa Exp $
+    </xs:documentation>
+    <xs:documentation source="xml-events-copyright-1.xsd"/>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+      XML Event Attributes
+        
+        These "global" event attributes are defined in "Attaching
+        Attributes Directly to the Observer Element" of the XML
+        Events specification.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attribute name="event" type="xs:NMTOKEN"/>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XsiType.xml b/xml/tests/testData/xml/XsiType.xml
new file mode 100644
index 000000000000..7e2038bd3bdb
--- /dev/null
+++ b/xml/tests/testData/xml/XsiType.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns1:ActivationRequest xmlns:ns1="http://www.synchronoss.com/activation/ActivationRequestV1.00.xsd"
+    xmlns:ns2="http://www.synchronoss.com/activation/GenericActivationRequestV1.00.xsd"
+    xmlns:ns3="http://www.synchronoss.com/common/TypesV1.00.xsd"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.synchronoss.com/activation/ActivationRequestV1.00.xsd XsiType_GenericActivationRequestV1.00.xsd
+    http://www.synchronoss.com/common/TypesV1.00.xsd XsiType_TypesV1.00.xsd
+    http://www.synchronoss.com/activation/GenericActivationRequestV1.00.xsd XsiType_GenericActivationRequestV1.00.xsd"
+    orderNumber="orderNumber0" retailer="2" xsi:type="ns2:ct_GenericActivationRequest">
+    <ns1:Header timeStamp="2006-05-04T18:13:51.0Z">
+        <ns3:Notification notificationEmail="notificationEmail0"/>
+    </ns1:Header>
+    <ns1:Account accountType="2" accountSubType="2" serviceProvider="2"
+        liabilityIndicator="Individual">
+        <ns1:ExistingAccount>
+            <ns1:AccountIdentification>
+                <ns1:MobileNumber>0000000000</ns1:MobileNumber>
+            </ns1:AccountIdentification>
+            <ns1:ExistingFedTaxID>ExistingFedTaxID0</ns1:ExistingFedTaxID>
+        </ns1:ExistingAccount>
+    </ns1:Account>
+    <ns1:Subscriber subscriberReference="subscriberReference0" techType="2" customerType="NEW">
+        <ns1:Usage>
+            <ns1:Name>
+                <ns3:FirstName>FirstName0</ns3:FirstName>
+                <ns3:LastName>LastName0</ns3:LastName>
+                <ns3:HomePhone>0000000000</ns3:HomePhone>
+                <ns3:WorkPhone>
+                    <ns3:PhoneNumber>0000000000</ns3:PhoneNumber>
+                </ns3:WorkPhone>
+            </ns1:Name>
+            <ns1:Address>
+                <ns3:POBox>POBox0</ns3:POBox>
+                <ns3:City>City0</ns3:City>
+                <ns3:State>AA</ns3:State>
+                <ns3:PostalCode>33333</ns3:PostalCode>
+            </ns1:Address>
+        </ns1:Usage>
+        <ns1:Service>
+            <ns1:RatePlan billingCode="3333" price="39.99"/>
+            <ns1:IncludedFeature>
+                <ns1:Feature billingCode="21212" price="0.00"/>
+            </ns1:IncludedFeature>
+        </ns1:Service>
+        <ns1:ContractLength length="1" unit="years"/>
+        <ns1:Equipment>
+            <ns1:Device>
+                <ns1:SKU>33333</ns1:SKU>
+                <ns1:Make>Nokia</ns1:Make>
+            </ns1:Device>
+        </ns1:Equipment>
+    </ns1:Subscriber>
+</ns1:ActivationRequest>
diff --git a/xml/tests/testData/xml/XsiType_ActivationRequestV1.00.xsd b/xml/tests/testData/xml/XsiType_ActivationRequestV1.00.xsd
new file mode 100644
index 000000000000..007ff36819f6
--- /dev/null
+++ b/xml/tests/testData/xml/XsiType_ActivationRequestV1.00.xsd
@@ -0,0 +1,429 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2001-2009 Synchronoss Technologies, Inc. 750 Route 202 South,
+    Bridgewater, New Jersey, 08807, U.S.A.  All Rights Reserved.
+
+    This source code is part of the ConvergenceNow(R) platform and is the
+    confidential and proprietary information of Synchronoss Technologies, Inc.
+    ("Confidential Information"). You shall not disclose such Confidential
+    Information and shall use it only in accordance with the terms of the
+    license agreement you entered into with Synchronoss Technologies.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.synchronoss.com/activation/ActivationRequestV1.00.xsd"
+    xmlns:types="http://www.synchronoss.com/common/TypesV1.00.xsd"
+    targetNamespace="http://www.synchronoss.com/activation/ActivationRequestV1.00.xsd"
+    elementFormDefault="qualified"
+    >
+    <xs:import schemaLocation="XsiType_TypesV1.00.xsd" namespace="http://www.synchronoss.com/common/TypesV1.00.xsd"/>
+    <xs:element name="ActivationRequest" type="ct_AbstractActivationRequest">
+        <xs:unique name="subscriberReference" xmlns:x="http://www.synchronoss.com/activation/ActivationRequestV1.00.xsd">
+            <xs:selector xpath="x:Subscriber"/>
+            <xs:field xpath="@subscriberReference"/>
+        </xs:unique>
+    </xs:element>
+    <xs:complexType name="ct_AbstractActivationRequest" abstract="true">
+        <xs:sequence>
+            <xs:element name="Header" type="types:ct_Header"/>
+            <xs:element name="FlexFields" type="ct_FlexFields" minOccurs="0"/>
+            <xs:element name="Account" type="ct_Account"/>
+            <xs:element name="Subscriber" type="ct_Subscriber" minOccurs="1" maxOccurs="unbounded"/>
+            <xs:element name="Shipping" type="ct_Shipping" minOccurs="0"/>
+            <xs:element name="Payments" type="ct_Payments" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="orderNumber" type="types:st_NonZeroLengthString" use="required">
+            <xs:annotation>
+                <xs:documentation>Client order number associated with the order (must be unique per client)</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="retailer" type="xs:positiveInteger" use="required">
+            <xs:annotation>
+                <xs:documentation>Retailer associated with the order</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="retailerOrderNumber" type="types:st_NonZeroLengthString" use="optional">
+            <xs:annotation>
+                <xs:documentation>Retailer order number associated with the order</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="ct_Account">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="NewAccount" type="ct_NewAccount"/>
+                <xs:element name="ExistingAccount" type="ct_ExistingAccount"/>
+                <xs:element name="PrepaidAccount" type="ct_PrepaidAccount"/>
+            </xs:choice>
+            <xs:element name="FlexFields" type="ct_FlexFields" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="accountType" type="xs:positiveInteger" use="required"/>
+        <xs:attribute name="accountSubType"  type="xs:positiveInteger" use="required"/>
+        <xs:attribute name="serviceProvider" type="xs:positiveInteger" use="required"/>
+        <xs:attribute name="businessName" type="types:st_NonZeroLengthString" use="optional"/>
+        <xs:attribute name="liabilityIndicator" type="st_LiabilityIndicator" use="required"/>
+        <xs:attribute name="contractNumber" type="types:st_NonZeroLengthString" use="optional"/>
+        <xs:attribute name="langId" type="xs:positiveInteger" use="optional"/>
+    </xs:complexType>
+    <xs:simpleType name="st_LiabilityIndicator">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Individual"/>
+            <xs:enumeration value="Corporate"/>
+            <xs:enumeration value="Consumer"/>
+            <xs:enumeration value="Business"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_NewAccount">
+        <xs:sequence>
+            <xs:element name="Liability" type="ct_Liability"/>
+            <xs:element name="CreditCheck" type="ct_CreditCheck"  minOccurs="0" />
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_Liability">
+        <xs:sequence>
+            <xs:element name="Name" type="types:ct_Name"/>
+            <xs:element name="Address" type="types:ct_Address"/>
+            <xs:element name="Authentication" type="ct_Authentication"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_Authentication">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="FedTaxID" type="types:st_NonZeroLengthString"/>
+                <xs:sequence>
+                    <xs:element name="SSN" type="types:st_SSN"/>
+                    <xs:element name="DOB" type="types:st_YearMonthDay"/>
+                    <xs:element name="PhotoIdentity" type="types:ct_PhotoIdentity" minOccurs="0"/>
+                </xs:sequence>
+            </xs:choice>
+            <xs:element name="SecurityQuestion" type="ct_SecurityQuestion" minOccurs="0"/>
+            <xs:element name="PIN" type="types:st_NonZeroLengthString" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_SecurityQuestion">
+        <xs:sequence>
+            <xs:element name="SecurityQuestion" type="types:st_NonZeroLengthString"/>
+            <xs:element name="SecurityQuestionAnswer" type="types:st_NonZeroLengthString"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_CreditCheck">
+        <xs:sequence>
+            <xs:element name="DepositAmount" type="types:st_USCurrency" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="applicationNumber" type="types:st_NonZeroLengthString" use="optional"/>
+        <xs:attribute name="numberLinesReq" type="xs:nonNegativeInteger" use="required"/>
+        <xs:attribute name="numberApprLines" type="xs:nonNegativeInteger" use="optional"/>
+        <xs:attribute name="applicationApprovalDate" type="types:st_YearMonthDay" use="optional"/>
+        <xs:attribute name="applicationExpiresDate" type="types:st_YearMonthDay" use="optional"/>
+        <xs:attribute name="creditStatus" type="st_CreditStatus" use="required"/>
+        <xs:attribute name="guid" type="types:st_NonZeroLengthString" use="optional"/>
+    </xs:complexType>
+    <xs:simpleType name="st_CreditStatus">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Approved"/>
+            <xs:enumeration value="Deposit"/>
+            <xs:enumeration value="Pending"/>
+            <xs:enumeration value="Review"/>
+            <xs:enumeration value="Declined"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_ExistingAccount">
+        <xs:sequence>
+            <xs:element name="AccountIdentification">
+                <xs:complexType>
+                    <xs:choice>
+                        <xs:sequence>
+                            <xs:element name="MobileNumber" type="types:st_PhoneNumber"/>
+                            <xs:element name="AccountNumber" type="types:st_NonZeroLengthString" minOccurs="0"/>
+                        </xs:sequence>
+                        <xs:element name="AccountNumber" type="types:st_NonZeroLengthString"/>
+                    </xs:choice>
+                </xs:complexType>
+            </xs:element>
+            <xs:choice>
+                <xs:element name="ExistingSSN" type="types:st_SSN"/>
+                <xs:element name="ExistingLast4SSN" type="types:st_Last4SSN"/>
+                <xs:element name="ExistingFedTaxID" type="types:st_NonZeroLengthString"/>
+            </xs:choice>
+            <xs:element name="ExistingLiability" type="ct_ExistingLiability" minOccurs="0"/>
+            <xs:element name="CreditCheck" type="ct_CreditCheck" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_ExistingLiability">
+        <xs:sequence>
+            <xs:element name="Name" type="types:ct_Name" minOccurs="0"/>
+            <xs:choice>
+                <xs:element name="Address" type="types:ct_Address" minOccurs="0"/>
+                <xs:element name="PostalCode" type="types:ct_PostalCode"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_PrepaidAccount">
+        <xs:sequence>
+            <xs:element name="PrepaidLiability" type="ct_PrepaidLiability"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_PrepaidLiability">
+        <xs:sequence>
+            <xs:element name="Name" type="types:ct_Name"/>
+            <xs:element name="Address" type="types:ct_Address"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="st_ContractLengthUnit">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="months"/>
+            <xs:enumeration value="years"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_ContractLength">
+        <xs:attribute name="length" type="xs:nonNegativeInteger" use="required"/>
+        <xs:attribute name="unit" type="st_ContractLengthUnit" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="ct_Subscriber">
+        <xs:sequence>
+            <xs:element name="Usage" type="ct_Usage"/>
+            <xs:element name="Service" type="ct_Service"/>
+            <xs:element name="ContractLength" type="ct_ContractLength" minOccurs="0"/>
+            <xs:element name="Equipment" type="ct_Equipment" minOccurs="0"/>
+            <xs:element name="ReservedMobileNumber" type="types:st_PhoneNumber" minOccurs="0"/>
+            <xs:element name="FlexFields" type="ct_FlexFields" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="subscriberReference" type="types:st_NonZeroLengthString" use="required"/>
+        <xs:attribute name="group" type="st_Group" use="optional"/>
+        <xs:attribute name="techType" type="xs:positiveInteger" use="required"/>
+        <xs:attribute name="tcVersion" use="optional" type="types:st_NonZeroLengthString"/>
+        <xs:attribute name="tcAgreedDateAndTime" use="optional" type="xs:dateTime"/>
+        <xs:attribute name="customerType" type="st_CustomerType" use=" required"/>
+    </xs:complexType>
+    <xs:simpleType name="st_CustomerType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="NEW"/>
+            <xs:enumeration value="AL"/>
+            <xs:enumeration value="ALF"/>
+            <xs:enumeration value="LNP"/>
+            <xs:enumeration value="LNPAL"/>
+            <xs:enumeration value="LNPALF"/>
+            <xs:enumeration value="UP"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_Group">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="SharedPlanSecondary"/>
+            <xs:enumeration value="SharedPlanPrimary"/>
+            <xs:enumeration value="SinglePlan"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_Usage">
+        <xs:sequence>
+            <xs:element name="Name" type="types:ct_Name"/>
+            <xs:element name="Address" type="types:ct_Address"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_Service">
+        <xs:sequence>
+            <xs:element name="RatePlan" minOccurs="0">
+                <xs:complexType>
+                    <xs:attribute name="systemName" type="types:st_NonZeroLengthString" use="optional"/>
+                    <xs:attribute name="billingCode" type="types:st_NonZeroLengthString" use="required"/>
+                    <xs:attribute name="price" type="types:st_USCurrency" use="required"/>
+                    <xs:attribute name="displayName" type="types:st_NonZeroLengthString" use="optional"/>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="IncludedFeature" type="ct_IncludedFeature" minOccurs="0" />
+            <xs:element name="OptionalFeature" type="ct_OptionalFeature" minOccurs="0"/>
+            <xs:element name="LnpPortIn" type="ct_LnpPortIn" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="activationFee" type="types:st_USCurrency" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_Equipment">
+        <xs:sequence>
+            <xs:element name="SIM" type="ct_SIM" minOccurs="0"/>
+            <xs:choice minOccurs="0">
+                <xs:element name="Device" type="ct_Device"/>
+                <xs:element name="ExistingDevice" type="ct_ExistingDevice"/>
+            </xs:choice>
+            <xs:element name="Accessory" type="ct_Accessory" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="Collateral" type="ct_Collateral" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_SIM">
+        <xs:sequence>
+            <xs:element name="SystemName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="SKU" type="types:st_NonZeroLengthString"/>
+            <xs:element name="Make" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="ICCID" type="types:st_ICCID" minOccurs="0"/>
+            <xs:element name="DisplayName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="price" type="types:st_USCurrency" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_Device">
+        <xs:sequence>
+            <xs:element name="SystemName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="SKU" type="types:st_NonZeroLengthString"/>
+            <xs:element name="Make" type="types:st_NonZeroLengthString"/>
+            <xs:choice minOccurs="0">
+                <xs:element name="IMEI" type="types:st_IMEI"/>
+                <xs:element name="ESN" type="types:st_ESN"/>
+            </xs:choice>
+            <xs:element name="DisplayName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="PhoneType" type="types:st_NonZeroLengthString" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="originalPrice" type="types:st_USCurrency" use="optional"/>
+        <xs:attribute name="price" type="types:st_USCurrency" use="optional"/>
+        <xs:attribute name="discount" type="types:st_USCurrency" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_ExistingDevice">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="IMEI" type="types:st_IMEI"/>
+                <xs:element name="ESN" type="types:st_ESN"/>
+            </xs:choice>
+            <xs:element name="Manufacturer" type="types:st_NonZeroLengthString"/>
+            <xs:element name="Model" type="types:st_NonZeroLengthString"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_Accessory">
+        <xs:sequence>
+            <xs:element name="SystemName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="SKU" type="types:st_NonZeroLengthString"/>
+            <xs:element name="DisplayName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="quantity" type="xs:nonNegativeInteger" use="required"/>
+        <xs:attribute name="price" type="types:st_USCurrency" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_Collateral">
+        <xs:sequence>
+            <xs:element name="SystemName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="SKU" type="types:st_NonZeroLengthString"/>
+            <xs:element name="Make" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="DisplayName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="quantity" type="xs:nonNegativeInteger" use="required"/>
+        <xs:attribute name="price" type="types:st_USCurrency" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_IncludedFeature">
+        <xs:sequence>
+            <xs:element name="Feature" type="ct_PromoFeature" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_OptionalFeature">
+        <xs:sequence>
+            <xs:element name="Feature" type="ct_PromoFeature" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_PromoFeature">
+        <xs:attribute name="systemName" type="types:st_NonZeroLengthString" use="optional"/>
+        <xs:attribute name="billingCode" type="types:st_NonZeroLengthString" use="required"/>
+        <xs:attribute name="price" type="types:st_USCurrency" use="required"/>
+        <xs:attribute name="displayName" type="types:st_NonZeroLengthString" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_LnpPortIn">
+        <xs:sequence>
+            <xs:element name="LnpCustomerInfo" type="ct_LnpCustomerInfo"/>
+            <xs:element name="PortingNumber" type="types:st_PhoneNumber"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_LnpCustomerInfo">
+        <xs:sequence>
+            <xs:element name="IndividualName" type="types:ct_Name"/>
+            <xs:element name="BusinessName" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="AuthName" type="types:ct_Name" minOccurs="0" />
+            <xs:element name="SourceAddress" type="types:ct_Address"/>
+            <xs:choice>
+                <xs:element name="SSN" type="types:st_SSN"/>
+                <xs:element name="Last4SSN" type="types:st_Last4SSN"/>
+                <xs:element name="FedTaxID" type="types:st_NonZeroLengthString"/>
+            </xs:choice>
+            <xs:element name="AccountNumber" type="types:st_NonZeroLengthString"/>
+            <xs:element name="PswdPin" type="types:st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="FlexFields" type="ct_FlexFields" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_Shipping">
+        <xs:sequence>
+            <xs:element name="Name" type="types:ct_Name"/>
+            <xs:element name="Address" type="types:ct_Address"/>
+            <xs:element name="FlexFields" type="ct_FlexFields" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="shippingSKU" type="types:st_NonZeroLengthString" use="required"/>
+        <xs:attribute name="shippingPrice" type="types:st_USCurrency" use="required"/>
+        <xs:attribute name="shippingPriceSKU" type="types:st_NonZeroLengthString" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_Payments">
+        <xs:sequence>
+            <xs:element name="RecurringPayment" type="ct_RecurringPayment" minOccurs="0"/>
+            <xs:element name="OneTimePayment" type="ct_OneTimePayment" minOccurs="0"/>
+            <xs:element name="DepositPayment" type="ct_DepositPayment" minOccurs="0"/>
+            <xs:element name="CreditPayment" type="ct_CreditPayment" minOccurs="0" maxOccurs="3"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_OneTimePayment">
+        <xs:sequence>
+            <xs:element name="CreditPaymentRef" type="ct_CreditPaymentRef"/>
+        </xs:sequence>
+        <xs:attribute name="amount" type="types:st_USCurrency" use="required"/>
+        <xs:attribute name="estimatedTax" type="types:st_USCurrency" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_DepositPayment">
+        <xs:choice>
+            <xs:element name="CreditPaymentRef" type="ct_CreditPaymentRef"/>
+        </xs:choice>
+        <xs:attribute name="amount" type="types:st_USCurrency" use="required"/>
+    </xs:complexType>
+    <xs:complexType name="ct_RecurringPayment">
+        <xs:sequence>
+            <xs:element name="CreditPaymentRef" type="ct_CreditPaymentRef"/>
+        </xs:sequence>
+        <xs:attribute name="amount" type="types:st_USCurrency" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_PaymentContactInfo">
+        <xs:sequence>
+            <xs:element name="Name" type="types:ct_Name"/>
+            <xs:element name="Address" type="types:ct_Address"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="st_CreditCardType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="American Express"/>
+            <xs:enumeration value="Discover"/>
+            <xs:enumeration value="Master Card"/>
+            <xs:enumeration value="Visa"/>
+            <xs:enumeration value="DINERS CLUB"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_CreditPayment">
+        <xs:complexContent>
+            <xs:extension base="ct_PaymentContactInfo">
+                <xs:sequence>
+                    <xs:element name="ExpirationYearMonth" type="xs:gYearMonth"/>
+                </xs:sequence>
+                <xs:attribute name="creditCardType" use="required" type="st_CreditCardType"/>
+                <xs:attribute name="creditCardNumber" type="types:st_NonZeroLengthString" use="required"/>
+                <xs:attribute name="uniqueId" type="st_CreditPaymentUniqueId" use="required"/>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+    <xs:complexType name="ct_CreditPaymentRef">
+        <xs:attribute name="uniqueIdRef" type="st_CreditPaymentUniqueId" use="required"/>
+    </xs:complexType>
+    <xs:simpleType name="st_CreditPaymentUniqueId">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="RECURRING"/>
+            <xs:enumeration value="ONETIME"/>
+            <xs:enumeration value="DEPOSIT"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_FlexFields" final="#all">
+        <xs:sequence>
+            <xs:element name="FlexField" type="ct_FlexField" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ct_FlexField" final="#all">
+        <xs:sequence>
+            <xs:element name="Key" type="types:st_NonZeroLengthString"/>
+            <xs:choice>
+                <xs:element name="Value" type="types:st_NonZeroLengthString"/>
+                <xs:element name="FlexFields" type="ct_FlexField"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XsiType_GenericActivationRequestV1.00.xsd b/xml/tests/testData/xml/XsiType_GenericActivationRequestV1.00.xsd
new file mode 100644
index 000000000000..03fb9d10ff58
--- /dev/null
+++ b/xml/tests/testData/xml/XsiType_GenericActivationRequestV1.00.xsd
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2001-2009 Synchronoss Technologies, Inc. 750 Route 202 South,
+    Bridgewater, New Jersey, 08807, U.S.A.  All Rights Reserved.
+
+    This source code is part of the ConvergenceNow(R) platform and is the
+    confidential and proprietary information of Synchronoss Technologies, Inc.
+    ("Confidential Information"). You shall not disclose such Confidential
+    Information and shall use it only in accordance with the terms of the
+    license agreement you entered into with Synchronoss Technologies.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.synchronoss.com/activation/GenericActivationRequestV1.00.xsd"
+    targetNamespace="http://www.synchronoss.com/activation/GenericActivationRequestV1.00.xsd"
+    xmlns:gen="http://www.synchronoss.com/activation/ActivationRequestV1.00.xsd"
+    elementFormDefault="qualified">
+    <xs:import schemaLocation="XsiType_ActivationRequestV1.00.xsd" namespace="http://www.synchronoss.com/activation/ActivationRequestV1.00.xsd"/>
+    <xs:complexType name="ct_GenericActivationRequest">
+        <xs:complexContent>
+            <xs:extension base="gen:ct_AbstractActivationRequest"/>
+        </xs:complexContent>
+    </xs:complexType>
+</xs:schema>
+
diff --git a/xml/tests/testData/xml/XsiType_TypesV1.00.xsd b/xml/tests/testData/xml/XsiType_TypesV1.00.xsd
new file mode 100644
index 000000000000..f16d3fb2021a
--- /dev/null
+++ b/xml/tests/testData/xml/XsiType_TypesV1.00.xsd
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2001-2009 Synchronoss Technologies, Inc. 750 Route 202 South,
+    Bridgewater, New Jersey, 08807, U.S.A.  All Rights Reserved.
+
+    This source code is part of the ConvergenceNow(R) platform and is the
+    confidential and proprietary information of Synchronoss Technologies, Inc.
+    ("Confidential Information"). You shall not disclose such Confidential
+    Information and shall use it only in accordance with the terms of the
+    license agreement you entered into with Synchronoss Technologies.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns="http://www.synchronoss.com/common/TypesV1.00.xsd"
+    targetNamespace="http://www.synchronoss.com/common/TypesV1.00.xsd"
+    elementFormDefault="qualified">
+    <xs:complexType name="ct_Header">
+        <xs:sequence>
+            <xs:element name="Notification" type="ct_Notification"/>
+        </xs:sequence>
+        <xs:attribute name="timeStamp" type="xs:dateTime" use="required"/>
+        <xs:attribute name="transactionID" type="st_NonZeroLengthString" use="optional"/>
+    </xs:complexType>
+    <xs:complexType name="ct_Notification">
+        <xs:attribute name="notificationUrl" type="st_NonZeroLengthString" use="optional"/>
+        <xs:attribute name="notificationEmail" type="st_EmailAddress" use="required"/>
+        <xs:attribute name="secondaryEmail" type="st_EmailAddress" use="optional"/>
+    </xs:complexType>
+    <xs:simpleType name="st_EmailAddress">
+        <xs:restriction base="st_NonZeroLengthString"/>
+    </xs:simpleType>
+    <xs:simpleType name="st_NonZeroLengthString">
+        <xs:restriction base="xs:string">
+            <xs:whiteSpace value="collapse"/>
+            <xs:minLength value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_PhoneNumber">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{10}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_PhoneNumberwExtension">
+        <xs:sequence>
+            <xs:element name="PhoneNumber" type="st_PhoneNumber"/>
+            <xs:element name="Extension" type="st_NonZeroLengthString" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="st_State">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="AA"/>
+            <xs:enumeration value="AK"/>
+            <xs:enumeration value="AL"/>
+            <xs:enumeration value="AR"/>
+            <xs:enumeration value="AZ"/>
+            <xs:enumeration value="AP"/>
+            <xs:enumeration value="AE"/>
+            <xs:enumeration value="CA"/>
+            <xs:enumeration value="CO"/>
+            <xs:enumeration value="CT"/>
+            <xs:enumeration value="DC"/>
+            <xs:enumeration value="DE"/>
+            <xs:enumeration value="FL"/>
+            <xs:enumeration value="FPO"/>
+            <xs:enumeration value="GA"/>
+            <xs:enumeration value="HI"/>
+            <xs:enumeration value="IA"/>
+            <xs:enumeration value="ID"/>
+            <xs:enumeration value="IL"/>
+            <xs:enumeration value="IN"/>
+            <xs:enumeration value="KS"/>
+            <xs:enumeration value="KY"/>
+            <xs:enumeration value="LA"/>
+            <xs:enumeration value="MA"/>
+            <xs:enumeration value="MD"/>
+            <xs:enumeration value="ME"/>
+            <xs:enumeration value="MI"/>
+            <xs:enumeration value="MN"/>
+            <xs:enumeration value="MO"/>
+            <xs:enumeration value="MS"/>
+            <xs:enumeration value="MT"/>
+            <xs:enumeration value="NC"/>
+            <xs:enumeration value="ND"/>
+            <xs:enumeration value="NE"/>
+            <xs:enumeration value="NH"/>
+            <xs:enumeration value="NJ"/>
+            <xs:enumeration value="NM"/>
+            <xs:enumeration value="NV"/>
+            <xs:enumeration value="NY"/>
+            <xs:enumeration value="OH"/>
+            <xs:enumeration value="OK"/>
+            <xs:enumeration value="OR"/>
+            <xs:enumeration value="PA"/>
+            <xs:enumeration value="PR"/>
+            <xs:enumeration value="RI"/>
+            <xs:enumeration value="SC"/>
+            <xs:enumeration value="SD"/>
+            <xs:enumeration value="TN"/>
+            <xs:enumeration value="TX"/>
+            <xs:enumeration value="UT"/>
+            <xs:enumeration value="VA"/>
+            <xs:enumeration value="VI"/>
+            <xs:enumeration value="VT"/>
+            <xs:enumeration value="WA"/>
+            <xs:enumeration value="WI"/>
+            <xs:enumeration value="WV"/>
+            <xs:enumeration value="WY"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_PostalCode5">
+        <xs:restriction base="xs:string">
+            <xs:whiteSpace value="collapse"/>
+            <xs:length value="5"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_Plus4">
+        <xs:restriction base="xs:string">
+            <xs:whiteSpace value="collapse"/>
+            <xs:length value="4"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_PostalCode">
+        <xs:simpleContent>
+            <xs:extension base="st_PostalCode5">
+                <xs:attribute name="plus4" type="st_Plus4" use="optional"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:simpleType name="st_NamePrefix">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Mr."/>
+            <xs:enumeration value="Mrs."/>
+            <xs:enumeration value="Miss."/>
+            <xs:enumeration value="Ms."/>
+            <xs:enumeration value="Dr."/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_NameSuffix">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="DDS"/>
+            <xs:enumeration value="I"/>
+            <xs:enumeration value="II"/>
+            <xs:enumeration value="III"/>
+            <xs:enumeration value="IV"/>
+            <xs:enumeration value="Jr"/>
+            <xs:enumeration value="Jr."/>
+            <xs:enumeration value="JR"/>
+            <xs:enumeration value="MD"/>
+            <xs:enumeration value="PhD"/>
+            <xs:enumeration value="Sr"/>
+            <xs:enumeration value="Sr."/>
+            <xs:enumeration value="SR"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_Name">
+        <xs:sequence>
+            <xs:element name="Title" type="st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element minOccurs="0" type="st_NamePrefix" name="Prefix"/>
+            <xs:element name="FirstName" type="st_NonZeroLengthString"/>
+            <xs:element name="MiddleInitial" type="st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="LastName" type="st_NonZeroLengthString"/>
+            <xs:element minOccurs="0" name="Suffix" type="st_NameSuffix"/>
+            <xs:element name="HomePhone" type="st_PhoneNumber"/>
+            <xs:element name="WorkPhone" type="ct_PhoneNumberwExtension"/>
+            <xs:element name="EmailAddress" type="st_EmailAddress" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="st_SSN">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{9}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_Last4SSN">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{4}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_YearMonthDay">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{4}-[0-9]{2}-[0-9]{2}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_PhotoIdentity">
+        <xs:sequence>
+            <xs:element name="LicenseNumber" type="st_NonZeroLengthString"/>
+            <xs:element name="StateIssued" type="st_NonZeroLengthString"/>
+            <xs:element name="LicenseExpirationDate" type="st_YearMonthDay"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:simpleType name="st_USCurrency">
+        <xs:restriction base="xs:decimal">
+            <xs:fractionDigits value="2"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="ct_Address">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="POBox" type="st_NonZeroLengthString"/>
+                <xs:sequence>
+                    <xs:element name="Street1" type="st_NonZeroLengthString"/>
+                    <xs:element name="Street2" type="xs:string" minOccurs="0"/>
+                </xs:sequence>
+                <xs:sequence>
+                    <xs:element name="HouseNumber" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="HouseNumberSuffix" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="DirectionPrefix" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="Direction" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="StreetName" type="st_NonZeroLengthString"/>
+                    <xs:element name="StreetNameSuffix" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="StreetType" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="Structure" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="StructureNum" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="Level" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="LevelNum" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="ApartmentUnit" type="st_NonZeroLengthString" minOccurs="0"/>
+                    <xs:element name="ApartmentUnitNum" type="st_NonZeroLengthString" minOccurs="0"/>
+                </xs:sequence>
+            </xs:choice>
+            <xs:element name="City" type="st_NonZeroLengthString"/>
+            <xs:element name="State" type="st_State"/>
+            <xs:element name="PostalCode" type="ct_PostalCode"/>
+            <xs:element name="Country" type="st_NonZeroLengthString" minOccurs="0"/>
+            <xs:element name="Attention" type="st_NonZeroLengthString" minOccurs="0"/>
+        </xs:sequence>
+        <xs:attribute name="type" use="optional" type="st_AddressType"/>
+    </xs:complexType>
+    <xs:simpleType name="st_AddressType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="United States"/>
+            <xs:enumeration value="Rural Route"/>
+            <xs:enumeration value="Military"/>
+            <xs:enumeration value="P.O. Box"/>
+            <xs:enumeration value="International"/>
+            <xs:enumeration value="Puerto Rico/USVI"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_ICCID">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{20}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_IMEI">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{15}"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="st_ESN">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="[0-9]{18}"/>
+        </xs:restriction>
+    </xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/Xslt2.xsl b/xml/tests/testData/xml/Xslt2.xsl
new file mode 100644
index 000000000000..7c3a2a9091f1
--- /dev/null
+++ b/xml/tests/testData/xml/Xslt2.xsl
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    This is a syntactically valid (but useless) XSLT 2 stylesheet to test IDEA's XSLT 2 support.
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
+    xmlns:myfn="<error>http://surguy.net/namespaces/myfunctions</error>"
+    exclude-result-prefixes="#all">
+
+    <xsl:character-map name="test">
+        <xsl:output-character character="a" string="b"/>
+    </xsl:character-map>
+
+    <xsl:output byte-order-mark="no" use-character-maps="test" />
+
+    <xsl:template match="/" mode="#all">
+        This is a dummy template
+        <xsl:apply-templates select="* except IgnoreMe" mode="#current">
+            <xsl:sort/>
+        </xsl:apply-templates>
+    </xsl:template>
+
+    <xsl:template match="text()">
+        <xsl:analyze-string select="." regex="[a-z]">
+            <xsl:matching-substring>Found something</xsl:matching-substring>
+            <xsl:non-matching-substring>Found nothing</xsl:non-matching-substring>
+        </xsl:analyze-string>
+    </xsl:template>
+
+    <xsl:function name="myfn:test">
+        <xsl:param name="current"></xsl:param>
+    </xsl:function>
+
+
+
+</xsl:stylesheet>
diff --git a/xml/tests/testData/xml/XsltValidation.xsl b/xml/tests/testData/xml/XsltValidation.xsl
new file mode 100644
index 000000000000..2063a7f62400
--- /dev/null
+++ b/xml/tests/testData/xml/XsltValidation.xsl
@@ -0,0 +1,15 @@
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+  <xsl:template match="/*">
+    <taglib>
+      <xsl:if test="@version">
+        <tlib-version><xsl:value-of select="@version" /></tlib-version>
+      </xsl:if>
+      <xsl:if test="@version">
+        <tlib-version><xsl:value-of select="@version" /></tlib-version>
+      </xsl:if>
+    </taglib>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XsltValidation2.xsl b/xml/tests/testData/xml/XsltValidation2.xsl
new file mode 100644
index 000000000000..da5562ceeebd
--- /dev/null
+++ b/xml/tests/testData/xml/XsltValidation2.xsl
@@ -0,0 +1,12 @@
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd">
+
+  <xsl:template match="/*">
+    <taglib version="2.0">
+      <xsl:if test="@version">
+        <tlib-version><xsl:value-of select="@version" /></tlib-version>
+      </xsl:if>
+    </taglib>
+  </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/XsltValidation3.xsl b/xml/tests/testData/xml/XsltValidation3.xsl
new file mode 100644
index 000000000000..2a7b961b25e3
--- /dev/null
+++ b/xml/tests/testData/xml/XsltValidation3.xsl
@@ -0,0 +1,16 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template match="/">
+      <a>
+          <b>
+              <c>
+                  <xsl:if test="something">
+                      <d>
+                          <e></e>
+                      </d>
+                  </xsl:if>
+              </c>
+          </b>
+      </a>
+  </xsl:template>
+</xsl:stylesheet>
+
diff --git a/xml/tests/testData/xml/allUnbound.xsd b/xml/tests/testData/xml/allUnbound.xsd
new file mode 100644
index 000000000000..36be69fb9891
--- /dev/null
+++ b/xml/tests/testData/xml/allUnbound.xsd
@@ -0,0 +1,27 @@
+<schema
+    xmlns:tns="allUnbound"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="allUnbound"
+    elementFormDefault="qualified">
+
+    <complexType name="object"/>
+
+    <complexType name="all">
+        <complexContent>
+            <extension base="tns:object">
+                <all>
+                    <element name="req" type="string"/>
+                    <element name="optional" type="string" minOccurs="0"/>
+                </all>
+            </extension>
+        </complexContent>
+    </complexType>
+
+    <element name="root">
+        <complexType>
+            <sequence>
+                <element name="item" type="tns:all" maxOccurs="unbounded"/>
+            </sequence>
+        </complexType>
+    </element>
+</schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/application-client_1_4.xsd b/xml/tests/testData/xml/application-client_1_4.xsd
new file mode 100644
index 000000000000..93e6af1c55ab
--- /dev/null
+++ b/xml/tests/testData/xml/application-client_1_4.xsd
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="1.4">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)application-client_1_4.xsds	1.17 02/11/03
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      Copyright 2003 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 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 application client 1.4
+	deployment descriptor.  The deployment descriptor must
+	be named "META-INF/application-client.xml" in the
+	application client's jar file.  All application client
+	deployment descriptors must indicate the application
+	client schema by using the J2EE namespace:
+
+	http://java.sun.com/xml/ns/j2ee
+
+	and indicate the version of the schema by
+	using the version element as shown below:
+
+	    <application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+		http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+	      version="1.4">
+	      ...
+	    </application-client>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for J2EE
+	namespace with the following location:
+
+	http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all J2EE
+      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="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+  <xsd:element name="application-client" type="j2ee:application-clientType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The application-client element is the root element of an
+	application client deployment descriptor.  The application
+	client deployment descriptor describes the EJB components
+	and external resources referenced by the application
+	client.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:unique name="env-entry-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The env-entry-name element contains the name of an
+	  application client's environment entry.  The name is a JNDI
+	  name relative to the java:comp/env context.  The name must
+	  be unique within an application client.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:env-entry"/>
+      <xsd:field    xpath="j2ee:env-entry-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="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 application
+	  client's environment and is relative to the
+	  java:comp/env context. The name must be unique within the
+	  application client.
+
+	  It is recommended that name is prefixed with "ejb/".
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:ejb-ref"/>
+      <xsd:field    xpath="j2ee:ejb-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="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 an application client.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:resource-ref"/>
+      <xsd:field    xpath="j2ee:res-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="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 application client
+	  code. The name is a JNDI name relative to the
+	  java:comp/env context and must be unique within an
+	  application client.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:resource-env-ref"/>
+      <xsd:field    xpath="j2ee:resource-env-ref-name"/>
+    </xsd:unique>
+
+    <xsd:unique name="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 message destination reference name used in the
+	  application client code. The name is a JNDI name
+	  relative to the java:comp/env context and must be unique
+	  within an application client.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:message-destination-ref"/>
+      <xsd:field    xpath="j2ee:message-destination-ref-name"/>
+    </xsd:unique>
+  </xsd:element>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="application-clientType">
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="env-entry"
+		   type="j2ee:env-entryType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="ejb-ref"
+		   type="j2ee:ejb-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:group ref="j2ee:service-refGroup"/>
+      <xsd:element name="resource-ref"
+		   type="j2ee:resource-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="resource-env-ref"
+		   type="j2ee:resource-env-refType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="message-destination-ref"
+		   type="j2ee:message-destination-refType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="callback-handler"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The callback-handler element names a class provided by
+	    the application.  The class must have a no args
+	    constructor and must implement the
+	    javax.security.auth.callback.CallbackHandler
+	    interface.  The class will be instantiated by the
+	    application client container and used by the container
+	    to collect authentication information from the user.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="message-destination"
+		   type="j2ee:message-destinationType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="1.4"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The required value for the version is 1.4.
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+</xsd:schema>
+
diff --git a/xml/tests/testData/xml/badXmlns.xml b/xml/tests/testData/xml/badXmlns.xml
new file mode 100644
index 000000000000..329c1dd0be7b
--- /dev/null
+++ b/xml/tests/testData/xml/badXmlns.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context=
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+</beans>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/closedTag1.xml b/xml/tests/testData/xml/closedTag1.xml
new file mode 100644
index 000000000000..490e3735b177
--- /dev/null
+++ b/xml/tests/testData/xml/closedTag1.xml
@@ -0,0 +1,3 @@
+<a>
+  <<error>b</error>></<error>c</error>>
+</a>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/def_xslt.dtd b/xml/tests/testData/xml/def_xslt.dtd
new file mode 100644
index 000000000000..554a7f7bd9c8
--- /dev/null
+++ b/xml/tests/testData/xml/def_xslt.dtd
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+   This DTD has been developed in order to provide entry helpers for XSLT documents 
+   conformant to the W3C XSLT 1.0 Recommendation.
+   
+   © Altova GmbH, 1999-2002. 
+-->
+
+<!ENTITY % xhtml-dtd PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+                   "xhtml1-transitional.dtd">
+%xhtml-dtd; 
+
+<!--XSL Begins here-->
+<!ENTITY % result-elements "a|abbr|acronym|address|applet|area|b|base|basefont|bdo|big|blockquote|body|br|button|caption|center|cite|code|col|colgroup|dd|del|dfn|dir|div|dl|dt|em|fieldset|font|form|h1|h2|h3|h4|h5|h6|head|hr|html|i|iframe|img|input|ins|isindex|kbd|label|legend|li|link|map|menu|meta|noframes|noscript|object|ol|optgroup|option|p|param|pre|q|s|samp|script|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|title|tr|tt|u|ul|var">
+<!ENTITY % char-instructions "xsl:apply-templates
+  | xsl:call-template
+  | xsl:apply-imports
+  | xsl:for-each
+  | xsl:value-of
+  | xsl:copy-of
+  | xsl:number
+  | xsl:choose
+  | xsl:if
+  | xsl:text
+  | xsl:copy
+  | xsl:variable
+  | xsl:message
+  | xsl:fallback">
+<!ENTITY % instructions "%char-instructions;
+  | xsl:processing-instruction
+  | xsl:comment
+  | xsl:element
+  | xsl:attribute">
+<!ENTITY % char-template "(#PCDATA |
+  %char-instructions;)*">
+<!ENTITY % template "(#PCDATA |
+  %instructions; |
+  %result-elements;)*">
+<!-- Used for the type of an attribute value that is a URI reference.-->
+<!ENTITY % URI "CDATA">
+<!-- Used for the type of an attribute value that is a pattern.-->
+<!ENTITY % pattern "CDATA">
+<!-- Used for the type of an attribute value that is an
+     attribute value template.-->
+<!ENTITY % avt "CDATA">
+<!-- Used for the type of an attribute value that is a QName; the prefix
+     gets expanded by the XSLT processor. -->
+<!ENTITY % qname "NMTOKEN">
+<!-- Like qname but a whitespace-separated list of QNames. -->
+<!ENTITY % qnames "NMTOKENS">
+<!-- Used for the type of an attribute value that is an expression.-->
+<!ENTITY % expr "CDATA">
+<!-- Used for the type of an attribute value that consists
+     of a single character.-->
+<!ENTITY % char "CDATA">
+<!-- Used for the type of an attribute value that is a priority. -->
+<!ENTITY % priority "NMTOKEN">
+<!ENTITY % space-att "xml:space (default|preserve) #IMPLIED">
+<!-- This may be overridden to customize the set of elements allowed
+at the top-level. -->
+<!ENTITY % top-level "(xsl:import*,
+  (xsl:include
+  | xsl:strip-space
+  | xsl:preserve-space
+  | xsl:output
+  | xsl:key
+  | xsl:decimal-format
+  | xsl:attribute-set
+  | xsl:variable
+  | xsl:param
+  | xsl:template
+  | xsl:namespace-alias
+  | %result-elements;)*)">
+<!ENTITY % top-level-atts 'extension-element-prefixes CDATA #IMPLIED
+  exclude-result-prefixes CDATA #IMPLIED
+  id ID #IMPLIED
+  version NMTOKEN #REQUIRED
+  xmlns:xsl CDATA #FIXED "http://www.w3.org/1999/XSL/Transform"
+  %space-att;'>
+<!-- This entity is defined for use in the ATTLIST declaration
+for result elements. -->
+<!ENTITY % result-element-atts 'xsl:extension-element-prefixes CDATA #IMPLIED
+  xsl:exclude-result-prefixes CDATA #IMPLIED
+  xsl:use-attribute-sets %qnames; #IMPLIED
+  xsl:version NMTOKEN #IMPLIED'>
+<!ELEMENT xsl:stylesheet %top-level;>
+<!ATTLIST xsl:stylesheet
+	%top-level-atts; 
+>
+<!ELEMENT xsl:transform %top-level;>
+<!ATTLIST xsl:transform
+	%top-level-atts; 
+>
+<!ELEMENT xsl:import EMPTY>
+<!ATTLIST xsl:import
+	href %URI; #REQUIRED
+>
+<!ELEMENT xsl:include EMPTY>
+<!ATTLIST xsl:include
+	href %URI; #REQUIRED
+>
+<!ELEMENT xsl:strip-space EMPTY>
+<!ATTLIST xsl:strip-space
+	elements CDATA #REQUIRED
+>
+<!ELEMENT xsl:preserve-space EMPTY>
+<!ATTLIST xsl:preserve-space
+	elements CDATA #REQUIRED
+>
+<!ELEMENT xsl:output EMPTY>
+<!ATTLIST xsl:output
+	method %qname; #IMPLIED
+	version NMTOKEN #IMPLIED
+	encoding CDATA #IMPLIED
+	omit-xml-declaration (yes | no) #IMPLIED
+	standalone (yes | no) #IMPLIED
+	doctype-public CDATA #IMPLIED
+	doctype-system CDATA #IMPLIED
+	cdata-section-elements %qnames; #IMPLIED
+	indent (yes | no) #IMPLIED
+	media-type CDATA #IMPLIED
+>
+<!ELEMENT xsl:key EMPTY>
+<!ATTLIST xsl:key
+	name %qname; #REQUIRED
+	match %pattern; #REQUIRED
+	use %expr; #REQUIRED
+>
+<!ELEMENT xsl:decimal-format EMPTY>
+<!ATTLIST xsl:decimal-format
+	name %qname; #IMPLIED
+	decimal-separator %char; "."
+	grouping-separator %char; ","
+	infinity CDATA "Infinity"
+	minus-sign %char; "-"
+	NaN CDATA "NaN"
+	percent %char; "%"
+	per-mille %char; "&#x2030;"
+	zero-digit %char; "0"
+	digit %char; "#"
+	pattern-separator %char; ";"
+>
+<!ELEMENT xsl:namespace-alias EMPTY>
+<!ATTLIST xsl:namespace-alias
+	stylesheet-prefix CDATA #REQUIRED
+	result-prefix CDATA #REQUIRED
+>
+<!ELEMENT xsl:template (#PCDATA | %instructions; | %result-elements; | xsl:param)*>
+<!ATTLIST xsl:template
+	match %pattern; #IMPLIED
+	name %qname; #IMPLIED
+	priority %priority; #IMPLIED
+	mode %qname; #IMPLIED
+	%space-att; 
+>
+<!ELEMENT xsl:value-of EMPTY>
+<!ATTLIST xsl:value-of
+	select %expr; #REQUIRED
+	disable-output-escaping (yes | no) "no"
+>
+<!ELEMENT xsl:copy-of EMPTY>
+<!ATTLIST xsl:copy-of
+	select %expr; #REQUIRED
+>
+<!ELEMENT xsl:number EMPTY>
+<!ATTLIST xsl:number
+	level (single | multiple | any) "single"
+	count %pattern; #IMPLIED
+	from %pattern; #IMPLIED
+	value %expr; #IMPLIED
+	format %avt; "1"
+	lang %avt; #IMPLIED
+	letter-value %avt; #IMPLIED
+	grouping-separator %avt; #IMPLIED
+	grouping-size %avt; #IMPLIED
+>
+<!ELEMENT xsl:apply-templates (xsl:sort | xsl:with-param)*>
+<!ATTLIST xsl:apply-templates
+	select %expr; "node()"
+	mode %qname; #IMPLIED
+>
+<!ELEMENT xsl:apply-imports EMPTY>
+<!-- xsl:sort cannot occur after any other elements or
+any non-whitespace character -->
+<!ELEMENT xsl:for-each (#PCDATA | %instructions; | %result-elements; | xsl:sort)*>
+<!ATTLIST xsl:for-each
+	select %expr; #REQUIRED
+	%space-att; 
+>
+<!ELEMENT xsl:sort EMPTY>
+<!ATTLIST xsl:sort
+	select %expr; "."
+	lang %avt; #IMPLIED
+	data-type %avt; "text"
+	order %avt; "ascending"
+	case-order %avt; #IMPLIED
+>
+<!ELEMENT xsl:if %template;>
+<!ATTLIST xsl:if
+	test %expr; #REQUIRED
+	%space-att; 
+>
+<!ELEMENT xsl:choose (xsl:when+, xsl:otherwise?)>
+<!ATTLIST xsl:choose
+	%space-att; 
+>
+<!ELEMENT xsl:when %template;>
+<!ATTLIST xsl:when
+	test %expr; #REQUIRED
+	%space-att; 
+>
+<!ELEMENT xsl:otherwise %template;>
+<!ATTLIST xsl:otherwise
+	%space-att; 
+>
+<!ELEMENT xsl:attribute-set (xsl:attribute)*>
+<!ATTLIST xsl:attribute-set
+	name %qname; #REQUIRED
+	use-attribute-sets %qnames; #IMPLIED
+>
+<!ELEMENT xsl:call-template (xsl:with-param)*>
+<!ATTLIST xsl:call-template
+	name %qname; #REQUIRED
+>
+<!ELEMENT xsl:with-param %template;>
+<!ATTLIST xsl:with-param
+	name %qname; #REQUIRED
+	select %expr; #IMPLIED
+>
+<!ELEMENT xsl:variable %template;>
+<!ATTLIST xsl:variable
+	name %qname; #REQUIRED
+	select %expr; #IMPLIED
+>
+<!ELEMENT xsl:param %template;>
+<!ATTLIST xsl:param
+	name %qname; #REQUIRED
+	select %expr; #IMPLIED
+>
+<!ELEMENT xsl:text (#PCDATA)>
+<!ATTLIST xsl:text
+	disable-output-escaping (yes | no) "no"
+>
+<!ELEMENT xsl:processing-instruction %char-template;>
+<!ATTLIST xsl:processing-instruction
+	name %avt; #REQUIRED
+	%space-att; 
+>
+<!ELEMENT xsl:element %template;>
+<!ATTLIST xsl:element
+	name %avt; #REQUIRED
+	namespace %avt; #IMPLIED
+	use-attribute-sets %qnames; #IMPLIED
+	%space-att; 
+>
+<!ELEMENT xsl:attribute %char-template;>
+<!ATTLIST xsl:attribute
+	name %avt; #REQUIRED
+	namespace %avt; #IMPLIED
+	%space-att; 
+>
+<!ELEMENT xsl:comment %char-template;>
+<!ATTLIST xsl:comment
+	%space-att; 
+>
+<!ELEMENT xsl:copy %template;>
+<!ATTLIST xsl:copy
+	%space-att; 
+	use-attribute-sets %qnames; #IMPLIED
+>
+<!ELEMENT xsl:message %template;>
+<!ATTLIST xsl:message
+	%space-att; 
+	terminate (yes | no) "no"
+>
+<!ELEMENT xsl:fallback %template;>
+<!ATTLIST xsl:fallback
+	%space-att; 
+>
diff --git a/xml/tests/testData/xml/duplicateAttribute.xml b/xml/tests/testData/xml/duplicateAttribute.xml
new file mode 100644
index 000000000000..6c6b161382f8
--- /dev/null
+++ b/xml/tests/testData/xml/duplicateAttribute.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE tv [ <!ELEMENT tv (date)*> <!ELEMENT date (#PCDATA)> <!ATTLIST tv id ID #IMPLIED>]>
+
+<tv <error>id</error>="1" <error>id</error>="3">
+
+</tv>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/duplicateAttribute2.xml b/xml/tests/testData/xml/duplicateAttribute2.xml
new file mode 100644
index 000000000000..f198151c4850
--- /dev/null
+++ b/xml/tests/testData/xml/duplicateAttribute2.xml
@@ -0,0 +1,6 @@
+<<error>root</error> xmlns:foo="http://www.foo.org/schema"
+    xmlns:foo="http://www.bar.org/foo">
+  <a>
+    <b/>
+  </a>
+</<error>root</error>>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/duplicateAttribute2.xsd b/xml/tests/testData/xml/duplicateAttribute2.xsd
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/xml/tests/testData/xml/ejb-jar_2_0.dtd b/xml/tests/testData/xml/ejb-jar_2_0.dtd
new file mode 100644
index 000000000000..9a2cc7ce7670
--- /dev/null
+++ b/xml/tests/testData/xml/ejb-jar_2_0.dtd
@@ -0,0 +1,1671 @@
+<!--
+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 EJB 2.0 deployment descriptor.
+All EJB 2.0 deployment descriptors must include a DOCTYPE
+of the following form:
+
+  <!DOCTYPE ejb-jar PUBLIC
+	"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
+	"http://java.sun.com/dtd/ejb-jar_2_0.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 ejb-jar element is the root element of the EJB deployment
+descriptor. It contains
+
+	- an optional description of the ejb-jar file
+	- an optional display name
+	- an optional small icon file name
+	- an optional large icon file name
+	- mandatory structural information about all included
+	  enterprise beans
+	- a descriptor for container managed relationships, if any
+	- an optional application-assembly descriptor
+	- an optional name of an ejb-client-jar file for the ejb-jar.
+-->
+<!ELEMENT ejb-jar (description?, display-name?, small-icon?,
+large-icon?, enterprise-beans, relationships?, assembly-descriptor?,
+ejb-client-jar?)>
+
+<!--
+The abstract-schema-name element specifies the name of the abstract
+schema type of an entity bean with cmp-version 2.x. It is used in EJB
+QL queries.
+
+For example, the abstract-schema-name for an entity bean whose local
+interface is com.acme.commerce.Order might be Order.
+
+Used in: entity
+-->
+<!ELEMENT abstract-schema-name (#PCDATA)>
+
+<!--
+
+The acknowledge-mode element specifies whether JMS AUTO_ACKNOWLEDGE or
+DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used
+for the onMessage message of a message-driven bean that uses bean
+managed transaction demarcation.
+
+The acknowledge-mode element must be one of the two following:
+
+	<acknowledge-mode>Auto-acknowledge</acknowledge-mode>
+	<acknowledge-mode>Dups-ok-acknowledge</acknowledgemode>
+
+Used in: message-driven
+-->
+<!ELEMENT acknowledge-mode (#PCDATA)>
+
+<!--
+The assembly-descriptor element contains application-assembly information.
+
+The application-assembly information consists of the following parts:
+the definition of security roles, the definition of method
+permissions, the definition of transaction attributes for
+enterprise beans with container-managed transaction demarcation and
+a list of methods to be excluded from being invoked.
+
+All the parts are optional in the sense that they are omitted if the
+lists represented by them are empty.
+
+Providing an assembly-descriptor in the deployment descriptor is
+optional for the ejb-jar file producer.
+
+Used in: ejb-jar
+-->
+<!ELEMENT assembly-descriptor (security-role*, method-permission*,
+container-transaction*, exclude-list?)>
+
+<!--
+The cascade-delete element specifies that, within a particular
+relationship, the lifetime of one or more entity beans is dependent
+upon the lifetime of another entity bean. The cascade-delete element
+can only be specified for an ejb-relationship-role element contained
+in an ejb-relation element in which the other ejb-relationship-role
+element specifies a multiplicity of One.
+
+Used in: ejb-relationship-role
+-->
+<!ELEMENT cascade-delete EMPTY>
+
+<!--
+The cmp-field element describes a container-managed field. The
+field element includes an optional description of the field, and the
+name of the field.
+
+Used in: entity
+-->
+<!ELEMENT cmp-field (description?, field-name)>
+
+<!--
+The cmp-version element specifies the version of an entity bean
+with container-managed persistence.
+
+The cmp-version element must be one of the two following:
+
+	<cmp-version>1.x</cmp-version>
+	<cmp-version>2.x</cmp-version>
+
+The default value of the cmp-version element is 2.x.
+
+Used in: entity
+-->
+<!ELEMENT cmp-version (#PCDATA)>
+
+<!--
+
+The cmr-field element describes the bean provider's view of a
+relationship. It consists of an optional description, and the name and
+the class type of a field in the source of a role of a
+relationship. The cmr-field-name element corresponds to the name used
+for the get and set accessor methods for the relationship. The
+cmr-field-type element is used only for collection-valued
+cmr-fields. It specifies the type of the collection that is used.
+
+Used in: ejb-relationship-role
+-->
+<!ELEMENT cmr-field (description?, cmr-field-name, cmr-field-type?)>
+
+<!--
+The cmr-field-name element specifies the name of a logical
+relationship field in the entity bean class. The name of the cmr-field
+must begin with a lowercase letter. This field is accessed by methods
+whose names consist of the name of the field specified by
+cmr-field-name in which the first letter is uppercased, prefixed by
+"get" or "set".
+
+Used in: cmr-field
+-->
+<!ELEMENT cmr-field-name (#PCDATA)>
+
+<!--
+The cmr-field-type element specifies the class of a
+collection-valued logical relationship field in the entity bean
+class. The value of the cmr-field-type element must be either:
+java.util.Collection or java.util.Set.
+
+Used in: cmr-field
+-->
+<!ELEMENT cmr-field-type (#PCDATA)>
+
+<!--
+The container-transaction element specifies how the container
+must manage transaction scopes for the enterprise bean's method
+invocations. The element consists of an optional description, a list
+of method elements, and a transaction attribute. The transaction
+attribute is to be applied to all the specified methods.
+
+Used in: assembly-descriptor
+-->
+<!ELEMENT container-transaction (description?, method+, trans-attribute)>
+
+<!--
+The description element is used to provide text describing the parent
+element.  The description element should include any information that
+the enterprise bean ejb-jar file producer wants to provide to the consumer of
+the enterprise bean ejb-jar file (i.e., to the Deployer). Typically, the tools
+used by the enterprise bean ejb-jar file consumer will display the description
+when processing the parent element that contains the description.
+
+Used in: cmp-field, cmr-field, container-transaction, ejb-jar,
+ejb-local-ref, ejb-ref, ejb-relation, ejb-relationship-role, entity,
+env-entry, exclude-list, message-driven, method, method-permission,
+query, relationship-role-source, relationships, resource-env-ref,
+resource-ref, run-as, security-identity, security-role,
+security-role-ref, session
+-->
+<!ELEMENT description (#PCDATA)>
+
+<!--
+The destination-type element specifies the type of the JMS
+destination. The type is specified by the Java interface expected to
+be implemented by the destination.
+
+The destination-type element must be one of the two following:
+
+<destination-type>javax.jms.Queue</destination-type>
+<destination-type>javax.jms.Topic</destination-type>
+
+Used in: message-driven-destination
+-->
+<!ELEMENT destination-type (#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: ejb-jar, entity, message-driven, session
+
+Example:
+
+<display-name>Employee Self Service</display-name>
+-->
+<!ELEMENT display-name (#PCDATA)>
+
+<!--
+The ejb-class element contains the fully-qualified name of the
+enterprise bean's class.
+
+Used in: entity, message-driven, session
+
+Example:
+
+<ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
+-->
+<!ELEMENT ejb-class (#PCDATA)>
+
+<!--
+The optional ejb-client-jar element specifies a JAR file that contains
+the class files necessary for a client program to access the
+enterprise beans in the ejb-jar file.
+
+Used in: ejb-jar
+
+Example:
+
+<ejb-client-jar>employee_service_client.jar</ejb-client-jar>
+-->
+<!ELEMENT ejb-client-jar (#PCDATA)>
+
+<!--
+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 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 J2EE 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 ejb-jar file
+containing the enterprise bean 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 enterprise bean
+	  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: entity, message-driven, session
+-->
+<!ELEMENT ejb-local-ref (description?, ejb-ref-name, ejb-ref-type,
+		local-home, local, ejb-link?)>
+
+<!--
+The ejb-name element specifies an enterprise bean's name. This name is
+assigned by the ejb-jar file producer to name the enterprise bean in
+the ejb-jar file's deployment descriptor. The name must be unique
+among the names of the enterprise beans in the same ejb-jar file.
+
+There is no architected relationship between the ejb-name in the
+deployment descriptor and the JNDI name that the Deployer will assign
+to the enterprise bean's home.
+
+The name for an entity bean with cmp-version 2.x must conform to the
+lexical rules for an NMTOKEN. The name for an entity bean with
+cmp-version 2.x must not be a reserved literal in EJB QL.
+
+Used in: entity, message-driven, method, relationship-role-source,
+session
+
+Example:
+
+<ejb-name>EmployeeService</ejb-name>
+-->
+<!ELEMENT ejb-name (#PCDATA)>
+
+<!--
+The ejb-ql element contains the EJB QL query string that defines
+a finder or select query. This element is defined within the scope of
+a query element whose contents specify the finder or the select method
+that uses the query. The content must be a valid EJB QL query string
+for the entity bean for which the query is specified.
+
+The ejb-ql element must be specified for all queries that are
+expressible in EJB QL.
+
+Used in: query
+
+Example:
+<query>
+    <query-method>
+        <method-name>ejbSelectPendingLineitems</method-name>
+        <method-params/>
+    </query-method>
+    <ejb-ql>SELECT OBJECT(l) FROM LineItems l WHERE l.shipped <> TRUE
+    </ejb-ql>
+</query>
+
+-->
+<!ELEMENT ejb-ql (#PCDATA)>
+
+<!--
+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 enterprise bean 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: entity, message-driven, session
+-->
+<!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 enterprise bean's environment and is
+relative to the java:comp/env context.  The name must be unique
+within the enterprise bean.
+
+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 ejb-relation element describes a relationship between two
+entity beans with container-managed persistence.  An ejb-relation
+element contains a description; an optional ejb-relation-name element;
+and exactly two relationship role declarations, defined by the
+ejb-relationship-role elements. The name of the relationship, if
+specified, is unique within the ejb-jar file.
+
+Used in: relationships
+-->
+<!ELEMENT ejb-relation (description?, ejb-relation-name?, ejb-relationship-role,
+ejb-relationship-role)>
+
+<!--
+The ejb-relation-name element provides a unique name for a relationship.
+
+Used in: ejb-relation
+-->
+<!ELEMENT ejb-relation-name (#PCDATA)>
+
+<!--
+The ejb-relationship-role element describes a role within a
+relationship. There are two roles in each relationship.
+
+The ejb-relationship-role element contains an optional description; an
+optional name for the relationship role; a specification of the
+multiplicity of the role; an optional specification of cascade-delete
+functionality for the role; the role source; and a declaration of the
+cmr-field, if any, by means of which the other side of the
+relationship is accessed from the perspective of the role source.
+
+The multiplicity and role-source element are mandatory.
+
+The relationship-role-source element designates an entity bean by
+means of an ejb-name element. For bidirectional relationships, both
+roles of a relationship must declare a relationship-role-source
+element that specifies a cmr-field in terms of which the relationship
+is accessed. The lack of a cmr-field element in an
+ejb-relationship-role specifies that the relationship is
+unidirectional in navigability and the entity bean that participates
+in the relationship is "not aware" of the relationship.
+
+Used in: ejb-relation
+
+Example:
+
+<ejb-relation>
+    <ejb-relation-name>Product-LineItem</ejb-relation-name>
+    <ejb-relationship-role>
+        <ejb-relationship-role-name>product-has-lineitems
+        </ejb-relationship-role-name>
+        <multiplicity>One</multiplicity>
+        <relationship-role-source>
+        <ejb-name>ProductEJB</ejb-name>
+        </relationship-role-source>
+     </ejb-relationship-role>
+
+-->
+<!ELEMENT ejb-relationship-role (description?, ejb-relationship-role-name?,
+multiplicity, cascade-delete?, relationship-role-source, cmr-field?)>
+
+<!--
+The ejb-relationship-role-name element defines a name for a role that
+is unique within an ejb-relation. Different relationships can use the
+same name for a role.
+
+Used in: ejb-relationship-role
+-->
+<!ELEMENT ejb-relationship-role-name (#PCDATA)>
+
+<!--
+The enterprise-beans element contains the declarations of one or more
+enterprise beans.
+-->
+<!ELEMENT enterprise-beans (session | entity | message-driven)+>
+
+<!--
+The entity element declares an entity bean. The declaration
+consists of:
+
+	- an optional description
+	- an optional display name
+	- an optional small icon file name
+	- an optional large icon file name
+	- a unique name assigned to the enterprise bean
+	  in the deployment descriptor
+	- the names of the entity bean's remote home and remote
+          interfaces, if any
+	- the names of the entity bean's local home and local
+	  interfaces, if any
+	- the entity bean's implementation class
+	- the entity bean's persistence management type
+	- the entity bean's primary key class name
+	- an indication of the entity bean's reentrancy
+	- an optional specification of the entity bean's cmp-version
+	- an optional specification of the entity bean's abstract
+	  schema name
+	- an optional list of container-managed fields
+	- an optional specification of the primary key field
+	- an optional declaration of the bean's environment entries
+	- an optional declaration of the bean's EJB references
+	- an optional declaration of the bean's local EJB references
+	- an optional declaration of the security role references
+	- an optional declaration of the security identity
+	  to be used for the execution of the bean's methods
+	- an optional declaration of the bean's resource manager
+          connection factory references
+	- an optional declaration of the bean's
+	  resource environment references
+	- an optional set of query declarations
+	  for finder and select methods for an entity
+	  bean with cmp-version 2.x.
+
+The optional abstract-schema-name element must be specified for an
+entity bean with container-managed persistence and cmp-version 2.x.
+
+The optional primkey-field may be present in the descriptor if the
+entity's persistence-type is Container.
+
+The optional cmp-version element may be present in the descriptor if
+the entity's persistence-type is Container. If the persistence-type is
+Container and the cmp-version element is not specified, its value
+defaults to 2.x.
+
+The optional home and remote elements must be specified if the entity
+bean cmp-version is 1.x.
+
+The optional home and remote elements must be specified if the entity
+bean has a remote home and remote interface.
+
+The optional local-home and local elements must be specified if the
+entity bean has a local home and local interface.
+
+Either both the local-home and the local elements or both the
+home and the remote elements must be specified.
+
+The optional query elements must be present if the persistence-type is
+Container and the cmp-version is 2.x and query methods other than
+findByPrimaryKey have been defined for the entity bean.
+
+The other elements that are optional are "optional" in the sense that
+they are omitted if the lists represented by them are empty.
+
+At least one cmp-field element must be present in the descriptor if
+the entity's persistence-type is Container and the cmp-version is 1.x,
+and none must not be present if the entity's persistence-type is Bean.
+
+Used in: enterprise-beans
+
+-->
+<!ELEMENT entity (description?, display-name?, small-icon?,
+		large-icon?, ejb-name, home?, remote?, local-home?,
+		local?, ejb-class, persistence-type, prim-key-class,
+		reentrant, cmp-version?, abstract-schema-name?,
+		cmp-field*, primkey-field?, env-entry*, ejb-ref*,
+		ejb-local-ref*, security-role-ref*, security-identity?,
+		resource-ref*, resource-env-ref*, query*)>
+
+<!--
+The env-entry element contains the declaration of an enterprise bean'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.
+
+Used in: entity, message-driven, session
+-->
+<!ELEMENT env-entry (description?, env-entry-name, env-entry-type,
+		env-entry-value?)>
+
+<!--
+The env-entry-name element contains the name of an enterprise bean's
+environment entry.  The name is a JNDI name relative to the
+java:comp/env context.  The name must be unique within an enterprise bean.
+
+Used in: env-entry
+
+Example:
+
+<env-entry-name>minAmount</env-entry-name>
+-->
+<!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 enterprise bean'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
+
+Example:
+
+<env-entry-type>java.lang.Boolean</env-entry-type>
+-->
+<!ELEMENT env-entry-type (#PCDATA)>
+
+<!--
+The env-entry-value element contains the value of an enterprise bean'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.
+
+Used in: env-entry
+
+Example:
+
+<env-entry-value>100.00</env-entry-value>
+-->
+<!ELEMENT env-entry-value (#PCDATA)>
+
+<!--
+The exclude list element specifies one or more methods which the
+Assembler marks to be uncallable.
+
+If the method permission relation contains methods that are in the
+exclude list, the Deployer should consider those methods to be
+uncallable.
+
+Used in: assembly-descriptor
+-->
+<!ELEMENT exclude-list (description?, method+)>
+
+<!--
+The field-name element specifies the name of a container managed
+field.
+
+The name of the cmp-field of an entity bean with cmp-version 2.x must
+begin with a lowercase letter. This field is accessed by methods whose
+names consists of the name of the field specified by field-name in
+which the first letter is uppercased, prefixed by "get" or "set".
+
+The name of the cmp-field of an entity bean with cmp-version 1.x must
+denote a public field of the enterprise bean class or one of its
+superclasses.
+
+Used in: cmp-field
+
+Example:
+
+
+	<field-name>firstName</field-Name>
+
+-->
+<!ELEMENT field-name (#PCDATA)>
+
+<!--
+The home element contains the fully-qualified name of the enterprise
+bean's home interface.
+
+Used in: ejb-ref, entity, session
+
+Example:
+
+<home>com.aardvark.payroll.PayrollHome</home>
+-->
+<!ELEMENT home (#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 enterprise bean's
+ejb-jar file.
+
+The image may be either in the JPEG or GIF format.
+The icon can be used by tools.
+
+Used in: ejb-jar, entity, message-driven, session
+
+Example:
+
+<large-icon>employee-service-icon32x32.jpg</large-icon>
+-->
+<!ELEMENT large-icon (#PCDATA)>
+
+<!--
+
+The local element contains the fully-qualified name of the
+enterprise bean's local interface.
+
+Used in: ejb-local-ref, entity, session
+
+-->
+<!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, entity, session
+-->
+<!ELEMENT local-home (#PCDATA)>
+
+<!--
+
+The message-driven element declares a message-driven bean. The
+declaration consists of:
+
+	- an optional description
+	- an optional display name
+	- an optional small icon file name
+	- an optional large icon file name
+	- a name assigned to the enterprise bean in
+	  the deployment descriptor
+	- the message-driven bean's implementation class
+	- the message-driven bean's transaction management type
+	- an optional declaration of the message-driven bean's
+	  message selector
+	- an optional declaration of the
+	  acknowledgment mode for the message-driven bean
+	  if bean-managed transaction demarcation is used
+	- an optional declaration of the
+	  intended destination type of the message-driven bean
+	- an optional declaration of the bean's environment entries
+	- an optional declaration of the bean's EJB references
+	- an optional declaration of the bean's local EJB references
+	- an optional declaration of the security
+	  identity to be used for the execution of the bean's methods
+	- an optional declaration of the bean's resource manager
+	  connection factory references
+	- an optional declaration of the bean's resource
+          environment references.
+
+Used in: enterprise-beans
+-->
+<!ELEMENT message-driven (description?, display-name?, small-icon?,
+		large-icon?, ejb-name, ejb-class, transaction-type,
+		message-selector?, acknowledge-mode?,
+		message-driven-destination?, env-entry*, ejb-ref*,
+		ejb-local-ref*, security-identity?, resource-ref*,
+		resource-env-ref*)>
+
+<!--
+The message-driven-destination element provides advice to the Deployer
+as to whether a message-driven bean is intended for a Queue or a
+Topic. The declaration consists of: the type of the message-driven
+bean's intended destination and an optional declaration of whether a
+durable or non-durable subscription should be used if the
+destination-type is javax.jms.Topic.
+
+Used in: message-driven
+-->
+<!ELEMENT message-driven-destination (destination-type,
+subscription-durability?)>
+
+<!--
+The message-selector element is used to specify the JMS message
+selector to be used in determining which messages a message-driven
+bean is to receive.
+
+Example:
+<message-selector>JMSType = `car' AND color = `blue' AND weight &gt; 2500
+</message-selector>
+
+Used in: message-driven
+-->
+<!ELEMENT message-selector (#PCDATA)>
+
+<!--
+
+The method element is used to denote a method of an enterprise
+bean's home or component interface, or, in the case of a message-driven
+bean, the bean's onMessage method, or a set of methods. The ejb-name
+element must be the name of one of the enterprise beans declared in
+the deployment descriptor; the optional method-intf element allows to
+distinguish between a method with the same signature that is multiply
+defined across in both the home and component interfaces; the
+method-name element specifies the method name; and the optional
+method-params elements identify a single method among multiple methods
+with an overloaded method name.
+
+There are three possible styles of the method element syntax:
+
+1.
+<method>
+    <ejb-name>EJBNAME</ejb-name>
+    <method-name>*</method-name>
+</method>
+
+   This style is used to refer to all the methods of the specified
+   enterprise bean's home and component interfaces.
+
+2.
+<method>
+    <ejb-name>EJBNAME</ejb-name>
+    <method-name>METHOD</method-name>
+</method>>
+
+   This style is used to refer to the specified method of the
+   specified enterprise bean. If there are multiple methods with
+   the same overloaded name, the element of this style refers to
+   all the methods with the overloaded name.
+
+
+3.
+<method>
+    <ejb-name>EJBNAME</ejb-name>
+    <method-name>METHOD</method-name>
+    <method-params>
+        <method-param>PARAM-1</method-param>
+        <method-param>PARAM-2</method-param>
+        ...
+        <method-param>PARAM-n</method-param>
+    </method-params>
+<method>
+
+
+   This style is used to refer to a single method within a set of
+   methods with an overloaded name. PARAM-1 through PARAM-n are the
+   fully-qualified Java types of the method's input parameters (if
+   the method has no input arguments, the method-params element
+   contains no method-param elements). Arrays are specified by the
+   array element's type, followed by one or more pair of square
+   brackets (e.g. int[][]). If there are multiple methods with the
+   same overloaded name, this style refers to all of the overloaded
+   methods.
+
+
+Used in: container-transaction, exclude-list, method-permission
+
+Examples:
+
+Style 1: The following method element refers to all the methods of
+the EmployeeService bean's home and component interfaces:
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-name>*</method-name>
+</method>
+
+Style 2: The following method element refers to all the create
+methods of the EmployeeService bean's home interface(s).
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-name>create</method-name>
+</method>
+
+
+Style 3: The following method element refers to the
+create(String firstName, String LastName) method of the
+EmployeeService bean's home interface(s).
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-name>create</method-name>
+    <method-params>
+        <method-param>java.lang.String</method-param>
+        <method-param>java.lang.String</method-param>
+    </method-params>
+</method>
+
+
+The following example illustrates a Style 3 element with
+more complex parameter types. The method
+foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
+mypackage.MyClass[][] myclaar) would be specified as:
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-name>foobar</method-name>
+    <method-params>
+        <method-param>char</method-param>
+        <method-param>int</method-param>
+        <method-param>int[]</method-param>
+        <method-param>mypackage.MyClass</method-param>
+        <method-param>mypackage.MyClass[][]</method-param>
+    </method-params>
+</method>
+
+
+The optional method-intf element can be used when it becomes necessary
+to differentiate between a method that is multiply defined across the
+enterprise bean's home and component interfaces with the same name and
+signature.
+
+
+For example, the method element
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-intf>Remote</method-intf>
+    <method-name>create</method-name>
+    <method-params>
+        <method-param>java.lang.String</method-param>
+        <method-param>java.lang.String</method-param>
+    </method-params>
+</method>
+
+
+can be used to differentiate the create(String, String) method defined
+in the remote interface from the create(String, String) method defined
+in the remote home interface, which would be defined as
+
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-intf>Home</method-intf>
+    <method-name>create</method-name>
+    <method-params>
+        <method-param>java.lang.String</method-param>
+        <method-param>java.lang.String</method-param>
+    </method-params>
+</method>
+
+and the create method that is defined in the local home interface
+which would be defined as
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-intf>LocalHome</method-intf>
+    <method-name>create</method-name>
+    <method-params>
+        <method-param>java.lang.String</method-param>
+        <method-param>java.lang.String</method-param>
+    </method-params>
+</method>
+
+
+The method-intf element can be used with all three Styles of the
+method element usage. For example, the following method element
+example could be used to refer to all the methods of the
+EmployeeService bean's remote home interface.
+
+
+<method>
+    <ejb-name>EmployeeService</ejb-name>
+    <method-intf>Home</method-intf>
+    <method-name>*</method-name>
+</method>
+
+-->
+<!ELEMENT method (description?, ejb-name, method-intf?, method-name,
+method-params?)>
+
+<!--
+
+The method-intf element allows a method element to differentiate
+between the methods with the same name and signature that are multiply
+defined across the component and home interfaces (e.g, in both an
+enterprise bean's remote and local interfaces; in both an enterprise bean's
+home and remote interfaces, etc.)
+
+The method-intf element must be one of the following:
+
+	<method-intf>Home</method-intf>
+	<method-intf>Remote</method-intf>
+	<method-intf>LocalHome</method-intf>
+	<method-intf>Local</method-intf>
+
+Used in: method
+-->
+<!ELEMENT method-intf (#PCDATA)>
+
+<!--
+The method-name element contains a name of an enterprise bean method
+or the asterisk (*) character. The asterisk is used when the element
+denotes all the methods of an enterprise bean's component and home
+interfaces.
+
+Used in: method, query-method
+-->
+<!ELEMENT method-name (#PCDATA)>
+
+<!--
+The method-param element contains the fully-qualified Java type name
+of a method parameter.
+
+Used in: method-params
+-->
+<!ELEMENT method-param (#PCDATA)>
+
+<!--
+The method-params element contains a list of the fully-qualified Java
+type names of the method parameters.
+
+Used in: method, query-method
+-->
+<!ELEMENT method-params (method-param*)>
+
+<!--
+
+The method-permission element specifies that one or more security
+roles are allowed to invoke one or more enterprise bean methods. The
+method-permission element consists of an optional description, a list
+of security role names or an indicator to state that the method is
+unchecked for authorization, and a list of method elements.
+
+The security roles used in the method-permission element must be
+defined in the security-role elements of the deployment descriptor,
+and the methods must be methods defined in the enterprise bean's
+component and/or home interfaces.
+
+
+Used in: assembly-descriptor
+-->
+<!ELEMENT method-permission (description?, (role-name+|unchecked), method+)>
+
+<!--
+The multiplicity element describes the multiplicity of the role that
+participates in a relation.
+
+The multiplicity element must be one of the two following:
+
+	<multiplicity>One</multiplicity>
+	<multiplicity>Many</multiplicity>
+
+Used in: ejb-relationship-role
+-->
+<!ELEMENT multiplicity (#PCDATA)>
+
+<!--
+The persistence-type element specifies an entity bean's persistence
+management type.
+
+The persistence-type element must be one of the two following:
+
+	<persistence-type>Bean</persistence-type>
+	<persistence-type>Container</persistence-type>
+
+Used in: entity
+-->
+<!ELEMENT persistence-type (#PCDATA)>
+
+<!--
+The prim-key-class element contains the fully-qualified name of an
+entity bean's primary key class.
+
+If the definition of the primary key class is deferred to deployment
+time, the prim-key-class element should specify java.lang.Object.
+
+Used in: entity
+
+Examples:
+
+	<prim-key-class>java.lang.String</prim-key-class>
+
+	<prim-key-class>com.wombat.empl.EmployeeID</prim-key-class>
+
+	<prim-key-class>java.lang.Object</prim-key-class>
+
+-->
+<!ELEMENT prim-key-class (#PCDATA)>
+
+<!--
+The primkey-field element is used to specify the name of the primary
+key field for an entity with container-managed persistence.
+
+The primkey-field must be one of the fields declared in the cmp-field
+element, and the type of the field must be the same as the primary key
+type.
+
+The primkey-field element is not used if the primary key maps to
+multiple container-managed fields (i.e. the key is a compound key). In
+this case, the fields of the primary key class must be public, and
+their names must correspond to the field names of the entity bean
+class that comprise the key.
+
+Used in: entity
+
+Example:
+
+	<primkey-field>EmployeeId</primkey-field>
+
+-->
+<!ELEMENT primkey-field (#PCDATA)>
+
+<!--
+The query element is used to specify a finder or select query. It
+contains
+	- an optional description of the query
+	- the specification of the finder or select
+	  method it is used by
+        - an optional specification of the result type mapping, if
+          the query is for a select method and entity objects are
+          returned.
+    	- the EJB QL query string that defines the query.
+
+Queries that are expressible in EJB QL must use the ejb-ql element to
+specify the query. If a query is not expressible in EJB QL, the
+description element should be used to describe the semantics of the
+query and the ejb-ql element should be empty.
+
+The result-type-mapping is an optional element. It can only be present
+if the query-method specifies a select method that returns entity
+objects.  The default value for the result-type-mapping element is
+"Local".
+
+
+Used in: entity
+-->
+<!ELEMENT query (description?, query-method, result-type-mapping?, ejb-ql)>
+
+<!--
+The query-method element is used to specify the method for a finder or
+select query.
+
+The method-name element specifies the name of a finder or select
+method in the entity bean's implementation class.
+
+Each method-param must be defined for a query-method using the
+method-params element.
+
+Used in: query
+
+Example:
+
+<query>
+    <description>Method finds large orders</description>
+    <query-method>
+        <method-name>findLargeOrders</method-name>
+        <method-params></method-params>
+    </query-method>
+    <ejb-ql>SELECT OBJECT(o) FROM Order o WHERE o.amount &gt; 1000</ejb-ql>
+</query>
+
+-->
+<!ELEMENT query-method (method-name, method-params)>
+
+<!--
+The reentrant element specifies whether an entity bean is reentrant or
+not.
+
+The reentrant element must be one of the two following:
+
+	<reentrant>True</reentrant>
+	<reentrant>False</reentrant>
+
+Used in: entity
+-->
+<!ELEMENT reentrant (#PCDATA)>
+
+<!--
+
+The relationship-role-source element designates the source of a role
+that participates in a relationship. A relationship-role-source
+element uniquely identifies an entity bean.
+
+Used in: ejb-relationship-role
+-->
+<!ELEMENT relationship-role-source (description?, ejb-name)>
+
+<!--
+The relationships element describes the relationships in which
+entity beans with container-managed persistence participate. The
+relationships element contains an optional description; and a list of
+ejb-relation elements, which specify the container managed
+relationships.
+
+
+Used in: ejb-jar
+-->
+<!ELEMENT relationships (description?, ejb-relation+)>
+
+<!--
+The remote element contains the fully-qualified name of the enterprise
+bean's remote interface.
+
+Used in: ejb-ref, entity, session
+
+Example:
+
+<remote>com.wombat.empl.EmployeeService</remote>
+-->
+<!ELEMENT remote (#PCDATA)>
+
+<!--
+The res-auth element specifies whether the enterprise bean code signs
+on programmatically to the resource manager, or whether the Container
+will sign on to the resource manager on behalf of the enterprise bean. 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 an enterprise bean.
+
+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 an enterprise bean's
+reference to an administered object associated with a resource
+in the enterprise bean'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 enterprise bean code.
+
+Used in: entity, message-driven, session
+
+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 enterprise bean code.  The name is a JNDI name relative to the
+java:comp/env context and must be unique within an enterprise bean.
+
+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 an enterprise bean'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 enterprise bean 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: entity, message-driven, session
+
+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 result-type-mapping element is used in the query element to specify
+whether an abstract schema type returned by a query for a select method
+is to be mapped to an EJBLocalObject or EJBObject type.
+
+The result-type-mapping element must be one of the following:
+
+        <result-type-mapping>Local</result-type-mapping>
+        <result-type-mapping>Remote</result-type-mapping>
+
+Used in: query
+-->
+<!ELEMENT result-type-mapping (#PCDATA)>
+
+<!--
+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: method-permission, 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 enterprise bean. It contains an optional description, and
+the name of a security role.
+
+Used in: security-identity
+-->
+<!ELEMENT run-as (description?, role-name)>
+
+<!--
+
+The security-identity element specifies whether the caller's
+security identity is to be used for the execution of the methods of
+the enterprise bean or whether a specific run-as identity is to be
+used. It contains an optional description and a specification of the
+security identity to be used.
+
+Used in: entity, message-driven, session
+-->
+<!ELEMENT security-identity (description?, (use-caller-identity|run-as))>
+
+<!--
+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: assembly-descriptor
+
+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 enterprise bean'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: entity, session
+
+-->
+<!ELEMENT security-role-ref (description?, role-name, role-link?)>
+
+<!--
+The session element declares an session bean. The declaration consists
+of:
+	- an optional description
+	- an optional display name
+	- an optional small icon file name
+	- an optional large icon file name
+	- a name assigned to the enterprise bean
+	  in the deployment description
+	- the names of the session bean's remote home and
+	  remote interfaces, if any
+	- the names of the session bean's local home and
+	  local interfaces, if any
+	- the session bean's implementation class
+	- the session bean's state management type
+	- the session bean's transaction management type
+	- an optional declaration of the bean's environment entries
+	- an optional declaration of the bean's EJB references
+	- an optional declaration of the bean's local EJB references
+	- an optional declaration of the security role references
+	- an optional declaration of the security identity to be
+          used for the execution of the bean's methods
+	- an optional declaration of the bean's resource manager
+	  connection factory references
+	- an optional declaration of the bean's resource environment
+	  references.
+
+The elements that are optional are "optional" in the sense that they
+are omitted when if lists represented by them are empty.
+
+Either both the local-home and the local elements or both the
+home and the remote elements must be specified for the session bean.
+
+Used in: enterprise-beans
+-->
+<!ELEMENT session (description?, display-name?, small-icon?,
+large-icon?, ejb-name, home?, remote?, local-home?, local?,
+ejb-class, session-type, transaction-type, env-entry*, ejb-ref*,
+ejb-local-ref*, security-role-ref*, security-identity?, resource-ref*,
+resource-env-ref*)>
+
+<!--
+The session-type element describes whether the session bean is a
+stateful session or stateless session.
+
+The session-type element must be one of the two following:
+
+	<session-type>Stateful</session-type>
+	<session-type>Stateless</session-type>
+-->
+<!ELEMENT session-type (#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 enterprise bean's
+ejb-jar file.
+
+The image may be either in the JPEG or GIF format.
+The icon can be used by tools.
+
+Used in: ejb-jar, entity, message-driven, session
+
+Example:
+
+<small-icon>employee-service-icon16x16.jpg</small-icon>
+-->
+<!ELEMENT small-icon (#PCDATA)>
+
+<!--
+The subscription-durability element specifies whether a JMS topic
+subscription is intended to be durable or nondurable.
+
+The subscription-durability element must be one of the two following:
+
+	<subscription-durability>Durable</subscription-durability>
+	<subscription-durability>NonDurable</subscription-durability>
+
+Used in: message-driven-destination
+-->
+<!ELEMENT subscription-durability (#PCDATA)>
+
+<!--
+The trans-attribute element specifies how the container must manage
+the transaction boundaries when delegating a method invocation to an
+enterprise bean's business method.
+
+The value of trans-attribute must be one of the following:
+
+
+	<trans-attribute>NotSupported</trans-attribute>
+	<trans-attribute>Supports</trans-attribute>
+	<trans-attribute>Required</trans-attribute>
+	<trans-attribute>RequiresNew</trans-attribute>
+	<trans-attribute>Mandatory</trans-attribute>
+	<trans-attribute>Never</trans-attribute>
+
+Used in: container-transaction
+-->
+<!ELEMENT trans-attribute (#PCDATA)>
+
+<!--
+The transaction-type element specifies an enterprise bean's
+transaction management type.
+
+The transaction-type element must be one of the two following:
+
+	<transaction-type>Bean</transaction-type>
+	<transaction-type>Container</transaction-type>
+
+Used in: message-driven, session
+-->
+<!ELEMENT transaction-type (#PCDATA)>
+
+<!--
+The unchecked element specifies that a method is not checked for authorization
+by the container prior to invocation of the method.
+
+Used in: method-permission
+-->
+<!ELEMENT unchecked EMPTY>
+
+<!--
+
+The use-caller-identity element specifies that the caller's security
+identity be used as the security identity for the execution of the
+enterprise bean's methods.
+
+Used in: security-identity
+-->
+<!ELEMENT use-caller-identity EMPTY>
+
+<!--
+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 abstract-schema-name id ID #IMPLIED>
+<!ATTLIST acknowledge-mode id ID #IMPLIED>
+<!ATTLIST assembly-descriptor id ID #IMPLIED>
+<!ATTLIST cascade-delete id ID #IMPLIED>
+<!ATTLIST cmp-field id ID #IMPLIED>
+<!ATTLIST cmp-version id ID #IMPLIED>
+<!ATTLIST cmr-field id ID #IMPLIED>
+<!ATTLIST cmr-field-name id ID #IMPLIED>
+<!ATTLIST cmr-field-type id ID #IMPLIED>
+<!ATTLIST container-transaction id ID #IMPLIED>
+<!ATTLIST description id ID #IMPLIED>
+<!ATTLIST destination-type id ID #IMPLIED>
+<!ATTLIST display-name id ID #IMPLIED>
+<!ATTLIST ejb-class id ID #IMPLIED>
+<!ATTLIST ejb-client-jar id ID #IMPLIED>
+<!ATTLIST ejb-jar id ID #IMPLIED>
+<!ATTLIST ejb-link id ID #IMPLIED>
+<!ATTLIST ejb-local-ref id ID #IMPLIED>
+<!ATTLIST ejb-name id ID #IMPLIED>
+<!ATTLIST ejb-ql id ID #IMPLIED>
+<!ATTLIST ejb-ref id ID #IMPLIED>
+<!ATTLIST ejb-ref-name id ID #IMPLIED>
+<!ATTLIST ejb-ref-type id ID #IMPLIED>
+<!ATTLIST ejb-relation id ID #IMPLIED>
+<!ATTLIST ejb-relation-name id ID #IMPLIED>
+<!ATTLIST ejb-relationship-role id ID #IMPLIED>
+<!ATTLIST ejb-relationship-role-name id ID #IMPLIED>
+<!ATTLIST enterprise-beans id ID #IMPLIED>
+<!ATTLIST entity 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 exclude-list id ID #IMPLIED>
+<!ATTLIST field-name id ID #IMPLIED>
+<!ATTLIST home id ID #IMPLIED>
+<!ATTLIST large-icon id ID #IMPLIED>
+<!ATTLIST local id ID #IMPLIED>
+<!ATTLIST local-home id ID #IMPLIED>
+<!ATTLIST message-driven id ID #IMPLIED>
+<!ATTLIST message-driven-destination id ID #IMPLIED>
+<!ATTLIST message-selector id ID #IMPLIED>
+<!ATTLIST method id ID #IMPLIED>
+<!ATTLIST method-intf id ID #IMPLIED>
+<!ATTLIST method-name id ID #IMPLIED>
+<!ATTLIST method-param id ID #IMPLIED>
+<!ATTLIST method-params id ID #IMPLIED>
+<!ATTLIST method-permission id ID #IMPLIED>
+<!ATTLIST multiplicity id ID #IMPLIED>
+<!ATTLIST persistence-type id ID #IMPLIED>
+<!ATTLIST prim-key-class id ID #IMPLIED>
+<!ATTLIST primkey-field id ID #IMPLIED>
+<!ATTLIST query id ID #IMPLIED>
+<!ATTLIST query-method id ID #IMPLIED>
+<!ATTLIST reentrant id ID #IMPLIED>
+<!ATTLIST relationship-role-source id ID #IMPLIED>
+<!ATTLIST relationships 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 result-type-mapping id ID #IMPLIED>
+<!ATTLIST role-link id ID #IMPLIED>
+<!ATTLIST role-name id ID #IMPLIED>
+<!ATTLIST run-as id ID #IMPLIED>
+<!ATTLIST security-identity id ID #IMPLIED>
+<!ATTLIST security-role id ID #IMPLIED>
+<!ATTLIST security-role-ref id ID #IMPLIED>
+<!ATTLIST session id ID #IMPLIED>
+<!ATTLIST session-type id ID #IMPLIED>
+<!ATTLIST small-icon id ID #IMPLIED>
+<!ATTLIST subscription-durability id ID #IMPLIED>
+<!ATTLIST trans-attribute id ID #IMPLIED>
+<!ATTLIST transaction-type id ID #IMPLIED>
+<!ATTLIST unchecked id ID #IMPLIED>
+<!ATTLIST use-caller-identity id ID #IMPLIED>
diff --git a/xml/tests/testData/xml/entities.dtd b/xml/tests/testData/xml/entities.dtd
new file mode 100644
index 000000000000..527324544fd7
--- /dev/null
+++ b/xml/tests/testData/xml/entities.dtd
@@ -0,0 +1 @@
+<!ENTITY idgenerator    "identity">
\ No newline at end of file
diff --git a/xml/tests/testData/xml/fop.xsd b/xml/tests/testData/xml/fop.xsd
new file mode 100644
index 000000000000..91cd0e24cacc
--- /dev/null
+++ b/xml/tests/testData/xml/fop.xsd
@@ -0,0 +1,4312 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<!--
+  Copyright 1999-2005 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id: fop.xsd,v 1.4 2005/02/02 07:33:14 jeremias Exp $ -->
+<schema xmlns = "http://www.w3.org/2001/XMLSchema" targetNamespace = "http://www.w3.org/1999/XSL/Format"  xmlns:fo = "http://www.w3.org/1999/XSL/Format" xmlns:xs = "http://www.w3.org/2001/XMLSchema" elementFormDefault = "qualified">
+
+  <annotation>
+    <documentation>
+
+      I'm not sure where to place this.
+      It applies to the page context (NOT implemented)
+      <attribute name = "size"  type = "size_Type"/>
+
+      I have not coded for the functions described in 5.10 Core Function Library
+      They need to be segregated into groups and then inserted in the types
+
+      common_functions
+      object  inherited-property-value(NCName)
+      object  from-parent( NCName)
+      object  from-nearest-specified-value( NCName)
+      object  merge-property-values( NCName)
+
+      font_functions
+      object  system-font( NCName , NCName)
+
+      length_functions
+      numeric floor( numeric)
+      numeric ceiling(numeric)
+      numeric round(numeric)
+      numeric min( numeric , numeric)
+      numeric max(numeric , numeric)
+      numeric abs( numeric)
+
+      table_cell_or_descendants_functions
+      object  from-table-column( NCName)
+
+      color_functions
+      color rgb(numeric , numeric , numeric)
+      color rgb-icc(numeric , numeric , numeric , NCName , numeric , numeric)
+      color system-color( NCName)
+
+      label_functions
+      numeric body-start()
+      numeric label-end()
+
+      (defined)
+      table-column_functions
+      numeric proportional-column-width( numeric)
+
+      This schema has been developed in order to validate XSL FO documents for FOP
+      All of the elements need to be prefixed with fo:
+      The namespace prefix is xmlns:fo = "http://www.w3.org/1999/XSL/Format".
+
+      This schema, as delivered, may either validate the full spec, or, just the FOP portion.
+      (What it validates depends upon what I was doing with it when released.)
+
+      If you want to restrict it to just those elements and attributes implemented by FOP,
+      you need to edit the <group xmlns=""/> and <attributeGroup xmlns=""/> tags to exclude the groups ending with _Not
+
+      Some schema tools complain about the placement of comments in this schema and will remove or reorder them
+      There are fop_result and fop_fail comments on specific features not implemented by FOP
+
+      FOP does not enforce the following schema requirements
+
+      fo:simple-page-master model = "(region-body,region-before?,region-after?,region-start?,region-end?)"
+      elements can be in any order
+
+      fo:table-cell model = "(%block;)+"
+      Can be empty
+
+      fo:flow model = "(%block;)+"
+      Can be empty
+
+      This schema allows the length attribute to be negative for some elements like margins.
+      There may be instances where I've entered %integer_Type; and it should be positive-integer or number
+      The schema trys to handle the text based rules re: fo:markers, fo:float, footer and fo:initial-property-set
+      But, allows you to do illegal things if you want because I couldn't figure out how to constrain against the illegal actions.
+
+      Please e-mail your comments to cpaussa@myrealbox.com
+
+      Contribution by Oleg Tkachenko
+      (Declarations able to include non-xsl children)
+      <xs:any minOccurs = "0" maxOccurs = "unbounded" namespace = "##other" processContents = "skip"/>
+      This declaration assumes that all <fo:color-profile/> elements must come before other stuff,
+      which is not required by spec, but I cannot see any way to express such constraints in schema,
+      one could use <xs:choice/> instead of <xs:sequence/>, but this way we lose control over (color-profile)+ constraint.
+
+      VCP 21-Oct-2002
+        Updated all (px|pt|mm|cm|in|em) to (px|pt|mm|cm|in|em|%) to allow percentage types.
+        Updated the restriction base of those types from NMTOKEN to string
+
+    </documentation>
+  </annotation>
+
+  <group name = "initial_property_set_List_Not">
+    <choice>
+      <element ref = "fo:initial-property-set"/>
+    </choice>
+  </group>
+
+  <annotation>
+    <documentation>
+      empty group so cannot be defined
+      <group name = "initial_property_set_List_FOP">
+        <choice/>
+      </group>
+    </documentation>
+  </annotation>
+
+  <group name = "initial_property_set_List">
+    <annotation>
+      <documentation>
+        <choice>
+          <group ref = "fo:initial_property_set_List_FOP"/>
+        </choice>
+      </documentation>
+    </annotation>
+    <choice>
+      <group ref = "fo:initial_property_set_List_Not"/>
+    </choice>
+  </group>
+  <group name = "marker_List">
+    <choice>
+      <element ref = "fo:marker"/>
+    </choice>
+  </group>
+  <group name = "inline_List_FOP">
+    <choice>
+      <element ref = "fo:character"/>
+      <element ref = "fo:external-graphic"/>
+      <element ref = "fo:instream-foreign-object"/>
+      <element ref = "fo:inline"/>
+      <element ref = "fo:leader"/>
+      <element ref = "fo:page-number"/>
+      <element ref = "fo:page-number-citation"/>
+      <element ref = "fo:basic-link"/>
+    </choice>
+  </group>
+  <group name = "inline_List_Not">
+    <choice>
+      <element ref = "fo:bidi-override"/>
+      <element ref = "fo:inline-container"/>
+      <element ref = "fo:multi-toggle"/>
+    </choice>
+  </group>
+  <group name = "inline_List">
+    <choice>
+      <group ref = "fo:inline_List_FOP"/>
+      <group ref = "fo:inline_List_Not"/>
+    </choice>
+  </group>
+  <group name = "block_List_FOP">
+    <choice>
+      <element ref = "fo:block"/>
+      <element ref = "fo:block-container"/>
+      <element ref = "fo:table"/>
+      <element ref = "fo:list-block"/>
+    </choice>
+  </group>
+  <group name = "block_List_Not">
+    <choice>
+      <element ref = "fo:table-and-caption"/>
+    </choice>
+  </group>
+  <group name = "block_List">
+    <choice>
+      <group ref = "fo:block_List_FOP"/>
+      <group ref = "fo:block_List_Not"/>
+    </choice>
+  </group>
+  <group name = "neutral_List_FOP">
+    <choice>
+      <element ref = "fo:wrapper"/>
+      <element ref = "fo:retrieve-marker"/>
+    </choice>
+  </group>
+  <group name = "neutral_List_Not">
+    <choice>
+      <element ref = "fo:multi-switch"/>
+      <element ref = "fo:multi-properties"/>
+    </choice>
+  </group>
+  <group name = "neutral_List">
+    <choice>
+      <group ref = "fo:neutral_List_FOP"/>
+      <group ref = "fo:neutral_List_Not"/>
+    </choice>
+  </group>
+  <annotation>
+    <documentation>
+      empty group so cannot be defined
+      <group name = "float_List_FOP">
+        <choice/>
+      </group>
+    </documentation>
+  </annotation>
+  <group name = "float_List_Not">
+    <choice>
+      <element ref = "fo:float"/>
+    </choice>
+  </group>
+  <group name = "float_List">
+    <annotation>
+      <documentation>
+        empty group
+        <choice>
+          <group ref = "fo:float_List_FOP"/>
+        </choice>
+      </documentation>
+    </annotation>
+    <choice>
+      <group ref = "fo:float_List_Not"/>
+    </choice>
+  </group>
+  <group name = "footnote_List">
+    <choice>
+      <element ref = "fo:footnote"/>
+    </choice>
+  </group>
+
+  <attributeGroup name = "block_properties_Not">
+    <attribute name = "page-break-after"  type = "fo:page_break_after_Type"/>
+    <attribute name = "page-break-before" type = "fo:page_break_after_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "block_properties_FOP">
+  </attributeGroup>
+  <attributeGroup name = "block_properties">
+    <attributeGroup ref = "fo:block_properties_FOP"/>
+    <attributeGroup ref = "fo:block_properties_Not"/>
+  </attributeGroup>
+
+  <attributeGroup name = "list_properties_Not">
+    <attribute name = "page-break-after"  type = "fo:page_break_after_Type"/>
+    <attribute name = "page-break-before" type = "fo:page_break_after_Type"/>
+    <attribute name = "background-position" type = "fo:background_position_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "list_properties_FOP">
+  </attributeGroup>
+  <attributeGroup name = "list_properties">
+    <attributeGroup ref = "fo:list_properties_FOP"/>
+    <attributeGroup ref = "fo:list_properties_Not"/>
+  </attributeGroup>
+
+  <attributeGroup name = "inheritable_properties_List_Not">
+    <attribute name = "auto-restore" type = "fo:auto_restore_Type"/>
+    <attribute name = "background"    type = "fo:background_Type"   />
+    <attribute name = "border-spacing" type = "fo:length_Type"/>
+    <attribute name = "caption-side" type = "fo:caption_side_Type"/>
+    <attribute name = "direction" type = "fo:direction_Type"/>
+    <attribute name = "empty-cells" type = "fo:empty_cells_Type"/>
+    <attribute name = "font" type = "xs:string"/>
+    <attribute name = "font-selection-strategy" type = "fo:font_selection_strategy_Type"/>
+    <attribute name = "font-size-adjust" type = "fo:font_size_adjust_Type"/>
+    <attribute name = "font-stretch" type = "xs:string"/>
+    <attribute name = "font-variant" type = "fo:font_variant_Type"/>
+    <attribute name = "glyph-orientation-vertical" type = "fo:orientation_Type"/>
+    <attribute name = "glyph-orientation-horizontal" type = "fo:orientation_Type"/>
+    <attribute name = "hyphenation-keep" type = "fo:hyphenation_keep_Type"/>
+    <attribute name = "hyphenation-ladder-count" type = "fo:hyphenation_ladder_count_Type"/>
+    <attribute name = "intrusion-displace" type = "fo:displace_Type"/>
+    <attribute name = "last-line-end-indent" type = "fo:last_line_end_indent_Type"/>
+    <attribute name = "line-height-shift-adjustment" type = "fo:line_height_shift_adjustment_Type"/>
+    <attribute name = "line-stacking-strategy" type = "fo:line_stacking_strategy_Type"/>
+    <attribute name = "linefeed-treatment" type = "fo:linefeed_treatment_Type"/>
+    <attribute name = "margin"        type = "fo:border_margin_width_Type"       />
+    <attribute name = "max-width"     type = "fo:max_width_Type"/>
+    <attribute name = "min-height"    type = "fo:start_indent_Type"/>
+    <attribute name = "min-width"     type = "fo:start_indent_Type"/>
+    <attribute name = "page-break-inside" type = "fo:page_break_inside_Type"/>
+    <attribute name = "reference-orientation" type = "fo:orientation_Type"/>
+    <attribute name = "score-spaces" type = "fo:score_spaces_Type"/>
+    <attribute name = "script" type = "xs:string"/>
+    <attribute name = "text-transform" type = "fo:text_transform_Type"/>
+    <attribute name = "visibility" type = "fo:visibility_Type"/>
+    <attribute name = "white-space" type = "fo:white_space_Type"/>
+    <attribute name = "white-space-treatment" type = "fo:white_space_treatment_Type"/>
+    <attribute name = "word-spacing" type = "fo:letter_spacing_Type"/>
+    <attribute name = "writing-mode" type = "fo:writing_mode_Type"/>
+  </attributeGroup>
+
+
+  <attributeGroup name = "inheritable_properties_List_FOP">
+    <annotation>
+      <documentation>
+        Removed because I'm not sure how to handle this<attribute xmlns="" name = "xml:lang" type = "xs:string"/>
+      </documentation>
+    </annotation>
+    <attribute name = "border-bottom" type = "fo:border_side_Type"/>
+    <attribute name = "border-collapse" type = "fo:border_collapse_Type"/>
+    <attribute name = "border-color"  type = "fo:border_color_Type" />
+    <attribute name = "border-left"   type = "fo:border_side_Type"  />
+    <attribute name = "border-right"  type = "fo:border_side_Type" />
+    <attribute name = "border-separation" type = "fo:length_bp_ip_direction_Type"/>
+    <attribute name = "border-style"  type = "fo:border_multi_style_Type" />
+    <attribute name = "border-top"    type = "fo:border_side_Type"   />
+    <attribute name = "border-width"  type = "fo:border_margin_width_Type" />
+    <attribute name = "color" type = "fo:color_Type"/>
+    <attribute name = "country" type = "fo:country_Type"/>
+    <attribute name = "display-align" type = "fo:display_align_Type"/>
+    <attribute name = "end-indent" type = "fo:end_indent_Type"/>
+    <attribute name = "font-family" type = "fo:family_name_Type"/>
+    <attribute name = "font-size" type = "fo:font_size_Type"/>
+    <attribute name = "font-style" type = "fo:font_style_Type"/>
+    <attribute name = "font-weight" type = "fo:font_weight_Type"/>
+    <attribute name = "hyphenate" type = "fo:hyphenate_Type"/>
+    <attribute name = "hyphenation-character" type = "fo:hyphenation_character_Type"/>
+    <attribute name = "hyphenation-push-character-count" type = "fo:integer_Type"/>
+    <attribute name = "hyphenation-remain-character-count" type = "fo:integer_Type"/>
+    <attribute name = "keep-together" type = "fo:keep_compound_Type"/>
+    <attribute name = "keep-together.within-column" type = "fo:keep_integer_Type"/>
+    <attribute name = "keep-together.within-line" type = "fo:keep_integer_Type"/>
+    <attribute name = "keep-together.within-page" type = "fo:keep_integer_Type"/>
+    <attribute name = "language" type = "fo:language_Type"/>
+    <attribute name = "leader-alignment" type = "fo:leader_alignment_Type"/>
+    <attribute name = "leader-length" type = "fo:leader_length_Type"/>
+    <attribute name = "leader-length.maximum" type = "fo:length_Type"/>
+    <attribute name = "leader-length.minimum" type = "fo:length_Type"/>
+    <attribute name = "leader-length.optimum" type = "fo:length_Type"/>
+    <attribute name = "leader-pattern" type = "fo:leader_pattern_Type"/>
+    <attribute name = "leader-pattern-width" type = "fo:leader_pattern_width_Type"/>
+    <attribute name = "letter-spacing" type = "fo:letter_spacing_Type"/>
+    <attribute name = "line-height" type = "fo:line_height_Type"/>
+    <attribute name = "orphans" type = "fo:orphans_Type"/>
+    <attribute name = "position" type = "fo:position_Type"/>
+    <attribute name = "provisional-distance-between-starts" type = "fo:provisional_distance_between_starts_Type"/>
+    <attribute name = "provisional-label-separation" type = "fo:provisional_label_separation_Type"/>
+    <attribute name = "relative-align" type = "fo:relative_align_Type"/>
+    <attribute name = "rule-style" type = "fo:rule_style_Type"/>
+    <attribute name = "rule-thickness" type = "fo:length_Type"/>
+    <attribute name = "start-indent" type = "fo:start_indent_Type"/>
+    <attribute name = "text-align" type = "fo:text_align_Type"/>
+    <attribute name = "text-align-last" type = "fo:text_align_last_Type"/>
+    <attribute name = "text-indent" type = "fo:length_percentage_Type"/>
+    <attribute name = "white-space-collapse" type = "fo:white_space_collapse_Type"/>
+    <attribute name = "widows" type = "fo:widows_Type"/>
+    <attribute name = "wrap-option" type = "fo:wrap_option_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "inheritable_properties_List">
+    <attributeGroup ref = "fo:inheritable_properties_List_FOP"/>
+    <attributeGroup ref = "fo:inheritable_properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "break_Properties_List_Not">
+    <annotation>
+      <documentation>
+        Inheritable
+        <attribute name = "page-break-inside" type = "fo:breaks_Type"/>
+      </documentation>
+    </annotation>
+  </attributeGroup>
+  <attributeGroup name = "break_Properties_List_FOP">
+    <attribute name = "break-after" type = "fo:breaks_Type"/>
+    <attribute name = "break-before" type = "fo:breaks_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "break_Properties_List">
+    <attributeGroup ref = "fo:break_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:break_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "text_one_Properties_List_FOP"/>
+  <attributeGroup name = "text_one_Properties_List_Not">
+    <attribute name = "text-depth" type = "fo:text_depth_Type"/>
+    <attribute name = "text-altitude" type = "fo:text_altitude_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "text_one_Properties_List">
+    <attributeGroup ref = "fo:text_one_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:text_one_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "line_height_Properties_List_FOP"/>
+  <attributeGroup name = "line_height_Properties_List_Not">
+    <annotation>
+      <documentation>
+        Inheritable
+        <attribute name = "line-height-shift-adjustment" type = "fo:line_height_shift_adjustment_Type"/>
+        <attribute name = "line-stacking-strategy" type = "fo:line_stacking_strategy_Type"/>
+      </documentation>
+    </annotation>
+  </attributeGroup>
+  <attributeGroup name = "line_height_Properties_List">
+    <attributeGroup ref = "fo:line_height_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:line_height_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "keep_Properties_List_FOP">
+    <attribute name = "keep-with-next" type = "fo:keep_integer_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "keep_Properties_List_Not">
+    <annotation>
+      <documentation>
+        Inheritable
+        <attribute name = "keep-together" type = "fo:keep_compound_Type"/>
+        <attribute name = "keep-together.within-line" type = "fo:keep_integer_Type"/>
+        <attribute name = "keep-together.within-column" type = "fo:keep_integer_Type"/>
+        <attribute name = "keep-together.within-page" type = "fo:keep_integer_Type"/>
+      </documentation>
+    </annotation>
+    <attribute name = "keep-with-previous" type = "fo:keep_integer_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "keep_Properties_List">
+    <attributeGroup ref = "fo:keep_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:keep_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "block_hyphenation_Properties_List_FOP"/>
+  <attributeGroup name = "block_hyphenation_Properties_List_Not">
+    <annotation>
+      <documentation>
+        Inheritable
+        <attribute name = "hyphenation-keep" type = "fo:hyphenation_keep_Type"/>
+        <attribute name = "hyphenation-ladder-count" type = "fo:hyphenation_ladder_count_Type"/>
+      </documentation>
+    </annotation>
+    </attributeGroup>
+  <attributeGroup name = "block_hyphenation_Properties_List">
+    <attributeGroup ref = "fo:block_hyphenation_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:block_hyphenation_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "intrusion_displace_Properties_List_FOP"/>
+  <attributeGroup name = "intrusion_displace_Properties_List_Not">
+    <annotation>
+      <documentation>
+        Inheritable attributes
+        <attribute name = "intrusion-displace" type = "fo:displace_Type"/>
+      </documentation>
+    </annotation>
+    </attributeGroup>
+  <attributeGroup name = "intrusion_displace_Properties_List">
+    <attributeGroup ref = "fo:intrusion_displace_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:intrusion_displace_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "progression_Properties_List_FOP"/>
+  <attributeGroup name = "progression_Properties_List_Not">
+    <attribute name = "block-progression-dimension" type = "fo:margin_width_Type"/>
+    <attribute name = "block-progression-dimension.minimum" type = "fo:length_Type"/>
+    <attribute name = "block-progression-dimension.optimum" type = "fo:block_progression_dimension_optimum_Type"/>
+    <attribute name = "block-progression-dimension.maximum" type = "fo:block_progression_dimension_maximum_Type"/>
+    <attribute name = "inline-progression-dimension" type = "fo:margin_width_Type"/>
+    <attribute name = "inline-progression-dimension.minimum" type = "fo:length_Type"/>
+    <attribute name = "inline-progression-dimension.optimum" type = "fo:block_progression_dimension_optimum_Type"/>
+    <attribute name = "inline-progression-dimension.maximum" type = "fo:block_progression_dimension_maximum_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "progression_Properties_List">
+    <attributeGroup ref = "fo:progression_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:progression_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "clip_Properties_List_FOP"/>
+  <attributeGroup name = "clip_Properties_List_Not">
+    <attribute name = "clip" type = "fo:clip_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "clip_Properties_List">
+    <attributeGroup ref = "fo:clip_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:clip_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "reference_Properties_List_FOP"/>
+  <attributeGroup name = "reference_Properties_List_Not">
+    <annotation>
+      <documentation>
+        Inherited
+        <attribute name = "reference-orientation" type = "fo:orientation_Type"/>
+        <attribute name = "writing-mode" type = "fo:writing_mode_Type"/>
+      </documentation>
+    </annotation>
+    </attributeGroup>
+  <attributeGroup name = "reference_Properties_List">
+    <attributeGroup ref = "fo:reference_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:reference_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Accessibility_Properties_List_FOP"/>
+  <attributeGroup name = "Accessibility_Properties_List_Not">
+    <attribute name = "source-document" type = "xs:string"/>
+    <attribute name = "role" type = "xs:string"/>
+  </attributeGroup>
+  <attributeGroup name = "Accessibility_Properties_List">
+    <attributeGroup ref = "fo:Accessibility_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:Accessibility_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Relative_Position_Properties_List_FOP">
+    <annotation>
+      <documentation>
+        Inherited
+        <attribute name = "position" type = "fo:position_Type"/>
+      </documentation>
+    </annotation>
+    <attribute name = "top" type = "fo:top_Type"/>
+    <attribute name = "right" type = "fo:right_Type"/>
+    <attribute name = "bottom" type = "fo:bottom_Type"/>
+    <attribute name = "left" type = "fo:left_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Relative_Position_Properties_List_Not">
+    <attribute name = "relative-position" type = "fo:relative_position_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Relative_Position_Properties_List">
+    <attributeGroup ref = "fo:Relative_Position_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:Relative_Position_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "absolute_or_Relative_Position_Properties_List_FOP">
+    <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+  </attributeGroup>
+  <attributeGroup name = "absolute_or_Relative_Position_Properties_List_Not">
+    <attribute name = "absolute-position" type = "fo:absolute_position_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "absolute_or_Relative_Position_Properties_List">
+    <attributeGroup ref = "fo:absolute_or_Relative_Position_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:absolute_or_Relative_Position_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Aural_Properties_List_FOP"/>
+  <attributeGroup name = "Aural_Properties_List_Not">
+    <attribute name = "azimuth" type = "fo:azimuth_Type"/>
+    <attribute name = "cue" type = "xs:string"/>
+    <attribute name = "cue-after" type = "xs:string"/>
+    <attribute name = "cue-before" type = "xs:string"/>
+    <attribute name = "elevation" type = "fo:elevation_Type"/>
+    <attribute name = "pause" type = "xs:string"/>
+    <attribute name = "pause-after" type = "xs:string"/>
+    <attribute name = "pause-before" type = "xs:string"/>
+    <attribute name = "pitch" type = "xs:string"/>
+    <attribute name = "pitch-range" type = "xs:string"/>
+    <attribute name = "play-during" type = "xs:string"/>
+    <attribute name = "richness" type = "xs:string"/>
+    <attribute name = "speak" type = "xs:string"/>
+    <attribute name = "speak-header" type = "xs:string"/>
+    <attribute name = "speak-numeral" type = "fo:speak_numeral_Type"/>
+    <attribute name = "speak-punctuation" type = "xs:string"/>
+    <attribute name = "speech-rate" type = "fo:speech_rate_Type"/>
+    <attribute name = "stress" type = "xs:string"/>
+    <attribute name = "voice-family" type = "xs:string"/>
+    <attribute name = "volume" type = "xs:string"/>
+  </attributeGroup>
+  <attributeGroup name = "Aural_Properties_List">
+    <attributeGroup ref = "fo:Aural_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:Aural_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Border_Padding_and_Background_Properties_List">
+    <attributeGroup ref = "fo:Border_Properties_List"/>
+    <attributeGroup ref = "fo:Padding_Properties_List"/>
+    <attributeGroup ref = "fo:Background_Properties_List"/>
+  </attributeGroup>
+  <attributeGroup name = "Absolute_Position_Properties_List_FOP">
+    <annotation>
+      <documentation>
+        Inherited
+        <attribute name = "position" type = "fo:position_Type"/>
+      </documentation>
+    </annotation>
+    <attribute name = "top" type = "fo:top_Type"/>
+    <attribute name = "right" type = "fo:right_Type"/>
+    <attribute name = "bottom" type = "fo:bottom_Type"/>
+    <attribute name = "left" type = "fo:left_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Absolute_Position_Properties_List_Not">
+    <attribute name = "absolute-position" type = "fo:absolute_position_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Absolute_Position_Properties_List">
+    <attributeGroup ref = "fo:Absolute_Position_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:Absolute_Position_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Background_Properties_List_FOP">
+    <attribute name = "background-color" type = "fo:background_color_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Background_Properties_List_Not">
+    <attribute name = "background-attachment" type = "fo:background_attachment_Type"/>
+    <attribute name = "background-image" type = "xs:string"/>
+    <attribute name = "background-repeat" type = "fo:background_repeat_Type"/>
+    <attribute name = "background-position-horizontal" type = "fo:background_position_horizontal_Type"/>
+    <attribute name = "background-position-vertical" type = "fo:background_position_vertical_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Background_Properties_List">
+    <attributeGroup ref = "fo:Background_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:Background_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Border_Properties_List">
+    <attribute name = "border" type = "fo:border_Type"/>
+    <attribute name = "border-before-color" type = "fo:color_Type"/>
+    <attribute name = "border-before-style" type = "fo:border_style_Type"/>
+    <attribute name = "border-before-width" type = "fo:border_before_width_Type"/>
+    <attribute name = "border-before-width.length" type = "fo:length_Type"/>
+    <attribute name = "border-before-width.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "border-after-color" type = "fo:color_Type"/>
+    <attribute name = "border-after-style" type = "fo:border_style_Type"/>
+    <attribute name = "border-after-width" type = "fo:border_before_width_Type"/>
+    <attribute name = "border-after-width.length" type = "fo:length_Type"/>
+    <attribute name = "border-after-width.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "border-start-color" type = "fo:color_Type"/>
+    <attribute name = "border-start-style" type = "fo:border_style_Type"/>
+    <attribute name = "border-start-width" type = "fo:border_before_width_Type"/>
+    <attribute name = "border-start-width.length" type = "fo:length_Type"/>
+    <attribute name = "border-start-width.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "border-end-color" type = "fo:color_Type"/>
+    <attribute name = "border-end-style" type = "fo:border_style_Type"/>
+    <attribute name = "border-end-width" type = "fo:border_before_width_Type"/>
+    <attribute name = "border-end-width.length" type = "fo:length_Type"/>
+    <attribute name = "border-end-width.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "border-top-color" type = "fo:color_Type"/>
+    <attribute name = "border-top-style" type = "fo:border_style_Type"/>
+    <attribute name = "border-top-width" type = "fo:border_top_width_Type"/>
+    <attribute name = "border-top-width.length" type = "fo:length_Type"/>
+    <attribute name = "border-top-width.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "border-bottom-color" type = "fo:color_Type"/>
+    <attribute name = "border-bottom-style" type = "fo:border_style_Type"/>
+    <attribute name = "border-bottom-width" type = "fo:border_top_width_Type"/>
+    <attribute name = "border-bottom-width.length" type = "fo:length_Type"/>
+    <attribute name = "border-bottom-width.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "border-left-color" type = "fo:color_Type"/>
+    <attribute name = "border-left-style" type = "fo:border_style_Type"/>
+    <attribute name = "border-left-width" type = "fo:border_top_width_Type"/>
+    <attribute name = "border-left-width.length" type = "fo:length_Type"/>
+    <attribute name = "border-left-width.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "border-right-color" type = "fo:color_Type"/>
+    <attribute name = "border-right-style" type = "fo:border_style_Type"/>
+    <attribute name = "border-right-width" type = "fo:border_top_width_Type"/>
+    <attribute name = "border-right-width.length" type = "fo:length_Type"/>
+    <attribute name = "border-right-width.conditionality" type = "fo:conditionality_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Padding_Properties_List">
+    <attribute name = "padding" type = "fo:padding_before_Type"/>
+    <attribute name = "padding-before" type = "fo:padding_before_Type"/>
+    <attribute name = "padding-before.length" type = "fo:length_Type"/>
+    <attribute name = "padding-before.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "padding-after" type = "fo:padding_before_Type"/>
+    <attribute name = "padding-after.length" type = "fo:length_Type"/>
+    <attribute name = "padding-after.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "padding-start" type = "fo:padding_before_Type"/>
+    <attribute name = "padding-start.length" type = "fo:length_Type"/>
+    <attribute name = "padding-start.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "padding-end" type = "fo:padding_before_Type"/>
+    <attribute name = "padding-end.length" type = "fo:length_Type"/>
+    <attribute name = "padding-end.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "padding-top" type = "fo:padding_top_Type"/>
+    <attribute name = "padding-top.length" type = "fo:length_Type"/>
+    <attribute name = "padding-top.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "padding-bottom" type = "fo:padding_top_Type"/>
+    <attribute name = "padding-bottom.length" type = "fo:length_Type"/>
+    <attribute name = "padding-bottom.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "padding-left" type = "fo:padding_top_Type"/>
+    <attribute name = "padding-left.length" type = "fo:length_Type"/>
+    <attribute name = "padding-left.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "padding-right" type = "fo:padding_top_Type"/>
+    <attribute name = "padding-right.length" type = "fo:length_Type"/>
+    <attribute name = "padding-right.conditionality" type = "fo:conditionality_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Font_Properties_List_FOP">
+    <annotation>
+      <documentation>
+        Font properties are all inheritable
+        <attribute name = "font-family" type = "fo:family_name_Type"/>
+        <attribute name = "font-size" type = "fo:font_size_Type"/>
+        <attribute name = "font-style" type = "fo:font_style_Type"/>
+        <attribute name = "font-weight" type = "fo:font_weight_Type"/>
+      </documentation>
+    </annotation>
+    </attributeGroup>
+  <attributeGroup name = "Font_Properties_List_Not">
+    <annotation>
+      <documentation>
+        Font properties are all inheritable
+        <attribute name = "font" type = "xs:string"/>
+        <attribute name = "font-selection-strategy" type = "fo:font_selection_strategy_Type"/>
+        <attribute name = "font-size-adjust" type = "xs:string"/>
+        <attribute name = "font-stretch" type = "xs:string"/>
+        <attribute name = "font-variant" type = "fo:font_variant_Type"/>
+      </documentation>
+    </annotation>
+    </attributeGroup>
+  <attributeGroup name = "Font_Properties_List">
+    <attributeGroup ref = "fo:Font_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:Font_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Hyphenation_Properties_List_FOP">
+    <annotation>
+      <documentation>
+        The hyphenation properties are all inheritable and so superceeded by that list
+        <attribute name = "country" type = "fo:country_Type"/>
+        <attribute name = "language" type = "fo:language_Type"/>
+        <attribute name = "hyphenate" type = "fo:hyphenate_Type"/>
+        <attribute name = "hyphenation-character" type = "fo:hyphenation_character_Type"/>
+        <attribute name = "hyphenation-push-character-count" type = "fo:integer_Type"/>
+        <attribute name = "hyphenation-remain-character-count" type = "fo:integer_Type"/>
+      </documentation>
+    </annotation>
+    </attributeGroup>
+  <attributeGroup name = "Hyphenation_Properties_List_Not">
+    <annotation>
+      <documentation>
+        The hyphenation properties are all inheritable and so superceeded by that list
+        <attribute name = "script" type = "xs:string"/>
+      </documentation>
+    </annotation>
+    </attributeGroup>
+  <attributeGroup name = "Hyphenation_Properties_List">
+    <attributeGroup ref = "fo:Hyphenation_Properties_List_FOP"/>
+    <attributeGroup ref = "fo:Hyphenation_Properties_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Margin_Properties_Basic_List">
+    <attribute name = "margin-top" type = "fo:margin_width_Type"/>
+    <attribute name = "margin-bottom" type = "fo:margin_width_Type"/>
+    <attribute name = "margin-left" type = "fo:margin_width_Type"/>
+    <attribute name = "margin-right" type = "fo:margin_width_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Margin_Properties_vertical_Space_List_FOP">
+    <annotation>
+      <documentation>
+        Indent properties are inheritable
+        <attribute name = "start-indent" type = "fo:start_indent_Type"/>
+        <attribute name = "end-indent" type = "fo:end_indent_Type"/>
+      </documentation>
+    </annotation>
+    <attribute name = "space-before.optimum" type = "fo:space_before_optimum_Type"/>
+    <attribute name = "space-after.optimum" type = "fo:space_after_optimum_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Margin_Properties_vertical_Space_List_Not">
+    <attribute name = "space-before" type = "fo:space_Type"/>
+    <attribute name = "space-before.minimum" type = "fo:length_Type"/>
+    <attribute name = "space-before.maximum" type = "fo:length_Type"/>
+    <attribute name = "space-before.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "space-before.precedence" type = "fo:integer_Force_Type"/>
+    <attribute name = "space-after" type = "fo:space_Type"/>
+    <attribute name = "space-after.minimum" type = "fo:length_Type"/>
+    <attribute name = "space-after.maximum" type = "fo:length_Type"/>
+    <attribute name = "space-after.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "space-after.precedence" type = "fo:integer_Force_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Margin_Properties_vertical_Space_List">
+    <attributeGroup ref = "fo:Margin_Properties_vertical_Space_List_FOP"/>
+    <attributeGroup ref = "fo:Margin_Properties_vertical_Space_List_Not"/>
+  </attributeGroup>
+  <attributeGroup name = "Margin_Properties_Block_List">
+    <attributeGroup ref = "fo:Margin_Properties_Basic_List"/>
+    <attributeGroup ref = "fo:Margin_Properties_vertical_Space_List"/>
+  </attributeGroup>
+  <attributeGroup name = "Margin_Properties_Inline_List">
+    <attributeGroup ref = "fo:Margin_Properties_Basic_List"/>
+    <attributeGroup ref = "fo:Margin_Properties_Horizontal_Space_List"/>
+  </attributeGroup>
+  <attributeGroup name = "Margin_Properties_Horizontal_Space_List_FOP"/>
+  <attributeGroup name = "Margin_Properties_Horizontal_Space_List_Not">
+    <attribute name = "space-start" type = "fo:space_start_Type"/>
+    <attribute name = "space-start.minimum" type = "fo:length_Type"/>
+    <attribute name = "space-start.optimum" type = "fo:length_Type"/>
+    <attribute name = "space-start.maximum" type = "fo:length_Type"/>
+    <attribute name = "space-start.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "space-start.precedence" type = "fo:integer_Force_Type"/>
+    <attribute name = "space-end" type = "fo:space_start_Type"/>
+    <attribute name = "space-end.minimum" type = "fo:length_Type"/>
+    <attribute name = "space-end.optimum" type = "fo:length_Type"/>
+    <attribute name = "space-end.maximum" type = "fo:length_Type"/>
+    <attribute name = "space-end.conditionality" type = "fo:conditionality_Type"/>
+    <attribute name = "space-end.precedence" type = "fo:integer_Force_Type"/>
+  </attributeGroup>
+  <attributeGroup name = "Margin_Properties_Horizontal_Space_List">
+    <attributeGroup ref = "fo:Margin_Properties_Horizontal_Space_List_FOP"/>
+    <attributeGroup ref = "fo:Margin_Properties_Horizontal_Space_List_Not"/>
+  </attributeGroup>
+
+  <annotation>
+    <documentation>
+      Simple Types definitions
+    </documentation>
+  </annotation>
+  <simpleType name = "integer_Type">
+    <annotation>
+      <documentation>
+        A signed integer value which consists of an optional '+' or '-' character followed by a sequence of digits. A property may define additional constraints on the value.
+        <enumeration value = "-3"/>
+        <enumeration value = "0"/>
+        <enumeration value = "1"/>
+        <enumeration value = "+3"/>
+        <enumeration value = "5"/>
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <pattern value = "[\+\-]?\d+"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "number_Type">
+    <annotation>
+      <documentation>
+        A signed real number which consists of an optional '+' or '-' character followed by a sequence of digits followed by an optional '.' character and sequence of digits. A property may define additional constraints on the value.
+        <enumeration value = "-2.4"/>
+        <enumeration value = "2"/>
+        <enumeration value = "4"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "[\+\-]?\d+\.\d*"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "length_Type">
+    <annotation>
+      <documentation>
+        A signed length value where a 'length' is a real number plus a unit qualification. A property may define additional constraints on the value.
+        <enumeration value = "1px"/>
+        <enumeration value = "1pt"/>
+        <enumeration value = "1mm"/>
+        <enumeration value = "1cm"/>
+        <enumeration value = "1in"/>
+        <enumeration value = "1em"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "[\+\-]?\d+\.?\d*(px|pt|mm|cm|in|em|%)"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "length_range_Type">
+    <annotation>
+      <documentation>
+        A compound datatype, with components: minimum, optimum, maximum. Each component is a <length xmlns=""/>. If "minimum" is greater than optimum, it will be treated as if it had been set to "optimum". If "maximum" is less than optimum, it will be treated as if it had been set to "optimum". A property may define additional constraints on the values.
+        <enumeration value = "1mm 2mm 3mm"/>
+        <enumeration value = "2mm 2mm 1mm"/>
+        <enumeration value = "3mm 2mm 1mm"/>
+      </documentation>
+    </annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list>
+          <xs:simpleType>
+            <xs:restriction base = "fo:length_Type"/>
+          </xs:simpleType>
+        </xs:list>
+      </xs:simpleType>
+      <xs:minLength value = "3" />
+      <xs:maxLength value = "3" />
+    </xs:restriction>
+  </simpleType>
+  <simpleType name = "length_conditional_Type">
+    <annotation>
+      <documentation>
+        A compound datatype, with components: length, conditionality. The length component is a <length xmlns=""/>. The conditionality component is either "discard" or "retain". A property may define additional constraints on the values.
+        <enumeration value = "1mm retain"/>
+        <enumeration value = "1mm discard"/>
+        <enumeration value = "1px retain"/>
+        <enumeration value = "1px discard"/>
+        <enumeration value = "1pt retain"/>
+        <enumeration value = "1pt discard"/>
+        <enumeration value = "1mm retain"/>
+        <enumeration value = "1mm discard"/>
+        <enumeration value = "1cm retain"/>
+        <enumeration value = "1cm discard"/>
+        <enumeration value = "1in retain"/>
+        <enumeration value = "1in discard"/>
+        <enumeration value = "1em retain"/>
+        <enumeration value = "1em discard"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "\+?\d+\.?\d*(px|pt|mm|cm|in|em|%) (retain|discard)"/>
+    </restriction>
+  </simpleType>
+  <xs:simpleType name = "length_bp_ip_direction_Type">
+    <annotation>
+      <documentation>
+        A compound datatype, with components: block-progression-direction, and inline-progression-direction. Each component is a <length xmlns=""/>. A property may define additional constraints on the values.
+        <enumeration value = "1mm 2mm"/>
+        <enumeration value = "2mm"/>
+        <enumeration value = "3mm 2mm"/>
+      </documentation>
+    </annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list>
+          <xs:simpleType>
+            <xs:restriction base = "fo:length_Type"/>
+          </xs:simpleType>
+        </xs:list>
+      </xs:simpleType>
+      <xs:minLength value = "1" />
+      <xs:maxLength value = "2" />
+    </xs:restriction>
+  </xs:simpleType>
+  <simpleType name = "space_Type">
+    <annotation>
+      <documentation>
+        A compound datatype, with components: minimum, optimum, maximum, precedence, and conditionality. The minimum, optimum, and maximum components are <length xmlns=""/>s. The precedence component is either "force" or an <integer/>. The conditionality component is either "discard" or "retain". If "minimum" is greater than optimum, it will be treated as if it had been set to "optimum". If "maximum" is less than optimum, it will be treated as if it had been set to "optimum".
+        <enumeration value = "1mm 2mm 3mm force retain"/>
+        <enumeration value = "1mm 2mm 3mm force discard"/>
+        <enumeration value = "1mm 2mm 3mm 3 retain"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "([ ]?\+?\d+\.?\d*(px|pt|mm|cm|in|em|%)){1,3}( \+?\d+| force)?( retain| discard)?"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "angle_Type">
+    <annotation>
+      <documentation>
+        A representation of an angle consisting of an optional '+' or  '-' character immediately followed by a <number/> immediately followed by an angle unit identifier. Angle unit identifiers are: 'deg' (for degrees), 'grad' (for grads), and 'rad' (for radians). The specified values are normalized to the range 0deg to 360deg. A property may define additional constraints on the value.
+        <enumeration value = "3deg"/>
+        <enumeration value = "45deg"/>
+        <enumeration value = "-12deg"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "[\+\-]?[1-3]?\d?\d?\.?\d*(deg|grad|rad)"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "percentage_Type">
+    <annotation>
+      <documentation>
+        A signed real percentage which consists of an optional '+' or '-' character followed by a sequence of digits followed by an optional '.' character and sequence of digits followed by '%'. A property may define additional constraints on the value.
+        <enumeration value = "10%"/>
+        <enumeration value = "30%"/>
+        <enumeration value = "100%"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "[\+\-]?\d+\.?\d*%"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "character_Type">
+    <annotation>
+      <documentation>
+        <enumeration value = "-"/>
+        <enumeration value = "h"/>
+        <enumeration value = "e"/>
+        <enumeration value = "l"/>
+        <enumeration value = "p"/>
+        <enumeration value = "o"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "."/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "name_Type">
+    <annotation>
+      <documentation>
+        A string of characters representing a name. It must conform to the definition of an NCName in
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = ".*"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "family_name_Type">
+    <annotation>
+      <documentation>
+        A string of characters identifying a font.
+        <enumeration value = "serif"/>
+        <enumeration value = "sans-serif"/>
+        <enumeration value = "Arial"/>
+        <enumeration value = "Times"/>
+        <enumeration value = "Courier"/>
+        <enumeration value = "Zapf Dingbats"/>
+        <enumeration value = "code39"/>
+        <enumeration value = "cyberbit"/>
+        <enumeration value = "Edwardian Script ITC"/>
+        <enumeration value = "Viner Hand ITC"/>
+        <enumeration value = "Georgia"/>
+        <enumeration value = "Bookman Old Style"/>
+        <enumeration value = "Book Antiqua"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = ".*"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "color_Type">
+    <annotation>
+      <documentation>
+        Either a string of characters representing a keyword or a color function defined in . The list of keyword color names is: aqua, black, blue, fuchsia, gray, green, lime, maroon, navy, olive, purple, red, silver, teal, white, and yellow.
+        <enumeration value = "red"/>
+        <enumeration value = "blue"/>
+        <enumeration value = "yellow"/>
+        <enumeration value = "green"/>
+      </documentation>
+    </annotation>
+    <union memberTypes = "fo:color_Hex_Type fo:color_Name_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "proportional_column_width_Type">
+    <annotation>
+      <documentation>
+        The function proportional-column-width(N[0])
+        This returns a width as a fraction of the available width as ( N[0] / sum1 ) * available space
+        The parent table must have width="x" and table-layout="fixed"
+        <enumeration value = "proportional-column-width(Number)"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "proportional-column-width\(\d+\)"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "column_width_Type">
+    <annotation>
+      <documentation>
+        <length xmlns=""/>, <percentage/>, <function>proportional-column-width</function>, or <function>common-functions</function>
+        <enumeration value = "20mm"/>
+        <enumeration value = "15%"/>
+      </documentation>
+    </annotation>
+    <union memberTypes = "fo:length_percentage_Type fo:proportional_column_width_Type"/>
+  </simpleType>
+  <annotation>
+    <documentation>
+      <script/> A string of characters conforming to an ISO 15924 script code.
+    </documentation>
+  </annotation>
+  <annotation>
+    <documentation>
+      <id/>     A string of characters conforming to the definition of an NCName in and is unique within the stylesheet.
+    </documentation>
+  </annotation>
+  <annotation>
+    <documentation>
+      <idRef/>  A string of characters conforming to the definition of an NCName in and that matches an ID property value used within the stylesheet.
+    </documentation>
+  </annotation>
+  <annotation>
+    <documentation>
+      <uri-specification/> A sequence of characters that is "url(", followed by optional white space, followed by an optional single quote (') or double quote (") character, followed by a URI reference as defined in , followed by an optional single quote (') or double quote (") character, followed by optional white space, followed by ")". The two quote characters must be the same and must both be present or absent. If the URI reference contains a single quote, the two quote characters must be present and be double quotes.
+    </documentation>
+  </annotation>
+  <annotation>
+    <documentation>
+      <time/>   A <number/> immediately followed by a time unit identifier. Time unit identifiers are: 'ms' (for milliseconds) and 's' (for seconds).
+    </documentation>
+  </annotation>
+  <annotation>
+    <documentation>
+      <frequency/> A <number/> immediately followed by a frequency unit identifier. Frequency unit identifiers are: 'Hz' (for Hertz) and 'kHz' (for kilo Hertz).
+    </documentation>
+  </annotation>
+  <annotation>
+    <documentation>
+      <generic-family/> The following generic families are defined: "serif", "sans-serif", "cursive", "fantasy", and "monospace". Please see the section on generic font families for descriptions of these families. Generic font family names are keywords, and therefore must not be quoted.
+    </documentation>
+  </annotation>
+  <simpleType name = "absolute_size_Type">
+    <annotation>
+      <documentation>
+        An <absolute-size/> keyword refers to an entry in a table of font sizes computed and kept by the user agent. Possible values are: [ xx-small | x-small | small | medium | large | x-large | xx-large ] On a computer screen a scaling factor of 1.2 is suggested between adjacent indexes; if the "medium" font is 12pt, the "large" font could be 14.4pt. Different media may need different scaling factors. Also, the user agent should take the quality and availability of fonts into account when computing the table. The table may be different from one font family to another. Note. In CSS1, the suggested scaling factor between adjacent indexes was 1.5 which user experience proved to be too large.
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <enumeration value = "xx-small"/>
+      <enumeration value = "x-small"/>
+      <enumeration value = "small"/>
+      <enumeration value = "medium"/>
+      <enumeration value = "large"/>
+      <enumeration value = "x-large"/>
+      <enumeration value = "xx-large"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "relative_size_Type">
+    <annotation>
+      <documentation>
+        A <relative-size/> keyword is interpreted relative to the table of font sizes and the font size of the parent element. Possible values are: [ larger | smaller ] For example, if the parent element has a font size of "medium", a value of "larger" will make the font size of the current element be "large". If the parent element's size is not close to a table entry, the user agent is free to interpolate between table entries or round off to the closest one. The user agent may have to extrapolate table values if the numerical value goes beyond the keywords.
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <enumeration value = "larger"/>
+      <enumeration value = "smaller"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "clip_Type">
+    <annotation>
+      <documentation>
+        shape_Type In CSS2, the only valid <shape/> value is: rect (<top/>, <right/>, <bottom/>, <left/>) where <top/>, <bottom/> <right/>, and <left/> specify offsets from the respective sides of the box. <top/>, <right/>, <bottom/>, and <left/> may either have a <length xmlns=""/> value or "auto". Negative lengths are permitted. The value "auto" means that a given edge of the clipping region will be the same as the edge of the element's generated box (i.e., "auto" means the same as "0".) When coordinates are rounded to pixel coordinates, care should be taken that no pixels remain visible when <left/> + <right/> is equal to the element's width (or <top/> + <bottom/> equals the element's height), and conversely that no pixels remain hidden when these values are 0.
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <annotation>
+        <documentation>
+          length_Type{1,2}
+        </documentation>
+      </annotation>
+      <pattern value = "(rect\((\+?\d+\.?\d*(px|pt|mm|cm|in|em|%)|auto),(\+?\d+\.?\d*(px|pt|mm|cm|in|em|%)|auto),(\+?\d+\.?\d*(px|pt|mm|cm|in|em|%)|auto),(\+?\d+\.?\d*(px|pt|mm|cm|in|em|%)|auto)\)|auto|inherit)"/>
+    </restriction>
+  </simpleType>
+
+  <simpleType name = "border_side_Type">
+    <annotation>
+      <documentation>
+        "fo:width_Type fo:border_style_Type fo:color_Type"
+        <enumeration value="thin solid red"/>
+        <enumeration value="medium solid black"/>
+        <enumeration value="thick solid blue"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "(thin|medium|thick) (none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset) ([a-z]{3,16}|#[0-9A-F]{6})"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "border_margin_width_Type">
+    <annotation>
+      <documentation>
+        "fo:width_Type{1,4} fo:inherit_Type"
+        <enumeration value = "none"/>
+        <enumeration value = "thin"/>
+        <enumeration value = "medium"/>
+        <enumeration value = "thick"/>
+        <enumeration value = "thick thin medium none"/>
+      </documentation>
+    </annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list>
+          <xs:simpleType>
+            <union memberTypes = "fo:width_Type fo:positive_length_Type"/>
+          </xs:simpleType>
+        </xs:list>
+      </xs:simpleType>
+      <xs:minLength value = "1" />
+      <xs:maxLength value = "4" />
+    </xs:restriction>
+  </simpleType>
+  <simpleType name = "border_multi_style_Type" >
+    <annotation>
+      <documentation>
+        "fo:border_style_Type{1,4} fo:inherit_Type"
+        <enumeration value = "none"/>
+        <enumeration value = "hidden"/>
+        <enumeration value = "dotted"/>
+        <enumeration value = "dashed"/>
+        <enumeration value = "solid"/>
+        <enumeration value = "double"/>
+        <enumeration value = "groove"/>
+        <enumeration value = "ridge"/>
+        <enumeration value = "inset"/>
+        <enumeration value = "outset"/>
+        <enumeration value = "solid dashed ridge groove"/>
+      </documentation>
+    </annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list>
+          <xs:simpleType>
+            <xs:restriction base = "fo:border_style_Type"/>
+          </xs:simpleType>
+        </xs:list>
+      </xs:simpleType>
+      <xs:minLength value = "1" />
+      <xs:maxLength value = "4" />
+    </xs:restriction>
+  </simpleType>
+  <simpleType name = "border_color_Type" >
+    <annotation>
+      <documentation>
+        "fo:background_color_Type{1,4}"
+        <enumeration value="red"/>
+        <enumeration value="green"/>
+        <enumeration value="blue red yellow"/>
+        <enumeration value="black"/>
+        <enumeration value="black red yellow green"/>
+        <enumeration value="silver black"/>
+      </documentation>
+    </annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list>
+          <xs:simpleType>
+            <xs:restriction base = "fo:color_Type"/>
+          </xs:simpleType>
+        </xs:list>
+      </xs:simpleType>
+      <xs:minLength value = "1" />
+      <xs:maxLength value = "4" />
+    </xs:restriction>
+  </simpleType>
+  <simpleType name = "max_width_Type">
+    <annotation>
+      <documentation>
+        <enumeration value="100%"/>
+        <enumeration value="160mm"/>
+      </documentation>
+    </annotation>
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:none_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "background_Type">
+    <union memberTypes = "fo:background_color_Type fo:background_image_Type fo:background_repeat_Type fo:background_attachment_Type fo:background_position_Type"/>
+  </simpleType>
+  <simpleType name = "background_position_Type">
+    <union memberTypes = "fo:background_position_percentage_Type fo:background_position_length_Type fo:background_position_base_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "background_position_percentage_Type">
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list>
+          <xs:simpleType>
+            <xs:restriction base = "fo:percentage_Type"/>
+          </xs:simpleType>
+        </xs:list>
+      </xs:simpleType>
+      <xs:minLength value = "1" />
+      <xs:maxLength value = "2" />
+    </xs:restriction>
+  </simpleType>
+  <simpleType name = "background_position_length_Type">
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list>
+          <xs:simpleType>
+            <xs:restriction base = "fo:length_Type"/>
+          </xs:simpleType>
+        </xs:list>
+      </xs:simpleType>
+      <xs:minLength value = "1" />
+      <xs:maxLength value = "2" />
+    </xs:restriction>
+  </simpleType>
+  <simpleType name = "background_position_base_Type">
+    <restriction base = "string">
+      <enumeration value = "top left"/>
+      <enumeration value = "top center"/>
+      <enumeration value = "top right"/>
+      <enumeration value = "center left"/>
+      <enumeration value = "center center"/>
+      <enumeration value = "center right"/>
+      <enumeration value = "bottom left"/>
+      <enumeration value = "bottom center"/>
+      <enumeration value = "bottom right"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "size_Type">
+    <union memberTypes = "fo:background_position_length_Type fo:size_base_Type"/>
+  </simpleType>
+  <simpleType name = "size_base_Type">
+    <restriction base = "string">
+      <enumeration value = "auto"/>
+      <enumeration value = "landscape"/>
+      <enumeration value = "portrait"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "vertical_align_base_Type">
+    <restriction base = "string">
+      <enumeration value = "baseline"/>
+      <enumeration value = "middle"/>
+      <enumeration value = "sub"/>
+      <enumeration value = "super"/>
+      <enumeration value = "text-top"/>
+      <enumeration value = "text-bottom"/>
+      <enumeration value = "top"/>
+      <enumeration value = "bottom"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "vertical_align_Type">
+    <union memberTypes = "fo:vertical_align_base_Type fo:percentage_Type fo:length_Type"/>
+  </simpleType>
+  <simpleType name = "leader_length_Type">
+    <annotation>
+      <documentation>
+        <enumeration value = "50% 100% 100%"/>
+      </documentation>
+    </annotation>
+    <union memberTypes = "fo:length_range_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "letter_spacing_Type">
+    <union memberTypes = "fo:normal_Type fo:length_Type fo:space_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "font_size_adjust_Type">
+    <union memberTypes = "fo:number_Type fo:none_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_start_Type">
+    <union memberTypes = "fo:space_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "normal_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "normal"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "background_attachment_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "scroll"/>
+      <enumeration value = "fixed"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "background_repeat_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "repeat"/>
+      <enumeration value = "repeat-x"/>
+      <enumeration value = "repeat-y"/>
+      <enumeration value = "no-repeat"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "speech_rate_base_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "x-slow"/>
+      <enumeration value = "slow"/>
+      <enumeration value = "medium"/>
+      <enumeration value = "fast"/>
+      <enumeration value = "x-fast"/>
+      <enumeration value = "faster"/>
+      <enumeration value = "slower"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "speech_rate_Type">
+    <union memberTypes = "fo:speech_rate_base_Type fo:integer_Type"/>
+  </simpleType>
+  <simpleType name = "speak_numeral_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "digits"/>
+      <enumeration value = "continuous"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "font_variant_Type">
+    <restriction base = "string">
+      <enumeration value = "normal"/>
+      <enumeration value = "small-caps"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "line_height_Type">
+    <union memberTypes = "fo:normal_Type fo:length_Type fo:integer_Type fo:percentage_Type fo:space_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "text_shadow_Type">
+    <union memberTypes = "fo:none_Type fo:color_Type fo:length_range_Type"/>
+  </simpleType>
+  <simpleType name = "height_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:auto_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "hyphenation_character_Type">
+    <union memberTypes = "fo:character_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "content_height_Type">
+    <union memberTypes = "fo:auto_Type fo:scale_to_fit_Type fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "scale_to_fit_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "scale-to-fit"/>
+    </restriction>
+  </simpleType>
+
+  <simpleType name = "font_weight_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "normal"/>
+      <enumeration value = "bold">
+        <annotation>
+          <documentation>
+            <fop_result>heavier than no value</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "bolder">
+        <annotation>
+          <documentation>
+            <fop_result>lighter than normal</fop_result> <fop_fail>unknown font</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "lighter">
+        <annotation>
+          <documentation>
+            <fop_result>lighter than normal</fop_result> <fop_fail>unknown font</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "100">
+        <annotation>
+          <documentation>
+            <fop_result>same as normal</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "200">
+        <annotation>
+          <documentation>
+            <fop_result>same as normal</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "300">
+        <annotation>
+          <documentation>
+            <fop_result>same as normal</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "400">
+        <annotation>
+          <documentation>
+            <fop_result>same as normal</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "500">
+        <annotation>
+          <documentation>
+            <fop_result>same as normal</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "600">
+        <annotation>
+          <documentation>
+            <fop_result>same as normal</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "700">
+        <annotation>
+          <documentation>
+            <fop_result>same as bold</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "800">
+        <annotation>
+          <documentation>
+            <fop_result>same as bold</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "900">
+        <annotation>
+          <documentation>
+            <fop_result>same as bold</fop_result>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_result>lighter than normal</fop_result> <fop_fail>unknown font</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "font_style_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "normal"/>
+      <enumeration value = "italic"/>
+      <enumeration value = "oblique"/>
+      <enumeration value = "backslant">
+        <annotation>
+          <documentation>
+            <fop_fail>unknown font</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>unknown font</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "page_break_inside_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "avoid"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "page_break_after_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "always"/>
+      <enumeration value = "avoid"/>
+      <enumeration value = "left"/>
+      <enumeration value = "right"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "white_space_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "normal"/>
+      <enumeration value = "pre"/>
+      <enumeration value = "nowrap"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "show_destination_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "replace"/>
+      <enumeration value = "new"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "indicate_destination_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "speak_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "normal"/>
+      <enumeration value = "none"/>
+      <enumeration value = "spell-out"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "relative_align_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "before"/>
+      <enumeration value = "baseline"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "empty_cells_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "show"/>
+      <enumeration value = "hide"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "ends_row_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "starts_row_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "position_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "static"/>
+      <enumeration value = "relative"/>
+      <enumeration value = "absolute"/>
+      <enumeration value = "fixed"/>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "conditionality_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "retain"/>
+      <enumeration value = "discard"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "keep_compound_Type">
+    <annotation>
+      <documentation>
+        A compound datatype, with components: within-line, within-column, within-page. Each component is a <keep/>.
+        <enumeration value = "2 auto always"/>
+        <enumeration value = "auto"/>
+        <enumeration value = "always"/>
+      </documentation>
+    </annotation>
+    <xs:restriction>
+      <xs:simpleType>
+        <xs:list>
+          <xs:simpleType>
+            <xs:restriction base = "fo:keep_integer_Type"/>
+          </xs:simpleType>
+        </xs:list>
+      </xs:simpleType>
+      <xs:minLength value = "1" />
+      <xs:maxLength value = "3" />
+    </xs:restriction>
+  </simpleType>
+  <simpleType name = "keep_integer_Type">
+    <annotation>
+      <documentation>
+        <enumeration value = "2"/>
+        <enumeration value = "5"/>
+        <enumeration value = "10"/>
+        <enumeration value = "auto"/>
+        <enumeration value = "always"/>
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <pattern value = "(\+?\d+|auto|always)"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "letter_value_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "alphabetic"/>
+      <enumeration value = "traditional"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "alignment_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "baseline"/>
+      <enumeration value = "before-edge"/>
+      <enumeration value = "text-before-edge"/>
+      <enumeration value = "middle"/>
+      <enumeration value = "central"/>
+      <enumeration value = "after-edge"/>
+      <enumeration value = "text-after-edge"/>
+      <enumeration value = "ideographic"/>
+      <enumeration value = "alphabetic"/>
+      <enumeration value = "hanging"/>
+      <enumeration value = "mathematical"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "box_alignment_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "top"/>
+      <enumeration value = "text-top"/>
+      <enumeration value = "bottom"/>
+      <enumeration value = "text-bottom"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "breaks_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "auto"/>
+      <enumeration value = "column"/>
+      <enumeration value = "page"/>
+      <enumeration value = "even-page"/>
+      <enumeration value = "odd-page"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "force_page_count_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "even"/>
+      <enumeration value = "odd"/>
+      <enumeration value = "end-on-even"/>
+      <enumeration value = "end-on-odd"/>
+      <enumeration value = "no-force"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "table_layout_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "fixed"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "scaling_method_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "integer-pixels"/>
+      <enumeration value = "resample-any-method"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "displace_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "inherit"/>
+      <enumeration value = "auto"/>
+      <enumeration value = "none"/>
+      <enumeration value = "line"/>
+      <enumeration value = "indent"/>
+      <enumeration value = "block"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "media_usage_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "paginate"/>
+      <enumeration value = "bounded-in-one-dimension"/>
+      <enumeration value = "unbounded"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "rendering_intent_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "perceptual"/>
+      <enumeration value = "relative-colorimetric"/>
+      <enumeration value = "saturation"/>
+      <enumeration value = "absolute-colorimetric"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "hyphenate_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "false"/>
+      <enumeration value = "true"/>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "suppress_at_line_break_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "suppress"/>
+      <enumeration value = "retain"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "treat_as_word_space_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "dominant_baseline_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "use-script"/>
+      <enumeration value = "no-change"/>
+      <enumeration value = "reset-size"/>
+      <enumeration value = "ideographic"/>
+      <enumeration value = "alphabetic"/>
+      <enumeration value = "hanging"/>
+      <enumeration value = "mathematical"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "orientation_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "inherit"/>
+      <enumeration value = "0"/>
+      <enumeration value = "90"/>
+      <enumeration value = "180"/>
+      <enumeration value = "270"/>
+      <enumeration value = "-90"/>
+      <enumeration value = "-180"/>
+      <enumeration value = "-270"/>
+      <enumeration value = "0deg"/>
+      <enumeration value = "90deg"/>
+      <enumeration value = "180deg"/>
+      <enumeration value = "270deg"/>
+      <enumeration value = "-90deg"/>
+      <enumeration value = "-180deg"/>
+      <enumeration value = "-270deg"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "measurement_Type">
+    <annotation>
+      <documentation>
+        Here to document the acceptable measurements
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <enumeration value = "px"/>
+      <enumeration value = "pt"/>
+      <enumeration value = "mm"/>
+      <enumeration value = "in"/>
+      <enumeration value = "cm"/>
+      <enumeration value = "em"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "positive_length_Type">
+    <restriction base = "string">
+      <pattern value = "\+?\d+\.?\d*(px|pt|mm|cm|in|em|%)"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "negative_length_Type">
+    <restriction base = "string">
+      <pattern value = "-\d+\.?\d*(px|pt|mm|cm|in|em|%)"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "integer_Force_Type">
+    <restriction base = "string">
+      <pattern value = "([0-9]+|force)"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "padding_top_Type">
+    <union memberTypes = "fo:width_Type fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "padding_before_Type">
+    <union memberTypes = "fo:width_Type fo:length_Type fo:length_conditional_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "country_Type">
+    <annotation>
+      <documentation>
+        A string of characters conforming to an ISO 3166 country code.
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <enumeration value = "none"/>
+      <enumeration value = "inherit"/>
+      <enumeration value = "AF"><annotation><documentation> country-name = "AFGHANISTAN"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "AL"><annotation><documentation> country-name = "ALBANIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "DZ"><annotation><documentation> country-name = "ALGERIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "AS"><annotation><documentation> country-name = "AMERICANSAMOA"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "AD"><annotation><documentation> country-name = "ANDORRA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "AO"><annotation><documentation> country-name = "ANGOLA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "AI"><annotation><documentation> country-name = "ANGUILLA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "AQ"><annotation><documentation> country-name = "ANTARCTICA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "AG"><annotation><documentation> country-name = "ANTIGUAANDBARBUDA"/ </documentation></annotation>             </enumeration>
+      <enumeration value = "AR"><annotation><documentation> country-name = "ARGENTINA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "AM"><annotation><documentation> country-name = "ARMENIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "AW"><annotation><documentation> country-name = "ARUBA"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "AU"><annotation><documentation> country-name = "AUSTRALIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "AT"><annotation><documentation> country-name = "AUSTRIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "AZ"><annotation><documentation> country-name = "AZERBAIJAN"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "BS"><annotation><documentation> country-name = "BAHAMAS"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "BH"><annotation><documentation> country-name = "BAHRAIN"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "BD"><annotation><documentation> country-name = "BANGLADESH"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "BB"><annotation><documentation> country-name = "BARBADOS"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "BY"><annotation><documentation> country-name = "BELARUS"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "BE"><annotation><documentation> country-name = "BELGIUM"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "BZ"><annotation><documentation> country-name = "BELIZE"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "BJ"><annotation><documentation> country-name = "BENIN"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "BM"><annotation><documentation> country-name = "BERMUDA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "BT"><annotation><documentation> country-name = "BHUTAN"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "BO"><annotation><documentation> country-name = "BOLIVIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "BA"><annotation><documentation> country-name = "BOSNIAANDHERZEGOVINA"/ </documentation></annotation>            </enumeration>
+      <enumeration value = "BW"><annotation><documentation> country-name = "BOTSWANA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "BV"><annotation><documentation> country-name = "BOUVETISLAND"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "BR"><annotation><documentation> country-name = "BRAZIL"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "IO"><annotation><documentation> country-name = "BRITISHINDIANOCEANTERRITORY"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "BN"><annotation><documentation> country-name = "BRUNEIDARUSSALAM"/ </documentation></annotation>              </enumeration>
+      <enumeration value = "BG"><annotation><documentation> country-name = "BULGARIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "BF"><annotation><documentation> country-name = "BURKINAFASO"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "BI"><annotation><documentation> country-name = "BURUNDI"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "KH"><annotation><documentation> country-name = "CAMBODIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "CM"><annotation><documentation> country-name = "CAMEROON"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "CA"><annotation><documentation> country-name = "CANADA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "CV"><annotation><documentation> country-name = "CAPEVERDE"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "KY"><annotation><documentation> country-name = "CAYMANISLANDS"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "CF"><annotation><documentation> country-name = "CENTRALAFRICANREPUBLIC"/ </documentation></annotation>            </enumeration>
+      <enumeration value = "TD"><annotation><documentation> country-name = "CHAD"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "CL"><annotation><documentation> country-name = "CHILE"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "CN"><annotation><documentation> country-name = "CHINA"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "CX"><annotation><documentation> country-name = "CHRISTMASISLAND"/ </documentation></annotation>             </enumeration>
+      <enumeration value = "CC"><annotation><documentation> country-name = "COCOS(KEELING)ISLANDS"/ </documentation></annotation>           </enumeration>
+      <enumeration value = "CO"><annotation><documentation> country-name = "COLOMBIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "KM"><annotation><documentation> country-name = "COMOROS"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "CG"><annotation><documentation> country-name = "CONGO"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "CD"><annotation><documentation> country-name = "CONGO,THEDEMOCRATICREPUBLICOFTHE"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "CK"><annotation><documentation> country-name = "COOKISLANDS"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "CR"><annotation><documentation> country-name = "COSTARICA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "CI"><annotation><documentation> country-name = "COTED'IVOIRE"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "HR"><annotation><documentation> country-name = "CROATIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "CU"><annotation><documentation> country-name = "CUBA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "CY"><annotation><documentation> country-name = "CYPRUS"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "CZ"><annotation><documentation> country-name = "CZECHREPUBLIC"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "DK"><annotation><documentation> country-name = "DENMARK"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "DJ"><annotation><documentation> country-name = "DJIBOUTI"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "DM"><annotation><documentation> country-name = "DOMINICA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "DO"><annotation><documentation> country-name = "DOMINICANREPUBLIC"/ </documentation></annotation>             </enumeration>
+      <enumeration value = "TP"><annotation><documentation> country-name = "EASTTIMOR"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "EC"><annotation><documentation> country-name = "ECUADOR"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "EG"><annotation><documentation> country-name = "EGYPT"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "SV"><annotation><documentation> country-name = "ELSALVADOR"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "GQ"><annotation><documentation> country-name = "EQUATORIALGUINEA"/ </documentation></annotation>              </enumeration>
+      <enumeration value = "ER"><annotation><documentation> country-name = "ERITREA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "EE"><annotation><documentation> country-name = "ESTONIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "ET"><annotation><documentation> country-name = "ETHIOPIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "FK"><annotation><documentation> country-name = "FALKLANDISLANDS(MALVINAS)"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "FO"><annotation><documentation> country-name = "FAROEISLANDS"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "FJ"><annotation><documentation> country-name = "FIJI"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "FI"><annotation><documentation> country-name = "FINLAND"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "FR"><annotation><documentation> country-name = "FRANCE"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "GF"><annotation><documentation> country-name = "FRENCHGUIANA"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "PF"><annotation><documentation> country-name = "FRENCHPOLYNESIA"/ </documentation></annotation>             </enumeration>
+      <enumeration value = "TF"><annotation><documentation> country-name = "FRENCHSOUTHERNTERRITORIES"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "GA"><annotation><documentation> country-name = "GABON"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "GM"><annotation><documentation> country-name = "GAMBIA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "GE"><annotation><documentation> country-name = "GEORGIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "DE"><annotation><documentation> country-name = "GERMANY"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "GH"><annotation><documentation> country-name = "GHANA"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "GI"><annotation><documentation> country-name = "GIBRALTAR"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "GR"><annotation><documentation> country-name = "GREECE"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "GL"><annotation><documentation> country-name = "GREENLAND"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "GD"><annotation><documentation> country-name = "GRENADA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "GP"><annotation><documentation> country-name = "GUADELOUPE"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "GU"><annotation><documentation> country-name = "GUAM"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "GT"><annotation><documentation> country-name = "GUATEMALA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "GN"><annotation><documentation> country-name = "GUINEA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "GW"><annotation><documentation> country-name = "GUINEA-BISSAU"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "GY"><annotation><documentation> country-name = "GUYANA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "HT"><annotation><documentation> country-name = "HAITI"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "HM"><annotation><documentation> country-name = "HEARDISLANDANDMCDONALDISLANDS"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "VA"><annotation><documentation> country-name = "HOLYSEE(VATICANCITYSTATE)"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "HN"><annotation><documentation> country-name = "HONDURAS"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "HK"><annotation><documentation> country-name = "HONGKONG"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "HU"><annotation><documentation> country-name = "HUNGARY"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "IS"><annotation><documentation> country-name = "ICELAND"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "IN"><annotation><documentation> country-name = "INDIA"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "ID"><annotation><documentation> country-name = "INDONESIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "IR"><annotation><documentation> country-name = "IRAN,ISLAMICREPUBLICOF"/ </documentation></annotation>            </enumeration>
+      <enumeration value = "IQ"><annotation><documentation> country-name = "IRAQ"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "IE"><annotation><documentation> country-name = "IRELAND"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "IL"><annotation><documentation> country-name = "ISRAEL"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "IT"><annotation><documentation> country-name = "ITALY"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "JM"><annotation><documentation> country-name = "JAMAICA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "JP"><annotation><documentation> country-name = "JAPAN"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "JO"><annotation><documentation> country-name = "JORDAN"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "KZ"><annotation><documentation> country-name = "KAZAKSTAN"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "KE"><annotation><documentation> country-name = "KENYA"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "KI"><annotation><documentation> country-name = "KIRIBATI"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "KP"><annotation><documentation> country-name = "KOREA,DEMOCRATICPEOPLE'SREPUBLICOF"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "KR"><annotation><documentation> country-name = "KOREA,REPUBLICOF"/ </documentation></annotation>              </enumeration>
+      <enumeration value = "KW"><annotation><documentation> country-name = "KUWAIT"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "KG"><annotation><documentation> country-name = "KYRGYZSTAN"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "LA"><annotation><documentation> country-name = "LAOPEOPLE'SDEMOCRATICREPUBLIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "LV"><annotation><documentation> country-name = "LATVIA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "LB"><annotation><documentation> country-name = "LEBANON"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "LS"><annotation><documentation> country-name = "LESOTHO"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "LR"><annotation><documentation> country-name = "LIBERIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "LY"><annotation><documentation> country-name = "LIBYANARABJAMAHIRIYA"/ </documentation></annotation>            </enumeration>
+      <enumeration value = "LI"><annotation><documentation> country-name = "LIECHTENSTEIN"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "LT"><annotation><documentation> country-name = "LITHUANIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "LU"><annotation><documentation> country-name = "LUXEMBOURG"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "MO"><annotation><documentation> country-name = "MACAU"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "MK"><annotation><documentation> country-name = "MACEDONIA,THEFORMERYUGOSLAVREPUBLICOF"/ </documentation></annotation>   </enumeration>
+      <enumeration value = "MG"><annotation><documentation> country-name = "MADAGASCAR"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "MW"><annotation><documentation> country-name = "MALAWI"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "MY"><annotation><documentation> country-name = "MALAYSIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "MV"><annotation><documentation> country-name = "MALDIVES"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "ML"><annotation><documentation> country-name = "MALI"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "MT"><annotation><documentation> country-name = "MALTA"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "MH"><annotation><documentation> country-name = "MARSHALLISLANDS"/ </documentation></annotation>             </enumeration>
+      <enumeration value = "MQ"><annotation><documentation> country-name = "MARTINIQUE"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "MR"><annotation><documentation> country-name = "MAURITANIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "MU"><annotation><documentation> country-name = "MAURITIUS"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "YT"><annotation><documentation> country-name = "MAYOTTE"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "MX"><annotation><documentation> country-name = "MEXICO"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "FM"><annotation><documentation> country-name = "MICRONESIA,FEDERATEDSTATESOF"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "MD"><annotation><documentation> country-name = "MOLDOVA,REPUBLICOF"/ </documentation></annotation>              </enumeration>
+      <enumeration value = "MC"><annotation><documentation> country-name = "MONACO"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "MN"><annotation><documentation> country-name = "MONGOLIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "MS"><annotation><documentation> country-name = "MONTSERRAT"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "MA"><annotation><documentation> country-name = "MOROCCO"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "MZ"><annotation><documentation> country-name = "MOZAMBIQUE"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "MM"><annotation><documentation> country-name = "MYANMAR"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "NA"><annotation><documentation> country-name = "NAMIBIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "NR"><annotation><documentation> country-name = "NAURU"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "NP"><annotation><documentation> country-name = "NEPAL"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "NL"><annotation><documentation> country-name = "NETHERLANDS"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "AN"><annotation><documentation> country-name = "NETHERLANDSANTILLES"/ </documentation></annotation>           </enumeration>
+      <enumeration value = "NC"><annotation><documentation> country-name = "NEWCALEDONIA"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "NZ"><annotation><documentation> country-name = "NEWZEALAND"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "NI"><annotation><documentation> country-name = "NICARAGUA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "NE"><annotation><documentation> country-name = "NIGER"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "NG"><annotation><documentation> country-name = "NIGERIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "NU"><annotation><documentation> country-name = "NIUE"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "NF"><annotation><documentation> country-name = "NORFOLKISLAND"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "MP"><annotation><documentation> country-name = "NORTHERNMARIANAISLANDS"/ </documentation></annotation>            </enumeration>
+      <enumeration value = "NO"><annotation><documentation> country-name = "NORWAY"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "OM"><annotation><documentation> country-name = "OMAN"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "PK"><annotation><documentation> country-name = "PAKISTAN"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "PW"><annotation><documentation> country-name = "PALAU"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "PS"><annotation><documentation> country-name = "PALESTINIANTERRITORY,OCCUPIED"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "PA"><annotation><documentation> country-name = "PANAMA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "PG"><annotation><documentation> country-name = "PAPUANEWGUINEA"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "PY"><annotation><documentation> country-name = "PARAGUAY"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "PE"><annotation><documentation> country-name = "PERU"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "PH"><annotation><documentation> country-name = "PHILIPPINES"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "PN"><annotation><documentation> country-name = "PITCAIRN"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "PL"><annotation><documentation> country-name = "POLAND"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "PT"><annotation><documentation> country-name = "PORTUGAL"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "PR"><annotation><documentation> country-name = "PUERTORICO"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "QA"><annotation><documentation> country-name = "QATAR"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "RE"><annotation><documentation> country-name = "R+UNION"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "RO"><annotation><documentation> country-name = "ROMANIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "RU"><annotation><documentation> country-name = "RUSSIANFEDERATION"/ </documentation></annotation>             </enumeration>
+      <enumeration value = "RW"><annotation><documentation> country-name = "RWANDA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "SH"><annotation><documentation> country-name = "SAINTHELENA"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "KN"><annotation><documentation> country-name = "SAINTKITTSANDNEVIS"/ </documentation></annotation>              </enumeration>
+      <enumeration value = "LC"><annotation><documentation> country-name = "SAINTLUCIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "PM"><annotation><documentation> country-name = "SAINTPIERREANDMIQUELON"/ </documentation></annotation>            </enumeration>
+      <enumeration value = "VC"><annotation><documentation> country-name = "SAINTVINCENTANDTHEGRENADINES"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "WS"><annotation><documentation> country-name = "SAMOA"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "SM"><annotation><documentation> country-name = "SANMARINO"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "ST"><annotation><documentation> country-name = "SAOTOMEANDPRINCIPE"/ </documentation></annotation>              </enumeration>
+      <enumeration value = "SA"><annotation><documentation> country-name = "SAUDIARABIA"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "SN"><annotation><documentation> country-name = "SENEGAL"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "SC"><annotation><documentation> country-name = "SEYCHELLES"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "SL"><annotation><documentation> country-name = "SIERRALEONE"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "SG"><annotation><documentation> country-name = "SINGAPORE"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "SK"><annotation><documentation> country-name = "SLOVAKIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "SI"><annotation><documentation> country-name = "SLOVENIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "SB"><annotation><documentation> country-name = "SOLOMONISLANDS"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "SO"><annotation><documentation> country-name = "SOMALIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "ZA"><annotation><documentation> country-name = "SOUTHAFRICA"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "GS"><annotation><documentation> country-name = "SOUTHGEORGIAANDTHESOUTHSANDWICHISLANDS"/ </documentation></annotation>    </enumeration>
+      <enumeration value = "ES"><annotation><documentation> country-name = "SPAIN"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "LK"><annotation><documentation> country-name = "SRILANKA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "SD"><annotation><documentation> country-name = "SUDAN"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "SR"><annotation><documentation> country-name = "SURINAME"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "SJ"><annotation><documentation> country-name = "SVALBARDANDJANMAYEN"/ </documentation></annotation>           </enumeration>
+      <enumeration value = "SZ"><annotation><documentation> country-name = "SWAZILAND"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "SE"><annotation><documentation> country-name = "SWEDEN"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "CH"><annotation><documentation> country-name = "SWITZERLAND"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "SY"><annotation><documentation> country-name = "SYRIANARABREPUBLIC"/ </documentation></annotation>              </enumeration>
+      <enumeration value = "TW"><annotation><documentation> country-name = "TAIWAN,PROVINCEOFCHINA"/ </documentation></annotation>            </enumeration>
+      <enumeration value = "TJ"><annotation><documentation> country-name = "TAJIKISTAN"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "TZ"><annotation><documentation> country-name = "TANZANIA,UNITEDREPUBLICOF"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "TH"><annotation><documentation> country-name = "THAILAND"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "TG"><annotation><documentation> country-name = "TOGO"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "TK"><annotation><documentation> country-name = "TOKELAU"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "TO"><annotation><documentation> country-name = "TONGA"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "TT"><annotation><documentation> country-name = "TRINIDADANDTOBAGO"/ </documentation></annotation>             </enumeration>
+      <enumeration value = "TN"><annotation><documentation> country-name = "TUNISIA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "TR"><annotation><documentation> country-name = "TURKEY"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "TM"><annotation><documentation> country-name = "TURKMENISTAN"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "TC"><annotation><documentation> country-name = "TURKSANDCAICOSISLANDS"/ </documentation></annotation>           </enumeration>
+      <enumeration value = "TV"><annotation><documentation> country-name = "TUVALU"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "UG"><annotation><documentation> country-name = "UGANDA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "UA"><annotation><documentation> country-name = "UKRAINE"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "AE"><annotation><documentation> country-name = "UNITEDARABEMIRATES"/ </documentation></annotation>              </enumeration>
+      <enumeration value = "GB"><annotation><documentation> country-name = "UNITEDKINGDOM"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "US"><annotation><documentation> country-name = "UNITEDSTATES"/ </documentation></annotation>                </enumeration>
+      <enumeration value = "UM"><annotation><documentation> country-name = "UNITEDSTATESMINOROUTLYINGISLANDS"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "UY"><annotation><documentation> country-name = "URUGUAY"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "UZ"><annotation><documentation> country-name = "UZBEKISTAN"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "VU"><annotation><documentation> country-name = "VANUATU"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "VE"><annotation><documentation> country-name = "VENEZUELA"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "VN"><annotation><documentation> country-name = "VIETNAM"/ </documentation></annotation>                 </enumeration>
+      <enumeration value = "VG"><annotation><documentation> country-name = "VIRGINISLANDS,BRITISH"/ </documentation></annotation>           </enumeration>
+      <enumeration value = "VI"><annotation><documentation> country-name = "VIRGINISLANDS,U.S."/ </documentation></annotation>              </enumeration>
+      <enumeration value = "WF"><annotation><documentation> country-name = "WALLISANDFUTUNA"/ </documentation></annotation>             </enumeration>
+      <enumeration value = "EH"><annotation><documentation> country-name = "WESTERNSAHARA"/ </documentation></annotation>               </enumeration>
+      <enumeration value = "YE"><annotation><documentation> country-name = "YEMEN"/ </documentation></annotation>                   </enumeration>
+      <enumeration value = "YU"><annotation><documentation> country-name = "YUGOSLAVIA"/ </documentation></annotation>                  </enumeration>
+      <enumeration value = "ZM"><annotation><documentation> country-name = "ZAMBIA"/ </documentation></annotation>                    </enumeration>
+      <enumeration value = "ZW"><annotation><documentation> country-name = "ZIMBABWE"/ </documentation></annotation>                  </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "language_Type">
+  <annotation><documentation> A string of characters conforming to the ISO 639 3-letter code. (Rather odd since all of them have 2 letters)</documentation></annotation>
+    <restriction base = "NMTOKEN">
+      <enumeration value = "none"/>
+      <enumeration value = "inherit"/>
+      <enumeration value = "AY"><annotation><documentation> language-name = "AYMARA" language-family = "AMERINDIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "GN"><annotation><documentation> language-name = "GUARANI" language-family = "AMERINDIAN"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "QU"><annotation><documentation> language-name = "QUECHUA" language-family = "AMERINDIAN"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "DZ"><annotation><documentation> language-name = "BHUTANI" language-family = "ASIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "MY"><annotation><documentation> language-name = "BURMESE" language-family = "ASIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "KM"><annotation><documentation> language-name = "CAMBODIAN" language-family = "ASIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "ZH"><annotation><documentation> language-name = "CHINESE" language-family = "ASIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "JA"><annotation><documentation> language-name = "JAPANESE" language-family = "ASIAN"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "KO"><annotation><documentation> language-name = "KOREAN" language-family = "ASIAN"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "LO"><annotation><documentation> language-name = "LAOTHIAN" language-family = "ASIAN"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "TH"><annotation><documentation> language-name = "THAI" language-family = "ASIAN"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "BO"><annotation><documentation> language-name = "TIBETAN" language-family = "ASIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "VI"><annotation><documentation> language-name = "VIETNAMESE" language-family = "ASIAN"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "LV"><annotation><documentation> language-name = "LATVIAN;LETTISH" language-family = "BALTIC"/ </documentation></annotation>   </enumeration>
+      <enumeration value = "LT"><annotation><documentation> language-name = "LITHUANIAN" language-family = "BALTIC"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "EU"><annotation><documentation> language-name = "BASQUE" language-family = "BASQUE"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "BR"><annotation><documentation> language-name = "BRETON" language-family = "CELTIC"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "GA"><annotation><documentation> language-name = "IRISH" language-family = "CELTIC"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "GD"><annotation><documentation> language-name = "SCOTS-GAELIC" language-family = "CELTIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "CY"><annotation><documentation> language-name = "WELSH" language-family = "CELTIC"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "KN"><annotation><documentation> language-name = "KANNADA" language-family = "DRAVIDIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "ML"><annotation><documentation> language-name = "MALAYALAM" language-family = "DRAVIDIAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "TA"><annotation><documentation> language-name = "TAMIL" language-family = "DRAVIDIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "TE"><annotation><documentation> language-name = "TELUGU" language-family = "DRAVIDIAN"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "KL"><annotation><documentation> language-name = "GREENLANDIC" language-family = "ESKIMO"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "IK"><annotation><documentation> language-name = "INUPIAK" language-family = "ESKIMO"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "ET"><annotation><documentation> language-name = "ESTONIAN" language-family = "FINNO-UGRIC"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "FI"><annotation><documentation> language-name = "FINNISH" language-family = "FINNO-UGRIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "HU"><annotation><documentation> language-name = "HUNGARIAN" language-family = "FINNO-UGRIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "AF"><annotation><documentation> language-name = "AFRIKAANS" language-family = "GERMANIC"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "DA"><annotation><documentation> language-name = "DANISH" language-family = "GERMANIC"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "NL"><annotation><documentation> language-name = "DUTCH" language-family = "GERMANIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "EN"><annotation><documentation> language-name = "ENGLISH" language-family = "GERMANIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "FO"><annotation><documentation> language-name = "FAROESE" language-family = "GERMANIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "FY"><annotation><documentation> language-name = "FRISIAN" language-family = "GERMANIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "DE"><annotation><documentation> language-name = "GERMAN" language-family = "GERMANIC"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "IS"><annotation><documentation> language-name = "ICELANDIC" language-family = "GERMANIC"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "NO"><annotation><documentation> language-name = "NORWEGIAN" language-family = "GERMANIC"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "SV"><annotation><documentation> language-name = "SWEDISH" language-family = "GERMANIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "YI"><annotation><documentation> language-name = "YIDDISH" language-family = "GERMANIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "OM"><annotation><documentation> language-name = "AFAN-(OROMO)" language-family = "HAMITIC"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "AA"><annotation><documentation> language-name = "AFAR" language-family = "HAMITIC"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "SO"><annotation><documentation> language-name = "SOMALI" language-family = "HAMITIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "AB"><annotation><documentation> language-name = "ABKHAZIAN" language-family = "IBERO-CAUCASIAN"/ </documentation></annotation>    </enumeration>
+      <enumeration value = "KA"><annotation><documentation> language-name = "GEORGIAN" language-family = "IBERO-CAUCASIAN"/ </documentation></annotation>   </enumeration>
+      <enumeration value = "AS"><annotation><documentation> language-name = "ASSAMESE" language-family = "INDIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "BN"><annotation><documentation> language-name = "BENGALI;BANGLA" language-family = "INDIAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "BH"><annotation><documentation> language-name = "BIHARI" language-family = "INDIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "GU"><annotation><documentation> language-name = "GUJARATI" language-family = "INDIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "HI"><annotation><documentation> language-name = "HINDI" language-family = "INDIAN"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "KS"><annotation><documentation> language-name = "KASHMIRI" language-family = "INDIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "MR"><annotation><documentation> language-name = "MARATHI" language-family = "INDIAN"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "NE"><annotation><documentation> language-name = "NEPALI" language-family = "INDIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "OR"><annotation><documentation> language-name = "ORIYA" language-family = "INDIAN"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "PA"><annotation><documentation> language-name = "PUNJABI" language-family = "INDIAN"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "SA"><annotation><documentation> language-name = "SANSKRIT" language-family = "INDIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "SD"><annotation><documentation> language-name = "SINDHI" language-family = "INDIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "SI"><annotation><documentation> language-name = "SINGHALESE" language-family = "INDIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "UR"><annotation><documentation> language-name = "URDU" language-family = "INDIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "SQ"><annotation><documentation> language-name = "ALBANIAN" language-family = "INDO-EUROPEAN(OTHER)"/ </documentation></annotation>  </enumeration>
+      <enumeration value = "HY"><annotation><documentation> language-name = "ARMENIAN" language-family = "INDO-EUROPEAN(OTHER)"/ </documentation></annotation>  </enumeration>
+      <enumeration value = "EO"><annotation><documentation> language-name = "ESPERANTO" language-family = "INTERNATIONAL-AUX."/ </documentation></annotation> </enumeration>
+      <enumeration value = "IA"><annotation><documentation> language-name = "INTERLINGUA" language-family = "INTERNATIONAL-AUX."/ </documentation></annotation> </enumeration>
+      <enumeration value = "IE"><annotation><documentation> language-name = "INTERLINGUE" language-family = "INTERNATIONAL-AUX."/ </documentation></annotation> </enumeration>
+      <enumeration value = "VO"><annotation><documentation> language-name = "VOLAPUK" language-family = "INTERNATIONAL-AUX."/ </documentation></annotation> </enumeration>
+      <enumeration value = "KU"><annotation><documentation> language-name = "KURDISH" language-family = "IRANIAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "PS"><annotation><documentation> language-name = "PASHTO;PUSHTO" language-family = "IRANIAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "FA"><annotation><documentation> language-name = "PERSIAN-(farsi)" language-family = "IRANIAN"/ </documentation></annotation>    </enumeration>
+      <enumeration value = "TG"><annotation><documentation> language-name = "TAJIK" language-family = "IRANIAN"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "EL"><annotation><documentation> language-name = "GREEK" language-family = "LATIN/GREEK"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "LA"><annotation><documentation> language-name = "LATIN" language-family = "LATIN/GREEK"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "HA"><annotation><documentation> language-name = "HAUSA" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "RW"><annotation><documentation> language-name = "KINYARWANDA" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>    </enumeration>
+      <enumeration value = "RN"><annotation><documentation> language-name = "KURUNDI" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "LN"><annotation><documentation> language-name = "LINGALA" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "SG"><annotation><documentation> language-name = "SANGHO" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "ST"><annotation><documentation> language-name = "SESOTHO" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "TN"><annotation><documentation> language-name = "SETSWANA" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>   </enumeration>
+      <enumeration value = "SN"><annotation><documentation> language-name = "SHONA" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "SS"><annotation><documentation> language-name = "SISWATI" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "SW"><annotation><documentation> language-name = "SWAHILI" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "TS"><annotation><documentation> language-name = "TSONGA" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "TW"><annotation><documentation> language-name = "TWI" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "WO"><annotation><documentation> language-name = "WOLOF" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "XH"><annotation><documentation> language-name = "XHOSA" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "YO"><annotation><documentation> language-name = "YORUBA" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "ZU"><annotation><documentation> language-name = "ZULU" language-family = "NEGRO-AFRICAN"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "FJ"><annotation><documentation> language-name = "FIJI" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation>    </enumeration>
+      <enumeration value = "ID"><annotation><documentation> language-name = "INDONESIAN" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation>  </enumeration>
+      <enumeration value = "JV"><annotation><documentation> language-name = "JAVANESE" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation>  </enumeration>
+      <enumeration value = "MG"><annotation><documentation> language-name = "MALAGASY" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation>  </enumeration>
+      <enumeration value = "MS"><annotation><documentation> language-name = "MALAY" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation>   </enumeration>
+      <enumeration value = "MI"><annotation><documentation> language-name = "MAORI" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation>   </enumeration>
+      <enumeration value = "SM"><annotation><documentation> language-name = "SAMOAN" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation>    </enumeration>
+      <enumeration value = "SU"><annotation><documentation> language-name = "SUNDANESE" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation> </enumeration>
+      <enumeration value = "TL"><annotation><documentation> language-name = "TAGALOG" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation> </enumeration>
+      <enumeration value = "TO"><annotation><documentation> language-name = "TONGA" language-family = "OCEANIC/INDONESIAN"/ </documentation></annotation>   </enumeration>
+      <enumeration value = "CA"><annotation><documentation> language-name = "CATALAN" language-family = "ROMANCE"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "CO"><annotation><documentation> language-name = "CORSICAN" language-family = "ROMANCE"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "FR"><annotation><documentation> language-name = "FRENCH" language-family = "ROMANCE"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "GL"><annotation><documentation> language-name = "GALICIAN" language-family = "ROMANCE"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "IT"><annotation><documentation> language-name = "ITALIAN" language-family = "ROMANCE"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "MO"><annotation><documentation> language-name = "MOLDAVIAN" language-family = "ROMANCE"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "OC"><annotation><documentation> language-name = "OCCITAN" language-family = "ROMANCE"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "PT"><annotation><documentation> language-name = "PORTUGUESE" language-family = "ROMANCE"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "RM"><annotation><documentation> language-name = "RHAETO-ROMANCE" language-family = "ROMANCE"/ </documentation></annotation>   </enumeration>
+      <enumeration value = "RO"><annotation><documentation> language-name = "ROMANIAN" language-family = "ROMANCE"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "ES"><annotation><documentation> language-name = "SPANISH" language-family = "ROMANCE"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "AM"><annotation><documentation> language-name = "AMHARIC" language-family = "SEMITIC"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "AR"><annotation><documentation> language-name = "ARABIC" language-family = "SEMITIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "HE"><annotation><documentation> language-name = "HEBREW" language-family = "SEMITIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "MT"><annotation><documentation> language-name = "MALTESE" language-family = "SEMITIC"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "TI"><annotation><documentation> language-name = "TIGRINYA" language-family = "SEMITIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "BG"><annotation><documentation> language-name = "BULGARIAN" language-family = "SLAVIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "BE"><annotation><documentation> language-name = "BYELORUSSIAN" language-family = "SLAVIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "HR"><annotation><documentation> language-name = "CROATIAN" language-family = "SLAVIC"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "CS"><annotation><documentation> language-name = "CZECH" language-family = "SLAVIC"/ </documentation></annotation>         </enumeration>
+      <enumeration value = "MK"><annotation><documentation> language-name = "MACEDONIAN" language-family = "SLAVIC"/ </documentation></annotation>        </enumeration>
+      <enumeration value = "PL"><annotation><documentation> language-name = "POLISH" language-family = "SLAVIC"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "RU"><annotation><documentation> language-name = "RUSSIAN" language-family = "SLAVIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "SR"><annotation><documentation> language-name = "SERBIAN" language-family = "SLAVIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "SH"><annotation><documentation> language-name = "SERBO-CROATIAN" language-family = "SLAVIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "SK"><annotation><documentation> language-name = "SLOVAK" language-family = "SLAVIC"/ </documentation></annotation>          </enumeration>
+      <enumeration value = "SL"><annotation><documentation> language-name = "SLOVENIAN" language-family = "SLAVIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "UK"><annotation><documentation> language-name = "UKRAINIAN" language-family = "SLAVIC"/ </documentation></annotation>       </enumeration>
+      <enumeration value = "AZ"><annotation><documentation> language-name = "AZERBAIJANI" language-family = "TURKIC/ALTAIC"/ </documentation></annotation>    </enumeration>
+      <enumeration value = "BA"><annotation><documentation> language-name = "BASHKIR" language-family = "TURKIC/ALTAIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "KK"><annotation><documentation> language-name = "KAZAKH" language-family = "TURKIC/ALTAIC"/ </documentation></annotation>     </enumeration>
+      <enumeration value = "KY"><annotation><documentation> language-name = "KIRGHIZ" language-family = "TURKIC/ALTAIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "TT"><annotation><documentation> language-name = "TATAR" language-family = "TURKIC/ALTAIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "TR"><annotation><documentation> language-name = "TURKISH" language-family = "TURKIC/ALTAIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "TK"><annotation><documentation> language-name = "TURKMEN" language-family = "TURKIC/ALTAIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "UZ"><annotation><documentation> language-name = "UZBEK" language-family = "TURKIC/ALTAIC"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "BI"><annotation><documentation> language-name = "BISLAMA" language-family = "[not-given]"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "MN"><annotation><documentation> language-name = "MONGOLIAN" language-family = "[not-given]"/ </documentation></annotation>      </enumeration>
+      <enumeration value = "NA"><annotation><documentation> language-name = "NAURU" language-family = "[not-given]"/ </documentation></annotation>        </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "always_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "always"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "auto_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "baseline_base_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "baseline"/>
+      <enumeration value = "sub"/>
+      <enumeration value = "super"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "caption_side_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "before"/>
+      <enumeration value = "after"/>
+      <enumeration value = "start"/>
+      <enumeration value = "end"/>
+      <enumeration value = "top"/>
+      <enumeration value = "bottom"/>
+      <enumeration value = "left"/>
+      <enumeration value = "right"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "display_align_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "before"/>
+      <enumeration value = "center"/>
+      <enumeration value = "after"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "float_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "inherit"/>
+      <enumeration value = "before"/>
+      <enumeration value = "start"/>
+      <enumeration value = "end"/>
+      <enumeration value = "left"/>
+      <enumeration value = "right"/>
+      <enumeration value = "none"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "blank_or_not_blank_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "blank"/>
+      <enumeration value = "not-blank"/>
+      <enumeration value = "any"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "text_transform_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "capitalize"/>
+      <enumeration value = "uppercase"/>
+      <enumeration value = "lowercase"/>
+      <enumeration value = "none"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "border_collapse_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "collapse"/>
+      <enumeration value = "separate"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "line_height_shift_adjustment_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "consider-shifts"/>
+      <enumeration value = "disregard-shifts"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "white_space_collapse_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "false"/>
+      <enumeration value = "true"/>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "retrieve_position_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "first-starting-within-page"/>
+      <enumeration value = "first-including-carryover"/>
+      <enumeration value = "last-starting-within-page"/>
+      <enumeration value = "last-ending-within-page"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "page_position_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "first"/>
+      <enumeration value = "last"/>
+      <enumeration value = "rest"/>
+      <enumeration value = "any"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "force_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "force"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "white_space_treatment_Type">
+    <annotation>
+      <documentation>
+        <fop_fail>property ignored</fop_fail>
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <enumeration value = "ignore"/>
+      <enumeration value = "preserve"/>
+      <enumeration value = "ignore-if-before-linefeed"/>
+      <enumeration value = "ignore-if-after-linefeed"/>
+      <enumeration value = "ignore-if-surrounding-linefeed"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "linefeed_treatment_Type">
+    <annotation>
+      <documentation>
+        <fop_fail>property is not implemented yet</fop_fail>
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <enumeration value = "ignore"/>
+      <enumeration value = "preserve"/>
+      <enumeration value = "treat-as-space"/>
+      <enumeration value = "treat-as-zero-width-space"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "inherit_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "horizontal_position_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "left"/>
+      <enumeration value = "center"/>
+      <enumeration value = "right"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "line_stacking_strategy_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "line-height"/>
+      <enumeration value = "font-height"/>
+      <enumeration value = "max-height"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "active_state_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "link"/>
+      <enumeration value = "visited"/>
+      <enumeration value = "active"/>
+      <enumeration value = "hover"/>
+      <enumeration value = "focus"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "writing_mode_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "lr-tb"/>
+      <enumeration value = "rl-tb"/>
+      <enumeration value = "tb-rl"/>
+      <enumeration value = "lr"/>
+      <enumeration value = "rl"/>
+      <enumeration value = "tb"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "direction_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "ltr"/>
+      <enumeration value = "rtl"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "wrap_option_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "no-wrap"/>
+      <enumeration value = "wrap"/>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "span_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "none"/>
+      <enumeration value = "all"/>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "rule_style_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "none"/>
+      <enumeration value = "dotted"/>
+      <enumeration value = "dashed"/>
+      <enumeration value = "solid"/>
+      <enumeration value = "double"/>
+      <enumeration value = "groove"/>
+      <enumeration value = "ridge"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "border_style_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "none"/>
+      <enumeration value = "hidden"/>
+      <enumeration value = "dotted"/>
+      <enumeration value = "dashed"/>
+      <enumeration value = "solid"/>
+      <enumeration value = "double"/>
+      <enumeration value = "groove"/>
+      <enumeration value = "ridge"/>
+      <enumeration value = "inset"/>
+      <enumeration value = "outset"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "leader_alignment_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "none"/>
+      <enumeration value = "reference-area"/>
+      <enumeration value = "page"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "text_decoration_Type">
+    <annotation>
+      <documentation>
+        <fop_result>not implemented</fop_result>
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <enumeration value = "none"/>
+      <enumeration value = "underline"/>
+      <enumeration value = "no-underline"/>
+      <enumeration value = "overline"/>
+      <enumeration value = "no-overline"/>
+      <enumeration value = "line-through"/>
+      <enumeration value = "no-line-through"/>
+      <enumeration value = "blink"/>
+      <enumeration value = "no-blink"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "unicode_bidi_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "normal"/>
+      <enumeration value = "embed"/>
+      <enumeration value = "bidi-override"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "odd_or_even_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "odd"/>
+      <enumeration value = "even"/>
+      <enumeration value = "any"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "once_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "once"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "retrieve_boundary_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "page"/>
+      <enumeration value = "page-sequence"/>
+      <enumeration value = "document"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "starting_state_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "show"/>
+      <enumeration value = "hide"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "leader_pattern_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "space"/>
+      <enumeration value = "rule"/>
+      <enumeration value = "dots"/>
+      <enumeration value = "use-content"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "text_align_last_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "start"/>
+      <enumeration value = "center"/>
+      <enumeration value = "end"/>
+      <enumeration value = "justify"/>
+      <enumeration value = "inside">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "outside">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "left">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "right">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "text_align_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "start"/>
+      <enumeration value = "center"/>
+      <enumeration value = "end"/>
+      <enumeration value = "justify"/>
+      <enumeration value = "inside">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "outside">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+      <enumeration value = "left"/>
+      <enumeration value = "right"/>
+      <enumeration value = "inherit">
+        <annotation>
+          <documentation>
+            <fop_fail>Unknown enumerated value</fop_fail>
+          </documentation>
+        </annotation>
+      </enumeration>
+    </restriction>
+  </simpleType>
+  <simpleType name = "width_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "thin"/>
+      <enumeration value = "medium"/>
+      <enumeration value = "thick"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "vertical_position_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "top"/>
+      <enumeration value = "center"/>
+      <enumeration value = "bottom"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "auto_restore_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "table_omit_footer_at_break_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "table_omit_header_at_break_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "precedence_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "score_spaces_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "true"/>
+      <enumeration value = "false"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "scaling_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "uniform"/>
+      <enumeration value = "non-uniform"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "use_font_metrics_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "use-font-metrics"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "background_image_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "uri-specification"/>
+      <enumeration value = "none"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "hyphenation_keep_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "column"/>
+      <enumeration value = "page"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "no_limit_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "no-limit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "visibility_Type">
+    <annotation>
+      <documentation>
+        <fop_fail>property is not implemented yet</fop_fail>
+      </documentation>
+    </annotation>
+    <restriction base = "NMTOKEN">
+      <enumeration value = "visible"/>
+      <enumeration value = "hidden"/>
+      <enumeration value = "collapse"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "overflow_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "visible"/>
+      <enumeration value = "hidden"/>
+      <enumeration value = "scroll"/>
+      <enumeration value = "error-if-overflow"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "transparent_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "transparent"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "none_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "none"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "absolute_position_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "absolute"/>
+      <enumeration value = "fixed"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "azimuth_base_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "left-side"/>
+      <enumeration value = "far-left"/>
+      <enumeration value = "left"/>
+      <enumeration value = "center-left"/>
+      <enumeration value = "center"/>
+      <enumeration value = "center-right"/>
+      <enumeration value = "right"/>
+      <enumeration value = "far-right"/>
+      <enumeration value = "right-side"/>
+      <enumeration value = "behind"/>
+      <enumeration value = "leftwards"/>
+      <enumeration value = "rightwards"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "azimuth_Type">
+    <union memberTypes = "fo:angle_Type fo:azimuth_base_Type"/>
+  </simpleType>
+  <simpleType name = "elevation_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "below"/>
+      <enumeration value = "level"/>
+      <enumeration value = "above"/>
+      <enumeration value = "higher"/>
+      <enumeration value = "lower"/>
+      <enumeration value = "0"/>
+      <enumeration value = "90"/>
+      <enumeration value = "180"/>
+      <enumeration value = "270"/>
+      <enumeration value = "0deg"/>
+      <enumeration value = "90deg"/>
+      <enumeration value = "180deg"/>
+      <enumeration value = "270deg"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "font_selection_strategy_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "auto"/>
+      <enumeration value = "character-by-character"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "font_stretch_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "normal"/>
+      <enumeration value = "wider"/>
+      <enumeration value = "narrower"/>
+      <enumeration value = "ultra-condensed"/>
+      <enumeration value = "extra-condensed"/>
+      <enumeration value = "condensed"/>
+      <enumeration value = "semi-condensed"/>
+      <enumeration value = "semi-expanded"/>
+      <enumeration value = "expanded"/>
+      <enumeration value = "extra-expanded"/>
+      <enumeration value = "ultra-expanded"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "clear_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "start"/>
+      <enumeration value = "end"/>
+      <enumeration value = "left"/>
+      <enumeration value = "right"/>
+      <enumeration value = "both"/>
+      <enumeration value = "none"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "color_Name_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "aliceblue"/>
+      <enumeration value = "antiquewhite"/>
+      <enumeration value = "aqua"/>
+      <enumeration value = "aquamarine"/>
+      <enumeration value = "azure"/>
+      <enumeration value = "beige"/>
+      <enumeration value = "bisque"/>
+      <enumeration value = "black"/>
+      <enumeration value = "blanchedalmond"/>
+      <enumeration value = "blue"/>
+      <enumeration value = "blueviolet"/>
+      <enumeration value = "brown"/>
+      <enumeration value = "burlywood"/>
+      <enumeration value = "cadetblue"/>
+      <enumeration value = "chartreuse"/>
+      <enumeration value = "chocolate"/>
+      <enumeration value = "coral"/>
+      <enumeration value = "cornflowerblue"/>
+      <enumeration value = "cornsilk"/>
+      <enumeration value = "crimson"/>
+      <enumeration value = "cyan"/>
+      <enumeration value = "darkblue"/>
+      <enumeration value = "darkcyan"/>
+      <enumeration value = "darkgoldenrod"/>
+      <enumeration value = "darkgray"/>
+      <enumeration value = "darkgreen"/>
+      <enumeration value = "darkgrey"/>
+      <enumeration value = "darkkhaki"/>
+      <enumeration value = "darkmagenta"/>
+      <enumeration value = "darkolivegreen"/>
+      <enumeration value = "darkorange"/>
+      <enumeration value = "darkorchid"/>
+      <enumeration value = "darkred"/>
+      <enumeration value = "darksalmon"/>
+      <enumeration value = "darkseagreen"/>
+      <enumeration value = "darkslateblue"/>
+      <enumeration value = "darkslategray"/>
+      <enumeration value = "darkslategrey"/>
+      <enumeration value = "darkturquoise"/>
+      <enumeration value = "darkviolet"/>
+      <enumeration value = "deeppink"/>
+      <enumeration value = "deepskyblue"/>
+      <enumeration value = "dimgray"/>
+      <enumeration value = "dimgrey"/>
+      <enumeration value = "dodgerblue"/>
+      <enumeration value = "firebrick"/>
+      <enumeration value = "floralwhite"/>
+      <enumeration value = "forestgreen"/>
+      <enumeration value = "fuchsia"/>
+      <enumeration value = "gainsboro"/>
+      <enumeration value = "lightpink"/>
+      <enumeration value = "lightsalmon"/>
+      <enumeration value = "lightseagreen"/>
+      <enumeration value = "lightskyblue"/>
+      <enumeration value = "lightslategray"/>
+      <enumeration value = "lightslategrey"/>
+      <enumeration value = "lightsteelblue"/>
+      <enumeration value = "lightyellow"/>
+      <enumeration value = "lime"/>
+      <enumeration value = "limegreen"/>
+      <enumeration value = "linen"/>
+      <enumeration value = "magenta"/>
+      <enumeration value = "maroon"/>
+      <enumeration value = "mediumaquamarine"/>
+      <enumeration value = "mediumblue"/>
+      <enumeration value = "mediumorchid"/>
+      <enumeration value = "mediumpurple"/>
+      <enumeration value = "mediumseagreen"/>
+      <enumeration value = "mediumslateblue"/>
+      <enumeration value = "mediumspringgreen"/>
+      <enumeration value = "mediumturquoise"/>
+      <enumeration value = "mediumvioletred"/>
+      <enumeration value = "midnightblue"/>
+      <enumeration value = "mintcream"/>
+      <enumeration value = "mistyrose"/>
+      <enumeration value = "moccasin"/>
+      <enumeration value = "navajowhite"/>
+      <enumeration value = "navy"/>
+      <enumeration value = "oldlace"/>
+      <enumeration value = "olive"/>
+      <enumeration value = "olivedrab"/>
+      <enumeration value = "orange"/>
+      <enumeration value = "orangered"/>
+      <enumeration value = "orchid"/>
+      <enumeration value = "palegoldenrod"/>
+      <enumeration value = "palegreen"/>
+      <enumeration value = "paleturquoise"/>
+      <enumeration value = "palevioletred"/>
+      <enumeration value = "papayawhip"/>
+      <enumeration value = "peachpuff"/>
+      <enumeration value = "peru"/>
+      <enumeration value = "pink"/>
+      <enumeration value = "plum"/>
+      <enumeration value = "powderblue"/>
+      <enumeration value = "purple"/>
+      <enumeration value = "red"/>
+      <enumeration value = "rosybrown"/>
+      <enumeration value = "royalblue"/>
+      <enumeration value = "saddlebrown"/>
+      <enumeration value = "salmon"/>
+      <enumeration value = "ghostwhite"/>
+      <enumeration value = "gold"/>
+      <enumeration value = "goldenrod"/>
+      <enumeration value = "gray"/>
+      <enumeration value = "grey"/>
+      <enumeration value = "green"/>
+      <enumeration value = "greenyellow"/>
+      <enumeration value = "honeydew"/>
+      <enumeration value = "hotpink"/>
+      <enumeration value = "indianred"/>
+      <enumeration value = "indigo"/>
+      <enumeration value = "ivory"/>
+      <enumeration value = "khaki"/>
+      <enumeration value = "lavender"/>
+      <enumeration value = "lavenderblush"/>
+      <enumeration value = "lawngreen"/>
+      <enumeration value = "lemonchiffon"/>
+      <enumeration value = "lightblue"/>
+      <enumeration value = "lightcoral"/>
+      <enumeration value = "lightcyan"/>
+      <enumeration value = "lightgoldenrodyellow"/>
+      <enumeration value = "lightgray"/>
+      <enumeration value = "lightgreen"/>
+      <enumeration value = "lightgrey"/>
+      <enumeration value = "sandybrown"/>
+      <enumeration value = "seagreen"/>
+      <enumeration value = "seashell"/>
+      <enumeration value = "sienna"/>
+      <enumeration value = "silver"/>
+      <enumeration value = "skyblue"/>
+      <enumeration value = "slateblue"/>
+      <enumeration value = "slategray"/>
+      <enumeration value = "slategrey"/>
+      <enumeration value = "snow"/>
+      <enumeration value = "springgreen"/>
+      <enumeration value = "steelblue"/>
+      <enumeration value = "tan"/>
+      <enumeration value = "teal"/>
+      <enumeration value = "thistle"/>
+      <enumeration value = "tomato"/>
+      <enumeration value = "turquoise"/>
+      <enumeration value = "violet"/>
+      <enumeration value = "wheat"/>
+      <enumeration value = "white"/>
+      <enumeration value = "whitesmoke"/>
+      <enumeration value = "yellow"/>
+      <enumeration value = "yellowgreen"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "color_Hex_Type">
+    <restriction base = "string">
+      <pattern value = "#[0-9A-F]{6}"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "background_color_Type">
+    <union memberTypes = "fo:color_Hex_Type fo:color_Name_Type fo:inherit_Type fo:transparent_Type"/>
+  </simpleType>
+  <simpleType name = "relative_position_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "static"/>
+      <enumeration value = "relative"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "speak_header_Type">
+    <restriction base = "NMTOKEN">
+      <enumeration value = "once"/>
+      <enumeration value = "always"/>
+      <enumeration value = "inherit"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "border_Type">
+    <annotation>
+      <documentation>
+        "fo:width_Type fo:border_style_Type fo:color_Type"
+        <enumeration value="solid 4px yellow"/>
+        <enumeration value="solid 2px green"/>
+        <enumeration value="solid 1px blue"/>
+        <enumeration value="solid 1px silver"/>
+      </documentation>
+    </annotation>
+    <restriction base = "string">
+      <pattern value = "(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset) \+?\d+\.?\d*(px|pt|mm|cm|in|em|%) (#[0-9A-F]{6}|[a-z]{3,16})"/>
+    </restriction>
+  </simpleType>
+  <simpleType name = "font_size_Type">
+    <union memberTypes = "fo:absolute_size_Type fo:relative_size_Type fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "alignment_baseline_Type">
+    <union memberTypes = "fo:auto_Type fo:alignment_Type fo:box_alignment_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "alignment_adjust_Type">
+    <union memberTypes = "fo:auto_Type fo:alignment_Type fo:percentage_Type fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "z_index_Type">
+    <union memberTypes = "fo:auto_Type fo:integer_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "margin_width_Type">
+    <union memberTypes = "fo:auto_Type fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "block_progression_dimension_optimum_Type">
+    <union memberTypes = "fo:auto_Type fo:length_Type"/>
+  </simpleType>
+  <simpleType name = "block_progression_dimension_maximum_Type">
+    <union memberTypes = "fo:auto_Type fo:length_Type"/>
+  </simpleType>
+  <simpleType name = "inline_progression_dimension_maximum_Type">
+    <union memberTypes = "fo:auto_Type fo:length_Type"/>
+  </simpleType>
+  <simpleType name = "inline_progression_dimension_optimum_Type">
+    <union memberTypes = "fo:auto_Type fo:length_Type"/>
+  </simpleType>
+  <simpleType name = "baseline_shift_Type">
+    <union memberTypes = "fo:baseline_base_Type fo:percentage_Type fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_start_precedence_Type">
+    <union memberTypes = "fo:integer_Type fo:force_Type"/>
+  </simpleType>
+  <simpleType name = "space_end_precedence_Type">
+    <union memberTypes = "fo:integer_Type fo:force_Type"/>
+  </simpleType>
+  <simpleType name = "space_after_precedence_Type">
+    <union memberTypes = "fo:integer_Type fo:force_Type"/>
+  </simpleType>
+  <simpleType name = "space_before_precedence_Type">
+    <union memberTypes = "fo:integer_Type fo:force_Type"/>
+  </simpleType>
+  <simpleType name = "widows_Type">
+    <union memberTypes = "fo:integer_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "orphans_Type">
+    <union memberTypes = "fo:integer_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_start_maximum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_start_minimum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_end_minimum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_end_optimum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_before_minimum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_after_maximum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_start_optimum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_end_maximum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_before_optimum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_before_maximum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_after_optimum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "space_after_minimum_Type">
+    <union memberTypes = "fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "left_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:auto_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "bottom_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:auto_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "right_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:auto_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "top_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:auto_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "start_indent_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "last_line_end_indent_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "provisional_distance_between_starts_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "end_indent_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "extent_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "provisional_label_separation_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "length_percentage_Type">
+    <union memberTypes = "fo:length_Type fo:percentage_Type"/>
+  </simpleType>
+  <simpleType name = "hyphenation_ladder_count_Type">
+    <union memberTypes = "fo:no_limit_Type fo:integer_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "background_position_horizontal_Type">
+    <union memberTypes = "fo:percentage_Type fo:length_Type fo:horizontal_position_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "background_position_vertical_Type">
+    <union memberTypes = "fo:percentage_Type fo:length_Type fo:vertical_position_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "leader_pattern_width_Type">
+    <union memberTypes = "fo:use_font_metrics_Type fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "text_altitude_Type">
+    <union memberTypes = "fo:use_font_metrics_Type fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "text_depth_Type">
+    <union memberTypes = "fo:use_font_metrics_Type fo:length_Type fo:percentage_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "border_before_width_Type">
+    <union memberTypes = "fo:width_Type fo:length_Type fo:length_conditional_Type fo:inherit_Type"/>
+  </simpleType>
+  <simpleType name = "border_top_width_Type">
+    <union memberTypes = "fo:width_Type fo:length_Type fo:inherit_Type"/>
+  </simpleType>
+
+  <annotation>
+    <documentation>
+      Element definitions
+    </documentation>
+  </annotation>
+
+  <element name = "root">
+    <complexType>
+      <sequence>
+        <element ref = "fo:layout-master-set"/>
+        <element ref = "fo:declarations" minOccurs = "0"/>
+        <element ref = "fo:page-sequence" maxOccurs = "unbounded"/>
+      </sequence>
+      <attribute name = "media-usage" type = "fo:media_usage_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "declarations">
+    <complexType>
+      <sequence>
+        <element ref = "fo:color-profile" maxOccurs = "unbounded"/>
+        <any minOccurs = "0" maxOccurs = "unbounded" namespace = "##other" processContents = "skip"/>
+      </sequence>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "color-profile">
+    <complexType>
+      <attribute name = "src" type = "xs:string" use = "required"/>
+      <attribute name = "color-profile-name" type = "xs:string" use = "required"/>
+      <attribute name = "rendering-intent" type = "fo:rendering_intent_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "layout-master-set">
+    <complexType>
+      <choice maxOccurs = "unbounded">
+        <element ref = "fo:simple-page-master"/>
+        <element ref = "fo:page-sequence-master"/>
+      </choice>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "page-sequence-master">
+    <complexType>
+      <choice maxOccurs = "unbounded">
+        <element ref = "fo:single-page-master-reference"/>
+        <element ref = "fo:repeatable-page-master-reference"/>
+        <element ref = "fo:repeatable-page-master-alternatives"/>
+      </choice>
+      <attribute name = "master-name" type = "xs:string" use = "required"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "single-page-master-reference">
+    <complexType>
+      <attribute name = "master-reference" type = "xs:string" use = "required"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "repeatable-page-master-reference">
+    <complexType>
+      <attribute name = "master-reference" type = "xs:string" use = "required"/>
+      <attribute name = "maximum-repeats" type = "fo:integer_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "repeatable-page-master-alternatives">
+    <complexType>
+      <sequence>
+        <element ref = "fo:conditional-page-master-reference" maxOccurs = "unbounded"/>
+      </sequence>
+      <attribute name = "maximum-repeats" type = "fo:integer_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "conditional-page-master-reference">
+    <complexType>
+      <attribute name = "master-reference" type = "xs:string" use = "required"/>
+      <attribute name = "page-position" type = "fo:page_position_Type"/>
+      <attribute name = "odd-or-even" type = "fo:odd_or_even_Type"/>
+      <attribute name = "blank-or-not-blank" type = "fo:blank_or_not_blank_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "simple-page-master">
+    <complexType>
+      <sequence>
+        <element ref = "fo:region-body"/>
+        <element ref = "fo:region-before" minOccurs = "0"/>
+        <element ref = "fo:region-after" minOccurs = "0"/>
+        <element ref = "fo:region-start" minOccurs = "0"/>
+        <element ref = "fo:region-end" minOccurs = "0"/>
+      </sequence>
+      <attributeGroup ref = "fo:Margin_Properties_Block_List"/>
+      <attribute name = "master-name" type = "xs:string" use = "required"/>
+      <attribute name = "page-height" type = "fo:length_Type"/>
+      <attribute name = "page-width" type = "fo:length_Type"/>
+      <attributeGroup ref = "fo:reference_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "region-body">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "display-align" type = "fo:display_align_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Margin_Properties_Block_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "column-count" type = "fo:integer_Type"/>
+      <attribute name = "column-gap" type = "fo:length_Type"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attribute name = "region-name" type = "xs:string"/>
+      <attributeGroup ref = "fo:reference_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "region-before">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "display-align" type = "fo:display_align_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "extent" type = "fo:extent_Type"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attribute name = "precedence" type = "fo:precedence_Type"/>
+      <attribute name = "region-name" type = "xs:string"/>
+      <attributeGroup ref = "fo:reference_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "region-after">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "display-align" type = "fo:display_align_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "extent" type = "fo:extent_Type"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attribute name = "precedence" type = "fo:precedence_Type"/>
+      <attribute name = "region-name" type = "xs:string"/>
+      <attributeGroup ref = "fo:reference_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "region-start">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "display-align" type = "fo:display_align_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "extent" type = "fo:extent_Type"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attribute name = "precedence" type = "fo:precedence_Type"/>
+      <attribute name = "region-name" type = "xs:string"/>
+      <attributeGroup ref = "fo:reference_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "region-end">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "display-align" type = "fo:display_align_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "extent" type = "fo:extent_Type"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attribute name = "precedence" type = "fo:precedence_Type"/>
+      <attribute name = "region-name" type = "xs:string"/>
+      <attributeGroup ref = "fo:reference_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "page-sequence">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "country" type = "fo:country_Type"/>
+          <attribute name = "language" type = "fo:language_Type"/>
+        </documentation>
+      </annotation>
+      <sequence>
+        <element ref = "fo:title" minOccurs = "0"/>
+        <element ref = "fo:static-content" minOccurs = "0" maxOccurs = "unbounded"/>
+        <element ref = "fo:flow"/>
+      </sequence>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "master-reference" type = "xs:string" use = "required"/>
+      <attribute name = "initial-page-number" type = "fo:integer_Type"/>
+      <attribute name = "force-page-count" type = "fo:force_page_count_Type"/>
+      <attribute name = "format" type = "xs:string"/>
+      <attribute name = "letter-value" type = "fo:letter_value_Type"/>
+      <attribute name = "grouping-separator" type = "fo:character_Type"/>
+      <attribute name = "grouping-size" type = "fo:integer_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "title">
+    <complexType mixed = "true">
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "color" type = "fo:color_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "visibility" type = "fo:visibility_Type"/>
+        </documentation>
+      </annotation>
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:neutral_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "static-content">
+    <complexType>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attribute name = "flow-name" type = "xs:string" use = "required"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "flow">
+    <complexType>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attribute name = "flow-name" type = "xs:string" use = "required"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "block">
+    <complexType mixed = "true">
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "color" type = "fo:color_Type"/>
+          <attribute name = "last-line-end-indent" type = "fo:last_line_end_indent_Type"/>
+          <attribute name = "linefeed-treatment" type = "fo:linefeed_treatment_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "orphans" type = "fo:orphans_Type"/>
+          <attribute name = "white-space-treatment" type = "fo:white_space_treatment_Type"/>
+          <attribute name = "text-align" type = "fo:text_align_Type"/>
+          <attribute name = "text-align-last" type = "fo:text_align_last_Type"/>
+          <attribute name = "text-indent" type = "fo:length_percentage_Type"/>
+          <attribute name = "visibility" type = "fo:visibility_Type"/>
+          <attribute name = "white-space-collapse" type = "fo:white_space_collapse_Type"/>
+          <attribute name = "widows" type = "fo:widows_Type"/>
+          <attribute name = "wrap-option" type = "fo:wrap_option_Type"/>
+        </documentation>
+      </annotation>
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:initial_property_set_List"/>
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:block_properties"/>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Hyphenation_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Block_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attributeGroup ref = "fo:break_Properties_List"/>
+      <attributeGroup ref = "fo:text_one_Properties_List"/>
+      <attributeGroup ref = "fo:block_hyphenation_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:intrusion_displace_Properties_List"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attributeGroup ref = "fo:line_height_Properties_List"/>
+      <attribute name = "span" type = "fo:span_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "block-container">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "display-align" type = "fo:display_align_Type"/>
+        </documentation>
+      </annotation>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:block_properties"/>
+      <attributeGroup ref = "fo:Absolute_Position_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Block_List"/>
+      <attributeGroup ref = "fo:progression_Properties_List"/>
+      <attributeGroup ref = "fo:break_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:intrusion_displace_Properties_List"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attributeGroup ref = "fo:reference_Properties_List"/>
+      <attribute name = "span" type = "fo:span_Type"/>
+      <attribute name = "width" type = "fo:height_Type"/>
+      <attribute name = "z-index" type = "fo:z_index_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "bidi-override">
+    <complexType mixed = "true">
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "color" type = "fo:color_Type"/>
+          <attribute name = "direction" type = "fo:direction_Type"/>
+          <attribute name = "letter-spacing" type = "fo:letter_spacing_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "score-spaces" type = "fo:score_spaces_Type"/>
+          <attribute name = "word-spacing" type = "fo:letter_spacing_Type"/>
+        </documentation>
+      </annotation>
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "unicode-bidi" type = "fo:unicode_bidi_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "character">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "color" type = "fo:color_Type"/>
+          <attribute name = "glyph-orientation-horizontal" type = "fo:orientation_Type"/>
+          <attribute name = "glyph-orientation-vertical" type = "fo:orientation_Type"/>
+          <attribute name = "letter-spacing" type = "fo:letter_spacing_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "score-spaces" type = "fo:score_spaces_Type"/>
+          <attribute name = "text-transform" type = "fo:text_transform_Type"/>
+          <attribute name = "visibility" type = "fo:visibility_Type"/>
+          <attribute name = "word-spacing" type = "fo:letter_spacing_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Hyphenation_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "treat-as-word-space" type = "fo:treat_as_word_space_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attribute name = "character" type = "fo:character_Type"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attributeGroup ref = "fo:text_one_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "keep-with-next" type = "fo:keep_integer_Type"/>
+      <attribute name = "keep-with-previous" type = "fo:keep_integer_Type"/>
+      <attribute name = "suppress-at-line-break" type = "fo:suppress_at_line_break_Type"/>
+      <attribute name = "text-decoration" type = "fo:text_decoration_Type"/>
+      <attribute name = "text-shadow" type = "fo:text_shadow_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "initial-property-set">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "color" type = "fo:color_Type"/>
+          <attribute name = "letter-spacing" type = "fo:letter_spacing_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "score-spaces" type = "fo:score_spaces_Type"/>
+          <attribute name = "text-transform" type = "fo:text_transform_Type"/>
+          <attribute name = "word-spacing" type = "fo:letter_spacing_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "text-decoration" type = "fo:text_decoration_Type"/>
+      <attribute name = "text-shadow" type = "fo:text_shadow_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "external-graphic">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "display-align" type = "fo:display_align_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "text-align" type = "fo:text_align_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attributeGroup ref = "fo:progression_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "content-height" type = "fo:content_height_Type"/>
+      <attribute name = "content-type" type = "xs:string"/>
+      <attribute name = "content-width" type = "fo:content_height_Type"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "keep-with-next" type = "fo:keep_integer_Type"/>
+      <attribute name = "keep-with-previous" type = "fo:keep_integer_Type"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attribute name = "scaling" type = "fo:scaling_Type"/>
+      <attribute name = "scaling-method" type = "fo:scaling_method_Type"/>
+      <attribute name = "src" type = "xs:string" use = "required"/>
+      <attribute name = "width" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "instream-foreign-object">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "display-align" type = "fo:display_align_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "text-align" type = "fo:text_align_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attributeGroup ref = "fo:progression_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "content-height" type = "fo:content_height_Type"/>
+      <attribute name = "content-type" type = "xs:string"/>
+      <attribute name = "content-width" type = "fo:content_height_Type"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "keep-with-next" type = "fo:keep_integer_Type"/>
+      <attribute name = "keep-with-previous" type = "fo:keep_integer_Type"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attribute name = "scaling" type = "fo:scaling_Type"/>
+      <attribute name = "scaling-method" type = "fo:scaling_method_Type"/>
+      <attribute name = "width" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "inline">
+    <complexType mixed = "true">
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "color" type = "fo:color_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "visibility" type = "fo:visibility_Type"/>
+          <attribute name = "wrap-option" type = "fo:wrap_option_Type"/>
+        </documentation>
+      </annotation>
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List">
+        <annotation>
+          <documentation>
+            <fop_result>Border and background properties not implemented</fop_result>
+          </documentation>
+        </annotation>
+      </attributeGroup>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attributeGroup ref = "fo:progression_Properties_List"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attribute name = "text-decoration" type = "fo:text_decoration_Type"/>
+      <attribute name = "width" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "inline-container">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "display-align" type = "fo:display_align_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+        </documentation>
+      </annotation>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attributeGroup ref = "fo:progression_Properties_List"/>
+      <attributeGroup ref = "fo:clip_Properties_List"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attribute name = "overflow" type = "fo:overflow_Type"/>
+      <attributeGroup ref = "fo:reference_Properties_List"/>
+      <attribute name = "width" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "leader">
+    <complexType mixed = "true">
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "color" type = "fo:color_Type"/>
+          <attribute name = "leader-alignment" type = "fo:leader_alignment_Type"/>
+          <attribute name = "leader-length" type = "fo:leader_length_Type"/>
+          <attribute name = "leader-length.minimum" type = "fo:length_Type"/>
+          <attribute name = "leader-length.optimum" type = "fo:length_Type"/>
+          <attribute name = "leader-length.maximum" type = "fo:length_Type"/>
+          <attribute name = "leader-pattern" type = "fo:leader_pattern_Type"/>
+          <attribute name = "leader-pattern-width" type = "fo:leader_pattern_width_Type"/>
+          <attribute name = "rule-style" type = "fo:rule_style_Type"/>
+          <attribute name = "rule-thickness" type = "fo:length_Type"/>
+          <attribute name = "letter-spacing" type = "fo:letter_spacing_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "visibility" type = "fo:visibility_Type"/>
+          <attribute name = "word-spacing" type = "fo:letter_spacing_Type"/>
+        </documentation>
+      </annotation>
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:neutral_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attributeGroup ref = "fo:text_one_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "keep-with-next" type = "fo:keep_integer_Type"/>
+      <attribute name = "keep-with-previous" type = "fo:keep_integer_Type"/>
+      <attribute name = "text-shadow" type = "fo:text_shadow_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "page-number">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "letter-spacing" type = "fo:letter_spacing_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "score-spaces" type = "fo:score_spaces_Type"/>
+          <attribute name = "text-transform" type = "fo:text_transform_Type"/>
+          <attribute name = "visibility" type = "fo:visibility_Type"/>
+          <attribute name = "word-spacing" type = "fo:letter_spacing_Type"/>
+          <attribute name = "wrap-option" type = "fo:wrap_option_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "keep-with-next" type = "fo:keep_integer_Type"/>
+      <attribute name = "keep-with-previous" type = "fo:keep_integer_Type"/>
+      <attributeGroup ref = "fo:text_one_Properties_List"/>
+      <attribute name = "text-decoration" type = "fo:text_decoration_Type"/>
+      <attribute name = "text-shadow" type = "fo:text_shadow_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "page-number-citation">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "letter-spacing" type = "fo:letter_spacing_Type"/>
+          <attribute name = "line-height" type = "fo:line_height_Type"/>
+          <attribute name = "score-spaces" type = "fo:score_spaces_Type"/>
+          <attribute name = "text-transform" type = "fo:text_transform_Type"/>
+          <attribute name = "visibility" type = "fo:visibility_Type"/>
+          <attribute name = "word-spacing" type = "fo:letter_spacing_Type"/>
+          <attribute name = "wrap-option" type = "fo:wrap_option_Type"/>
+        </documentation>
+      </annotation>
+      <attribute name = "ref-id" type = "xs:string" use = "required"/>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Font_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "keep-with-next" type = "fo:keep_integer_Type"/>
+      <attribute name = "keep-with-previous" type = "fo:keep_integer_Type"/>
+      <attributeGroup ref = "fo:text_one_Properties_List"/>
+      <attribute name = "text-decoration" type = "fo:text_decoration_Type"/>
+      <attribute name = "text-shadow" type = "fo:text_shadow_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "table-and-caption">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "caption-side" type = "fo:caption_side_Type"/>
+          <attribute name = "text-align" type = "fo:text_align_Type"/>
+        </documentation>
+      </annotation>
+      <sequence>
+        <element ref = "fo:table-caption" minOccurs = "0"/>
+        <element ref = "fo:table"/>
+      </sequence>
+      <attributeGroup ref = "fo:block_properties"/>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Block_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attributeGroup ref = "fo:break_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:intrusion_displace_Properties_List"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "table-caption">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "keep-together" type = "fo:keep_compound_Type"/>
+          <attribute name = "keep-together.within-line" type = "fo:keep_integer_Type"/>
+          <attribute name = "keep-together.within-column" type = "fo:keep_integer_Type"/>
+          <attribute name = "keep-together.within-page" type = "fo:keep_integer_Type"/>
+        </documentation>
+      </annotation>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attributeGroup ref = "fo:progression_Properties_List"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:intrusion_displace_Properties_List"/>
+      <attribute name = "width" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "table">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "border-collapse" type = "fo:border_collapse_Type"/>
+          <attribute name = "border-separation" type = "fo:length_bp_ip_direction_Type"/>
+          <attribute name = "border-spacing" type = "fo:length_Type"/>
+          <attribute name = "writing-mode" type = "fo:writing_mode_Type"/>
+        </documentation>
+      </annotation>
+      <sequence>
+        <element ref = "fo:table-column" minOccurs = "0" maxOccurs = "unbounded"/>
+        <element ref = "fo:table-header" minOccurs = "0"/>
+        <element ref = "fo:table-footer" minOccurs = "0"/>
+        <element ref = "fo:table-body" maxOccurs = "unbounded"/>
+      </sequence>
+      <attributeGroup ref = "fo:block_properties"/>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Block_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attributeGroup ref = "fo:progression_Properties_List"/>
+      <attribute name = "border-after-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-before-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-end-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-start-precedence" type = "fo:precedence_Type"/>
+      <attributeGroup ref = "fo:break_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:intrusion_displace_Properties_List"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attribute name = "table-layout" type = "fo:table_layout_Type"/>
+      <attribute name = "table-omit-footer-at-break" type = "fo:table_omit_footer_at_break_Type"/>
+      <attribute name = "table-omit-header-at-break" type = "fo:table_omit_header_at_break_Type"/>
+      <attribute name = "width" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "table-column">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "visibility" type = "fo:visibility_Type"/>
+        </documentation>
+      </annotation>
+      <attributeGroup ref = "fo:Border_Properties_List"/>
+      <attributeGroup ref = "fo:Background_Properties_List"/>
+      <attribute name = "border-after-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-before-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-end-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-start-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "column-number" type = "fo:integer_Type"/>
+      <attribute name = "column-width" type = "fo:column_width_Type"/>
+      <attribute name = "number-columns-repeated" type = "fo:integer_Type"/>
+      <attribute name = "number-columns-spanned" type = "fo:integer_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "table-header">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "visibility" type = "fo:visibility_Type"/>
+        </documentation>
+      </annotation>
+      <choice>
+        <element ref = "fo:table-row" maxOccurs = "unbounded"/>
+        <element ref = "fo:table-cell" maxOccurs = "unbounded"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Properties_List"/>
+      <attributeGroup ref = "fo:Background_Properties_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "border-after-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-before-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-end-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-start-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "table-footer">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "visibility" type = "fo:visibility_Type"/>
+        </documentation>
+      </annotation>
+      <choice>
+        <element ref = "fo:table-row" maxOccurs = "unbounded"/>
+        <element ref = "fo:table-cell" maxOccurs = "unbounded"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Properties_List"/>
+      <attributeGroup ref = "fo:Background_Properties_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "border-after-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-before-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-end-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-start-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "table-body">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "visibility" type = "fo:visibility_Type"/>
+        </documentation>
+      </annotation>
+      <choice>
+        <element ref = "fo:table-row" maxOccurs = "unbounded"/>
+        <element ref = "fo:table-cell" maxOccurs = "unbounded"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Properties_List"/>
+      <attributeGroup ref = "fo:Background_Properties_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "border-after-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-before-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-end-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-start-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "table-row">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "visibility" type = "fo:visibility_Type"/>
+        </documentation>
+      </annotation>
+      <sequence>
+        <element ref = "fo:table-cell" maxOccurs = "unbounded"/>
+      </sequence>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Properties_List"/>
+      <attributeGroup ref = "fo:Background_Properties_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "block-progression-dimension" type = "fo:margin_width_Type"/>
+      <attribute name = "block-progression-dimension.minimum" type = "fo:length_Type"/>
+      <attribute name = "block-progression-dimension.optimum" type = "fo:block_progression_dimension_optimum_Type"/>
+      <attribute name = "block-progression-dimension.maximum" type = "fo:block_progression_dimension_maximum_Type"/>
+      <attribute name = "border-after-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-before-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-end-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-start-precedence" type = "fo:precedence_Type"/>
+      <attributeGroup ref = "fo:break_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "page-break-after"  type = "fo:page_break_after_Type"/>
+      <attribute name = "page-break-before" type = "fo:page_break_after_Type"/>
+    </complexType>
+  </element>
+  <element name = "table-cell">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "display-align" type = "fo:display_align_Type"/>
+          <attribute name = "relative-align" type = "fo:relative_align_Type"/>
+          <attribute name = "empty-cells" type = "fo:empty_cells_Type"/>
+        </documentation>
+      </annotation>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "border-after-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-before-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-end-precedence" type = "fo:precedence_Type"/>
+      <attribute name = "border-start-precedence" type = "fo:precedence_Type"/>
+      <attributeGroup ref = "fo:progression_Properties_List"/>
+      <attribute name = "column-number" type = "fo:integer_Type"/>
+      <attribute name = "ends-row" type = "fo:ends_row_Type"/>
+      <attribute name = "height" type = "fo:height_Type"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "number-columns-spanned" type = "fo:integer_Type"/>
+      <attribute name = "number-rows-spanned" type = "fo:integer_Type"/>
+      <attribute name = "starts-row" type = "fo:starts_row_Type"/>
+      <attribute name = "width" type = "fo:height_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "list-block">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "provisional-distance-between-starts" type = "fo:provisional_distance_between_starts_Type"/>
+          <attribute name = "provisional-label-separation" type = "fo:provisional_label_separation_Type"/>
+        </documentation>
+      </annotation>
+      <sequence>
+        <element ref = "fo:list-item" maxOccurs = "unbounded"/>
+      </sequence>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Block_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attributeGroup ref = "fo:break_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:intrusion_displace_Properties_List"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attributeGroup ref = "fo:list_properties"/>
+    </complexType>
+  </element>
+  <element name = "list-item">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "relative-align" type = "fo:relative_align_Type"/>
+        </documentation>
+      </annotation>
+      <sequence>
+        <element ref = "fo:list-item-label"/>
+        <element ref = "fo:list-item-body"/>
+      </sequence>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Block_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attributeGroup ref = "fo:break_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:intrusion_displace_Properties_List"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attributeGroup ref = "fo:list_properties"/>
+    </complexType>
+  </element>
+  <element name = "list-item-body">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "keep-together" type = "fo:keep_compound_Type"/>
+          <attribute name = "keep-together.within-line" type = "fo:keep_integer_Type"/>
+          <attribute name = "keep-together.within-column" type = "fo:keep_integer_Type"/>
+          <attribute name = "keep-together.within-page" type = "fo:keep_integer_Type"/>
+        </documentation>
+      </annotation>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attributeGroup ref = "fo:list_properties"/>
+    </complexType>
+  </element>
+  <element name = "list-item-label">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable
+          <attribute name = "keep-together" type = "fo:keep_compound_Type"/>
+          <attribute name = "keep-together.within-line" type = "fo:keep_integer_Type"/>
+          <attribute name = "keep-together.within-column" type = "fo:keep_integer_Type"/>
+          <attribute name = "keep-together.within-page" type = "fo:keep_integer_Type"/>
+        </documentation>
+      </annotation>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attributeGroup ref = "fo:list_properties"/>
+    </complexType>
+  </element>
+  <element name = "float">
+    <complexType>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attribute name = "float" type = "fo:float_Type"/>
+      <attribute name = "clear" type = "fo:clear_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "footnote">
+    <complexType>
+      <sequence>
+        <element ref = "fo:inline"/>
+        <element ref = "fo:footnote-body"/>
+      </sequence>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "footnote-body">
+    <complexType>
+      <choice maxOccurs = "unbounded">
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "basic-link">
+    <complexType mixed = "true">
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "line-height" type = "fo:line_height_Type"/>
+        </documentation>
+      </annotation>
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attributeGroup ref = "fo:Aural_Properties_List"/>
+      <attributeGroup ref = "fo:Border_Padding_and_Background_Properties_List"/>
+      <attributeGroup ref = "fo:Margin_Properties_Inline_List"/>
+      <attributeGroup ref = "fo:Relative_Position_Properties_List"/>
+      <attribute name = "alignment-adjust" type = "fo:alignment_adjust_Type"/>
+      <attribute name = "alignment-baseline" type = "fo:alignment_baseline_Type"/>
+      <attribute name = "baseline-shift" type = "fo:baseline_shift_Type"/>
+      <attribute name = "destination-placement-offset" type = "fo:length_Type"/>
+      <attribute name = "dominant-baseline" type = "fo:dominant_baseline_Type"/>
+      <attribute name = "external-destination" type = "xs:string"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "indicate-destination" type = "fo:indicate_destination_Type"/>
+      <attribute name = "internal-destination" type = "xs:string"/>
+      <attributeGroup ref = "fo:keep_Properties_List"/>
+      <attribute name = "show-destination" type = "fo:show_destination_Type"/>
+      <attribute name = "target-processing-context" type = "xs:string"/>
+      <attribute name = "target-presentation-context" type = "xs:string"/>
+      <attribute name = "target-stylesheet" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "wrapper">
+    <complexType mixed = "true">
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:marker_List"/>
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "marker">
+    <complexType mixed = "true">
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:block_List"/>
+      </choice>
+      <attribute name = "marker-class-name" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "retrieve-marker">
+    <complexType>
+      <attribute name = "retrieve-class-name" type = "xs:string"/>
+      <attribute name = "retrieve-position" type = "fo:retrieve_position_Type"/>
+      <attribute name = "retrieve-boundary" type = "fo:retrieve_boundary_Type"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "multi-switch">
+    <complexType>
+      <annotation>
+        <documentation>
+          Inheritable <attribute name = "auto-restore" type = "fo:auto_restore_Type"/>
+        </documentation>
+      </annotation>
+      <sequence>
+        <element ref = "fo:multi-case"/>
+      </sequence>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "multi-case">
+    <complexType mixed = "true">
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "starting-state" type = "fo:starting_state_Type"/>
+      <attribute name = "case-name" type = "xs:string"/>
+      <attribute name = "case-title" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "multi-toggle">
+    <complexType mixed = "true">
+      <choice minOccurs = "0" maxOccurs = "unbounded">
+        <group ref = "fo:inline_List"/>
+        <group ref = "fo:block_List"/>
+        <group ref = "fo:neutral_List"/>
+        <group ref = "fo:float_List"/>
+        <group ref = "fo:footnote_List"/>
+      </choice>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "switch-to" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+      <attribute name = "vertical-align" type = "fo:vertical_align_Type"/>
+    </complexType>
+  </element>
+  <element name = "multi-properties">
+    <complexType>
+      <sequence>
+        <element ref = "fo:multi-property-set" maxOccurs = "unbounded"/>
+        <element ref = "fo:wrapper"/>
+      </sequence>
+      <attributeGroup ref = "fo:Accessibility_Properties_List"/>
+      <attribute name = "id" type = "xs:string"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+  <element name = "multi-property-set">
+    <complexType>
+      <attribute name = "id" type = "xs:string"/>
+      <attribute name = "active-state" type = "fo:active_state_Type" use = "required"/>
+      <attributeGroup ref = "fo:inheritable_properties_List"/>
+    </complexType>
+  </element>
+</schema>
diff --git a/xml/tests/testData/xml/hibernate-configuration-3.0.dtd b/xml/tests/testData/xml/hibernate-configuration-3.0.dtd
new file mode 100644
index 000000000000..a22cd7b50e42
--- /dev/null
+++ b/xml/tests/testData/xml/hibernate-configuration-3.0.dtd
@@ -0,0 +1,52 @@
+<!-- Hibernate file-based configuration document.
+
+<!DOCTYPE hibernate-configuration PUBLIC
+	"-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+	"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+
+An instance of this document contains property settings and references
+to mapping files for a number of SessionFactory instances to be listed
+in JNDI.
+
+-->
+
+<!ELEMENT hibernate-configuration (session-factory,security?)>
+
+<!ELEMENT property (#PCDATA)>
+<!ATTLIST property name CDATA #REQUIRED>
+
+<!ELEMENT mapping EMPTY> <!-- reference to a mapping file -->
+<!ATTLIST mapping resource CDATA #IMPLIED>
+<!ATTLIST mapping file CDATA #IMPLIED>
+<!ATTLIST mapping jar CDATA #IMPLIED>
+<!ATTLIST mapping package CDATA #IMPLIED>
+<!ATTLIST mapping class CDATA #IMPLIED>
+
+<!ELEMENT class-cache EMPTY>
+<!ATTLIST class-cache class CDATA #REQUIRED>
+<!ATTLIST class-cache region CDATA #IMPLIED>
+<!ATTLIST class-cache usage (read-only|read-write|nonstrict-read-write|transactional) #REQUIRED>
+<!ATTLIST class-cache include (all|non-lazy) "all">
+
+<!ELEMENT collection-cache EMPTY>
+<!ATTLIST collection-cache collection CDATA #REQUIRED>
+<!ATTLIST collection-cache region CDATA #IMPLIED>
+<!ATTLIST collection-cache usage (read-only|read-write|nonstrict-read-write|transactional) #REQUIRED>
+
+<!ELEMENT event (listener*)>
+<!ATTLIST event type (auto-flush|merge|create|create-onflush|delete|dirty-check|evict|flush|flush-entity|load|load-collection|lock|refresh|replicate|save-update|save|update|pre-load|pre-update|pre-insert|pre-delete|post-load|post-update|post-insert|post-delete|post-commit-update|post-commit-insert|post-commit-delete) #REQUIRED>
+
+<!ELEMENT listener EMPTY>
+<!ATTLIST listener type (auto-flush|merge|create|create-onflush|delete|dirty-check|evict|flush|flush-entity|load|load-collection|lock|refresh|replicate|save-update|save|update|pre-load|pre-update|pre-insert|pre-delete|post-load|post-update|post-insert|post-delete|post-commit-update|post-commit-insert|post-commit-delete) #IMPLIED>
+<!ATTLIST listener class CDATA #REQUIRED>
+
+<!ELEMENT session-factory (property*, mapping*, (class-cache|collection-cache)*, event*, listener*)>
+<!ATTLIST session-factory name CDATA #IMPLIED> <!-- the JNDI name -->
+
+<!ELEMENT security (grant*)>
+<!ATTLIST security context CDATA #REQUIRED> <!--the JACC contextID-->
+
+<!ELEMENT grant EMPTY>
+<!ATTLIST grant role CDATA #REQUIRED>
+<!ATTLIST grant entity-name CDATA #REQUIRED>
+<!ATTLIST grant actions CDATA #REQUIRED>
diff --git a/xml/tests/testData/xml/hibernate-mapping-3.0.dtd b/xml/tests/testData/xml/hibernate-mapping-3.0.dtd
new file mode 100644
index 000000000000..de7bf3d1ff1d
--- /dev/null
+++ b/xml/tests/testData/xml/hibernate-mapping-3.0.dtd
@@ -0,0 +1,1036 @@
+<!-- Hibernate Mapping DTD.
+
+<!DOCTYPE hibernate-mapping PUBLIC 
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+
+An instance of this XML document may contain mappings for an arbitrary 
+number of classes. The class mappings may contain associations to classes
+mapped in the same document or in another document. No class may be 
+mapped more than once. Each document may also contain definitions of an
+arbitrary number of queries, and import declarations of arbitrary classes. 
+
+-->
+
+<!--
+	The document root.
+ -->
+
+<!ELEMENT hibernate-mapping (
+	meta*, 
+	typedef*, 
+	import*, 
+	(class|subclass|joined-subclass|union-subclass)*,
+    resultset*,
+	(query|sql-query)*,
+	filter-def*,
+    database-object*
+)>
+	<!ATTLIST hibernate-mapping schema CDATA #IMPLIED>									<!-- default: none -->
+	<!ATTLIST hibernate-mapping catalog CDATA #IMPLIED>									<!-- default: none -->
+	<!ATTLIST hibernate-mapping default-cascade CDATA "none">
+	<!ATTLIST hibernate-mapping default-access CDATA "property">
+	<!ATTLIST hibernate-mapping default-lazy (true|false) "true">
+	<!ATTLIST hibernate-mapping auto-import (true|false) "true">
+	<!ATTLIST hibernate-mapping package CDATA #IMPLIED>									<!-- default: none -->
+
+<!--
+	META element definition; used to assign meta-level attributes to a class
+	or property.  Is currently used by codegenerator as a placeholder for
+	values that is not directly related to OR mappings.
+-->
+<!ELEMENT meta (#PCDATA)>
+	<!ATTLIST meta attribute CDATA #REQUIRED>
+	<!ATTLIST meta inherit (true|false) "true">
+
+<!--
+	TYPEDEF element definition; defines a new name for a Hibernate type. May
+	contain parameters for parameterizable types.
+-->
+<!ELEMENT typedef (param*)>
+	<!ATTLIST typedef class CDATA #REQUIRED>
+	<!ATTLIST typedef name CDATA #REQUIRED>
+
+<!--
+	IMPORT element definition; an explicit query language "import"
+-->
+<!ELEMENT import EMPTY>
+	<!ATTLIST import class CDATA #REQUIRED>
+	<!ATTLIST import rename CDATA #IMPLIED>	<!-- default: unqualified class name -->
+
+<!--
+	Root entity mapping.  Poorly named as entities do not have to be represented by 
+	classes at all.  Mapped entities may be represented via different methodologies 
+	(POJO, Map, Dom4j).
+-->
+<!ELEMENT class (
+ 	meta*,
+	subselect?,
+	cache?,
+	synchronize*,
+	comment?,
+    tuplizer*,
+	(id|composite-id),
+	discriminator?,
+	natural-id?,
+	(version|timestamp)?,
+	(property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*,
+	((join*,subclass*)|joined-subclass*|union-subclass*),
+	loader?,sql-insert?,sql-update?,sql-delete?,
+	filter*,
+    resultset*,
+	(query|sql-query)*
+)>
+	<!ATTLIST class entity-name CDATA #IMPLIED>
+	<!ATTLIST class name CDATA #IMPLIED>                            <!-- this is the class name -->
+	<!ATTLIST class proxy CDATA #IMPLIED>							<!-- default: no proxy interface -->
+	<!ATTLIST class lazy (true|false) #IMPLIED>
+	<!ATTLIST class table CDATA #IMPLIED>							<!-- default: unqualified classname -->
+	<!ATTLIST class schema CDATA #IMPLIED>							<!-- default: none -->
+	<!ATTLIST class catalog CDATA #IMPLIED>							<!-- default: none -->
+	<!ATTLIST class subselect CDATA #IMPLIED>
+	<!ATTLIST class discriminator-value CDATA #IMPLIED>				<!-- default: unqualified class name | none -->
+	<!ATTLIST class mutable (true|false) "true">
+	<!ATTLIST class abstract (true|false) #IMPLIED>
+	<!ATTLIST class polymorphism (implicit|explicit) "implicit">
+	<!ATTLIST class where CDATA #IMPLIED>							<!-- default: none -->
+	<!ATTLIST class persister CDATA #IMPLIED>
+	<!ATTLIST class dynamic-update (true|false) "false">
+	<!ATTLIST class dynamic-insert (true|false) "false">
+	<!ATTLIST class batch-size CDATA #IMPLIED>
+	<!ATTLIST class select-before-update (true|false) "false">
+	<!ATTLIST class optimistic-lock (none|version|dirty|all) "version">
+	<!ATTLIST class check CDATA #IMPLIED>							<!-- default: none -->
+	<!ATTLIST class rowid CDATA #IMPLIED>
+	<!ATTLIST class node CDATA #IMPLIED>
+
+<!--
+    TUPLIZER element; defines tuplizer to use for a component/entity for a given entity-mode
+-->
+<!ELEMENT tuplizer EMPTY>
+    <!ATTLIST tuplizer entity-mode (pojo|dom4j|dynamic-map) #IMPLIED>   <!-- entity mode for which tuplizer is in effect -->
+    <!ATTLIST tuplizer class CDATA #REQUIRED>                           <!-- the tuplizer class to use -->
+
+<!--
+	FILTER-DEF element; top-level filter definition.
+-->
+<!ELEMENT filter-def (#PCDATA|filter-param)*>
+	<!ATTLIST filter-def name CDATA #REQUIRED> <!-- The filter name -->
+	<!ATTLIST filter-def condition CDATA #IMPLIED>
+
+<!--
+	FILTER-PARAM element; qualifies parameters found within a FILTER-DEF
+	condition.
+-->
+<!ELEMENT filter-param EMPTY>
+	<!ATTLIST filter-param name CDATA #REQUIRED> <!-- The parameter name -->
+	<!ATTLIST filter-param type CDATA #REQUIRED> <!-- The parameter type -->
+
+<!--
+	FILTER element; used to apply a filter.
+-->
+<!ELEMENT filter (#PCDATA)>
+	<!ATTLIST filter name CDATA #REQUIRED>
+	<!ATTLIST filter condition CDATA #IMPLIED>
+
+
+<!-- A join allows some properties of a class to be persisted to a second table -->
+
+<!ELEMENT join ( 
+	subselect?,
+	comment?,
+	key,
+	(property|many-to-one|component|dynamic-component|any)*,
+	sql-insert?,sql-update?,sql-delete?
+)>
+	<!ATTLIST join table CDATA #REQUIRED>
+	<!ATTLIST join schema CDATA #IMPLIED>						<!-- default: none -->
+	<!ATTLIST join catalog CDATA #IMPLIED>						<!-- default: none -->
+	<!ATTLIST join subselect CDATA #IMPLIED>
+	<!ATTLIST join fetch (join|select) "join">
+	<!ATTLIST join inverse (true|false) "false">
+	<!ATTLIST join optional (true|false) "false">
+
+<!-- A natural-id element allows declaration of the unique business key -->
+
+<!ELEMENT natural-id ( (property|many-to-one|component|dynamic-component|any)* )>
+	<!ATTLIST natural-id mutable (true|false) "false">
+
+<!-- Declares the id type, column and generation algorithm for an entity class.
+If a name attribut is given, the id is exposed to the application through the 
+named property of the class. If not, the id is only exposed to the application 
+via Session.getIdentifier() -->
+
+<!ELEMENT id (meta*,column*,type?,generator?)>
+	<!ATTLIST id name CDATA #IMPLIED>
+	<!ATTLIST id node CDATA #IMPLIED>
+	<!ATTLIST id access CDATA #IMPLIED>
+	<!ATTLIST id column CDATA #IMPLIED>
+	<!ATTLIST id type CDATA #IMPLIED>
+	<!ATTLIST id length CDATA #IMPLIED>
+	<!ATTLIST id unsaved-value CDATA #IMPLIED>					<!-- any|none|null|undefined|0|-1|... -->
+
+<!-- A composite key may be modelled by a java class with a property for each 
+key column. The class must implement java.io.Serializable and reimplement equals() 
+and hashCode(). -->
+
+<!ELEMENT composite-id ( meta*, (key-property|key-many-to-one)+ )>
+	<!ATTLIST composite-id class CDATA #IMPLIED>
+	<!ATTLIST composite-id mapped (true|false) "false">
+	<!ATTLIST composite-id name CDATA #IMPLIED>
+	<!ATTLIST composite-id node CDATA #IMPLIED>
+	<!ATTLIST composite-id access CDATA #IMPLIED>
+	<!ATTLIST composite-id unsaved-value (undefined|any|none) "undefined"> 
+
+<!-- Polymorphic data requires a column holding a class discriminator value. This
+value is not directly exposed to the application. -->
+
+<!ELEMENT discriminator ((column|formula)?)>
+	<!ATTLIST discriminator column CDATA #IMPLIED>				<!-- default: "class"|none -->
+	<!ATTLIST discriminator formula CDATA #IMPLIED>
+	<!ATTLIST discriminator type CDATA "string">
+	<!ATTLIST discriminator not-null (true|false) "true">
+	<!ATTLIST discriminator length CDATA #IMPLIED>
+	<!ATTLIST discriminator force (true|false) "false">
+	<!ATTLIST discriminator insert (true|false) "true">
+	
+<!-- Versioned data requires a column holding a version number. This is exposed to the
+application through a property of the Java class. -->
+
+<!ELEMENT version (meta*,column*)>
+	<!ATTLIST version name CDATA #REQUIRED>
+	<!ATTLIST version node CDATA #IMPLIED>
+	<!ATTLIST version access CDATA #IMPLIED>
+	<!ATTLIST version column CDATA #IMPLIED>
+	<!ATTLIST version type CDATA "integer">
+	<!ATTLIST version unsaved-value (null|negative|undefined) "undefined">
+    <!ATTLIST version generated (never|always) "never">
+    <!ATTLIST version insert (true|false) #IMPLIED>
+
+<!ELEMENT timestamp (meta*)>
+	<!ATTLIST timestamp name CDATA #REQUIRED>
+	<!ATTLIST timestamp node CDATA #IMPLIED>
+	<!ATTLIST timestamp column CDATA #IMPLIED>
+	<!ATTLIST timestamp access CDATA #IMPLIED>
+	<!ATTLIST timestamp unsaved-value (null|undefined) "null">
+    <!ATTLIST timestamp source (vm|db) "vm">
+    <!ATTLIST timestamp generated (never|always) "never">
+
+
+<!--
+	Subclass declarations are nested beneath the root class declaration to achieve
+	polymorphic persistence with the table-per-hierarchy mapping strategy.
+
+	See the note on the class element regarding <pojo/> vs. @name usage...
+-->
+<!ELEMENT subclass (
+ 	meta*,
+    tuplizer*,
+	synchronize*,
+	(property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|idbag|array|primitive-array)*,
+	join*, 
+	subclass*,
+	loader?,sql-insert?,sql-update?,sql-delete?,
+    resultset*,
+	(query|sql-query)*
+)>
+	<!ATTLIST subclass entity-name CDATA #IMPLIED>
+	<!ATTLIST subclass name CDATA #IMPLIED>
+	<!ATTLIST subclass proxy CDATA #IMPLIED>							<!-- default: no proxy interface -->
+	<!ATTLIST subclass discriminator-value CDATA #IMPLIED>				<!-- default: unqualified class name | none -->
+	<!ATTLIST subclass dynamic-update (true|false) "false">
+	<!ATTLIST subclass dynamic-insert (true|false) "false">
+	<!ATTLIST subclass select-before-update (true|false) "false">
+	<!ATTLIST subclass extends CDATA #IMPLIED>							<!-- default: empty when a toplevel, otherwise the nearest class definition -->
+	<!ATTLIST subclass lazy (true|false) #IMPLIED>
+	<!ATTLIST subclass abstract (true|false) #IMPLIED>
+	<!ATTLIST subclass persister CDATA #IMPLIED>
+	<!ATTLIST subclass batch-size CDATA #IMPLIED>
+	<!ATTLIST subclass node CDATA #IMPLIED>
+
+<!--
+	Joined subclasses are used for the normalized table-per-subclass mapping strategy
+
+	See the note on the class element regarding <pojo/> vs. @name usage...
+-->
+<!ELEMENT joined-subclass (
+	meta*,
+	subselect?,
+	synchronize*,
+	comment?,
+    tuplizer*,
+	key,
+	(property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*, 
+	joined-subclass*,
+	loader?,sql-insert?,sql-update?,sql-delete?,
+    resultset*,
+	(query|sql-query)*
+)>
+	<!ATTLIST joined-subclass entity-name CDATA #IMPLIED>
+	<!ATTLIST joined-subclass name CDATA #IMPLIED>
+	<!ATTLIST joined-subclass proxy CDATA #IMPLIED>				 		<!-- default: no proxy interface -->
+	<!ATTLIST joined-subclass table CDATA #IMPLIED>				 		<!-- default: unqualified class name -->
+	<!ATTLIST joined-subclass schema CDATA #IMPLIED>
+	<!ATTLIST joined-subclass catalog CDATA #IMPLIED>
+	<!ATTLIST joined-subclass subselect CDATA #IMPLIED>
+	<!ATTLIST joined-subclass dynamic-update (true|false) "false">
+	<!ATTLIST joined-subclass dynamic-insert (true|false) "false">
+	<!ATTLIST joined-subclass select-before-update (true|false) "false">
+	<!ATTLIST joined-subclass extends CDATA #IMPLIED>			 		<!-- default: none when toplevel, otherwise the nearest class definition -->
+	<!ATTLIST joined-subclass lazy (true|false) #IMPLIED>
+	<!ATTLIST joined-subclass abstract (true|false) #IMPLIED>
+	<!ATTLIST joined-subclass persister CDATA #IMPLIED>
+	<!ATTLIST joined-subclass check CDATA #IMPLIED>				 		<!-- default: none -->
+	<!ATTLIST joined-subclass batch-size CDATA #IMPLIED>
+	<!ATTLIST joined-subclass node CDATA #IMPLIED>
+
+<!--
+	Union subclasses are used for the table-per-concrete-class mapping strategy
+
+	See the note on the class element regarding <pojo/> vs. @name usage...
+-->
+<!ELEMENT union-subclass (
+ 	meta*,
+	subselect?,
+	synchronize*,
+	comment?,
+    tuplizer*,
+	(property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*,
+	union-subclass*,
+	loader?,sql-insert?,sql-update?,sql-delete?,
+    resultset*,
+	(query|sql-query)*
+)>
+	<!ATTLIST union-subclass entity-name CDATA #IMPLIED>
+	<!ATTLIST union-subclass name CDATA #IMPLIED>
+	<!ATTLIST union-subclass proxy CDATA #IMPLIED>						<!-- default: no proxy interface -->
+	<!ATTLIST union-subclass table CDATA #IMPLIED>						<!-- default: unqualified class name -->
+	<!ATTLIST union-subclass schema CDATA #IMPLIED>
+	<!ATTLIST union-subclass catalog CDATA #IMPLIED>
+	<!ATTLIST union-subclass subselect CDATA #IMPLIED>
+	<!ATTLIST union-subclass dynamic-update (true|false) "false">
+	<!ATTLIST union-subclass dynamic-insert (true|false) "false">
+	<!ATTLIST union-subclass select-before-update (true|false) "false">
+	<!ATTLIST union-subclass extends CDATA #IMPLIED>					<!-- default: none when toplevel, otherwise the nearest class definition -->
+	<!ATTLIST union-subclass lazy (true|false) #IMPLIED>
+	<!ATTLIST union-subclass abstract (true|false) #IMPLIED>
+	<!ATTLIST union-subclass persister CDATA #IMPLIED>
+	<!ATTLIST union-subclass check CDATA #IMPLIED>						<!-- default: none -->
+	<!ATTLIST union-subclass batch-size CDATA #IMPLIED>
+	<!ATTLIST union-subclass node CDATA #IMPLIED>
+
+<!-- Property of an entity class or component, component-element, composite-id, etc. 
+JavaBeans style properties are mapped to table columns. -->
+
+<!ELEMENT property (meta*,(column|formula)*,type?)>
+	<!ATTLIST property name CDATA #REQUIRED>
+	<!ATTLIST property node CDATA #IMPLIED>
+	<!ATTLIST property access CDATA #IMPLIED>
+	<!ATTLIST property type CDATA #IMPLIED>
+	<!ATTLIST property column CDATA #IMPLIED>
+	<!ATTLIST property length CDATA #IMPLIED>
+	<!ATTLIST property precision CDATA #IMPLIED>
+	<!ATTLIST property scale CDATA #IMPLIED>
+	<!ATTLIST property not-null (true|false) #IMPLIED>
+	<!ATTLIST property unique (true|false) "false">
+	<!ATTLIST property unique-key CDATA #IMPLIED>
+	<!ATTLIST property index CDATA #IMPLIED>				<!-- include the columns spanned by this property in an index -->
+	<!ATTLIST property update (true|false) #IMPLIED>
+	<!ATTLIST property insert (true|false) #IMPLIED>
+	<!ATTLIST property optimistic-lock (true|false) "true">	<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST property formula CDATA #IMPLIED>
+	<!ATTLIST property lazy (true|false) "false">
+    <!ATTLIST property generated (never|insert|always) "never">
+
+<!-- Declares the type of the containing property (overrides an eventually existing type
+attribute of the property). May contain param elements to customize a ParametrizableType. -->
+<!ELEMENT type (param*)>
+	<!ATTLIST type name CDATA #REQUIRED>
+	
+<!-- Declares an association between two entities (Or from a component, component element,
+etc. to an entity). -->
+
+<!ELEMENT many-to-one (meta*,(column|formula)*)>
+	<!ATTLIST many-to-one name CDATA #REQUIRED>
+	<!ATTLIST many-to-one access CDATA #IMPLIED>
+	<!ATTLIST many-to-one class CDATA #IMPLIED>
+	<!ATTLIST many-to-one entity-name CDATA #IMPLIED>
+	<!ATTLIST many-to-one column CDATA #IMPLIED>
+	<!ATTLIST many-to-one not-null (true|false) #IMPLIED>
+	<!ATTLIST many-to-one unique (true|false) "false">
+	<!ATTLIST many-to-one unique-key CDATA #IMPLIED>
+	<!ATTLIST many-to-one index CDATA #IMPLIED>
+	<!ATTLIST many-to-one cascade CDATA #IMPLIED>
+	<!ATTLIST many-to-one outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST many-to-one fetch (join|select) #IMPLIED>
+	<!ATTLIST many-to-one update (true|false) "true">
+	<!ATTLIST many-to-one insert (true|false) "true">
+	<!ATTLIST many-to-one optimistic-lock (true|false) "true">	<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST many-to-one foreign-key CDATA #IMPLIED>
+	<!ATTLIST many-to-one property-ref CDATA #IMPLIED>
+	<!ATTLIST many-to-one formula CDATA #IMPLIED>
+	<!ATTLIST many-to-one lazy (false|proxy|no-proxy) #IMPLIED>
+	<!ATTLIST many-to-one not-found (exception|ignore) "exception">
+	<!ATTLIST many-to-one node CDATA #IMPLIED>
+	<!ATTLIST many-to-one embed-xml (true|false) "true">
+	
+<!-- Declares a one-to-one association between two entities (Or from a component, 
+component element, etc. to an entity). -->
+
+<!ELEMENT one-to-one (meta*,formula*)>
+	<!ATTLIST one-to-one name CDATA #REQUIRED>
+	<!ATTLIST one-to-one formula CDATA #IMPLIED>
+	<!ATTLIST one-to-one access CDATA #IMPLIED>
+	<!ATTLIST one-to-one class CDATA #IMPLIED>
+	<!ATTLIST one-to-one entity-name CDATA #IMPLIED>
+	<!ATTLIST one-to-one cascade CDATA #IMPLIED>
+	<!ATTLIST one-to-one outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST one-to-one fetch (join|select) #IMPLIED>
+	<!ATTLIST one-to-one constrained (true|false) "false">
+	<!ATTLIST one-to-one foreign-key CDATA #IMPLIED>
+	<!ATTLIST one-to-one property-ref CDATA #IMPLIED>
+	<!ATTLIST one-to-one lazy (false|proxy|no-proxy) #IMPLIED>
+	<!ATTLIST one-to-one node CDATA #IMPLIED>
+	<!ATTLIST one-to-one embed-xml (true|false) "true">
+	
+<!-- A property embedded in a composite identifier or map index (always not-null). -->
+
+<!ELEMENT key-property (meta*,column*,type?)>
+	<!ATTLIST key-property name CDATA #REQUIRED>
+	<!ATTLIST key-property access CDATA #IMPLIED>
+	<!ATTLIST key-property type CDATA #IMPLIED>
+	<!ATTLIST key-property column CDATA #IMPLIED>
+	<!ATTLIST key-property length CDATA #IMPLIED>
+	<!ATTLIST key-property node CDATA #IMPLIED>
+
+<!-- A many-to-one association embedded in a composite identifier or map index 
+(always not-null, never cascade). -->
+
+<!ELEMENT key-many-to-one (meta*,column*)>
+	<!ATTLIST key-many-to-one name CDATA #REQUIRED>
+	<!ATTLIST key-many-to-one access CDATA #IMPLIED>
+	<!ATTLIST key-many-to-one class CDATA #IMPLIED>
+	<!ATTLIST key-many-to-one entity-name CDATA #IMPLIED>
+	<!ATTLIST key-many-to-one column CDATA #IMPLIED>
+	<!ATTLIST key-many-to-one foreign-key CDATA #IMPLIED>
+	<!ATTLIST key-many-to-one lazy (false|proxy) #IMPLIED>
+
+<!-- An "any" association is a polymorphic association to any table with
+the given identifier type. The first listed column is a VARCHAR column 
+holding the name of the class (for that row). -->
+
+<!ELEMENT any (meta*,meta-value*,column,column+)>
+	<!ATTLIST any id-type CDATA #REQUIRED>
+	<!ATTLIST any meta-type CDATA #IMPLIED>			 	<!--- default: Hibernate.STRING -->
+	<!ATTLIST any name CDATA #REQUIRED>
+	<!ATTLIST any access CDATA #IMPLIED>
+	<!ATTLIST any insert (true|false) "true">
+	<!ATTLIST any update (true|false) "true">
+	<!ATTLIST any cascade CDATA #IMPLIED>
+	<!ATTLIST any index CDATA #IMPLIED>					<!-- include the columns spanned by this association in an index -->
+	<!ATTLIST any optimistic-lock (true|false) "true">	<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST any lazy (true|false) "false">
+	<!ATTLIST any node CDATA #IMPLIED>
+	
+<!ELEMENT meta-value EMPTY>
+	<!ATTLIST meta-value value CDATA #REQUIRED>
+	<!ATTLIST meta-value class CDATA #REQUIRED>
+
+<!-- A component is a user-defined class, persisted along with its containing entity
+to the table of the entity class. JavaBeans style properties of the component are
+mapped to columns of the table of the containing entity. A null component reference
+is mapped to null values in all columns and vice versa. Components do not support
+shared reference semantics. -->
+
+<!ELEMENT component (
+	meta*,
+    tuplizer*,
+	parent?,
+	(property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|array|primitive-array)*
+)>
+	<!ATTLIST component class CDATA #IMPLIED>
+	<!ATTLIST component name CDATA #REQUIRED>
+	<!ATTLIST component access CDATA #IMPLIED>
+	<!ATTLIST component unique (true|false) "false">
+	<!ATTLIST component update (true|false) "true">
+	<!ATTLIST component insert (true|false) "true">
+	<!ATTLIST component lazy (true|false) "false">
+	<!ATTLIST component optimistic-lock (true|false) "true">
+	<!ATTLIST component node CDATA #IMPLIED>
+	
+<!-- A dynamic-component maps columns of the database entity to a java.util.Map 
+at the Java level -->
+
+<!ELEMENT dynamic-component (
+	(property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|array|primitive-array)*
+)>
+	<!ATTLIST dynamic-component name CDATA #REQUIRED>
+	<!ATTLIST dynamic-component access CDATA #IMPLIED>
+	<!ATTLIST dynamic-component unique (true|false) "false">
+	<!ATTLIST dynamic-component update (true|false) "true">
+	<!ATTLIST dynamic-component insert (true|false) "true">
+	<!ATTLIST dynamic-component optimistic-lock (true|false) "true">
+	<!ATTLIST dynamic-component node CDATA #IMPLIED>
+
+<!-- properties declares that the contained properties form an alternate key. The name
+attribute allows an alternate key to be used as the target of a property-ref. -->
+
+<!ELEMENT properties (
+	(property|many-to-one|component|dynamic-component)*
+)>
+	<!ATTLIST properties name CDATA #REQUIRED>
+	<!ATTLIST properties unique (true|false) "false">
+	<!ATTLIST properties insert (true|false) "true">
+	<!ATTLIST properties update (true|false) "true">
+	<!ATTLIST properties optimistic-lock (true|false) "true">
+	<!ATTLIST properties node CDATA #IMPLIED>
+	
+<!-- The parent element maps a property of the component class as a pointer back to
+the owning entity. -->
+
+<!ELEMENT parent EMPTY>
+	<!ATTLIST parent name CDATA #REQUIRED>
+
+<!-- Collection declarations nested inside a class declaration indicate a foreign key 
+relationship from the collection table to the enclosing class. -->
+
+<!ELEMENT map (
+	meta*,
+	subselect?,
+	cache?,
+	synchronize*,
+	comment?,
+	key, 
+	(map-key|composite-map-key|map-key-many-to-many|index|composite-index|index-many-to-many|index-many-to-any), 
+	(element|one-to-many|many-to-many|composite-element|many-to-any),
+	loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?,
+	filter*
+)>
+	<!ATTLIST map name CDATA #REQUIRED>
+	<!ATTLIST map access CDATA #IMPLIED>
+	<!ATTLIST map table CDATA #IMPLIED>																<!-- default: name -->
+	<!ATTLIST map schema CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST map subselect CDATA #IMPLIED>
+	<!ATTLIST map catalog CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST map lazy (true|false|extra) #IMPLIED>
+	<!ATTLIST map mutable (true|false) "true">
+	<!ATTLIST map inverse (true|false) "false">
+	<!ATTLIST map sort CDATA "unsorted">														 	<!-- unsorted|natural|"comparator class", default: unsorted -->
+	<!ATTLIST map cascade CDATA #IMPLIED>
+	<!ATTLIST map order-by CDATA #IMPLIED>													 		<!-- default: none -->
+	<!ATTLIST map where CDATA #IMPLIED>																<!-- default: none -->
+	<!ATTLIST map batch-size CDATA #IMPLIED>
+	<!ATTLIST map outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST map fetch (join|select|subselect) #IMPLIED>
+	<!ATTLIST map check CDATA #IMPLIED>																<!-- default: none -->	
+	<!ATTLIST map persister CDATA #IMPLIED>														
+	<!ATTLIST map collection-type CDATA #IMPLIED>	
+	<!ATTLIST map optimistic-lock (true|false) "true">		<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST map node CDATA #IMPLIED>
+	<!ATTLIST map embed-xml (true|false) "true">
+	
+<!ELEMENT set (
+	meta*,
+	subselect?,
+	cache?,
+	synchronize*,
+	comment?,
+	key, 
+	(element|one-to-many|many-to-many|composite-element|many-to-any),
+	loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?,
+	filter*
+)>
+	<!ATTLIST set name CDATA #REQUIRED>
+	<!ATTLIST set access CDATA #IMPLIED>
+	<!ATTLIST set table CDATA #IMPLIED>																<!-- default: name -->
+	<!ATTLIST set schema CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST set catalog CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST set subselect CDATA #IMPLIED>
+	<!ATTLIST set lazy (true|false|extra) #IMPLIED>
+	<!ATTLIST set sort CDATA "unsorted">														 	<!-- unsorted|natural|"comparator class" -->
+	<!ATTLIST set inverse (true|false) "false">
+	<!ATTLIST set mutable (true|false) "true">
+	<!ATTLIST set cascade CDATA #IMPLIED>
+	<!ATTLIST set order-by CDATA #IMPLIED>													 		<!-- default: none -->
+	<!ATTLIST set where CDATA #IMPLIED>																<!-- default: none -->
+	<!ATTLIST set batch-size CDATA #IMPLIED>
+	<!ATTLIST set outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST set fetch (join|select|subselect) #IMPLIED>
+	<!ATTLIST set persister CDATA #IMPLIED>	
+	<!ATTLIST set collection-type CDATA #IMPLIED>														
+	<!ATTLIST set check CDATA #IMPLIED>																<!-- default: none -->
+	<!ATTLIST set optimistic-lock (true|false) "true">		<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST set node CDATA #IMPLIED>
+	<!ATTLIST set embed-xml (true|false) "true">
+
+<!ELEMENT bag (
+	meta*,
+	subselect?,
+	cache?,
+	synchronize*,
+	comment?,
+	key, 
+	(element|one-to-many|many-to-many|composite-element|many-to-any),
+	loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?,
+	filter*
+)>
+	<!ATTLIST bag name CDATA #REQUIRED>
+	<!ATTLIST bag access CDATA #IMPLIED>
+	<!ATTLIST bag table CDATA #IMPLIED>																<!-- default: name -->
+	<!ATTLIST bag schema CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST bag catalog CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST bag subselect CDATA #IMPLIED>
+	<!ATTLIST bag lazy (true|false|extra) #IMPLIED>
+	<!ATTLIST bag inverse (true|false) "false">
+	<!ATTLIST bag mutable (true|false) "true">
+	<!ATTLIST bag cascade CDATA #IMPLIED>
+	<!ATTLIST bag order-by CDATA #IMPLIED>													 		<!-- default: none -->
+	<!ATTLIST bag where CDATA #IMPLIED>																<!-- default: none -->
+	<!ATTLIST bag batch-size CDATA #IMPLIED>
+	<!ATTLIST bag outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST bag fetch (join|select|subselect) #IMPLIED>
+	<!ATTLIST bag persister CDATA #IMPLIED>															
+	<!ATTLIST bag collection-type CDATA #IMPLIED>	
+	<!ATTLIST bag check CDATA #IMPLIED>																<!-- default: none -->
+	<!ATTLIST bag optimistic-lock (true|false) "true">		<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST bag node CDATA #IMPLIED>
+	<!ATTLIST bag embed-xml (true|false) "true">
+
+<!ELEMENT idbag (
+	meta*,
+	subselect?,
+	cache?,
+	synchronize*,
+	comment?,
+	collection-id,
+	key, 
+	(element|many-to-many|composite-element|many-to-any),
+	loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?,
+	filter*
+)>
+	<!ATTLIST idbag name CDATA #REQUIRED>
+	<!ATTLIST idbag access CDATA #IMPLIED>
+	<!ATTLIST idbag table CDATA #IMPLIED>															<!-- default: name -->
+	<!ATTLIST idbag schema CDATA #IMPLIED>														 	<!-- default: none -->
+	<!ATTLIST idbag catalog CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST idbag subselect CDATA #IMPLIED>
+	<!ATTLIST idbag lazy (true|false|extra) #IMPLIED>
+	<!ATTLIST idbag mutable (true|false) "true">
+	<!ATTLIST idbag cascade CDATA #IMPLIED>
+	<!ATTLIST idbag order-by CDATA #IMPLIED>													 	<!-- default: none -->
+	<!ATTLIST idbag where CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST idbag batch-size CDATA #IMPLIED>
+	<!ATTLIST idbag outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST idbag fetch (join|select|subselect) #IMPLIED>
+	<!ATTLIST idbag persister CDATA #IMPLIED>															
+	<!ATTLIST idbag collection-type CDATA #IMPLIED>
+	<!ATTLIST idbag check CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST idbag optimistic-lock (true|false) "true">	<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST idbag node CDATA #IMPLIED>
+	<!ATTLIST idbag embed-xml (true|false) "true">
+
+<!ELEMENT list (
+	meta*,
+	subselect?,
+	cache?,
+	synchronize*,
+	comment?,
+	key, 
+	(index|list-index), 
+	(element|one-to-many|many-to-many|composite-element|many-to-any),
+	loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?,
+	filter*
+)>
+	<!ATTLIST list name CDATA #REQUIRED>
+	<!ATTLIST list access CDATA #IMPLIED>
+	<!ATTLIST list table CDATA #IMPLIED>														 	<!-- default: name -->
+	<!ATTLIST list schema CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST list catalog CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST list subselect CDATA #IMPLIED>
+	<!ATTLIST list lazy (true|false|extra) #IMPLIED>
+	<!ATTLIST list inverse (true|false) "false">
+	<!ATTLIST list mutable (true|false) "true">
+	<!ATTLIST list cascade CDATA #IMPLIED>
+	<!ATTLIST list where CDATA #IMPLIED>														 	<!-- default: none -->
+	<!ATTLIST list batch-size CDATA #IMPLIED>
+	<!ATTLIST list outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST list fetch (join|select|subselect) #IMPLIED>
+	<!ATTLIST list persister CDATA #IMPLIED>																
+	<!ATTLIST list collection-type CDATA #IMPLIED>
+	<!ATTLIST list check CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST list optimistic-lock (true|false) "true">		<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST list node CDATA #IMPLIED>
+	<!ATTLIST list embed-xml (true|false) "true">
+
+<!ELEMENT array (
+	meta*,
+	subselect?,
+	cache?,
+	synchronize*,
+	comment?,
+	key, 
+	(index|list-index), 
+	(element|one-to-many|many-to-many|composite-element|many-to-any),
+	loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?
+)>
+	<!ATTLIST array name CDATA #REQUIRED>
+	<!ATTLIST array access CDATA #IMPLIED>
+	<!ATTLIST array table CDATA #IMPLIED>															<!-- default: name -->
+	<!ATTLIST array schema CDATA #IMPLIED>													 		<!-- default: none -->
+	<!ATTLIST array catalog CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST array subselect CDATA #IMPLIED>
+	<!ATTLIST array inverse (true|false) "false">
+	<!ATTLIST array mutable (true|false) "true">
+	<!ATTLIST array element-class CDATA #IMPLIED>
+	<!ATTLIST array cascade CDATA #IMPLIED>
+	<!ATTLIST array where CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST array batch-size CDATA #IMPLIED>
+	<!ATTLIST array outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST array fetch (join|select|subselect) #IMPLIED>
+	<!ATTLIST array persister CDATA #IMPLIED>															
+	<!ATTLIST array collection-type CDATA #IMPLIED>
+	<!ATTLIST array check CDATA #IMPLIED>															<!-- default: none -->
+	<!ATTLIST array optimistic-lock (true|false) "true">	<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST array node CDATA #IMPLIED>
+	<!ATTLIST array embed-xml (true|false) "true">
+
+<!ELEMENT primitive-array (
+	meta*, 
+	subselect?,
+	cache?, 
+	synchronize*,
+	comment?,
+	key, 
+	(index|list-index), 
+	element,
+	loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?
+)>
+	<!ATTLIST primitive-array name CDATA #REQUIRED>
+	<!ATTLIST primitive-array access CDATA #IMPLIED>
+	<!ATTLIST primitive-array table CDATA #IMPLIED>									<!-- default: name -->
+	<!ATTLIST primitive-array schema CDATA #IMPLIED>								<!-- default: none -->
+	<!ATTLIST primitive-array catalog CDATA #IMPLIED>								<!-- default: none -->
+	<!ATTLIST primitive-array subselect CDATA #IMPLIED>
+	<!ATTLIST primitive-array mutable (true|false) "true">
+	<!ATTLIST primitive-array where CDATA #IMPLIED>									<!-- default: none -->
+	<!ATTLIST primitive-array batch-size CDATA #IMPLIED>
+	<!ATTLIST primitive-array outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST primitive-array fetch (join|select|subselect) #IMPLIED>
+	<!ATTLIST primitive-array persister CDATA #IMPLIED>																
+	<!ATTLIST primitive-array collection-type CDATA #IMPLIED>
+	<!ATTLIST primitive-array check CDATA #IMPLIED>									<!-- default: none -->
+	<!ATTLIST primitive-array optimistic-lock (true|false) "true">		<!-- only supported for properties of a class (not component) -->
+	<!ATTLIST primitive-array node CDATA #IMPLIED>
+	<!ATTLIST primitive-array embed-xml (true|false) "true">
+
+<!-- Declares the element type of a collection of basic type -->
+
+<!ELEMENT element ( (column|formula)*, type? )>
+	<!ATTLIST element column CDATA #IMPLIED>
+	<!ATTLIST element node CDATA #IMPLIED>
+	<!ATTLIST element formula CDATA #IMPLIED>
+	<!ATTLIST element type CDATA #IMPLIED>
+	<!ATTLIST element length CDATA #IMPLIED>
+	<!ATTLIST element precision CDATA #IMPLIED>
+	<!ATTLIST element scale CDATA #IMPLIED>
+	<!ATTLIST element not-null (true|false) "false">
+	<!ATTLIST element unique (true|false) "false">
+
+<!-- One to many association. This tag declares the entity-class
+element type of a collection and specifies a one-to-many relational model -->
+
+<!ELEMENT one-to-many EMPTY>
+	<!ATTLIST one-to-many class CDATA #IMPLIED>
+	<!ATTLIST one-to-many not-found (exception|ignore) "exception">
+	<!ATTLIST one-to-many node CDATA #IMPLIED>
+	<!ATTLIST one-to-many embed-xml (true|false) "true">
+	<!ATTLIST one-to-many entity-name CDATA #IMPLIED>
+	<!-- No column declaration attributes required in this case. The primary
+	key column of the associated class is already mapped elsewhere.-->
+
+<!-- Many to many association. This tag declares the entity-class
+element type of a collection and specifies a many-to-many relational model -->
+
+<!ELEMENT many-to-many (meta*,(column|formula)*,filter*)>
+	<!ATTLIST many-to-many class CDATA #IMPLIED>
+	<!ATTLIST many-to-many node CDATA #IMPLIED>
+	<!ATTLIST many-to-many embed-xml (true|false) "true">
+	<!ATTLIST many-to-many entity-name CDATA #IMPLIED>
+	<!ATTLIST many-to-many column CDATA #IMPLIED>
+	<!ATTLIST many-to-many formula CDATA #IMPLIED>
+	<!ATTLIST many-to-many not-found (exception|ignore) "exception">
+	<!ATTLIST many-to-many outer-join (true|false|auto) #IMPLIED>
+	<!ATTLIST many-to-many fetch (join|select) #IMPLIED>
+	<!ATTLIST many-to-many lazy (false|proxy) #IMPLIED>
+	<!ATTLIST many-to-many foreign-key CDATA #IMPLIED>
+	<!ATTLIST many-to-many unique (true|false) "false">
+	<!ATTLIST many-to-many where CDATA #IMPLIED>
+	<!ATTLIST many-to-many order-by CDATA #IMPLIED>
+	<!ATTLIST many-to-many property-ref CDATA #IMPLIED>
+
+<!-- A composite element allows a collection to hold instances of an arbitrary 
+class, without the requirement of joining to an entity table. Composite elements
+have component semantics - no shared references and ad hoc null value semantics. 
+Composite elements may not hold nested collections. -->
+
+<!ELEMENT composite-element ( 
+	(meta*),
+	parent?,
+	(property|many-to-one|any|nested-composite-element)* 
+)>
+	<!ATTLIST composite-element class CDATA #REQUIRED>
+	<!ATTLIST composite-element node CDATA #IMPLIED>
+
+<!ELEMENT nested-composite-element ( 
+	parent?,
+	(property|many-to-one|any|nested-composite-element)* 
+)>
+	<!ATTLIST nested-composite-element class CDATA #REQUIRED>
+	<!ATTLIST nested-composite-element name CDATA #REQUIRED>
+	<!ATTLIST nested-composite-element access CDATA #IMPLIED>
+	<!ATTLIST nested-composite-element node CDATA #IMPLIED>
+	
+<!-- Declares the column name of a foreign key. -->
+
+<!ELEMENT key (column*)>
+	<!ATTLIST key column CDATA #IMPLIED>
+	<!ATTLIST key property-ref CDATA #IMPLIED>
+	<!ATTLIST key foreign-key CDATA #IMPLIED>
+	<!ATTLIST key on-delete (cascade|noaction) "noaction">
+	<!ATTLIST key not-null (true|false) #IMPLIED>
+	<!ATTLIST key update (true|false) #IMPLIED>
+	<!ATTLIST key unique (true|false) #IMPLIED>
+	
+<!-- Declares the type and column mapping for a collection index (array or
+list index, or key of a map). -->
+
+<!ELEMENT list-index (column?)>
+	<!ATTLIST list-index column CDATA #IMPLIED>
+	<!ATTLIST list-index base CDATA "0">
+
+<!ELEMENT map-key ((column|formula)*)>
+	<!ATTLIST map-key column CDATA #IMPLIED>
+	<!ATTLIST map-key formula CDATA #IMPLIED>
+	<!ATTLIST map-key type CDATA #REQUIRED>
+	<!ATTLIST map-key length CDATA #IMPLIED>
+	<!ATTLIST map-key node CDATA #IMPLIED>
+
+<!ELEMENT index (column*)>
+	<!ATTLIST index column CDATA #IMPLIED>
+	<!ATTLIST index type CDATA #IMPLIED>			<!-- required for maps -->
+	<!ATTLIST index length CDATA #IMPLIED>
+
+<!-- Many to many association mapped to the key of a map. ie. a map keyed
+on entities. -->
+
+<!ELEMENT map-key-many-to-many ((column|formula)*)>
+	<!ATTLIST map-key-many-to-many class CDATA #IMPLIED>
+	<!ATTLIST map-key-many-to-many entity-name CDATA #IMPLIED>
+	<!ATTLIST map-key-many-to-many column CDATA #IMPLIED>
+	<!ATTLIST map-key-many-to-many formula CDATA #IMPLIED>
+	<!ATTLIST map-key-many-to-many foreign-key CDATA #IMPLIED>
+
+<!ELEMENT index-many-to-many (column*)>
+	<!ATTLIST index-many-to-many class CDATA #REQUIRED>
+	<!ATTLIST index-many-to-many entity-name CDATA #IMPLIED>
+	<!ATTLIST index-many-to-many column CDATA #IMPLIED>
+	<!ATTLIST index-many-to-many foreign-key CDATA #IMPLIED>
+
+<!-- Composite index of a map ie. a map keyed on components. -->
+
+<!ELEMENT composite-map-key ( (key-property|key-many-to-one)+ )>
+	<!ATTLIST composite-map-key class CDATA #REQUIRED>
+
+<!ELEMENT composite-index ( (key-property|key-many-to-one)+ )>
+	<!ATTLIST composite-index class CDATA #REQUIRED>
+
+<!-- A "many to any" defines a polymorphic association to any table 
+with the given identifier type. The first listed column is a VARCHAR column 
+holding the name of the class (for that row). -->
+
+<!ELEMENT many-to-any (meta-value*,column, column+)>
+	<!ATTLIST many-to-any id-type CDATA #REQUIRED>
+	<!ATTLIST many-to-any meta-type CDATA #IMPLIED>			<!--- default: Hibernate.CLASS -->
+
+<!ELEMENT index-many-to-any (column, column+)>
+	<!ATTLIST index-many-to-any id-type CDATA #REQUIRED>
+	<!ATTLIST index-many-to-any meta-type CDATA #IMPLIED>	<!--- default: Hibernate.CLASS -->
+
+<!ELEMENT collection-id (meta*, column*, generator)>
+	<!ATTLIST collection-id column CDATA #REQUIRED>
+	<!ATTLIST collection-id type CDATA #REQUIRED>
+	<!ATTLIST collection-id length CDATA #IMPLIED>
+	
+<!-- Generators generate unique identifiers. The class attribute specifies a Java 
+class implementing an id generation algorithm. -->
+
+<!ELEMENT generator (param*)>
+	<!ATTLIST generator class CDATA #REQUIRED>
+<!ELEMENT param (#PCDATA)>
+	<!ATTLIST param name CDATA #REQUIRED>
+
+<!-- The column element is an alternative to column attributes and required for 
+mapping associations to classes with composite ids. -->
+
+<!ELEMENT column (comment?)>
+	<!ATTLIST column name CDATA #REQUIRED>
+	<!ATTLIST column length CDATA #IMPLIED>						<!-- default: 255 -->
+	<!ATTLIST column precision CDATA #IMPLIED>
+	<!ATTLIST column scale CDATA #IMPLIED>
+	<!ATTLIST column not-null (true|false) #IMPLIED>		 	<!-- default: false (except for id properties) -->
+	<!ATTLIST column unique (true|false) #IMPLIED>			 	<!-- default: false (except for id properties) -->
+	<!ATTLIST column unique-key CDATA #IMPLIED>					<!-- default: no unique key -->
+	<!ATTLIST column sql-type CDATA #IMPLIED>					<!-- override default column type for hibernate type -->
+	<!ATTLIST column index CDATA #IMPLIED>
+	<!ATTLIST column check CDATA #IMPLIED>						<!-- default: no check constraint -->
+    <!ATTLIST column default CDATA #IMPLIED>                    <!-- default: no default value -->
+
+<!-- The formula and subselect elements allow us to map derived properties and 
+entities. -->
+
+<!ELEMENT formula (#PCDATA)>
+<!ELEMENT subselect (#PCDATA)>
+
+<!-- The cache element enables caching of an entity class. -->
+<!ELEMENT cache EMPTY>
+	<!ATTLIST cache usage (read-only|read-write|nonstrict-read-write|transactional) #REQUIRED>				
+	<!ATTLIST cache region CDATA #IMPLIED>						<!-- default: class or collection role name -->
+	<!ATTLIST cache include (all|non-lazy) "all">
+
+<!-- The comment element allows definition of a database table or column comment. -->
+
+<!ELEMENT comment (#PCDATA)>
+
+<!-- The loader element allows specification of a named query to be used for fetching
+an entity or collection -->
+
+<!ELEMENT loader EMPTY>
+	<!ATTLIST loader query-ref CDATA #REQUIRED>
+
+<!-- The query element declares a named Hibernate query string -->
+
+<!ELEMENT query (#PCDATA|query-param)*>
+	<!ATTLIST query name CDATA #REQUIRED>
+	<!ATTLIST query flush-mode (auto|never|always) #IMPLIED>
+	<!ATTLIST query cacheable (true|false) "false">
+	<!ATTLIST query cache-region CDATA #IMPLIED>
+	<!ATTLIST query fetch-size CDATA #IMPLIED>
+	<!ATTLIST query timeout CDATA #IMPLIED>
+	<!ATTLIST query cache-mode (get|ignore|normal|put|refresh) #IMPLIED>
+    <!ATTLIST query read-only (true|false) #IMPLIED>
+    <!ATTLIST query comment CDATA #IMPLIED>
+
+<!-- The sql-query element declares a named SQL query string -->
+
+<!ELEMENT sql-query (#PCDATA|return-scalar|return|return-join|load-collection|synchronize|query-param)*>
+	<!ATTLIST sql-query name CDATA #REQUIRED>
+    <!ATTLIST sql-query resultset-ref CDATA #IMPLIED>
+	<!ATTLIST sql-query flush-mode (auto|never|always) #IMPLIED>
+	<!ATTLIST sql-query cacheable (true|false) "false">
+	<!ATTLIST sql-query cache-region CDATA #IMPLIED>
+	<!ATTLIST sql-query fetch-size CDATA #IMPLIED>
+	<!ATTLIST sql-query timeout CDATA #IMPLIED>
+	<!ATTLIST sql-query cache-mode (get|ignore|normal|put|refresh) #IMPLIED>
+    <!ATTLIST sql-query read-only (true|false) #IMPLIED>
+    <!ATTLIST sql-query comment CDATA #IMPLIED>
+	<!ATTLIST sql-query callable (true|false) "false">
+
+<!-- The query-param element is used only by tools that generate
+finder methods for named queries -->
+
+<!ELEMENT query-param EMPTY>
+	<!ATTLIST query-param name CDATA #REQUIRED>
+	<!ATTLIST query-param type CDATA #REQUIRED>
+
+<!-- The resultset element declares a named resultset mapping definition for SQL queries -->
+<!ELEMENT resultset (return-scalar|return|return-join|load-collection)*>
+	<!ATTLIST resultset name CDATA #REQUIRED>
+
+<!--
+	Defines a return component for a sql-query.  Alias refers to the alias
+	used in the actual sql query; lock-mode specifies the locking to be applied
+	when the query is executed.  The class, collection, and role attributes are mutually exclusive;
+	class refers to the class name of a "root entity" in the object result; collection refers
+	to a collection of a given class and is used to define custom sql to load that owned collection
+	and takes the form "ClassName.propertyName"; role refers to the property path for an eager fetch
+	and takes the form "owningAlias.propertyName"
+-->
+<!ELEMENT return (return-discriminator?,return-property)*>
+	<!ATTLIST return alias CDATA #IMPLIED>
+	<!ATTLIST return entity-name CDATA #IMPLIED>
+	<!ATTLIST return class CDATA #IMPLIED>
+	<!ATTLIST return lock-mode (none|read|upgrade|upgrade-nowait|write) "read">	
+
+<!ELEMENT return-property (return-column*)> 
+	<!ATTLIST return-property name CDATA #REQUIRED>
+	<!ATTLIST return-property column CDATA #IMPLIED>
+
+<!ELEMENT return-column EMPTY> 
+	<!ATTLIST return-column name CDATA #REQUIRED>
+
+<!ELEMENT return-discriminator EMPTY> 
+	<!ATTLIST return-discriminator column CDATA #REQUIRED>
+	
+<!ELEMENT return-join (return-property)*> 
+	<!ATTLIST return-join alias CDATA #REQUIRED>
+	<!ATTLIST return-join property CDATA #REQUIRED>
+	<!ATTLIST return-join lock-mode (none|read|upgrade|upgrade-nowait|write) "read">
+
+<!ELEMENT load-collection (return-property)*> 
+	<!ATTLIST load-collection alias CDATA #REQUIRED>
+	<!ATTLIST load-collection role CDATA #REQUIRED>
+	<!ATTLIST load-collection lock-mode (none|read|upgrade|upgrade-nowait|write) "read">
+
+<!ELEMENT return-scalar EMPTY>
+	<!ATTLIST return-scalar column CDATA #REQUIRED>
+	<!ATTLIST return-scalar type CDATA #IMPLIED>
+
+<!ELEMENT synchronize EMPTY>
+	<!ATTLIST synchronize table CDATA #REQUIRED>
+	
+<!-- custom sql operations -->
+<!ELEMENT sql-insert (#PCDATA)>
+	<!ATTLIST sql-insert callable (true|false) "false">
+	<!ATTLIST sql-insert check (none|rowcount|param) #IMPLIED>
+
+<!ELEMENT sql-update (#PCDATA)>
+	<!ATTLIST sql-update callable (true|false) "false">
+	<!ATTLIST sql-update check (none|rowcount|param) #IMPLIED>
+
+<!ELEMENT sql-delete (#PCDATA)>
+	<!ATTLIST sql-delete callable (true|false) "false">
+	<!ATTLIST sql-delete check (none|rowcount|param) #IMPLIED>
+
+<!ELEMENT sql-delete-all (#PCDATA)>
+	<!ATTLIST sql-delete-all callable (true|false) "false">
+	<!ATTLIST sql-delete-all check (none|rowcount|param) #IMPLIED>
+
+<!--
+    Element for defining "auxiliary" database objects.  Must be one of two forms:
+
+    #1 :
+        <database-object>
+            <definition class="CustomClassExtendingAuxiliaryObject"/>
+        </database-object>
+
+    #2 :
+        <database-object>
+            <create>CREATE OR REPLACE ....</create>
+            <drop>DROP ....</drop>
+        </database-object>
+-->
+<!ELEMENT database-object ( (definition|(create,drop)), dialect-scope* )>
+
+<!ELEMENT definition EMPTY>
+    <!ATTLIST definition class CDATA #REQUIRED>
+
+<!ELEMENT create (#PCDATA)>
+<!ELEMENT drop (#PCDATA)>
+
+<!--
+    dialect-scope element allows scoping auxiliary-objects to a particular
+    Hibernate dialect implementation.
+-->
+<!ELEMENT dialect-scope (#PCDATA)>
+    <!ATTLIST dialect-scope name CDATA #REQUIRED>
+
diff --git a/xml/tests/testData/xml/javaee_5.xsd b/xml/tests/testData/xml/javaee_5.xsd
new file mode 100644
index 000000000000..59b6575b2c3c
--- /dev/null
+++ b/xml/tests/testData/xml/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/xml/jdo_2_0.xsd b/xml/tests/testData/xml/jdo_2_0.xsd
new file mode 100644
index 000000000000..c6d0219889c7
--- /dev/null
+++ b/xml/tests/testData/xml/jdo_2_0.xsd
@@ -0,0 +1,653 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--W3C Schema generated by XML Spy v4.2 U (http://www.xmlspy.com)-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+	<xs:element name="array">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="embedded" minOccurs="0"/>
+				<xs:element ref="foreign-key" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="column">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="serialized">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="foreign-key" type="xs:string"/>
+			<xs:attribute name="embedded-element">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="dependent-element">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="class">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="implements" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="datastore-identity" minOccurs="0"/>
+				<xs:element ref="inheritance" minOccurs="0"/>
+				<xs:element ref="version" minOccurs="0"/>
+				<xs:element ref="join" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="foreign-key" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="index" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="unique" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="field" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="query" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="fetch-group" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+			<xs:attribute name="identity-type">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="application"/>
+						<xs:enumeration value="datastore"/>
+						<xs:enumeration value="nondurable"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="objectid-class" type="xs:string"/>
+			<xs:attribute name="table" type="xs:string"/>
+			<xs:attribute name="requires-extent" default="true">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="persistence-capable-superclass" type="xs:string"/>
+			<xs:attribute name="detachable" default="true">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="embedded-only">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="persistence-modifier">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="persistence-capable"/>
+						<xs:enumeration value="persistence-aware"/>
+						<xs:enumeration value="non-persistent"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="collection">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="order" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="element-type" type="xs:string"/>
+			<xs:attribute name="embedded-element">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="dependent-element">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="column">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string"/>
+			<xs:attribute name="target" type="xs:string"/>
+			<xs:attribute name="target-field" type="xs:string"/>
+			<xs:attribute name="jdbc-type" type="xs:string"/>
+			<xs:attribute name="sql-type" type="xs:string"/>
+			<xs:attribute name="length" type="xs:string"/>
+			<xs:attribute name="scale" type="xs:string"/>
+			<xs:attribute name="precision" type="xs:string"/>
+			<xs:attribute name="allows-null" type="xs:string"/>
+			<xs:attribute name="default-value" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="datastore-identity">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="strategy" type="xs:string"/>
+			<xs:attribute name="sequence" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="discriminator">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="value" type="xs:string"/>
+			<xs:attribute name="strategy">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="value-map"/>
+						<xs:enumeration value="class-name"/>
+						<xs:enumeration value="none"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="element">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="index" minOccurs="0"/>
+				<xs:element ref="embedded" minOccurs="0"/>
+				<xs:element ref="foreign-key" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="serialized">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="foreign-key" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="embedded">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="field" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="owner" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="extension">
+		<xs:complexType mixed="true">
+			<xs:attribute name="vendor-name" type="xs:string" use="required"/>
+			<xs:attribute name="key" type="xs:string"/>
+			<xs:attribute name="value" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="fetch-group">
+		<xs:complexType>
+			<xs:choice minOccurs="0" maxOccurs="unbounded">
+				<xs:element ref="fetch-group"/>
+				<xs:element ref="field"/>
+			</xs:choice>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+			<xs:attribute name="post-load">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="field">
+		<xs:complexType>
+			<xs:sequence minOccurs="0">
+				<xs:choice minOccurs="0">
+					<xs:element ref="collection"/>
+					<xs:element ref="map"/>
+					<xs:element ref="array"/>
+					<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				</xs:choice>
+				<xs:element ref="join" minOccurs="0"/>
+				<xs:element ref="element" minOccurs="0"/>
+				<xs:element ref="key" minOccurs="0"/>
+				<xs:element ref="value" minOccurs="0"/>
+				<xs:element ref="fetch-group" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="order" minOccurs="0"/>
+				<xs:element ref="embedded" minOccurs="0"/>
+				<xs:element ref="index" minOccurs="0"/>
+				<xs:element ref="foreign-key" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+			<xs:attribute name="persistence-modifier">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="persistent"/>
+						<xs:enumeration value="transactional"/>
+						<xs:enumeration value="none"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="table" type="xs:string"/>
+			<xs:attribute name="primary-key" default="false">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="null-value" default="none">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="exception"/>
+						<xs:enumeration value="default"/>
+						<xs:enumeration value="none"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="default-fetch-group">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="embedded">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="serialized">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="dependent">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="value-factory" type="xs:string"/>
+			<xs:attribute name="foreign-key" type="xs:string"/>
+			<xs:attribute name="fetch-group" type="xs:string"/>
+			<xs:attribute name="depth" type="xs:string"/>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="mapped-by" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="foreign-key">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="deferred">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="delete-action">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="cascade"/>
+						<xs:enumeration value="restrict"/>
+						<xs:enumeration value="null"/>
+						<xs:enumeration value="default"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="update-action">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="cascade"/>
+						<xs:enumeration value="restrict"/>
+						<xs:enumeration value="default"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="unique">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="name" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="implements">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="property-field" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="index">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string"/>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="unique" default="false">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="inheritance">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="discriminator" minOccurs="0"/>
+				<xs:element ref="join" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="strategy" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="interface">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="property" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+			<xs:attribute name="requires-extent" default="true">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="jdo">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="package" maxOccurs="unbounded"/>
+				<xs:element ref="query" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="join">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="index" minOccurs="0"/>
+				<xs:element ref="foreign-key" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="table" type="xs:string"/>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="outer" default="false">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="foreign-key" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="key">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="index" minOccurs="0"/>
+				<xs:element ref="embedded" minOccurs="0"/>
+				<xs:element ref="foreign-key" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="serialized">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="foreign-key" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="map">
+		<xs:complexType>
+			<xs:sequence minOccurs="0" maxOccurs="unbounded">
+				<xs:element ref="extension"/>
+			</xs:sequence>
+			<xs:attribute name="key-type" type="xs:string"/>
+			<xs:attribute name="embedded-key">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="dependent-key">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="value-type" type="xs:string"/>
+			<xs:attribute name="embedded-value">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="dependent-value">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="order">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="column" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="owner">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="field" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="package">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="interface" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="class" maxOccurs="unbounded"/>
+				<xs:element ref="sequence" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:sequence minOccurs="0">
+					<xs:element ref="join" minOccurs="0"/>
+					<xs:element ref="element" minOccurs="0"/>
+					<xs:element ref="key" minOccurs="0"/>
+					<xs:element ref="value" minOccurs="0"/>
+					<xs:element ref="order" minOccurs="0"/>
+					<xs:element ref="column"/>
+				</xs:sequence>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+			<xs:attribute name="column" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="property-field">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+			<xs:attribute name="field-name" type="xs:string" use="required"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="query">
+		<xs:complexType mixed="true">
+			<xs:sequence>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string"/>
+			<xs:attribute name="language" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="sequence">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string" use="required"/>
+			<xs:attribute name="sequence-name" type="xs:string" use="required"/>
+			<xs:attribute name="strategy" use="required">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="non-transactional"/>
+						<xs:enumeration value="transactional-contiguous"/>
+						<xs:enumeration value="transactional-holes-allowed"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="unique">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:choice minOccurs="0" maxOccurs="unbounded">
+					<xs:element ref="column"/>
+					<xs:element ref="field"/>
+					<xs:element ref="property"/>
+				</xs:choice>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="name" type="xs:string"/>
+			<xs:attribute name="table" type="xs:string"/>
+			<xs:attribute name="deferred" default="false">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="value">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="index" minOccurs="0"/>
+				<xs:element ref="embedded" minOccurs="0"/>
+				<xs:element ref="foreign-key" minOccurs="0"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="column" type="xs:string"/>
+			<xs:attribute name="serialized">
+				<xs:simpleType>
+					<xs:restriction base="xs:NMTOKEN">
+						<xs:enumeration value="true"/>
+						<xs:enumeration value="false"/>
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+			<xs:attribute name="foreign-key" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:element name="version">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="column" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element ref="extension" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+			<xs:attribute name="strategy" type="xs:string"/>
+			<xs:attribute name="column" type="xs:string"/>
+		</xs:complexType>
+	</xs:element>
+	<xs:notation name="JDO.2_0" public="-//Sun Microsystems, Inc.//DTD Java Data Objects Metadata 2.0//EN"/>
+</xs:schema>
diff --git a/xml/tests/testData/xml/jsp_2_0.xsd b/xml/tests/testData/xml/jsp_2_0.xsd
new file mode 100644
index 000000000000..b03c73a31641
--- /dev/null
+++ b/xml/tests/testData/xml/jsp_2_0.xsd
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="2.0">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)jsp_2_0.xsds	1.17 03/18/03
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      Copyright 2003 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 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>
+
+      This is the XML Schema for the JSP 2.0 deployment descriptor
+      types.  The JSP 2.0 schema contains all the special
+      structures and datatypes that are necessary to use JSP files
+      from a web application.
+
+      The contents of this schema is used by the web-app_2_4.xsd
+      file to define JSP specific content.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all J2EE
+      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="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="jsp-configType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The jsp-configType is used to provide global configuration
+	information for the JSP files in a web application. It has
+	two subelements, taglib and jsp-property-group.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="taglib"
+		   type="j2ee:taglibType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="jsp-property-group"
+		   type="j2ee:jsp-property-groupType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="jsp-fileType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The jsp-file element contains the full path to a JSP file
+	within the web application beginning with a `/'.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:pathType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="jsp-property-groupType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The jsp-property-groupType is used to group a number of
+	files so they can be given global property information.
+	All files so described are deemed to be JSP files.  The
+	following additional properties can be described:
+
+	    - Control whether EL is ignored
+	    - Control whether scripting elements are invalid
+	    - Indicate pageEncoding information.
+	    - Indicate that a resource is a JSP document (XML)
+	    - Prelude and Coda automatic includes.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="url-pattern"
+		   type="j2ee:url-patternType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="el-ignored"
+		   type="j2ee:true-falseType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Can be used to easily set the isELIgnored
+	    property of a group of JSP pages.  By default, the
+	    EL evaluation is enabled for Web Applications using
+	    a Servlet 2.4 or greater web.xml, and disabled
+	    otherwise.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="page-encoding"
+		   type="j2ee:string"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The valid values of page-encoding are those of the
+	    pageEncoding page directive.  It is a
+	    translation-time error to name different encodings
+	    in the pageEncoding attribute of the page directive
+	    of a JSP page and in a JSP configuration element
+	    matching the page.  It is also a translation-time
+	    error to name different encodings in the prolog
+	    or text declaration of a document in XML syntax and
+	    in a JSP configuration element matching the document.
+	    It is legal to name the same encoding through
+	    mulitple mechanisms.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="scripting-invalid"
+		   type="j2ee:true-falseType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Can be used to easily disable scripting in a
+	    group of JSP pages.  By default, scripting is
+	    enabled.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="is-xml"
+		   type="j2ee:true-falseType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    If true, denotes that the group of resources
+	    that match the URL pattern are JSP documents,
+	    and thus must be interpreted as XML documents.
+	    If false, the resources are assumed to not
+	    be JSP documents, unless there is another
+	    property group that indicates otherwise.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="include-prelude"
+		   type="j2ee:pathType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The include-prelude element is a context-relative
+	    path that must correspond to an element in the
+	    Web Application.  When the element is present,
+	    the given path will be automatically included (as
+	    in an include directive) at the beginning of each
+	    JSP page in this jsp-property-group.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="include-coda"
+		   type="j2ee:pathType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The include-coda element is a context-relative
+	    path that must correspond to an element in the
+	    Web Application.  When the element is present,
+	    the given path will be automatically included (as
+	    in an include directive) at the end of each
+	    JSP page in this jsp-property-group.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="taglibType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The taglibType defines the syntax for declaring in
+	the deployment descriptor that a tag library is
+	available to the application.  This can be done
+	to override implicit map entries from TLD files and
+	from the container.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="taglib-uri"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    A taglib-uri element describes a URI identifying a
+	    tag library used in the web application.  The body
+	    of the taglib-uri element may be either an
+	    absolute URI specification, or a relative URI.
+	    There should be no entries in web.xml with the
+	    same taglib-uri value.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:element name="taglib-location"
+		   type="j2ee:pathType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    the taglib-location element contains the location
+	    (as a resource relative to the root of the web
+	    application) where to find the Tag Library
+	    Description file for the tag library.
+
+	  </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/xml/maven-4.0.0.xsd b/xml/tests/testData/xml/maven-4.0.0.xsd
new file mode 100644
index 000000000000..4f7e708a2960
--- /dev/null
+++ b/xml/tests/testData/xml/maven-4.0.0.xsd
@@ -0,0 +1,2213 @@
+<?xml version="1.0"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://maven.apache.org/POM/4.0.0" xmlns="http://maven.apache.org/POM/4.0.0">
+  <xs:element name="project" type="Model">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+      <xs:documentation source="description">
+         The &lt;code&gt;&amp;lt;project&amp;gt;&lt;/code&gt; element is the root of the descriptor.
+         The following table lists all of the possible child elements.
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="Model">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+      <xs:documentation source="description">
+         The &lt;code&gt;&amp;lt;project&amp;gt;&lt;/code&gt; element is the root of the descriptor.
+         The following table lists all of the possible child elements.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="parent" minOccurs="0" type="Parent">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The location of the parent project, if one exists. Values from the
+            parent project will be the default for this project if they are
+            left unspecified. The location is given as a group ID, artifact ID and version.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="modelVersion" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Declares to which version of project descriptor this POM conforms.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="groupId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            A universally unique identifier for a project. It is normal to
+            use a fully-qualified package name to distinguish it from other projects with a similar name
+            (eg. &lt;code&gt;org.apache.maven&lt;/code&gt;).
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="artifactId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The identifier for this artifact that is unique within the group given by the group ID.
+            An artifact is something that is either produced or used by a project. Examples of artifacts produced by
+            Maven for a project include: JARs, source and binary distributions, and WARs.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="packaging" minOccurs="0" type="xs:string" default="jar">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The type of artifact this project produces, for example &lt;code&gt;jar&lt;/code&gt;
+              &lt;code&gt;war&lt;/code&gt;
+              &lt;code&gt;ear&lt;/code&gt;
+              &lt;code&gt;pom&lt;/code&gt;.
+            Plugins can create their own packaging, and
+            therefore their own packaging types,
+            so this list does not contain all possible types.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The full name of the project.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="version" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The current version of the artifact produced by this project.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="description" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            A detailed description of the project, used by Maven whenever it needs to describe the project,
+            such as on the web site. While this element can be specified as CDATA to enable
+            the use of HTML tags within the description, it is discouraged to allow plain text representation.
+            If you need to modify the index page of the generated web site, you are able to specify your own instead
+            of adjusting this text.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+             The URL to the project&apos;s homepage.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="prerequisites" minOccurs="0" type="Prerequisites">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Describes the prerequisites in the build environment for this project.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="issueManagement" minOccurs="0" type="IssueManagement">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The project&apos;s issue management system information.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="ciManagement" minOccurs="0" type="CiManagement">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The project&apos;s continuous integration information.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="inceptionYear" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The year of the project&apos;s inception, specified with 4 digits.
+            This value is used when generating copyright notices as well as being informational.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="mailingLists" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Contains information about a project&apos;s mailing lists.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="mailingList" minOccurs="0" maxOccurs="unbounded" type="MailingList"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="developers" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Describes the committers of a project.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="developer" minOccurs="0" maxOccurs="unbounded" type="Developer"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="contributors" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Describes the contributors to a project that are not yet committers.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="contributor" minOccurs="0" maxOccurs="unbounded" type="Contributor"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="licenses" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            This element describes all of the licenses for this project.
+            Each license is described by a &lt;code&gt;license&lt;/code&gt; element, which
+            is then described by additional elements.
+            Projects should only list the license(s) that applies to the project
+            and not the licenses that apply to dependencies.
+            If multiple licenses are listed, it is assumed that the user can select any of them, not that they
+            must accept all.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="license" minOccurs="0" maxOccurs="unbounded" type="License"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="scm" minOccurs="0" type="Scm">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Specification for the SCM used by the project, such as CVS, Subversion, etc.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="organization" minOccurs="0" type="Organization">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            This element describes various attributes of the organization to
+            which the project belongs.  These attributes are utilized when
+            documentation is created (for copyright notices and links).
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="build" minOccurs="0" type="Build">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">Information required to build the project.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="profiles" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            A listing of project-local build profiles which will modify the build process when activated.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="profile" minOccurs="0" maxOccurs="unbounded" type="Profile"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="modules" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The modules (sometimes called subprojects) to build as a part of this project.
+            Each module listed is a relative path to the directory containing the module.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="module" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="repositories" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The lists of the remote repositories for discovering dependencies and
+          extensions.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="repository" minOccurs="0" maxOccurs="unbounded" type="Repository"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="pluginRepositories" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The lists of the remote repositories for discovering plugins for builds and reports.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="pluginRepository" minOccurs="0" maxOccurs="unbounded" type="Repository"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="dependencies" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+              This element describes all of the dependencies associated with a
+              project.
+              These dependencies are used to construct a classpath for your
+              project during the build process. They are automatically downloaded from the
+              repositories defined in this project.
+              See &lt;a href=&quot;http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html&quot;&gt;the
+              dependency mechanism&lt;/a&gt; for more information.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="dependency" minOccurs="0" maxOccurs="unbounded" type="Dependency"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="reports" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            &lt;b&gt;Deprecated&lt;/b&gt;. Now ignored by Maven.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="reporting" minOccurs="0" type="Reporting">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            This element includes the specification of report plugins to use to generate the reports on the
+            Maven-generated site.  These reports will be run when a user executes &lt;code&gt;mvn site&lt;/code&gt;.  All of the
+            reports will be included in the navigation bar for browsing.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="dependencyManagement" minOccurs="0" type="DependencyManagement">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Default dependency information for projects that inherit from
+            this one. The dependencies in this section are not immediately resolved.
+            Instead, when a POM derived from this one declares a dependency
+            described by a matching groupId and artifactId, the version and other values from this
+            section are used for that dependency if they were not already specified.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="distributionManagement" minOccurs="0" type="DistributionManagement">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Distribution information for a project that enables deployment of the site
+          and artifacts to remote web servers and repositories respectively.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="properties" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+             Properties that can be used throughout the POM as a substitution, and are used as filters in resources
+             if enabled. The format is &lt;code&gt;&amp;lt;name&amp;gt;value&amp;lt;/name&amp;gt;&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Contributor">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Description of a person who has contributed to the project, but who does
+        not have commit privileges. Usually, these contributions come in the
+        form of patches submitted.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The full name of the contributor.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="email" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The email address of the contributor.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The URL for the homepage of the contributor.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="organization" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The organization to which the contributor belongs.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="organizationUrl" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The URL of the organization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="roles" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The roles the contributor plays in the project.  Each role is
+            described by a &lt;code&gt;role&lt;/code&gt; element, the body of which is a
+            role name. This can also be used to describe the contribution.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="role" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="timezone" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The timezone the contributor is in. This is a number in the range -11 to 12.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="properties" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Properties about the contributor, such as an instant messenger handle.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Profile">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        Modifications to the build process which is activated based on environmental parameters or command line arguments.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="id" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The identifier of this build profile. This used both for command line activation, and identifies
+            identical profiles to merge with during inheritance.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="activation" minOccurs="0" type="Activation">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The conditional logic which will automatically
+            trigger the inclusion of this profile.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="build" minOccurs="0" type="BuildBase">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Information required to build the project.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="modules" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The modules (sometimes called subprojects) to build as a part of this project.
+            Each module listed is a relative path to the directory containing the module.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="module" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="repositories" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The lists of the remote repositories for discovering dependencies and
+          extensions.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="repository" minOccurs="0" maxOccurs="unbounded" type="Repository"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="pluginRepositories" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The lists of the remote repositories for discovering plugins for builds and reports.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="pluginRepository" minOccurs="0" maxOccurs="unbounded" type="Repository"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="dependencies" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+              This element describes all of the dependencies associated with a
+              project.
+              These dependencies are used to construct a classpath for your
+              project during the build process. They are automatically downloaded from the
+              repositories defined in this project.
+              See &lt;a href=&quot;http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html&quot;&gt;the
+              dependency mechanism&lt;/a&gt; for more information.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="dependency" minOccurs="0" maxOccurs="unbounded" type="Dependency"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="reports" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            &lt;b&gt;Deprecated&lt;/b&gt;. Now ignored by Maven.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="reporting" minOccurs="0" type="Reporting">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            This element includes the specification of report plugins to use to generate the reports on the
+            Maven-generated site.  These reports will be run when a user executes &lt;code&gt;mvn site&lt;/code&gt;.  All of the
+            reports will be included in the navigation bar for browsing.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="dependencyManagement" minOccurs="0" type="DependencyManagement">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Default dependency information for projects that inherit from
+            this one. The dependencies in this section are not immediately resolved.
+            Instead, when a POM derived from this one declares a dependency
+            described by a matching groupId and artifactId, the version and other values from this
+            section are used for that dependency if they were not already specified.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="distributionManagement" minOccurs="0" type="DistributionManagement">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Distribution information for a project that enables deployment of the site
+          and artifacts to remote web servers and repositories respectively.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="properties" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+             Properties that can be used throughout the POM as a substitution, and are used as filters in resources
+             if enabled. The format is &lt;code&gt;&amp;lt;name&amp;gt;value&amp;lt;/name&amp;gt;&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Activation">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        The conditions within the build runtime environment which will trigger
+        the automatic inclusion of the build profile.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="activeByDefault" minOccurs="0" type="xs:boolean" default="false">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Flag specifying whether this profile is active by default.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="jdk" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Specifies that this profile will be activated when a matching JDK is detected. For example, &lt;code&gt;1.4&lt;/code&gt;
+            only activates on JDKs versioned 1.4, while &lt;code&gt;!1.4&lt;/code&gt; matches any JDK that is not version 1.4.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="os" minOccurs="0" type="ActivationOS">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Specifies that this profile will be activated when matching operating system attributes are detected.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="property" minOccurs="0" type="ActivationProperty">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Specifies that this profile will be activated when this system property is specified.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="file" minOccurs="0" type="ActivationFile">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+             Specifies that this profile will be activated based on existence of a file.
+             </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="ActivationFile">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        This is the file specification used to activate the profile. The missing value will be the location
+        of a file that needs to exist, and if it doesn&apos;t the profile will be activated.  On the other hand exists will test
+        for the existence of the file and if it is there the profile will be activated.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="missing" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The name of the file that must be missing to activate the profile.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="exists" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The name of the file that must exist to activate the profile.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="ActivationProperty">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        This is the property specification used to activate a profile. If the value field is empty,
+        then the existence of the named property will activate the profile, otherwise it does a case-sensitive
+        match against the property value as well.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The name of the property to be used to activate a profile.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="value" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The value of the property required to activate a profile.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="ActivationOS">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        This is an activator which will detect an operating system&apos;s attributes in order to activate
+        its profile.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The name of the operating system to be used to activate the profile. This must be an exact match
+          of the &lt;code&gt;${os.name}&lt;/code&gt; Java property, such as &lt;code&gt;Windows XP&lt;/code&gt;.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="family" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The general family of the OS to be used to activate the profile, such as &lt;code&gt;windows&lt;/code&gt; or &lt;code&gt;unix&lt;/code&gt;.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="arch" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The architecture of the operating system to be used to activate the profile.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="version" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The version of the operating system to be used to activate the profile.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="DependencyManagement">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        Section for management of default dependency information for use in a group of POMs.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="dependencies" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The dependencies specified here are not used until they
+            are referenced in a POM within the group. This allows the
+            specification of a &quot;standard&quot; version for a particular
+            dependency.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="dependency" minOccurs="0" maxOccurs="unbounded" type="Dependency"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Dependency">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="groupId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The project group that produced the dependency, e.g.
+            &lt;code&gt;org.apache.maven&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="artifactId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The unique id for an artifact produced by the project group, e.g.
+            &lt;code&gt;maven-artifact&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="version" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The version of the dependency, e.g. &lt;code&gt;3.2.1&lt;/code&gt;. In Maven 2, this can also be
+            specified as a range of versions.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="type" minOccurs="0" type="xs:string" default="jar">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The type of dependency. This defaults to &lt;code&gt;jar&lt;/code&gt;. While it usually represents the extension on
+            the filename of the dependency, that is not always the case. A type can be mapped to a different
+            extension and a classifier.
+            The type often correspongs to the packaging used, though this is also not always the case.
+            Some examples are &lt;code&gt;jar&lt;/code&gt;, &lt;code&gt;war&lt;/code&gt;, &lt;code&gt;ejb-client&lt;/code&gt; and &lt;code&gt;test-jar&lt;/code&gt;.
+            New types can be defined by plugins that set
+            &lt;code&gt;extensions&lt;/code&gt; to &lt;code&gt;true&lt;/code&gt;, so this is not a complete list.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="classifier" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The classifier of the dependency. This allows distinguishing two artifacts that belong to the same POM but
+            were built differently, and is appended to the filename after the version. For example,
+            &lt;code&gt;jdk14&lt;/code&gt; and &lt;code&gt;jdk15&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="scope" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The scope of the dependency - &lt;code&gt;compile&lt;/code&gt;, &lt;code&gt;runtime&lt;/code&gt;, &lt;code&gt;test&lt;/code&gt;,
+            &lt;code&gt;system&lt;/code&gt;, and &lt;code&gt;provided&lt;/code&gt;. Used to
+            calculate the various classpaths used for compilation, testing, and so on. It also assists in determining
+            which artifacts to include in a distribution of this project. For more information, see
+            &lt;a href=&quot;http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html&quot;&gt;the
+            dependency mechanism&lt;/a&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="systemPath" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            FOR SYSTEM SCOPE ONLY. Note that use of this property is &lt;b&gt;discouraged&lt;/b&gt; and may be replaced in later
+            versions. This specifies the path on the filesystem for this dependency.
+            Requires an absolute path for the value, not relative.
+            Use a property that gives the machine specific absolute path,
+            e.g. &lt;code&gt;${java.home}&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="exclusions" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Lists a set of artifacts that should be excluded from this dependency&apos;s artifact list when it comes to
+            calculating transitive dependencies.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="exclusion" minOccurs="0" maxOccurs="unbounded" type="Exclusion"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="optional" minOccurs="0" type="xs:boolean" default="false">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Indicates the dependency is optional for use of this library. While the version of the dependency will be
+            taken into account for dependency calculation if the library is used elsewhere, it will not be passed on
+            transitively.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Exclusion">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="artifactId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The artifact ID of the project to exclude.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="groupId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The group ID of the project to exclude.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Reporting">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">Section for management of reports and their configuration.</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="excludeDefaults" minOccurs="0" type="xs:boolean" default="false">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">If true, then the default reports are not included in the site generation. This includes the
+            reports in the &quot;Project Info&quot; menu.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="outputDirectory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Where to store all of the generated reports. The default is
+            &lt;code&gt;${project.build.directory}/site&lt;/code&gt;
+            .
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="plugins" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The reporting plugins to use and their configuration.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="plugin" minOccurs="0" maxOccurs="unbounded" type="ReportPlugin"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="ReportPlugin">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="groupId" minOccurs="0" type="xs:string" default="org.apache.maven.plugins">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The group ID of the reporting plugin in the repository.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="artifactId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The artifact ID of the reporting plugin in the repository.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="version" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The version of the reporting plugin to be used.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="inherited" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Whether the configuration in this plugin should be made available to projects that
+            inherit from this one.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="configuration" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The configuration of the reporting plugin.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="reportSets" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Multiple specifications of a set of reports, each having (possibly) different
+            configuration. This is the reporting parallel to an &lt;code&gt;execution&lt;/code&gt; in the build.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="reportSet" minOccurs="0" maxOccurs="unbounded" type="ReportSet"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="ReportSet">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">Represents a set of reports and configuration to be used to generate them.</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="id" minOccurs="0" type="xs:string" default="default">
+        <xs:annotation>
+          <xs:documentation source="version">0.0.0+</xs:documentation>
+          <xs:documentation source="description">The unique id for this report set, to be used during POM inheritance.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="configuration" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Configuration of the report to be used when generating this set.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="inherited" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Whether any configuration should be propagated to child POMs.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="reports" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The list of reports from this plugin which should be generated from this set.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="report" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="BuildBase">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="defaultGoal" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The default goal (or phase in Maven 2) to execute when none is specified for the project.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="resources" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            This element describes all of the classpath resources such as properties files associated with a
+            project. These resources are often included in the final package.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="resource" minOccurs="0" maxOccurs="unbounded" type="Resource"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="testResources" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            This element describes all of the classpath resources such as properties files associated with a
+            project&apos;s unit tests.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="testResource" minOccurs="0" maxOccurs="unbounded" type="Resource"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="directory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The directory where all files generated by the build are placed.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="finalName" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The filename (excluding the extension, and with no path information) that the produced artifact
+            will be called. The default value is &lt;code&gt;${artifactId}-${version}&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="filters" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+          The list of filter properties files that are used when filtering is enabled.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="pluginManagement" minOccurs="0" type="PluginManagement">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Default plugin information to be made available for reference by
+            projects derived from this one. This plugin configuration will not
+            be resolved or bound to the lifecycle unless referenced. Any local
+            configuration for a given plugin will override the plugin&apos;s entire
+            definition here.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="plugins" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The list of plugins to use.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="plugin" minOccurs="0" maxOccurs="unbounded" type="Plugin"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Plugin">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="groupId" minOccurs="0" type="xs:string" default="org.apache.maven.plugins">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The group ID of the plugin in the repository.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="artifactId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The artifact ID of the plugin in the repository.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="version" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The version (or valid range of verisons) of the plugin to be used.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="extensions" minOccurs="0" type="xs:boolean" default="false">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Whether to load Maven extensions (such as packaging and type handlers) from this
+            plugin. For performance reasons, this should only be enabled when necessary.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="executions" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Multiple specifications of a set of goals to execute during the build lifecycle, each having
+            (possibly) different
+            configuration.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="execution" minOccurs="0" maxOccurs="unbounded" type="PluginExecution"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="dependencies" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Additional dependencies that this project needs to introduce to the plugin&apos;s
+            classloader.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="dependency" minOccurs="0" maxOccurs="unbounded" type="Dependency"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="goals" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            &lt;b&gt;Deprecated&lt;/b&gt;. Unused by Maven.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="inherited" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Whether any configuration should be propagated to child POMs.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="configuration" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">0.0.0+</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="PluginExecution">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="id" minOccurs="0" type="xs:string" default="default">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The identifier of this execution for labelling the goals during the build, and for matching
+            exections to merge during inheritance.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="phase" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The build lifecycle phase to bind the goals in this execution to. If omitted, the goals will
+            be bound to the default specified in their metadata.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="goals" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The goals to execute with the given configuration.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="goal" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="inherited" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Whether any configuration should be propagated to child POMs.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="configuration" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">0.0.0+</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="PluginManagement">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        Section for management of default plugin information for use in a group of POMs.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="plugins" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The list of plugins to use.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="plugin" minOccurs="0" maxOccurs="unbounded" type="Plugin"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Resource">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        This element describes all of the classpath resources associated with a project or
+        unit tests.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="targetPath" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Describe the resource target path. For example, if you want that
+            resource to appear in a specific package
+            (&lt;code&gt;org.apache.maven.messages&lt;/code&gt;), you must specify this
+            element with this value: &lt;code&gt;org/apache/maven/messages&lt;/code&gt;.
+            This is not required if you simply put the resources in that directory structure at the source, however.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="filtering" minOccurs="0" type="xs:boolean" default="false">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Whether resources are filtered to replace tokens with parameterised values or not.
+            The values are taken from the &lt;code&gt;properties&lt;/code&gt; element and from the properties in the files listed
+            in the &lt;code&gt;filters&lt;/code&gt; element.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="directory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Describe the directory where the resources are stored.
+            The path is relative to the POM.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="includes" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">A list of patterns to include, e.g. &lt;code&gt;**&amp;#47;*.xml&lt;/code&gt;.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="include" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="excludes" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">A list of patterns to exclude, e.g. &lt;code&gt;**&amp;#47;*.xml&lt;/code&gt;</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="exclude" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="DistributionManagement">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        This elements describes all that pertains to distribution for a project.
+        It is primarily used for deployment of artifacts and the site
+        produced by the build.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="repository" minOccurs="0" type="DeploymentRepository">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Information needed to deploy the artifacts generated by the project to a remote repository.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="snapshotRepository" minOccurs="0" type="DeploymentRepository">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Where to deploy snapshots of artifacts to. If not given, it defaults to the &lt;code&gt;repository&lt;/code&gt; element.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="site" minOccurs="0" type="Site">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Information needed for deploying the web site of the project.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="downloadUrl" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The URL of the project&apos;s download page. If not given users will be referred to the homepage given by
+            &lt;code&gt;url&lt;/code&gt;. This is given to assist in locating artifacts that are not in the repository due to
+            licensing restrictions.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="relocation" minOccurs="0" type="Relocation">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Relocation information of the artifact if it has been moved to a new group ID and/or artifact ID.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="status" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Gives the status of this artifact in the remote repository. This must not be set in your local
+            project, as it is updated by tools placing it in the reposiory. Valid values are: &lt;code&gt;none&lt;/code&gt; (default),
+            &lt;code&gt;converted&lt;/code&gt; (repository manager converted this from an Maven 1 POM), &lt;code&gt;partner&lt;/code&gt;
+            (directly synced from a partner Maven 2 repository), &lt;code&gt;deployed&lt;/code&gt; (was deployed from a Maven 2
+            instance), &lt;code&gt;verified&lt;/code&gt; (has been hand verified as correct and final).
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Site">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+         Contains the information needed for deploying websites.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="id" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            A unique identifier for a deployment locataion. This is used to match the site to configuration in
+            the &lt;code&gt;settings.xml&lt;/code&gt; file, for example.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Human readable name of the deployment location.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+             The url of the location where website is deployed, in the form &lt;code&gt;protocol://hostname/path&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Relocation">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">Describes where an artifact has moved to. If any of the values are omitted, it is assumed to be the
+        same as it was before.</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="groupId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The group ID the artifact has moved to.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="artifactId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The new artifact ID of the artifact.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="version" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The new version of the artifact.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="message" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">An additional message to show the user about the move, such as the reason.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="DeploymentRepository">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        Repository contains the information needed for deploying to the remote repoistory.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="uniqueVersion" minOccurs="0" type="xs:boolean" default="true">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Whether to assign snapshots a unique version comprised of the timestamp and build number, or to
+            use the same version each time</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="id" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            A unique identifier for a repository. This is used to match the repository to configuration in
+            the &lt;code&gt;settings.xml&lt;/code&gt; file, for example.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Human readable name of the repository.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+             The url of the repository, in the form &lt;code&gt;protocol://hostname/path&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="layout" minOccurs="0" type="xs:string" default="default">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The type of layout this repository uses for locating and storing artifacts - can be &lt;code&gt;legacy&lt;/code&gt; or
+            &lt;code&gt;default&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Repository">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        A repository contains the information needed for establishing connections with remote repoistory.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="releases" minOccurs="0" type="RepositoryPolicy">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">How to handle downloading of releases from this repository.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="snapshots" minOccurs="0" type="RepositoryPolicy">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">How to handle downloading of snapshots from this repository.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="id" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            A unique identifier for a repository. This is used to match the repository to configuration in
+            the &lt;code&gt;settings.xml&lt;/code&gt; file, for example.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Human readable name of the repository.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+             The url of the repository, in the form &lt;code&gt;protocol://hostname/path&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="layout" minOccurs="0" type="xs:string" default="default">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The type of layout this repository uses for locating and storing artifacts - can be &lt;code&gt;legacy&lt;/code&gt; or
+            &lt;code&gt;default&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="RepositoryPolicy">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">Download policy</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="enabled" minOccurs="0" type="xs:boolean" default="true">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Whether to use this repository for downloading this type of artifact.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="updatePolicy" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The frequency for downloading updates - can be
+            &lt;code&gt;always,&lt;/code&gt;
+            &lt;code&gt;daily&lt;/code&gt;
+            (default),
+            &lt;code&gt;interval:XXX&lt;/code&gt;
+            (in minutes) or
+            &lt;code&gt;never&lt;/code&gt;
+            (only if it doesn&apos;t exist locally).
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="checksumPolicy" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            What to do when verification of an artifact checksum fails. Valid values are
+            &lt;code&gt;ignore&lt;/code&gt;
+            ,
+            &lt;code&gt;fail&lt;/code&gt;
+            or
+            &lt;code&gt;warn&lt;/code&gt;
+            (the default).
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="MailingList">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        This element describes all of the mailing lists associated with
+        a project. The auto-generated site references this information.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The name of the mailing list.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="subscribe" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The email address or link that can be used to subscribe to the mailing list.
+            If this is an email address, a
+            &lt;code&gt;mailto:&lt;/code&gt; link will automatically be created when
+            the documentation is created.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="unsubscribe" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The email address or link that can be used to unsubscribe to
+            the mailing list.  If this is an email address, a
+            &lt;code&gt;mailto:&lt;/code&gt; link will automatically be created
+            when the documentation is created.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="post" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The email address or link that can be used to post to
+            the mailing list.  If this is an email address, a
+            &lt;code&gt;mailto:&lt;/code&gt; link will automatically be created
+            when the documentation is created.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="archive" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The link to a URL where you can browse the mailing list archive.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="otherArchives" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The link to alternate URLs where you can browse the list archive.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="otherArchive" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Build">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="sourceDirectory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            This element specifies a directory containing the source
+            of the project. The generated build system will compile
+            the source in this directory when the project is built.
+            The path given is relative to the project descriptor.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="scriptSourceDirectory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            This element specifies a directory containing the script sources
+            of the project. This directory is meant to be different from the
+            sourceDirectory, in that its contents will be copied to the output
+            directory in most cases (since scripts are interpreted rather than
+            compiled).
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="testSourceDirectory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            This element specifies a directory containing the unit test
+            source of the project. The generated build system will
+            compile these directories when the project is being tested.
+            The path given is relative to the project descriptor.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="outputDirectory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The directory where compiled application classes are placed.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="testOutputDirectory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The directory where compiled test classes are placed.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="extensions" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">A set of build extensions to use from this project.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="extension" minOccurs="0" maxOccurs="unbounded" type="Extension"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="defaultGoal" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The default goal (or phase in Maven 2) to execute when none is specified for the project.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="resources" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            This element describes all of the classpath resources such as properties files associated with a
+            project. These resources are often included in the final package.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="resource" minOccurs="0" maxOccurs="unbounded" type="Resource"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="testResources" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            This element describes all of the classpath resources such as properties files associated with a
+            project&apos;s unit tests.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="testResource" minOccurs="0" maxOccurs="unbounded" type="Resource"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="directory" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The directory where all files generated by the build are placed.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="finalName" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The filename (excluding the extension, and with no path information) that the produced artifact
+            will be called. The default value is &lt;code&gt;${artifactId}-${version}&lt;/code&gt;.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="filters" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+          The list of filter properties files that are used when filtering is enabled.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="filter" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="pluginManagement" minOccurs="0" type="PluginManagement">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Default plugin information to be made available for reference by
+            projects derived from this one. This plugin configuration will not
+            be resolved or bound to the lifecycle unless referenced. Any local
+            configuration for a given plugin will override the plugin&apos;s entire
+            definition here.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="plugins" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The list of plugins to use.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="plugin" minOccurs="0" maxOccurs="unbounded" type="Plugin"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Extension">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">Describes a build extension to utilise.</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="groupId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The group ID of the extension&apos;s artifact.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="artifactId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The artifact ID of the extension.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="version" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The version of the extension.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="IssueManagement">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        Information about the issue tracking (or bug tracking) system used to manage this project.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="system" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The name of the issue management system, e.g. Bugzilla</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">URL for the issue management system used by the project.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Parent">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="artifactId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The artifact id of the parent project to inherit from.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="groupId" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The group id of the parent project to inherit from.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="version" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The version of the parent project to inherit.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="relativePath" minOccurs="0" type="xs:string" default="../pom.xml">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The relative path of the parent &lt;code&gt;pom.xml&lt;/code&gt; file within the check out.
+            The default value is &lt;code&gt;../pom.xml&lt;/code&gt;.
+            Maven looks for the parent pom first in the reactor of currently building projects, then in this location on
+            the filesystem, then the local repository, and lastly in the remote repo.
+            &lt;code&gt;relativePath&lt;/code&gt; allows you to select a different location,
+            for example when your structure is flat, or deeper without an intermediate parent pom.
+            However, the group ID, artifact ID and version are still required,
+            and must match the file in the location given or it will revert to the repository for the POM.
+            This feature is only for enhancing the development in a local checkout of that project.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Prerequisites">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">Describes the prerequisites a project can have.</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="maven" minOccurs="0" type="xs:string" default="2.0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The minimum version of Maven required to build the project, or to use this plugin.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="CiManagement">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="system" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The name of the continuous integration system, e.g. &lt;code&gt;continuum&lt;/code&gt;.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            URL for the continuous integration system used by the project if it has a web interface.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="notifiers" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Configuration for notifying developers/users when a build is
+            unsuccessful, including user information and notification mode.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="notifier" minOccurs="0" maxOccurs="unbounded" type="Notifier"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Notifier">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+      <xs:documentation source="description">
+        Configures one method for notifying users/developers when a build breaks.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="type" minOccurs="0" type="xs:string" default="mail">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">The mechanism used to deliver notifications.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="sendOnError" minOccurs="0" type="xs:boolean" default="true">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Whether to send notifications on error.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="sendOnFailure" minOccurs="0" type="xs:boolean" default="true">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Whether to send notifications on failure.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="sendOnSuccess" minOccurs="0" type="xs:boolean" default="true">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Whether to send notifications on success.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="sendOnWarning" minOccurs="0" type="xs:boolean" default="true">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">Whether to send notifications on warning.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="address" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            &lt;b&gt;Deprecated&lt;/b&gt;. Where to send the notification to - eg email address.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="configuration" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">0.0.0+</xs:documentation>
+          <xs:documentation source="description">Extended configuration specific to this notifier goes here.</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="License">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Describes the licenses for this project.  This is used to generate
+        the license page of the project&apos;s web site, as well as being taken into consideration in other reporting and
+        validation. The licenses listed for the project are that of the project itself, and not of dependencies.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The full legal name of the license.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The official url for the license text.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="distribution" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+              The primary method by which this project may be distributed.
+            &lt;dl&gt;
+              &lt;dt&gt;repo&lt;/dt&gt;
+              &lt;dd&gt;may be downloaded from the Maven repository&lt;/dd&gt;
+              &lt;dt&gt;manual&lt;/dt&gt;
+              &lt;dd&gt;user must manually download and install the dependency.&lt;/dd&gt;
+            &lt;/dl&gt;
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="comments" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Addendum information pertaining to this license.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Developer">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+      <xs:documentation source="description">
+        Information about one of the committers on this project.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="id" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The unique ID of the developer in the SCM.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The full name of the contributor.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="email" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The email address of the contributor.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The URL for the homepage of the contributor.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="organization" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The organization to which the contributor belongs.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="organizationUrl" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The URL of the organization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="roles" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The roles the contributor plays in the project.  Each role is
+            described by a &lt;code&gt;role&lt;/code&gt; element, the body of which is a
+            role name. This can also be used to describe the contribution.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="role" minOccurs="0" maxOccurs="unbounded" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="timezone" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            The timezone the contributor is in. This is a number in the range -11 to 12.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="properties" minOccurs="0">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">
+            Properties about the contributor, such as an instant messenger handle.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+          <xs:sequence>
+            <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Scm">
+    <xs:annotation>
+      <xs:documentation source="version">4.0.0</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="connection" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+              The source control management system URL
+              that describes the repository and how to connect to the
+              repository. For more information, see the
+              &lt;a href=&quot;http://maven.apache.org/scm/scm-url-format.html&quot;&gt;URL format&lt;/a&gt;
+              and &lt;a href=&quot;http://maven.apache.org/scm/scms-overview.html&quot;&gt;list of supported SCMs&lt;/a&gt;.
+              This connection is read-only.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="developerConnection" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            Just like &lt;code&gt;connection&lt;/code&gt;, but for developers, i.e. this scm connection
+            will not be read only.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="tag" minOccurs="0" type="xs:string" default="HEAD">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The tag of current code. By default, it&apos;s set to HEAD during development.
+          </xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">4.0.0</xs:documentation>
+          <xs:documentation source="description">
+            The URL to the project&apos;s browsable SCM repository, such as ViewVC or Fisheye.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+  <xs:complexType name="Organization">
+    <xs:annotation>
+      <xs:documentation source="version">3.0.0+</xs:documentation>
+      <xs:documentation source="description">Specifies the organization that produces this project.</xs:documentation>
+    </xs:annotation>
+    <xs:all>
+      <xs:element name="name" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The full name of the organization.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="url" minOccurs="0" type="xs:string">
+        <xs:annotation>
+          <xs:documentation source="version">3.0.0+</xs:documentation>
+          <xs:documentation source="description">The URL to the organization&apos;s home page.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:all>
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/mule-management.xsd b/xml/tests/testData/xml/mule-management.xsd
new file mode 100644
index 000000000000..71c5c45ba4cd
--- /dev/null
+++ b/xml/tests/testData/xml/mule-management.xsd
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<xsd:schema xmlns="http://www.mulesource.org/schema/mule/management/2.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:mule="http://www.mulesource.org/schema/mule/core/2.0"
+            xmlns:spring="http://www.springframework.org/schema/beans"
+            targetNamespace="http://www.mulesource.org/schema/mule/management/2.0" elementFormDefault="qualified"
+            attributeFormDefault="unqualified">
+
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:import namespace="http://www.mulesource.org/schema/mule/core/2.0"
+                schemaLocation="mule.xsd" />
+    <xsd:import namespace="http://www.springframework.org/schema/beans"
+                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+
+    <!-- JMX Agent-->
+    <xsd:element name="jmx-server" type="jmxServerType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="jmxServerType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:abstractAgentType">
+                <xsd:sequence>
+                    <xsd:element name="connector-server" type="connectorServerType" minOccurs="0" />
+                    <xsd:element name="credentials" type="mule:mapType" minOccurs="0" />
+                </xsd:sequence>
+                <xsd:attribute name="server-ref" type="xsd:NMTOKEN"/>
+                <xsd:attribute name="locateServer" type="mule:substitutableBoolean" default="true" />
+                <xsd:attribute name="createServer" type="mule:substitutableBoolean" default="true" />
+                <xsd:attribute name="enableStatistics" type="mule:substitutableBoolean" default="true" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="connectorServerType">
+        <xsd:attribute name="url" type="xsd:string" use="required" />
+        <xsd:attribute name="rebind" type="mule:substitutableBoolean" use="optional" default="true" />
+    </xsd:complexType>
+
+    <!-- JMX Adaptors -->
+    <xsd:element name="jmx-mx4j-adaptor" type="jmxMx4jAdaptorType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="jmxMx4jAdaptorType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:abstractAgentType">
+                <xsd:sequence>
+                    <xsd:element name="socketFactoryProperties" type="mule:mapType" minOccurs="0" />
+                </xsd:sequence>
+                <xsd:attribute name="jmxAdaptorUrl" type="xsd:string" />
+                <xsd:attribute name="login" type="xsd:string" />
+                <xsd:attribute name="password" type="xsd:string" />
+                <xsd:attribute name="authenticationMethod" default="basic">
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="none" />
+                            <xsd:enumeration value="basic" />
+                            <xsd:enumeration value="digest" />
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="cacheXsl" type="xsd:string" default="true" />
+                <xsd:attribute name="xslFilePath" type="xsd:string" />
+                <xsd:attribute name="pathInJar" type="xsd:string" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--  JMX Agents -->
+
+    <!-- Rmi Registry Agent -->
+    <xsd:element name="rmi-server" type="rmiServerTyper" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="rmiServerTyper">
+        <xsd:complexContent>
+            <xsd:extension base="mule:abstractAgentType">
+                <xsd:attribute name="serverUri" type="xsd:string" />
+                <xsd:attribute name="createRegistry" type="mule:substitutableBoolean" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="jmx-log4j" type="jmxLog4jType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="jmxLog4jType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:abstractAgentType" />
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="jmx-default-config" type="jmxDefaultConfigType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="jmxDefaultConfigType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:abstractAgentType">
+                <xsd:sequence>
+                    <xsd:element name="credentials" type="mule:mapType" minOccurs="0" />
+                </xsd:sequence>
+                <xsd:attribute name="registerMx4jAdapter" type="mule:substitutableBoolean" />
+                <xsd:attribute name="host" type="xsd:string" />
+                <xsd:attribute name="port" type="mule:substitutablePortNumber" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- JMX Notifications -->
+
+    <xsd:complexType name="notificationLoggerAgentType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:abstractAgentType">
+                <xsd:attribute name="ignoreManagerNotifications" type="mule:substitutableBoolean" default="false"/>
+                <xsd:attribute name="ignoreModelNotifications" type="mule:substitutableBoolean" default="false"/>
+                <xsd:attribute name="ignoreComponentNotifications" type="mule:substitutableBoolean" default="false"/>
+                <xsd:attribute name="ignoreConnectionNotifications" type="mule:substitutableBoolean" default="false"/>
+                <xsd:attribute name="ignoreSecurityNotifications" type="mule:substitutableBoolean" default="false"/>
+                <xsd:attribute name="ignoreManagementNotifications" type="mule:substitutableBoolean" default="false"/>
+                <xsd:attribute name="ignoreCustomNotifications" type="mule:substitutableBoolean" default="false"/>
+                <xsd:attribute name="ignoreAdminNotifications" type="mule:substitutableBoolean" default="false"/>
+                <xsd:attribute name="ignoreMessageNotifications" type="mule:substitutableBoolean" default="false"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="jmx-notifications" type="jmxNotificationType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="jmxNotificationType">
+        <xsd:complexContent>
+            <xsd:extension base="notificationLoggerAgentType" />
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="log4j-notifications" type="log4jNotificationType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="log4jNotificationType">
+        <xsd:complexContent>
+            <xsd:extension base="notificationLoggerAgentType">
+                <xsd:sequence>
+                    <xsd:element name="level-mapping" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:complexType>
+                            <xsd:attribute name="severity" type="serveritySimpleType" default="INFO" />
+                            <xsd:attribute name="eventId" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="logName" type="xsd:string" />
+                <xsd:attribute name="logConfigFile" type="xsd:string" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="chainsaw-notifications" type="chainsawNotificationType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="chainsawNotificationType">
+        <xsd:complexContent>
+            <xsd:extension base="notificationLoggerAgentType">
+                <xsd:sequence>
+                    <xsd:element name="level-mapping" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:complexType>
+                            <xsd:attribute name="severity" type="serveritySimpleType" default="INFO" />
+                            <xsd:attribute name="eventId" type="xsd:string" use="required" />
+                        </xsd:complexType>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="chainsawHost" type="xsd:string" use="required" />
+                <xsd:attribute name="chainsawPort" type="mule:substitutablePortNumber" use="required" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:simpleType name="serveritySimpleType">
+        <xsd:restriction base="xsd:NMTOKEN">
+            <xsd:enumeration value="DEBUG" />
+            <xsd:enumeration value="INFO" />
+            <xsd:enumeration value="WARN" />
+            <xsd:enumeration value="ERROR" />
+            <xsd:enumeration value="FATAL" />
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:element name="publish-notifications" type="publishNotificationType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="publishNotificationType">
+        <xsd:complexContent>
+            <xsd:extension base="notificationLoggerAgentType">
+                <xsd:attribute name="endpointAddress" type="xsd:string" use="required" />
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="yourkit-profiler" substitutionGroup="mule:abstract-extension"/>
+
+    <xsd:element name="custom-agent" type="customAgentType" substitutionGroup="mule:abstract-extension"/>
+    <xsd:complexType name="customAgentType">
+        <xsd:complexContent>
+            <xsd:extension base="mule:abstractAgentType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="xsd:NMTOKEN" use="required"/>
+                <xsd:attribute name="name" type="mule:substitutableName" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Identifies the agent in the registry.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/mule.xsd b/xml/tests/testData/xml/mule.xsd
new file mode 100644
index 000000000000..595bd7135f66
--- /dev/null
+++ b/xml/tests/testData/xml/mule.xsd
@@ -0,0 +1,3827 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<xsd:schema xmlns="http://www.mulesource.org/schema/mule/core/2.0"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:spring="http://www.springframework.org/schema/beans"
+            xmlns:spring-context="http://www.springframework.org/schema/context"
+            targetNamespace="http://www.mulesource.org/schema/mule/core/2.0"
+            attributeFormDefault="unqualified"
+            elementFormDefault="qualified">
+
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+    <xsd:import namespace="http://www.springframework.org/schema/beans"
+                schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+    <xsd:import namespace="http://www.springframework.org/schema/context"
+                schemaLocation="http://www.springframework.org/schema/context/spring-context-2.5.xsd"/>
+
+    <!--==============================================================-->
+    <!--   Structure                                                  -->
+    <!--==============================================================-->
+
+    <!-- This defines the structure in abstract terms (except for a few simple/unique things like
+         global properties).  We then provide some implementations below.  Other modules
+         can provide other implementations. -->
+
+    <xsd:element name="mule" type="muleType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Either the root element of a Mule configuration,
+                or a "top-level" element in a Spring configuration,
+                that contains further Mule elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="muleType">
+        <xsd:sequence>
+            <xsd:element name="description" type="descriptionType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        This can hold any kind of documentation consistent with the overall XML format).
+                        It is intended to be "human readable" only and is not used by the system.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:choice minOccurs="0" maxOccurs="unbounded">
+                <xsd:group ref="springRootElements"/>
+                <xsd:group ref="muleRootElements"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="springRootElements">
+        <xsd:choice>
+            <xsd:element ref="spring:beans">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Allow embedding of further spring documents.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="spring:bean">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        We support direct use of spring beans via this tag.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="spring-context:property-placeholder">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        We support direct use of property placeholders via this tag.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="muleRootElements">
+        <xsd:choice>
+            <xsd:element name="global-property" type="globalPropertyType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        An global property is a named string.
+                        It can be used inserted in most attribute values using the ${...} syntax.
+                        So the attribute value "${foo}" would be replaced by the value associated with
+                        the property named "foo".
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="configuration" type="configurationType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Defaults and general settings for the entire Mule system.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="notifications" type="notificationManagerType">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Register listeners for notifications
+                        and associate interfaces with particular events.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="abstract-extension"/>
+            <xsd:element ref="abstract-security-manager"/>
+            <xsd:element ref="abstract-transaction-manager"/>
+            <xsd:element ref="abstract-connector"/>
+            <xsd:element ref="abstract-global-endpoint"/>
+            <xsd:element ref="abstract-transformer"/>
+            <xsd:element ref="abstract-filter"/>
+            <xsd:element ref="abstract-model"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="descriptionType">
+        <xsd:complexContent mixed="true">
+            <xsd:extension base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-extension" abstract="true" type="abstractExtensionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for arbitrary extensions as children of the mule element.
+                Other transports and modules may extend this if they need to add global
+                elements to the configuration (but consider the more specific elements
+                like abstract-connector first).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractExtensionType"/>
+
+    <xsd:element name="abstract-connector" abstract="true" type="abstractConnectorType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for connector elements.
+                Connector elements allow properties to be configured across all endpoints that
+                use the same transport.
+                If multiple connectors are defined for the same transport then each endpoint
+                must name which connector is being used.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractConnectorType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the connector so that other elements can reference it.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-global-endpoint" abstract="true" type="abstractGlobalEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for global endpoint elements.
+                Global endpoints are named templates that allow us to define an endpoint once
+                and refer to it in several places.
+                Currently the same template is used for both inbound and outbound endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractGlobalEndpointType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the endpoint so that other elements can reference it.
+                    This name can also be referenced in MuleClient.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-inbound-endpoint" abstract="true" type="abstractInboundEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for inbound endpoint elements.
+                Inbound endpoints receive messages from the underlying transport.
+                The message payload is then delivered to the component for processing.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInboundEndpointType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the inbound endpoint in the registry, but is of relatively little use
+                    - it cannot be referred to from MuleClient, for example.
+                    For more useful aliases, use global endpoints.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-outbound-endpoint" abstract="true" type="abstractOutboundEndpointType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for outbound endpoint elements.
+                Outbound endpoints dispatch messages to the underlying transport.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractOutboundEndpointType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the outbound endpoint in the registry, but is of relatively little use
+                    - it cannot be referred to from MuleClient, for example.
+                    For more useful aliases, use global endpoints.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-transformer" abstract="true" type="abstractTransformerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transformer elements.
+                Transformers convert message payloads.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransformerType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the transformer so that other elements can reference it.
+                    Required if the transformer is defined at the global level.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="returnClass" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class of the message generated by the transformer.
+                    This is used if transformers are auto-selected
+                    (which is somewhat incomplete at the moment?).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="ignoreBadInput" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Many transformers only accept certain classes.
+                    Such transformers are never called with inappropriate input
+                    (whatever the value of this attribute).
+                    If a transformer forms part of a chain and cannot accept the current message class,
+                    then this flag controls whether the remaining part of the chain is evaluated.
+                    If true, the next transformer is called.
+                    If false the chain ends, keeping the result generated up to that point.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="globalPropertyType">
+        <xsd:attribute name="name" type="substitutableName" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the property.
+                    This is used inside ${...}.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="value" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The value of the property.
+                    This replaces each occurence of ${...}.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- seemed pointless making these simple container types abstract -->
+    <xsd:complexType name="inboundCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-catch-all-strategy" minOccurs="0"/>
+            <xsd:element ref="abstract-inbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-inbound-router" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-catch-all-strategy" abstract="true" type="abstractCatchAllStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for catch-all strategy elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractCatchAllStrategyType"/>
+
+    <xsd:element name="abstract-inbound-router" abstract="true" type="abstractInboundRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for inbound router elements.
+                Inbound routers control how incoming messages are handled.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractInboundRouterType"/>
+
+    <xsd:element name="abstract-filter" abstract="true" type="abstractFilterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for filter elements.
+                Filters are used to make decisions within the Mule framework.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractFilterType">
+        <xsd:attribute name="name" type="substitutableName">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Identifies the filter so that other elements can reference it.
+                    Required if the filter is defined at the global level.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="not" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Inverts the filter's condition.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="outboundCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-catch-all-strategy" minOccurs="0"/>
+            <xsd:element ref="abstract-outbound-router" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="matchAll" type="substitutableBoolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true, the output message will be sent to all routers, otherwise only
+                    the first matching router is used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-outbound-router" abstract="true" type="abstractOutboundRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for outbound router elements.
+                Outbound routers control how outgoing messages are delivered to the outbound endpoints.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractOutboundRouterType"/>
+
+    <xsd:element name="abstract-transaction-manager" abstract="true" type="abstractTransactionManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transaction manager elements.
+                Transaction managers are used to co-ordinate transactions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransactionManagerType"/>
+
+    <xsd:complexType name="configurationType">
+        <xsd:sequence>
+            <xsd:element name="default-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default threading profile,
+                        used by components and by endpoints for dispatching and receiving
+                        if no more specific configuration is given.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-dispatcher-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default dispatching threading profile, modifies the default-threading-profile
+                        values and is used by endpoints for dispatching
+                        if no more specific configuration is given.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-receiver-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default receiving threading profile, modifies the default-threading-profile
+                        values and is used by endpoints for receiving
+                        if no more specific configuration is given.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="default-component-threading-profile" type="threadingProfileType" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        The default component threading profile, modifies the default-threading-profile
+                        values and is used if no more specific configuration is given.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="defaultSynchronousEndpoints" type="substitutableBoolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true then connections to endpoints will wait for a response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="defaultRemoteSync" type="substitutableBoolean" default="false">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true then connections to endpoints will wait for a response from the remote service.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="defaultSynchronousEventTimeout" type="xsd:string" default="3000">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The default period (ms) to wait for a synchronous response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="defaultTransactionTimeout" type="xsd:string" default="5000">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The default timeout for transactions,
+                    used if no more specific configuration is given.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="notificationManagerType">
+        <xsd:sequence>
+            <xsd:element name="notification" type="defineNotificationType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Associate an event with an interface.
+                        Listeners which implement the interface will receive instances of the event.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="disable-notification" type="disableNotificationType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Block the association of an event with a particular interface.
+                        This filters events after the association with a particular interface
+                        (and so takes precedence).
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="notification-listener" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Register a bean as a listener with the notification system.
+                        Events are dispatched by reflection - the listener will receive all events
+                        associated with any interfaces it implements.
+                        The relationship between interfaces and events is configured by the
+                        notification and disable-notification elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                    <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The bean that will receive notifications.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                    <xsd:attribute name="subscription" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                An optional string that is compared with the event's resource identifier.
+                                Only events with matching identifiers will be sent.
+                                If no value is given, all events are sent.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="dynamic" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If the notification manager is dynamic then programatic updates to the manager
+                    (ie via Java code) will affect all messages.
+                    Otherwise, some parts of the system may cache state for
+                    efficiency and so not generate newly enabled notifications.
+                    The default value is false.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="defineNotificationType">
+        <xsd:attribute name="event-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class associated with a notification event that will be delivered to the interface.
+                    This can be used instead of the event attribute to specify a custom class.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="event" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The notification event to deliver.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface (class name) that will receive the notification event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface that will receive the notification event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="disableNotificationType">
+        <xsd:attribute name="event-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The class associated with an event that will no longer be delivered to any interface.
+                    This can be used instead of the event attribute to specify a custom class.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="event" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The event to not deliver.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface-class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface (class name) that will no longer receive an event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="interface" type="notificationTypes">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface that will no longer receive an event.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+
+    <xsd:simpleType name="notificationTypes">
+        <xsd:annotation>
+            <xsd:documentation>
+                The interface that will no longer receive an event.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:NMTOKEN">
+            <xsd:enumeration value="MANAGER"/>
+            <xsd:enumeration value="MODEL"/>
+            <xsd:enumeration value="SERVICE"/>
+            <xsd:enumeration value="SECURITY"/>
+            <xsd:enumeration value="MESSAGE"/>
+            <xsd:enumeration value="MANAGEMENT"/>
+            <xsd:enumeration value="CONNECTION"/>
+            <xsd:enumeration value="REGISTRY"/>
+            <xsd:enumeration value="CUSTOM"/>
+            <xsd:enumeration value="EXCEPTION"/>
+            <xsd:enumeration value="TRANSACTION"/>
+            <xsd:enumeration value="ROUTING"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+    <!--==============================================================-->
+    <!-- Models                                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-model" abstract="true" type="abstractModelType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for model elements.
+                A model provides basic settings and processing for all the services it contains.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractModelType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-exception-strategy" minOccurs="0"/>
+            <xsd:group ref="entryPointResolvers"/>
+            <xsd:element ref="abstract-service" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="name" type="nonBlankString">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name used to identify this model.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="seda-model" type="sedaModelType" substitutionGroup="abstract-model">
+        <xsd:annotation>
+            <xsd:documentation>
+                A SEDA (Staged Event Drivern Architecture) model has separate threads and
+                queues for each component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="sedaModelType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractModelType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-queue-profile" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="inherit" type="xsd:boolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If true then this model element is an extension of a previous model
+                            element with the same name.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="model" type="defaultModelType" substitutionGroup="abstract-model">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default model is a SEDA model.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="defaultModelType">
+        <xsd:complexContent>
+            <xsd:extension base="sedaModelType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Model elements -->
+
+    <xsd:element name="abstract-queue-profile" abstract="true" type="abstractQueueProfileType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for queue profile elements.
+                A queue profile controls how messages are queued before being processed.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractQueueProfileType"/>
+
+    <!-- to give a cleaner config we allow either a set or an individual entry (but not both).-->
+    <xsd:group name="entryPointResolvers">
+        <xsd:choice>
+            <xsd:element ref="abstract-entry-point-resolver-set" minOccurs="0"/>
+            <!-- we could allow many of these, but it looks ugly -->
+            <xsd:element ref="abstract-entry-point-resolver" minOccurs="0"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:element name="abstract-entry-point-resolver-set" abstract="true" type="abstractEntryPointResolverSetType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for entry point resolver set elements.
+                These combine a group of entry point resolvers, trying them in turn until one succeeds.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractEntryPointResolverSetType"/>
+
+    <xsd:element name="legacy-entry-point-resolver-set" type="extensibleEntryPointResolverSet"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                An extensible set of entry point resolvers (which determine how a message is passed to a component in
+                Java)
+                that already contains resolvers to implement the standard logic.
+                This is already provided by default and is only needed explicitly if
+                it will be extended with other entry point resolvers.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="entry-point-resolver-set" type="extensibleEntryPointResolverSet"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                An extensible set of entry point resolvers.
+                These determine how a message is passed to a component in Java.
+                Each entry point resolver is tried in turn until one succeeds in delivering the messge to the component.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="extensibleEntryPointResolverSet">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverSetType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-entry-point-resolver" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-entry-point-resolver-set" type="customEntryPointResolverSetType"
+                 substitutionGroup="abstract-entry-point-resolver-set">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom entry point resolver set.
+                This allows user-supplied code to determine how a message is passed to a component in Java.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customEntryPointResolverSetType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverSetType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the EntryPointResolverSet interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-entry-point-resolver" abstract="true" type="abstractEntryPointResolverType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an entry point resolver element.
+                Entry point resolvers define how payloads are delivered to Java code
+                (ie they choose the method to call).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="callable-entry-point-resolver" type="abstractEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                An entry point resolver for components that implement the Callable interface.
+                This passes a MuleEventContext to the component.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+                This element can also be used directly or as part of a set of resolvers;
+                the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractEntryPointResolverType"/>
+
+    <xsd:element name="custom-entry-point-resolver" type="customEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom entry point resolver.
+                This allows user-supplied code to determine how a message is passed to a component in Java.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+                This element can also be used directly or as part of a set of resolvers;
+                the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the EntryPointResolver interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractEntryPointResolverType">
+                <xsd:attribute name="transformFirst" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Should the message be transformer before being delivered to the component?
+                            By default, messages are transformed.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="acceptVoidMethods" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Should the resolver call void methods?
+                            By default, void methods are not considered as possible candidates for message delivery.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="property-entry-point-resolver" type="propertyEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Use a message property to select the component method to be called.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+                This element can also be used directly or as part of a set of resolvers;
+                the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="propertyEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:attribute name="property" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the message property used to select a method on the component.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="method-entry-point-resolver" type="methodEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Deliver the message to a named method.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+                This element can also be used directly or as part of a set of resolvers;
+                the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="methodEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="include-entry-point" minOccurs="1" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="reflection-entry-point-resolver" type="reflectionEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Generate a list of candidate methods from the component via reflections.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+                This element can also be used directly or as part of a set of resolvers;
+                the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="reflectionEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="baseEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element name="exclude-object-methods" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                If specified, methods in the Java Object interface are not included in
+                                the list of possible methods that can receive the message.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="exclude-entry-point" type="methodType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Explicitly exclude a named method from receiving the message.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="array-entry-point-resolver" type="complexEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Deliver the message to a method which takes a single array as argument.
+                This element can be set on the model or component;
+                the model value provides a default which individual component values can override.
+                This element can also be used directly or as part of a set of resolvers;
+                the resolvers in a set are used in turn until one is successful.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="no-arguments-entry-point-resolver" type="complexEntryPointResolverType"
+                 substitutionGroup="abstract-entry-point-resolver">
+        <xsd:annotation>
+            <xsd:documentation>
+                Call a method without arguments (the message is not passed to the component).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="complexEntryPointResolverType">
+        <xsd:complexContent>
+            <xsd:extension base="reflectionEntryPointResolverType">
+                <xsd:sequence>
+                    <xsd:element ref="include-entry-point" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="enableDiscovery" type="substitutableBoolean"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="include-entry-point" type="methodType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A possible method for delivery.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="methodType">
+        <xsd:attribute name="method" type="nonBlankString">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the method.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--  Services                                                    -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-service" abstract="true" type="abstractServiceType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for a service element.
+                Services combine message routing with a Java (typically) component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractServiceType">
+        <xsd:attribute name="name" type="nonBlankString" use="required">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name used to identify this service.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseServiceType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Base support for a model-based wrapper around the POJO service (SEDA, Streaming, etc.)
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractServiceType">
+                <xsd:sequence>
+                    <xsd:element name="description" type="descriptionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                This can hold any kind of documentation consistent with the overall XML format).
+                                It is intended to be "human readable" only and is not used by the system.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="inbound" type="inboundCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within "inbound" describe how messages enter the service.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <!-- minOccurs="0" to allow for <forwarding-router/> and/or default component -->
+                    <xsd:element ref="abstract-component" minOccurs="0"/>
+                    <xsd:element name="outbound" type="outboundCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within "outbound" describe how messages leave the service.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="async-reply" type="asyncReplyCollectionType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The elements within "async-reply" describe how asynchronous replies are handled.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element ref="abstract-exception-strategy" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="initialState" default="started">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The initial state of the service.
+                            Usually a service is started automatically, but this attribute can block any
+                            initial startup ("stopped") or stop the service immediately after initial
+                            startup ("paused").
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="started"/>
+                            <xsd:enumeration value="stopped"/>
+                            <xsd:enumeration value="paused"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-exception-strategy" abstract="true" type="abstractExceptionStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an exception strategy element.
+                Exception strategies define how Mule should react to errors.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="abstractExceptionStrategyType">
+        <xsd:sequence>
+            <xsd:element name="commit-transaction" type="exceptionPatternType" maxOccurs="1" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>Defines when a current transaction gets rolled-back depending on the name of the
+                        exception caught. Users can set a comma delimited list of wildcard patterns that wil be matched
+                        angainst the fully qualified classname of the current exception. Patterns defined for this
+                        element will leave the current transaction (if any) untouched and llow it to be committed.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="rollback-transaction" type="exceptionPatternType" maxOccurs="1" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>Defines when a current transaction gets rolled-back depending on the name of the
+                        exception caught. Users can set a comma delimited list of wildcard patterns that wil be matched
+                        angainst the fully qualified classname of the current exception. Patterns defined for this
+                        element will rollback the current transaction (if any).
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="enableNotifications" type="xsd:boolean">
+            <xsd:annotation>
+                <xsd:documentation>Determines whether ExceptionNotifications wil be fired from this strategy when an
+                    exception occurs.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="exceptionPatternType">
+        <xsd:attribute name="exception-pattern" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>A comma-separate list of wildcard expressions that will be matched against the
+                    fully qualified cassname of the current exception received by the ExceptionStrategy.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="asyncReplyCollectionType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-inbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-async-reply-router" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="timeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The timeout (ms) to wait for a reply.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="failOnTimeout" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If the router times out before all expected events have been received should an exception be thrown
+                    or should the current events be returned for processing. The default is false.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-async-reply-router" abstract="true" type="abstractAsyncReplyRouterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for an async reply router element.
+                Asynchronous replies are handled via this router.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractAsyncReplyRouterType"/>
+
+    <xsd:element name="service" type="sedaServiceType" substitutionGroup="abstract-service">
+        <xsd:annotation>
+            <xsd:documentation>
+                The standard SEDA service.
+                A service describes how to receive messages, deliver them to
+                a component, and handle the results (if any).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="sedaServiceType">
+        <xsd:complexContent>
+            <xsd:extension base="baseServiceType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-component-threading-profile" minOccurs="0"/>
+                    <xsd:element ref="abstract-queue-profile" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="queueTimeout" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The timeout used when taking messages from the SEDA queue.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-service" type="customServiceType" substitutionGroup="abstract-service">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemeted service
+                (typically used only in testing).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customServiceType">
+        <xsd:complexContent>
+            <xsd:extension base="baseServiceType">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The class to use for the service.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-component-threading-profile" abstract="true"
+                 type="abstractComponentThreadingProfileType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for component threading profile element.
+                Threading profils define how thread pools interact with the component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractComponentThreadingProfileType"/>
+
+    <!--==============================================================-->
+    <!-- Components                                              -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-component" abstract="true" type="abstractComponentType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for component element.
+                A component processes data. Typically it is a Java object.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractComponentType">
+        <xsd:sequence>
+            <xsd:group ref="entryPointResolvers"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="component" type="defaultJavaComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                A simple POJO (Plain Old Java Object) component
+                that will be invoked by Mule when a message is received.
+                The instance can be specified via a factory, or via a class.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="defaultJavaComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractComponentType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-object-factory" minOccurs="0"/>
+                    <xsd:element ref="abstract-lifecycle-adapter-factory" minOccurs="0"/>
+                    <xsd:element name="binding" type="pojoBindingType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                A binding associates a Mule endpoint with an injected Java interface
+                                (this is like using Spring to inject a bean, but instead of calling a
+                                method on the bean a message is sent to an endpoint).
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Specify a component class.
+                            This is a shortcut that is equivalent to providing a prototype-object element.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="pooled-component" type="pooledJavaComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                A pooled POJO (Plain Old Java Object) component
+                that will be invoked by Mule when a message is received.
+                The instance can be specified via a factory, or via a class.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="pooledJavaComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="defaultJavaComponentType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-pooling-profile" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>Characteristics of the object pool</xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:complexType name="pojoBindingType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="interface" use="required" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The interface to be injected.
+                    A proxy will be created that implements this interface by calling out to the endpoint.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="method" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The method on the interface that should be used.
+                    This can be omitted if the interface has a single method.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="defaultComponentType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractComponentType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="bridge-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                This transfers a message from inbound to outbound endpoints.
+                This name is provided for backwards compatability - it is equivalent to not specifying any component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!-- don't expose this, it's not needed -->
+    <!-- xsd:element name="pass-through-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default, "do nothing" component.
+                The message is simply transferred from inbound to outbound endpoints.
+                This is the default and need not be specified.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element -->
+
+    <xsd:element name="echo-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                This logs the message and returns the payload back as the result.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="log-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                This logs the message content (or content length if it is a large message).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="null-component" type="defaultComponentType" substitutionGroup="abstract-component">
+        <xsd:annotation>
+            <xsd:documentation>
+                This will throw an exception if it receives a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+
+    <!--==============================================================-->
+    <!--   Transactions                                               -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-transaction" abstract="true" type="abstractTransactionType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for transaction elements.
+                Transactions allow a series of operations to be grouped together.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractTransactionType">
+        <xsd:attribute name="action">
+            <xsd:annotation>
+                <xsd:documentation>
+                    NONE - Never participate in a transaction;
+                    ALWAYS_BEGIN - Always start a new transaction when receiving an event. An exception will be thrown
+                    if a transaction already exists;
+                    BEGIN_OR_JOIN - If a transaction is already in progress when an event is received, join the
+                    transaction, otherwise start a new transaction;
+                    ALWAYS_JOIN - Always expects a transaction to be in progress when an event is received, if there is
+                    no transaction an exception is thrown;
+                    JOIN_IF_POSSIBLE - Will join the current transaction if one is available otherwise no transaction is
+                    created.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN">
+                    <xsd:enumeration value="NONE"/>
+                    <xsd:enumeration value="ALWAYS_BEGIN"/>
+                    <xsd:enumeration value="BEGIN_OR_JOIN"/>
+                    <xsd:enumeration value="ALWAYS_JOIN"/>
+                    <xsd:enumeration value="JOIN_IF_POSSIBLE"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="timeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Timeout for transaction (ms).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseTransactionType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-transaction" type="customTransactionType" substitutionGroup="abstract-transaction">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allow access to user-defined or otherwise unsupported third party transactions.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransactionType">
+        <xsd:complexContent>
+            <xsd:extension base="baseTransactionType">
+                <xsd:attribute name="factory-class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the TransactionFactory interface.
+                            This will be instantiated and used to generate a transaction.
+                            The attribute and the "factory-ref" attribute are mutually exclusive;
+                            one of the two is required.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="factory-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A bean that implements the TransactionFactory interface.
+                            This will be used to generate a transaction.
+                            The attribute and the "factory-class" attribute are mutually exclusive;
+                            one of the two is required.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="transactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionManagerType">
+                <xsd:attribute name="name" type="substitutableName" default="transactionManager" use="optional">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An optional name for the transaction manager.
+                            The default value is "transactionManager".
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="websphere-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The Websphere transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="jboss-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The JBoss transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="jndiTransactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransactionManagerType">
+                <xsd:sequence>
+                    <xsd:element name="environment" type="mapType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The JNDI environment.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="weblogic-transaction-manager" type="jndiTransactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The Weblogic transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="jrun-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The JRun transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="resin-transaction-manager" type="transactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The Resin transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="jndi-transaction-manager" substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                Retrieve a named transaction manager factory from JNDI.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="jndiTransactionManagerType">
+                    <xsd:attribute name="jndiName" type="xsd:string">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The name of the manager factory to retrieve (eg java:/TransactionManager).
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="custom-transaction-manager" type="customTransactionManagerType"
+                 substitutionGroup="abstract-transaction-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented transaction manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransactionManagerType">
+        <xsd:complexContent>
+            <xsd:extension base="jndiTransactionManagerType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The class to instantiate to create a transaction manager.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--   Endpoint elements                                          -->
+    <!--==============================================================-->
+
+    <xsd:element name="endpoint" type="globalEndpointType" substitutionGroup="abstract-global-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                An endpoint "template" which can be used to construct an inbound or outbound endpoint
+                elsewhere in the configuration by referencing the endpoint's name.
+                Each transport implements its own endpoint element, with a more friendly syntax,
+                but this generic element can be used with any transport by supplying the correct
+                address URI. For example, "vm://foo" describes a VM transport endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="globalEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractGlobalEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="inbound-endpoint" type="inboundEndpointType" substitutionGroup="abstract-inbound-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                An inbound endpoint receives messages from the associated transport.
+                Each transport implements its own inbound endpoint element, with a more friendly syntax,
+                but this generic element can be used with any transport by supplying the correct
+                address URI. For example, "vm://foo" describes a VM transport endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="inboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInboundEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="outbound-endpoint" type="outboundEndpointType" substitutionGroup="abstract-outbound-endpoint">
+        <xsd:annotation>
+            <xsd:documentation>
+                An outbound endpoint sends messages to the associated transport.
+                Each transport implements its own outbound endpoint element, with a more friendly syntax,
+                but this generic element can be used with any transport by supplying the correct
+                address URI. For example, "vm://foo" describes a VM transport endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="outboundEndpointType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundEndpointType">
+                <xsd:group ref="defaultEndpointElements"/>
+                <xsd:attributeGroup ref="defaultEndpointAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- these include option/repeats - should be embedded once -->
+    <xsd:group name="defaultEndpointElements">
+        <xsd:sequence>
+            <xsd:sequence minOccurs="0" maxOccurs="unbounded">
+                <xsd:group ref="endpointTransformers"/>
+                <xsd:element ref="abstract-transaction" minOccurs="0"/>
+                <xsd:element ref="abstract-filter" minOccurs="0"/>
+                <xsd:element ref="abstract-security-filter" minOccurs="0"/>
+                <xsd:group ref="propertiesGroup"/>
+            </xsd:sequence>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:element name="abstract-security-filter" abstract="true" type="abstractSecurityFilterType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for security filter elements.
+                Security filters can control access to the system, etc.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="abstractSecurityFilterType"/>
+
+    <xsd:attributeGroup name="defaultEndpointAttributes">
+        <xsd:attributeGroup ref="restrictedEndpointAttributes"/>
+        <!-- these next two attributes are mutually exclusive and one is required.
+             but there is no way to define this in a schema... -->
+        <!-- endpoint references - dynamically checked to make sure not top level -->
+        <xsd:attribute name="ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A reference to a global endpoint.
+                    If this attribute is used then the endpoint is used as a template to construct this endpoint.
+                    A template fixes the address (protocol, path, host, etc), and may specify initial values for
+                    various properties, but further properties can be defined locally (as long as they don't
+                    change the address in any way).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <!-- explicit or global endpoints -->
+        <xsd:attribute name="address" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The generic address for this endpoint.
+                    If this attribute is used then the protocol must be specified as part of the URI.
+                    Alternatively, most transports provide alternative attributes for specifying the address
+                    (path, host etc).
+                    Note that the address attribute cannot be combined with "ref" or with the transport-provided
+                    alternative attributes.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:attributeGroup name="restrictedEndpointAttributes">
+        <xsd:attribute name="synchronous" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true the result from the component processing the incoming message will be
+                    returned as a response.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="remoteSync" type="substitutableBoolean">
+            <xsd:annotation>
+                <xsd:documentation>
+                    If true the component will wait for a response to the outgoing message before
+                    replying to the incoming message.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="remoteSyncTimeout" type="substitutableInt">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The timeout for the remoteSync wait (ms).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="encoding" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    String encoding used for messages.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="connector-ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The name of the connector associated with this endpoint.
+                    This must be specified if more than one connector is defined for this transport.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="transformer-refs" type="xsd:NMTOKENS">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of transformers which will be applied in order to the message before it is
+                    delivered to the component.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="responseTransformer-refs" type="xsd:NMTOKENS">
+            <xsd:annotation>
+                <xsd:documentation>
+                    A list of transformers which will be applied in order to the synchronous response
+                    before it is returned via the transport.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <xsd:complexType name="endpointRefType">
+        <xsd:attribute name="address" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The destination address for a reply message.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="ref" type="xsd:NMTOKEN">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The reference name of a global endpoint to use. If this EndpointRef will be associated to a message
+                    such as a Reply-To address, this endpoint ref has to be available on the remote Mule instance that reads the
+                    Reply-To address.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:group name="endpointTransformers">
+        <xsd:annotation>
+            <xsd:documentation>
+                This allows the user to specify either a simple list of (normal) transformers or
+                separate bracketed lists of normal and response transformers.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:choice>
+            <xsd:group ref="transformersList"/>
+            <xsd:sequence>
+                <xsd:element name="transformers" minOccurs="0">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A list of transformer elements that will be applied to the message
+                            before it is delivered to the component.
+                            Note that a list of transformers can also be specified directly
+                            (without the "transformers" element), but then it is not possible
+                            to also specify response transformers
+                            (using the "response-transformers" element).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:complexType>
+                        <xsd:group ref="transformersList"/>
+                    </xsd:complexType>
+                </xsd:element>
+                <xsd:element name="response-transformers" minOccurs="0">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A list of transformer elements that will be applied to the response message
+                            returned from the component.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:complexType>
+                        <xsd:group ref="transformersList"/>
+                    </xsd:complexType>
+                </xsd:element>
+            </xsd:sequence>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:group name="transformersList">
+        <xsd:annotation>
+            <xsd:documentation>
+                A list of transformers - normal or response, depending on context.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <!--==============================================================-->
+    <!--   Filter elements                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="filter" type="refFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that is defined elsewhere (at the global level, or as a Spring bean).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="refFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the filter to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="not-filter" type="unitaryFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Invert the enclosed filter
+                (so if it returns true for some message, this will return false, and vice-versa).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="unitaryFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="and-filter" type="collectionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Return true only if all the enclosed filters return true.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="or-filter" type="collectionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                Return true if any of the enclosed filters returns true.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="collectionFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter" minOccurs="2" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="wildcard-filter" type="wildcardFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches string messages against wildcards.
+                It performs matches with "*", i.e. "jms.events.*" would catch "jms.events.customer"
+                and "jms.events.receipts".
+                This filter accepts a comma-separated list of patterns, so more than one filter pattern can be
+                matched for a given argument: "jms.events.*, jms.actions.*" will match "jms.events.system"
+                and "jms.actions" but not "jms.queue".
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="wildcardFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="caseSensitivePatternFilterType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="expression-filter" type="expressionFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that can evaluate a range of expressions. It supports some base expression types
+                such as 'header', 'payload' (payload type), 'regex' and 'wildcard'.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="expressionFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="evaluator" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>The expression evaluator to use. The expression filter supports some types
+                            such as header, payload, exception, wildcard and regex, that are in-built filters not
+                            registered with the ExpressionEvaluatorManager. All others are registered with the
+                            ExpressionEvaluatorManager. Where XPath, bean and ongl are used, the expression should be a
+                            boolean expression.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="substitutableName">
+                            <xsd:enumeration value="header"/>
+                            <xsd:enumeration value="payload-type"/>
+                            <xsd:enumeration value="exception-type"/>
+                            <xsd:enumeration value="wildcard"/>
+                            <xsd:enumeration value="regex"/>
+                            <xsd:enumeration value="ognl"/>
+                            <xsd:enumeration value="xpath"/>
+                            <xsd:enumeration value="jxpath"/>
+                            <xsd:enumeration value="bean"/>
+                            <xsd:enumeration value="custom"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="expression" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>The expression that will be evaluated. This should always be a boolean
+                            expression.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="customEvaluator" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>Must be set if the evaluator is set to 'custom'. Also the custom evaluator
+                            must be registered with the ExpressionEvaluatorManager if it is to be used here.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="nullReturnsTrue" type="substitutableBoolean">
+                    <xsd:annotation>
+                        <xsd:documentation>If the specified expression returns null should the filter return true or
+                            false.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:element name="regex-filter" type="patternFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches string messages against a regular expression.
+                The Java regular expression engine (java.util.regex.Pattern) is used.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="patternFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="pattern" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The pattern to use when matching.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-property-filter" type="caseSensitivePatternFilterType"
+                 substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches properties on an event.
+                This can be very useful as the event properties represent all the meta information about the event
+                from the underlying transport, so for an event received over HTTP you can check for HTTP headers etc.
+                The pattern should be expressed as a key/value pair, i.e. "propertyName=value".
+                If you want to compare more than one property you can use the logic filters for And, Or and Not
+                expressions.
+                By default the comparison is case sensitive; you can set the caseSensitive property to override this.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="caseSensitivePatternFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="patternFilterType">
+                <xsd:attribute name="caseSensitive" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If false, the comparison ignores case.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="exception-type-filter" type="typeFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches the type of an exception.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="payload-type-filter" type="typeFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that matches the type of the payload.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="typeFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:attribute name="expectedType" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The expected class used in the comparison.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-filter" type="customFilterType" substitutionGroup="abstract-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented filter.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractFilterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the Filter interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- security filters -->
+
+    <xsd:element name="encryption-security-filter" type="encryptionSecurityFilterType"
+                 substitutionGroup="abstract-security-filter">
+        <xsd:annotation>
+            <xsd:documentation>
+                A filter that provides password based encyption.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="encryptionSecurityFilterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractSecurityFilterType">
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the encryption strategy to use.
+                            This should be configured using the password-encryption-strategy element,
+                            inside a security-manager element at the top level.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--   Transformer elements                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="transformer" type="refTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A reference to a transformer defined elsewhere.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="refTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:attribute name="ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the transformer to use,
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="auto-transformer" type="abstractTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that uses the transform discovery mechanism to convert the message payload. This
+                transformer works much better when transforming custom object types rather that java types since there
+                is less chance for ambiguity.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="custom-transformer" type="customTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-implemented transformer.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the Transformer interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-properties-transformer" type="messagePropertiesTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that can add or delete message properties.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="messagePropertiesTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:sequence>
+                    <xsd:element name="delete-message-property" type="keyType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Delete a message property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="add-message-property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Add a message property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="add-message-properties" type="mapType" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Add a set of message properties.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="overwrite" type="substitutableBoolean" use="optional" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            If false, a property is not added if the message already contains a property with that name.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="no-action-transformer" type="abstractTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that has no effect.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="base64-encoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that base64 encodes a string or byte array message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="base64-decoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that base64 decodes a message to give an array of bytes.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="xml-entity-encoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that encodes a string using XML entities.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="xml-entity-decoder-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that decodes a string containing XML entities.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="gzip-compress-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that compresses a byte array using gzip.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="gzip-uncompress-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that uncompresses a byte array using gzip.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-hex-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to a string of hexadecimal digits.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="hex-string-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a string of hexadecimal digits to a byte array.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-object-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to an object (either deserializing or converting to a string).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="object-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that serializes all objects except strings (which are converted using getBytes()).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="object-to-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that gives a human-readable description of various types (useful for debugging).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-serializable-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to an object (ie deserializing the object).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="serializable-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts an object to a byte array (ie serializing the object).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="byte-array-to-string-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a byte array to a string.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="string-to-byte-array-transformer" type="abstractTransformerType"
+                 substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that converts a string to a byte array.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="append-string-transformer" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that appends a string to a string payload.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="abstractTransformerType">
+                    <xsd:attribute name="message" type="xsd:string" use="required">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                The string to append.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:attribute>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:element name="encrypt-transformer" type="encryptionTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that encrypts a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="decrypt-transformer" type="encryptionTransformerType" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that decrypts a message.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="encryptionTransformerType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractTransformerType">
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the encryption strategy to use.
+                            This should be configured using the password-encryption-strategy element,
+                            inside a security-manager element at the top level.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="expression-transformer" substitutionGroup="abstract-transformer">
+        <xsd:annotation>
+            <xsd:documentation>
+                A transformer that evaluates one or more expressions on the current event. Each expression equates to a
+                parameter in the return message. The return message for 2 or more expressions will be an Object[].
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="abstractTransformerType">
+                    <xsd:sequence minOccurs="1" maxOccurs="unbounded">
+                        <xsd:element name="return-argument">
+                            <xsd:complexType>
+                                <xsd:attributeGroup ref="expressionAttributes"/>
+                                <xsd:attribute name="optional" type="substitutableBoolean" use="optional">
+                                    <xsd:annotation>
+                                        <xsd:documentation>An optional expression means that if the expression evaluates
+                                            to null, it will continue to the next expression without error.
+                                        </xsd:documentation>
+                                    </xsd:annotation>
+                                </xsd:attribute>
+                            </xsd:complexType>
+                        </xsd:element>
+                    </xsd:sequence>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
+    </xsd:element>
+
+    <xsd:attributeGroup name="expressionAttributes">
+        <xsd:attribute name="evaluator" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The expression evaluator to use. Expression Evaluators must be registered with the
+                    ExpressionEvaluatrManager before thay can be used. Using the custom evaluator allows the developer
+                    to define their on in the 'custom-evaluator' attribute. Note that some evaluators such as xpath,
+                    groovy and bean are loaded from other mule modules (xml and scripting respectively), these modules
+                    wll need to be on your classpath before the evaluator can be used.
+                </xsd:documentation>
+            </xsd:annotation>
+            <xsd:simpleType>
+                <xsd:restriction base="substitutableName">
+                    <xsd:enumeration value="groovy"/>
+                    <xsd:enumeration value="header"/>
+                    <xsd:enumeration value="headers"/>
+                    <xsd:enumeration value="headers-list"/>
+                    <xsd:enumeration value="attachment"/>
+                    <xsd:enumeration value="attachments"/>
+                    <xsd:enumeration value="attachments-list"/>
+                    <xsd:enumeration value="payload"/>
+                    <xsd:enumeration value="xpath"/>
+                    <xsd:enumeration value="jxpath"/>
+                    <xsd:enumeration value="bean"/>
+                    <xsd:enumeration value="ognl"/>
+                    <xsd:enumeration value="function"/>
+                    <xsd:enumeration value="custom"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:attribute>
+        <xsd:attribute name="expression" type="xsd:string" use="required">
+            <xsd:annotation>
+                <xsd:documentation>The expression to evaluate. The syntax of this will change depeneding on the
+                    evaluator being used.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="custom-evaluator" type="substitutableName" use="optional">
+            <xsd:annotation>
+                <xsd:documentation>The name of the custom evaluator to use. This attribute is only used when the
+                    evaluator attribute is set to 'custom'. Users can plug in their own expression evaluators by
+                    registering them with the ExpressionEvaluatorManager.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:attributeGroup>
+
+    <!--==============================================================-->
+    <!--   Shared elements                                             -->
+    <!--==============================================================-->
+
+    <xsd:element name="queue-profile" type="queueProfileType" substitutionGroup="abstract-queue-profile">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configure the queue used on a component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="queueProfileType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractQueueProfileType">
+                <xsd:attribute name="maxOutstandingMessages" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The maximum size of the queue.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="persistent" type="substitutableBoolean" default="false">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether the queue is persistent.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-security-manager" type="abstractSecurityManagerType" abstract="true">
+        <xsd:annotation>
+            <xsd:documentation>
+                A security manager is a container for security providers. More than one
+                security manager may be configured; each contains providers from a particular
+                module and has that module's type. This element is abstract - a security
+                related module or transport will provide a suitable implementation.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="abstractSecurityManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                This is an empty holder that can be extended by modules that want to
+                provide security managers. Typically it will contain elements called
+                module:type-security-provider which extend securityProviderType
+                where "module" might be "acegi" and "type" might de "delegate", for example.
+                Alternatively (or in addition) it may contain encryption strategies,
+                which should follow a similar scheme and extend encryptionStrategyType.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="id" fixed="_muleSecurityManager"/>
+        <xsd:attribute name="name" fixed="_muleSecurityManager"/>
+    </xsd:complexType>
+
+    <xsd:element name="security-manager" type="securityManagerType" substitutionGroup="abstract-security-manager">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default security manager.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="securityManagerType">
+        <xsd:annotation>
+            <xsd:documentation>
+                The default security manager (type mule:defaultSecurityManagerType) provides
+                basic support for security functions. Other modules (eg Acegi, JAAS, PGP)
+                provide more advanced functionality.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractSecurityManagerType">
+                <xsd:sequence>
+                    <xsd:element name="custom-security-provider" type="customSecurityProviderType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Allow any implementation of UMOSecurityProvider to be used.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="custom-encryption-strategy" type="customEncryptionStrategyType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Allow any implementation of UMOEncryptionStrategy to be used.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="secret-key-encryption-strategy" type="secretKeyEncryptionStrategyType"
+                                 minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Provides secret key-based encryption using JCE.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="password-encryption-strategy" type="passwordEncryptionStrategyType"
+                                 minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Provides password-based encryption using JCE. Users must specify a password and
+                                optionally a salt and iteration count as well. The default algorithm is
+                                PBEWithMD5AndDES, but users can specify any valid algorithm supported by JCE.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="securityProviderType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A security provider is a source of a particular security-related functionality.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="name" type="substitutableName" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="encryptionStrategyType">
+        <xsd:annotation>
+            <xsd:documentation>
+                An encryption strategy provides support for a particular encryption algorithm.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="name" type="substitutableName" use="required"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="customSecurityProviderType">
+        <xsd:complexContent>
+            <xsd:extension base="securityProviderType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="provider-ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the security provider to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="customEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="strategy-ref" type="xsd:NMTOKEN" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A reference to the encryption strategy (which may be a Spring bean that
+                            implements the EncryptionStrategy interface).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="passwordEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:attribute name="password" type="xsd:string" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The password to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="salt" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The salt to use (this helps prevent dictionary attacks).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="iterationCount" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The number of itreations to use.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="secretKeyEncryptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="encryptionStrategyType">
+                <xsd:attribute name="key" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The key to use.
+                            This and the keyFactory-ref attribute are mutually exclusive.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="keyFactory-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The name of the key factory to use.
+                            This should implement the ObjectFactory interface and return a byte array.
+                            This and the key attribute are mutually exclusive.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="component-threading-profile" type="threadingProfileType"
+                 substitutionGroup="abstract-component-threading-profile">
+        <xsd:annotation>
+            <xsd:documentation>
+                The threading profile to use on the component.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <!-- this is a general threading type used by various elements here -->
+    <xsd:complexType name="threadingProfileType">
+        <xsd:complexContent>
+            <!-- this is a hack that allows us to use this general threading profile as a component threading profile
+                 without retyping everything -->
+            <xsd:extension base="abstractComponentThreadingProfileType">
+                <xsd:attribute name="maxThreadsActive" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The maximum number of threads that will be used.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="maxThreadsIdle" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The maximum number of idle threads stored in the pool.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="threadTTL" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The time excess threads in the pool live before being discarded.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="poolExhaustedAction">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            How tasks should be handled when no more threads are available.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="WAIT"/>
+                            <xsd:enumeration value="DISCARD"/>
+                            <xsd:enumeration value="DISCARD_OLDEST"/>
+                            <xsd:enumeration value="ABORT"/>
+                            <xsd:enumeration value="RUN"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="threadWaitTimeout" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            How long to wait (when the pool exhausted action is WAIT).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="doThreading" type="substitutableBoolean" default="true">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Whether threading should be used at all (default is true).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="maxBufferSize" type="substitutableInt">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The size of the queue used (when the pool exhausted action is WAIT).
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   Exception strategies                                       -->
+    <!--==============================================================-->
+
+    <xsd:element name="default-service-exception-strategy" type="endpointExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Provide default exception handling via an endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:element name="default-connector-exception-strategy" type="endpointExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                Provide default exception handling via an endpoint.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="endpointExceptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractExceptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-exception-strategy" type="customExceptionStrategyType"
+                 substitutionGroup="abstract-exception-strategy">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-defined exception stratgey.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customExceptionStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="endpointExceptionStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the ExceptionListener interface.
+                            In addition, if an outbound-endpoint element is specified,
+                            it is set as an "endpoint" bean property.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- Custom connector element -->
+
+    <xsd:element name="custom-connector" type="customConnectorType" substitutionGroup="abstract-connector">
+        <xsd:annotation>
+            <xsd:documentation>
+                A user-defined connector.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customConnectorType">
+        <xsd:complexContent>
+            <xsd:extension base="connectorType">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            A class that implements the Connector interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--  Routers                                                     -->
+    <!--==============================================================-->
+
+    <!-- Inbound Router implementations -->
+
+    <xsd:element name="idempotent-secure-hash-receiver-router" type="filteredInboundRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+    <xsd:element name="inbound-pass-through-router" type="filteredInboundRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+    <xsd:complexType name="filteredInboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter" minOccurs="0"/>
+                    <!-- TODO this doesn't make sense here, need to re-visit <xsd:element ref="abstract-message-info-mapping" minOccurs="0"/>-->
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-message-info-mapping" abstract="true" type="abstractMessageInfoMappingType"/>
+    <xsd:complexType name="abstractMessageInfoMappingType"/>
+
+    <xsd:element name="idempotent-receiver-router" type="filteredInboundRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+
+    <xsd:element name="wire-tap-router" type="wireTapRouterType" substitutionGroup="abstract-inbound-router"/>
+    <xsd:complexType name="wireTapRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="1" maxOccurs="1"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="forwarding-router" type="selectiveConsumerRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+
+    <xsd:element name="selective-consumer-router" type="selectiveConsumerRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+
+    <xsd:element name="correlation-resequencer-router" type="baseAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+
+    <xsd:complexType name="selectiveConsumerRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="transformer-refs" type="xsd:NMTOKENS"/>
+                <xsd:attribute name="transformFirst" type="substitutableBoolean"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-chunking-aggregator-router" type="messageChunkingAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+    <xsd:complexType name="messageChunkingAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="baseAggregatorRouterType">
+                <xsd:attribute name="correlationExpression" type="xsd:string"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-correlation-aggregator-router" type="customCorrelationAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+    <xsd:complexType name="customCorrelationAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="messageChunkingAggregatorRouterType">
+                <xsd:attribute name="class" type="substitutableClass" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="collection-aggregator-router" type="baseAggregatorRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+
+    <xsd:element name="custom-inbound-router" type="customInboundRouterType"
+                 substitutionGroup="abstract-inbound-router"/>
+
+    <xsd:complexType name="customInboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element ref="abstract-inbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="baseAggregatorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteredInboundRouterType">
+                <xsd:attribute name="timeout" type="substitutableInt"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- ResponseRouters -->
+
+    <xsd:element name="single-async-reply-router" type="asyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router">
+        <xsd:annotation>
+            <xsd:documentation>Configures a Single Response Router. This will return the first event it receives on a
+                reply endpoint and will discard the rest.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:element name="collection-async-reply-router" type="asyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router">
+        <xsd:annotation>
+            <xsd:documentation>Configures a Collection Response Router. This will return a MuleMEssageCollection message
+                type that will contain all events recieved for the current correlation.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="asyncReplyRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractAsyncReplyRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-inbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element ref="abstract-message-info-mapping" minOccurs="0"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-async-reply-router" type="customAsyncReplyRouterType"
+                 substitutionGroup="abstract-async-reply-router"/>
+    <xsd:complexType name="customAsyncReplyRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="asyncReplyRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- Outbound Router implementations -->
+
+    <xsd:element name="outbound-pass-through-router" type="outboundRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:complexType name="outboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element name="reply-to" type="endpointRefType" minOccurs="0"/>
+                    <xsd:element ref="abstract-transaction" minOccurs="0"/>
+                    <xsd:element ref="abstract-message-info-mapping" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="enableCorrelation" default="IF_NOT_SET">
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="ALWAYS"/>
+                            <xsd:enumeration value="NEVER"/>
+                            <xsd:enumeration value="IF_NOT_SET"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="filtering-router" type="filteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:element name="chaining-router" type="filteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:element name="exception-based-router" type="filteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:element name="multicasting-router" type="filteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:element name="template-endpoint-router" type="filteringOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:complexType name="filteringOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="outboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-filter" minOccurs="0"/>
+                    <xsd:element ref="abstract-transformer" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="transformer-refs" type="xsd:NMTOKENS"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="endpoint-selector-router" type="endpointSelectorRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:complexType name="endpointSelectorRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteringOutboundRouterType">
+                <xsd:attributeGroup ref="expressionAttributes"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="list-message-splitter-router" type="messageSplitterOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:complexType name="messageSplitterOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteringOutboundRouterType">
+                <!-- this isn't exposed to the user afaict? -->
+                <!-- xsd:attribute name="multimatch" type="substitutableBoolean"/ -->
+                <xsd:attribute name="honorSynchronicity" type="substitutableBoolean"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="message-chunking-router" type="chunkingRouterType" substitutionGroup="abstract-outbound-router"/>
+    <xsd:complexType name="chunkingRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteringOutboundRouterType">
+                <xsd:attribute name="messageSize" type="substitutableInt"/>
+                <xsd:attribute name="numberOfMessages" type="substitutableInt"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="static-recipient-list-router" type="staticRecipientListRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:complexType name="staticRecipientListRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteringOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element name="recipients" type="listOrSetType" minOccurs="0" maxOccurs="1"/>
+                </xsd:sequence>
+                <xsd:attribute name="recipientsProperty" type="xsd:string"/>
+                <xsd:attribute name="recipientsDelimiter" type="xsd:string"/>
+                <xsd:attribute name="synchronous" type="xsd:boolean"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="recipient-list-router" type="recipientListRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:complexType name="recipientListRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteringOutboundRouterType">
+                <xsd:attributeGroup ref="expressionAttributes"/>
+                <xsd:attribute name="synchronous" type="xsd:boolean"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-outbound-router" type="customOutboundRouterType"
+                 substitutionGroup="abstract-outbound-router"/>
+    <xsd:complexType name="customOutboundRouterType">
+        <xsd:complexContent>
+            <xsd:extension base="filteringOutboundRouterType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!-- Catch all strategy implementations -->
+
+    <xsd:element name="logging-catch-all-strategy" type="loggingCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy"/>
+    <xsd:complexType name="loggingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-catch-all-strategy" type="customCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy"/>
+    <xsd:complexType name="customCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="forwarding-catch-all-strategy" type="forwardingCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy"/>
+    <xsd:complexType name="forwardingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="abstract-outbound-endpoint" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-forwarding-catch-all-strategy" type="customForwardingCatchAllStrategyType"
+                 substitutionGroup="abstract-catch-all-strategy"/>
+    <xsd:complexType name="customForwardingCatchAllStrategyType">
+        <xsd:complexContent>
+            <xsd:extension base="forwardingCatchAllStrategyType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- Message Info Mappers -->
+
+    <xsd:element name="expression-message-info-mapping" type="expressionMessageInfoMappingType"
+                 substitutionGroup="abstract-message-info-mapping">
+        <xsd:annotation>
+            <xsd:documentation>
+                Allows expressions to be configured to extract the message information.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <xsd:complexType name="expressionMessageInfoMappingType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractMessageInfoMappingType">
+                <xsd:attribute name="messageIdExpression" type="xsd:string" use="required"/>
+                <xsd:attribute name="correlationIdExpression" type="xsd:string" use="required"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="custom-message-info-mapping" type="customMessageInfoMappingType"
+                 substitutionGroup="abstract-message-info-mapping">
+        <xsd:annotation>
+            <xsd:documentation>
+                This allows configuraton of a custom implementation of MessageInfoMapping
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="customMessageInfoMappingType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractMessageInfoMappingType">
+                <xsd:sequence>
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                </xsd:sequence>
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the MessageInfoMapping interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <!--==============================================================-->
+    <!--  Lifecycle Adapters                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-lifecycle-adapter-factory" abstract="true" type="abstractLifecycleAdapterFactory"/>
+    <xsd:complexType name="abstractLifecycleAdapterFactory">
+        <xsd:annotation>
+            <xsd:documentation>
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:complexType>
+    <xsd:complexType name="customLifecycleAdapterFactory">
+        <xsd:complexContent>
+            <xsd:extension base="abstractLifecycleAdapterFactory">
+                <xsd:attribute name="class" type="substitutableClass" use="required">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            An implementation of the LifecycleAdapter interface.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+    <xsd:element name="custom-lifecycle-adapter-factory" type="customLifecycleAdapterFactory"
+                 substitutionGroup="abstract-lifecycle-adapter-factory">
+        <xsd:annotation>
+            <xsd:documentation>
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+
+    <!--==============================================================-->
+    <!--  Object Factories                                            -->
+    <!--==============================================================-->
+
+    <xsd:element name="abstract-object-factory" abstract="true" type="abstractObjectFactoryType"/>
+    <xsd:complexType name="abstractObjectFactoryType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A factory which will be used by Mule to create new instances of this object
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:sequence>
+            <xsd:group ref="propertiesGroup">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Properties to be set on the created object
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:group>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="genericObjectFactoryType">
+        <xsd:sequence>
+            <xsd:element ref="abstract-object-factory"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:element name="spring-object" type="springBeanLookupType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="springBeanLookupType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="bean" type="substitutableName">
+                    <xsd:annotation>
+                        <xsd:documentation>Name of Spring bean to look up</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="singleton-object" type="singletonObjectFactoryType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="singletonObjectFactoryType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>Class name</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="prototype-object" type="prototypeObjectFactoryType" substitutionGroup="abstract-object-factory"/>
+    <xsd:complexType name="prototypeObjectFactoryType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractObjectFactoryType">
+                <xsd:attribute name="class" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>Class name</xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:element name="abstract-pooling-profile" abstract="true" type="abstractPoolingProfileType"/>
+    <xsd:complexType name="abstractPoolingProfileType"/>
+
+    <xsd:element name="pooling-profile" type="poolingProfileType" substitutionGroup="abstract-pooling-profile"/>
+    <xsd:complexType name="poolingProfileType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractPoolingProfileType">
+                <xsd:attribute name="maxActive" type="xsd:string"/>
+                <xsd:attribute name="maxIdle" type="xsd:string"/>
+                <xsd:attribute name="initialisationPolicy" default="INITIALISE_ONE">
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="INITIALISE_NONE"/>
+                            <xsd:enumeration value="INITIALISE_ONE"/>
+                            <xsd:enumeration value="INITIALISE_ALL"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="exhaustedAction" default="WHEN_EXHAUSTED_GROW">
+                    <xsd:simpleType>
+                        <xsd:restriction base="xsd:NMTOKEN">
+                            <xsd:enumeration value="WHEN_EXHAUSTED_GROW"/>
+                            <xsd:enumeration value="WHEN_EXHAUSTED_WAIT"/>
+                            <xsd:enumeration value="WHEN_EXHAUSTED_FAIL"/>
+                        </xsd:restriction>
+                    </xsd:simpleType>
+                </xsd:attribute>
+                <xsd:attribute name="maxWait" type="xsd:string"/>
+                <!-- <xsd:attribute name="factory" type="xsd:string" default="org.mule.config.pool.CommonsPoolFactory"/> -->
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--  Utils / Standard Types                                      -->
+    <!--==============================================================-->
+
+
+    <xsd:complexType name="abstractAgentType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A placeholder for agents. Not used in core, but common to several modules.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="abstractExtensionType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsIndirectKeyStore, named as tls-client in transport namespace -->
+    <xsd:complexType name="tlsClientKeyStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configure client key stores.
+                TLS/SSL connections are made on behalf of an entity, which can be anonymous or identified by a
+                certificate - this interface specifies how a keystore can be used to provide the certificates
+                (and associated private keys) necessary for identification.
+                This is also used as the trust store if no other trust store is specified and the
+                explicitTrustStoreOnly parameter in the server trust store configuration is false.
+                WARNING - due to restrictions in library implementations the values specified here typically apply
+                to all connectors using this transport.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if
+                    possible) of the keystore that contains public certificates and private keys for identification.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the keystore.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The type of keystore used (a Java class name).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsDirectKeyStore, named as tls-key-store in transport namespace -->
+    <xsd:complexType name="tlsKeyStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configure key stores.
+                TLS/SSL connections are made on behalf of an entity, which can be anonymous or identified by a
+                certificate - this interface specifies how a keystore can be used to provide the certificates
+                (and associated private keys) necessary for identification.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if
+                    possible) of the keystore that contains public certificates and private keys for identification.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="class" type="substitutableClass">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The type of keystore used (a Java class name).
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="keyPassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the private key.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protect the keystore.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="algorithm" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The algorithm used by the key store.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsIndirectTrustStore, named as tls-trust-store in transport namespace -->
+    <xsd:complexType name="tlsTrustStoreType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configure a trust store.
+                TLS/SSL connections are made to trusted systems - the public certificates of trusted systems are store
+                in a keystore (called a trust store) and used to verify that the connection made to a remote system
+                "really is" the expected identity.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="path" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The location (which will be resolved relative to the current classpath and file system, if
+                    possible) of the keystore that contains public certificates of trusted servers.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+        <xsd:attribute name="storePassword" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    The password used to protected the trust store.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsDirectTrustStore, named as tls-server in transport namespace
+         note that this extends tlsTrustStoreType, so only one of the two is needed -->
+    <xsd:complexType name="tlsServerTrustStoreType">
+        <xsd:complexContent>
+            <xsd:extension base="tlsTrustStoreType">
+                <xsd:attribute name="class" type="substitutableClass"/>
+                <xsd:attribute name="algorithm" type="xsd:string"/>
+                <!-- should be of type TrustManagerFactory -->
+                <xsd:attribute name="factory-ref" type="xsd:NMTOKEN"/>
+                <xsd:attribute name="explicitOnly" type="substitutableBoolean"/>
+                <xsd:attribute name="requireClientAuthentication" type="substitutableBoolean"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!-- corresponds to TlsProtocolHandler, named as tls-protocol-handler -->
+    <xsd:complexType name="tlsProtocolHandler">
+        <xsd:annotation>
+            <xsd:documentation>
+                Configure the global Java protocol handler.
+                WARNING - Untested.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:attribute name="property" type="xsd:string">
+            <xsd:annotation>
+                <xsd:documentation>
+                    Set the java.protocol.handler.pkgs system property.
+                </xsd:documentation>
+            </xsd:annotation>
+        </xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:simpleType name="propertyPlaceholderType">
+        <xsd:annotation>
+            <xsd:documentation>
+                A type that defines an Ant-style property placeholder
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:restriction base="xsd:string">
+            <xsd:pattern value="(\$\{[^\}]+\})"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableClass">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:NMTOKEN-like type that also allows for Ant-style property placeholders
+                and a leading [
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:pattern value="\[?[A-Za-z0-9_\.$]+"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="nonBlankString">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:string-like type that cannot be empty
+                (is there a better way?)
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:string">
+                    <xsd:pattern value=".*[^ ]+.*"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableName">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:NMTOKEN type that also allows for Ant-style property placeholders.
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:NMTOKEN"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutablePortNumber">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:int type that also allows for Ant-style property placeholders and restrict the
+                int value to a valid port number
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:int">
+                    <xsd:minInclusive value="0"/>
+                    <xsd:maxInclusive value="65536"/>
+                </xsd:restriction>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableInt">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:int type that also allows for Ant-style property placeholders
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:int"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableLong">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:long type that also allows for Ant-style property placeholders
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:long"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="substitutableBoolean">
+        <xsd:annotation>
+            <xsd:documentation>
+                A custom xsd:boolean type that also allows for Ant-style property placeholders
+            </xsd:documentation>
+        </xsd:annotation>
+        <xsd:union>
+            <xsd:simpleType>
+                <xsd:restriction base="propertyPlaceholderType"/>
+            </xsd:simpleType>
+            <xsd:simpleType>
+                <xsd:restriction base="xsd:boolean"/>
+            </xsd:simpleType>
+        </xsd:union>
+    </xsd:simpleType>
+
+    <!-- i found this a bit confusing, so here's some background...
+         this type is typically called from something like
+           <xsd:element name="properties" type="mapType/>
+         and the "properties" element generates a ChildMapDefinitionParser that
+         can "receive" the map entries generated by the embedded spring <entry..>
+         elements and which is then set via "setProperties" on the parent.
+         in other words, it's a map, and despite the name "properties" has
+         nothing to do with the spring <property ...> element.
+         spring elements like <entry...> are handled by
+         MuleHierarchicalBeanDefinitionParserDelegate which punts them to
+         the spring handler -->
+    <xsd:element name="properties" type="mapType">
+        <xsd:annotation>
+            <xsd:documentation>
+                Set Mule properties.
+                These are name/value pairs that can be set on components, services, etc,
+                and which provide a generic way of configuring the system.
+                In Mule v2 you typically shouldn't need to use generic properties like
+                this, since almost all functionality is exposed via dedicated elements.
+                However, they can be useful in configuring obscure or overlooked options
+                and in configuring transports from the generic endpoint elements.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:element>
+    <xsd:complexType name="mapType">
+        <xsd:complexContent>
+            <xsd:extension base="spring:mapType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:group name="propertiesGroup">
+        <xsd:sequence>
+            <xsd:element name="property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Set a Mule property.
+                        This is a name/value pair that can be set on components, services, etc,
+                        and which provide a generic way of configuring the system.
+                        In Mule v2 you typically shouldn't need to use a generic property like
+                        this, since almost all functionality is exposed via dedicated elements.
+                        However, it can be useful in configuring obscure or overlooked options
+                        and in configuring transports from the generic endpoint elements.
+                    </xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element ref="properties" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:complexType name="listOrSetType">
+        <xsd:complexContent>
+            <xsd:extension base="spring:listOrSetType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="referenceType">
+        <xsd:attribute name="ref" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="keyType">
+        <xsd:attribute name="key" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="valueType">
+        <xsd:attribute name="value" type="xsd:string"/>
+        <xsd:attribute name="value-ref" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="keyValueType">
+        <xsd:complexContent>
+            <xsd:extension base="keyType">
+                <xsd:attribute name="value" type="xsd:string"/>
+                <xsd:attribute name="value-ref" type="xsd:NMTOKEN"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <!--==============================================================-->
+    <!--   Connector support                                          -->
+    <!--==============================================================-->
+
+    <xsd:complexType name="connectorType">
+        <xsd:complexContent>
+            <xsd:extension base="abstractConnectorType">
+                <xsd:sequence>
+                    <!-- for normal connectors, this is for emergency use only, but it is
+                         critical for custom connector -->
+                    <xsd:element ref="spring:property" minOccurs="0" maxOccurs="unbounded"/>
+                    <xsd:element name="receiver-threading-profile" type="threadingProfileType" minOccurs="0"/>
+                    <xsd:element name="dispatcher-threading-profile" type="threadingProfileType" minOccurs="0"/>
+                    <xsd:element ref="abstract-exception-strategy" minOccurs="0"/>
+                    <xsd:element name="service-overrides" type="serviceOverridesType" minOccurs="0"/>
+                </xsd:sequence>
+                <xsd:attribute name="createDispatcherPerRequest" type="substitutableBoolean"/>
+                <xsd:attribute name="createMultipleTransactedReceivers" type="substitutableBoolean"/>
+                <xsd:attribute name="numberOfConcurrentTransactedReceivers" type="substitutableInt"/>
+                <xsd:attribute name="dynamicNotification" type="substitutableBoolean"/>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="serviceOverridesType">
+        <xsd:attribute name="messageReceiver" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="transactedMessageReceiver" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="dispatcherFactory" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="inboundTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="outboundTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="responseTransformer" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="endpointBuilder" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="messageAdapter" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="streamMessageAdapter" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="serviceFinder" type="xsd:NMTOKEN"/>
+        <xsd:attribute name="sessionHandler" type="xsd:NMTOKEN"/>
+    </xsd:complexType>
+
+    <!--==============================================================-->
+    <!--   JNDI support                                               -->
+    <!--==============================================================-->
+
+    <xsd:complexType name="jndiConnectorType">
+        <xsd:complexContent>
+            <xsd:extension base="connectorType">
+                <xsd:sequence>
+                    <xsd:element name="jndi-provider-property" type="keyValueType" minOccurs="0" maxOccurs="unbounded">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Direct setting of a JNDI property.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="jndi-provider-properties" type="mapType" minOccurs="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Direct setting of JNDI properties
+                                (this allows access to the full Spring map entry).
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+                <xsd:attribute name="jndiContext-ref" type="xsd:NMTOKEN">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Set the complete context directly, via a bean reference.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiInitialFactory" type="substitutableClass">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The initial context factory to use. The value
+                            of the property should be the fully qualified class name
+                            of the factory class that will create an initial context.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiProviderUrl" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The service provider to use. The value of the property
+                            should contain a URL string (e.g. "ldap://somehost:389").
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+                <xsd:attribute name="jndiUrlPkgPrefixes" type="xsd:string">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            The list of package prefixes to use when
+                            loading in URL context factories. The value
+                            of the property should be a colon-separated list of package
+                            prefixes for the class name of the factory class that will create
+                            a URL context factory.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:attribute>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="dataReferenceType" mixed="true">
+        <xsd:attribute name="file" type="xsd:string"/>
+        <xsd:attribute name="ref" type="xsd:string"/>
+        <!--I don't like this flag, may be we could use content-type mappings... -->
+        <xsd:attribute name="binary" type="substitutableBoolean"/>
+    </xsd:complexType>
+
+    <!-- these cannot be references (unless we use qualified attribute names, which are ugly),
+         but serve as templates to cut+paste in individual transports
+
+    <xsd:attribute name="path" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A file location.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="user" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A username.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="password" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                A password.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="host" type="xsd:string">
+        <xsd:annotation>
+            <xsd:documentation>
+                An IP address (eg www.mulesource.com, localhost, 127.0.0.1).
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    <xsd:attribute name="port" type="substitutablePortNumber">
+        <xsd:annotation>
+            <xsd:documentation>
+                A port number.
+            </xsd:documentation>
+        </xsd:annotation>
+    </xsd:attribute>
+
+    -->
+
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/mylib.jar b/xml/tests/testData/xml/mylib.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8c2612b7a22d871a5d3ede4863af0e9306c1fdb6
GIT binary patch
literal 6524
zcmaJ`1yCGYv&P+mhv2YSSONqO?zXtQyIXJw?k>yX9^Bo6y9E{q5F7$wkq|W4Oa6NA
z-uwUc-s@9SbEc-d=S-ij>eJt+qJW4*2#5B2ct+9l!u><g;gH}!QW|1FIVI^gPZMx(
zh;S+jsAzvQ5dK?D<^MD${H^hqF-S~FPFhM`gAFA86Erocr~qV}$5sHc%uLNTsj)A<
z-P(6!lLxWNf#y9ck<h`1FNa@&nQf3V514PQ7)bU>w23oI4v1fS9{`SRFWi2(!T)O^
zN;|m|GQU6b=lXjgy8rPPM8Dr!yP3M!I645`J={FaJv`kk*}UB?P7L*(*Z7D7XY00n
zgQYO&y{vC+1yem@k6<PZj@H5BW;Zn|^a8{z>XfRLsX={$ktE6Z%#*ILImd^&5uV}6
zj=)Gk!Kb6?$4Y8ro8g}+hM?a3-n{M(;dl2(d9yy9B~@W~ZqhLAT#fh5PvB}MV@Bp4
z2<x%0Q2z93rA3bck@|y3RSIb4w9L|zmjIDnnBU#6A6G_XEyyFVZFcbHWG;K!s`Kt$
z>+{<2^5*Q*&GsWzyUTN^)Qs?b-s4jwRUmk~jo`B`3-B<e@mIcOi?0lcocf}6sz`Rp
z7zzKhKry|i;eHzkl)Hr8v}zp77%YTtZkf9n;<&tm>YtHri)g+*3f%PmqG8SlRg$ju
zGNM<+%W8~<<*&0ct8yl1XaZJ@8x;lRzo#rt<`4)8j33fkr^PA{6L>;PJk<f=uu@q{
z8>tE8z`NH|!Tz$9v(u1nl3ng`3c$D9ACWh8Wf#e9Qa!BMT>!bUuI%@cam}?8Z+xVi
zF!}2tnlr=qYG~io;_Anb0ps>chXJ6Mvb>o+@hOlj6{N3wpV`Be&wLpC<aDlAPM73{
zZD)u9mtHh}@MdY%-qecchAwBA03yS=n8q}DmItom3le10rDUYVb^jK&DoA}^LIl!M
zim2S=jb#i)f(EAnl^2RV1V&TjywUwKLtH$tlw0m|nj0G+5udyRO5vuRJ`G8g(%oJL
zK6{Yde)4CQ#fsB#K91x@?q@YQvE&ZFc{fiflGNNM?8gR_;yy{<sgrsvZj{IuWvwk2
z2Uc3Jyh_o$5Ord<<<nG)Z&u*caQ<Oisv*#1QxRR)32i<}B+SdKr>oK&4{>j>DinAL
zR!}3fV(Y5F`W|-#)6RLR_-MD2wQ0d~8+HKs88wf3gH99JPqW9Gd%cV}XeF0R?l(1i
zxqUd9M)_l9kXAiWi0SoPUl@n2*ZWJ3egjIssZ#b6s5@&$ql4iA>=1KF_=J5hPbk0b
zzQdpf(^q-Ur`UYVG-v7VHLLBm3bI&B9aujBbL#La{6QT;cBQl;aFq%9_^9;Ycm?lU
z)hk86<&Vx;-pj@Lal?MTU0N0)pQ((Wl8_@eVz#2iTPX!Y*wn3XKuCbv(6iA0TCYAy
zD{duWb>LlC&Zdp19y%9O6pPCz9{E*|62Tsn0yc&TcW{XXo@BbX7m~g4$!Q_f&bgp?
z>DZ9WKM@n0q#3B(R22=T|B4!Q%ADDEsGCd#%0!>Mn}{kgQNuP(p-y-qFz5k%&$FN|
zGj<<~BEJCb45YS4Pn?sh#Cf8lCXmqplwc>PVnOyo<I*%4C=uY&Ev@W!YBIoiIW$Y3
z%1vi{xgJcKrWODgMZTTby(TSr6=yj0Kn~IjEC8<Au$(LRozm8zbsFlZlC79cN1cZ3
z&uTz}2_XiTWT#v_jnh3LI}slPVVeKV{p{JsMt3gc2O*sl<IfCics8aHTMoAy`o$_n
zJ-RH0iYlFwa;T=-myfvzjsu9lYS6#))e<KwxeRL){5ToK<?VaC&rBphBdcW~dTbgG
zM`?B~(Z*kOMz}cFsW=};iMVA*ny86FxlJRTecMugP}+HA7$jA@KuK$ohkT@6TR2$~
z6&>iq@GH`hgAD|kj~gVI3Xy+Wd5w>MrTGQD&~?>|8oR8*I^$M7Mg4>H&+vI?b0Gu$
zhSV=@IjRpC#y-FDezXZyjy@sU8!7fFzmVucEU%5F5Q|o!*#Gc?Hb8;GG}5NfOU+z$
zRHWKP(w@%g?P_h?vG+-Ma3#I?7Il)GeW^}OmxgjTFvg7z{0qQLHu0_gosXDHEeR6s
z5GF$5CNhWW7IMFkU+|(;s>yr9rg8w$xZ7SvE62P(06p$)Hv~@GDir8)t-t!|b1T<}
zVJBO&sK!zX6^AvOn2g4kYSTr@_y<}pgSE(#)C~MMokU6c%cU@SF@r4&KF`LFEcc&z
zGRpDHn>If;SKLDPS_)X3vAAUxpnl?s&WWvb)bTIo?%|H|;Cd6K0zB{$3efk-zAEO^
z*xSa3sRbCLr2v*n65^ZiTXXT6z#t*QpHHD~kpsd>BOT4e0rEJ~ftUf_i4sMn*RqGE
zuLzzj)T-G>y$$Lz1MpFF&hTW+!(8=;Y=Hxjevh@LZI*+arm{fg?@FTEx0YGu9*Q!x
zd+*#`MZ<zz5$@WsOX9Z1h-E$3M+&GK2)VquUR9+esL$87Q-DBzF2)q880*C5<fn*F
zO9uDw!Gde^i<fUsUHe5DTrkP!4e$!zd_OA=2@pCYK3|`4a=v99CrK5=T01k>cV1X*
z^$gU1@V4)UuKH%La2OUuQ&b^CF3kiamS$qQ4%XMQ1<1I=-0#0k1N_r*wp~t5GDYKu
z6hY#h+mN_dIF!}8N*13Jt?7v*dbw8TmL-ht>~=e+)yfVADm8FIX*!jR@K`Gp@y(vo
zU3LYd@otvHzW6Qfb(<oWM51(U+e6F*xH|$|)Fo?9NgPK;su<Ivx2|nBZOt%N<Zcxe
zeSKWBI-`3yY;Crc-jcrZ$@H=4JDe4A7>%3!9OoWeU&fTPgPwI>8!Fl1O{^ZJTf}IJ
z!Eto<u`KD*VVjL-#(8s$^;U?Cx3N6@hs9$GnA<cb-qkyZo(}OjuRZJN6&dv&^2YYW
zOFLq{Gje=tkJZpEi5VQbI5cz!-4ulgx_j8|RYy|RXf3Q2R|tnHzE$8U?b+taEN9-8
z@1c5(!OF}Fh^2CJUfBCZ#IeFtKLZ)0vzVeCSO_hfu=gZ=XO{hNUXrFD<f$Av&eWe~
z+|3>@(WZLUkN*12Wxjx^jEWZ9WmH;vY`S-c%-4_ONB9I<Z<#(u`6beSESH^0CTu~v
ztY8)pUM}i+<%56Q+9Q3#J-W^i&w=+oQF79Px1GF`;gxHNFb?NU_yIC+qA=hX?|h4<
zop*U?Pj(kD0A@{pGb_1~0i(5c-_=g7@B28qpScGMNdwh<R!D&8rZfTh0cJ+#jY=bo
zIY>M<4r(K`WZNJz_nZ4$VTXr<=sqv8p&64)9Qn+L*&}SF*_X|G@4V6Q;GR|eRB$h}
zy^T-ZV&Cjh2zI<FjY7}pQ+{r?P%L94&shXtd&*}cIMwx>z)89L+_5OSOKc-<kj?#I
z?PQQMrOF#${S~zJf{xZxoBbpt$Ze9K5aT%MW<9^o{SZbbB3?h)ErpBc!3;h%G`*=k
z<2Ty=TG1@O@)cD9MT#YK*B~G>3H9bucCvNDWa!#Gb{C)B!0GmANC-%+Y{&5I<|8M5
zxd4f|8MVY>@8~9{?{Ie(6el}|q>7rvRWzjR^Vhyeq1b1^b)f!msGaB!|2PXXksvV(
zwiygY)xES8cM6~KZ>@HSq6=O3#$p^W@QysH&{?-o3e5Dh<k#h?3NzH=8c$gZsU+8O
zSgc|_fFHjoWiGlPs#mM6PzynBL<%hwKcTH_w`rY<owDNUm&Gn><frM<pgHb)@Ek|M
zNXfcr{V=mygDGSq%j!oPO~tfoa|XjmR5H`J*cJG`B865OvMUr=(9SxUG2e{$ob6$*
zOcN;_5ACmH!z#N)T{eI>4k#QRB&-TOnh*@lwe5Q!ZC0j;<7`bE-=ld`^^A|Zm+ndN
zUVi2|{HsPgXjpz$R3dkL%2~K+oW7^6B!yHloz9QDnpp3FLjD8@rYw%gzEoqXK`?Jn
z*y{r`e`U-nWr3MRr%Mg0*)D}8%6{G#J?%-t9_P^Q51EW1GSF(=(qhIGwh>n3f`h58
zm^HCtjy=D@u=C;%r5KX~`yoqL2v}Y<N9RQNb&3(y%g(7nH?R*)l)o{Zh_iGR_kEVS
zXg0~-kzad2!9@>PdBV-ehxJC(JojoDeQ1o>590As?Nz=_r2fu$2X(iLds^hW4R;l@
z5N339!a7Z2a$&G?h$K)tlAgX7F67q0A^!CWqzuAQ5|ctg=rCryy0GKS{W^Vui9TnQ
ztZura85;EI<jkvByB2F|O^eq-bHP3~znip+#Qer!<P?w1(0EYY=xc}l4ejxp#y}U{
zvzhE1d%@=k;FDEwSJp!=8UhL%|BhAl#OhG7W))n6Ay6iDywq9-wIODH;W)qOV5s-X
z?tAx8ZIIGcyuoRpwxw?Nm@#`S2K22SnMrz{-x!K`zH;cNMF(>P(@}Wiue8jwiG3F8
zI$2`+`4?E=BIQO}Q`DYWAMB7Ql)Bj*!Q=C?S#*t%+Gzm4dl1iebRSx<+1Tl>oD&Jx
z2f5sEC~|udl%8b-Hj2?EKlCAs#{I=;LvbC=`CE_{5;`P=ky%H04VnYKE$*o??}<~k
z0qSI4_C`_gV#m{pySgkXxSokvYAEG-)}`oei5`{HQ{yS`C%OPbyElf(<PVHe1Nq1X
zFmTk)cf!yl3qlDtvM@*i>Rowa0inxVMu{zbyI*_0=(-L@oUKWszc5GIdR)fE&(Wim
zRxKG2sVMzU{CXqig&+h$;3l0GiBaS!$^THxml79;T#NM8ZTdxVknMJo;*X`RKzi%T
znK|tVu+gt`vGiePn_d!#v|;j|2VBdpm6=(p^difPaooz%2tIOeJxSo>0td}iJy~V!
zys!p^S!cJ6x1OSQCY>=j;rFf8Px0ob!J4tfg`6wJaW9g$(^T!`4T1H&*8RqSR_2d2
zWsj4zz^Yag*geeYf%P?fgHp$a@crUsX25dS;~91bRsPkSw1Z1hL|?5>2uHS`Ou#EN
zH+kch^lX2^ATp_=r&|RXxdN7@s9S98E#9{IZRX{>oO|*$U}nJCBnvWW*Z!}liumt3
zM$b;Qf@~vn*Hp*~WV*3T{z%x7%VuI1-@LC(g`Z5Sn#090_PWxvOumOuY~w20*1$5{
zV31EvlwTIeMT>+U4i=}?@j0D5C14fKWi6$mX4-AUOlZN8$i2RNVy67z7<+)Ff&uW@
zPOwg4U-s>EMP#|J!ut35(|Bfzqot{6L)E9(x8j-<Ub#*H@d4W8Bek~X4HXs*YxVDO
z_4V)V76z-;&Z3W|Js31NE1Z6I%CkJz#SO%ASLy40@Yre}{oLhse4DM_tMXXV&Rt&<
zxz`~~(f1^lXG~L6=L8@Ptf6C6s6jc;QP+WMC^ID2=Im$zAx>E2Qk~`QMP5lFNgD$E
zz5>It!@Vg8jYGsmtHbN{-HUWwZSk%y^Q_q%FBcN2?w|hv0LVSrG2FOtaAe8<U*C=S
zci;W5Zd-5Dd5s4zaMrlr?h_2|DcQ+cF1JXu(@ZB@s2LYALWq4yZd*Q;O=@^1sE>|0
zD-EFQhUe$W(?_4-{eF`|WFuE8@TXVL)*igZNC{Y~j*(=3?YOCl_ZY^Ry*U_yFFqrC
zJFih%;CzJ82*@2|?OgWt;m<9LVLK!7H+vq5sRhe2s+Fp9Q8yk|R}LG&fchjo27X6S
zJ8s=ahvjDv*B`#WM#~fPf!B`3pG@J!pJ|~xDEJU}q1fL2w5BkzZp(1Hnia#^!bSm-
z{$KXR8<H^?G~7_qe*3B+gV=pR-VvB3)qvtbrShC0na53vdh!e{Uh;x+?|M^Q8nG-E
zIziHl0NlM$)ypF~4t##l2X>BcK5=%uZ9I9FVKLtBK608Uiu7(f{$QtfrVeXWg<T0O
z8008Bd_PrZPEPXf-$^Z{D~x1m-5GqtU^r$?Fo-ga9}P#gDwcce5u1j;K}9D%V&3;=
zKNna2K!G-?sp;^wppr=qQEvNM@@7-b6-G+L{=(@Me38l+avkl$s7N12z<QI~J>LrT
z+;&mwdA;x5N`&?p>GcPF<IN9C7%;>oBj8I%(o-*45w_{*qmn#Ou0zA#IWhp@bJjD1
zw1T9{+x@0P)CnJtF;>p*WMjlTQbM0^%Fli+2xVgXv^})#O!_RJe!e!N&gXW)N%ia5
z`qriX;?5xeFv5`{YuS_(9ecIR_==X`f^J!xH2PSMMlTwpKh0{FQ=CX+clm`Wg!PcF
zzdh+4b^9@jfdObS9d}hbm^o~kd#J|h&?-3^17T2hGw|2Nz4MtfX7c--Nur^>4;SQ(
z3Y>(TY5be7r8;Y{KpXQ|?`QS7Jv_R9PH{}xGp4%k_enDNm8L3Ye<aUPBzk+FdZZ+e
zqd`quC=;fToFF>@7=F_*b;cJLr5a@#<ODG!na<HgLm*;l%Ow87$`Ty@vc;6B=v2ql
z;Jc35<B860$b7??6wBB*F*pb=bY`Z&sPnmp?QG;dl5EulQ#)dk-g<l#qgdi$#&qeJ
zPFa&$ypbGjrZmUC*t^5T0lu-V!89Sl>C#6d%1N-De2M`QI!9W|s5xJp=}ZO79+7~}
zZ0$SrE{zizUn-Ke)K{0uAVABn>}+>c>4Gh#Y%<1eC{k8inU!|r@}fv{o7d=p9{1HR
zqebVG;PgQXcB?)lsLqtZTV|q+RN6|J*EY%@rMw2oSADq~QFyLw)*1%WOBfXHwM!-8
zi76L=*68XliRs9m<8g1zp2j$Q1cQL9x|Dc|GCMc2?})Y5ZC(>z2{eS(EM1P*LyJyE
zwa!)wzv#6r4r$R014~G&QExSEWW}yv)A{igo=9Vqu!8FyjG?25*PB9`tSf;UKLRNr
zESd^$z$}=ZR-|Qw?wb{O48iM(JZr*~5JAwj5l^^9t#X3ItEnD2jjIbZ*2-7@{al>T
ztl@I#4)w+pNa<*uV>M?^i@<svX?I2N2pTcV{5g7h(t3~b#J8p?P`=MYe)0ABwKF6^
zs>f0PS>0KphvLnQ-J6)+Z$FIR?w#Hlqu^58h4%f>;-p}3i1(OF!Q#p0pvEj1=mxds
za8KyKxLep;_+Ci=;HIP+Y^vrH*9*nBpne+4?LoX+zWaz#CTKK^Gs5HqkLYN!zHa?-
zOMixNNLvzv$y_gv3pJ3HgEUzhEp$TE%w*>LQ@wY+<BU){>H#^c`TSQi1kjqHG-Xca
z!AN>!hqUW^`!?^DRoqFMZ$uoKBx$MBLK-r_JjVcT&)!M<xo^&`%>EG_F5z4IDs6@P
zwz+89vbvfo%mx$~tjU!-{YcFcE2jYz{y~S>pYG97(>_*y6zRCmsbB6;RquWjTyQ^p
z%2oah?92B|atiw9V)rxjdiw*A*iuIQ=EUWzdQ%O_UA?uTP=`-{f~i<8*C>RbnbZ%x
z+4lL%k{tJBeAGMN{d9+ulx*MPdd9~1*alsD+U(8(`I}v-{KnmBfLE6juV!qIomY(s
zFGFhH@al`%C$B|+KW@s|yh{$}x%lQ?bV>_?nK0LO2cLb)K>6+R>?hPe<zrbZ@DK&%
zH#!Xb|H=pY@ABd8VC!W6r+7fqyPO8t2_xRqZ}eXvn%FSng_TxnM0*v~EJDKw@S&L|
zRH^6Jo>*bQ@`#8MO<$g#-0uRa<H}13Ef7bn^gxFN%jF9n*N(hKN-4hZA&<+oNnBI8
zH6i%#;ycWkgXai2s5rC;rRuz4woPWC+b(1B$raA>m3*ib%Ed4y^5)4I$!p$Wi9Qh%
z<GQ9B6?(@51bBQxVSBoK>TRX1uv!Wd-IV?mO8x|!#&8Kfnq0famY3X$X=g#=uGxry
z$<PTaP7={#7T<HWY7s%g6MU^~lxkf3;u{ES`;{uoXXgr{cpOhnY9_}1b2z7V7ZpYm
zNAff@yCZvNKzIVb-2#pq!SWn9_qxFzoco^K%Wjel0w$AXs;I`&a%p+Y=~EeC!-%`4
zBuDl;d&0Y2bzU-w;AL^Bj2&SQHn_!X-(+QCT6LZlWqY9OF*6fysR54=){+vJ60O_n
zdB-J~|Ag9dFFfQaoe?x=7a!Dn3C{<eb8zTwTvK0K=0HU-`kvtbY@7(fU1<nB9Gvp+
z%~Mf;M<9gzci!NCNP$1R!N1F2M8F>w;Xh6P3FH4^4gMCP-_yTL|G^>r)59OQ|DOkv
zKXCuwGV*)+zk>h&>EfSB`RC;Fw+Q3?<>F5&{-@zTgYqY5|CRvae`K(V0`l*u!NDQ_
O9_+tk$V2+)>AwJ+A?J($

literal 0
HcmV?d00001

diff --git a/xml/tests/testData/xml/relaxng.xsd b/xml/tests/testData/xml/relaxng.xsd
new file mode 100644
index 000000000000..5a3d36ff7abe
--- /dev/null
+++ b/xml/tests/testData/xml/relaxng.xsd
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://relaxng.org/ns/structure/fake/1.0" xmlns:structure="http://relaxng.org/ns/structure/fake/1.0">
+  <xs:group name="pattern">
+    <xs:choice>
+      <xs:element ref="structure:element"/>
+      <xs:element ref="structure:attribute"/>
+      <xs:element ref="structure:group"/>
+      <xs:element ref="structure:interleave"/>
+      <xs:element name="choice">
+        <xs:complexType>
+          <xs:group ref="structure:open-patterns"/>
+          <xs:attributeGroup ref="structure:common-atts"/>
+        </xs:complexType>
+      </xs:element>
+      <xs:element ref="structure:optional"/>
+      <xs:element ref="structure:zeroOrMore"/>
+      <xs:element ref="structure:oneOrMore"/>
+      <xs:element ref="structure:list"/>
+      <xs:element ref="structure:mixed"/>
+      <xs:element ref="structure:ref"/>
+      <xs:element ref="structure:parentRef"/>
+      <xs:element ref="structure:empty"/>
+      <xs:element ref="structure:text"/>
+      <xs:element ref="structure:value"/>
+      <xs:element ref="structure:data"/>
+      <xs:element ref="structure:notAllowed"/>
+      <xs:element ref="structure:externalRef"/>
+      <xs:element ref="structure:grammar"/>
+    </xs:choice>
+  </xs:group>
+  <xs:element name="element">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:group minOccurs="0" ref="structure:open-name-class"/>
+        <xs:group ref="structure:open-patterns"/>
+      </xs:sequence>
+      <xs:attribute name="name" type="xs:QName"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="attribute">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:group minOccurs="0" ref="structure:open-name-class"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:group ref="structure:other"/>
+          <xs:group ref="structure:pattern"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attributeGroup ref="structure:common-atts"/>
+      <xs:attribute name="name" type="xs:QName"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="group">
+    <xs:complexType>
+      <xs:group ref="structure:open-patterns"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="interleave">
+    <xs:complexType>
+      <xs:group ref="structure:open-patterns"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="optional">
+    <xs:complexType>
+      <xs:group ref="structure:open-patterns"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="zeroOrMore">
+    <xs:complexType>
+      <xs:group ref="structure:open-patterns"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="oneOrMore">
+    <xs:complexType>
+      <xs:group ref="structure:open-patterns"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="list">
+    <xs:complexType>
+      <xs:group ref="structure:open-patterns"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="mixed">
+    <xs:complexType>
+      <xs:group ref="structure:open-patterns"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ref">
+    <xs:complexType>
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="parentRef">
+    <xs:complexType>
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="empty">
+    <xs:complexType>
+      <xs:group ref="structure:other"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="text">
+    <xs:complexType>
+      <xs:group ref="structure:other"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="value">
+    <xs:complexType mixed="true">
+      <xs:attribute name="type" type="xs:NCName"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="data">
+    <xs:complexType>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:group ref="structure:other"/>
+        <xs:choice>
+          <xs:element ref="structure:param"/>
+          <xs:element name="except">
+            <xs:complexType>
+              <xs:group ref="structure:open-patterns"/>
+              <xs:attributeGroup ref="structure:common-atts"/>
+            </xs:complexType>
+          </xs:element>
+        </xs:choice>
+      </xs:choice>
+      <xs:attribute name="type" use="required" type="xs:NCName"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="param">
+    <xs:complexType mixed="true">
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="notAllowed">
+    <xs:complexType>
+      <xs:group ref="structure:other"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="externalRef">
+    <xs:complexType>
+      <xs:group ref="structure:other"/>
+      <xs:attribute name="href" use="required" type="xs:anyURI"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="grammar">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="structure:grammar-content">
+          <xs:attributeGroup ref="structure:common-atts"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:complexType name="grammar-content">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="structure:other"/>
+      <xs:choice>
+        <xs:element ref="structure:start"/>
+        <xs:element ref="structure:define"/>
+        <xs:element name="div">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="structure:grammar-content">
+                <xs:attributeGroup ref="structure:common-atts"/>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+        <xs:element ref="structure:include"/>
+      </xs:choice>
+    </xs:choice>
+  </xs:complexType>
+  <xs:element name="include">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="structure:include-content">
+          <xs:attribute name="href" use="required" type="xs:anyURI"/>
+          <xs:attributeGroup ref="structure:common-atts"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:complexType name="include-content">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="structure:other"/>
+      <xs:choice>
+        <xs:element ref="structure:start"/>
+        <xs:element ref="structure:define"/>
+        <xs:element name="div">
+          <xs:complexType>
+            <xs:complexContent>
+              <xs:extension base="structure:include-content">
+                <xs:attributeGroup ref="structure:common-atts"/>
+              </xs:extension>
+            </xs:complexContent>
+          </xs:complexType>
+        </xs:element>
+      </xs:choice>
+    </xs:choice>
+  </xs:complexType>
+  <xs:element name="start">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="structure:open-pattern">
+          <xs:attributeGroup ref="structure:combine-att"/>
+          <xs:attributeGroup ref="structure:common-atts"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="define">
+    <xs:complexType>
+      <xs:group ref="structure:open-patterns"/>
+      <xs:attribute name="name" use="required" type="xs:NCName"/>
+      <xs:attributeGroup ref="structure:combine-att"/>
+      <xs:attributeGroup ref="structure:common-atts"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="combine-att">
+    <xs:attribute name="combine">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="choice"/>
+          <xs:enumeration value="interleave"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+  <xs:group name="open-patterns">
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:group ref="structure:other"/>
+        <xs:group ref="structure:pattern"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:group>
+  <xs:complexType name="open-pattern">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="structure:other"/>
+      <xs:group ref="structure:pattern"/>
+    </xs:choice>
+  </xs:complexType>
+  <xs:group name="name-class">
+    <xs:choice>
+      <xs:element ref="structure:name"/>
+      <xs:element ref="structure:anyName"/>
+      <xs:element ref="structure:nsName"/>
+      <xs:element name="choice">
+        <xs:complexType>
+          <xs:complexContent>
+            <xs:extension base="structure:open-name-classes">
+              <xs:attributeGroup ref="structure:common-atts"/>
+            </xs:extension>
+          </xs:complexContent>
+        </xs:complexType>
+      </xs:element>
+    </xs:choice>
+  </xs:group>
+  <xs:element name="name">
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base="xs:QName">
+          <xs:attributeGroup ref="structure:common-atts"/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="anyName">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="structure:except-name-class">
+          <xs:attributeGroup ref="structure:common-atts"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="nsName">
+    <xs:complexType>
+      <xs:complexContent>
+        <xs:extension base="structure:except-name-class">
+          <xs:attributeGroup ref="structure:common-atts"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+  <xs:complexType name="except-name-class">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="structure:other"/>
+      <xs:element ref="structure:except"/>
+    </xs:choice>
+  </xs:complexType>
+  <xs:element name="except" type="structure:open-name-classes"/>
+  <xs:complexType name="open-name-classes">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="structure:other"/>
+      <xs:group ref="structure:name-class"/>
+    </xs:choice>
+  </xs:complexType>
+  <xs:group name="open-name-class">
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:group ref="structure:other"/>
+        <xs:group ref="structure:name-class"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:group>
+  <xs:attributeGroup name="common-atts">
+    <xs:attribute name="ns"/>
+    <xs:attribute name="datatypeLibrary" type="xs:anyURI"/>
+    <xs:anyAttribute namespace="##other" processContents="skip"/>
+  </xs:attributeGroup>
+  <xs:group name="other">
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:any namespace="##other" processContents="skip"/>
+        <xs:any namespace="##local" processContents="skip"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:group>
+  <xs:group name="any">
+    <xs:sequence>
+      <xs:any processContents="skip"/>
+    </xs:sequence>
+  </xs:group>
+</xs:schema>
diff --git a/xml/tests/testData/xml/rootTag1.xml b/xml/tests/testData/xml/rootTag1.xml
new file mode 100644
index 000000000000..e976b69790f1
--- /dev/null
+++ b/xml/tests/testData/xml/rootTag1.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE tv [ <!ELEMENT tv (date)*> <!ELEMENT date (#PCDATA)> ]>
+
+<tv>
+  <<error>xxx</error>></<error>xxx</error>>
+</tv>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/soap-encoding.xsd b/xml/tests/testData/xml/soap-encoding.xsd
new file mode 100644
index 000000000000..87ea88850714
--- /dev/null
+++ b/xml/tests/testData/xml/soap-encoding.xsd
@@ -0,0 +1,536 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!-- Schema for the SOAP/1.1 encoding
+
+     This schema has been produced using W3C's SOAP Version 1.2 schema
+     found at:
+
+     http://www.w3.org/2001/06/soap-encoding
+
+     Copyright 2001 Martin Gudgin, Developmentor.
+	 http://www.develop.co.uk
+
+     Changes made are the following:
+     - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
+     - reverted root to only allow 0 and 1 as lexical values
+
+	 Further changes:
+
+	 - removed default value from root attribute declaration - 20030314
+
+     Original copyright:
+     
+     Copyright 2001 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
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:tns="http://schemas.xmlsoap.org/soap/encoding/"
+           targetNamespace="http://schemas.xmlsoap.org/soap/encoding/" >
+        
+ <xs:attribute name="root" >
+   <xs:annotation>
+     <xs:documentation>
+	   'root' can be used to distinguish serialization roots from other
+       elements that are present in a serialization but are not roots of
+       a serialized value graph 
+	 </xs:documentation>
+   </xs:annotation>
+   <xs:simpleType>
+     <xs:restriction base='xs:boolean'>
+	   <xs:pattern value='0|1' />
+	 </xs:restriction>
+   </xs:simpleType>
+ </xs:attribute>
+
+  <xs:attributeGroup name="commonAttributes" >
+    <xs:annotation>
+	  <xs:documentation>
+	    Attributes common to all elements that function as accessors or 
+        represent independent (multi-ref) values.  The href attribute is
+        intended to be used in a manner like CONREF.  That is, the element
+        content should be empty iff the href attribute appears
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:attribute name="id" type="xs:ID" />
+    <xs:attribute name="href" type="xs:anyURI" />
+    <xs:anyAttribute namespace="##other" processContents="lax" />
+  </xs:attributeGroup>
+
+  <!-- Global Attributes.  The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
+       
+  <!-- Array attributes. Needed to give the type and dimensions of an array's contents, and the offset for partially-transmitted arrays. -->
+   
+  <xs:simpleType name="arrayCoordinate" >
+    <xs:restriction base="xs:string" />
+  </xs:simpleType>
+          
+  <xs:attribute name="arrayType" type="xs:string" />
+  <xs:attribute name="offset" type="tns:arrayCoordinate" />
+  
+  <xs:attributeGroup name="arrayAttributes" >
+    <xs:attribute ref="tns:arrayType" />
+    <xs:attribute ref="tns:offset" />
+  </xs:attributeGroup>    
+  
+  <xs:attribute name="position" type="tns:arrayCoordinate" /> 
+  
+  <xs:attributeGroup name="arrayMemberAttributes" >
+    <xs:attribute ref="tns:position" />
+  </xs:attributeGroup>    
+
+  <xs:group name="Array" >
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+	</xs:sequence>
+  </xs:group>
+
+  <xs:element name="Array" type="tns:Array" />
+  <xs:complexType name="Array" >
+    <xs:annotation>
+	  <xs:documentation>
+	   'Array' is a complex type for accessors identified by position 
+	  </xs:documentation>
+	</xs:annotation>
+    <xs:group ref="tns:Array" minOccurs="0" />
+    <xs:attributeGroup ref="tns:arrayAttributes" />
+    <xs:attributeGroup ref="tns:commonAttributes" />
+  </xs:complexType> 
+
+  <!-- 'Struct' is a complex type for accessors identified by name. 
+       Constraint: No element may be have the same name as any other,
+       nor may any element have a maxOccurs > 1. -->
+   
+  <xs:element name="Struct" type="tns:Struct" />
+
+  <xs:group name="Struct" >
+    <xs:sequence>
+      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+	</xs:sequence>
+  </xs:group>
+
+  <xs:complexType name="Struct" >
+    <xs:group ref="tns:Struct" minOccurs="0" />
+    <xs:attributeGroup ref="tns:commonAttributes"/>
+  </xs:complexType> 
+
+  <!-- 'Base64' can be used to serialize binary data using base64 encoding
+       as defined in RFC2045 but without the MIME line length limitation. -->
+
+  <xs:simpleType name="base64" >
+    <xs:restriction base="xs:base64Binary" />
+  </xs:simpleType>
+
+ <!-- Element declarations corresponding to each of the simple types in the 
+      XML Schemas Specification. -->
+
+  <xs:element name="duration" type="tns:duration" />
+  <xs:complexType name="duration" >
+    <xs:simpleContent>
+      <xs:extension base="xs:duration" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="dateTime" type="tns:dateTime" />
+  <xs:complexType name="dateTime" >
+    <xs:simpleContent>
+      <xs:extension base="xs:dateTime" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+
+
+  <xs:element name="NOTATION" type="tns:NOTATION" />
+  <xs:complexType name="NOTATION" >
+    <xs:simpleContent>
+      <xs:extension base="xs:QName" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  
+
+  <xs:element name="time" type="tns:time" />
+  <xs:complexType name="time" >
+    <xs:simpleContent>
+      <xs:extension base="xs:time" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="date" type="tns:date" />
+  <xs:complexType name="date" >
+    <xs:simpleContent>
+      <xs:extension base="xs:date" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gYearMonth" type="tns:gYearMonth" />
+  <xs:complexType name="gYearMonth" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gYearMonth" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gYear" type="tns:gYear" />
+  <xs:complexType name="gYear" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gYear" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gMonthDay" type="tns:gMonthDay" />
+  <xs:complexType name="gMonthDay" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gMonthDay" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gDay" type="tns:gDay" />
+  <xs:complexType name="gDay" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gDay" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="gMonth" type="tns:gMonth" />
+  <xs:complexType name="gMonth" >
+    <xs:simpleContent>
+      <xs:extension base="xs:gMonth" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  
+  <xs:element name="boolean" type="tns:boolean" />
+  <xs:complexType name="boolean" >
+    <xs:simpleContent>
+      <xs:extension base="xs:boolean" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="base64Binary" type="tns:base64Binary" />
+  <xs:complexType name="base64Binary" >
+    <xs:simpleContent>
+      <xs:extension base="xs:base64Binary" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="hexBinary" type="tns:hexBinary" />
+  <xs:complexType name="hexBinary" >
+    <xs:simpleContent>
+     <xs:extension base="xs:hexBinary" >
+       <xs:attributeGroup ref="tns:commonAttributes" />
+     </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="float" type="tns:float" />
+  <xs:complexType name="float" >
+    <xs:simpleContent>
+      <xs:extension base="xs:float" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="double" type="tns:double" />
+  <xs:complexType name="double" >
+    <xs:simpleContent>
+      <xs:extension base="xs:double" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="anyURI" type="tns:anyURI" />
+  <xs:complexType name="anyURI" >
+    <xs:simpleContent>
+      <xs:extension base="xs:anyURI" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="QName" type="tns:QName" />
+  <xs:complexType name="QName" >
+    <xs:simpleContent>
+      <xs:extension base="xs:QName" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  
+  <xs:element name="string" type="tns:string" />
+  <xs:complexType name="string" >
+    <xs:simpleContent>
+      <xs:extension base="xs:string" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="normalizedString" type="tns:normalizedString" />
+  <xs:complexType name="normalizedString" >
+    <xs:simpleContent>
+      <xs:extension base="xs:normalizedString" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="token" type="tns:token" />
+  <xs:complexType name="token" >
+    <xs:simpleContent>
+      <xs:extension base="xs:token" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="language" type="tns:language" />
+  <xs:complexType name="language" >
+    <xs:simpleContent>
+      <xs:extension base="xs:language" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="Name" type="tns:Name" />
+  <xs:complexType name="Name" >
+    <xs:simpleContent>
+      <xs:extension base="xs:Name" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="NMTOKEN" type="tns:NMTOKEN" />
+  <xs:complexType name="NMTOKEN" >
+    <xs:simpleContent>
+      <xs:extension base="xs:NMTOKEN" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="NCName" type="tns:NCName" />
+  <xs:complexType name="NCName" >
+    <xs:simpleContent>
+      <xs:extension base="xs:NCName" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="NMTOKENS" type="tns:NMTOKENS" />
+  <xs:complexType name="NMTOKENS" >
+    <xs:simpleContent>
+      <xs:extension base="xs:NMTOKENS" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="ID" type="tns:ID" />
+  <xs:complexType name="ID" >
+    <xs:simpleContent>
+      <xs:extension base="xs:ID" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="IDREF" type="tns:IDREF" />
+  <xs:complexType name="IDREF" >
+    <xs:simpleContent>
+      <xs:extension base="xs:IDREF" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="ENTITY" type="tns:ENTITY" />
+  <xs:complexType name="ENTITY" >
+    <xs:simpleContent>
+      <xs:extension base="xs:ENTITY" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="IDREFS" type="tns:IDREFS" />
+  <xs:complexType name="IDREFS" >
+    <xs:simpleContent>
+      <xs:extension base="xs:IDREFS" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="ENTITIES" type="tns:ENTITIES" />
+  <xs:complexType name="ENTITIES" >
+    <xs:simpleContent>
+      <xs:extension base="xs:ENTITIES" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="decimal" type="tns:decimal" />
+  <xs:complexType name="decimal" >
+    <xs:simpleContent>
+      <xs:extension base="xs:decimal" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="integer" type="tns:integer" />
+  <xs:complexType name="integer" >
+    <xs:simpleContent>
+      <xs:extension base="xs:integer" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="nonPositiveInteger" type="tns:nonPositiveInteger" />
+  <xs:complexType name="nonPositiveInteger" >
+    <xs:simpleContent>
+      <xs:extension base="xs:nonPositiveInteger" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="negativeInteger" type="tns:negativeInteger" />
+  <xs:complexType name="negativeInteger" >
+    <xs:simpleContent>
+      <xs:extension base="xs:negativeInteger" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="long" type="tns:long" />
+  <xs:complexType name="long" >
+    <xs:simpleContent>
+      <xs:extension base="xs:long" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="int" type="tns:int" />
+  <xs:complexType name="int" >
+    <xs:simpleContent>
+      <xs:extension base="xs:int" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="short" type="tns:short" />
+  <xs:complexType name="short" >
+    <xs:simpleContent>
+      <xs:extension base="xs:short" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="byte" type="tns:byte" />
+  <xs:complexType name="byte" >
+    <xs:simpleContent>
+      <xs:extension base="xs:byte" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="nonNegativeInteger" type="tns:nonNegativeInteger" />
+  <xs:complexType name="nonNegativeInteger" >
+    <xs:simpleContent>
+      <xs:extension base="xs:nonNegativeInteger" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="unsignedLong" type="tns:unsignedLong" />
+  <xs:complexType name="unsignedLong" >
+    <xs:simpleContent>
+      <xs:extension base="xs:unsignedLong" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="unsignedInt" type="tns:unsignedInt" />
+  <xs:complexType name="unsignedInt" >
+    <xs:simpleContent>
+      <xs:extension base="xs:unsignedInt" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="unsignedShort" type="tns:unsignedShort" />
+  <xs:complexType name="unsignedShort" >
+    <xs:simpleContent>
+      <xs:extension base="xs:unsignedShort" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="unsignedByte" type="tns:unsignedByte" />
+  <xs:complexType name="unsignedByte" >
+    <xs:simpleContent>
+      <xs:extension base="xs:unsignedByte" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="positiveInteger" type="tns:positiveInteger" />
+  <xs:complexType name="positiveInteger" >
+    <xs:simpleContent>
+      <xs:extension base="xs:positiveInteger" >
+        <xs:attributeGroup ref="tns:commonAttributes" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:element name="anyType" />
+</xs:schema>
+
diff --git a/xml/tests/testData/xml/spring-beans-2.0.xsd b/xml/tests/testData/xml/spring-beans-2.0.xsd
new file mode 100644
index 000000000000..6825d93187b9
--- /dev/null
+++ b/xml/tests/testData/xml/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/xml/spring-beans-2.5.xsd b/xml/tests/testData/xml/spring-beans-2.5.xsd
new file mode 100644
index 000000000000..769830c69dc5
--- /dev/null
+++ b/xml/tests/testData/xml/spring-beans-2.5.xsd
@@ -0,0 +1,1164 @@
+<?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:element ref="description" minOccurs="0"/>
+			<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:element ref="description" minOccurs="0"/>
+					<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/xml/spring-context-2.5.xsd b/xml/tests/testData/xml/spring-context-2.5.xsd
new file mode 100644
index 000000000000..0cbb8da9273c
--- /dev/null
+++ b/xml/tests/testData/xml/spring-context-2.5.xsd
@@ -0,0 +1,423 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/context" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:beans="http://www.springframework.org/schema/beans"
+			xmlns:tool="http://www.springframework.org/schema/tool"
+			targetNamespace="http://www.springframework.org/schema/context" elementFormDefault="qualified"
+			attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+
+	<xsd:annotation>
+		<xsd:documentation><![CDATA[
+	Defines the configuration elements for the Spring Framework's application
+	context support. Effects the activation of various configuration styles
+	for the containing Spring ApplicationContext.
+		]]></xsd:documentation>
+	</xsd:annotation>
+
+	<xsd:element name="property-placeholder">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Activates replacement of ${...} placeholders, resolved against the specified properties file or Properties object
+	(if any). Falls back to resolving placeholders against JVM system properties.
+	Alternatively, define a parameterized PropertyPlaceholderConfigurer bean in the context.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="location" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The location of the properties file to resolve placeholders against, as a Spring
+	resource location: a URL, a "classpath:" pseudo URL, or a relative file path.
+	Multiple locations may be specified, separated by commas. If neither location nor properties-ref is
+	specified, placeholders will be resolved against system properties.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="properties-ref" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation source="java:java.util.Properties"><![CDATA[
+	The bean name of a Java Properties object that will be used for property substitution.
+	If neither location nor properties-ref is specified, placeholders will be resolved against system properties.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="property-override">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Activates pushing of override values into bean properties, based on configuration
+	lines of the following format: beanName.property=value
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.beans.factory.config.PropertyOverrideConfigurer"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="location" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The location of the properties file to read property overrides from, as a Spring
+	resource location: a URL, a "classpath:" pseudo URL, or a relative file path.
+	Multiple locations may be specified, separated by commas.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="properties-ref" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation source="java:java.util.Properties"><![CDATA[
+	The bean name of a Java Properties object that will be used for property overrides.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="annotation-config">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Activates various annotations to be detected in bean classes: Spring's @Required and
+	@Autowired, as well as JSR 250's @PostConstruct, @PreDestroy and @Resource (if available),
+	JAX-WS's @WebServiceRef (if available), EJB3's @EJB (if available), and JPA's
+	@PersistenceContext and @PersistenceUnit (if available). Alternatively, you may
+	choose to activate the individual BeanPostProcessors for those annotations.
+
+	Note: This tag does not activate processing of Spring's @Transactional or EJB3's
+	@TransactionAttribute annotation. Consider the use of the <tx:annotation-driven>
+	tag for that purpose.
+			]]></xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="component-scan">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Scans the classpath for annotated components that will be auto-registered as 
+	Spring beans. By default, the Spring-provided @Component, @Repository, 
+	@Service, and @Controller stereotypes will be detected.
+
+	Note: This tag implies the effects of the 'annotation-config' tag, activating @Required,
+	@Autowired, @PostConstruct, @PreDestroy, @Resource, @PersistenceContext and @PersistenceUnit
+	annotations in the component classes, which is usually desired for autodetected components
+	(without external configuration). Turn off the 'annotation-config' attribute to deactivate
+	this default behavior, for example in order to use custom BeanPostProcessor definitions
+	for handling those annotations.
+
+	Note: You may use placeholders in package paths, but only resolved against system
+	properties (analogous to resource paths). A component scan results in new bean definition
+	being registered; Spring's PropertyPlaceholderConfigurer will apply to those bean
+	definitions just like to regular bean definitions, but it won't apply to the component
+	scan settings themselves.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="include-filter" type="filterType" minOccurs="0" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+	Controls which eligible types to include for component scanning.
+							]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+				<xsd:element name="exclude-filter" type="filterType" minOccurs="0" maxOccurs="unbounded">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+	Controls which eligible types to exclude for component scanning.
+						]]></xsd:documentation>
+					</xsd:annotation>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="base-package" type="xsd:string" use="required">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The comma-separated list of packages to scan for annotated components.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="resource-pattern" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Controls the class files eligible for component detection. Defaults to "**/*.class", the recommended value.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="use-default-filters" type="xsd:boolean" default="true">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Indicates whether automatic detection of classes annotated with @Component, @Repository, @Service, or @Controller
+	should be enabled. Default is "true".
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="annotation-config" type="xsd:boolean" default="true">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Indicates whether the implicit AutowiredAnnotationBeanPostProcessor and CommonAnnotationBeanPostProcessor should
+	 be enabled. Default is "true".
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="name-generator" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The fully-qualified classname of the BeanNameGenerator to be used for naming detected components.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.beans.factory.support.BeanNameGenerator"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="scope-resolver" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The fully-qualified class name of the ScopeMetadataResolver to be used for resolving the scope of detected components.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.context.annotation.ScopeMetadataResolver"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="scoped-proxy">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	Indicates whether proxies should be generated for detected components, which may be necessary when using certain
+	non-singleton scopes in a proxy-style fashion. Default is to generate no such proxies.
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="no"/>
+						<xsd:enumeration value="interfaces"/>
+						<xsd:enumeration value="targetClass"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="load-time-weaver">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Activates a Spring LoadTimeWeaver for this application context, available as
+	a bean with the name "loadTimeWeaver". Any bean that implements the
+	LoadTimeWeaverAware interface will then receive the LoadTimeWeaver reference
+	automatically; for example, Spring's JPA bootstrap support.
+
+	The default weaver is determined automatically. As of Spring 2.5: detecting
+	Sun's GlassFish, Oracle's OC4J, Spring's VM agent and any ClassLoader
+	supported by Spring's ReflectiveLoadTimeWeaver (for example, the
+	TomcatInstrumentableClassLoader).
+
+	The activation of AspectJ load-time weaving is specified via a simple flag
+	(the 'aspectj-weaving' attribute), with the AspectJ class transformer
+	registered through Spring's LoadTimeWeaver. AspectJ weaving will be activated
+	by default if a "META-INF/aop.xml" resource is present in the classpath.
+
+	This also activates the current application context for applying dependency
+	injection to non-managed classes that are instantiated outside of the Spring
+	bean factory (typically classes annotated with the @Configurable annotation).
+	This will only happen if the AnnotationBeanConfigurerAspect is on the classpath
+	(i.e. spring-aspects.jar), effectively activating "spring-configured" by default.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.instrument.classloading.LoadTimeWeaver"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="weaver-class" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The fully-qualified classname of the LoadTimeWeaver that is to be activated.
+					]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:expected-type type="java.lang.Class"/>
+							<tool:assignable-to type="org.springframework.instrument.classloading.LoadTimeWeaver"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="aspectj-weaving" default="autodetect">
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:string">
+						<xsd:enumeration value="on">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Switches Spring-based AspectJ load-time weaving on.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:enumeration>
+						<xsd:enumeration value="off">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Switches Spring-based AspectJ load-time weaving off.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:enumeration>
+						<xsd:enumeration value="autodetect">
+							<xsd:annotation>
+								<xsd:documentation><![CDATA[
+	Switches AspectJ load-time weaving on if a "META-INF/aop.xml" resource
+	is present in the classpath. If there is no such resource, then AspectJ
+	load-time weaving will be switched off.
+								]]></xsd:documentation>
+							</xsd:annotation>
+						</xsd:enumeration>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="spring-configured">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect">
+				<![CDATA[
+	Signals the current application context to apply dependency injection
+	to non-managed classes that are instantiated outside of the Spring bean
+	factory (typically classes annotated with the @Configurable annotation).
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleType>
+			<xsd:restriction base="xsd:string"/>
+		</xsd:simpleType>
+	</xsd:element>
+
+	<xsd:element name="mbean-export">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.jmx.export.annotation.AnnotationMBeanExporter"><![CDATA[
+	Activates default exporting of MBeans by detecting standard MBeans in the Spring
+	context as well as @ManagedResource annotations on Spring-defined beans.
+
+	The resulting MBeanExporter bean is defined under the name "mbeanExporter".
+	Alternatively, consider defining a custom AnnotationMBeanExporter bean explicitly.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.jmx.export.annotation.MBeanExporter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="default-domain" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The default domain to use when generating JMX ObjectNames.
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="server" type="xsd:string">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The bean name of the MBeanServer to which MBeans should be exported.
+	Default is to use the platform's default MBeanServer (autodetecting
+	WebLogic 9+, WebSphere 5.1+ and the JDK 1.5+ platform MBeanServer).
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="registration">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+	The registration behavior, indicating how to deal with existing MBeans
+	of the same name: fail with an exception, ignore and keep the existing
+	MBean, or replace the existing one with the new MBean.
+
+	Default is to fail with an exception.
+					]]></xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:restriction base="xsd:NMTOKEN">
+						<xsd:enumeration value="failOnExisting"/>
+						<xsd:enumeration value="ignoreExisting"/>
+						<xsd:enumeration value="replaceExisting"/>
+					</xsd:restriction>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="mbean-server">
+		<xsd:annotation>
+			<xsd:documentation source="java:org.springframework.jmx.support.MBeanServerFactoryBean"><![CDATA[
+	Exposes a default MBeanServer for the current platform.
+	Autodetects WebLogic 9+, WebSphere 5.1+ and the JDK 1.5+ platform MBeanServer.
+
+	The default bean name for the exposed MBeanServer is "mbeanServer".
+	This may be customized through specifying the "id" attribute.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="javax.management.MBeanServer"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="beans:identifiedType">
+					<xsd:attribute name="agent-id" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	The agent id of the target MBeanServer, if any.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:complexType name="filterType">
+		<xsd:attribute name="type" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+    Controls the type of filtering to apply to the expression.
+
+    "annotation" indicates an annotation to be present at the type level in target components;
+    "assignable" indicates a class (or interface) that the target components are assignable to (extend/implement);
+    "aspectj" indicates an AspectJ type expression to be matched by the target components;
+    "regex" indicates a regex expression to be matched by the target components' class names;
+    "custom" indicates a custom implementation of the org.springframework.core.type.TypeFilter interface.
+
+    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:string">
+					<xsd:enumeration value="annotation"/>
+					<xsd:enumeration value="assignable"/>
+					<xsd:enumeration value="aspectj"/>
+					<xsd:enumeration value="regex"/>
+					<xsd:enumeration value="custom"/>
+				</xsd:restriction>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="expression" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+    Indicates the filter expression, the type of which is indicated by "type".
+                ]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/spring-tool-2.5.xsd b/xml/tests/testData/xml/spring-tool-2.5.xsd
new file mode 100644
index 000000000000..17bec6dbecc8
--- /dev/null
+++ b/xml/tests/testData/xml/spring-tool-2.5.xsd
@@ -0,0 +1,75 @@
+<?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:element name="registers-scope" type="registersScopeType" minOccurs="0" maxOccurs="unbounded"/>
+			</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><![CDATA[
+	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><![CDATA[
+	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><![CDATA[
+	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:complexType name="registersScopeType">
+		<xsd:attribute name="name" type="xsd:string" use="required">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Defines the name of a custom bean scope that the annotated type registers, e.g. "conversation".
+	Such a scope will be available in addition to the standard "singleton" and "prototype" scopes
+	(plus "request", "session" and "globalSession" in a web application environment).
+		]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+</xsd:schema>
diff --git a/xml/tests/testData/xml/struts-config_1_2.dtd b/xml/tests/testData/xml/struts-config_1_2.dtd
new file mode 100644
index 000000000000..fd0dc1585be5
--- /dev/null
+++ b/xml/tests/testData/xml/struts-config_1_2.dtd
@@ -0,0 +1,686 @@
+<!--
+     DTD for the Struts Application Configuration File
+
+     To support validation of your configuration file, include the following
+     DOCTYPE element at the beginning (after the "xml" declaration):
+
+     <!DOCTYPE struts-config PUBLIC
+       "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+       "http://struts.apache.org/dtds/struts-config_1_2.dtd">
+
+     $Id: struts-config_1_2.dtd,v 1.8 2004/04/06 23:30:23 husted Exp $
+-->
+
+
+<!-- ========== Defined Types ============================================= -->
+
+
+<!-- An "AttributeName" is the identifier of a page, request, session, or
+     application scope attribute.
+-->
+<!ENTITY % AttributeName "CDATA">
+
+
+<!-- A "BeanName" is the identifier of a JavaBean, such as a form bean,
+     and also serves as the name of the corresponding scripting variable
+     and the name of the JSP attribute under which the bean is accessed.
+     Therefore, it must conform to the rules for a Java identifier.
+-->
+<!ENTITY % BeanName "CDATA">
+
+
+<!-- A "Boolean" is the string representation of a boolean (true or false)
+     variable.
+-->
+<!ENTITY % Boolean "(true|false|yes|no)">
+
+
+<!-- A "ClassName" is the fully qualified name of a Java class that is
+     instantiated to provide the functionality of the enclosing element.
+-->
+<!ENTITY % ClassName "CDATA">
+
+
+<!-- An "Integer" is a character string consisting solely of numeric digits,
+     optionally preceeded by a minus sign, that can be converted to a
+     32-bit integer.
+-->
+<!ENTITY % Integer "CDATA">
+
+
+<!-- A "Location" is a relative path, delimited by "/" characters, that
+     defines the location of a resource relative to the location of the
+     Struts configuration file itself.
+-->
+<!ENTITY % Location "#PCDATA">
+
+
+<!-- A "PropName" is the name of a JavaBeans property, and must begin with
+     a lower case letter and contain only characters that are legal in a
+     Java identifier.
+-->
+<!ENTITY % PropName "CDATA">
+
+
+<!-- A "RequestPath" is an module-relative URI path, beginning with a
+     slash, that identifies a mapped resource (such as a JSP page or a servlet)
+     within this web application.
+-->
+<!ENTITY % RequestPath "CDATA">
+
+
+<!-- The name of a JSP bean scope within which such a form bean may be
+     accessed.
+-->
+<!ENTITY % RequestScope "(request|session)">
+
+
+<!-- ========== Top Level Elements ======================================== -->
+
+
+<!-- The "struts-config" element is the root of the configuration file
+     hierarchy, and contains nested elements for all of the other
+     configuration settings.
+-->
+<!ELEMENT struts-config (display-name?, description?, data-sources?, form-beans?, global-exceptions?, global-forwards?, action-mappings?, controller?, message-resources*, plug-in*)>
+<!ATTLIST struts-config  id             ID              #IMPLIED>
+
+
+<!-- The "data-sources" element describes a set of DataSource objects [JDBC 2.0
+     Standard Extension]. The individual DataSource objects are configured through
+     nested <data-source> elements.
+-->
+<!ELEMENT data-sources (data-source*)>
+<!ATTLIST data-sources   id             ID              #IMPLIED>
+
+
+<!-- The "data-source" element describes a DataSource object [JDBC 2.0 Standard
+     Extension] that will be instantiated, configured, and made available as a
+     servlet context attribute (or "application-scope bean"). Any object can be
+     specified so long as it implements [javax.sql.DataSource] and can be
+     configured entirely from JavaBean properties. The following attributes
+     are required:
+
+     className       The configuration bean for this DataSource object. If
+                     specified, the object must be a subclass of the default
+                     configuration bean.
+                     ["org.apache.struts.config.DataSourceConfig"]
+
+     key             Servlet context attribute key under which this data source
+                     will be stored.  Default is the value specified by string
+                     constant defined by Globals.DATA_SOURCE_KEY. The application
+                     module prefix (if any) is appended to the key
+                     (${key}$prefix}).
+                     [org.apache.struts.Globals.DATA_SOURCE_KEY]
+
+                     NOTE: The application module prefix includes the leading
+                     slash, so the default datasource for a module named "foo" is
+                     stored under "org.apache.struts.action.DATA_SOURCE/foo".
+
+     type          Fully qualified Java class name for this data source object.
+                     The class must implement DataSource [javax.sql.DataSource],
+                     and the object must be configurable entirely from JavaBean
+                     properties.
+-->
+<!ELEMENT data-source (set-property*)>
+<!ATTLIST data-source    id             ID              #IMPLIED>
+<!ATTLIST data-source    className      %ClassName;     #IMPLIED>
+<!ATTLIST data-source    key            %AttributeName; #IMPLIED>
+<!ATTLIST data-source    type           %ClassName;     #REQUIRED>
+
+
+<!-- The "form-beans" element describes the set of form bean descriptors for this
+     module. The following attributes are defined:
+
+     type            Fully qualified Java class to use when instantiating
+                     ActionFormBean objects. If specified, the object must be a
+                     subclass of the default class type.
+
+                     WARNING:  For Struts 1.0, this value is ignored.  You
+                     can set the default implementation class name with the
+                     "formBean" initialization parameter to the Struts
+                     controller servlet.
+-->
+<!ELEMENT form-beans (form-bean*)>
+<!ATTLIST form-beans     id             ID              #IMPLIED>
+<!ATTLIST form-beans     type           %ClassName;     #IMPLIED>
+
+
+<!-- The "form-bean" element describes an ActionForm subclass
+     [org.apache.struts.action.ActionForm] that can be referenced by an "action"
+     element.
+
+
+The "form-bean" element describes a particular form bean, which is a
+     JavaBean that implements the org.apache.struts.action.ActionForm
+     class.  The following attributes are defined:
+
+     className       The configuration bean for this form bean object. If
+                     specified, the object must be a subclass of the default
+                     configuration bean.
+                     ["org.apache.struts.config.FormBeanConfig"]
+
+     name            The unique identifier for this form bean. Referenced by the
+                     <action> element to specify which form bean to use with its
+                     request.
+
+     type            Fully qualified Java class name of the ActionForm subclass
+                     to use with this form bean.
+-->
+<!ELEMENT form-bean (icon?, display-name?, description?, set-property*, form-property*)>
+<!ATTLIST form-bean      id             ID              #IMPLIED>
+<!ATTLIST form-bean      className      %ClassName;     #IMPLIED>
+<!ATTLIST form-bean      dynamic        %Boolean;       #IMPLIED>
+<!ATTLIST form-bean      name           %BeanName;      #REQUIRED>
+<!ATTLIST form-bean      type           %ClassName;     #REQUIRED>
+
+
+<!-- The "form-property" element describes a JavaBean property that can be used to
+     configure an instance of a DynaActionForm or a subclass thereof. This element
+     is only utilized when the "type" attribute of the enclosing "form-bean" element
+     is [org.apache.struts.action.DynaActionForm] or a subclass of DynaActionForm. If
+     a custom DynaActionForm subclass is used, then the "dynamic" attribute of the
+     enclosing <form-bean> element must be set to "true". Since Struts 1.1.
+
+     className       The configuration bean for this form property object. If
+                     specified, the object must be a subclass of the default
+                     configuration bean.
+                     ["org.apache.struts.config.FormPropertyConfig"]
+
+     initial         String representation of the initial value for this property.
+                     If not specified, primitives will be initialized to zero and
+                     objects initialized to the zero-argument instantiation of that
+                     object class.  For example, Strings will be initialized to ""
+
+
+     name            The name of the JavaBean property described by this element.
+
+     size            The number of array elements to create if the value of the
+                     "type" attribute specifies an array, but there is no value
+                     specified for the "initial" attribute.
+
+     type            Fully qualified Java class name of the field underlying this
+                     property, optionally followed by "[]" to indicate that the
+                     field is indexed.
+-->
+<!ELEMENT form-property  (set-property*)>
+<!ATTLIST form-property  className      %ClassName;     #IMPLIED>
+<!ATTLIST form-property  initial        CDATA           #IMPLIED>
+<!ATTLIST form-property  name           %PropName;      #REQUIRED>
+<!ATTLIST form-property  size           %Integer;       #IMPLIED>
+<!ATTLIST form-property  type           %ClassName;     #REQUIRED>
+
+
+<!-- The "global-exceptions" element describes a set of exceptions that might be
+     thrown by an Action object. The handling of individual exception types is
+     configured through nested exception elements. An <action> element may
+     override a global exception handler by registering a local exception handler
+     for the same exception type. Since Struts 1.1.
+-->
+<!ELEMENT global-exceptions (exception*)>
+<!ATTLIST global-exceptions id          ID              #IMPLIED>
+
+
+<!-- The "exception" element registers an ExceptionHandler for an exception type.
+     The following attributes are defined:
+
+    bundle           Servlet context attribute for the message resources bundle
+                     associated with this handler. The default attribute is the
+                     value specified by the string constant declared at
+                     Globals.MESSAGES_KEY.
+                     [org.apache.struts.Globals.MESSAGES_KEY]
+
+    className        The configuration bean for this ExceptionHandler object.
+                     If specified, className must be a subclass of the default
+                     configuration bean
+                     ["org.apache.struts.config.ExceptionConfig"]
+
+    handler          Fully qualified Java class name for this exception handler.
+                     ["org.apache.struts.action.ExceptionHandler"]
+
+    key              The key to use with this handler's message resource bundle
+                     that will retrieve the error message template for this
+                     exception.
+
+    path             The module-relative URI to the resource that will complete
+                     the request/response if this exception occurs.
+
+    scope            The context ("request" or "session") that is used to access
+                     the ActionError object [org.apache.struts.action.ActionError]
+                     for this exception.
+
+    type             Fully qualified Java class name of the exception type to
+                     register with this handler.
+-->
+<!ELEMENT exception (icon?, display-name?, description?, set-property*)>
+<!ATTLIST exception      id             ID              #IMPLIED>
+<!ATTLIST exception      bundle         %AttributeName; #IMPLIED>
+<!ATTLIST exception      className      %ClassName;     #IMPLIED>
+<!ATTLIST exception      handler        %ClassName;     #IMPLIED>
+<!ATTLIST exception      key            CDATA           #REQUIRED>
+<!ATTLIST exception      path           %RequestPath;    #IMPLIED>
+<!ATTLIST exception      scope          %RequestScope;   #IMPLIED>
+<!ATTLIST exception      type           %ClassName;     #REQUIRED>
+
+
+<!-- The "global-forwards" element describes a set of ActionForward objects
+     [org.apache.struts.action.ActionForward] that are available to all Action
+     objects as a return value. The individual ActionForwards are configured
+     through nested <forward> elements. An <action> element may override a global
+     forward by defining a local <forward> of the same name.
+
+     type            Fully qualified Java class to use when instantiating
+                     ActionForward objects.  If specified, the object must be a
+                     subclass of the default class type.
+
+                     WARNING:  For Struts 1.0, this value is ignored.  You
+                     can set the default implementation class name with the
+                     "forward" initialization parameter to the Struts
+                     controller servlet.
+-->
+<!ELEMENT global-forwards (forward*)>
+<!ATTLIST global-forwards id            ID              #IMPLIED>
+<!ATTLIST global-forwards type          %ClassName;     #IMPLIED>
+
+
+<!-- The "forward" element describes an ActionForward that is to be made
+     available to an Action as a return value. An ActionForward is referenced by
+     a logical name and encapsulates a URI. A "forward" element may be used to
+     describe both global and local ActionForwards. Global forwards are available
+     to all the Action objects in the module. Local forwards can be
+     nested within an <action> element and only available to an Action object
+     when it is invoked through that ActionMapping.
+
+     className       Fully qualified Java class name of ActionForward
+                     subclass to use for this object.
+                     ["org.apache.struts.action.ActionForward"]
+
+    contextRelative  Set this to "true" if, in a modular application, the path
+                     attribute starts with a slash "/" and should be considered
+                     relative to the entire web application rather than the module.
+                     Since Struts 1.1.
+                     DEPRECATED.
+                     [false]
+
+     module          The module prefix to use with this path. This value should
+                     begin with a slash ("/").
+
+     name            The unique identifier for this forward. Referenced by the
+                     Action object at runtime to select - by its logical name -
+                     the resource that should complete the request/response.
+
+     path            The module-relative or context-relative path to the resources
+                     that is encapsulated by the logical name of this ActionForward.
+                     If the path is to be considered context-relative when used in
+                     a modular application, then the contextRelative attribute
+                     should be set to "true". This value should begin with a slash
+                     ("/") character.
+
+     redirect        Set to "true" if a redirect instruction should be issued to
+                     the user-agent so that a new request is issued for this
+                     forward's resource. If true,  RequestDispatcher.Redirect is
+                     called. If "false", RequestDispatcher.forward is called instead.
+                     [false]
+-->
+<!ELEMENT forward (icon?, display-name?, description?, set-property*)>
+<!ATTLIST forward        id             ID              #IMPLIED>
+<!ATTLIST forward        className      %ClassName;     #IMPLIED>
+<!ATTLIST forward        contextRelative %Boolean;      #IMPLIED>
+<!ATTLIST forward        module         %RequestPath;   #IMPLIED>
+<!ATTLIST forward        name           CDATA           #REQUIRED>
+<!ATTLIST forward        path           %RequestPath;   #REQUIRED>
+<!ATTLIST forward        redirect       %Boolean;       #IMPLIED>
+
+
+<!-- The "action-mappings" element describes a set of ActionMapping objects
+     [org.apache.struts.action.ActionMapping] that are available to process
+     requests matching the url-pattern our ActionServlet registered with the
+     container. The individual ActionMappings are configured through nested
+     <action> elements. The following attributes are defined:
+
+     type           Fully qualified Java class to use when instantiating
+                    ActionMapping objects. If specified, the object must be a
+                    subclass of the default class type.
+
+                    WARNING:  For Struts 1.0, this value is ignored.  You
+                    can set the default implementation class name with the
+                    "mapping" initialization parameter to the Struts
+                    controller servlet.
+-->
+<!ELEMENT action-mappings (action*)>
+<!ATTLIST action-mappings id             ID              #IMPLIED>
+<!ATTLIST action-mappings type           %ClassName;     #IMPLIED>
+
+
+<!-- The "action" element describes an ActionMapping object that is to be used
+     to process a request for a specific module-relative URI. The following
+     attributes are defined:
+
+     attribute       Name of the request-scope or session-scope attribute that
+                     is used to access our ActionForm bean, if it is other than
+                     the bean's specified "name". Optional if "name" is specified,
+                     else not valid.
+
+     className       The fully qualified Java class name of the ActionMapping
+                     subclass to use for this action mapping object. Defaults to
+                     the type specified by the enclosing <action-mappings>
+                     element or to "org.apache.struts.action.ActionMapping" if
+                     not specified.
+                     ["org.apache.struts.action.ActionMapping"]
+
+     forward         Module-relative path of the servlet or other resource that
+                     will process this request, instead of the Action class
+                     specified by "type".  The path WILL NOT be processed
+                     through the "forwardPattern" attribute that is configured
+                     on the "controller" element for this module.
+                     Exactly one of "forward", "include", or "type" must be
+                     specified.
+
+     include         Module-relative path of the servlet or other resource that
+                     will process this request, instead of the Action class
+                     specified by "type".  The path WILL NOT be processed
+                     through the "forwardPattern" attribute that is configured
+                     on the "controller" element for this module.
+                     Exactly one of "forward", "include", or "type" must be
+                     specified.
+
+     input           Module-relative path of the action or other resource to
+                     which control should be returned if a validation error is
+                     encountered. Valid only when "name" is specified. Required
+                     if "name" is specified and the input bean returns
+                     validation errors. Optional if "name" is specified and the
+                     input bean does not return validation errors.
+
+     name            Name of the form bean, if any, that is associated with this
+                     action mapping.
+
+     path            The module-relative path of the submitted request, starting
+                     with a "/" character, and without the filename extension if
+                     extension mapping is used.
+
+                     NOTE:  Do *not* include a period in your path name,
+                     because it will look like a filename extension and
+                     cause your Action to not be located.
+
+     parameter       General-purpose configuration parameter that can be used to
+                     pass extra information to the Action object selected by
+                     this action mapping.
+
+     prefix          Prefix used to match request parameter names to ActionForm
+                     property names, if any. Optional if "name" is specified,
+                     else not allowed.
+
+     roles           Comma-delimited list of security role names that are allowed
+                     access to this ActionMapping object. Since Struts 1.1.
+
+     scope           The context ("request" or "session") that is used to
+                     access our ActionForm bean, if any.  Optional if "name" is
+                     specified, else not valid.
+
+     suffix          Suffix used to match request parameter names to ActionForm
+                     bean property names, if any. Optional if "name" is
+                     specified, else not valid.
+
+     type            Fully qualified Java class name of the Action subclass
+                     [org.apache.struts.action.Action] that will process requests
+                     for this action mapping. Not valid if either the "forward"
+                     or "include" attribute is specified.  Exactly one of
+                     "forward", "include", or "type" must be specified.
+
+     unknown         Set to "true" if this object should be configured as the
+                     default action mapping for this module. If a request does not
+                     match another object, it will be passed to the ActionMapping
+                     object with unknown set to "true". Only one ActionMapping
+                     can be marked as "unknown" within a module.
+                     [false]
+
+     validate        Set to "true" if the validate method of the ActionForm bean
+                     should be called prior to calling the Action object for this
+                     action mapping, or set to "false" if you do not want the
+                     validate method called.
+                     [true]
+-->
+<!ELEMENT action (icon?, display-name?, description?, set-property*, exception*, forward*)>
+<!ATTLIST action         id             ID              #IMPLIED>
+<!ATTLIST action         attribute      %BeanName;      #IMPLIED>
+<!ATTLIST action         className      %ClassName;     #IMPLIED>
+<!ATTLIST action         forward        %RequestPath;   #IMPLIED>
+<!ATTLIST action         include        %RequestPath;   #IMPLIED>
+<!ATTLIST action         input          %RequestPath;   #IMPLIED>
+<!ATTLIST action         name           %BeanName;      #IMPLIED>
+<!ATTLIST action         parameter      CDATA           #IMPLIED>
+<!ATTLIST action         path           %RequestPath;   #REQUIRED>
+<!ATTLIST action         prefix         CDATA           #IMPLIED>
+<!ATTLIST action         roles          CDATA           #IMPLIED>
+<!ATTLIST action         scope          %RequestScope;  #IMPLIED>
+<!ATTLIST action         suffix         CDATA           #IMPLIED>
+<!ATTLIST action         type           %ClassName;     #IMPLIED>
+<!ATTLIST action         unknown        %Boolean;       #IMPLIED>
+<!ATTLIST action         validate       %Boolean;       #IMPLIED>
+
+
+<!-- The "controller" element describes the ControllerConfig bean
+     [org.apache.struts.config.ControllerConfig] that encapsulates
+     a module's runtime configuration. The following
+     attributes are defined:
+
+     bufferSize      The size of the input buffer used when processing
+                     file uploads.
+                     [4096]
+
+     className       Fully qualified Java class name of the
+                     ControllerConfig subclass for this controller object.
+                     If specified, the object must be a subclass of the
+                     default class.
+                     ["org.apache.struts.config.ControllerConfig"]
+
+     contentType     Default content type (and optional character encoding) to
+                     be set on each response. May be overridden by the Action,
+                     JSP, or other resource to which the request is forwarded.
+                     ["text/html"]
+
+     forwardPattern  Replacement pattern defining how the "path" attribute of a
+                     <forward> element is mapped to a context-relative URL when
+                     it starts with a slash (and when the contextRelative
+                     property is false). This value may consist of any
+                     combination of the following:
+                     - "$M" - Replaced by the module prefix of this module
+                     - "$P" - Replaced by the "path" attribute of the  selected
+                     "forward" element
+                     - "$$" - Causes a literal dollar sign to be rendered
+                     - "$x" - (Where "x" is any character not defined above)
+                     Silently swallowed, reserved for future use
+                     If not specified, the default forwardPattern is "$M$P",
+                     which is consistent with the previous behavior of
+                     forwards.  Since Struts 1.1.  ["$M$P"]
+
+     inputForward    Set to "true" if you want the "input" attribute of
+                     <action> elements to be the name of a local or global
+                     ActionForward, which will then be used to calculate the
+                     ultimate URL. Set to "false" (the default) to treat the
+                     "input" parameter of <action> elements as a
+                     module-relative path to the resource
+                     to be used as the input form. Since Struts 1.1.
+                     [false]
+
+     locale          Set to "true" if you want a Locale object stored in the
+                     user's session if not already present.
+                     [true]
+
+     maxFileSize     The maximum size (in bytes) of a file to be accepted as a
+                     file upload.  Can be expressed as a number followed by a
+                     "K", "M", or "G", which are interpreted to mean kilobytes,
+                     megabytes, or gigabytes, respectively.
+                     ["250M"]
+
+     memFileSize     The maximum size (in bytes) of a file whose contents will
+                     be retained in memory after uploading. Files larger than
+                     this threshold will be written to some alternative storage
+                     medium, typically a hard disk. Can be expressed as a number
+                     followed by a "K", "M", or "G", which are interpreted to
+                     mean kilobytes, megabytes, or gigabytes, respectively.
+                     ["256K"]
+
+     multipartClass  The fully qualified Java class name of the multipart
+                     request handler class to be used with this module.
+                     ["org.apache.struts.upload.CommonsMultipartRequestHandler"]
+
+     nocache         Set to "true" if you want the controller to add HTTP
+                     headers for defeating caching to every response from
+                     this module.  [false]
+
+     pagePattern     Replacement pattern defining how the "page" attribute of
+                     custom tags using it is mapped to a context-relative URL
+                     of the corresponding resource.  This value may consist of
+                     any combination of the following:
+                     - "$M" - Replaced by the module prefix of this module
+                     - "$P" - Replaced by the value of the "page" attribute
+                     - "$$" - Causes a literal dollar sign to be rendered
+                     - "$x" - (Where "x" is any character not defined above)
+                              Silently swallowed, reserved for future use
+                     If not specified, the default forwardPattern is
+                     "$M$P", which is consistent with previous hard coded
+                     behavior of URL evaluation for "page" attributes.
+                     ["$M$P"]
+
+     processorClass  The fully qualified Java class name of the
+                     RequestProcessor subclass to be used with this module.
+                     ["org.apache.struts.action.RequestProcessor"]
+
+     tempDir         Temporary working directory to use when processing
+                     file uploads.
+                     [{Directory provided by servlet container}]
+-->
+<!ELEMENT controller     (set-property*)>
+<!ATTLIST controller     id             ID              #IMPLIED>
+<!ATTLIST controller     bufferSize     %Integer;       #IMPLIED>
+<!ATTLIST controller     className      %ClassName;     #IMPLIED>
+<!ATTLIST controller     contentType    CDATA           #IMPLIED>
+<!ATTLIST controller     forwardPattern CDATA           #IMPLIED>
+<!ATTLIST controller     inputForward   %Boolean;       #IMPLIED>
+<!ATTLIST controller     locale         %Boolean;       #IMPLIED>
+<!ATTLIST controller     maxFileSize    CDATA           #IMPLIED>
+<!ATTLIST controller     memFileSize    CDATA           #IMPLIED>
+<!ATTLIST controller     multipartClass %ClassName;     #IMPLIED>
+<!ATTLIST controller     nocache        %Boolean;       #IMPLIED>
+<!ATTLIST controller     pagePattern    CDATA           #IMPLIED>
+<!ATTLIST controller     processorClass %ClassName;     #IMPLIED>
+<!ATTLIST controller     tempDir        CDATA           #IMPLIED>
+
+
+<!-- The "message-resources" element describes a MessageResources object with
+     message templates for this module. The following attributes are defined:
+
+     className       The configuration bean for this message resources object.
+                     If specified, the object must be a subclass of the default
+                     configuration bean.
+                     ["org.apache.struts.config.MessageResourcesConfig"]
+
+     factory         Fully qualified Java class name of the
+                     MessageResourcesFactory subclass to use for this message
+                     resources object.
+                     ["org.apache.struts.util.PropertyMessageResourcesFactory"]
+
+     key             Servlet context attribute under which this message
+                     resources bundle will be stored. The default attribute is
+                     the value specified by the string constant at
+                     [Globals.MESSAGES_KEY]. The module prefix (if
+                     any) is appended to the key (${key}${prefix}).
+                     [org.apache.struts.Globals.MESSAGES_KEY]
+
+                     NOTE: The module  prefix includes the leading
+                     slash, so the default message resource bundle for a module
+                     named "foo" is stored under
+                     "org.apache.struts.action.MESSAGE/foo".
+
+     null            Set to "true" if you want our message resources to return a
+                     null string for unknown message keys, or "false" to return a
+                     message with the bad key value.
+
+     parameter       Configuration parameter to be passed to the createResources
+                     method of our factory object.
+-->
+<!ELEMENT message-resources (set-property*)>
+<!ATTLIST message-resources id          ID              #IMPLIED>
+<!ATTLIST message-resources className   %ClassName;     #IMPLIED>
+<!ATTLIST message-resources factory     %ClassName;     #IMPLIED>
+<!ATTLIST message-resources key         %AttributeName; #IMPLIED>
+<!ATTLIST message-resources null        %Boolean;       #IMPLIED>
+<!ATTLIST message-resources parameter   CDATA           #REQUIRED>
+
+
+<!-- The "plug-in" element specifies the fully qualified class name of a
+     general-purpose application plug-in module that receives notification of
+     application startup and shutdown events. An instance of the specified class
+     is created for each element, and can be configured with nested <set-property>
+     elements. The following attributes are supported:
+
+     className       Fully qualified Java class name of the plug-in class; must
+                     implement [org.apache.struts.action.PlugIn].
+-->
+<!ELEMENT plug-in           (set-property*)>
+<!ATTLIST plug-in           id          ID              #IMPLIED>
+<!ATTLIST plug-in           className   %ClassName;     #REQUIRED>
+
+
+<!-- ========== Subordinate Elements ====================================== -->
+
+
+<!-- The "description" element contains descriptive (paragraph length) text
+     about the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT description    (#PCDATA)>
+<!ATTLIST description    id             ID              #IMPLIED>
+
+
+<!-- The "display-name" element contains a short (one line) description of
+     the surrounding element, suitable for use in GUI tools.
+-->
+<!ELEMENT display-name (#PCDATA)>
+<!ATTLIST display-name   id             ID              #IMPLIED>
+
+
+<!-- The "icon" element contains a small-icon and large-icon element which
+     specify the location, relative to the Struts configuration file, for small
+     and large images used to represent the surrounding element in GUI tools.
+-->
+<!ELEMENT icon           (small-icon?, large-icon?)>
+<!ATTLIST icon           id             ID              #IMPLIED>
+
+
+<!-- The "large-icon" element specifies the location, relative to the Struts
+     configuration file, of a resource containing a large (32x32 pixel)
+     icon image.
+-->
+<!ELEMENT large-icon     (%Location;)>
+<!ATTLIST large-icon     id             ID              #IMPLIED>
+
+
+<!-- The "set-property" element specifies the method name and initial value of
+     an additional JavaBean configuration property. When the object representing
+     the surrounding element is instantiated, the accessor for the indicated
+     property is called and passed the indicated value. The "set-property"
+     element is especially useful when a custom subclass is used with
+     <data-source>, <forward>, <action>, or <plug-in> elements. The subclass
+     can be passed whatever other properties may be required to configure the
+     object without changing how the struts-config is parsed.
+
+     property        Name of the JavaBeans property whose setter method
+                     will be called.
+
+     value           String representation of the value to which this
+                     property will be set, after suitable type conversion
+-->
+<!ELEMENT set-property   EMPTY>
+<!ATTLIST set-property   id             ID              #IMPLIED>
+<!ATTLIST set-property   property       %PropName;      #REQUIRED>
+<!ATTLIST set-property   value          CDATA           #REQUIRED>
+
+
+<!-- The "small-icon" element specifies the location, relative to the Struts
+     configuration file, of a resource containing a small (16x16 pixel)
+     icon image.
+-->
+<!ELEMENT small-icon     (%Location;)>
+<!ATTLIST small-icon     id             ID              #IMPLIED>
+
diff --git a/xml/tests/testData/xml/web-app_2_3.dtd b/xml/tests/testData/xml/web-app_2_3.dtd
new file mode 100644
index 000000000000..5e3ab01c0fe8
--- /dev/null
+++ b/xml/tests/testData/xml/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/xml/web-app_2_4.xsd b/xml/tests/testData/xml/web-app_2_4.xsd
new file mode 100644
index 000000000000..9e4f58dc238a
--- /dev/null
+++ b/xml/tests/testData/xml/web-app_2_4.xsd
@@ -0,0 +1,1242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	    elementFormDefault="qualified"
+	    attributeFormDefault="unqualified"
+	    version="2.4">
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)web-app_2_4.xsds	1.61 04/04/16
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+      Copyright 2003-2007 Sun Microsystems, Inc. All rights reserved.
+
+      The contents of this file are subject to the terms of either the
+      GNU General Public License Version 2 only ("GPL") or the Common
+      Development and Distribution License("CDDL") (collectively, the
+      "License").  You may not use this file except in compliance with
+      the License. You can obtain a copy of the License at
+      https://glassfish.dev.java.net/public/CDDL+GPL.html or
+      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
+      specific language governing permissions and limitations under the
+      License.
+
+      When distributing the software, include this License Header
+      Notice in each file and include the License file at
+      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
+      particular file as subject to the "Classpath" exception as
+      provided by Sun in the GPL Version 2 section of the License file
+      that accompanied this code.  If applicable, add the following
+      below the License Header, with the fields enclosed by brackets []
+      replaced by your own identifying information:
+      "Portions Copyrighted [year] [name of copyright owner]"
+
+      Contributor(s):
+
+      If you wish your version of this file to be governed by only the
+      CDDL or only the GPL Version 2, indicate your decision by adding
+      "[Contributor] elects to include this software in this
+      distribution under the [CDDL or GPL Version 2] license."  If you
+      don't indicate a single choice of license, a recipient has the
+      option to distribute your version of this file under either the
+      CDDL, the GPL Version 2 or to extend the choice of license to its
+      licensees as provided above.  However, if you add GPL Version 2
+      code and therefore, elected the GPL Version 2 license, then the
+      option applies only if the new code is made subject to such
+      option by the copyright holder.
+
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+      <![CDATA[
+
+	This is the XML Schema for the Servlet 2.4 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 J2EE
+	namespace:
+
+	http://java.sun.com/xml/ns/j2ee
+
+	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/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="..."
+	      version="2.4">
+	      ...
+	    </web-app>
+
+	The instance documents may indicate the published version of
+	the schema using the xsi:schemaLocation attribute for J2EE
+	namespace with the following location:
+
+	http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      The following conventions apply to all J2EE
+      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="j2ee_1_4.xsd"/>
+  <xsd:include schemaLocation="jsp_2_0.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+  <xsd:element name="web-app" type="j2ee: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 concatinate the element contents.  The multiple occurance
+	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="j2ee:servlet"/>
+      <xsd:field    xpath="j2ee: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="j2ee:filter"/>
+      <xsd:field    xpath="j2ee: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="j2ee:ejb-local-ref"/>
+      <xsd:field    xpath="j2ee: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="j2ee:ejb-ref"/>
+      <xsd:field    xpath="j2ee: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="j2ee:resource-env-ref"/>
+      <xsd:field    xpath="j2ee: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="j2ee:message-destination-ref"/>
+      <xsd:field    xpath="j2ee: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="j2ee:resource-ref"/>
+      <xsd:field    xpath="j2ee: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="j2ee:env-entry"/>
+      <xsd:field    xpath="j2ee: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="j2ee:security-role"/>
+      <xsd:field    xpath="j2ee:role-name"/>
+    </xsd:key>
+
+    <xsd:keyref name="web-app-role-name-references"
+		refer="j2ee: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="j2ee:servlet/j2ee:security-role-ref"/>
+      <xsd:field    xpath="j2ee: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="j2ee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="role-name"
+		   type="j2ee: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="j2ee: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="j2ee: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="j2ee: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="j2ee:error-codeType"/>
+
+	<xsd:element name="exception-type"
+		     type="j2ee: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="j2ee: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="j2ee:filter-nameType"/>
+      <xsd:choice>
+	<xsd:element name="url-pattern"
+		     type="j2ee:url-patternType"/>
+	<xsd:element name="servlet-name"
+		     type="j2ee:servlet-nameType"/>
+      </xsd:choice>
+      <xsd:element name="dispatcher"
+		   type="j2ee: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="j2ee: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="j2ee:descriptionGroup"/>
+      <xsd:element name="filter-name"
+		   type="j2ee:filter-nameType"/>
+      <xsd:element name="filter-class"
+		   type="j2ee: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="j2ee: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="j2ee: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="j2ee: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:complexType name="http-methodType">
+    <xsd:annotation>
+
+      <xsd:documentation>
+
+	The http-method contains an HTTP method recognized by the
+	web-app, for example GET, POST, ...
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="GET"/>
+	<xsd:enumeration value="POST"/>
+	<xsd:enumeration value="PUT"/>
+	<xsd:enumeration value="DELETE"/>
+	<xsd:enumeration value="HEAD"/>
+	<xsd:enumeration value="OPTIONS"/>
+	<xsd:enumeration value="TRACE"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <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="j2ee: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="j2ee:localeType"/>
+      <xsd:element name="encoding"
+		   type="j2ee: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="j2ee:auth-methodType"
+		   minOccurs="0"/>
+      <xsd:element name="realm-name"
+		   type="j2ee: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="j2ee: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="j2ee:string"/>
+      <xsd:element name="mime-type"
+		   type="j2ee: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="j2ee: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="j2ee:string">
+	<xsd:minLength value="1"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <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="j2ee:display-nameType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="web-resource-collection"
+		   type="j2ee:web-resource-collectionType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="auth-constraint"
+		   type="j2ee:auth-constraintType"
+		   minOccurs="0"/>
+      <xsd:element name="user-data-constraint"
+		   type="j2ee: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="j2ee:servlet-nameType"/>
+      <xsd:element name="url-pattern"
+		   type="j2ee:url-patternType"/>
+    </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="j2ee: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="j2ee:descriptionGroup"/>
+      <xsd:element name="servlet-name"
+		   type="j2ee:servlet-nameType"/>
+      <xsd:choice>
+	<xsd:element name="servlet-class"
+		     type="j2ee: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="j2ee:jsp-fileType"/>
+
+      </xsd:choice>
+
+      <xsd:element name="init-param"
+		   type="j2ee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="load-on-startup"
+		   type="j2ee:xsdIntegerType"
+		   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="j2ee:run-asType"
+		   minOccurs="0"/>
+      <xsd:element name="security-role-ref"
+		   type="j2ee: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="j2ee: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="j2ee: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="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="transport-guarantee"
+		   type="j2ee: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="j2ee: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.4"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="web-appType">
+
+    <xsd:choice minOccurs="0" maxOccurs="unbounded">
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="distributable"
+		   type="j2ee:emptyType"/>
+      <xsd:element name="context-param"
+		   type="j2ee: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="j2ee:filterType"/>
+      <xsd:element name="filter-mapping"
+		   type="j2ee:filter-mappingType"/>
+      <xsd:element name="listener"
+		   type="j2ee:listenerType"/>
+      <xsd:element name="servlet"
+		   type="j2ee:servletType"/>
+      <xsd:element name="servlet-mapping"
+		   type="j2ee:servlet-mappingType"/>
+      <xsd:element name="session-config"
+		   type="j2ee:session-configType"/>
+      <xsd:element name="mime-mapping"
+		   type="j2ee:mime-mappingType"/>
+      <xsd:element name="welcome-file-list"
+		   type="j2ee:welcome-file-listType"/>
+      <xsd:element name="error-page"
+		   type="j2ee:error-pageType"/>
+      <xsd:element name="jsp-config"
+		   type="j2ee:jsp-configType"/>
+      <xsd:element name="security-constraint"
+		   type="j2ee:security-constraintType"/>
+      <xsd:element name="login-config"
+		   type="j2ee:login-configType"/>
+      <xsd:element name="security-role"
+		   type="j2ee:security-roleType"/>
+      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
+      <xsd:element name="message-destination"
+		   type="j2ee:message-destinationType"/>
+      <xsd:element name="locale-encoding-mapping-list"
+		   type="j2ee:locale-encoding-mapping-listType"/>
+    </xsd:choice>
+
+    <xsd:attribute name="version"
+		   type="j2ee:web-app-versionType"
+		   use="required"/>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </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="j2ee: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="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="url-pattern"
+		   type="j2ee:url-patternType"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="http-method"
+		   type="j2ee: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/xml/web-jsptaglibrary_1_2.dtd b/xml/tests/testData/xml/web-jsptaglibrary_1_2.dtd
new file mode 100644
index 000000000000..369f41e62457
--- /dev/null
+++ b/xml/tests/testData/xml/web-jsptaglibrary_1_2.dtd
@@ -0,0 +1,462 @@
+<!--
+
+   This is the DTD defining the JavaServer Pages 1.2 Tag Library
+   descriptor (.tld) (XML) file format/syntax.
+
+   A Tag Library is a JAR file containing a valid instance of a Tag Library
+   Descriptor (taglib.tld) file in the META-INF subdirectory, along with the
+   appropriate implementing classes, and other resources required to
+   implement the tags defined therein.
+
+   Use is subject to license terms.
+  -->
+
+<!NOTATION WEB-JSPTAGLIB.1_2 PUBLIC
+          "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN">
+
+<!--
+This is the XML DTD for the JSP 1.2 Tag Library Descriptor.
+All JSP 1.2 tag library descriptors must include a DOCTYPE
+of the following form:
+
+  <!DOCTYPE taglib
+        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+	"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+
+-->
+
+<!--
+The taglib tag is the document root, it defines:
+
+tlib-version	the version of the tag library implementation
+
+jsp-version	the version of JSP the tag library depends upon
+
+short-name	a simple default short name that could be used by
+		a JSP authoring tool to create names with a mnemonic
+		value; for example, the it may be used as the prefered
+		prefix value in taglib directives
+
+uri		a uri uniquely identifying this taglib
+
+display-name    the display-name element contains a short name that
+                is intended to be displayed by tools
+small-icon      optional small-icon that can be used by tools
+
+large-icon      optional large-icon that can be used by tools
+
+description	a simple string describing the "use" of this taglib,
+		should be user discernable
+
+validator       optional TagLibraryValidator information
+
+listener        optional event listener specification
+
+
+-->
+
+<!ELEMENT taglib (tlib-version, jsp-version, short-name, uri?,
+                  display-name?, small-icon?, large-icon?, description?,
+                  validator?, listener*, tag+) >
+
+<!ATTLIST taglib id ID #IMPLIED
+	  xmlns CDATA #FIXED
+		"http://java.sun.com/JSP/TagLibraryDescriptor"
+>
+
+<!--
+Describes this version (number) of the taglibrary (dewey decimal)
+
+#PCDATA ::= [0-9]*{ "."[0-9] }0..3
+-->
+
+<!ELEMENT tlib-version (#PCDATA) >
+
+<!--
+Describes the JSP version (number) this taglibrary requires in
+order to function (dewey decimal)
+
+The default is 1.2
+
+#PCDATA ::= [0-9]*{ "."[0-9] }0..3
+-->
+
+<!ELEMENT jsp-version  (#PCDATA) >
+
+<!--
+Defines a short (default) short-name to be used for tags and
+variable names used/created by this tag library.  Do not use
+white space, and do not start with digits or underscore.
+
+#PCDATA ::= NMTOKEN
+-->
+
+<!ELEMENT short-name      (#PCDATA) >
+
+<!--
+Defines a public URI that uniquely identifies this version of
+the taglibrary.  Leave it empty if it does not apply.
+-->
+
+<!ELEMENT uri	 (#PCDATA) >
+
+<!--
+Defines an arbitrary text string descirbing the tag library
+-->
+
+<!ELEMENT description	(#PCDATA) >
+
+<!--
+
+Defines an optional validator that can be used to
+validate the conformance of a JSP page to using this tag library.
+-->
+
+<!ELEMENT validator (validator-class, init-param*, description?) >
+
+
+<!--
+
+Defines the TagLibraryValidator class that can be used to
+validate the conformance of a JSP page to using this tag library.
+-->
+
+<!ELEMENT validator-class (#PCDATA) >
+
+
+<!--
+
+The init-param element contains a name/value pair as an
+initialization param
+-->
+
+<!ELEMENT init-param (param-name, param-value, description?)>
+
+<!--
+
+The param-name element contains the name of a parameter.
+-->
+
+<!ELEMENT param-name (#PCDATA)>
+
+<!--
+
+The param-value element contains the value of a parameter.
+-->
+
+<!ELEMENT param-value (#PCDATA)>
+
+
+<!--
+
+Defines an optional event listener object to be instantiated and
+registered automatically.
+-->
+
+<!ELEMENT listener (listener-class) >
+
+<!--
+
+The listener-class element declares a class in the application that
+must be registered as a web application listener bean.  See the
+Servlet 2.3 specification for details.
+-->
+
+<!ELEMENT listener-class (#PCDATA) >
+
+
+<!--
+The tag defines a unique tag in this tag library.  It has one
+attribute, id.
+
+The tag element may have several subelements defining:
+
+name              The unique action name
+
+tag-class         The tag handler class implementing
+                  javax.servlet.jsp.tagext.Tag
+
+tei-class         An optional subclass of
+                  javax.servlet.jsp.tagext.TagExtraInfo
+
+body-content      The body content type
+
+display-name      A short name that is intended to be displayed
+                  by tools
+
+small-icon        Optional small-icon that can be used by tools
+
+large-icon        Optional large-icon that can be used by tools
+
+description       Optional tag-specific information
+
+variable          Optional scripting variable information
+
+attribute         All attributes of this action
+
+example           Optional informal description of an example of a
+                  use of this tag
+
+-->
+
+<!ELEMENT tag (name, tag-class, tei-class?, body-content?, display-name?,
+               small-icon?, large-icon?, description?, variable*, attribute*,
+               example?) >
+
+<!--
+Defines the subclass of javax.serlvet.jsp.tagext.Tag that implements
+the request time semantics for this tag. (required)
+
+#PCDATA ::= fully qualified Java class name
+-->
+
+<!ELEMENT tag-class (#PCDATA) >
+
+<!--
+Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo for
+this tag. (optional)
+
+If this is not given, the class is not consulted at translation time.
+
+#PCDATA ::= fully qualified Java class name
+-->
+
+<!ELEMENT tei-class (#PCDATA) >
+
+<!--
+Provides a hint as to the content of the body of this tag. Primarily
+intended for use by page composition tools.
+
+There are currently three values specified:
+
+tagdependent	The body of the tag is interpreted by the tag
+		implementation itself, and is most likely in a
+		different "langage", e.g embedded SQL statements.
+
+JSP		The body of the tag contains nested JSP syntax
+
+empty		The body must be empty
+
+The default (if not defined) is JSP
+
+#PCDATA ::=  tagdependent | JSP | empty
+
+-->
+
+<!ELEMENT body-content (#PCDATA) >
+
+<!--
+
+The display-name element contains a short name that is intended
+to be displayed by tools.
+-->
+
+<!ELEMENT display-name (#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
+tag library.  The image must be either in the JPEG or GIF format, and
+the file name must end with the suffix ".jpg" or ".gif" respectively.
+The icon can be used by tools.
+-->
+
+<!ELEMENT large-icon (#PCDATA) >
+
+<!--
+
+The small-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
+tag library.  The image must be either in the JPEG or GIF format, and
+the file name must end with the suffix ".jpg" or ".gif" respectively.
+The icon can be used by tools.
+-->
+
+<!ELEMENT small-icon (#PCDATA) >
+
+<!--
+
+The example element contains an informal description of an example
+of the use of a tag.
+-->
+
+<!ELEMENT example (#PCDATA) >
+
+<!--
+
+The variable tag provides information on the scripting variables
+defined by this tag.  It is a (translation time) error for a tag
+that has one or more variable subelements to have a TagExtraInfo
+class that returns a non-null object.
+
+The subelements of variable are of the form:
+
+name-given               The variable name as a constant
+
+name-from-attribute      The name of an attribute whose (translation
+                         time) value will give the name of the
+                         variable.  One of name-given or
+                         name-from-attribute is required.
+
+variable-class           Name of the class of the variable.
+                         java.lang.String is default.
+
+declare                  Whether the variable is declared or not.
+                         True is the default.
+
+scope                    The scope of the scripting varaible
+                         defined.  NESTED is default.
+
+description              Optional description of this variable
+
+-->
+
+<!ELEMENT variable ( (name-given | name-from-attribute), variable-class?,
+                    declare?, scope?, description?) >
+
+<!--
+
+The name for the scripting variable.  One of name-given or
+name-from-attribute is required.
+-->
+
+<!ELEMENT name-given (#PCDATA) >
+
+<!--
+
+The name of an attribute whose (translation-time) value will give
+the name of the variable.  One of name-given or name-from-attribute
+is required.
+-->
+
+<!ELEMENT name-from-attribute (#PCDATA) >
+
+<!--
+
+The optional name of the class for the scripting variable.  The
+default is java.lang.String.
+-->
+
+<!ELEMENT variable-class (#PCDATA) >
+
+<!--
+
+Whether the scripting variable is to be defined or not.  See
+TagExtraInfo for details.  This element is optional and "true"
+is the default.
+-->
+
+<!ELEMENT declare (#PCDATA) >
+
+<!--
+
+The scope of the scripting variable.  See TagExtraInfo for details.
+The element is optional and "NESTED" is the default.  Other legal
+values are "AT_BEGIN" and "AT_END".
+-->
+
+<!ELEMENT scope (#PCDATA) >
+
+<!--
+
+The attribute tag defines an attribute for the nesting tag
+
+An attribute definition is composed of:
+	
+- the attributes name (required)
+- if the attribute is required or optional (optional)
+- if the attributes value may be dynamically calculated at runtime
+  by a scriptlet expression (optional)
+- the type of the attributes value (optional)
+- an informal description of the meaning of the attribute (optional)
+
+-->
+
+
+<!--
+The attribute tag defines an attribute for the nesting tag
+
+An attribute definition is composed of:
+
+- the attributes name (required)
+
+- if the attribute is required or optional (optional)
+
+- if the attributes value may be dynamically calculated at runtime
+  by a scriptlet expression (optional)
+
+- the type of the attributes value (optional)
+
+- an informal description of the meaning of the attribute (optional)
+-->
+
+<!ELEMENT attribute (name, required? , rtexprvalue?, type?, description?) >
+
+<!--
+Defines the canonical name of a tag or attribute being defined
+
+#PCDATA ::= NMTOKEN
+-->
+
+<!ELEMENT name	(#PCDATA) >
+
+<!--
+Defines if the nesting attribute is required or optional.
+
+#PCDATA ::= true | false | yes | no
+
+If not present then the default is "false", i.e the attribute
+is optional.
+-->
+
+<!ELEMENT required    (#PCDATA) >
+
+<!--
+Defines if the nesting attribute can have scriptlet expressions as
+a value, i.e the value of the attribute may be dynamically calculated
+at request time, as opposed to a static value determined at translation
+time.
+
+#PCDATA ::= true | false | yes | no
+
+If not present then the default is "false", i.e the attribute
+has a static value
+-->
+
+<!ELEMENT rtexprvalue (#PCDATA) >
+
+
+<!--
+
+Defines the Java type of the attributes value.  For static values
+(those determined at translation time) the type is always
+java.lang.String.
+-->
+
+<!ELEMENT type (#PCDATA) >
+
+
+<!-- ID attributes -->
+
+<!ATTLIST tlib-version id ID #IMPLIED>
+<!ATTLIST jsp-version id ID #IMPLIED>
+<!ATTLIST short-name id ID #IMPLIED>
+<!ATTLIST uri id ID #IMPLIED>
+<!ATTLIST description id ID #IMPLIED>
+<!ATTLIST example id ID #IMPLIED>
+<!ATTLIST tag id ID #IMPLIED>
+<!ATTLIST tag-class id ID #IMPLIED>
+<!ATTLIST tei-class id ID #IMPLIED>
+<!ATTLIST body-content id ID #IMPLIED>
+<!ATTLIST attribute id ID #IMPLIED>
+<!ATTLIST name id ID #IMPLIED>
+<!ATTLIST required id ID #IMPLIED>
+<!ATTLIST rtexprvalue id ID #IMPLIED>
+
+
+<!ATTLIST param-name id ID #IMPLIED>
+<!ATTLIST param-value id ID #IMPLIED>
+<!ATTLIST listener id ID #IMPLIED>
+<!ATTLIST listener-class id ID #IMPLIED>
diff --git a/xml/tests/testData/xml/web-jsptaglibrary_2_0.xsd b/xml/tests/testData/xml/web-jsptaglibrary_2_0.xsd
new file mode 100644
index 000000000000..79a8b5d6fe3c
--- /dev/null
+++ b/xml/tests/testData/xml/web-jsptaglibrary_2_0.xsd
@@ -0,0 +1,1010 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+     targetNamespace="http://java.sun.com/xml/ns/j2ee"
+     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+     elementFormDefault="qualified"
+     attributeFormDefault="unqualified"
+     version="2.0">
+
+  <xsd:annotation>
+    <xsd:documentation>
+      @(#)web-jsptaglibrary_2_0.xsds	1.38 10/08/03
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:annotation>
+    <xsd:documentation>
+
+      Copyright 2003 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 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 JSP Taglibrary
+	descriptor.  All Taglibrary descriptors must
+	indicate the tag library schema by using the Taglibrary
+	namespace:
+
+	http://java.sun.com/xml/ns/j2ee
+
+	and by indicating the version of the schema by
+	using the version element as shown below:
+
+	    <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
+	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	      xsi:schemaLocation="..."
+	      version="2.0">
+	      ...
+	    </taglib>
+
+	The instance documents may indicate the published
+	version of the schema using xsi:schemaLocation attribute
+	for J2EE namespace with the following location:
+
+	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
+
+	]]>
+    </xsd:documentation>
+  </xsd:annotation>
+
+  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+  <xsd:element name="taglib" type="j2ee:tldTaglibType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The taglib tag is the document root.
+	The definition of taglib is provided
+	by the tldTaglibType.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:unique name="tag-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The taglib element contains, among other things, tag and
+	  tag-file elements.
+	  The name subelements of these elements must each be unique.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:tag|j2ee:tag-file"/>
+      <xsd:field    xpath="j2ee:name"/>
+    </xsd:unique>
+
+    <xsd:unique name="function-name-uniqueness">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  The taglib element contains function elements.
+	  The name subelements of these elements must each be unique.
+
+	</xsd:documentation>
+      </xsd:annotation>
+      <xsd:selector xpath="j2ee:function"/>
+      <xsd:field    xpath="j2ee:name"/>
+    </xsd:unique>
+
+  </xsd:element>
+
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="body-contentType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+        Specifies the type of body that is valid for a tag.
+	This value is used by the JSP container to validate
+	that a tag invocation has the correct body syntax and
+	by page composition tools to assist the page author
+	in providing a valid tag body.
+
+	There are currently four values specified:
+
+	tagdependent    The body of the tag is interpreted by the tag
+			implementation itself, and is most likely
+			in a different "language", e.g embedded SQL
+			statements.
+
+	JSP             The body of the tag contains nested JSP
+			syntax.
+
+	empty           The body must be empty
+
+	scriptless      The body accepts only template text, EL
+			Expressions, and JSP action elements.  No
+			scripting elements are allowed.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="tagdependent"/>
+	<xsd:enumeration value="JSP"/>
+	<xsd:enumeration value="empty"/>
+	<xsd:enumeration value="scriptless"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="extensibleType" abstract="true">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The extensibleType is an abstract base type that is used to
+	define the type of extension-elements. Instance documents
+	must substitute a known type to define the extension by
+	using xsi:type attribute to define the actual type of
+	extension-elements.
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="functionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The function element is used to provide information on each
+	function in the tag library that is to be exposed to the EL.
+
+	The function element may have several subelements defining:
+
+	description         Optional tag-specific information
+
+	display-name        A short name that is intended to be
+			    displayed by tools
+
+	icon                Optional icon element that can be used
+			    by tools
+
+	name                A unique name for this function
+
+	function-class      Provides the name of the Java class that
+			    implements the function
+
+	function-signature  Provides the signature, as in the Java
+			    Language Specification, of the Java
+			    method that is to be used to implement
+			    the function.
+
+	example             Optional informal description of an
+			    example of a use of this function
+
+	function-extension  Zero or more extensions that provide extra
+			    information about this function, for tool
+			    consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="name"
+		   type="j2ee:tld-canonical-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    A unique name for this function.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="function-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Provides the fully-qualified class name of the Java
+	    class containing the static method that implements
+	    the function.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="function-signature"
+		   type="j2ee:string">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Provides the signature, of the static Java method that is
+	    to be used to implement the function.  The syntax of the
+	    function-signature element is as follows:
+
+		FunctionSignature ::= ReturnType S MethodName S?
+				      '(' S? Parameters? S? ')'
+
+                ReturnType        ::= Type
+
+		MethodName        ::= Identifier
+
+		Parameters        ::=   Parameter
+				      | ( Parameter S? ',' S? Parameters )
+
+                Parameter         ::= Type
+
+		Where:
+
+ 		    * Type is a basic type or a fully qualified
+		      Java class name (including package name),
+		      as per the 'Type' production in the Java
+		      Language Specification, Second Edition,
+		      Chapter 18.
+
+                    * Identifier is a Java identifier, as per
+		      the 'Identifier' production in the Java
+		      Language Specification, Second
+		      Edition, Chapter 18.
+
+	    Example:
+
+	    java.lang.String nickName( java.lang.String, int )
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="example"
+		   type="j2ee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The example element contains an informal description
+	    of an example of the use of this function.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="function-extension"
+		   type="j2ee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Function extensions are for tool use only and must not affect
+	    the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tagFileType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Defines an action in this tag library that is implemented
+	as a .tag file.
+
+	The tag-file element has two required subelements:
+
+	description       Optional tag-specific information
+
+	display-name      A short name that is intended to be
+			  displayed by tools
+
+	icon              Optional icon element that can be used
+			  by tools
+
+	name              The unique action name
+
+	path              Where to find the .tag file implementing this
+			  action, relative to the root of the web
+			  application or the root of the JAR file for a
+			  tag library packaged in a JAR.  This must
+			  begin with /WEB-INF/tags if the .tag file
+			  resides in the WAR, or /META-INF/tags if the
+			  .tag file resides in a JAR.
+
+	example           Optional informal description of an
+			  example of a use of this tag
+
+	tag-extension     Zero or more extensions that provide extra
+			  information about this tag, for tool
+			  consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="name"
+		   type="j2ee:tld-canonical-nameType"/>
+      <xsd:element name="path"
+		   type="j2ee:pathType"/>
+      <xsd:element name="example"
+		   type="j2ee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The example element contains an informal description
+	    of an example of the use of a tag.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="tag-extension"
+		   type="j2ee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Tag extensions are for tool use only and must not affect
+	    the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tagType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The tag defines a unique tag in this tag library.  It has one
+	attribute, id.
+
+	The tag element may have several subelements defining:
+
+	description       Optional tag-specific information
+
+	display-name      A short name that is intended to be
+			  displayed by tools
+
+	icon              Optional icon element that can be used
+			  by tools
+
+	name              The unique action name
+
+	tag-class         The tag handler class implementing
+			  javax.servlet.jsp.tagext.JspTag
+
+	tei-class         An optional subclass of
+			  javax.servlet.jsp.tagext.TagExtraInfo
+
+	body-content      The body content type
+
+	variable          Optional scripting variable information
+
+	attribute         All attributes of this action that are
+			  evaluated prior to invocation.
+
+	dynamic-attributes Whether this tag supports additional
+			   attributes with dynamic names.  If
+			   true, the tag-class must implement the
+			   javax.servlet.jsp.tagext.DynamicAttributes
+			   interface.  Defaults to false.
+
+	example           Optional informal description of an
+			  example of a use of this tag
+
+	tag-extension     Zero or more extensions that provide extra
+			  information about this tag, for tool
+			  consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="name"
+		   type="j2ee:tld-canonical-nameType"/>
+      <xsd:element name="tag-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the subclass of javax.serlvet.jsp.tagext.JspTag
+	    that implements the request time semantics for
+	    this tag. (required)
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="tei-class"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo
+	    for this tag. (optional)
+
+	    If this is not given, the class is not consulted at
+	    translation time.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="body-content"
+		   type="j2ee:body-contentType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Specifies the format for the body of this tag.
+	    The default in JSP 1.2 was "JSP" but because this
+	    is an invalid setting for simple tag handlers, there
+	    is no longer a default in JSP 2.0.  A reasonable
+	    default for simple tag handlers is "scriptless" if
+	    the tag can have a body.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="variable"
+		   type="j2ee:variableType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="attribute"
+		   type="j2ee:tld-attributeType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="dynamic-attributes"
+		   type="j2ee:generic-booleanType"
+		   minOccurs="0"/>
+      <xsd:element name="example"
+		   type="j2ee:xsdStringType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The example element contains an informal description
+	    of an example of the use of a tag.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="tag-extension"
+		   type="j2ee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Tag extensions are for tool use only and must not affect
+	    the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-attributeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The attribute element defines an attribute for the nesting
+	tag.  The attributre element may have several subelements
+	defining:
+
+	description     a description of the attribute
+
+	name            the name of the attribute
+
+	required        whether the attribute is required or
+			optional
+
+	rtexprvalue     whether the attribute is a runtime attribute
+
+	type            the type of the attributes
+
+	fragment        whether this attribute is a fragment
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:element name="name"
+		   type="j2ee:java-identifierType"/>
+      <xsd:element name="required"
+		   type="j2ee:generic-booleanType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines if the nesting attribute is required or
+	    optional.
+
+	    If not present then the default is "false", i.e
+	    the attribute is optional.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+
+      <xsd:choice>
+	<xsd:sequence>
+	  <xsd:element name="rtexprvalue"
+		       type="j2ee:generic-booleanType"
+		       minOccurs="0">
+	    <xsd:annotation>
+	      <xsd:documentation>
+
+		Defines if the nesting attribute can have scriptlet
+		expressions as a value, i.e the value of the
+		attribute may be dynamically calculated at request
+		time, as opposed to a static value determined at
+		translation time.
+
+		If not present then the default is "false", i.e the
+		attribute has a static value
+
+	      </xsd:documentation>
+	    </xsd:annotation>
+
+	  </xsd:element>
+	  <xsd:element name="type"
+		       type="j2ee:fully-qualified-classType"
+		       minOccurs="0">
+	    <xsd:annotation>
+	      <xsd:documentation>
+
+		Defines the Java type of the attributes value.  For
+		static values (those determined at translation time)
+		the type is always java.lang.String.
+
+	      </xsd:documentation>
+	    </xsd:annotation>
+	  </xsd:element>
+	</xsd:sequence>
+	<xsd:element name="fragment"
+		     type="j2ee:generic-booleanType"
+		     minOccurs="0">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      "true" if this attribute is of type
+	      javax.jsp.tagext.JspFragment, representing dynamic
+	      content that can be re-evaluated as many times
+	      as needed by the tag handler.  If omitted or "false",
+	      the default is still type="java.lang.String"
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-canonical-nameType">
+
+    <xsd:annotation>
+      <xsd:documentation>
+
+	Defines the canonical name of a tag or attribute being
+	defined.
+
+	The name must conform to the lexical rules for an NMTOKEN.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:xsdNMTOKENType"/>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tld-extensionType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The tld-extensionType is used to indicate
+	extensions to a specific TLD element.
+
+	It is used by elements to designate an extension block
+	that is targeted to a specific extension designated by
+	a set of extension elements that are declared by a
+	namespace. The namespace identifies the extension to
+	the tool that processes the extension.
+
+	The type of the extension-element is abstract. Therefore,
+	a concrete type must be specified by the TLD using
+	xsi:type attribute for each extension-element.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="extension-element"
+		   type="j2ee:extensibleType"
+		   maxOccurs="unbounded"/>
+    </xsd:sequence>
+
+    <xsd:attribute name="namespace"
+		   use="required"
+		   type="xsd:anyURI"/>
+    <xsd:attribute name="id" type="xsd:ID"/>
+
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="tldTaglibType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The taglib tag is the document root, it defines:
+
+	description     a simple string describing the "use" of this
+			taglib, should be user discernable
+
+	display-name    the display-name element contains a
+			short name that is intended to be displayed
+			by tools
+
+	icon            optional icon that can be used by tools
+
+	tlib-version    the version of the tag library implementation
+
+	short-name      a simple default short name that could be
+			used by a JSP authoring tool to create
+			names with a mnemonic value; for example,
+			the it may be used as the prefered prefix
+			value in taglib directives
+
+	uri             a uri uniquely identifying this taglib
+
+	validator       optional TagLibraryValidator information
+
+	listener        optional event listener specification
+
+	tag             tags in this tag library
+
+	tag-file        tag files in this tag library
+
+	function        zero or more EL functions defined in this
+			tag library
+
+	taglib-extension zero or more extensions that provide extra
+			information about this taglib, for tool
+			consumption
+
+      </xsd:documentation>
+    </xsd:annotation>
+    <xsd:sequence>
+      <xsd:group ref="j2ee:descriptionGroup"/>
+      <xsd:element name="tlib-version"
+		   type="j2ee:dewey-versionType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Describes this version (number) of the taglibrary.
+	    It is described as a dewey decimal.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+
+      <xsd:element name="short-name"
+		   type="j2ee:tld-canonical-nameType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines a simple default name that could be used by
+	    a JSP authoring tool to create names with a
+	    mnemonicvalue; for example, it may be used as the
+	    preferred prefix value in taglib directives.  Do
+	    not use white space, and do not start with digits
+	    or underscore.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="uri"
+		   type="j2ee:xsdAnyURIType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines a public URI that uniquely identifies this
+	    version of the taglibrary.  Leave it empty if it
+	    does not apply.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+      <xsd:element name="validator"
+		   type="j2ee:validatorType"
+		   minOccurs="0">
+      </xsd:element>
+      <xsd:element name="listener"
+		   type="j2ee:listenerType"
+		   minOccurs="0" maxOccurs="unbounded">
+      </xsd:element>
+      <xsd:element name="tag"
+		   type="j2ee:tagType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="tag-file"
+		   type="j2ee:tagFileType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="function"
+		   type="j2ee:functionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="taglib-extension"
+		   type="j2ee:tld-extensionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Taglib extensions are for tool use only and must not affect
+	    the behavior of a container.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+    </xsd:sequence>
+    <xsd:attribute name="version"
+		   type="j2ee:dewey-versionType"
+		   fixed="2.0"
+		   use="required">
+      <xsd:annotation>
+	<xsd:documentation>
+
+	  Describes the JSP version (number) this taglibrary
+	  requires in order to function (dewey decimal)
+
+	</xsd:documentation>
+      </xsd:annotation>
+
+    </xsd:attribute>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="validatorType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	A validator that can be used to validate
+	the conformance of a JSP page to using this tag library is
+	defined by a validatorType.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0"
+		   maxOccurs="unbounded"/>
+      <xsd:element name="validator-class"
+		   type="j2ee:fully-qualified-classType">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Defines the TagLibraryValidator class that can be used
+	    to validate the conformance of a JSP page to using this
+	    tag library.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="init-param"
+		   type="j2ee:param-valueType"
+		   minOccurs="0" maxOccurs="unbounded">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The init-param element contains a name/value pair as an
+	    initialization param.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+
+    </xsd:sequence>
+    <xsd:attribute name="id" type="xsd:ID"/>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="variable-scopeType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	This type defines scope of the scripting variable.  See
+	TagExtraInfo for details.  The allowed values are,
+	"NESTED", "AT_BEGIN" and "AT_END".
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:simpleContent>
+      <xsd:restriction base="j2ee:string">
+	<xsd:enumeration value="NESTED"/>
+	<xsd:enumeration value="AT_BEGIN"/>
+	<xsd:enumeration value="AT_END"/>
+      </xsd:restriction>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+<!-- **************************************************** -->
+
+  <xsd:complexType name="variableType">
+    <xsd:annotation>
+      <xsd:documentation>
+
+	The variableType provides information on the scripting
+	variables defined by using this tag.  It is a (translation
+	time) error for a tag that has one or more variable
+	subelements to have a TagExtraInfo class that returns a
+	non-null value from a call to getVariableInfo().
+
+	The subelements of variableType are of the form:
+
+	description              Optional description of this
+				 variable
+
+	name-given               The variable name as a constant
+
+	name-from-attribute      The name of an attribute whose
+				 (translation time) value will
+				 give the name of the
+				 variable.  One of name-given or
+				 name-from-attribute is required.
+
+	variable-class           Name of the class of the variable.
+				 java.lang.String is default.
+
+	declare                  Whether the variable is declared
+				 or not.  True is the default.
+
+	scope                    The scope of the scripting varaible
+				 defined.  NESTED is default.
+
+      </xsd:documentation>
+    </xsd:annotation>
+
+    <xsd:sequence>
+      <xsd:element name="description"
+		   type="j2ee:descriptionType"
+		   minOccurs="0" maxOccurs="unbounded"/>
+      <xsd:choice>
+	<xsd:element name="name-given"
+		     type="j2ee:java-identifierType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The name for the scripting variable.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="name-from-attribute"
+		     type="j2ee:java-identifierType">
+	  <xsd:annotation>
+	    <xsd:documentation>
+
+	      The name of an attribute whose
+	      (translation-time) value will give the name of
+	      the variable.
+
+	    </xsd:documentation>
+	  </xsd:annotation>
+	</xsd:element>
+      </xsd:choice>
+      <xsd:element name="variable-class"
+		   type="j2ee:fully-qualified-classType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The optional name of the class for the scripting
+	    variable.  The default is java.lang.String.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+
+      </xsd:element>
+
+      <xsd:element name="declare"
+		   type="j2ee:generic-booleanType"
+		   minOccurs="0">
+
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    Whether the scripting variable is to be defined
+	    or not.  See TagExtraInfo for details.  This
+	    element is optional and "true" is the default.
+
+	  </xsd:documentation>
+	</xsd:annotation>
+      </xsd:element>
+      <xsd:element name="scope"
+		   type="j2ee:variable-scopeType"
+		   minOccurs="0">
+	<xsd:annotation>
+	  <xsd:documentation>
+
+	    The element is optional and "NESTED" is the default.
+
+	  </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/xml/wrongRootTag1.xml b/xml/tests/testData/xml/wrongRootTag1.xml
new file mode 100644
index 000000000000..6bd0d3ea101d
--- /dev/null
+++ b/xml/tests/testData/xml/wrongRootTag1.xml
@@ -0,0 +1,5 @@
+<!DOCTYPE tv [ <!ELEMENT tv (date)*> <!ELEMENT date (#PCDATA)> ]>
+
+<<error>xx</error>>
+
+</<error>xx</error>>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/wsdl11.xsd b/xml/tests/testData/xml/wsdl11.xsd
new file mode 100644
index 000000000000..14b5bef302e6
--- /dev/null
+++ b/xml/tests/testData/xml/wsdl11.xsd
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+<!-- 
+ 
+Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL Schema Files
+
+The Authors grant permission to copy and distribute the WSDL Schema 
+Files in any medium without fee or royalty as long as this notice and 
+license are distributed with them.  The originals of these files can 
+be located at:
+
+http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
+RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, 
+including advertising or publicity pertaining to these files or any program 
+or service that uses these files, written prior permission.  Title to copyright 
+in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+--> 
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
+           elementFormDefault="qualified" >
+   
+  <xs:complexType mixed="true" name="tDocumentation" >
+    <xs:sequence>
+      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+    </xs:sequence>
+  </xs:complexType>
+
+  <xs:complexType name="tDocumented" >
+    <xs:annotation>
+      <xs:documentation>
+      This type is extended by  component types to allow them to be documented
+      </xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
+    </xs:sequence>
+  </xs:complexType>
+	 
+  <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tDocumented" >
+        <xs:annotation>
+          <xs:documentation>
+          This type is extended by component types to allow attributes from other namespaces to be added.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:anyAttribute namespace="##other" processContents="lax" />    
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tExtensibleDocumented" abstract="true" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tDocumented" >
+        <xs:annotation>
+          <xs:documentation>
+          This type is extended by component types to allow elements from other namespaces to be added.
+          </xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="definitions" type="wsdl:tDefinitions" >
+    <xs:key name="message" >
+      <xs:selector xpath="wsdl:message" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="portType" >
+      <xs:selector xpath="wsdl:portType" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="binding" >
+      <xs:selector xpath="wsdl:binding" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="service" >
+      <xs:selector xpath="wsdl:service" />
+      <xs:field xpath="@name" />
+    </xs:key>
+    <xs:key name="import" >
+      <xs:selector xpath="wsdl:import" />
+      <xs:field xpath="@namespace" />
+    </xs:key>
+  </xs:element>
+
+  <xs:group name="anyTopLevelOptionalElement" >
+    <xs:annotation>
+      <xs:documentation>
+      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice>
+      <xs:element name="import" type="wsdl:tImport" />
+      <xs:element name="types" type="wsdl:tTypes" />                     
+      <xs:element name="message"  type="wsdl:tMessage" >
+        <xs:unique name="part" >
+          <xs:selector xpath="wsdl:part" />
+          <xs:field xpath="@name" />
+        </xs:unique>
+      </xs:element>
+      <xs:element name="portType" type="wsdl:tPortType" />
+      <xs:element name="binding"  type="wsdl:tBinding" />
+      <xs:element name="service"  type="wsdl:tService" >
+        <xs:unique name="port" >
+          <xs:selector xpath="wsdl:port" />
+          <xs:field xpath="@name" />
+        </xs:unique>
+	  </xs:element>
+    </xs:choice>
+  </xs:group>
+
+  <xs:complexType name="tDefinitions" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:group ref="wsdl:anyTopLevelOptionalElement"  minOccurs="0"   maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="targetNamespace" type="xs:anyURI" use="optional" />
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+   
+  <xs:complexType name="tImport" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
+        <xs:attribute name="location" type="xs:anyURI" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+   
+  <xs:complexType name="tTypes" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" />
+    </xs:complexContent>   
+  </xs:complexType>
+     
+  <xs:complexType name="tMessage" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+
+  <xs:complexType name="tPart" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="element" type="xs:QName" use="optional" />
+        <xs:attribute name="type" type="xs:QName" use="optional" />    
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+
+  <xs:complexType name="tPortType" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:sequence>
+          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+   
+  <xs:complexType name="tOperation" >
+    <xs:complexContent>   
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+	    <xs:sequence>
+          <xs:choice>
+            <xs:group ref="wsdl:request-response-or-one-way-operation" />
+            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
+          </xs:choice>
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
+      </xs:extension>
+    </xs:complexContent>   
+  </xs:complexType>
+    
+  <xs:group name="request-response-or-one-way-operation" >
+    <xs:sequence>
+      <xs:element name="input" type="wsdl:tParam" />
+	  <xs:sequence minOccurs='0' >
+	    <xs:element name="output" type="wsdl:tParam" />
+		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+      </xs:sequence>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:group name="solicit-response-or-notification-operation" >
+    <xs:sequence>
+      <xs:element name="output" type="wsdl:tParam" />
+	  <xs:sequence minOccurs='0' >
+	    <xs:element name="input" type="wsdl:tParam" />
+		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
+	  </xs:sequence>
+    </xs:sequence>
+  </xs:group>
+        
+  <xs:complexType name="tParam" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+        <xs:attribute name="message" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tFault" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
+        <xs:attribute name="name" type="xs:NCName"  use="required" />
+        <xs:attribute name="message" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tBinding" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="type" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+    
+  <xs:complexType name="tBindingOperationMessage" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:complexType name="tBindingOperationFault" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:complexType name="tBindingOperation" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
+          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
+          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tService" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:sequence>
+          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+     
+  <xs:complexType name="tPort" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibleDocumented" >
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+        <xs:attribute name="binding" type="xs:QName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:attribute name="arrayType" type="xs:string" />
+  <xs:attribute name="required" type="xs:boolean" />
+  <xs:complexType name="tExtensibilityElement" abstract="true" >
+    <xs:attribute ref="wsdl:required" use="optional" />
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/wsdl11_soapbinding.xsd b/xml/tests/testData/xml/wsdl11_soapbinding.xsd
new file mode 100644
index 000000000000..0458e6c9ec51
--- /dev/null
+++ b/xml/tests/testData/xml/wsdl11_soapbinding.xsd
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+<!-- 
+ 
+Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
+All Rights Reserved
+
+License for WSDL Schema Files
+
+The Authors grant permission to copy and distribute the WSDL Schema 
+Files in any medium without fee or royalty as long as this notice and 
+license are distributed with them.  The originals of these files can 
+be located at:
+
+http://schemas.xmlsoap.org/wsdl/soap/2003-02-11.xsd
+
+THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
+OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
+NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
+INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
+RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
+
+The name and trademarks of the Authors may NOT be used in any manner, 
+including advertising or publicity pertaining to these files or any program 
+or service that uses these files, written prior permission.  Title to copyright 
+in these files will at all times remain with the Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+
+
+--> 
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+           targetNamespace="http://schemas.xmlsoap.org/wsdl/soap/" >
+
+  <xs:import namespace = "http://schemas.xmlsoap.org/wsdl/" />
+
+  <xs:simpleType name="encodingStyle" >
+    <xs:annotation>
+      <xs:documentation>
+      "encodingStyle" indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value "http://schemas.xmlsoap.org/soap/encoding/" indicates the pattern described in SOAP specification
+      </xs:documentation>
+    </xs:annotation>
+    <xs:list itemType="xs:anyURI" />
+  </xs:simpleType>
+
+  <xs:element name="binding" type="soap:tBinding" />
+  <xs:complexType name="tBinding" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:attribute name="transport" type="xs:anyURI" use="required" />
+        <xs:attribute name="style" type="soap:tStyleChoice" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:simpleType name="tStyleChoice" >
+    <xs:restriction base="xs:string" >
+      <xs:enumeration value="rpc" />
+      <xs:enumeration value="document" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="operation" type="soap:tOperation" />
+  <xs:complexType name="tOperation" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:attribute name="soapAction" type="xs:anyURI" use="optional" />
+        <xs:attribute name="style" type="soap:tStyleChoice" use="optional" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="body" type="soap:tBody" />
+  <xs:attributeGroup name="tBodyAttributes" >
+    <xs:attribute name="encodingStyle" type="soap:encodingStyle" use="optional" />	   
+    <xs:attribute name="use" type="soap:useChoice" use="optional" />
+    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
+  </xs:attributeGroup>
+  <xs:complexType name="tBody" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:attribute name="parts" type="xs:NMTOKENS" use="optional" />
+        <xs:attributeGroup ref = "soap:tBodyAttributes" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  
+  <xs:simpleType name="useChoice" >
+    <xs:restriction base="xs:string" >
+      <xs:enumeration value="literal" />
+      <xs:enumeration value="encoded" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="fault" type="soap:tFault" />
+  <xs:complexType name="tFaultRes" abstract="true" >
+    <xs:complexContent>
+      <xs:restriction base="soap:tBody" >
+	    <xs:attribute ref="wsdl:required" use="optional" /> 
+        <xs:attribute name="parts" type="xs:NMTOKENS" use="prohibited" />
+		<xs:attributeGroup ref="soap:tBodyAttributes" />
+      </xs:restriction>
+    </xs:complexContent>  	
+  </xs:complexType>
+  <xs:complexType name="tFault" >
+    <xs:complexContent>
+      <xs:extension base="soap:tFaultRes">
+        <xs:attribute name="name" type="xs:NCName" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+
+  <xs:element name="header" type="soap:tHeader" />
+  <xs:attributeGroup name="tHeaderAttributes" >
+    <xs:attribute name="message" type="xs:QName" use="required" />
+    <xs:attribute name="part" type="xs:NMTOKEN" use="required" />
+    <xs:attribute name="use" type="soap:useChoice" use="required" />
+    <xs:attribute name="encodingStyle" type="soap:encodingStyle" use="optional" />
+    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />      
+  </xs:attributeGroup>
+  <xs:complexType name="tHeader" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:sequence>
+          <xs:element ref="soap:headerfault" minOccurs="0" maxOccurs="unbounded" />
+        </xs:sequence>
+		<xs:attributeGroup ref="soap:tHeaderAttributes" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="headerfault" type="soap:tHeaderFault" />
+  <xs:complexType name="tHeaderFault" >
+	<xs:attributeGroup ref="soap:tHeaderAttributes" />
+  </xs:complexType>
+
+  <xs:element name="address" type="soap:tAddress" />
+  <xs:complexType name="tAddress" >
+    <xs:complexContent>
+      <xs:extension base="wsdl:tExtensibilityElement" >
+        <xs:attribute name="location" type="xs:anyURI" use="required" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/xhtml-lat1.ent b/xml/tests/testData/xml/xhtml-lat1.ent
new file mode 100644
index 000000000000..2a33e090df8a
--- /dev/null
+++ b/xml/tests/testData/xml/xhtml-lat1.ent
@@ -0,0 +1,196 @@
+<!-- Portions (C) International Organization for Standardization 1986
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+-->
+<!-- Character entity set. Typical invocation:
+    <!ENTITY % HTMLlat1 PUBLIC
+       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
+    %HTMLlat1;
+-->
+
+<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
+                                  U+00A0 ISOnum -->
+<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
+<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
+<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
+<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
+<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
+<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
+                                  U+00A6 ISOnum -->
+<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
+<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
+                                  U+00A8 ISOdia -->
+<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
+<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
+<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
+                                  = left pointing guillemet, U+00AB ISOnum -->
+<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
+                                  U+00AC ISOnum -->
+<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
+                                  U+00AD ISOnum -->
+<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
+                                  U+00AE ISOnum -->
+<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
+                                  = APL overbar, U+00AF ISOdia -->
+<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
+<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
+                                  U+00B1 ISOnum -->
+<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
+                                  = squared, U+00B2 ISOnum -->
+<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
+                                  = cubed, U+00B3 ISOnum -->
+<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
+                                  U+00B4 ISOdia -->
+<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
+<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
+                                  U+00B6 ISOnum -->
+<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
+                                  = Greek middle dot, U+00B7 ISOnum -->
+<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
+<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
+                                  U+00B9 ISOnum -->
+<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
+                                  U+00BA ISOnum -->
+<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
+                                  = right pointing guillemet, U+00BB ISOnum -->
+<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
+                                  = fraction one quarter, U+00BC ISOnum -->
+<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
+                                  = fraction one half, U+00BD ISOnum -->
+<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
+                                  = fraction three quarters, U+00BE ISOnum -->
+<!ENTITY iquest "&#191;"> <!-- inverted question mark
+                                  = turned question mark, U+00BF ISOnum -->
+<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
+                                  = latin capital letter A grave,
+                                  U+00C0 ISOlat1 -->
+<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
+                                  U+00C1 ISOlat1 -->
+<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
+                                  U+00C2 ISOlat1 -->
+<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
+                                  U+00C3 ISOlat1 -->
+<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
+                                  U+00C4 ISOlat1 -->
+<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
+                                  = latin capital letter A ring,
+                                  U+00C5 ISOlat1 -->
+<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
+                                  = latin capital ligature AE,
+                                  U+00C6 ISOlat1 -->
+<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
+                                  U+00C7 ISOlat1 -->
+<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
+                                  U+00C8 ISOlat1 -->
+<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
+                                  U+00C9 ISOlat1 -->
+<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
+                                  U+00CA ISOlat1 -->
+<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
+                                  U+00CB ISOlat1 -->
+<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
+                                  U+00CC ISOlat1 -->
+<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
+                                  U+00CD ISOlat1 -->
+<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
+                                  U+00CE ISOlat1 -->
+<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
+                                  U+00CF ISOlat1 -->
+<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
+<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
+                                  U+00D1 ISOlat1 -->
+<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
+                                  U+00D2 ISOlat1 -->
+<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
+                                  U+00D3 ISOlat1 -->
+<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
+                                  U+00D4 ISOlat1 -->
+<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
+                                  U+00D5 ISOlat1 -->
+<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
+                                  U+00D6 ISOlat1 -->
+<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
+<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
+                                  = latin capital letter O slash,
+                                  U+00D8 ISOlat1 -->
+<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
+                                  U+00D9 ISOlat1 -->
+<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
+                                  U+00DA ISOlat1 -->
+<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
+                                  U+00DB ISOlat1 -->
+<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
+                                  U+00DC ISOlat1 -->
+<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
+                                  U+00DD ISOlat1 -->
+<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
+                                  U+00DE ISOlat1 -->
+<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
+                                  U+00DF ISOlat1 -->
+<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
+                                  = latin small letter a grave,
+                                  U+00E0 ISOlat1 -->
+<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
+                                  U+00E1 ISOlat1 -->
+<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
+                                  U+00E2 ISOlat1 -->
+<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
+                                  U+00E3 ISOlat1 -->
+<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
+                                  U+00E4 ISOlat1 -->
+<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
+                                  = latin small letter a ring,
+                                  U+00E5 ISOlat1 -->
+<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
+                                  = latin small ligature ae, U+00E6 ISOlat1 -->
+<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
+                                  U+00E7 ISOlat1 -->
+<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
+                                  U+00E8 ISOlat1 -->
+<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
+                                  U+00E9 ISOlat1 -->
+<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
+                                  U+00EA ISOlat1 -->
+<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
+                                  U+00EB ISOlat1 -->
+<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
+                                  U+00EC ISOlat1 -->
+<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
+                                  U+00ED ISOlat1 -->
+<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
+                                  U+00EE ISOlat1 -->
+<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
+                                  U+00EF ISOlat1 -->
+<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
+<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
+                                  U+00F1 ISOlat1 -->
+<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
+                                  U+00F2 ISOlat1 -->
+<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
+                                  U+00F3 ISOlat1 -->
+<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
+                                  U+00F4 ISOlat1 -->
+<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
+                                  U+00F5 ISOlat1 -->
+<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
+                                  U+00F6 ISOlat1 -->
+<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
+<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
+                                  = latin small letter o slash,
+                                  U+00F8 ISOlat1 -->
+<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
+                                  U+00F9 ISOlat1 -->
+<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
+                                  U+00FA ISOlat1 -->
+<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
+                                  U+00FB ISOlat1 -->
+<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
+                                  U+00FC ISOlat1 -->
+<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
+                                  U+00FD ISOlat1 -->
+<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn,
+                                  U+00FE ISOlat1 -->
+<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
+                                  U+00FF ISOlat1 -->
\ No newline at end of file
diff --git a/xml/tests/testData/xml/xhtml-special.ent b/xml/tests/testData/xml/xhtml-special.ent
new file mode 100644
index 000000000000..ca358b2fec72
--- /dev/null
+++ b/xml/tests/testData/xml/xhtml-special.ent
@@ -0,0 +1,80 @@
+<!-- Special characters for XHTML -->
+
+<!-- Character entity set. Typical invocation:
+     <!ENTITY % HTMLspecial PUBLIC
+        "-//W3C//ENTITIES Special for XHTML//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
+     %HTMLspecial;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+     New names (i.e., not in ISO 8879 list) do not clash with any
+     existing ISO 8879 entity names. ISO 10646 character numbers
+     are given for each character, in hex. values are decimal
+     conversions of the ISO 10646 values and refer to the document
+     character set. Names are Unicode names. 
+-->
+
+<!-- C0 Controls and Basic Latin -->
+<!ENTITY quot    "&#34;"> <!--  quotation mark, U+0022 ISOnum -->
+<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
+<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
+<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
+<!ENTITY apos	 "&#39;"> <!--  apostrophe = APL quote, U+0027 ISOnum -->
+
+<!-- Latin Extended-A -->
+<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
+                                    U+0152 ISOlat2 -->
+<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
+<!-- ligature is a misnomer, this is a separate character in some languages -->
+<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
+                                    U+0160 ISOlat2 -->
+<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
+                                    U+0161 ISOlat2 -->
+<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
+                                    U+0178 ISOlat2 -->
+
+<!-- Spacing Modifier Letters -->
+<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
+                                    U+02C6 ISOpub -->
+<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
+
+<!-- General Punctuation -->
+<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
+<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
+<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
+<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
+                                    U+200C NEW RFC 2070 -->
+<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
+<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
+<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
+<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
+<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
+<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
+                                    U+2018 ISOnum -->
+<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
+                                    U+2019 ISOnum -->
+<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
+<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
+                                    U+201C ISOnum -->
+<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
+                                    U+201D ISOnum -->
+<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
+<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
+<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
+<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
+<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
+                                    U+2039 ISO proposed -->
+<!-- lsaquo is proposed but not yet ISO standardized -->
+<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
+                                    U+203A ISO proposed -->
+<!-- rsaquo is proposed but not yet ISO standardized -->
+
+<!-- Currency Symbols -->
+<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
diff --git a/xml/tests/testData/xml/xhtml-symbol.ent b/xml/tests/testData/xml/xhtml-symbol.ent
new file mode 100644
index 000000000000..63c2abfa6f45
--- /dev/null
+++ b/xml/tests/testData/xml/xhtml-symbol.ent
@@ -0,0 +1,237 @@
+<!-- Mathematical, Greek and Symbolic characters for XHTML -->
+
+<!-- Character entity set. Typical invocation:
+     <!ENTITY % HTMLsymbol PUBLIC
+        "-//W3C//ENTITIES Symbols for XHTML//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
+     %HTMLsymbol;
+-->
+
+<!-- Portions (C) International Organization for Standardization 1986:
+     Permission to copy in any form is granted for use with
+     conforming SGML systems and applications as defined in
+     ISO 8879, provided this notice is included in all copies.
+-->
+
+<!-- Relevant ISO entity set is given unless names are newly introduced.
+     New names (i.e., not in ISO 8879 list) do not clash with any
+     existing ISO 8879 entity names. ISO 10646 character numbers
+     are given for each character, in hex. values are decimal
+     conversions of the ISO 10646 values and refer to the document
+     character set. Names are Unicode names. 
+-->
+
+<!-- Latin Extended-B -->
+<!ENTITY fnof     "&#402;"> <!-- latin small letter f with hook = function
+                                    = florin, U+0192 ISOtech -->
+
+<!-- Greek -->
+<!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
+<!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
+<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
+                                    U+0393 ISOgrk3 -->
+<!ENTITY Delta    "&#916;"> <!-- greek capital letter delta,
+                                    U+0394 ISOgrk3 -->
+<!ENTITY Epsilon  "&#917;"> <!-- greek capital letter epsilon, U+0395 -->
+<!ENTITY Zeta     "&#918;"> <!-- greek capital letter zeta, U+0396 -->
+<!ENTITY Eta      "&#919;"> <!-- greek capital letter eta, U+0397 -->
+<!ENTITY Theta    "&#920;"> <!-- greek capital letter theta,
+                                    U+0398 ISOgrk3 -->
+<!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
+<!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
+<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lamda,
+                                    U+039B ISOgrk3 -->
+<!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
+<!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
+<!ENTITY Xi       "&#926;"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
+<!ENTITY Omicron  "&#927;"> <!-- greek capital letter omicron, U+039F -->
+<!ENTITY Pi       "&#928;"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
+<!ENTITY Rho      "&#929;"> <!-- greek capital letter rho, U+03A1 -->
+<!-- there is no Sigmaf, and no U+03A2 character either -->
+<!ENTITY Sigma    "&#931;"> <!-- greek capital letter sigma,
+                                    U+03A3 ISOgrk3 -->
+<!ENTITY Tau      "&#932;"> <!-- greek capital letter tau, U+03A4 -->
+<!ENTITY Upsilon  "&#933;"> <!-- greek capital letter upsilon,
+                                    U+03A5 ISOgrk3 -->
+<!ENTITY Phi      "&#934;"> <!-- greek capital letter phi,
+                                    U+03A6 ISOgrk3 -->
+<!ENTITY Chi      "&#935;"> <!-- greek capital letter chi, U+03A7 -->
+<!ENTITY Psi      "&#936;"> <!-- greek capital letter psi,
+                                    U+03A8 ISOgrk3 -->
+<!ENTITY Omega    "&#937;"> <!-- greek capital letter omega,
+                                    U+03A9 ISOgrk3 -->
+
+<!ENTITY alpha    "&#945;"> <!-- greek small letter alpha,
+                                    U+03B1 ISOgrk3 -->
+<!ENTITY beta     "&#946;"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
+<!ENTITY gamma    "&#947;"> <!-- greek small letter gamma,
+                                    U+03B3 ISOgrk3 -->
+<!ENTITY delta    "&#948;"> <!-- greek small letter delta,
+                                    U+03B4 ISOgrk3 -->
+<!ENTITY epsilon  "&#949;"> <!-- greek small letter epsilon,
+                                    U+03B5 ISOgrk3 -->
+<!ENTITY zeta     "&#950;"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
+<!ENTITY eta      "&#951;"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
+<!ENTITY theta    "&#952;"> <!-- greek small letter theta,
+                                    U+03B8 ISOgrk3 -->
+<!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
+<!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
+                                    U+03BA ISOgrk3 -->
+<!ENTITY lambda   "&#955;"> <!-- greek small letter lamda,
+                                    U+03BB ISOgrk3 -->
+<!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
+<!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
+<!ENTITY xi       "&#958;"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
+<!ENTITY omicron  "&#959;"> <!-- greek small letter omicron, U+03BF NEW -->
+<!ENTITY pi       "&#960;"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
+<!ENTITY rho      "&#961;"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
+<!ENTITY sigmaf   "&#962;"> <!-- greek small letter final sigma,
+                                    U+03C2 ISOgrk3 -->
+<!ENTITY sigma    "&#963;"> <!-- greek small letter sigma,
+                                    U+03C3 ISOgrk3 -->
+<!ENTITY tau      "&#964;"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
+<!ENTITY upsilon  "&#965;"> <!-- greek small letter upsilon,
+                                    U+03C5 ISOgrk3 -->
+<!ENTITY phi      "&#966;"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
+<!ENTITY chi      "&#967;"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
+<!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
+<!ENTITY omega    "&#969;"> <!-- greek small letter omega,
+                                    U+03C9 ISOgrk3 -->
+<!ENTITY thetasym "&#977;"> <!-- greek theta symbol,
+                                    U+03D1 NEW -->
+<!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
+                                    U+03D2 NEW -->
+<!ENTITY piv      "&#982;"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
+
+<!-- General Punctuation -->
+<!ENTITY bull     "&#8226;"> <!-- bullet = black small circle,
+                                     U+2022 ISOpub  -->
+<!-- bullet is NOT the same as bullet operator, U+2219 -->
+<!ENTITY hellip   "&#8230;"> <!-- horizontal ellipsis = three dot leader,
+                                     U+2026 ISOpub  -->
+<!ENTITY prime    "&#8242;"> <!-- prime = minutes = feet, U+2032 ISOtech -->
+<!ENTITY Prime    "&#8243;"> <!-- double prime = seconds = inches,
+                                     U+2033 ISOtech -->
+<!ENTITY oline    "&#8254;"> <!-- overline = spacing overscore,
+                                     U+203E NEW -->
+<!ENTITY frasl    "&#8260;"> <!-- fraction slash, U+2044 NEW -->
+
+<!-- Letterlike Symbols -->
+<!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
+                                     = Weierstrass p, U+2118 ISOamso -->
+<!ENTITY image    "&#8465;"> <!-- black-letter capital I = imaginary part,
+                                     U+2111 ISOamso -->
+<!ENTITY real     "&#8476;"> <!-- black-letter capital R = real part symbol,
+                                     U+211C ISOamso -->
+<!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
+<!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
+                                     U+2135 NEW -->
+<!-- alef symbol is NOT the same as hebrew letter alef,
+     U+05D0 although the same glyph could be used to depict both characters -->
+
+<!-- Arrows -->
+<!ENTITY larr     "&#8592;"> <!-- leftwards arrow, U+2190 ISOnum -->
+<!ENTITY uarr     "&#8593;"> <!-- upwards arrow, U+2191 ISOnum-->
+<!ENTITY rarr     "&#8594;"> <!-- rightwards arrow, U+2192 ISOnum -->
+<!ENTITY darr     "&#8595;"> <!-- downwards arrow, U+2193 ISOnum -->
+<!ENTITY harr     "&#8596;"> <!-- left right arrow, U+2194 ISOamsa -->
+<!ENTITY crarr    "&#8629;"> <!-- downwards arrow with corner leftwards
+                                     = carriage return, U+21B5 NEW -->
+<!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
+<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
+    but also does not have any other character for that function. So lArr can
+    be used for 'is implied by' as ISOtech suggests -->
+<!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
+<!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
+                                     U+21D2 ISOtech -->
+<!-- Unicode does not say this is the 'implies' character but does not have 
+     another character with this function so rArr can be used for 'implies'
+     as ISOtech suggests -->
+<!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
+<!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
+                                     U+21D4 ISOamsa -->
+
+<!-- Mathematical Operators -->
+<!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
+<!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
+<!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
+<!ENTITY empty    "&#8709;"> <!-- empty set = null set, U+2205 ISOamso -->
+<!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
+                                     U+2207 ISOtech -->
+<!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
+<!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
+<!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
+<!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
+                                     U+220F ISOamsb -->
+<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
+     the same glyph might be used for both -->
+<!ENTITY sum      "&#8721;"> <!-- n-ary summation, U+2211 ISOamsb -->
+<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
+     though the same glyph might be used for both -->
+<!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
+<!ENTITY lowast   "&#8727;"> <!-- asterisk operator, U+2217 ISOtech -->
+<!ENTITY radic    "&#8730;"> <!-- square root = radical sign,
+                                     U+221A ISOtech -->
+<!ENTITY prop     "&#8733;"> <!-- proportional to, U+221D ISOtech -->
+<!ENTITY infin    "&#8734;"> <!-- infinity, U+221E ISOtech -->
+<!ENTITY ang      "&#8736;"> <!-- angle, U+2220 ISOamso -->
+<!ENTITY and      "&#8743;"> <!-- logical and = wedge, U+2227 ISOtech -->
+<!ENTITY or       "&#8744;"> <!-- logical or = vee, U+2228 ISOtech -->
+<!ENTITY cap      "&#8745;"> <!-- intersection = cap, U+2229 ISOtech -->
+<!ENTITY cup      "&#8746;"> <!-- union = cup, U+222A ISOtech -->
+<!ENTITY int      "&#8747;"> <!-- integral, U+222B ISOtech -->
+<!ENTITY there4   "&#8756;"> <!-- therefore, U+2234 ISOtech -->
+<!ENTITY sim      "&#8764;"> <!-- tilde operator = varies with = similar to,
+                                     U+223C ISOtech -->
+<!-- tilde operator is NOT the same character as the tilde, U+007E,
+     although the same glyph might be used to represent both  -->
+<!ENTITY cong     "&#8773;"> <!-- approximately equal to, U+2245 ISOtech -->
+<!ENTITY asymp    "&#8776;"> <!-- almost equal to = asymptotic to,
+                                     U+2248 ISOamsr -->
+<!ENTITY ne       "&#8800;"> <!-- not equal to, U+2260 ISOtech -->
+<!ENTITY equiv    "&#8801;"> <!-- identical to, U+2261 ISOtech -->
+<!ENTITY le       "&#8804;"> <!-- less-than or equal to, U+2264 ISOtech -->
+<!ENTITY ge       "&#8805;"> <!-- greater-than or equal to,
+                                     U+2265 ISOtech -->
+<!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
+<!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
+<!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
+<!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
+<!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
+                                     U+2287 ISOtech -->
+<!ENTITY oplus    "&#8853;"> <!-- circled plus = direct sum,
+                                     U+2295 ISOamsb -->
+<!ENTITY otimes   "&#8855;"> <!-- circled times = vector product,
+                                     U+2297 ISOamsb -->
+<!ENTITY perp     "&#8869;"> <!-- up tack = orthogonal to = perpendicular,
+                                     U+22A5 ISOtech -->
+<!ENTITY sdot     "&#8901;"> <!-- dot operator, U+22C5 ISOamsb -->
+<!-- dot operator is NOT the same character as U+00B7 middle dot -->
+
+<!-- Miscellaneous Technical -->
+<!ENTITY lceil    "&#8968;"> <!-- left ceiling = APL upstile,
+                                     U+2308 ISOamsc  -->
+<!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
+<!ENTITY lfloor   "&#8970;"> <!-- left floor = APL downstile,
+                                     U+230A ISOamsc  -->
+<!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
+<!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
+                                     U+2329 ISOtech -->
+<!-- lang is NOT the same character as U+003C 'less than sign' 
+     or U+2039 'single left-pointing angle quotation mark' -->
+<!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
+                                     U+232A ISOtech -->
+<!-- rang is NOT the same character as U+003E 'greater than sign' 
+     or U+203A 'single right-pointing angle quotation mark' -->
+
+<!-- Geometric Shapes -->
+<!ENTITY loz      "&#9674;"> <!-- lozenge, U+25CA ISOpub -->
+
+<!-- Miscellaneous Symbols -->
+<!ENTITY spades   "&#9824;"> <!-- black spade suit, U+2660 ISOpub -->
+<!-- black here seems to mean filled as opposed to hollow -->
+<!ENTITY clubs    "&#9827;"> <!-- black club suit = shamrock,
+                                     U+2663 ISOpub -->
+<!ENTITY hearts   "&#9829;"> <!-- black heart suit = valentine,
+                                     U+2665 ISOpub -->
+<!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
diff --git a/xml/tests/testData/xml/xhtml1-transitional.xsd b/xml/tests/testData/xml/xhtml1-transitional.xsd
new file mode 100644
index 000000000000..213711565157
--- /dev/null
+++ b/xml/tests/testData/xml/xhtml1-transitional.xsd
@@ -0,0 +1,2773 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xs:schema [
+<!ENTITY % HTMLlat1 PUBLIC
+       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+       "xhtml-lat1.ent">
+    %HTMLlat1;
+
+    <!ENTITY % HTMLsymbol PUBLIC
+       "-//W3C//ENTITIES Symbols for XHTML//EN"
+       "xhtml-symbol.ent">
+    %HTMLsymbol;
+
+    <!ENTITY % HTMLspecial PUBLIC
+       "-//W3C//ENTITIES Special for XHTML//EN"
+       "xhtml-special.ent">
+    %HTMLspecial;
+]>
+
+<xs:schema version="1.0" xml:lang="en"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://www.w3.org/1999/xhtml"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    elementFormDefault="qualified">
+
+  <xs:annotation>
+    <xs:documentation>
+    XHTML 1.0 (Second Edition) Transitional in XML Schema
+
+    This is the same as HTML 4 Transitional except for
+    changes due to the differences between XML and SGML.
+
+    Namespace = http://www.w3.org/1999/xhtml
+
+    For further information, see: http://www.w3.org/TR/xhtml1
+
+    Copyright (c) 1998-2002 W3C (MIT, INRIA, Keio),
+    All Rights Reserved.
+
+    The DTD version is identified by the PUBLIC and SYSTEM identifiers:
+
+    PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+
+    $Id: xhtml1-transitional.xsd,v 1.5 2002/08/28 09:53:29 mimasa Exp $
+    </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>
+    ================ Character mnemonic entities =========================
+
+    XHTML entity sets are identified by the PUBLIC and SYSTEM identifiers:
+
+    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
+    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent"
+
+    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
+    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"
+
+    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
+    SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:annotation>
+    <xs:documentation>
+    ================== Imported Names ====================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:simpleType name="ContentType">
+    <xs:annotation>
+      <xs:documentation>
+      media type, as per [RFC2045]
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="ContentTypes">
+    <xs:annotation>
+      <xs:documentation>
+      comma-separated list of media types, as per [RFC2045]
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="Charset">
+    <xs:annotation>
+      <xs:documentation>
+      a character encoding, as per [RFC2045]
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="Charsets">
+    <xs:annotation>
+      <xs:documentation>
+      a space separated list of character encodings, as per [RFC2045]
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="LanguageCode">
+    <xs:annotation>
+      <xs:documentation>
+      a language code, as per [RFC3066]
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:language"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="Character">
+    <xs:annotation>
+      <xs:documentation>
+      a single character, as per section 2.2 of [XML]
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:length value="1" fixed="true"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="Number">
+    <xs:annotation>
+      <xs:documentation>
+      one or more digits
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:nonNegativeInteger">
+      <xs:pattern value="[0-9]+"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="tabindexNumber">
+    <xs:annotation>
+      <xs:documentation>
+      tabindex attribute specifies the position of the current element
+      in the tabbing order for the current document. This value must be
+      a number between 0 and 32767. User agents should ignore leading zeros.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="Number">
+      <xs:minInclusive value="0"/>
+      <xs:maxInclusive value="32767"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="LinkTypes">
+    <xs:annotation>
+      <xs:documentation>
+      space-separated list of link types
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:NMTOKENS"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="MediaDesc">
+    <xs:annotation>
+      <xs:documentation>
+      single or comma-separated list of media descriptors
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[^,]+(,\s*[^,]+)*"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="URI">
+    <xs:annotation>
+      <xs:documentation>
+      a Uniform Resource Identifier, see [RFC2396]
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:anyURI"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="UriList">
+    <xs:annotation>
+      <xs:documentation>
+      a space separated list of Uniform Resource Identifiers
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="Datetime">
+    <xs:annotation>
+      <xs:documentation>
+      date and time information. ISO date format
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:dateTime"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="Script">
+    <xs:annotation>
+      <xs:documentation>
+      script expression
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="StyleSheet">
+    <xs:annotation>
+      <xs:documentation>
+      style sheet data
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="Text">
+    <xs:annotation>
+      <xs:documentation>
+      used for titles etc.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:simpleType name="FrameTarget">
+    <xs:annotation>
+      <xs:documentation>
+      render in this frame
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:NMTOKEN">
+      <xs:pattern value="_(blank|self|parent|top)|[A-Za-z]\c*"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="Length">
+    <xs:annotation>
+      <xs:documentation>
+      nn for pixels or nn% for percentage length
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[-+]?(\d+|\d+(\.\d+)?%)"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="MultiLength">
+    <xs:annotation>
+      <xs:documentation>
+      pixel, percentage, or relative
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[-+]?(\d+|\d+(\.\d+)?%)|[1-9]?(\d+)?\*"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="Pixels">
+    <xs:annotation>
+      <xs:documentation>
+      integer representing length in pixels
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:nonNegativeInteger"/>
+  </xs:simpleType>
+
+  <xs:annotation>
+    <xs:documentation>
+    these are used for image maps
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:simpleType name="Shape">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="rect"/>
+      <xs:enumeration value="circle"/>
+      <xs:enumeration value="poly"/>
+      <xs:enumeration value="default"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="Coords">
+    <xs:annotation>
+      <xs:documentation>
+      comma separated list of lengths
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:pattern
+          value="[-+]?(\d+|\d+(\.\d+)?%)(,\s*[-+]?(\d+|\d+(\.\d+)?%))*"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="ImgAlign">
+    <xs:annotation>
+      <xs:documentation>
+      used for object, applet, img, input and iframe
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="top"/>
+      <xs:enumeration value="middle"/>
+      <xs:enumeration value="bottom"/>
+      <xs:enumeration value="left"/>
+      <xs:enumeration value="right"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="Color">
+    <xs:annotation>
+      <xs:documentation>
+      a color using sRGB: #RRGGBB as Hex values
+
+      There are also 16 widely known color names with their sRGB values:
+
+      Black  = #000000    Green  = #008000
+      Silver = #C0C0C0    Lime   = #00FF00
+      Gray   = #808080    Olive  = #808000
+      White  = #FFFFFF    Yellow = #FFFF00
+      Maroon = #800000    Navy   = #000080
+      Red    = #FF0000    Blue   = #0000FF
+      Purple = #800080    Teal   = #008080
+      Fuchsia= #FF00FF    Aqua   = #00FFFF
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string">
+      <xs:pattern value="[A-Za-z]+|#[0-9A-Fa-f]{3}|#[0-9A-Fa-f]{6}"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Generic Attributes ===============================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:attributeGroup name="coreattrs">
+    <xs:annotation>
+      <xs:documentation>
+      core attributes common to most elements
+      id       document-wide unique id
+      class    space separated list of classes
+      style    associated style info
+      title    advisory title/amplification
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="id" type="xs:ID"/>
+    <xs:attribute name="class" type="xs:NMTOKENS"/>
+    <xs:attribute name="style" type="StyleSheet"/>
+    <xs:attribute name="title" type="Text"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="i18n">
+    <xs:annotation>
+      <xs:documentation>
+      internationalization attributes
+      lang        language code (backwards compatible)
+      xml:lang    language code (as per XML 1.0 spec)
+      dir         direction for weak/neutral text
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="lang" type="LanguageCode"/>
+    <xs:attribute ref="xml:lang"/>
+    <xs:attribute name="dir">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="ltr"/>
+          <xs:enumeration value="rtl"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="events">
+    <xs:annotation>
+      <xs:documentation>
+      attributes for common UI events
+      onclick     a pointer button was clicked
+      ondblclick  a pointer button was double clicked
+      onmousedown a pointer button was pressed down
+      onmouseup   a pointer button was released
+      onmousemove a pointer was moved onto the element
+      onmouseout  a pointer was moved away from the element
+      onkeypress  a key was pressed and released
+      onkeydown   a key was pressed down
+      onkeyup     a key was released
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="onclick" type="Script"/>
+    <xs:attribute name="ondblclick" type="Script"/>
+    <xs:attribute name="onmousedown" type="Script"/>
+    <xs:attribute name="onmouseup" type="Script"/>
+    <xs:attribute name="onmouseover" type="Script"/>
+    <xs:attribute name="onmousemove" type="Script"/>
+    <xs:attribute name="onmouseout" type="Script"/>
+    <xs:attribute name="onkeypress" type="Script"/>
+    <xs:attribute name="onkeydown" type="Script"/>
+    <xs:attribute name="onkeyup" type="Script"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="focus">
+    <xs:annotation>
+      <xs:documentation>
+      attributes for elements that can get the focus
+      accesskey   accessibility key character
+      tabindex    position in tabbing order
+      onfocus     the element got the focus
+      onblur      the element lost the focus
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="accesskey" type="Character"/>
+    <xs:attribute name="tabindex" type="tabindexNumber"/>
+    <xs:attribute name="onfocus" type="Script"/>
+    <xs:attribute name="onblur" type="Script"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="attrs">
+    <xs:attributeGroup ref="coreattrs"/>
+    <xs:attributeGroup ref="i18n"/>
+    <xs:attributeGroup ref="events"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="TextAlign">
+    <xs:annotation>
+      <xs:documentation>
+      text alignment for p, div, h1-h6. The default is
+      align="left" for ltr headings, "right" for rtl
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="align">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="left"/>
+          <xs:enumeration value="center"/>
+          <xs:enumeration value="right"/>
+          <xs:enumeration value="justify"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Text Elements ====================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:group name="special.extra">
+    <xs:choice>
+      <xs:element ref="object"/>
+      <xs:element ref="applet"/>
+      <xs:element ref="img"/>
+      <xs:element ref="map"/>
+      <xs:element ref="iframe"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="special.basic">
+    <xs:choice>
+      <xs:element ref="br"/>
+      <xs:element ref="span"/>
+      <xs:element ref="bdo"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="special">
+    <xs:choice>
+      <xs:group ref="special.basic"/>
+      <xs:group ref="special.extra"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="fontstyle.extra">
+    <xs:choice>
+      <xs:element ref="big"/>
+      <xs:element ref="small"/>
+      <xs:element ref="font"/>
+      <xs:element ref="basefont"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="fontstyle.basic">
+    <xs:choice>
+      <xs:element ref="tt"/>
+      <xs:element ref="i"/>
+      <xs:element ref="b"/>
+      <xs:element ref="u"/>
+      <xs:element ref="s"/>
+      <xs:element ref="strike"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="fontstyle">
+    <xs:choice>
+      <xs:group ref="fontstyle.basic"/>
+      <xs:group ref="fontstyle.extra"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="phrase.extra">
+    <xs:choice>
+      <xs:element ref="sub"/>
+      <xs:element ref="sup"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="phrase.basic">
+    <xs:choice>
+      <xs:element ref="em"/>
+      <xs:element ref="strong"/>
+      <xs:element ref="dfn"/>
+      <xs:element ref="code"/>
+      <xs:element ref="q"/>
+      <xs:element ref="samp"/>
+      <xs:element ref="kbd"/>
+      <xs:element ref="var"/>
+      <xs:element ref="cite"/>
+      <xs:element ref="abbr"/>
+      <xs:element ref="acronym"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="phrase">
+    <xs:choice>
+      <xs:group ref="phrase.basic"/>
+      <xs:group ref="phrase.extra"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="inline.forms">
+    <xs:choice>
+      <xs:element ref="input"/>
+      <xs:element ref="select"/>
+      <xs:element ref="textarea"/>
+      <xs:element ref="label"/>
+      <xs:element ref="button"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="misc.inline">
+    <xs:annotation>
+      <xs:documentation>
+      these can only occur at block level
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice>
+      <xs:element ref="ins"/>
+      <xs:element ref="del"/>
+      <xs:element ref="script"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="misc">
+    <xs:annotation>
+      <xs:documentation>
+      these can only occur at block level
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice>
+      <xs:element ref="noscript"/>
+      <xs:group ref="misc.inline"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="inline">
+    <xs:choice>
+      <xs:element ref="a"/>
+      <xs:group ref="special"/>
+      <xs:group ref="fontstyle"/>
+      <xs:group ref="phrase"/>
+      <xs:group ref="inline.forms"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:complexType name="Inline" mixed="true">
+    <xs:annotation>
+      <xs:documentation>
+      "Inline" covers inline or "text-level" element
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="inline"/>
+      <xs:group ref="misc.inline"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:annotation>
+    <xs:documentation>
+    ================== Block level elements ==============================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:group name="heading">
+    <xs:choice>
+      <xs:element ref="h1"/>
+      <xs:element ref="h2"/>
+      <xs:element ref="h3"/>
+      <xs:element ref="h4"/>
+      <xs:element ref="h5"/>
+      <xs:element ref="h6"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="lists">
+    <xs:choice>
+      <xs:element ref="ul"/>
+      <xs:element ref="ol"/>
+      <xs:element ref="dl"/>
+      <xs:element ref="menu"/>
+      <xs:element ref="dir"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="blocktext">
+    <xs:choice>
+      <xs:element ref="pre"/>
+      <xs:element ref="hr"/>
+      <xs:element ref="blockquote"/>
+      <xs:element ref="address"/>
+      <xs:element ref="center"/>
+      <xs:element ref="noframes"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:group name="block">
+    <xs:choice>
+      <xs:element ref="p"/>
+      <xs:group ref="heading"/>
+      <xs:element ref="div"/>
+      <xs:group ref="lists"/>
+      <xs:group ref="blocktext"/>
+      <xs:element ref="isindex"/>
+      <xs:element ref="fieldset"/>
+      <xs:element ref="table"/>
+    </xs:choice>
+  </xs:group>
+
+  <xs:complexType name="Flow" mixed="true">
+    <xs:annotation>
+      <xs:documentation>
+      "Flow" mixes block and inline and is used for list items etc.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="block"/>
+      <xs:element ref="form"/>
+      <xs:group ref="inline"/>
+      <xs:group ref="misc"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:annotation>
+    <xs:documentation>
+    ================== Content models for exclusions =====================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:complexType name="a.content" mixed="true">
+    <xs:annotation>
+      <xs:documentation>
+      a elements use "Inline" excluding a
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="special"/>
+      <xs:group ref="fontstyle"/>
+      <xs:group ref="phrase"/>
+      <xs:group ref="inline.forms"/>
+      <xs:group ref="misc.inline"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="pre.content" mixed="true">
+    <xs:annotation>
+      <xs:documentation>
+      pre uses "Inline" excluding img, object, applet, big, small,
+      font, or basefont
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="a"/>
+      <xs:group ref="special.basic"/>
+      <xs:group ref="fontstyle.basic"/>
+      <xs:group ref="phrase.basic"/>
+      <xs:group ref="inline.forms"/>
+      <xs:group ref="misc.inline"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="form.content" mixed="true">
+    <xs:annotation>
+      <xs:documentation>
+      form uses "Flow" excluding form
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:group ref="block"/>
+      <xs:group ref="inline"/>
+      <xs:group ref="misc"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="button.content" mixed="true">
+    <xs:annotation>
+      <xs:documentation>
+      button uses "Flow" but excludes a, form, form controls, iframe
+      </xs:documentation>
+    </xs:annotation>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element ref="p"/>
+      <xs:group ref="heading"/>
+      <xs:element ref="div"/>
+      <xs:group ref="lists"/>
+      <xs:group ref="blocktext"/>
+      <xs:element ref="table"/>
+      <xs:element ref="br"/>
+      <xs:element ref="span"/>
+      <xs:element ref="bdo"/>
+      <xs:element ref="object"/>
+      <xs:element ref="applet"/>
+      <xs:element ref="img"/>
+      <xs:element ref="map"/>
+      <xs:group ref="fontstyle"/>
+      <xs:group ref="phrase"/>
+      <xs:group ref="misc"/>
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:annotation>
+    <xs:documentation>
+    ================ Document Structure ==================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="html">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="head"/>
+        <xs:element ref="body"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="i18n"/>
+      <xs:attribute name="id" type="xs:ID"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    ================ Document Head =======================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:group name="head.misc">
+    <xs:sequence>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="script"/>
+        <xs:element ref="style"/>
+        <xs:element ref="meta"/>
+        <xs:element ref="link"/>
+        <xs:element ref="object"/>
+        <xs:element ref="isindex"/>
+      </xs:choice>
+    </xs:sequence>
+  </xs:group>
+
+  <xs:element name="head">
+    <xs:annotation>
+      <xs:documentation>
+      content model is "head.misc" combined with a single
+      title and an optional base element in any order
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:group ref="head.misc"/>
+        <xs:choice>
+          <xs:sequence>
+            <xs:element ref="title"/>
+            <xs:group ref="head.misc"/>
+            <xs:sequence minOccurs="0">
+              <xs:element ref="base"/>
+              <xs:group ref="head.misc"/>
+            </xs:sequence>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element ref="base"/>
+            <xs:group ref="head.misc"/>
+            <xs:element ref="title"/>
+            <xs:group ref="head.misc"/>
+          </xs:sequence>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attributeGroup ref="i18n"/>
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="profile" type="URI"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="title">
+    <xs:annotation>
+      <xs:documentation>
+      The title element is not considered part of the flow of text.
+      It should be displayed, for example as the page header or
+      window title. Exactly one title is required per document.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:attributeGroup ref="i18n"/>
+      <xs:attribute name="id" type="xs:ID"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="base">
+    <xs:annotation>
+      <xs:documentation>
+      document base URI
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="href" type="URI"/>
+      <xs:attribute name="target" type="FrameTarget"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="meta">
+    <xs:annotation>
+      <xs:documentation>
+      generic metainformation
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="i18n"/>
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="http-equiv"/>
+      <xs:attribute name="name"/>
+      <xs:attribute name="content" use="required"/>
+      <xs:attribute name="scheme"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="link">
+    <xs:annotation>
+      <xs:documentation>
+      Relationship values can be used in principle:
+
+      a) for document specific toolbars/menus when used
+         with the link element in document head e.g.
+           start, contents, previous, next, index, end, help
+      b) to link to a separate style sheet (rel="stylesheet")
+      c) to make a link to a script (rel="script")
+      d) by stylesheets to control how collections of
+         html nodes are rendered into printed documents
+      e) to make a link to a printable version of this document
+         e.g. a PostScript or PDF version (rel="alternate" media="print")
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="charset" type="Charset"/>
+      <xs:attribute name="href" type="URI"/>
+      <xs:attribute name="hreflang" type="LanguageCode"/>
+      <xs:attribute name="type" type="ContentType"/>
+      <xs:attribute name="rel" type="LinkTypes"/>
+      <xs:attribute name="rev" type="LinkTypes"/>
+      <xs:attribute name="media" type="MediaDesc"/>
+      <xs:attribute name="target" type="FrameTarget"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="style">
+    <xs:annotation>
+      <xs:documentation>
+      style info, which may include CDATA sections
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:attributeGroup ref="i18n"/>
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="type" use="required" type="ContentType"/>
+      <xs:attribute name="media" type="MediaDesc"/>
+      <xs:attribute name="title" type="Text"/>
+      <xs:attribute ref="xml:space" fixed="preserve"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="script">
+    <xs:annotation>
+      <xs:documentation>
+      script statements, which may include CDATA sections
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="charset" type="Charset"/>
+      <xs:attribute name="type" use="required" type="ContentType"/>
+      <xs:attribute name="language"/>
+      <xs:attribute name="src" type="URI"/>
+      <xs:attribute name="defer">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="defer"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute ref="xml:space" fixed="preserve"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="noscript">
+    <xs:annotation>
+      <xs:documentation>
+      alternate content container for non script-based rendering
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    ======================= Frames =======================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="iframe">
+    <xs:annotation>
+      <xs:documentation>
+      inline subwindow
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="coreattrs"/>
+          <xs:attribute name="longdesc" type="URI"/>
+          <xs:attribute name="name" type="xs:NMTOKEN"/>
+          <xs:attribute name="src" type="URI"/>
+          <xs:attribute name="frameborder" default="1">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="1"/>
+                <xs:enumeration value="0"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="marginwidth" type="Pixels"/>
+          <xs:attribute name="marginheight" type="Pixels"/>
+          <xs:attribute name="scrolling" default="auto">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="yes"/>
+                <xs:enumeration value="no"/>
+                <xs:enumeration value="auto"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="align" type="ImgAlign"/>
+          <xs:attribute name="height" type="Length"/>
+          <xs:attribute name="width" type="Length"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="noframes">
+    <xs:annotation>
+      <xs:documentation>
+      alternate content container for non frame-based rendering
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Document Body ====================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="body">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="onload" type="Script"/>
+          <xs:attribute name="onunload" type="Script"/>
+          <xs:attribute name="background" type="URI"/>
+          <xs:attribute name="bgcolor" type="Color"/>
+          <xs:attribute name="text" type="Color"/>
+          <xs:attribute name="link" type="Color"/>
+          <xs:attribute name="vlink" type="Color"/>
+          <xs:attribute name="alink" type="Color"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="div">
+    <xs:annotation>
+      <xs:documentation>
+      generic language/style container
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="TextAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Paragraphs =======================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="p">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="TextAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Headings =========================================
+
+    There are six levels of headings from h1 (the most important)
+    to h6 (the least important).
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="h1">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="TextAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="h2">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="TextAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="h3">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="TextAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="h4">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="TextAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="h5">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="TextAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="h6">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="TextAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Lists ============================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:simpleType name="ULStyle">
+    <xs:annotation>
+      <xs:documentation>
+      Unordered list bullet styles
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="disc"/>
+      <xs:enumeration value="square"/>
+      <xs:enumeration value="circle"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="ul">
+    <xs:annotation>
+      <xs:documentation>
+      Unordered list
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="li"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="type" type="ULStyle"/>
+      <xs:attribute name="compact">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="compact"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name="OLStyle">
+    <xs:annotation>
+      <xs:documentation>
+      Ordered list numbering style
+
+      1   arabic numbers      1, 2, 3, ...
+      a   lower alpha         a, b, c, ...
+      A   upper alpha         A, B, C, ...
+      i   lower roman         i, ii, iii, ...
+      I   upper roman         I, II, III, ...
+
+      The style is applied to the sequence number which by default
+      is reset to 1 for the first list item in an ordered list.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:element name="ol">
+    <xs:annotation>
+      <xs:documentation>
+      Ordered (numbered) list
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="li"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="type" type="OLStyle"/>
+      <xs:attribute name="compact">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="compact"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="start" type="Number"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="menu">
+    <xs:annotation>
+      <xs:documentation>
+      single column list (DEPRECATED)
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="li"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="compact">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="compact"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="dir">
+    <xs:annotation>
+      <xs:documentation>
+      multiple column list (DEPRECATED)
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="li"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="compact">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="compact"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name="LIStyle">
+    <xs:annotation>
+      <xs:documentation>
+      LIStyle is constrained to: "(ULStyle|OLStyle)"
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:string"/>
+  </xs:simpleType>
+
+  <xs:element name="li">
+    <xs:annotation>
+      <xs:documentation>
+      list item
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="type" type="LIStyle"/>
+          <xs:attribute name="value" type="Number"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    definition lists - dt for term, dd for its definition
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="dl">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="dt"/>
+        <xs:element ref="dd"/>
+      </xs:choice>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="compact">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="compact"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="dt">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="dd">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Address ==========================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="address">
+    <xs:annotation>
+      <xs:documentation>
+      information on author
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:group ref="inline"/>
+        <xs:group ref="misc.inline"/>
+        <xs:element ref="p"/>
+      </xs:choice>
+      <xs:attributeGroup ref="attrs"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Horizontal Rule ==================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="hr">
+    <xs:complexType>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="align">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="center"/>
+            <xs:enumeration value="right"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="noshade">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="noshade"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="size" type="Pixels"/>
+      <xs:attribute name="width" type="Length"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Preformatted Text ================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="pre">
+    <xs:annotation>
+      <xs:documentation>
+      content is "Inline" excluding
+         "img|object|applet|big|small|sub|sup|font|basefont"
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="pre.content">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="width" type="Number"/>
+          <xs:attribute ref="xml:space" fixed="preserve"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Block-like Quotes ================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="blockquote">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="cite" type="URI"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Text alignment ===================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="center">
+    <xs:annotation>
+      <xs:documentation>
+      center content
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Inserted/Deleted Text ============================
+
+    ins/del are allowed in block and inline content, but its
+    inappropriate to include block content within an ins element
+    occurring in inline content.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="ins">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="cite" type="URI"/>
+          <xs:attribute name="datetime" type="Datetime"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="del">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="cite" type="URI"/>
+          <xs:attribute name="datetime" type="Datetime"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    ================== The Anchor Element ================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="a">
+    <xs:annotation>
+      <xs:documentation>
+      content is "Inline" except that anchors shouldn't be nested
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="a.content">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="focus"/>
+          <xs:attribute name="charset" type="Charset"/>
+          <xs:attribute name="type" type="ContentType"/>
+          <xs:attribute name="name" type="xs:NMTOKEN"/>
+          <xs:attribute name="href" type="URI"/>
+          <xs:attribute name="hreflang" type="LanguageCode"/>
+          <xs:attribute name="rel" type="LinkTypes"/>
+          <xs:attribute name="rev" type="LinkTypes"/>
+          <xs:attribute name="shape" default="rect" type="Shape"/>
+          <xs:attribute name="coords" type="Coords"/>
+          <xs:attribute name="target" type="FrameTarget"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    ===================== Inline Elements ================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="span">
+    <xs:annotation>
+      <xs:documentation>
+      generic language/style container
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="bdo">
+    <xs:annotation>
+      <xs:documentation>
+      I18N BiDi over-ride
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="coreattrs"/>
+          <xs:attributeGroup ref="events"/>
+          <xs:attribute name="lang" type="LanguageCode"/>
+          <xs:attribute ref="xml:lang"/>
+          <xs:attribute name="dir" use="required">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="ltr"/>
+                <xs:enumeration value="rtl"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="br">
+    <xs:annotation>
+      <xs:documentation>
+      forced line break
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="coreattrs"/>
+      <xs:attribute name="clear" default="none">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="left"/>
+            <xs:enumeration value="all"/>
+            <xs:enumeration value="right"/>
+            <xs:enumeration value="none"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="em">
+    <xs:annotation>
+      <xs:documentation>
+      emphasis
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="strong">
+    <xs:annotation>
+      <xs:documentation>
+      strong emphasis
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="dfn">
+    <xs:annotation>
+      <xs:documentation>
+      definitional
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="code">
+    <xs:annotation>
+      <xs:documentation>
+      program code
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="samp">
+    <xs:annotation>
+      <xs:documentation>
+      sample
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="kbd">
+    <xs:annotation>
+      <xs:documentation>
+      something user would type
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="var">
+    <xs:annotation>
+      <xs:documentation>
+      variable
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="cite">
+    <xs:annotation>
+      <xs:documentation>
+      citation
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="abbr">
+    <xs:annotation>
+      <xs:documentation>
+      abbreviation
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="acronym">
+    <xs:annotation>
+      <xs:documentation>
+      acronym
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="q">
+    <xs:annotation>
+      <xs:documentation>
+      inlined quote
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="cite" type="URI"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="sub">
+    <xs:annotation>
+      <xs:documentation>
+      subscript
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="sup">
+    <xs:annotation>
+      <xs:documentation>
+      superscript
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="tt">
+    <xs:annotation>
+      <xs:documentation>
+      fixed pitch font
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="i">
+    <xs:annotation>
+      <xs:documentation>
+      italic font
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="b">
+    <xs:annotation>
+      <xs:documentation>
+      bold font
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="big">
+    <xs:annotation>
+      <xs:documentation>
+      bigger font
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="small">
+    <xs:annotation>
+      <xs:documentation>
+      smaller font
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="u">
+    <xs:annotation>
+      <xs:documentation>
+      underline
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="s">
+    <xs:annotation>
+      <xs:documentation>
+      strike-through
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="strike">
+    <xs:annotation>
+      <xs:documentation>
+      strike-through
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="basefont">
+    <xs:annotation>
+      <xs:documentation>
+      base font size
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="size" use="required"/>
+      <xs:attribute name="color" type="Color"/>
+      <xs:attribute name="face"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="font">
+    <xs:annotation>
+      <xs:documentation>
+      local change to font
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="coreattrs"/>
+          <xs:attributeGroup ref="i18n"/>
+          <xs:attribute name="size"/>
+          <xs:attribute name="color" type="Color"/>
+          <xs:attribute name="face"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    ==================== Object ======================================
+
+    object is used to embed objects as part of HTML pages.
+    param elements should precede other content. Parameters
+    can also be expressed as attribute/value pairs on the
+    object element itself when brevity is desired.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="object">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="param"/>
+        <xs:group ref="block"/>
+        <xs:element ref="form"/>
+        <xs:group ref="inline"/>
+        <xs:group ref="misc"/>
+      </xs:choice>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="declare">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="declare"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="classid" type="URI"/>
+      <xs:attribute name="codebase" type="URI"/>
+      <xs:attribute name="data" type="URI"/>
+      <xs:attribute name="type" type="ContentType"/>
+      <xs:attribute name="codetype" type="ContentType"/>
+      <xs:attribute name="archive" type="UriList"/>
+      <xs:attribute name="standby" type="Text"/>
+      <xs:attribute name="height" type="Length"/>
+      <xs:attribute name="width" type="Length"/>
+      <xs:attribute name="usemap" type="URI"/>
+      <xs:attribute name="name" type="xs:NMTOKEN"/>
+      <xs:attribute name="tabindex" type="Number"/>
+      <xs:attribute name="align" type="ImgAlign"/>
+      <xs:attribute name="border" type="Pixels"/>
+      <xs:attribute name="hspace" type="Pixels"/>
+      <xs:attribute name="vspace" type="Pixels"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="param">
+    <xs:annotation>
+      <xs:documentation>
+      param is used to supply a named property value.
+      In XML it would seem natural to follow RDF and support an
+      abbreviated syntax where the param elements are replaced
+      by attribute value pairs on the object start tag.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attribute name="id" type="xs:ID"/>
+      <xs:attribute name="name" use="required"/>
+      <xs:attribute name="value"/>
+      <xs:attribute name="valuetype" default="data">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="data"/>
+            <xs:enumeration value="ref"/>
+            <xs:enumeration value="object"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="type" type="ContentType"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Java applet ==================================
+
+    One of code or object attributes must be present.
+    Place param elements before other content.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="applet">
+    <xs:complexType mixed="true">
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:element ref="param"/>
+        <xs:group ref="block"/>
+        <xs:element ref="form"/>
+        <xs:group ref="inline"/>
+        <xs:group ref="misc"/>
+      </xs:choice>
+      <xs:attributeGroup ref="coreattrs"/>
+      <xs:attribute name="codebase" type="URI"/>
+      <xs:attribute name="archive"/>
+      <xs:attribute name="code"/>
+      <xs:attribute name="object"/>
+      <xs:attribute name="alt" type="Text"/>
+      <xs:attribute name="name" type="xs:NMTOKEN"/>
+      <xs:attribute name="width" use="required" type="Length"/>
+      <xs:attribute name="height" use="required" type="Length"/>
+      <xs:attribute name="align" type="ImgAlign"/>
+      <xs:attribute name="hspace" type="Pixels"/>
+      <xs:attribute name="vspace" type="Pixels"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    =================== Images ===========================================
+
+    To avoid accessibility problems for people who aren't
+    able to see the image, you should provide a text
+    description using the alt and longdesc attributes.
+    In addition, avoid the use of server-side image maps.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="img">
+    <xs:complexType>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="src" use="required" type="URI"/>
+      <xs:attribute name="alt" use="required" type="Text"/>
+      <xs:attribute name="name" type="xs:NMTOKEN"/>
+      <xs:attribute name="longdesc" type="URI"/>
+      <xs:attribute name="height" type="Length"/>
+      <xs:attribute name="width" type="Length"/>
+      <xs:attribute name="usemap" type="URI">
+  <xs:annotation>
+    <xs:documentation>
+          usemap points to a map element which may be in this document
+          or an external document, although the latter is not widely supported
+          </xs:documentation>
+  </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="ismap">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="ismap"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="align" type="ImgAlign"/>
+      <xs:attribute name="border" type="Length"/>
+      <xs:attribute name="hspace" type="Pixels"/>
+      <xs:attribute name="vspace" type="Pixels"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    ================== Client-side image maps ============================
+
+    These can be placed in the same document or grouped in a
+    separate document although this isn't yet widely supported
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="map">
+    <xs:complexType>
+      <xs:choice>
+        <xs:choice maxOccurs="unbounded">
+          <xs:group ref="block"/>
+          <xs:element ref="form"/>
+          <xs:group ref="misc"/>
+        </xs:choice>
+        <xs:element maxOccurs="unbounded" ref="area"/>
+      </xs:choice>
+      <xs:attributeGroup ref="i18n"/>
+      <xs:attributeGroup ref="events"/>
+      <xs:attribute name="id" use="required" type="xs:ID"/>
+      <xs:attribute name="class"/>
+      <xs:attribute name="style" type="StyleSheet"/>
+      <xs:attribute name="title" type="Text"/>
+      <xs:attribute name="name"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="area">
+    <xs:complexType>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attributeGroup ref="focus"/>
+      <xs:attribute name="shape" default="rect" type="Shape"/>
+      <xs:attribute name="coords" type="Coords"/>
+      <xs:attribute name="href" type="URI"/>
+      <xs:attribute name="nohref">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="nohref"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="alt" use="required" type="Text"/>
+      <xs:attribute name="target" type="FrameTarget"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    ================ Forms ===============================================
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="form">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="form.content">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="action" use="required" type="URI"/>
+          <xs:attribute name="name" type="xs:NMTOKEN"/>
+          <xs:attribute name="method" default="get">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="get"/>
+                <xs:enumeration value="post"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="enctype" type="ContentType"
+              default="application/x-www-form-urlencoded"/>
+          <xs:attribute name="onsubmit" type="Script"/>
+          <xs:attribute name="onreset" type="Script"/>
+          <xs:attribute name="accept" type="ContentTypes"/>
+          <xs:attribute name="accept-charset" type="Charsets"/>
+          <xs:attribute name="target" type="FrameTarget"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="label">
+    <xs:annotation>
+      <xs:documentation>
+      Each label must not contain more than ONE field
+      Label elements shouldn't be nested.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="for" type="xs:IDREF"/>
+          <xs:attribute name="accesskey" type="Character"/>
+          <xs:attribute name="onfocus" type="Script"/>
+          <xs:attribute name="onblur" type="Script"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name="InputType">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="text"/>
+      <xs:enumeration value="password"/>
+      <xs:enumeration value="checkbox"/>
+      <xs:enumeration value="radio"/>
+      <xs:enumeration value="submit"/>
+      <xs:enumeration value="reset"/>
+      <xs:enumeration value="file"/>
+      <xs:enumeration value="hidden"/>
+      <xs:enumeration value="image"/>
+      <xs:enumeration value="button"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="input">
+    <xs:annotation>
+      <xs:documentation>
+      form control
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attributeGroup ref="focus"/>
+      <xs:attribute name="type" default="text" type="InputType"/>
+      <xs:attribute name="name">
+  <xs:annotation>
+    <xs:documentation>
+          the name attribute is required for all but submit &amp; reset
+          </xs:documentation>
+  </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="value"/>
+      <xs:attribute name="checked">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="checked"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="disabled">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="disabled"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="readonly">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="readonly"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="size"/>
+      <xs:attribute name="maxlength" type="Number"/>
+      <xs:attribute name="src" type="URI"/>
+      <xs:attribute name="alt"/>
+      <xs:attribute name="usemap" type="URI"/>
+      <xs:attribute name="onselect" type="Script"/>
+      <xs:attribute name="onchange" type="Script"/>
+      <xs:attribute name="accept" type="ContentTypes"/>
+      <xs:attribute name="align" type="ImgAlign"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="select">
+    <xs:annotation>
+      <xs:documentation>
+      option selector
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="optgroup"/>
+        <xs:element ref="option"/>
+      </xs:choice>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="name"/>
+      <xs:attribute name="size" type="Number"/>
+      <xs:attribute name="multiple">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="multiple"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="disabled">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="disabled"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="tabindex" type="tabindexNumber"/>
+      <xs:attribute name="onfocus" type="Script"/>
+      <xs:attribute name="onblur" type="Script"/>
+      <xs:attribute name="onchange" type="Script"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="optgroup">
+    <xs:annotation>
+      <xs:documentation>
+      option group
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="option"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="disabled">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="disabled"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="label" use="required" type="Text"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="option">
+    <xs:annotation>
+      <xs:documentation>
+      selectable choice
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="selected">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="selected"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="disabled">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="disabled"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="label" type="Text"/>
+      <xs:attribute name="value"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="textarea">
+    <xs:annotation>
+      <xs:documentation>
+      multi-line text field
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attributeGroup ref="focus"/>
+      <xs:attribute name="name"/>
+      <xs:attribute name="rows" use="required" type="Number"/>
+      <xs:attribute name="cols" use="required" type="Number"/>
+      <xs:attribute name="disabled">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="disabled"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="readonly">
+        <xs:simpleType>
+          <xs:restriction base="xs:token">
+            <xs:enumeration value="readonly"/>
+          </xs:restriction>
+        </xs:simpleType>
+      </xs:attribute>
+      <xs:attribute name="onselect" type="Script"/>
+      <xs:attribute name="onchange" type="Script"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="fieldset">
+    <xs:annotation>
+      <xs:documentation>
+      The fieldset element is used to group form fields.
+      Only one legend element should occur in the content
+      and if present should only be preceded by whitespace.
+
+      NOTE: this content model is different from the XHTML 1.0 DTD,
+      closer to the intended content model in HTML4 DTD
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:sequence>
+        <xs:element ref="legend"/>
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:group ref="block"/>
+          <xs:element ref="form"/>
+          <xs:group ref="inline"/>
+          <xs:group ref="misc"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name="LAlign">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="top"/>
+      <xs:enumeration value="bottom"/>
+      <xs:enumeration value="left"/>
+      <xs:enumeration value="right"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="legend">
+    <xs:annotation>
+      <xs:documentation>
+      fieldset label
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="accesskey" type="Character"/>
+          <xs:attribute name="align" type="LAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="button">
+    <xs:annotation>
+      <xs:documentation>
+      Content is "Flow" excluding a, form and form controls
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="button.content">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attributeGroup ref="focus"/>
+          <xs:attribute name="name"/>
+          <xs:attribute name="value"/>
+          <xs:attribute name="type" default="submit">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="button"/>
+                <xs:enumeration value="submit"/>
+                <xs:enumeration value="reset"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="disabled">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="disabled"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="isindex">
+    <xs:annotation>
+      <xs:documentation>
+      single-line text input control (DEPRECATED)
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="coreattrs"/>
+      <xs:attributeGroup ref="i18n"/>
+      <xs:attribute name="prompt" type="Text"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    ======================= Tables =======================================
+
+    Derived from IETF HTML table standard, see [RFC1942]
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:simpleType name="TFrame">
+    <xs:annotation>
+      <xs:documentation>
+      The border attribute sets the thickness of the frame around the
+      table. The default units are screen pixels.
+
+      The frame attribute specifies which parts of the frame around
+      the table should be rendered. The values are not the same as
+      CALS to avoid a name clash with the valign attribute.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="void"/>
+      <xs:enumeration value="above"/>
+      <xs:enumeration value="below"/>
+      <xs:enumeration value="hsides"/>
+      <xs:enumeration value="lhs"/>
+      <xs:enumeration value="rhs"/>
+      <xs:enumeration value="vsides"/>
+      <xs:enumeration value="box"/>
+      <xs:enumeration value="border"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="TRules">
+    <xs:annotation>
+      <xs:documentation>
+      The rules attribute defines which rules to draw between cells:
+
+      If rules is absent then assume:
+          "none" if border is absent or border="0" otherwise "all"
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="none"/>
+      <xs:enumeration value="groups"/>
+      <xs:enumeration value="rows"/>
+      <xs:enumeration value="cols"/>
+      <xs:enumeration value="all"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:simpleType name="TAlign">
+    <xs:annotation>
+      <xs:documentation>
+      horizontal placement of table relative to document
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="left"/>
+      <xs:enumeration value="center"/>
+      <xs:enumeration value="right"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:attributeGroup name="cellhalign">
+    <xs:annotation>
+      <xs:documentation>
+      horizontal alignment attributes for cell contents
+
+      char        alignment char, e.g. char=':'
+      charoff     offset for alignment char
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="align">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="left"/>
+          <xs:enumeration value="center"/>
+          <xs:enumeration value="right"/>
+          <xs:enumeration value="justify"/>
+          <xs:enumeration value="char"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+    <xs:attribute name="char" type="Character"/>
+    <xs:attribute name="charoff" type="Length"/>
+  </xs:attributeGroup>
+
+  <xs:attributeGroup name="cellvalign">
+    <xs:annotation>
+      <xs:documentation>
+      vertical alignment attributes for cell contents
+      </xs:documentation>
+    </xs:annotation>
+    <xs:attribute name="valign">
+      <xs:simpleType>
+        <xs:restriction base="xs:token">
+          <xs:enumeration value="top"/>
+          <xs:enumeration value="middle"/>
+          <xs:enumeration value="bottom"/>
+          <xs:enumeration value="baseline"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+  </xs:attributeGroup>
+
+  <xs:element name="table">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="caption"/>
+        <xs:choice>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="col"/>
+          <xs:element minOccurs="0" maxOccurs="unbounded" ref="colgroup"/>
+        </xs:choice>
+        <xs:element minOccurs="0" ref="thead"/>
+        <xs:element minOccurs="0" ref="tfoot"/>
+        <xs:choice>
+          <xs:element maxOccurs="unbounded" ref="tbody"/>
+          <xs:element maxOccurs="unbounded" ref="tr"/>
+        </xs:choice>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="summary" type="Text"/>
+      <xs:attribute name="width" type="Length"/>
+      <xs:attribute name="border" type="Pixels"/>
+      <xs:attribute name="frame" type="TFrame"/>
+      <xs:attribute name="rules" type="TRules"/>
+      <xs:attribute name="cellspacing" type="Length"/>
+      <xs:attribute name="cellpadding" type="Length"/>
+      <xs:attribute name="align" type="TAlign"/>
+      <xs:attribute name="bgcolor" type="Color"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name="CAlign">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="top"/>
+      <xs:enumeration value="bottom"/>
+      <xs:enumeration value="left"/>
+      <xs:enumeration value="right"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="caption">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Inline">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="align" type="CAlign"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:annotation>
+    <xs:documentation>
+    Use thead to duplicate headers when breaking table
+    across page boundaries, or for static headers when
+    tbody sections are rendered in scrolling panel.
+
+    Use tfoot to duplicate footers when breaking table
+    across page boundaries, or for static footers when
+    tbody sections are rendered in scrolling panel.
+
+    Use multiple tbody sections when rules are needed
+    between groups of table rows.
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="thead">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tr"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attributeGroup ref="cellhalign"/>
+      <xs:attributeGroup ref="cellvalign"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="tfoot">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tr"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attributeGroup ref="cellhalign"/>
+      <xs:attributeGroup ref="cellvalign"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="tbody">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tr"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attributeGroup ref="cellhalign"/>
+      <xs:attributeGroup ref="cellvalign"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="colgroup">
+    <xs:annotation>
+      <xs:documentation>
+      colgroup groups a set of col elements. It allows you to group
+      several semantically related columns together.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="col"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="span" default="1" type="Number"/>
+      <xs:attribute name="width" type="MultiLength"/>
+      <xs:attributeGroup ref="cellhalign"/>
+      <xs:attributeGroup ref="cellvalign"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="col">
+    <xs:annotation>
+      <xs:documentation>
+      col elements define the alignment properties for cells in
+      one or more columns.
+
+      The width attribute specifies the width of the columns, e.g.
+
+          width=64        width in screen pixels
+          width=0.5*      relative width of 0.5
+
+      The span attribute causes the attributes of one
+      col element to apply to more than one column.
+      </xs:documentation>
+    </xs:annotation>
+    <xs:complexType>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attribute name="span" default="1" type="Number"/>
+      <xs:attribute name="width" type="MultiLength"/>
+      <xs:attributeGroup ref="cellhalign"/>
+      <xs:attributeGroup ref="cellvalign"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="tr">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="th"/>
+        <xs:element ref="td"/>
+      </xs:choice>
+      <xs:attributeGroup ref="attrs"/>
+      <xs:attributeGroup ref="cellhalign"/>
+      <xs:attributeGroup ref="cellvalign"/>
+      <xs:attribute name="bgcolor" type="Color"/>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:simpleType name="Scope">
+    <xs:annotation>
+      <xs:documentation>
+      Scope is simpler than headers attribute for common tables
+      </xs:documentation>
+    </xs:annotation>
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="row"/>
+      <xs:enumeration value="col"/>
+      <xs:enumeration value="rowgroup"/>
+      <xs:enumeration value="colgroup"/>
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:annotation>
+    <xs:documentation>
+    th is for headers, td for data and for cells acting as both
+    </xs:documentation>
+  </xs:annotation>
+
+  <xs:element name="th">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="abbr" type="Text"/>
+          <xs:attribute name="axis"/>
+          <xs:attribute name="headers" type="xs:IDREFS"/>
+          <xs:attribute name="scope" type="Scope"/>
+          <xs:attribute name="rowspan" default="1" type="Number"/>
+          <xs:attribute name="colspan" default="1" type="Number"/>
+          <xs:attributeGroup ref="cellhalign"/>
+          <xs:attributeGroup ref="cellvalign"/>
+          <xs:attribute name="nowrap">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="nowrap"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="bgcolor" type="Color"/>
+          <xs:attribute name="width" type="Length"/>
+          <xs:attribute name="height" type="Length"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="td">
+    <xs:complexType mixed="true">
+      <xs:complexContent>
+        <xs:extension base="Flow">
+          <xs:attributeGroup ref="attrs"/>
+          <xs:attribute name="abbr" type="Text"/>
+          <xs:attribute name="axis"/>
+          <xs:attribute name="headers" type="xs:IDREFS"/>
+          <xs:attribute name="scope" type="Scope"/>
+          <xs:attribute name="rowspan" default="1" type="Number"/>
+          <xs:attribute name="colspan" default="1" type="Number"/>
+          <xs:attributeGroup ref="cellhalign"/>
+          <xs:attributeGroup ref="cellvalign"/>
+          <xs:attribute name="nowrap">
+            <xs:simpleType>
+              <xs:restriction base="xs:token">
+                <xs:enumeration value="nowrap"/>
+              </xs:restriction>
+            </xs:simpleType>
+          </xs:attribute>
+          <xs:attribute name="bgcolor" type="Color"/>
+          <xs:attribute name="width" type="Length"/>
+          <xs:attribute name="height" type="Length"/>
+        </xs:extension>
+      </xs:complexContent>
+    </xs:complexType>
+  </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/xml/tests/testData/xml/xlink.xsd b/xml/tests/testData/xml/xlink.xsd
new file mode 100644
index 000000000000..cbe6de5f84d9
--- /dev/null
+++ b/xml/tests/testData/xml/xlink.xsd
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/1999/xlink" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <xs:attribute name="href"/>
+  <xs:attribute name="type"/>
+  <xs:attribute name="role"/>
+  <xs:attribute name="arcrole"/>
+  <xs:attribute name="title"/>
+  <xs:attribute name="show">
+    <xs:simpleType>
+      <xs:restriction base="xs:token">
+        <xs:enumeration value="new"/>
+        <xs:enumeration value="replace"/>
+        <xs:enumeration value="embed"/>
+        <xs:enumeration value="other"/>
+        <xs:enumeration value="none"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="actuate">
+    <xs:simpleType>
+      <xs:restriction base="xs:token">
+        <xs:enumeration value="onLoad"/>
+        <xs:enumeration value="onRequest"/>
+        <xs:enumeration value="other"/>
+        <xs:enumeration value="none"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+  <xs:attribute name="label" type="xs:NMTOKEN"/>
+  <xs:attribute name="from" type="xs:NMTOKEN"/>
+  <xs:attribute name="to" type="xs:NMTOKEN"/>
+</xs:schema>
diff --git a/xml/tests/testData/xml/xml.xsd b/xml/tests/testData/xml/xml.xsd
new file mode 100644
index 000000000000..f88d79560634
--- /dev/null
+++ b/xml/tests/testData/xml/xml.xsd
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/XML/1998/namespace" >
+  <xs:attribute name="id" type="xs:ID"/>
+  <xs:attribute name="lang"/>
+  <xs:attribute name="base"/>
+  <xs:attribute name="space">
+    <xs:simpleType>
+      <xs:restriction base="xs:token">
+        <xs:enumeration value="preserve"/>
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:attribute>
+</xs:schema>

From 7996bdd0aa7adf0049067bd6f70988583de610ca Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Mon, 4 Jun 2012 18:23:00 +0400
Subject: [PATCH 165/239] IDEA-86854 GitLog should not be available with all
 projects closed or should work - IAE at
 com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier.showOverVersionControlView
 ++

---
 plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java b/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java
index 7dc2e815286e..80e5e7979eec 100644
--- a/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java
+++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryImpl.java
@@ -141,6 +141,9 @@ public class GitRepositoryImpl implements GitRepository, Disposable {
   @Override
   @NotNull
   public GitUntrackedFilesHolder getUntrackedFilesHolder() {
+    if (myUntrackedFilesHolder == null) {
+      throw new IllegalStateException("Using untracked files holder with light git repository instance " + this);
+    }
     return myUntrackedFilesHolder;
   }
 

From a1062f0bfa454f58dacde4c0db4bd1f48f165853 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Mon, 4 Jun 2012 18:27:30 +0400
Subject: [PATCH 166/239] test moved to CSS module

---
 .../HtmlConditionalCommentInjectionTest.java  | 28 -------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 xml/tests/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjectionTest.java

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
deleted file mode 100644
index 2db52d88e6ed..000000000000
--- a/xml/tests/src/com/intellij/psi/impl/source/html/HtmlConditionalCommentInjectionTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-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/";
-  }
-}

From ec09aeafdd5194830590a03fc372bad3ca08e1a5 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 4 Jun 2012 16:25:06 +0400
Subject: [PATCH 167/239] notnull

---
 .../daemon/impl/PostHighlightingPass.java     | 88 +++++++++++--------
 .../psi/AbstractQualifiedReference.java       |  3 +-
 .../impl/providers/JavaClassReference.java    |  3 +-
 .../ClsJavaCodeReferenceElementImpl.java      |  3 +-
 .../PsiImportStaticReferenceElementImpl.java  |  3 +-
 .../PsiJavaCodeReferenceElementImpl.java      |  3 +-
 .../tree/java/PsiReferenceExpressionImpl.java | 19 ++--
 .../processor/ConflictFilterProcessor.java    |  2 +
 .../intellij/psi/PsiElementResolveResult.java |  2 +
 .../psi/impl/source/resolve/ResolveCache.java |  5 +-
 .../impl/PsiPolyVariantCachingReference.java  |  3 +-
 .../reference/impl/CachingReference.java      |  3 +-
 .../impl/providers/FileReference.java         |  4 +-
 .../converters/AndroidResourceReference.java  |  3 +-
 .../dom/converters/OnClickConverter.java      |  4 +-
 .../dom/converters/PackageClassConverter.java |  2 +-
 .../dom/AntDomMacrodefAttributeReference.java |  2 +-
 .../lang/ant/dom/AntDomPropertyReference.java |  3 +-
 .../lang/ant/dom/AntDomTargetReference.java   |  2 +-
 .../GrAssignmentExpressionImpl.java           |  3 +-
 .../expressions/GrBinaryExpressionImpl.java   |  3 +-
 .../GrReferenceExpressionImpl.java            |  5 +-
 .../GrThisSuperReferenceExpressionBase.java   |  3 +-
 .../arithmetic/GrUnaryExpressionImpl.java     |  3 +-
 .../expressions/path/GrIndexPropertyImpl.java |  3 +-
 .../types/GrSafeCastExpressionImpl.java       |  3 +-
 .../types/GrCodeReferenceElementImpl.java     |  4 +-
 .../xslt/context/XsltVariableContext.java     |  2 +-
 .../references/SimpleAttributeReference.java  |  2 +-
 .../providers/SchemaReferencesProvider.java   |  2 +-
 30 files changed, 120 insertions(+), 70 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
index d1d227c8b9f2..b4e9bdbcacc1 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/PostHighlightingPass.java
@@ -124,7 +124,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Override
-  public void doCollectInformation(final ProgressIndicator progress) {
+  public void doCollectInformation(@NotNull final ProgressIndicator progress) {
     DaemonCodeAnalyzer daemonCodeAnalyzer = DaemonCodeAnalyzer.getInstance(myProject);
     final FileStatusMap fileStatusMap = ((DaemonCodeAnalyzerImpl)daemonCodeAnalyzer).getFileStatusMap();
     final List<HighlightInfo> highlights = new ArrayList<HighlightInfo>();
@@ -190,7 +190,9 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
     }
   }
 
-  public static void invokeOnTheFlyImportOptimizer(@NotNull final Runnable runnable, @NotNull final PsiFile file, @NotNull final Editor editor) {
+  public static void invokeOnTheFlyImportOptimizer(@NotNull final Runnable runnable,
+                                                   @NotNull final PsiFile file,
+                                                   @NotNull final Editor editor) {
     final long stamp = editor.getDocument().getModificationStamp();
     ApplicationManager.getApplication().invokeLater(new Runnable() {
       @Override
@@ -220,7 +222,9 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
   }
 
   // returns true if error highlight was created
-  private boolean collectHighlights(@NotNull Collection<PsiElement> elements, @NotNull final List<HighlightInfo> result, @NotNull ProgressIndicator progress) throws ProcessCanceledException {
+  private boolean collectHighlights(@NotNull Collection<PsiElement> elements,
+                                    @NotNull final List<HighlightInfo> result,
+                                    @NotNull ProgressIndicator progress) throws ProcessCanceledException {
     ApplicationManager.getApplication().assertReadAccessAllowed();
 
     InspectionProfile profile = InspectionProjectProfileManager.getInstance(myProject).getInspectionProfile();
@@ -244,15 +248,15 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
       }
     }
 
-    myDeadCodeInfoType = myDeadCodeKey == null ? null : new HighlightInfoType.HighlightInfoTypeImpl(profile.getErrorLevel(myDeadCodeKey, myFile).getSeverity(), HighlightInfoType.UNUSED_SYMBOL.getAttributesKey());
+    myDeadCodeInfoType = myDeadCodeKey == null
+                         ? null
+                         : new HighlightInfoType.HighlightInfoTypeImpl(profile.getErrorLevel(myDeadCodeKey, myFile).getSeverity(),
+                                                                       HighlightInfoType.UNUSED_SYMBOL.getAttributesKey());
 
     GlobalUsageHelper helper = new GlobalUsageHelper() {
       @Override
       public boolean shouldCheckUsages(@NotNull PsiMember member) {
-        if (myInLibrary) return false;
-        if (!myDeadCodeEnabled) return false;
-        if (myDeadCodeInspection.isEntryPoint(member)) return false;
-        return true;
+        return !myInLibrary && myDeadCodeEnabled && !myDeadCodeInspection.isEntryPoint(member);
       }
 
       @Override
@@ -305,28 +309,28 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
     if (PsiUtilCore.hasErrorElementChild(parent)) return null;
 
     if (parent instanceof PsiLocalVariable && myUnusedSymbolInspection.LOCAL_VARIABLE) {
-      return processLocalVariable((PsiLocalVariable)parent, progress);
+      return processLocalVariable((PsiLocalVariable)parent, identifier, progress);
     }
     if (parent instanceof PsiField && myUnusedSymbolInspection.FIELD) {
       return processField((PsiField)parent, identifier, progress, helper);
     }
     if (parent instanceof PsiParameter && myUnusedSymbolInspection.PARAMETER) {
       if (InspectionManagerEx.isSuppressed(identifier, UnusedParametersInspection.SHORT_NAME)) return null;
-      return processParameter((PsiParameter)parent, progress);
+      return processParameter((PsiParameter)parent, identifier, progress);
     }
     if (parent instanceof PsiMethod && myUnusedSymbolInspection.METHOD) {
-      return processMethod((PsiMethod)parent, progress, helper);
+      return processMethod((PsiMethod)parent, identifier, progress, helper);
     }
     if (parent instanceof PsiClass && myUnusedSymbolInspection.CLASS) {
-      return processClass((PsiClass)parent, progress, helper);
+      return processClass((PsiClass)parent, identifier, progress, helper);
     }
     return null;
   }
 
   @Nullable
-  private HighlightInfo processLocalVariable(PsiLocalVariable variable, ProgressIndicator progress) {
-    PsiIdentifier identifier = variable.getNameIdentifier();
-    if (identifier == null) return null;
+  private HighlightInfo processLocalVariable(@NotNull PsiLocalVariable variable,
+                                             @NotNull PsiIdentifier identifier,
+                                             @NotNull ProgressIndicator progress) {
     if (variable instanceof PsiResourceVariable && PsiUtil.isIgnoredName(variable.getName())) return null;
     if (isImplicitUsage(variable, progress)) return null;
 
@@ -404,7 +408,10 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Nullable
-  private HighlightInfo processField(final PsiField field, final PsiIdentifier identifier, ProgressIndicator progress, GlobalUsageHelper helper) {
+  private HighlightInfo processField(@NotNull final PsiField field,
+                                     @NotNull PsiIdentifier identifier,
+                                     @NotNull ProgressIndicator progress,
+                                     @NotNull GlobalUsageHelper helper) {
     if (field.hasModifierProperty(PsiModifier.PRIVATE)) {
       if (!myRefCountHolder.isReferenced(field) && !isImplicitUsage(field, progress)) {
         if (HighlightUtil.isSerializationImplicitlyUsedField(field)) {
@@ -449,7 +456,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
       return null;
     }
     else if (isFieldUnused(field, progress, helper)) {
-      return formatUnusedSymbolHighlightInfo("field.is.not.used", field, "fields", myDeadCodeKey, myDeadCodeInfoType);
+      return formatUnusedSymbolHighlightInfo("field.is.not.used", field, "fields", myDeadCodeKey, myDeadCodeInfoType, identifier);
     }
     return null;
   }
@@ -479,7 +486,9 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Nullable
-  private HighlightInfo processParameter(PsiParameter parameter, ProgressIndicator progress) {
+  private HighlightInfo processParameter(@NotNull PsiParameter parameter,
+                                         @NotNull PsiIdentifier identifier,
+                                         @NotNull ProgressIndicator progress) {
     PsiElement declarationScope = parameter.getDeclarationScope();
     if (declarationScope instanceof PsiMethod) {
       PsiMethod method = (PsiMethod)declarationScope;
@@ -494,7 +503,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
           !HighlightMethodUtil.isSerializationRelatedMethod(method, method.getContainingClass()) &&
           !PsiClassImplUtil.isMainMethod(method)) {
         if (UnusedSymbolLocalInspection.isInjected(method)) return null;
-        HighlightInfo highlightInfo = checkUnusedParameter(parameter, progress);
+        HighlightInfo highlightInfo = checkUnusedParameter(parameter, identifier, progress);
         if (highlightInfo != null) {
           final ArrayList<IntentionAction> options = new ArrayList<IntentionAction>();
           options.addAll(IntentionManager.getInstance().getStandardIntentionOptions(myUnusedSymbolKey, myFile));
@@ -509,7 +518,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
       }
     }
     else if (declarationScope instanceof PsiForeachStatement && !PsiUtil.isIgnoredName(parameter.getName())) {
-      HighlightInfo highlightInfo = checkUnusedParameter(parameter, progress);
+      HighlightInfo highlightInfo = checkUnusedParameter(parameter, identifier, progress);
       if (highlightInfo != null) {
         QuickFixAction.registerQuickFixAction(highlightInfo, new RenameToIgnoredFix(parameter), myUnusedSymbolKey);
         return highlightInfo;
@@ -520,10 +529,10 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Nullable
-  private HighlightInfo checkUnusedParameter(final PsiParameter parameter, ProgressIndicator progress) {
+  private HighlightInfo checkUnusedParameter(@NotNull PsiParameter parameter,
+                                             @NotNull PsiIdentifier identifier,
+                                             @NotNull ProgressIndicator progress) {
     if (!myRefCountHolder.isReferenced(parameter) && !isImplicitUsage(parameter, progress)) {
-      PsiIdentifier identifier = parameter.getNameIdentifier();
-      assert identifier != null;
       String message = JavaErrorMessages.message("parameter.is.not.used", identifier.getText());
       return createUnusedSymbolInfo(identifier, message, HighlightInfoType.UNUSED_SYMBOL);
     }
@@ -531,7 +540,10 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Nullable
-  private HighlightInfo processMethod(final PsiMethod method, ProgressIndicator progress, GlobalUsageHelper helper) {
+  private HighlightInfo processMethod(@NotNull final PsiMethod method,
+                                      @NotNull PsiIdentifier identifier,
+                                      @NotNull ProgressIndicator progress,
+                                      @NotNull GlobalUsageHelper helper) {
     if (isMethodReferenced(method, progress, helper)) return null;
     HighlightInfoType highlightInfoType;
     HighlightDisplayKey highlightDisplayKey;
@@ -548,7 +560,6 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
     }
     String symbolName = HighlightMessageUtil.getSymbolName(method, PsiSubstitutor.EMPTY);
     String message = JavaErrorMessages.message(key, symbolName);
-    PsiIdentifier identifier = method.getNameIdentifier();
     final HighlightInfo highlightInfo = createUnusedSymbolInfo(identifier, message, highlightInfoType);
     QuickFixAction.registerQuickFixAction(highlightInfo, new SafeDeleteFix(method), highlightDisplayKey);
     SpecialAnnotationsUtil.createAddToSpecialAnnotationFixes(method, new Processor<String>() {
@@ -655,7 +666,10 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Nullable
-  private HighlightInfo processClass(PsiClass aClass, ProgressIndicator progress, GlobalUsageHelper helper) {
+  private HighlightInfo processClass(@NotNull PsiClass aClass,
+                                     @NotNull PsiIdentifier identifier,
+                                     @NotNull ProgressIndicator progress,
+                                     @NotNull GlobalUsageHelper helper) {
     if (isClassUsed(aClass, progress, helper)) return null;
 
     String pattern;
@@ -683,7 +697,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
       highlightDisplayKey = myDeadCodeKey;
       highlightInfoType = myDeadCodeInfoType;
     }
-    return formatUnusedSymbolHighlightInfo(pattern, aClass, "classes", highlightDisplayKey, highlightInfoType);
+    return formatUnusedSymbolHighlightInfo(pattern, aClass, "classes", highlightDisplayKey, highlightInfoType, identifier);
   }
 
   public static boolean isClassUsed(PsiClass aClass, ProgressIndicator progress, GlobalUsageHelper helper) {
@@ -706,14 +720,14 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
     return !weAreSureThereAreNoUsages(aClass, progress, helper);
   }
 
-  private static HighlightInfo formatUnusedSymbolHighlightInfo(@PropertyKey(resourceBundle = JavaErrorMessages.BUNDLE) String pattern,
-                                                               final PsiNameIdentifierOwner aClass,
-                                                               final String element,
-                                                               final HighlightDisplayKey highlightDisplayKey,
-                                                               final HighlightInfoType highlightInfoType) {
+  private static HighlightInfo formatUnusedSymbolHighlightInfo(@NotNull @PropertyKey(resourceBundle = JavaErrorMessages.BUNDLE) String pattern,
+                                                               @NotNull final PsiNameIdentifierOwner aClass,
+                                                               @NotNull final String element,
+                                                               @NotNull HighlightDisplayKey highlightDisplayKey,
+                                                               @NotNull HighlightInfoType highlightInfoType,
+                                                               @NotNull PsiElement identifier) {
     String symbolName = aClass.getName();
     String message = JavaErrorMessages.message(pattern, symbolName);
-    PsiElement identifier = aClass.getNameIdentifier();
     final HighlightInfo highlightInfo = createUnusedSymbolInfo(identifier, message, highlightInfoType);
     QuickFixAction.registerQuickFixAction(highlightInfo, new SafeDeleteFix(aClass), highlightDisplayKey);
     SpecialAnnotationsUtil.createAddToSpecialAnnotationFixes((PsiModifierListOwner)aClass, new Processor<String>() {
@@ -727,7 +741,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
   }
 
   @Nullable
-  private HighlightInfo processImport(PsiImportStatementBase importStatement, HighlightDisplayKey unusedImportKey) {
+  private HighlightInfo processImport(@NotNull PsiImportStatementBase importStatement, @NotNull HighlightDisplayKey unusedImportKey) {
     // jsp include directive hack
     if (importStatement instanceof JspxImportStatement && ((JspxImportStatement)importStatement).isForeignFileImport()) return null;
 
@@ -764,7 +778,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
     return null;
   }
 
-  private HighlightInfo registerRedundantImport(PsiImportStatementBase importStatement, HighlightDisplayKey unusedImportKey) {
+  private HighlightInfo registerRedundantImport(@NotNull PsiImportStatementBase importStatement, @NotNull HighlightDisplayKey unusedImportKey) {
     HighlightInfo info = HighlightInfo.createHighlightInfo(JavaHighlightInfoTypes.UNUSED_IMPORT, importStatement, InspectionsBundle.message("unused.import.statement"));
 
     QuickFixAction.registerQuickFixAction(info, new OptimizeImportsFix(), unusedImportKey);
@@ -787,7 +801,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
     return !errors && codeAnalyzer.canChangeFileSilently(myFile);
   }
 
-  private boolean containsErrorsPreventingOptimize(PsiFile file) {
+  private boolean containsErrorsPreventingOptimize(@NotNull PsiFile file) {
     // ignore unresolved imports errors
     PsiImportList importList = ((PsiJavaFile)file).getImportList();
     final TextRange importsRange = importList == null ? TextRange.EMPTY_RANGE : importList.getTextRange();
@@ -804,7 +818,7 @@ public class PostHighlightingPass extends TextEditorHighlightingPass {
     return hasErrorsExceptUnresolvedImports;
   }
 
-  private static boolean isIntentionalPrivateConstructor(PsiMethod method, PsiClass containingClass) {
+  private static boolean isIntentionalPrivateConstructor(@NotNull PsiMethod method, PsiClass containingClass) {
     return method.isConstructor() &&
            method.getParameterList().getParametersCount() == 0 &&
            containingClass != null &&
diff --git a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
index 97fb37ef8993..55001b8d8224 100644
--- a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
+++ b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
@@ -42,8 +42,9 @@ import java.util.Set;
  */
 public abstract class AbstractQualifiedReference<T extends AbstractQualifiedReference<T>> extends ASTWrapperPsiElement implements PsiPolyVariantReference, PsiQualifiedReference {
   private static final ResolveCache.PolyVariantResolver<AbstractQualifiedReference> MY_RESOLVER = new ResolveCache.PolyVariantResolver<AbstractQualifiedReference>() {
+    @NotNull
     @Override
-    public ResolveResult[] resolve(final AbstractQualifiedReference expression, final boolean incompleteCode) {
+    public ResolveResult[] resolve(@NotNull final AbstractQualifiedReference expression, final boolean incompleteCode) {
       return expression.resolveInner();
     }
   };
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
index f06185756f76..4fe0f182794b 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
@@ -606,8 +606,9 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer
   private static class MyResolver implements ResolveCache.PolyVariantResolver<JavaClassReference> {
     private static final MyResolver INSTANCE = new MyResolver();
 
+    @NotNull
     @Override
-    public JavaResolveResult[] resolve(JavaClassReference javaClassReference, boolean incompleteCode) {
+    public JavaResolveResult[] resolve(@NotNull JavaClassReference javaClassReference, boolean incompleteCode) {
       return new JavaResolveResult[]{javaClassReference.doAdvancedResolve()};
     }
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
index aca7b11d7006..417c5b606713 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
@@ -108,8 +108,9 @@ public class ClsJavaCodeReferenceElementImpl extends ClsElementImpl implements P
   private static class Resolver implements ResolveCache.PolyVariantResolver<ClsJavaCodeReferenceElementImpl> {
     public static final Resolver INSTANCE = new Resolver();
 
+    @NotNull
     @Override
-    public JavaResolveResult[] resolve(ClsJavaCodeReferenceElementImpl ref, boolean incompleteCode) {
+    public JavaResolveResult[] resolve(@NotNull ClsJavaCodeReferenceElementImpl ref, boolean incompleteCode) {
       final JavaResolveResult resolveResult = ref.advancedResolveImpl();
       return resolveResult.getElement() == null ? JavaResolveResult.EMPTY_ARRAY : new JavaResolveResult[] {resolveResult};
     }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
index 7cf121c612aa..1af1755c20bf 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
@@ -226,8 +226,9 @@ public class PsiImportStaticReferenceElementImpl extends CompositePsiElement imp
   private static final class OurGenericsResolver implements ResolveCache.PolyVariantResolver<PsiImportStaticReferenceElementImpl> {
     private static final OurGenericsResolver INSTANCE = new OurGenericsResolver();
 
+    @NotNull
     @Override
-    public JavaResolveResult[] resolve(final PsiImportStaticReferenceElementImpl referenceElement, final boolean incompleteCode) {
+    public JavaResolveResult[] resolve(@NotNull final PsiImportStaticReferenceElementImpl referenceElement, final boolean incompleteCode) {
       final PsiElement qualifier = referenceElement.getQualifier();
       if (!(qualifier instanceof PsiJavaCodeReferenceElement)) return JavaResolveResult.EMPTY_ARRAY;
       final PsiElement target = ((PsiJavaCodeReferenceElement)qualifier).resolve();
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
index f69fdf7127ea..039545a50998 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
@@ -344,8 +344,9 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
       return result;
     }
 
+    @NotNull
     @Override
-    public JavaResolveResult[] resolve(final PsiJavaReference ref, final boolean incompleteCode) {
+    public JavaResolveResult[] resolve(@NotNull final PsiJavaReference ref, final boolean incompleteCode) {
       final JavaResolveResult[] result = _resolve(ref, incompleteCode);
       if (result.length > 0 && result[0].getElement() instanceof PsiClass) {
         final PsiType[] parameters = ((PsiJavaCodeReferenceElement)ref).getTypeParameters();
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
index 550efd7929ca..7f2b850e7bce 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
@@ -51,7 +51,10 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
-import com.intellij.util.*;
+import com.intellij.util.CharTable;
+import com.intellij.util.Function;
+import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.NullableFunction;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -187,9 +190,11 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
   private static final class OurGenericsResolver implements ResolveCache.PolyVariantResolver<PsiJavaReference> {
     private static final OurGenericsResolver INSTANCE = new OurGenericsResolver();
 
+    @NotNull
     private static JavaResolveResult[] _resolve(boolean incompleteCode, PsiReferenceExpressionImpl expression) {
       CompositeElement treeParent = expression.getTreeParent();
-      IElementType parentType = treeParent != null ? treeParent.getElementType() : null;
+      IElementType parentType = treeParent == null ? null : treeParent.getElementType();
+
       final JavaResolveResult[] result = expression.resolve(parentType);
 
       if (incompleteCode && parentType != JavaElementType.REFERENCE_EXPRESSION && result.length == 0) {
@@ -199,7 +204,8 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
     }
 
     @Override
-    public JavaResolveResult[] resolve(PsiJavaReference ref, boolean incompleteCode) {
+    @NotNull
+    public JavaResolveResult[] resolve(@NotNull PsiJavaReference ref, boolean incompleteCode) {
       final JavaResolveResult[] result = _resolve(incompleteCode, (PsiReferenceExpressionImpl)ref);
       if (result.length > 0 && result[0].getElement() instanceof PsiClass) {
         final PsiType[] parameters = ((PsiJavaCodeReferenceElement)ref).getTypeParameters();
@@ -215,10 +221,8 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
     }
   }
 
+  @NotNull
   private JavaResolveResult[] resolve(IElementType parentType) {
-    if (parentType == null) {
-      parentType = getTreeParent() != null ? getTreeParent().getElementType() : null;
-    }
     if (parentType == JavaElementType.REFERENCE_EXPRESSION) {
       JavaResolveResult[] result = resolveToVariable();
       if (result.length > 0) {
@@ -240,6 +244,7 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
     return resolveToVariable();
   }
 
+  @NotNull
   private JavaResolveResult[] resolveToMethod() {
     final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)getParent();
     final MethodResolverProcessor processor = new MethodResolverProcessor(methodCall);
@@ -252,6 +257,7 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
     return processor.getResult();
   }
 
+  @NotNull
   private JavaResolveResult[] resolveToPackage() {
     final String packageName = getCachedTextSkipWhiteSpaceAndComments();
     final PsiManager manager = getManager();
@@ -277,6 +283,7 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
     return processor.getResult();
   }
 
+  @NotNull
   private JavaResolveResult[] resolveToVariable() {
     final VariableResolverProcessor processor = new VariableResolverProcessor(this);
     PsiScopesUtil.resolveAndWalk(processor, this, null);
diff --git a/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java b/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java
index fe0984b9c71e..3d928069cc03 100644
--- a/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java
+++ b/java/java-psi-impl/src/com/intellij/psi/scope/processor/ConflictFilterProcessor.java
@@ -24,6 +24,7 @@ import com.intellij.psi.scope.NameHint;
 import com.intellij.psi.scope.PsiConflictResolver;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.util.PsiUtil;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
 
@@ -74,6 +75,7 @@ public class ConflictFilterProcessor extends FilterScopeProcessor<CandidateInfo>
     }
   }
 
+  @NotNull
   public JavaResolveResult[] getResult() {
     if (myCachedResult == null) {
       final List<CandidateInfo> conflicts = getResults();
diff --git a/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java b/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java
index 3bb181aadf6b..205bf27fe1c0 100644
--- a/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java
+++ b/platform/core-api/src/com/intellij/psi/PsiElementResolveResult.java
@@ -74,6 +74,7 @@ public class PsiElementResolveResult implements ResolveResult{
            (myElement instanceof PsiNamedElement ? ((PsiNamedElement)myElement).getName() : myElement.getText());
   }
 
+  @NotNull
   public static ResolveResult[] createResults(@Nullable Collection<? extends PsiElement> elements) {
     if (elements == null || elements.isEmpty()) return EMPTY_ARRAY;
 
@@ -85,6 +86,7 @@ public class PsiElementResolveResult implements ResolveResult{
     return results;
   }
 
+  @NotNull
   public static ResolveResult[] createResults(@Nullable PsiElement[] elements) {
     if (elements == null || elements.length == 0) return EMPTY_ARRAY;
 
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
index 29b101a1b222..07eb7b7e2b52 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
@@ -55,9 +55,12 @@ public class ResolveCache {
   }
 
   public interface AbstractResolver<TRef extends PsiReference,TResult> {
-    TResult resolve(TRef ref, boolean incompleteCode);
+    TResult resolve(@NotNull TRef ref, boolean incompleteCode);
   }
   public interface PolyVariantResolver<T extends PsiPolyVariantReference> extends AbstractResolver<T,ResolveResult[]> {
+    @Override
+    @NotNull
+    ResolveResult[] resolve(@NotNull T t, boolean incompleteCode);
   }
 
   public interface Resolver extends AbstractResolver<PsiReference,PsiElement>{
diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java
index 87928ad43a17..2f924b45630b 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java
@@ -57,8 +57,9 @@ public abstract class PsiPolyVariantCachingReference implements PsiPolyVariantRe
   private static class MyResolver implements ResolveCache.PolyVariantResolver<PsiPolyVariantReference> {
     private static final MyResolver INSTANCE = new MyResolver();
 
+    @NotNull
     @Override
-    public ResolveResult[] resolve(PsiPolyVariantReference reference, boolean incompleteCode) {
+    public ResolveResult[] resolve(@NotNull PsiPolyVariantReference reference, boolean incompleteCode) {
       return ((PsiPolyVariantCachingReference)reference).resolveInner(incompleteCode);
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/CachingReference.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/CachingReference.java
index fa13dc446077..fe032d918805 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/CachingReference.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/CachingReference.java
@@ -21,6 +21,7 @@ import com.intellij.psi.ElementManipulators;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.impl.source.resolve.ResolveCache;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -54,7 +55,7 @@ public abstract class CachingReference implements PsiReference, EmptyResolveMess
     private static final MyResolver INSTANCE = new MyResolver();
     @Override
     @Nullable
-    public PsiElement resolve(PsiReference ref, boolean incompleteCode) {
+    public PsiElement resolve(@NotNull PsiReference ref, boolean incompleteCode) {
       return ((CachingReference)ref).resolveInner();
     }
   }
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
index 9f7bdf2d1759..1f361d5386c0 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
@@ -139,6 +139,7 @@ public class FileReference implements FileReferenceOwner, PsiPolyVariantReferenc
     return innerResolve(getFileReferenceSet().isCaseSensitive());
   }
 
+  @NotNull
   protected ResolveResult[] innerResolve(boolean caseSensitive) {
     final String referenceText = getText();
     if (referenceText.isEmpty() && myIndex == 0) {
@@ -586,8 +587,9 @@ public class FileReference implements FileReferenceOwner, PsiPolyVariantReferenc
   static class MyResolver implements ResolveCache.PolyVariantResolver<FileReference> {
     static final MyResolver INSTANCE = new MyResolver();
 
+    @NotNull
     @Override
-    public ResolveResult[] resolve(FileReference ref, boolean incompleteCode) {
+    public ResolveResult[] resolve(@NotNull FileReference ref, boolean incompleteCode) {
       return ref.innerResolve(ref.getFileReferenceSet().isCaseSensitive());
     }
   }
diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java b/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java
index 4f326f9cb957..42bf53f9169f 100644
--- a/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java
+++ b/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java
@@ -102,8 +102,9 @@ public class AndroidResourceReference extends PsiReferenceBase.Poly<XmlElement>
   public ResolveResult[] multiResolve(boolean incompleteCode) {
     return ResolveCache.getInstance(myElement.getProject())
       .resolveWithCaching(this, new ResolveCache.PolyVariantResolver<AndroidResourceReference>() {
+        @NotNull
         @Override
-        public ResolveResult[] resolve(AndroidResourceReference reference, boolean incompleteCode) {
+        public ResolveResult[] resolve(@NotNull AndroidResourceReference reference, boolean incompleteCode) {
           return resolveInner();
         }
       }, false, incompleteCode);
diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/OnClickConverter.java b/plugins/android/src/org/jetbrains/android/dom/converters/OnClickConverter.java
index a5538b242372..00e65c78e5db 100644
--- a/plugins/android/src/org/jetbrains/android/dom/converters/OnClickConverter.java
+++ b/plugins/android/src/org/jetbrains/android/dom/converters/OnClickConverter.java
@@ -63,13 +63,15 @@ public class OnClickConverter extends Converter<String> implements CustomReferen
     public ResolveResult[] multiResolve(boolean incompleteCode) {
       return ResolveCache.getInstance(myElement.getProject())
         .resolveWithCaching(this, new ResolveCache.PolyVariantResolver<MyReference>() {
+          @NotNull
           @Override
-          public ResolveResult[] resolve(MyReference myReference, boolean incompleteCode) {
+          public ResolveResult[] resolve(@NotNull MyReference myReference, boolean incompleteCode) {
             return resolveInner();
           }
         }, false, incompleteCode);
     }
 
+    @NotNull
     private ResolveResult[] resolveInner() {
       final String methodName = myElement.getValue();
       if (methodName == null) {
diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/PackageClassConverter.java b/plugins/android/src/org/jetbrains/android/dom/converters/PackageClassConverter.java
index 7a2d2056888e..0f1574141e17 100644
--- a/plugins/android/src/org/jetbrains/android/dom/converters/PackageClassConverter.java
+++ b/plugins/android/src/org/jetbrains/android/dom/converters/PackageClassConverter.java
@@ -250,7 +250,7 @@ public class PackageClassConverter extends ResolvingConverter<PsiClass> implemen
       return ResolveCache.getInstance(myElement.getProject()).resolveWithCaching(this, new ResolveCache.Resolver() {
           @Nullable
           @Override
-          public PsiElement resolve(PsiReference reference, boolean incompleteCode) {
+          public PsiElement resolve(@NotNull PsiReference reference, boolean incompleteCode) {
             return resolveInner();
           }
         }, false, false);
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomMacrodefAttributeReference.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomMacrodefAttributeReference.java
index aef75687dd46..44f29310296a 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomMacrodefAttributeReference.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomMacrodefAttributeReference.java
@@ -87,7 +87,7 @@ public class AntDomMacrodefAttributeReference extends AntDomReferenceBase{
     
     static final MyResolver INSTANCE = new MyResolver();
     
-    public PsiElement resolve(PsiReference psiReference, boolean incompleteCode) {
+    public PsiElement resolve(@NotNull PsiReference psiReference, boolean incompleteCode) {
       final PsiElement element = psiReference.getElement();
       if (element == null) {
         return null;
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyReference.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyReference.java
index c8868762de92..0b75627a303a 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyReference.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomPropertyReference.java
@@ -186,7 +186,8 @@ public class AntDomPropertyReference extends PsiPolyVariantReferenceBase<PsiElem
   private static class MyResolver implements ResolveCache.PolyVariantResolver<AntDomPropertyReference> {
     static final MyResolver INSTANCE = new MyResolver();
     
-    public ResolveResult[] resolve(AntDomPropertyReference antDomPropertyReference, boolean incompleteCode) {
+    @NotNull
+    public ResolveResult[] resolve(@NotNull AntDomPropertyReference antDomPropertyReference, boolean incompleteCode) {
       final List<ResolveResult> result = new ArrayList<ResolveResult>();
       final AntDomProject project = antDomPropertyReference.myInvocationContextElement.getParentOfType(AntDomProject.class, true);
       if (project != null) {
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomTargetReference.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomTargetReference.java
index b692d9dd92a2..8460b3e7a03d 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomTargetReference.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomTargetReference.java
@@ -198,7 +198,7 @@ class AntDomTargetReference extends AntDomReferenceBase implements BindablePsiRe
   private static class MyResolver implements ResolveCache.Resolver {
     static final MyResolver INSTANCE = new MyResolver();
     
-    public PsiElement resolve(PsiReference psiReference, boolean incompleteCode) {
+    public PsiElement resolve(@NotNull PsiReference psiReference, boolean incompleteCode) {
       final TargetResolver.Result result = ((AntDomTargetReference)psiReference).doResolve(psiReference.getCanonicalText());
       if (result == null) {
         return null;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrAssignmentExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrAssignmentExpressionImpl.java
index d2a3174ee9c1..57a25fc248c9 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrAssignmentExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrAssignmentExpressionImpl.java
@@ -199,8 +199,9 @@ public class GrAssignmentExpressionImpl extends GrExpressionImpl implements GrAs
 
   private static final ResolveCache.PolyVariantResolver<GrAssignmentExpressionImpl> RESOLVER =
     new ResolveCache.PolyVariantResolver<GrAssignmentExpressionImpl>() {
+      @NotNull
       @Override
-      public GroovyResolveResult[] resolve(GrAssignmentExpressionImpl assignmentExpression, boolean incompleteCode) {
+      public GroovyResolveResult[] resolve(@NotNull GrAssignmentExpressionImpl assignmentExpression, boolean incompleteCode) {
         final IElementType opType = assignmentExpression.getOperationToken();
         if (opType == null || opType == GroovyTokenTypes.mASSIGN) return GroovyResolveResult.EMPTY_ARRAY;
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrBinaryExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrBinaryExpressionImpl.java
index 16845d51944e..d80b8201284c 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrBinaryExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrBinaryExpressionImpl.java
@@ -44,8 +44,9 @@ public abstract class GrBinaryExpressionImpl extends GrExpressionImpl implements
 
   private static final ResolveCache.PolyVariantResolver<GrBinaryExpressionImpl> RESOLVER =
     new ResolveCache.PolyVariantResolver<GrBinaryExpressionImpl>() {
+      @NotNull
       @Override
-      public GroovyResolveResult[] resolve(GrBinaryExpressionImpl binary, boolean incompleteCode) {
+      public GroovyResolveResult[] resolve(@NotNull GrBinaryExpressionImpl binary, boolean incompleteCode) {
         final IElementType opType = binary.getOperationTokenType();
 
         final PsiType lType = binary.getLeftOperand().getType();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
index 292af48c7f15..a5703a96069b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
@@ -231,6 +231,7 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl<GrExpressi
    * priority: inside class C: local variable, c.method, c.property, c.getter
    * in other places: local variable, c.method, c.getter, c.property
    */
+  @NotNull
   private GroovyResolveResult[] resolveMethodOrProperty(boolean allVariants, @Nullable GrExpression upToArgument, boolean genericsMatter) {
     final String name = getReferenceName();
     if (name == null) return GroovyResolveResult.EMPTY_ARRAY;
@@ -467,7 +468,8 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl<GrExpressi
 
   private static final ResolveCache.PolyVariantResolver<GrReferenceExpressionImpl> POLY_RESOLVER =
     new ResolveCache.PolyVariantResolver<GrReferenceExpressionImpl>() {
-      public GroovyResolveResult[] resolve(GrReferenceExpressionImpl refExpr, boolean incompleteCode) {
+      @NotNull
+      public GroovyResolveResult[] resolve(@NotNull GrReferenceExpressionImpl refExpr, boolean incompleteCode) {
         return refExpr.doPolyResolve(incompleteCode, true);
       }
     };
@@ -635,6 +637,7 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl<GrExpressi
     return this;
   }
 
+  @NotNull
   private GroovyResolveResult[] doPolyResolve(boolean incompleteCode, boolean genericsMatter) {
     String name = getReferenceName();
     if (name == null) return GroovyResolveResult.EMPTY_ARRAY;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrThisSuperReferenceExpressionBase.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrThisSuperReferenceExpressionBase.java
index 9e0dc35f49d9..369ed73ab33b 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrThisSuperReferenceExpressionBase.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrThisSuperReferenceExpressionBase.java
@@ -112,8 +112,9 @@ public abstract class GrThisSuperReferenceExpressionBase extends GrExpressionImp
   }
 
   static class OurResolver implements ResolveCache.PolyVariantResolver<GrThisSuperReferenceExpressionBase> {
+    @NotNull
     @Override
-    public ResolveResult[] resolve(GrThisSuperReferenceExpressionBase ref, boolean incompleteCode) {
+    public ResolveResult[] resolve(@NotNull GrThisSuperReferenceExpressionBase ref, boolean incompleteCode) {
       final PsiElement resolved = ref.resolveInner();
       if (resolved == null) return ResolveResult.EMPTY_ARRAY;
       return new ResolveResult[]{new GroovyResolveResultImpl(resolved, true)};
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/arithmetic/GrUnaryExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/arithmetic/GrUnaryExpressionImpl.java
index 561194cda511..b040498d777d 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/arithmetic/GrUnaryExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/arithmetic/GrUnaryExpressionImpl.java
@@ -74,8 +74,9 @@ public class GrUnaryExpressionImpl extends GrExpressionImpl implements GrUnaryEx
 
   private static final ResolveCache.PolyVariantResolver<GrUnaryExpressionImpl> OUR_RESOLVER =
     new ResolveCache.PolyVariantResolver<GrUnaryExpressionImpl>() {
+      @NotNull
       @Override
-      public GroovyResolveResult[] resolve(GrUnaryExpressionImpl unary, boolean incompleteCode) {
+      public GroovyResolveResult[] resolve(@NotNull GrUnaryExpressionImpl unary, boolean incompleteCode) {
         final GrExpression operand = unary.getOperand();
         if (operand == null) return GroovyResolveResult.EMPTY_ARRAY;
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
index 1177d37e96f7..1ade130d33c1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/path/GrIndexPropertyImpl.java
@@ -132,8 +132,9 @@ public class GrIndexPropertyImpl extends GrExpressionImpl implements GrIndexProp
   };
   private static final ResolveCache.PolyVariantResolver<MyReference> RESOLVER =
     new ResolveCache.PolyVariantResolver<MyReference>() {
+      @NotNull
       @Override
-      public GroovyResolveResult[] resolve(MyReference index, boolean incompleteCode) {
+      public GroovyResolveResult[] resolve(@NotNull MyReference index, boolean incompleteCode) {
         return index.getElement().resolveImpl(incompleteCode, null);
       }
     };
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/types/GrSafeCastExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/types/GrSafeCastExpressionImpl.java
index 8c6a08d416df..9ed3cda795ba 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/types/GrSafeCastExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/types/GrSafeCastExpressionImpl.java
@@ -85,8 +85,9 @@ public class GrSafeCastExpressionImpl extends GrExpressionImpl implements GrSafe
 
 
   private static final class OurResolver implements ResolveCache.PolyVariantResolver<GrSafeCastExpressionImpl> {
+    @NotNull
     @Override
-    public ResolveResult[] resolve(GrSafeCastExpressionImpl cast, boolean incompleteCode) {
+    public ResolveResult[] resolve(@NotNull GrSafeCastExpressionImpl cast, boolean incompleteCode) {
       PsiType type = cast.getOperand().getType();
       if (type == null) {
         return GroovyResolveResult.EMPTY_ARRAY;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
index 0aed67b8c24e..be3e52cc63b4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
@@ -362,8 +362,8 @@ public class GrCodeReferenceElementImpl extends GrReferenceElementImpl<GrCodeRef
 
   private static class OurResolver implements ResolveCache.PolyVariantResolver<GrCodeReferenceElementImpl> {
 
-    @Nullable
-    public GroovyResolveResult[] resolve(GrCodeReferenceElementImpl reference, boolean incompleteCode) {
+    @NotNull
+    public GroovyResolveResult[] resolve(@NotNull GrCodeReferenceElementImpl reference, boolean incompleteCode) {
       if (reference.getReferenceName() == null) return GroovyResolveResult.EMPTY_ARRAY;
       final GroovyResolveResult[] results = _resolve(reference, reference.getManager(), reference.getKind(false));
       if (results == null) return results;
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltVariableContext.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltVariableContext.java
index 58eb5807c395..23aabcebefc0 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltVariableContext.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/context/XsltVariableContext.java
@@ -49,7 +49,7 @@ public class XsltVariableContext implements VariableContext<XsltVariable> {
     
     private final ResolveCache.Resolver RESOLVER = new ResolveCache.Resolver() {
         @Nullable
-        public PsiElement resolve(PsiReference psiReference, boolean incompleteCode) {
+        public PsiElement resolve(@NotNull PsiReference psiReference, boolean incompleteCode) {
             return resolveInner((XPathVariableReference)psiReference);
         }
     };
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java
index 34f68ad229b5..d0fefab4317f 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java
@@ -75,7 +75,7 @@ abstract class SimpleAttributeReference implements PsiReference {
     public final PsiElement resolve() {
         return ResolveCache.getInstance(myAttribute.getProject()).resolveWithCaching(this, new ResolveCache.Resolver() {
             @Nullable
-            public PsiElement resolve(PsiReference psiReference, boolean b) {
+            public PsiElement resolve(@NotNull PsiReference psiReference, boolean b) {
                 return resolveImpl();
             }
         }, false, false);
diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java
index f57123d366f1..b4c39f109269 100644
--- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java
@@ -546,7 +546,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider {
 
     private static class MyResolver implements ResolveCache.Resolver {
       static MyResolver INSTANCE = new MyResolver(); 
-      public PsiElement resolve(PsiReference ref, boolean incompleteCode) {
+      public PsiElement resolve(@NotNull PsiReference ref, boolean incompleteCode) {
         return ((TypeOrElementOrAttributeReference)ref).resolveInner();
       }
     }

From 99454064dd1d169f3bfcd7e82adce8a448f2143c Mon Sep 17 00:00:00 2001
From: "andrey.zaytsev" <andrey.zaytsev@jetbrains.com>
Date: Thu, 31 May 2012 20:20:20 +0400
Subject: [PATCH 168/239] AnyExceptionBreakpoint properties and category fixed

---
 .../ui/XBreakpointGroupingByCategoryRule.java         | 11 +++++++++--
 .../ui/breakpoints/AnyExceptionBreakpointFactory.java |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByCategoryRule.java b/java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByCategoryRule.java
index 7b8fe5d4b767..f3cf9b9d5eb8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByCategoryRule.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/XBreakpointGroupingByCategoryRule.java
@@ -15,8 +15,11 @@
  */
 package com.intellij.debugger.ui;
 
+import com.intellij.debugger.ui.breakpoints.AnyExceptionBreakpoint;
 import com.intellij.debugger.ui.breakpoints.Breakpoint;
 import com.intellij.debugger.ui.breakpoints.BreakpointFactory;
+import com.intellij.debugger.ui.breakpoints.ExceptionBreakpoint;
+import com.intellij.openapi.util.Key;
 import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroupingRule;
 import org.jetbrains.annotations.NotNull;
 
@@ -36,12 +39,16 @@ class XBreakpointGroupingByCategoryRule<B> extends XBreakpointGroupingRule<B, XB
   public XBreakpointCategoryGroup getGroup(@NotNull B b, @NotNull Collection<XBreakpointCategoryGroup> groups) {
     if (b instanceof Breakpoint) {
       final Breakpoint breakpoint = (Breakpoint)b;
+      Key<? extends Breakpoint> category = breakpoint.getCategory();
+      if (category.equals(AnyExceptionBreakpoint.ANY_EXCEPTION_BREAKPOINT)) {
+        category = ExceptionBreakpoint.CATEGORY;
+      }
       for (XBreakpointCategoryGroup group : groups) {
-        if (group.getCategory().equals(breakpoint.getCategory())) {
+        if (group.getCategory().equals(category)) {
           return group;
         }
       }
-      final BreakpointFactory factory = BreakpointFactory.getInstance(breakpoint.getCategory());
+      final BreakpointFactory factory = BreakpointFactory.getInstance(category);
       if (factory != null) {
         return new XBreakpointCategoryGroup(factory);
       }
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java
index 69e72b01342e..617ae160efa6 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java
@@ -54,7 +54,7 @@ public class AnyExceptionBreakpointFactory extends BreakpointFactory{
 
   @Override
   public BreakpointPropertiesPanel createBreakpointPropertiesPanel(Project project, boolean compact) {
-    return null;  //To change body of implemented methods use File | Settings | File Templates.
+    return new ExceptionBreakpointPropertiesPanel(project, compact);
   }
 
   @Override

From f72d26c800459ddabf6ec846d2004fa871ebffb6 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Mon, 4 Jun 2012 19:18:24 +0400
Subject: [PATCH 169/239] Update Tree structure and selection without async
 mode

---
 .../intellij/designer/componentTree/TreeEditableArea.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
index 33335b817f39..e7d42aee8381 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeEditableArea.java
@@ -139,12 +139,17 @@ public final class TreeEditableArea implements EditableArea, FeedbackTreeLayer,
 
     if (value == null) {
       myTreeBuilder.select(ArrayUtil.EMPTY_OBJECT_ARRAY, null);
+      myTree.clearSelection();
     }
     else if (value instanceof RadComponent) {
       myTreeBuilder.select(value);
     }
     else {
-      myTreeBuilder.select(((Collection)value).toArray(), null);
+      Collection collection = (Collection)value;
+      myTreeBuilder.select(collection.toArray(), null);
+      if (collection.isEmpty()) {
+        myTree.clearSelection();
+      }
     }
 
     hookSelection();

From 84a3aff0ff26c34087429ae43f6d40fbd5a743f2 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Mon, 4 Jun 2012 19:19:17 +0400
Subject: [PATCH 170/239] IDEA-80278 support of building Android apk artifacts

---
 ...acetBasedPackagingSourceItemsProvider.java |   2 +-
 .../android/util/AndroidCommonUtils.java      |  34 +++
 plugins/android/src/META-INF/plugin.xml       |   5 +
 .../android/compiler/AndroidCompileUtil.java  |  95 ++++--
 .../compiler/AndroidPackagingCompiler.java    |  18 +-
 .../compiler/AndroidPrecompileTask.java       |  71 ++++-
 .../AndroidApplicationArtifactProperties.java | 250 ++++++++++++++++
 .../AndroidApplicationArtifactType.java       |  95 ++++++
 .../AndroidArtifactPropertiesEditor.form      | 157 ++++++++++
 .../AndroidArtifactPropertiesEditor.java      | 260 +++++++++++++++++
 .../AndroidArtifactPropertiesProvider.java    |  30 ++
 .../AndroidArtifactSigningCompiler.java       | 122 ++++++++
 .../artifact/AndroidArtifactSigningMode.java  |   8 +
 .../artifact/AndroidArtifactUtil.java         |  56 ++++
 .../artifact/AndroidFinalPackageElement.java  | 154 ++++++++++
 .../AndroidFinalPackageElementType.java       |  88 ++++++
 .../AndroidFinalPackagePresentation.java      |  40 +++
 .../artifact/AndroidSourceItemsProvider.java  |  56 ++++
 .../compiler/artifact/ChooseKeyDialog.form    |  57 ++++
 .../compiler/artifact/ChooseKeyDialog.java    | 129 +++++++++
 .../compiler/artifact/NewKeyStoreDialog.form  |  78 +++++
 .../compiler/artifact/NewKeyStoreDialog.java  | 124 ++++++++
 .../android/exportSignedPackage/ApkStep.java  |  41 +--
 .../ExportSignedPackageWizardStep.java        |  36 ---
 .../exportSignedPackage/InitialKeyStep.java   |   3 +-
 .../exportSignedPackage/KeystoreStep.java     |   5 +-
 .../{NewKeyStep.form => NewKeyForm.form}      |   4 +-
 .../exportSignedPackage/NewKeyForm.java       | 270 ++++++++++++++++++
 .../exportSignedPackage/NewKeyStep.java       | 225 +++------------
 .../jetbrains/android/util/AndroidUtils.java  |  49 +++-
 30 files changed, 2258 insertions(+), 304 deletions(-)
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesProvider.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactSigningCompiler.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactSigningMode.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactUtil.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackageElement.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackageElementType.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackagePresentation.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidSourceItemsProvider.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.form
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.java
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.form
 create mode 100644 plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.java
 rename plugins/android/src/org/jetbrains/android/exportSignedPackage/{NewKeyStep.form => NewKeyForm.form} (99%)
 create mode 100644 plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyForm.java

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/FacetBasedPackagingSourceItemsProvider.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/FacetBasedPackagingSourceItemsProvider.java
index c278f5499fe3..b5535a2db956 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/FacetBasedPackagingSourceItemsProvider.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/FacetBasedPackagingSourceItemsProvider.java
@@ -77,7 +77,7 @@ public abstract class FacetBasedPackagingSourceItemsProvider<F extends Facet, E
 
   protected abstract PackagingElement<?> createElement(ArtifactEditorContext context, F facet);
 
-  private static class FacetBasedSourceItem<F extends Facet> extends PackagingSourceItem {
+  protected static class FacetBasedSourceItem<F extends Facet> extends PackagingSourceItem {
     private final FacetBasedPackagingSourceItemsProvider<F, ?> myProvider;
     private final F myFacet;
 
diff --git a/plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java b/plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java
index 6c90602ad3d3..df69b76e40f6 100644
--- a/plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java
+++ b/plugins/android/common/src/org/jetbrains/android/util/AndroidCommonUtils.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.android.util;
 
+import com.android.jarutils.SignedJarBuilder;
 import com.android.resources.ResourceFolderType;
 import com.android.resources.ResourceType;
 import com.android.sdklib.IAndroidTarget;
@@ -38,6 +39,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
+import java.security.GeneralSecurityException;
+import java.security.PrivateKey;
+import java.security.cert.X509Certificate;
 import java.util.*;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
@@ -90,6 +94,8 @@ public class AndroidCommonUtils {
 
   @NonNls public static final String PACKAGE_MANIFEST_ATTRIBUTE = "package";
 
+  @NonNls public static final String ANDROID_FINAL_PACKAGE_FOR_ARTIFACT_SUFFIX = ".afp";
+
   private AndroidCommonUtils() {
   }
 
@@ -529,4 +535,32 @@ public class AndroidCommonUtils {
     final String b = path.substring(dot);
     return a + suffix + b;
   }
+
+  public static void signApk(@NotNull File srcApk,
+                             @NotNull File destFile,
+                             @NotNull PrivateKey privateKey,
+                             @NotNull X509Certificate certificate)
+    throws IOException, GeneralSecurityException {
+    FileOutputStream fos = new FileOutputStream(destFile);
+    SignedJarBuilder builder = new SafeSignedJarBuilder(fos, privateKey, certificate, destFile.getPath());
+    FileInputStream fis = new FileInputStream(srcApk);
+    try {
+      builder.writeZip(fis, null);
+      builder.close();
+    }
+    finally {
+      try {
+        fis.close();
+      }
+      catch (IOException ignored) {
+      }
+      finally {
+        try {
+          fos.close();
+        }
+        catch (IOException ignored) {
+        }
+      }
+    }
+  }
 }
diff --git a/plugins/android/src/META-INF/plugin.xml b/plugins/android/src/META-INF/plugin.xml
index 23eb2b596175..3315888cb0df 100644
--- a/plugins/android/src/META-INF/plugin.xml
+++ b/plugins/android/src/META-INF/plugin.xml
@@ -219,6 +219,11 @@
     <usageTargetProvider implementation="org.jetbrains.android.AndroidUsagesTargetProvider"/>
     <renameHandler implementation="org.jetbrains.android.AndroidRenameHandler" order="first"/>
 
+    <packaging.elementType implementation="org.jetbrains.android.compiler.artifact.AndroidFinalPackageElementType"/>
+    <packaging.sourceItemProvider implementation="org.jetbrains.android.compiler.artifact.AndroidSourceItemsProvider"/>
+    <packaging.artifactPropertiesProvider implementation="org.jetbrains.android.compiler.artifact.AndroidArtifactPropertiesProvider"/>
+    <packaging.artifactType implementation="org.jetbrains.android.compiler.artifact.AndroidApplicationArtifactType"/>
+
     <compileServer.plugin jar-path="jps/android-jps-plugin.jar"/>
     <compileServer.plugin jar-path="android-common.jar"/>
     <compileServer.plugin jar-path="android-rt.jar"/>
diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java
index 10551667f969..0875a4fb4be9 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java
@@ -44,6 +44,9 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.*;
+import com.intellij.packaging.artifacts.Artifact;
+import com.intellij.packaging.artifacts.ArtifactProperties;
+import com.intellij.packaging.impl.compiler.ArtifactCompileScope;
 import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiFile;
@@ -52,6 +55,9 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
+import org.jetbrains.android.compiler.artifact.AndroidApplicationArtifactProperties;
+import org.jetbrains.android.compiler.artifact.AndroidArtifactPropertiesProvider;
+import org.jetbrains.android.compiler.artifact.AndroidArtifactSigningMode;
 import org.jetbrains.android.dom.manifest.Manifest;
 import org.jetbrains.android.dom.resources.Attr;
 import org.jetbrains.android.dom.resources.DeclareStyleable;
@@ -86,6 +92,7 @@ public class AndroidCompileUtil {
 
   @NonNls public static final String PROGUARD_CFG_FILE_NAME = "proguard-project.txt";
   @NonNls public static final String OLD_PROGUARD_CFG_FILE_NAME = "proguard.cfg";
+  public static final String UNSIGNED_SUFFIX = ".unsigned";
 
   private AndroidCompileUtil() {
   }
@@ -131,7 +138,7 @@ public class AndroidCompileUtil {
     return null;
   }
 
-  static void addMessages(final CompileContext context, final Map<CompilerMessageCategory, List<String>> messages, Module module) {
+  public static void addMessages(final CompileContext context, final Map<CompilerMessageCategory, List<String>> messages, @Nullable Module module) {
     addMessages(context, messages, null, module);
   }
 
@@ -150,7 +157,7 @@ public class AndroidCompileUtil {
   static void addMessages(final CompileContext context,
                           final Map<CompilerMessageCategory, List<String>> messages,
                           @Nullable final Map<VirtualFile, VirtualFile> presentableFilesMap,
-                          final Module module) {
+                          @Nullable final Module module) {
     ApplicationManager.getApplication().runReadAction(new Runnable() {
       public void run() {
         if (context.getProject().isDisposed()) return;
@@ -167,7 +174,7 @@ public class AndroidCompileUtil {
                 line = Integer.parseInt(matcher.group(2));
               }
             }
-            context.addMessage(category, '[' + module.getName() + "] " + message, url, line, -1);
+            context.addMessage(category, (module != null ? '[' + module.getName() + "] " : "") + message, url, line, -1);
           }
         }
       }
@@ -619,7 +626,22 @@ public class AndroidCompileUtil {
 
   public static boolean isReleaseBuild(@NotNull CompileContext context) {
     final Boolean value = context.getCompileScope().getUserData(RELEASE_BUILD_KEY);
-    return value != null && value.booleanValue();
+    if (value != null && value.booleanValue()) {
+      return true;
+    }
+    final Project project = context.getProject();
+    final Set<Artifact> artifacts = ArtifactCompileScope.getArtifactsToBuild(project, context.getCompileScope(), false);
+
+    if (artifacts != null) {
+      for (Artifact artifact : artifacts) {
+        final ArtifactProperties<?> properties = artifact.getProperties(AndroidArtifactPropertiesProvider.getInstance());
+        if (properties instanceof AndroidApplicationArtifactProperties &&
+            ((AndroidApplicationArtifactProperties)properties).getSigningMode() != AndroidArtifactSigningMode.DEBUG) {
+          return true;
+        }
+      }
+    }
+    return false;
   }
 
   public static void setReleaseBuild(@NotNull CompileScope compileScope) {
@@ -668,7 +690,10 @@ public class AndroidCompileUtil {
     }
   }
 
-  private static void initializeGenSourceRoot(@NotNull Module module, @Nullable String sourceRootPath, boolean createIfNotExist, boolean exclude) {
+  private static void initializeGenSourceRoot(@NotNull Module module,
+                                              @Nullable String sourceRootPath,
+                                              boolean createIfNotExist,
+                                              boolean exclude) {
     if (sourceRootPath == null) {
       return;
     }
@@ -716,31 +741,31 @@ public class AndroidCompileUtil {
       final Resources resources = pair.getFirst();
       waitForSmartMode(project);
 
-        ApplicationManager.getApplication().runReadAction(new Runnable() {
-          @Override
-          public void run() {
-            if (!resources.isValid() || facet.getModule().isDisposed() || project.isDisposed()) {
-              return;
-            }
+      ApplicationManager.getApplication().runReadAction(new Runnable() {
+        @Override
+        public void run() {
+          if (!resources.isValid() || facet.getModule().isDisposed() || project.isDisposed()) {
+            return;
+          }
 
-            for (final Attr attr : resources.getAttrs()) {
-              final String name = attr.getName().getValue();
+          for (final Attr attr : resources.getAttrs()) {
+            final String name = attr.getName().getValue();
 
-              if (name != null) {
-                resourceSet.add(new ResourceEntry(ResourceType.ATTR.getName(), name));
-              }
-            }
-
-            for (final DeclareStyleable styleable : resources.getDeclareStyleables()) {
-              final String name = styleable.getName().getValue();
-
-              if (name != null) {
-                resourceSet.add(new ResourceEntry(ResourceType.DECLARE_STYLEABLE.getName(), name));
-              }
+            if (name != null) {
+              resourceSet.add(new ResourceEntry(ResourceType.ATTR.getName(), name));
             }
           }
-        });
-      }
+
+          for (final DeclareStyleable styleable : resources.getDeclareStyleables()) {
+            final String name = styleable.getName().getValue();
+
+            if (name != null) {
+              resourceSet.add(new ResourceEntry(ResourceType.DECLARE_STYLEABLE.getName(), name));
+            }
+          }
+        }
+      });
+    }
 
     waitForSmartMode(project);
 
@@ -929,4 +954,22 @@ public class AndroidCompileUtil {
     }
     return false;
   }
+
+  @Nullable
+  public static String getUnsignedApkPath(@NotNull AndroidFacet facet) {
+    final String apkPath = AndroidRootUtil.getApkPath(facet);
+    return apkPath != null ? AndroidCommonUtils.addSuffixToFileName(apkPath, UNSIGNED_SUFFIX) : null;
+  }
+
+  @Nullable
+  public static <T> T handleExceptionError(@NotNull CompileContext context,
+                                           @NotNull String messagePrefix,
+                                           @NotNull Exception e) {
+    reportException(context, messagePrefix, e);
+    return null;
+  }
+
+  public static void reportException(@NotNull CompileContext context, @NotNull String messagePrefix, @NotNull Exception e) {
+    context.addMessage(CompilerMessageCategory.ERROR, messagePrefix + e.getClass().getSimpleName() + ": " + e.getMessage(), null, -1, -1);
+  }
 }
\ No newline at end of file
diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
index 3cf23e95fcd2..3bc201520429 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidPackagingCompiler.java
@@ -16,6 +16,7 @@
 package org.jetbrains.android.compiler;
 
 import com.intellij.compiler.CompilerIOUtil;
+import com.intellij.compiler.impl.CompilerUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.compiler.*;
 import com.intellij.openapi.diagnostic.Logger;
@@ -27,6 +28,7 @@ import com.intellij.openapi.roots.ModuleOrderEntry;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.HashSet;
@@ -54,8 +56,6 @@ import java.util.*;
 public class AndroidPackagingCompiler implements PackagingCompiler {
   private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.compiler.AndroidPackagingCompiler");
 
-  public static final String UNSIGNED_SUFFIX = ".unsigned";
-
   public void processOutdatedItem(CompileContext context, String url, @Nullable ValidityState state) {
   }
 
@@ -235,7 +235,7 @@ public class AndroidPackagingCompiler implements PackagingCompiler {
                                     : item.getResPackagePath();
 
       final String finalPath = unsigned
-                               ? AndroidCommonUtils.addSuffixToFileName(item.getFinalPath(), UNSIGNED_SUFFIX)
+                               ? AndroidCommonUtils.addSuffixToFileName(item.getFinalPath(), AndroidCompileUtil.UNSIGNED_SUFFIX)
                                : item.getFinalPath();
 
       final String[] sourceRoots = AndroidCompileUtil.toOsPaths(item.getSourceRoots());
@@ -247,6 +247,18 @@ public class AndroidPackagingCompiler implements PackagingCompiler {
                                   item.getAdditionalNativeLibs(), finalPath, unsigned, item.mySdkPath, item.getCustomKeystorePath(),
                                   new ExcludedSourcesFilter(project)));
 
+      if (messages.get(CompilerMessageCategory.ERROR).size() == 0) {
+        if (item.myReleaseBuild == unsigned) {
+          final File dst = new File(
+            AndroidCommonUtils.addSuffixToFileName(item.getFinalPath(), AndroidCommonUtils.ANDROID_FINAL_PACKAGE_FOR_ARTIFACT_SUFFIX));
+          FileUtil.copy(new File(finalPath), dst);
+          CompilerUtil.refreshIOFile(dst);
+          final VirtualFile jar = JarFileSystem.getInstance().refreshAndFindFileByPath(dst.getPath() + "!/");
+          if (jar != null) {
+            jar.refresh(false, true);
+          }
+        }
+      }
       AndroidCompileUtil.addMessages(context, messages, item.myModule);
     }
     catch (final IOException e) {
diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidPrecompileTask.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidPrecompileTask.java
index e4d6b8b2295f..3b952b9eb0c9 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/AndroidPrecompileTask.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidPrecompileTask.java
@@ -17,6 +17,8 @@ package org.jetbrains.android.compiler;
 
 import com.intellij.compiler.CompilerConfiguration;
 import com.intellij.compiler.CompilerConfigurationImpl;
+import com.intellij.compiler.options.CompileStepBeforeRun;
+import com.intellij.facet.ProjectFacetManager;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.compiler.*;
@@ -35,7 +37,13 @@ import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.packaging.artifacts.Artifact;
+import com.intellij.packaging.artifacts.ArtifactProperties;
+import com.intellij.packaging.impl.compiler.ArtifactCompileScope;
 import com.intellij.util.containers.hash.HashSet;
+import org.jetbrains.android.compiler.artifact.AndroidApplicationArtifactProperties;
+import org.jetbrains.android.compiler.artifact.AndroidArtifactPropertiesProvider;
+import org.jetbrains.android.compiler.artifact.AndroidArtifactSigningMode;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.android.maven.AndroidMavenUtil;
@@ -55,10 +63,13 @@ public class AndroidPrecompileTask implements CompileTask {
 
   @Override
   public boolean execute(CompileContext context) {
+    if (!checkArtifacts(context)) {
+      return false;
+    }
     checkAndroidDependencies(context);
 
     final Project project = context.getProject();
-    
+
     ExcludedEntriesConfiguration configuration =
       ((CompilerConfigurationImpl)CompilerConfiguration.getInstance(project)).getExcludedEntriesConfiguration();
 
@@ -107,6 +118,62 @@ public class AndroidPrecompileTask implements CompileTask {
     return true;
   }
 
+  private static boolean checkArtifacts(@NotNull CompileContext context) {
+    final Project project = context.getProject();
+    if (!ProjectFacetManager.getInstance(project).hasFacets(AndroidFacet.ID)) {
+      return true;
+    }
+
+    final Set<Artifact> artifacts = ArtifactCompileScope.getArtifactsToBuild(project, context.getCompileScope(), false);
+    if (artifacts == null) {
+      return true;
+    }
+    final Set<Artifact> debugArtifacts = new HashSet<Artifact>();
+    final Set<Artifact> releaseArtifacts = new HashSet<Artifact>();
+
+    for (final Artifact artifact : artifacts) {
+      final ArtifactProperties<?> properties = artifact.getProperties(AndroidArtifactPropertiesProvider.getInstance());
+      if (properties instanceof AndroidApplicationArtifactProperties) {
+        final AndroidArtifactSigningMode mode = ((AndroidApplicationArtifactProperties)properties).getSigningMode();
+        if (mode == AndroidArtifactSigningMode.DEBUG) {
+          debugArtifacts.add(artifact);
+        }
+        else {
+          releaseArtifacts.add(artifact);
+        }
+      }
+    }
+    boolean success = true;
+
+    if (debugArtifacts.size() > 0 && releaseArtifacts.size() > 0) {
+      final String message = "Cannot build debug and release Android artifacts in the same session\n" +
+                             "Debug artifacts: " + toString(debugArtifacts) + "\n" +
+                             "Release artifacts: " + toString(releaseArtifacts);
+      context.addMessage(CompilerMessageCategory.ERROR, message, null, -1, -1);
+      success = false;
+    }
+
+    if (releaseArtifacts.size() > 0 &&
+        CompileStepBeforeRun.getRunConfiguration(context) != null) {
+      final String message = "Cannot build release Android artifacts in the 'make before run' session\n" +
+                             "Release artifacts: " + toString(releaseArtifacts);
+      context.addMessage(CompilerMessageCategory.ERROR, message, null, -1, -1);
+      success = false;
+    }
+    return success;
+  }
+
+  private static String toString(Collection<Artifact> artifacts) {
+    final StringBuilder result = new StringBuilder();
+    for (Artifact artifact : artifacts) {
+      if (result.length() > 0) {
+        result.append(", ");
+      }
+      result.append(artifact.getName());
+    }
+    return result.toString();
+  }
+
   private static void checkAndroidDependencies(@NotNull CompileContext context) {
     for (Module module : context.getCompileScope().getAffectedModules()) {
       final AndroidFacet facet = AndroidFacet.getInstance(module);
@@ -142,7 +209,7 @@ public class AndroidPrecompileTask implements CompileTask {
       }
     }
   }
-  
+
   private static void clearResCache(@NotNull AndroidFacet facet, @NotNull CompileContext context) {
     final Module module = facet.getModule();
 
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
new file mode 100644
index 000000000000..c7ee3c802239
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
@@ -0,0 +1,250 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.openapi.compiler.CompileContext;
+import com.intellij.openapi.compiler.CompilerMessageCategory;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Pair;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
+import com.intellij.packaging.artifacts.Artifact;
+import com.intellij.packaging.artifacts.ArtifactProperties;
+import com.intellij.packaging.ui.ArtifactEditorContext;
+import com.intellij.packaging.ui.ArtifactPropertiesEditor;
+import com.intellij.util.xmlb.XmlSerializerUtil;
+import com.intellij.util.xmlb.annotations.Transient;
+import org.apache.commons.codec.binary.Base64;
+import org.jetbrains.android.compiler.AndroidCompileUtil;
+import org.jetbrains.android.util.AndroidBundle;
+import org.jetbrains.android.util.AndroidCommonUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.*;
+import java.security.*;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+@SuppressWarnings("UnusedDeclaration")
+public class AndroidApplicationArtifactProperties extends ArtifactProperties<AndroidApplicationArtifactProperties> {
+  private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.compiler.artifact.AndroidApplicationArtifactProperties");
+
+  private AndroidArtifactSigningMode mySigningMode = AndroidArtifactSigningMode.RELEASE_UNSIGNED;
+  private String myKeyStoreUrl = "";
+  private String myKeyStorePassword = "";
+  private String myKeyAlias = "";
+  private String myKeyPassword = "";
+
+  @Override
+  public void onBuildFinished(@NotNull Artifact artifact, @NotNull CompileContext context) {
+    if (!(artifact.getArtifactType() instanceof AndroidApplicationArtifactType) ||
+        mySigningMode != AndroidArtifactSigningMode.RELEASE_SIGNED) {
+      return;
+    }
+    final String errorPrefix = "[Artifact '" + artifact.getName() + "'] ";
+    final Pair<PrivateKey, X509Certificate> pair = getPrivateKeyAndCertificate(context, errorPrefix);
+    if (pair == null) {
+      return;
+    }
+
+    final String artifactFilePath = artifact.getOutputFilePath();
+    final String prefix = "Cannot sign artifact " + artifact.getName() + ": ";
+
+    if (artifactFilePath == null) {
+      context.addMessage(CompilerMessageCategory.ERROR, prefix + "output path is not specified", null, -1, -1);
+      return;
+    }
+
+    final File artifactFile = new File(artifactFilePath);
+    if (!artifactFile.exists()) {
+      context.addMessage(CompilerMessageCategory.ERROR, prefix + "file " + artifactFilePath + " hasn't been generated", null, -1, -1);
+      return;
+    }
+
+    File tmpDir = null;
+    try {
+      tmpDir = FileUtil.createTempDirectory("android_artifact", "tmp");
+      final File tmpArtifact = new File(tmpDir, "tmpArtifact.apk");
+      FileUtil.copy(artifactFile, tmpArtifact);
+
+      if (!FileUtil.delete(artifactFile)) {
+        context.addMessage(CompilerMessageCategory.ERROR, "Cannot delete file " + artifactFile.getPath(), null, -1, -1);
+        return;
+      }
+      AndroidCommonUtils.signApk(tmpArtifact, artifactFile, pair.getFirst(), pair.getSecond());
+    }
+    catch (IOException e) {
+      context.addMessage(CompilerMessageCategory.ERROR, prefix + "I/O error: " + e.getMessage(), null, -1, -1);
+    }
+    catch (GeneralSecurityException e) {
+      AndroidCompileUtil.reportException(context, prefix, e);
+    }
+    finally {
+      if (tmpDir != null) {
+        FileUtil.delete(tmpDir);
+      }
+    }
+  }
+
+  @Override
+  public ArtifactPropertiesEditor createEditor(@NotNull ArtifactEditorContext context) {
+    return new AndroidArtifactPropertiesEditor(this, context.getProject());
+  }
+
+  @Override
+  public AndroidApplicationArtifactProperties getState() {
+    return this;
+  }
+
+  @Override
+  public void loadState(AndroidApplicationArtifactProperties state) {
+    XmlSerializerUtil.copyBean(state, this);
+  }
+
+  @Nullable
+  private Pair<PrivateKey, X509Certificate> getPrivateKeyAndCertificate(@NotNull CompileContext context, @NotNull String errorPrefix) {
+    final String keyStoreFilePath = myKeyStoreUrl != null ? VfsUtilCore.urlToPath(myKeyStoreUrl) : "";
+
+    if (keyStoreFilePath.length() == 0) {
+      context.addMessage(CompilerMessageCategory.ERROR, errorPrefix + "Key store file is not specified", null, -1, -1);
+      return null;
+    }
+    if (myKeyStorePassword == null || myKeyStorePassword.length() == 0) {
+      context.addMessage(CompilerMessageCategory.ERROR, errorPrefix + "Key store password is not specified", null, -1, -1);
+      return null;
+    }
+    if (myKeyAlias == null || myKeyAlias.length() == 0) {
+      context.addMessage(CompilerMessageCategory.ERROR, errorPrefix + "Key alias is not specified", null, -1, -1);
+      return null;
+    }
+    if (myKeyPassword == null || myKeyPassword.length() == 0) {
+      context.addMessage(CompilerMessageCategory.ERROR, errorPrefix + "Key password is not specified", null, -1, -1);
+      return null;
+    }
+    final File keyStoreFile = new File(keyStoreFilePath);
+    final String keystorePasswordStr = getPlainKeystorePassword();
+    final char[] keystorePassword = keystorePasswordStr.toCharArray();
+
+    final String keyPasswordStr = getPlainKeyPassword();
+    final char[] keyPassword = keyPasswordStr.toCharArray();
+
+    final KeyStore keyStore;
+    InputStream is = null;
+    try {
+      //noinspection IOResourceOpenedButNotSafelyClosed
+      is = new FileInputStream(keyStoreFile);
+      keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+      keyStore.load(is, keystorePassword);
+
+      final KeyStore.PrivateKeyEntry entry =
+        (KeyStore.PrivateKeyEntry)keyStore.getEntry(myKeyAlias, new KeyStore.PasswordProtection(keyPassword));
+      if (entry == null) {
+        context.addMessage(CompilerMessageCategory.ERROR,
+                           errorPrefix + AndroidBundle.message("android.extract.package.cannot.find.key.error", myKeyAlias), null, -1, -1);
+        return null;
+      }
+
+      final PrivateKey privateKey = entry.getPrivateKey();
+      final Certificate certificate = entry.getCertificate();
+      if (privateKey == null || certificate == null) {
+        context.addMessage(CompilerMessageCategory.ERROR,
+                           errorPrefix + AndroidBundle.message("android.extract.package.cannot.find.key.error", myKeyAlias), null, -1, -1);
+        return null;
+      }
+      return Pair.create(privateKey, (X509Certificate)certificate);
+    }
+    catch (FileNotFoundException e) {
+      return AndroidCompileUtil.handleExceptionError(context, errorPrefix, e);
+    }
+    catch (KeyStoreException e) {
+      return AndroidCompileUtil.handleExceptionError(context, errorPrefix, e);
+    }
+    catch (CertificateException e) {
+      return AndroidCompileUtil.handleExceptionError(context, errorPrefix, e);
+    }
+    catch (NoSuchAlgorithmException e) {
+      return AndroidCompileUtil.handleExceptionError(context, errorPrefix, e);
+    }
+    catch (IOException e) {
+      return AndroidCompileUtil.handleExceptionError(context, errorPrefix, e);
+    }
+    catch (UnrecoverableEntryException e) {
+      return AndroidCompileUtil.handleExceptionError(context, errorPrefix, e);
+    }
+    finally {
+      if (is != null) {
+        try {
+          is.close();
+        }
+        catch (IOException e) {
+          LOG.info(e);
+        }
+      }
+    }
+  }
+
+  public AndroidArtifactSigningMode getSigningMode() {
+    return mySigningMode;
+  }
+
+  public void setSigningMode(AndroidArtifactSigningMode signingMode) {
+    mySigningMode = signingMode;
+  }
+
+  public String getKeyStoreUrl() {
+    return myKeyStoreUrl;
+  }
+
+  public String getKeyStorePassword() {
+    return myKeyStorePassword;
+  }
+
+  public String getKeyAlias() {
+    return myKeyAlias;
+  }
+
+  public String getKeyPassword() {
+    return myKeyPassword;
+  }
+
+  public void setKeyStoreUrl(String keyStoreUrl) {
+    myKeyStoreUrl = keyStoreUrl;
+  }
+
+  public void setKeyStorePassword(String keyStorePassword) {
+    myKeyStorePassword = keyStorePassword;
+  }
+
+  public void setKeyAlias(String keyAlias) {
+    myKeyAlias = keyAlias;
+  }
+
+  public void setKeyPassword(String keyPassword) {
+    myKeyPassword = keyPassword;
+  }
+
+  @Transient
+  @NotNull
+  public String getPlainKeystorePassword() {
+    return new String(new Base64().decode(myKeyStorePassword.getBytes()));
+  }
+
+  @Transient
+  public void setPlainKeystorePassword(@NotNull String password) {
+    myKeyStorePassword = new String(new Base64().encode(password.getBytes()));
+  }
+
+  @Transient
+  @NotNull
+  public String getPlainKeyPassword() {
+    return new String(new Base64().decode(myKeyPassword.getBytes()));
+  }
+
+  @Transient
+  public void setPlainKeyPassword(@NotNull String password) {
+    myKeyPassword = new String(new Base64().encode(password.getBytes()));
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java
new file mode 100644
index 000000000000..ea268a3fac13
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java
@@ -0,0 +1,95 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.LibrarySourceItem;
+import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ModuleOutputSourceItem;
+import com.intellij.packaging.artifacts.ArtifactTemplate;
+import com.intellij.packaging.artifacts.ArtifactType;
+import com.intellij.packaging.elements.CompositePackagingElement;
+import com.intellij.packaging.elements.PackagingElementFactory;
+import com.intellij.packaging.elements.PackagingElementOutputKind;
+import com.intellij.packaging.elements.PackagingElementResolvingContext;
+import com.intellij.packaging.impl.artifacts.ArtifactUtil;
+import com.intellij.packaging.impl.artifacts.PlainArtifactType;
+import com.intellij.packaging.ui.PackagingSourceItem;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidApplicationArtifactType extends ArtifactType {
+  public AndroidApplicationArtifactType() {
+    super("apk", "Android Application");
+  }
+
+  @NotNull
+  @Override
+  public Icon getIcon() {
+    return PlainArtifactType.ARTIFACT_ICON;
+  }
+
+  @Override
+  public String getDefaultPathFor(@NotNull PackagingElementOutputKind kind) {
+    return "/";
+  }
+
+  @Override
+  public boolean isSuitableItem(@NotNull PackagingSourceItem item) {
+    return !(item instanceof ModuleOutputSourceItem || item instanceof LibrarySourceItem);
+  }
+
+  @NotNull
+  @Override
+  public CompositePackagingElement<?> createRootElement(@NotNull String artifactName) {
+    return PackagingElementFactory.getInstance().createArchive(ArtifactUtil.suggestArtifactFileName(artifactName) + ".apk");
+  }
+
+
+  @NotNull
+  @Override
+  public List<? extends ArtifactTemplate> getNewArtifactTemplates(@NotNull PackagingElementResolvingContext context) {
+    return Collections.singletonList(new MyTemplate(context));
+  }
+
+  private class MyTemplate extends ArtifactTemplate {
+    protected PackagingElementResolvingContext myContext;
+
+    public MyTemplate(@NotNull PackagingElementResolvingContext context) {
+      myContext = context;
+    }
+
+    @Override
+    public String getPresentableName() {
+      return "From module...";
+    }
+
+    @Override
+    public NewArtifactConfiguration createArtifact() {
+      final List<Module> modules = new ArrayList<Module>();
+
+      for (Module module : myContext.getModulesProvider().getModules()) {
+        final AndroidFacet facet = AndroidFacet.getInstance(module);
+
+        if (facet != null && !facet.getConfiguration().LIBRARY_PROJECT) {
+          modules.add(module);
+        }
+      }
+
+      final AndroidFacet facet = AndroidArtifactUtil.chooseAndroidApplicationModule(myContext.getProject(), modules);
+      if (facet == null) {
+        return null;
+      }
+
+      final CompositePackagingElement<?> rootElement =
+        AndroidApplicationArtifactType.this.createRootElement(facet.getModule().getName());
+      rootElement.addFirstChild(new AndroidFinalPackageElement(myContext.getProject(), facet));
+      return new NewArtifactConfiguration(rootElement, facet.getModule().getName(), AndroidApplicationArtifactType.this);
+    }
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form
new file mode 100644
index 000000000000..cef9f344b696
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.compiler.artifact.AndroidArtifactPropertiesEditor">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <vspacer id="39e8a">
+        <constraints>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
+      <component id="8bfdb" class="javax.swing.JRadioButton" binding="myReleaseSignedRadio">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <enabled value="true"/>
+          <text value="Release &amp;signed"/>
+        </properties>
+      </component>
+      <component id="791e9" class="javax.swing.JRadioButton" binding="myReleaseUnsignedRadio">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Release &amp;unsigned"/>
+        </properties>
+      </component>
+      <component id="ce323" class="javax.swing.JRadioButton" binding="myDebugRadio">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="&amp;Debug"/>
+        </properties>
+      </component>
+      <grid id="b6cd" binding="myReleaseKeyPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="587da" class="com.intellij.ui.components.JBLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="779"/>
+              <text value="&amp;Key store path: "/>
+            </properties>
+          </component>
+          <component id="e6a18" class="com.intellij.ui.components.JBLabel">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="8c694"/>
+              <text value="Key store &amp;password:"/>
+            </properties>
+          </component>
+          <component id="8c694" class="javax.swing.JPasswordField" binding="myKeyStorePasswordField">
+            <constraints>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="5d3f2" class="com.intellij.ui.components.JBLabel">
+            <constraints>
+              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="9b706"/>
+              <text value="K&amp;ey alias: "/>
+            </properties>
+          </component>
+          <component id="76382" class="com.intellij.ui.components.JBLabel">
+            <constraints>
+              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <labelFor value="3398"/>
+              <text value="Key pass&amp;word:"/>
+            </properties>
+          </component>
+          <component id="3398" class="javax.swing.JPasswordField" binding="myKeyPasswordField">
+            <constraints>
+              <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="9b706" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myKeyAliasField">
+            <constraints>
+              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+          </component>
+          <component id="779" class="javax.swing.JTextField" binding="myKeyStorePathField">
+            <constraints>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <preferred-size width="150" height="-1"/>
+              </grid>
+            </constraints>
+            <properties/>
+          </component>
+          <grid id="bdf4e" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="48c0d" class="javax.swing.JButton" binding="myCreateKeyStoreButton">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="&amp;Create new..."/>
+                </properties>
+              </component>
+              <component id="a6531" class="javax.swing.JButton" binding="myLoadKeyStoreButton">
+                <constraints>
+                  <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="&amp;Choose existing..."/>
+                </properties>
+              </component>
+              <hspacer id="ed5f1">
+                <constraints>
+                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+              </hspacer>
+            </children>
+          </grid>
+        </children>
+      </grid>
+    </children>
+  </grid>
+  <buttonGroups>
+    <group name="myGroup1">
+      <member id="ce323"/>
+      <member id="8bfdb"/>
+      <member id="791e9"/>
+    </group>
+  </buttonGroups>
+</form>
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.java
new file mode 100644
index 000000000000..8c86c94895ef
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.java
@@ -0,0 +1,260 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.android.annotations.NonNull;
+import com.intellij.CommonBundle;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.fileChooser.FileChooser;
+import com.intellij.openapi.fileChooser.FileChooserDescriptor;
+import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.ui.TextFieldWithBrowseButton;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VfsUtilCore;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.packaging.ui.ArtifactPropertiesEditor;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.android.util.AndroidUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.*;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.util.List;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidArtifactPropertiesEditor extends ArtifactPropertiesEditor {
+  private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.compiler.artifact.AndroidApplicationArtifactProperties");
+
+  private final AndroidApplicationArtifactProperties myProperties;
+
+  private JPanel myPanel;
+  private JRadioButton myDebugRadio;
+  private JRadioButton myReleaseSignedRadio;
+  private JRadioButton myReleaseUnsignedRadio;
+  private JPanel myReleaseKeyPanel;
+  private JPasswordField myKeyStorePasswordField;
+  private JTextField myKeyStorePathField;
+  private JPasswordField myKeyPasswordField;
+  private TextFieldWithBrowseButton myKeyAliasField;
+  private JButton myLoadKeyStoreButton;
+  private JButton myCreateKeyStoreButton;
+
+  public AndroidArtifactPropertiesEditor(@NonNull AndroidApplicationArtifactProperties properties, @NotNull final Project project) {
+    myProperties = properties;
+
+    final ActionListener listener = new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        UIUtil.setEnabled(myReleaseKeyPanel, myReleaseSignedRadio.isSelected(), true);
+      }
+    };
+    myDebugRadio.addActionListener(listener);
+    myReleaseUnsignedRadio.addActionListener(listener);
+    myReleaseSignedRadio.addActionListener(listener);
+
+    myLoadKeyStoreButton.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        final String defaultPath = getKeyStorePath();
+        final VirtualFile defaultFile = LocalFileSystem.getInstance().findFileByPath(defaultPath);
+        final FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor();
+        final VirtualFile file = FileChooser.chooseFile(descriptor, myPanel, project, defaultFile);
+        if (file != null) {
+          myKeyStorePathField.setText(FileUtil.toSystemDependentName(file.getPath()));
+        }
+      }
+    });
+
+    myCreateKeyStoreButton.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        final NewKeyStoreDialog dialog = new NewKeyStoreDialog(project, myKeyStorePathField.getText());
+        dialog.show();
+
+        if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
+          myKeyStorePathField.setText(dialog.getKeyStorePath());
+          myKeyStorePasswordField.setText(String.valueOf(dialog.getKeyStorePassword()));
+          myKeyAliasField.setText(dialog.getKeyAlias());
+          myKeyPasswordField.setText(String.valueOf(dialog.getKeyPassword()));
+        }
+      }
+    });
+
+    myKeyAliasField.getButton().addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        final List<String> keys = loadExistingKeys();
+        if (keys == null) {
+          return;
+        }
+        final ChooseKeyDialog dialog =
+          new ChooseKeyDialog(project, getKeyStorePath(), myKeyStorePasswordField.getPassword(), keys, getKeyAlias());
+        dialog.show();
+
+        if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
+          final String chosenKey = dialog.getChosenKey();
+          if (chosenKey != null) {
+            myKeyAliasField.setText(chosenKey);
+          }
+
+          final char[] password = dialog.getChosenKeyPassword();
+          if (password != null) {
+            myKeyPasswordField.setText(String.valueOf(password));
+          }
+        }
+      }
+    });
+  }
+
+  private String getKeyStorePath() {
+    return myKeyStorePathField.getText().trim();
+  }
+
+  @Nullable
+  private List<String> loadExistingKeys() {
+    final String errorPrefix = "Cannot load key store: ";
+    InputStream is = null;
+    try {
+      //noinspection IOResourceOpenedButNotSafelyClosed
+      is = new FileInputStream(new File(getKeyStorePath()));
+      final KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+      keyStore.load(is, myKeyStorePasswordField.getPassword());
+      return AndroidUtils.toList(keyStore.aliases());
+    }
+    catch (KeyStoreException e) {
+      Messages.showErrorDialog(myPanel, errorPrefix + e.getMessage(), CommonBundle.getErrorTitle());
+      return null;
+    }
+    catch (FileNotFoundException e) {
+      Messages.showErrorDialog(myPanel, errorPrefix + e.getMessage(), CommonBundle.getErrorTitle());
+      return null;
+    }
+    catch (CertificateException e) {
+      Messages.showErrorDialog(myPanel, errorPrefix + e.getMessage(), CommonBundle.getErrorTitle());
+      return null;
+    }
+    catch (NoSuchAlgorithmException e) {
+      Messages.showErrorDialog(myPanel, errorPrefix + e.getMessage(), CommonBundle.getErrorTitle());
+      return null;
+    }
+    catch (IOException e) {
+      Messages.showErrorDialog(myPanel, errorPrefix + e.getMessage(), CommonBundle.getErrorTitle());
+      return null;
+    }
+    finally {
+      if (is != null) {
+        try {
+          is.close();
+        }
+        catch (IOException e) {
+          LOG.info(e);
+        }
+      }
+    }
+  }
+
+  @Override
+  public String getTabName() {
+    return "Android";
+  }
+
+  @Override
+  public JComponent createComponent() {
+    return myPanel;
+  }
+
+  @Override
+  public boolean isModified() {
+    return getSigningMode() != myProperties.getSigningMode() ||
+           !getKeyStoreFileUrl().equals(myProperties.getKeyStoreUrl()) ||
+           !getKeyStorePassword().equals(myProperties.getPlainKeystorePassword()) ||
+           !getKeyAlias().equals(myProperties.getKeyAlias()) ||
+           !getKeyPassword().equals(myProperties.getPlainKeyPassword());
+  }
+
+  @Override
+  public void apply() {
+    myProperties.setSigningMode(getSigningMode());
+    myProperties.setKeyStoreUrl(getKeyStoreFileUrl());
+    myProperties.setPlainKeystorePassword(getKeyStorePassword());
+    myProperties.setKeyAlias(getKeyAlias());
+    myProperties.setPlainKeyPassword(getKeyPassword());
+  }
+
+  @Override
+  public void reset() {
+    switch (myProperties.getSigningMode()) {
+      case RELEASE_UNSIGNED:
+        myReleaseUnsignedRadio.setSelected(true);
+        myDebugRadio.setSelected(false);
+        myReleaseSignedRadio.setSelected(false);
+        break;
+      case DEBUG:
+        myReleaseUnsignedRadio.setSelected(false);
+        myDebugRadio.setSelected(true);
+        myReleaseSignedRadio.setSelected(false);
+        break;
+      case RELEASE_SIGNED:
+        myReleaseUnsignedRadio.setSelected(false);
+        myDebugRadio.setSelected(false);
+        myReleaseSignedRadio.setSelected(true);
+        break;
+    }
+    final String keyStoreUrl = myProperties.getKeyStoreUrl();
+    myKeyStorePathField.setText(keyStoreUrl != null ? VfsUtilCore.urlToPath(keyStoreUrl) : "");
+    myKeyStorePasswordField.setText(myProperties.getPlainKeystorePassword());
+
+    final String keyAlias = myProperties.getKeyAlias();
+    myKeyAliasField.setText(keyAlias != null ? keyAlias : "");
+    myKeyPasswordField.setText(myProperties.getPlainKeyPassword());
+
+    UIUtil.setEnabled(myReleaseKeyPanel, myProperties.getSigningMode() == AndroidArtifactSigningMode.RELEASE_SIGNED, true);
+  }
+
+  @Override
+  public void disposeUIResources() {
+  }
+
+  @NotNull
+  private AndroidArtifactSigningMode getSigningMode() {
+    if (myDebugRadio.isSelected()) {
+      return AndroidArtifactSigningMode.DEBUG;
+    }
+    else if (myReleaseSignedRadio.isSelected()) {
+      return AndroidArtifactSigningMode.RELEASE_SIGNED;
+    }
+    return AndroidArtifactSigningMode.RELEASE_UNSIGNED;
+  }
+
+  @NotNull
+  private String getKeyStoreFileUrl() {
+    final String path = getKeyStorePath();
+    return VfsUtilCore.pathToUrl(path);
+  }
+
+  @NotNull
+  private String getKeyStorePassword() {
+    return String.valueOf(myKeyStorePasswordField.getPassword());
+  }
+
+  @NotNull
+  private String getKeyAlias() {
+    return myKeyAliasField.getText().trim();
+  }
+
+  @NotNull
+  private String getKeyPassword() {
+    return String.valueOf(myKeyPasswordField.getPassword());
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesProvider.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesProvider.java
new file mode 100644
index 000000000000..84161bd24df5
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesProvider.java
@@ -0,0 +1,30 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.packaging.artifacts.ArtifactProperties;
+import com.intellij.packaging.artifacts.ArtifactPropertiesProvider;
+import com.intellij.packaging.artifacts.ArtifactType;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidArtifactPropertiesProvider extends ArtifactPropertiesProvider {
+  protected AndroidArtifactPropertiesProvider() {
+    super("android-properties");
+  }
+
+  @Override
+  public boolean isAvailableFor(@NotNull ArtifactType type) {
+    return type instanceof AndroidApplicationArtifactType;
+  }
+
+  @NotNull
+  @Override
+  public ArtifactProperties<?> createProperties(@NotNull ArtifactType artifactType) {
+    return new AndroidApplicationArtifactProperties();
+  }
+
+  public static AndroidArtifactPropertiesProvider getInstance() {
+    return EP_NAME.findExtension(AndroidArtifactPropertiesProvider.class);
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactSigningCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactSigningCompiler.java
new file mode 100644
index 000000000000..bacf8b670933
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactSigningCompiler.java
@@ -0,0 +1,122 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.compiler.CompileContext;
+import com.intellij.openapi.compiler.CompileScope;
+import com.intellij.openapi.compiler.PackagingCompiler;
+import com.intellij.openapi.compiler.ValidityState;
+import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidArtifactSigningCompiler implements PackagingCompiler {
+  @Override
+  public void processOutdatedItem(CompileContext context, String url, @Nullable ValidityState state) {
+  }
+
+  @NotNull
+  @Override
+  public ProcessingItem[] getProcessingItems(CompileContext context) {
+    return ApplicationManager.getApplication().runReadAction(new Computable<ProcessingItem[]>() {
+      @Override
+      public ProcessingItem[] compute() {
+        return null;
+      }
+    });
+  }
+
+  @Override
+  public ProcessingItem[] process(CompileContext context, ProcessingItem[] items) {
+    return new ProcessingItem[0];  //To change body of implemented methods use File | Settings | File Templates.
+  }
+
+  @NotNull
+  @Override
+  public String getDescription() {
+    return "Android Artifact Signing Compiler";
+  }
+
+  @Override
+  public boolean validateConfiguration(CompileScope scope) {
+    return true;
+  }
+
+  @Override
+  public ValidityState createValidityState(DataInput in) throws IOException {
+    return new MyValidityState(in);
+  }
+
+  private static class MyProcessingItem implements ProcessingItem {
+    private final VirtualFile myApkFile;
+    private final AndroidArtifactSigningMode mySigningMode;
+    private final String myDebugKeyStorePath;
+    private final MyValidityState myValidityState;
+
+    private MyProcessingItem(@NotNull VirtualFile apkFile,
+                             @NotNull AndroidArtifactSigningMode signingMode,
+                             @Nullable String debugKeyStorePath) {
+      myApkFile = apkFile;
+      mySigningMode = signingMode;
+      myDebugKeyStorePath = debugKeyStorePath;
+
+      myValidityState = new MyValidityState(myApkFile.getModificationStamp(),
+                                            mySigningMode.name(),
+                                            myDebugKeyStorePath);
+    }
+
+    @NotNull
+    @Override
+    public VirtualFile getFile() {
+      return myApkFile;
+    }
+
+    @Override
+    public ValidityState getValidityState() {
+      return myValidityState;
+    }
+  }
+
+  private static class MyValidityState implements ValidityState {
+    private final long myApkFileTimestamp;
+    private final String mySigningMode;
+    private final String myDebugKeyStorePath;
+
+    private MyValidityState(long apkFileTimestamp, @NotNull String signingMode, @NotNull String debugKeyStorePath) {
+      myApkFileTimestamp = apkFileTimestamp;
+      mySigningMode = signingMode;
+      myDebugKeyStorePath = debugKeyStorePath;
+    }
+
+    private MyValidityState(@NotNull DataInput in) throws IOException {
+      myApkFileTimestamp = in.readLong();
+      mySigningMode = in.readUTF();
+      myDebugKeyStorePath = in.readUTF();
+    }
+
+    @Override
+    public boolean equalsTo(ValidityState otherState) {
+      if (!(otherState instanceof MyValidityState)) {
+        return false;
+      }
+      final MyValidityState state = (MyValidityState)otherState;
+      return state.myApkFileTimestamp == myApkFileTimestamp &&
+             state.mySigningMode.equals(mySigningMode) &&
+             state.myDebugKeyStorePath.equals(myDebugKeyStorePath);
+    }
+
+    @Override
+    public void save(DataOutput out) throws IOException {
+      out.writeLong(myApkFileTimestamp);
+      out.writeUTF(mySigningMode);
+      out.writeUTF(myDebugKeyStorePath);
+    }
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactSigningMode.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactSigningMode.java
new file mode 100644
index 000000000000..4499d7a60d4d
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactSigningMode.java
@@ -0,0 +1,8 @@
+package org.jetbrains.android.compiler.artifact;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public enum AndroidArtifactSigningMode {
+  DEBUG, RELEASE_UNSIGNED, RELEASE_SIGNED
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactUtil.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactUtil.java
new file mode 100644
index 000000000000..85bf6c281842
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactUtil.java
@@ -0,0 +1,56 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.CommonBundle;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ui.configuration.ChooseModulesDialog;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.packaging.artifacts.Artifact;
+import com.intellij.packaging.impl.artifacts.ArtifactUtil;
+import com.intellij.packaging.ui.ArtifactEditorContext;
+import com.intellij.util.Processor;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidArtifactUtil {
+  private AndroidArtifactUtil() {
+  }
+
+  public static boolean containsAndroidPackage(ArtifactEditorContext editorContext, Artifact artifact) {
+    return !ArtifactUtil
+      .processPackagingElements(artifact, AndroidFinalPackageElementType.getInstance(), new Processor<AndroidFinalPackageElement>() {
+        public boolean process(AndroidFinalPackageElement e) {
+          return false;
+        }
+      }, editorContext, true);
+  }
+
+  @Nullable
+  public static AndroidFacet chooseAndroidApplicationModule(@NotNull Project project, @NotNull List<Module> modules) {
+    final ChooseModulesDialog dialog = new ChooseModulesDialog(project, modules, "Select Module",
+                                                               "Selected Android application module will be included in the created artifact with all dependencies");
+    dialog.setSingleSelectionMode();
+    dialog.show();
+    final List<Module> selected = dialog.getChosenElements();
+    if (selected.isEmpty()) {
+      return null;
+    }
+    assert selected.size() == 1;
+    final Module module = selected.get(0);
+    final String moduleName = module.getName();
+
+    final AndroidFacet facet = AndroidFacet.getInstance(module);
+    if (facet == null) {
+      final String message = "Cannot find Android facet for module " + moduleName;
+      Messages.showErrorDialog(project, message, CommonBundle.getErrorTitle());
+      return null;
+    }
+    return facet;
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackageElement.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackageElement.java
new file mode 100644
index 000000000000..3c719ed56d90
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackageElement.java
@@ -0,0 +1,154 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.compiler.ant.Generator;
+import com.intellij.facet.pointers.FacetPointer;
+import com.intellij.facet.pointers.FacetPointersManager;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.openapi.vfs.JarFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.packaging.artifacts.ArtifactType;
+import com.intellij.packaging.elements.*;
+import com.intellij.packaging.impl.elements.FacetBasedPackagingElement;
+import com.intellij.packaging.impl.elements.ModuleOutputPackagingElement;
+import com.intellij.packaging.impl.ui.DelegatedPackagingElementPresentation;
+import com.intellij.packaging.ui.ArtifactEditorContext;
+import com.intellij.packaging.ui.PackagingElementPresentation;
+import com.intellij.util.xmlb.annotations.Attribute;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.android.facet.AndroidRootUtil;
+import org.jetbrains.android.util.AndroidCommonUtils;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidFinalPackageElement extends PackagingElement<AndroidFinalPackageElement.AndroidFinalPackageElementState>
+  implements FacetBasedPackagingElement, ModuleOutputPackagingElement {
+
+  @NonNls static final String FACET_ATTRIBUTE = "facet";
+
+  private FacetPointer<AndroidFacet> myFacetPointer;
+  private final Project myProject;
+
+  public AndroidFinalPackageElement(@NotNull Project project, @Nullable AndroidFacet facet) {
+    super(AndroidFinalPackageElementType.getInstance());
+    myProject = project;
+    myFacetPointer = facet != null ? FacetPointersManager.getInstance(myProject).create(facet) : null;
+  }
+
+  @Override
+  public PackagingElementPresentation createPresentation(@NotNull ArtifactEditorContext context) {
+    return new DelegatedPackagingElementPresentation(new AndroidFinalPackagePresentation(myFacetPointer));
+  }
+
+  @Nullable
+  private String getApkPath() {
+    if (myFacetPointer == null) {
+      return null;
+    }
+
+    final AndroidFacet facet = myFacetPointer.getFacet();
+    if (facet == null) {
+      return null;
+    }
+
+    final String apkPath = AndroidRootUtil.getApkPath(facet);
+    final String path = apkPath != null
+                        ? AndroidCommonUtils.addSuffixToFileName(apkPath, AndroidCommonUtils.ANDROID_FINAL_PACKAGE_FOR_ARTIFACT_SUFFIX)
+                        : null;
+    return path != null
+           ? FileUtil.toSystemIndependentName(path) + "!/"
+           : null;
+  }
+
+  @Override
+  public List<? extends Generator> computeAntInstructions(@NotNull PackagingElementResolvingContext resolvingContext,
+                                                          @NotNull AntCopyInstructionCreator creator,
+                                                          @NotNull ArtifactAntGenerationContext generationContext,
+                                                          @NotNull ArtifactType artifactType) {
+    final String apkPath = getApkPath();
+    if (apkPath != null) {
+      return Collections.singletonList(creator.createExtractedDirectoryInstruction(apkPath));
+    }
+    return Collections.emptyList();
+  }
+
+  @Override
+  public void computeIncrementalCompilerInstructions(@NotNull IncrementalCompilerInstructionCreator creator,
+                                                     @NotNull PackagingElementResolvingContext resolvingContext,
+                                                     @NotNull ArtifactIncrementalCompilerContext compilerContext,
+                                                     @NotNull ArtifactType artifactType) {
+    final String apkPath = getApkPath();
+    if (apkPath != null) {
+      final VirtualFile apk = JarFileSystem.getInstance().findFileByPath(apkPath);
+      if (apk != null && apk.isValid() && apk.isDirectory()) {
+        creator.addDirectoryCopyInstructions(apk);
+      }
+    }
+  }
+
+  @Nullable
+  public AndroidFacet getFacet() {
+    return myFacetPointer != null ? myFacetPointer.getFacet() : null;
+  }
+
+  @Override
+  public boolean isEqualTo(@NotNull PackagingElement<?> element) {
+    if (!(element instanceof AndroidFinalPackageElement)) {
+      return false;
+    }
+    final AndroidFinalPackageElement packageElement = (AndroidFinalPackageElement)element;
+
+    return myFacetPointer == null
+           ? packageElement.myFacetPointer == null
+           : myFacetPointer.equals(packageElement.myFacetPointer);
+  }
+
+  public AndroidFinalPackageElementState getState() {
+    final AndroidFinalPackageElementState state = new AndroidFinalPackageElementState();
+    state.myFacetPointer = myFacetPointer != null ? myFacetPointer.getId() : null;
+    return state;
+  }
+
+  @Override
+  public AndroidFacet findFacet(@NotNull PackagingElementResolvingContext context) {
+    return myFacetPointer != null ? myFacetPointer.findFacet(context.getModulesProvider(), context.getFacetsProvider()) : null;
+  }
+
+  public void loadState(AndroidFinalPackageElementState state) {
+    myFacetPointer = state.myFacetPointer != null
+                     ? FacetPointersManager.getInstance(myProject).<AndroidFacet>create(state.myFacetPointer)
+                     : null;
+  }
+
+  @Override
+  public String getModuleName() {
+    return myFacetPointer != null ? myFacetPointer.getModuleName() : null;
+  }
+
+  @Override
+  public Module findModule(PackagingElementResolvingContext context) {
+    final AndroidFacet facet = findFacet(context);
+    return facet != null ? facet.getModule() : null;
+  }
+
+  @NotNull
+  @Override
+  public Collection<VirtualFile> getSourceRoots(PackagingElementResolvingContext context) {
+    return Collections.emptyList();
+  }
+
+  public static class AndroidFinalPackageElementState {
+
+    @Attribute(FACET_ATTRIBUTE)
+    public String myFacetPointer;
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackageElementType.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackageElementType.java
new file mode 100644
index 000000000000..e1e76d027d5f
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackageElementType.java
@@ -0,0 +1,88 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.packaging.artifacts.Artifact;
+import com.intellij.packaging.elements.CompositePackagingElement;
+import com.intellij.packaging.elements.PackagingElement;
+import com.intellij.packaging.elements.PackagingElementType;
+import com.intellij.packaging.ui.ArtifactEditorContext;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.android.util.AndroidUtils;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidFinalPackageElementType extends PackagingElementType<AndroidFinalPackageElement> {
+  @NonNls public static final String TYPE_ID = "android-final-package";
+
+  protected AndroidFinalPackageElementType() {
+    super(TYPE_ID, "Android Final Package");
+  }
+
+  public static AndroidFinalPackageElementType getInstance() {
+    return getInstance(AndroidFinalPackageElementType.class);
+  }
+
+  @Override
+  public Icon getCreateElementIcon() {
+    return AndroidUtils.ANDROID_ICON;
+  }
+
+  @Override
+  public boolean canCreate(@NotNull ArtifactEditorContext context, @NotNull Artifact artifact) {
+    return getAndroidApplicationFacets(context, context.getModulesProvider().getModules()).size() > 0 &&
+           !AndroidArtifactUtil.containsAndroidPackage(context, artifact);
+  }
+
+  @NotNull
+  private static List<AndroidFacet> getAndroidApplicationFacets(@NotNull ArtifactEditorContext context, @NotNull Module[] modules) {
+    final List<AndroidFacet> result = new ArrayList<AndroidFacet>();
+    for (Module module : modules) {
+      for (AndroidFacet facet : context.getFacetsProvider().getFacetsByType(module, AndroidFacet.ID)) {
+        if (!facet.getConfiguration().LIBRARY_PROJECT) {
+          result.add(facet);
+        }
+      }
+    }
+    return result;
+  }
+
+  @NotNull
+  private static List<Module> facetsToModules(@NotNull Collection<AndroidFacet> facets) {
+    final List<Module> result = new ArrayList<Module>(facets.size());
+    for (AndroidFacet facet : facets) {
+      result.add(facet.getModule());
+    }
+    return result;
+  }
+
+  @NotNull
+  @Override
+  public List<? extends PackagingElement<?>> chooseAndCreate(@NotNull ArtifactEditorContext context,
+                                                             @NotNull Artifact artifact,
+                                                             @NotNull CompositePackagingElement<?> parent) {
+    final List<AndroidFacet> facets = getAndroidApplicationFacets(context, context.getModulesProvider().getModules());
+    final List<Module> modules = facetsToModules(facets);
+
+    final AndroidFacet facet = AndroidArtifactUtil.chooseAndroidApplicationModule(context.getProject(), modules);
+    if (facet == null) {
+      return Collections.emptyList();
+    }
+    return Collections.singletonList(new AndroidFinalPackageElement(context.getProject(), facet));
+  }
+
+  @NotNull
+  @Override
+  public AndroidFinalPackageElement createEmpty(@NotNull Project project) {
+    return new AndroidFinalPackageElement(project, null);
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackagePresentation.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackagePresentation.java
new file mode 100644
index 000000000000..d43b9cb2c08b
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidFinalPackagePresentation.java
@@ -0,0 +1,40 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.facet.pointers.FacetPointer;
+import com.intellij.ide.projectView.PresentationData;
+import com.intellij.packaging.ui.SourceItemPresentation;
+import com.intellij.packaging.ui.SourceItemWeights;
+import com.intellij.ui.SimpleTextAttributes;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+class AndroidFinalPackagePresentation extends SourceItemPresentation {
+  private final FacetPointer<AndroidFacet> myFacetPointer;
+
+  public AndroidFinalPackagePresentation(@Nullable FacetPointer<AndroidFacet> facetPointer) {
+    myFacetPointer = facetPointer;
+  }
+
+  @Override
+  public String getPresentableName() {
+    final String moduleName = myFacetPointer != null ? myFacetPointer.getModuleName() : "<unknown>";
+    return "'" + moduleName + "' Android final package";
+  }
+
+  @Override
+  public void render(@NotNull PresentationData presentationData,
+                     SimpleTextAttributes mainAttributes,
+                     SimpleTextAttributes commentAttributes) {
+    presentationData.setIcons(AndroidFacet.getFacetType().getIcon());
+    presentationData.addText(getPresentableName(), mainAttributes);
+  }
+
+  @Override
+  public int getWeight() {
+    return SourceItemWeights.LIBRARY_WEIGHT - 5;
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidSourceItemsProvider.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidSourceItemsProvider.java
new file mode 100644
index 000000000000..4c2528464ed6
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidSourceItemsProvider.java
@@ -0,0 +1,56 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.facet.pointers.FacetPointersManager;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.FacetBasedPackagingSourceItemsProvider;
+import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ModuleSourceItemGroup;
+import com.intellij.packaging.artifacts.Artifact;
+import com.intellij.packaging.ui.ArtifactEditorContext;
+import com.intellij.packaging.ui.PackagingSourceItem;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class AndroidSourceItemsProvider extends FacetBasedPackagingSourceItemsProvider<AndroidFacet, AndroidFinalPackageElement> {
+  public AndroidSourceItemsProvider() {
+    super(AndroidFacet.ID, AndroidFinalPackageElementType.getInstance());
+  }
+
+  @Override
+  protected AndroidFinalPackagePresentation createPresentation(AndroidFacet facet) {
+    return new AndroidFinalPackagePresentation(FacetPointersManager.getInstance(facet.getModule().getProject()).create(facet));
+  }
+
+  @Override
+  protected AndroidFinalPackageElement createElement(ArtifactEditorContext context, AndroidFacet facet) {
+    return new AndroidFinalPackageElement(context.getProject(), facet);
+  }
+
+  @NotNull
+  @Override
+  public Collection<? extends PackagingSourceItem> getSourceItems(@NotNull ArtifactEditorContext editorContext,
+                                                                  @NotNull Artifact artifact,
+                                                                  @Nullable PackagingSourceItem parent) {
+
+    if (parent instanceof ModuleSourceItemGroup && !AndroidArtifactUtil.containsAndroidPackage(editorContext, artifact)) {
+      final Module module = ((ModuleSourceItemGroup)parent).getModule();
+      final Set<AndroidFacet> facets =
+        new HashSet<AndroidFacet>(editorContext.getFacetsProvider().getFacetsByType(module, AndroidFacet.ID));
+      return Collections.singletonList(new FacetBasedSourceItem<AndroidFacet>(this, facets.iterator().next()));
+    }
+    return Collections.emptyList();
+  }
+
+  @Override
+  protected AndroidFacet getFacet(AndroidFinalPackageElement element) {
+    return element.getFacet();
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.form b/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.form
new file mode 100644
index 000000000000..0b5728b4ae74
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.form
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.compiler.artifact.ChooseKeyDialog">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="500" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <component id="6262e" class="com.intellij.ui.components.JBRadioButton" binding="myUseExistingKeyRadioButton">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="&amp;Use an existing key:"/>
+        </properties>
+      </component>
+      <vspacer id="ba9f7">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
+      <component id="91b01" class="com.intellij.ui.components.JBRadioButton" binding="myCreateNewKeyRadioButton">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Create a &amp;new key"/>
+        </properties>
+      </component>
+      <grid id="97118" binding="myNewKeyPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="2" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children/>
+      </grid>
+      <component id="b9c2f" class="javax.swing.JComboBox" binding="myKeyCombo">
+        <constraints>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
+    </children>
+  </grid>
+  <buttonGroups>
+    <group name="myGroup1">
+      <member id="6262e"/>
+      <member id="91b01"/>
+    </group>
+  </buttonGroups>
+  <inspectionSuppressions>
+    <suppress inspection="NoLabelFor" id="b9c2f"/>
+  </inspectionSuppressions>
+</form>
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.java
new file mode 100644
index 000000000000..7b0695955515
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.java
@@ -0,0 +1,129 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.CommonBundle;
+import com.intellij.ide.wizard.CommitStepException;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.ui.CollectionComboBoxModel;
+import com.intellij.ui.components.JBRadioButton;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.android.exportSignedPackage.NewKeyForm;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.List;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class ChooseKeyDialog extends DialogWrapper {
+  private JPanel myNewKeyPanel;
+  private JBRadioButton myCreateNewKeyRadioButton;
+  private JBRadioButton myUseExistingKeyRadioButton;
+  private JComboBox myKeyCombo;
+  private JPanel myPanel;
+
+  private final NewKeyForm myNewKeyForm = new MyNewKeyForm();
+  private final Project myProject;
+  private final String myKeyStorePath;
+  private final char[] myKeyStorePassword;
+  private final List<String> myExistingKeys;
+
+  public ChooseKeyDialog(@NotNull Project project,
+                         @NotNull String keyStorePath,
+                         @NotNull char[] password,
+                         @NotNull List<String> existingKeys,
+                         @Nullable String keyToSelect) {
+    super(project);
+    myProject = project;
+    myKeyStorePath = keyStorePath;
+    myKeyStorePassword = password;
+    myExistingKeys = existingKeys;
+    myKeyCombo.setModel(new CollectionComboBoxModel(existingKeys, existingKeys.get(0)));
+
+    if (keyToSelect != null && existingKeys.contains(keyToSelect)) {
+      myKeyCombo.setSelectedItem(keyToSelect);
+    }
+    myNewKeyPanel.add(myNewKeyForm.getContentPanel(), BorderLayout.CENTER);
+
+    final ActionListener listener = new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        UIUtil.setEnabled(myNewKeyPanel, myCreateNewKeyRadioButton.isSelected(), true);
+      }
+    };
+    myCreateNewKeyRadioButton.addActionListener(listener);
+    myUseExistingKeyRadioButton.addActionListener(listener);
+
+    final boolean useExisting = existingKeys.size() > 0;
+    myUseExistingKeyRadioButton.setSelected(useExisting);
+    myCreateNewKeyRadioButton.setSelected(!useExisting);
+    UIUtil.setEnabled(myNewKeyPanel, !useExisting, true);
+
+    setTitle("Create New Key");
+    init();
+  }
+
+  @Override
+  protected JComponent createCenterPanel() {
+    return myPanel;
+  }
+
+  @Override
+  protected void doOKAction() {
+    if (myCreateNewKeyRadioButton.isSelected()) {
+      try {
+        myNewKeyForm.createKey();
+      }
+      catch (CommitStepException e) {
+        Messages.showErrorDialog(myPanel, e.getMessage(), CommonBundle.getErrorTitle());
+        return;
+      }
+    }
+    super.doOKAction();
+  }
+
+  @Nullable
+  public String getChosenKey() {
+    return myUseExistingKeyRadioButton.isSelected()
+           ? (String)myKeyCombo.getSelectedItem()
+           : myNewKeyForm.getKeyAlias();
+  }
+
+  @Nullable
+  public char[] getChosenKeyPassword() {
+    return myCreateNewKeyRadioButton.isSelected()
+           ? myNewKeyForm.getKeyPassword()
+           : null;
+  }
+
+  private class MyNewKeyForm extends NewKeyForm {
+    @Override
+    protected List<String> getExistingKeyAliasList() {
+      return myExistingKeys;
+    }
+
+    @NotNull
+    @Override
+    protected Project getProject() {
+      return myProject;
+    }
+
+    @NotNull
+    @Override
+    protected char[] getKeyStorePassword() {
+      return myKeyStorePassword;
+    }
+
+    @NotNull
+    @Override
+    protected String getKeyStoreLocation() {
+      return myKeyStorePath;
+    }
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.form b/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.form
new file mode 100644
index 000000000000..ade0f50564b1
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.form
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.compiler.artifact.NewKeyStoreDialog">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+    <margin top="0" left="0" bottom="0" right="0"/>
+    <constraints>
+      <xy x="20" y="20" width="507" height="400"/>
+    </constraints>
+    <properties/>
+    <border type="none"/>
+    <children>
+      <component id="61ec4" class="com.intellij.ui.components.JBLabel">
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <labelFor value="decbb"/>
+          <text value="&amp;Key store path:"/>
+        </properties>
+      </component>
+      <vspacer id="a56a5">
+        <constraints>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+        </constraints>
+      </vspacer>
+      <component id="decbb" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myKeyStorePathField">
+        <constraints>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
+      <grid id="1d308" binding="myNewKeyPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <clientProperties>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
+        </clientProperties>
+        <border type="etched" title="Key"/>
+        <children/>
+      </grid>
+      <component id="f7c78" class="com.intellij.ui.components.JBLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <labelFor value="75dcc"/>
+          <text value="&amp;Password:"/>
+        </properties>
+      </component>
+      <component id="75dcc" class="javax.swing.JPasswordField" binding="myPasswordField">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="aa6ed" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <labelFor value="bffd5"/>
+          <text value="Co&amp;nfirm password:"/>
+        </properties>
+      </component>
+      <component id="bffd5" class="javax.swing.JPasswordField" binding="myConfirmedPassword">
+        <constraints>
+          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
+        </constraints>
+        <properties/>
+      </component>
+    </children>
+  </grid>
+</form>
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.java
new file mode 100644
index 000000000000..7ea7ae3a88be
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.java
@@ -0,0 +1,124 @@
+package org.jetbrains.android.compiler.artifact;
+
+import com.intellij.CommonBundle;
+import com.intellij.ide.wizard.CommitStepException;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.ui.TextFieldWithBrowseButton;
+import org.jetbrains.android.exportSignedPackage.NewKeyForm;
+import org.jetbrains.android.util.AndroidBundle;
+import org.jetbrains.android.util.AndroidUtils;
+import org.jetbrains.android.util.SaveFileListener;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public class NewKeyStoreDialog extends DialogWrapper {
+  private JPanel myNewKeyPanel;
+  private JPanel myPanel;
+  private TextFieldWithBrowseButton myKeyStorePathField;
+  private JPasswordField myPasswordField;
+  private JPasswordField myConfirmedPassword;
+
+  private final NewKeyForm myNewKeyForm;
+  private final Project myProject;
+
+  public NewKeyStoreDialog(@NotNull Project project, @NotNull String defaultKeyStorePath) {
+    super(project);
+    myProject = project;
+    myKeyStorePathField.setText(defaultKeyStorePath);
+    setTitle("Create New Key Store");
+    myNewKeyForm = new MyNewKeyForm();
+    myNewKeyPanel.add(myNewKeyForm.getContentPanel(), BorderLayout.CENTER);
+
+    myKeyStorePathField.addActionListener(new SaveFileListener(myPanel, myKeyStorePathField, AndroidBundle.message(
+      "android.extract.package.choose.keystore.title")) {
+      @Override
+      protected String getDefaultLocation() {
+        return getKeyStorePath();
+      }
+    });
+    init();
+  }
+
+  @Override
+  protected JComponent createCenterPanel() {
+    return myPanel;
+  }
+
+  @Override
+  public JComponent getPreferredFocusedComponent() {
+    return myKeyStorePathField;
+  }
+
+  @Override
+  protected void doOKAction() {
+    if (getKeyStorePath().length() == 0) {
+      Messages.showErrorDialog(myPanel, "Specify key store path", CommonBundle.getErrorTitle());
+      return;
+    }
+
+    try {
+      AndroidUtils.checkNewPassword(myPasswordField, myConfirmedPassword);
+      myNewKeyForm.createKey();
+    }
+    catch (CommitStepException e) {
+      Messages.showErrorDialog(myPanel, e.getMessage(), CommonBundle.getErrorTitle());
+      return;
+    }
+    super.doOKAction();
+  }
+
+  @NotNull
+  public String getKeyStorePath() {
+    return myKeyStorePathField.getText().trim();
+  }
+
+  @NotNull
+  public char[] getKeyStorePassword() {
+    return myPasswordField.getPassword();
+  }
+
+  @NotNull
+  public String getKeyAlias() {
+    return myNewKeyForm.getKeyAlias();
+  }
+
+  @NotNull
+  public char[] getKeyPassword() {
+    return myNewKeyForm.getKeyPassword();
+  }
+
+  private class MyNewKeyForm extends NewKeyForm {
+
+    @Override
+    protected List<String> getExistingKeyAliasList() {
+      return Collections.emptyList();
+    }
+
+    @NotNull
+    @Override
+    protected Project getProject() {
+      return myProject;
+    }
+
+    @NotNull
+    @Override
+    protected char[] getKeyStorePassword() {
+      return NewKeyStoreDialog.this.getKeyStorePassword();
+    }
+
+    @NotNull
+    @Override
+    protected String getKeyStoreLocation() {
+      return getKeyStorePath();
+    }
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java
index 06547b1bd90b..6c25426a7b9e 100644
--- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.android.exportSignedPackage;
 
-import com.android.jarutils.SignedJarBuilder;
 import com.android.sdklib.SdkConstants;
 import com.intellij.CommonBundle;
 import com.intellij.execution.ExecutionException;
@@ -50,7 +49,6 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.components.JBLabel;
 import org.jetbrains.android.compiler.AndroidCompileUtil;
-import org.jetbrains.android.compiler.AndroidPackagingCompiler;
 import org.jetbrains.android.compiler.AndroidProguardCompiler;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.facet.AndroidFacetConfiguration;
@@ -58,7 +56,6 @@ import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.android.sdk.AndroidPlatform;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.android.util.AndroidCommonUtils;
-import org.jetbrains.android.util.SafeSignedJarBuilder;
 import org.jetbrains.android.util.SaveFileListener;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -68,12 +65,8 @@ import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.security.PrivateKey;
-import java.security.cert.X509Certificate;
 
 /**
  * @author Eugene.Kudelevsky
@@ -110,7 +103,7 @@ class ApkStep extends ExportSignedPackageWizardStep {
     myWizard = wizard;
     myApkPathLabel.setLabelFor(myApkPathField);
     myProguardConfigFilePathLabel.setLabelFor(myProguardConfigFilePathField);
-    
+
     myApkPathField.getButton().addActionListener(
       new SaveFileListener(myContentPanel, myApkPathField, AndroidBundle.message("android.extract.package.choose.dest.apk")) {
         @Override
@@ -140,7 +133,7 @@ class ApkStep extends ExportSignedPackageWizardStep {
         }
       }
     });
-    
+
     myProguardCheckBox.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
@@ -193,7 +186,7 @@ class ApkStep extends ExportSignedPackageWizardStep {
     myIncludeSystemProguardFileCheckBox.setVisible(AndroidCommonUtils.isIncludingInProguardSupported(sdkToolsRevision));
 
     final String proguardCfgPath = properties.getValue(PROGUARD_CFG_PATH_PROPERTY);
-    if (proguardCfgPath != null && 
+    if (proguardCfgPath != null &&
         LocalFileSystem.getInstance().refreshAndFindFileByPath(proguardCfgPath) != null) {
       myProguardConfigFilePathField.setText(FileUtil.toSystemDependentName(proguardCfgPath));
       final String includeSystemProguardFile = properties.getValue(INCLUDE_SYSTEM_PROGUARD_FILE_PROPERTY);
@@ -274,35 +267,11 @@ class ApkStep extends ExportSignedPackageWizardStep {
 
   @SuppressWarnings({"IOResourceOpenedButNotSafelyClosed"})
   private void createApk(File destFile) throws IOException, GeneralSecurityException {
-    final String srcApkPath = AndroidRootUtil.getApkPath(myWizard.getFacet()) + AndroidPackagingCompiler.UNSIGNED_SUFFIX;
+    final String srcApkPath = AndroidCompileUtil.getUnsignedApkPath(myWizard.getFacet());
     final File srcApk = new File(FileUtil.toSystemDependentName(srcApkPath));
 
     if (myWizard.isSigned()) {
-      FileOutputStream fos = new FileOutputStream(destFile);
-      PrivateKey privateKey = myWizard.getPrivateKey();
-      assert privateKey != null;
-      X509Certificate certificate = myWizard.getCertificate();
-      assert certificate != null;
-      SignedJarBuilder builder = new SafeSignedJarBuilder(fos, privateKey, certificate, destFile.getPath());
-      FileInputStream fis = new FileInputStream(srcApk);
-      try {
-        builder.writeZip(fis, null);
-        builder.close();
-      }
-      finally {
-        try {
-          fis.close();
-        }
-        catch (IOException ignored) {
-        }
-        finally {
-          try {
-            fos.close();
-          }
-          catch (IOException ignored) {
-          }
-        }
-      }
+      AndroidCommonUtils.signApk(srcApk, destFile, myWizard.getPrivateKey(), myWizard.getCertificate());
     }
     else {
       FileUtil.copy(srcApk, destFile);
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ExportSignedPackageWizardStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ExportSignedPackageWizardStep.java
index 8e542c7a8feb..a676bb78f1cb 100644
--- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ExportSignedPackageWizardStep.java
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ExportSignedPackageWizardStep.java
@@ -18,11 +18,9 @@ package org.jetbrains.android.exportSignedPackage;
 
 import com.intellij.ide.wizard.CommitStepException;
 import com.intellij.ide.wizard.StepAdapter;
-import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.util.Arrays;
 
 /**
  * @author Eugene.Kudelevsky
@@ -44,42 +42,8 @@ public abstract class ExportSignedPackageWizardStep extends StepAdapter {
 
   public abstract String getHelpId();
 
-  protected static void checkNewPassword(JPasswordField passwordField, JPasswordField confirmedPasswordField) throws CommitStepException {
-    char[] password = passwordField.getPassword();
-    char[] confirmedPassword = confirmedPasswordField.getPassword();
-    try {
-      checkPassword(password);
-      if (password.length < 6) {
-        throw new CommitStepException(AndroidBundle.message("android.export.package.incorrect.password.length"));
-      }
-      if (!Arrays.equals(password, confirmedPassword)) {
-        throw new CommitStepException(AndroidBundle.message("android.export.package.passwords.not.match.error"));
-      }
-    }
-    finally {
-      Arrays.fill(password, '\0');
-      Arrays.fill(confirmedPassword, '\0');
-    }
-  }
-
   protected abstract void commitForNext() throws CommitStepException;
 
-  protected static void checkPassword(char[] password) throws CommitStepException {
-    if (password.length == 0) {
-        throw new CommitStepException(AndroidBundle.message("android.export.package.specify.password.error"));
-      }
-  }
-
-  protected static void checkPassword(JPasswordField passwordField) throws CommitStepException {
-    char[] password = passwordField.getPassword();
-    try {
-      checkPassword(password);
-    }
-    finally {
-      Arrays.fill(password, '\0');
-    }
-  }
-
   @Override
   public Icon getIcon() {
     return null;
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/InitialKeyStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/InitialKeyStep.java
index fc9e6de8540b..9a20ae2b17e0 100644
--- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/InitialKeyStep.java
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/InitialKeyStep.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.ui.CollectionComboBoxModel;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.android.util.AndroidBundle;
+import org.jetbrains.android.util.AndroidUtils;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -132,7 +133,7 @@ class InitialKeyStep extends ExportSignedPackageWizardStep {
         if (myAliasCombo.getSelectedItem() == null) {
           throw new CommitStepException(AndroidBundle.message("android.extract.package.select.key.alias.error"));
         }
-        checkPassword(password);
+        AndroidUtils.checkPassword(password);
         String alias = (String)myAliasCombo.getSelectedItem();
         loadKey(alias, password);
       }
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/KeystoreStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/KeystoreStep.java
index 1cd022ce4fad..f5a8cc6b02bb 100644
--- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/KeystoreStep.java
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/KeystoreStep.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.android.util.AndroidBundle;
+import org.jetbrains.android.util.AndroidUtils;
 import org.jetbrains.android.util.SaveFileListener;
 import org.jetbrains.annotations.Nullable;
 
@@ -102,7 +103,7 @@ class KeystoreStep extends ExportSignedPackageWizardStep {
   private KeyStore checkExistingKeystoreOptionsAndCreateKeystore(File keystoreFile) throws CommitStepException {
     char[] password = myKeystorePasswordField.getPassword();
     FileInputStream fis = null;
-    checkPassword(password);
+    AndroidUtils.checkPassword(password);
     if (!keystoreFile.isFile()) {
       throw new CommitStepException(AndroidBundle.message("android.cannot.find.file.error", keystoreFile.getPath()));
     }
@@ -129,7 +130,7 @@ class KeystoreStep extends ExportSignedPackageWizardStep {
   }
 
   private void checkNewKeystoreOptions(File keystoreFile) throws CommitStepException {
-    checkNewPassword(myKeystorePasswordField, myConfirmKeystorePasswordField);
+    AndroidUtils.checkNewPassword(myKeystorePasswordField, myConfirmKeystorePasswordField);
 
     if (keystoreFile.exists()) {
       throw new CommitStepException(AndroidBundle.message(
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyStep.form b/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyForm.form
similarity index 99%
rename from plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyStep.form
rename to plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyForm.form
index 74c03cda9970..a9cef39e58cb 100644
--- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyStep.form
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyForm.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.exportSignedPackage.NewKeyStep">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.exportSignedPackage.NewKeyForm">
   <grid id="27dc6" binding="myContentPanel" layout-manager="GridLayoutManager" row-count="5" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
@@ -71,7 +71,7 @@
           <grid row="3" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
-        <border type="etched"/>
+        <border type="etched" title="Certificate"/>
         <children>
           <component id="7b983" class="javax.swing.JLabel">
             <constraints>
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyForm.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyForm.java
new file mode 100644
index 000000000000..18558faf89f9
--- /dev/null
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyForm.java
@@ -0,0 +1,270 @@
+package org.jetbrains.android.exportSignedPackage;
+
+import com.android.jarutils.DebugKeyProvider;
+import com.android.jarutils.KeystoreHelper;
+import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.ide.wizard.CommitStepException;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
+import org.jetbrains.android.util.AndroidBundle;
+import org.jetbrains.android.util.AndroidUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import java.awt.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.security.KeyStore;
+import java.security.PrivateKey;
+import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Eugene.Kudelevsky
+ */
+public abstract class NewKeyForm {
+  private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.exportSignedPackage.NewKeyForm");
+
+  private JPanel myContentPanel;
+  private JTextField myAliasField;
+  private JPasswordField myKeyPasswordField;
+  private JPasswordField myConfirmKeyPasswordField;
+  private JSpinner myValiditySpinner;
+  private JTextField myFirstAndLastNameField;
+  private JTextField myOrganizationUnitField;
+  private JTextField myCityField;
+  private JTextField myStateOrProvinceField;
+  private JTextField myCountryCodeField;
+  private JPanel myCertificatePanel;
+  private JTextField myOrganizationField;
+
+  private KeyStore myKeyStore;
+  private PrivateKey myPrivateKey;
+  private X509Certificate myCertificate;
+
+  public NewKeyForm() {
+    myValiditySpinner.setModel(new SpinnerNumberModel(25, 1, 1000, 1));
+  }
+
+  private int getValidity() {
+    SpinnerNumberModel model = (SpinnerNumberModel)myValiditySpinner.getModel();
+    return model.getNumber().intValue();
+  }
+
+  public void init() {
+    myAliasField.setText(generateAlias());
+  }
+
+  public JPanel getContentPanel() {
+    return myContentPanel;
+  }
+
+  private boolean findNonEmptyCertificateField() {
+    for (Component component : myCertificatePanel.getComponents()) {
+      if (component instanceof JTextField) {
+        if (((JTextField)component).getText().trim().length() > 0) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  public void createKey() throws CommitStepException {
+    if (getKeyAlias().length() == 0) {
+      throw new CommitStepException(AndroidBundle.message("android.export.package.specify.key.alias.error"));
+    }
+    AndroidUtils.checkNewPassword(myKeyPasswordField, myConfirmKeyPasswordField);
+    if (!findNonEmptyCertificateField()) {
+      throw new CommitStepException(AndroidBundle.message("android.export.package.specify.certificate.field.error"));
+    }
+    doCreateKey();
+  }
+
+  @NotNull
+  private String generateAlias() {
+    List<String> aliasList = getExistingKeyAliasList();
+    String prefix = "key";
+    if (aliasList == null) {
+      return prefix + '0';
+    }
+    Set<String> aliasSet = new HashSet<String>();
+    for (String alias : aliasList) {
+      aliasSet.add(alias.toLowerCase());
+    }
+    for (int i = 0; ; i++) {
+      String alias = prefix + i;
+      if (!aliasSet.contains(alias)) {
+        return alias;
+      }
+    }
+  }
+
+  @Nullable
+  protected abstract List<String> getExistingKeyAliasList();
+
+  private static void buildDName(StringBuilder builder, String prefix, JTextField textField) {
+    if (textField != null) {
+      String value = textField.getText().trim();
+      if (value.length() > 0) {
+        if (builder.length() > 0) {
+          builder.append(",");
+        }
+        builder.append(prefix);
+        builder.append('=');
+        builder.append(value);
+      }
+    }
+  }
+
+  private String getDName() {
+    StringBuilder builder = new StringBuilder();
+    buildDName(builder, "CN", myFirstAndLastNameField);
+    buildDName(builder, "OU", myOrganizationUnitField);
+    buildDName(builder, "O", myOrganizationField);
+    buildDName(builder, "L", myCityField);
+    buildDName(builder, "ST", myStateOrProvinceField);
+    buildDName(builder, "C", myCountryCodeField);
+    return builder.toString();
+  }
+
+
+
+  private void doCreateKey() throws CommitStepException {
+    String keystoreLocation = getKeyStoreLocation();
+    char[] keystorePassword = getKeyStorePassword();
+    char[] keyPassword = getKeyPassword();
+    String keyAlias = getKeyAlias();
+    String dname = getDName();
+    assert dname != null;
+    boolean createdStore = false;
+    final StringBuilder errorBuilder = new StringBuilder();
+    final StringBuilder outBuilder = new StringBuilder();
+    try {
+      createdStore = KeystoreHelper
+        .createNewStore(keystoreLocation, null, new String(keystorePassword), keyAlias, new String(keyPassword), dname, getValidity(),
+                        new DebugKeyProvider.IKeyGenOutput() {
+                          public void err(String message) {
+                            errorBuilder.append(message).append('\n');
+                            LOG.info("Error: " + message);
+                          }
+
+                          public void out(String message) {
+                            outBuilder.append(message).append('\n');
+                            LOG.info(message);
+                          }
+                        });
+    }
+    catch (Exception e) {
+      LOG.info(e);
+      errorBuilder.append(e.getMessage()).append('\n');
+    }
+    normalizeBuilder(errorBuilder);
+    normalizeBuilder(outBuilder);
+    try {
+      if (createdStore) {
+        if (errorBuilder.length() > 0) {
+          String prefix = AndroidBundle.message("android.create.new.key.error.prefix");
+          Messages.showErrorDialog(myContentPanel, prefix + '\n' + errorBuilder.toString());
+        }
+      }
+      else {
+        if (errorBuilder.length() > 0) {
+          throw new CommitStepException(errorBuilder.toString());
+        }
+        if (outBuilder.length() > 0) {
+          throw new CommitStepException(outBuilder.toString());
+        }
+        throw new CommitStepException(AndroidBundle.message("android.cannot.create.new.key.error"));
+      }
+      PropertiesComponent.getInstance(getProject()).setValue(KeystoreStep.DEFAULT_KEYSTORE_LOCATION, keystoreLocation);
+      loadKeystoreAndKey(keystoreLocation, keystorePassword, keyAlias, keyPassword);
+    }
+    finally {
+      Arrays.fill(keystorePassword, '\0');
+      Arrays.fill(keyPassword, '\0');
+    }
+  }
+
+  @NotNull
+  public char[] getKeyPassword() {
+    return myKeyPasswordField.getPassword();
+  }
+
+  @NotNull
+  public String getKeyAlias() {
+    return myAliasField.getText().trim();
+  }
+
+  @NotNull
+  protected abstract Project getProject();
+
+  @NotNull
+  protected abstract char[] getKeyStorePassword();
+
+  @NotNull
+  protected abstract String getKeyStoreLocation();
+
+  private void loadKeystoreAndKey(String keystoreLocation, char[] keystorePassword, String keyAlias, char[] keyPassword)
+    throws CommitStepException {
+    FileInputStream fis = null;
+    try {
+      KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+      fis = new FileInputStream(new File(keystoreLocation));
+      keyStore.load(fis, keystorePassword);
+      myKeyStore = keyStore;
+      KeyStore.PrivateKeyEntry entry = (KeyStore.PrivateKeyEntry)keyStore.getEntry(keyAlias, new KeyStore.PasswordProtection(keyPassword));
+      if (entry == null) {
+        throw new CommitStepException(AndroidBundle.message("android.extract.package.cannot.find.key.error", keyAlias));
+      }
+      PrivateKey privateKey = entry.getPrivateKey();
+      Certificate certificate = entry.getCertificate();
+      if (privateKey == null || certificate == null) {
+        throw new CommitStepException(AndroidBundle.message("android.extract.package.cannot.find.key.error", keyAlias));
+      }
+      PropertiesComponent.getInstance(getProject()).setValue(InitialKeyStep.DEFAULT_KEY_ALIAS, keyAlias);
+      myPrivateKey = privateKey;
+      myCertificate = (X509Certificate)certificate;
+    }
+    catch (Exception e) {
+      throw new CommitStepException("Error: " + e.getMessage());
+    }
+    finally {
+      if (fis != null) {
+        try {
+          fis.close();
+        }
+        catch (IOException ignored) {
+        }
+      }
+    }
+  }
+
+  private static void normalizeBuilder(StringBuilder builder) {
+    if (builder.length() > 0) {
+      builder.deleteCharAt(builder.length() - 1);
+    }
+  }
+
+  @Nullable
+  public KeyStore getKeyStore() {
+    return myKeyStore;
+  }
+
+  @Nullable
+  public PrivateKey getPrivateKey() {
+    return myPrivateKey;
+  }
+
+  @Nullable
+  public X509Certificate getCertificate() {
+    return myCertificate;
+  }
+}
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyStep.java
index bb4887969ae8..dcfb4d96f0fe 100644
--- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyStep.java
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/NewKeyStep.java
@@ -16,79 +16,37 @@
 
 package org.jetbrains.android.exportSignedPackage;
 
-import com.android.jarutils.DebugKeyProvider;
-import com.android.jarutils.KeystoreHelper;
-import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.ide.wizard.CommitStepException;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.ui.Messages;
-import org.jetbrains.android.util.AndroidBundle;
+import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.awt.*;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.security.KeyStore;
 import java.security.PrivateKey;
-import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @author Eugene.Kudelevsky
  */
 public class NewKeyStep extends ExportSignedPackageWizardStep {
-  private static final Logger LOG = Logger.getInstance("#com.jetbrains.android.exportSignedPackage.NewKeyStep");
-
-  private JPanel myContentPanel;
-  private JTextField myAliasField;
-  private JPasswordField myKeyPasswordField;
-  private JPasswordField myConfirmKeyPasswordField;
-  private JSpinner myValiditySpinner;
-  private JTextField myFirstAndLastNameField;
-  private JTextField myOrganizationUnitField;
-  private JTextField myCityField;
-  private JTextField myStateOrProvinceField;
-  private JTextField myCountryCodeField;
-  private JPanel myCertificatePanel;
-  private JTextField myOrganizationField;
 
   private final ExportSignedPackageWizard myWizard;
+  private final NewKeyForm myNewKeyForm;
 
   public NewKeyStep(ExportSignedPackageWizard wizard) {
     myWizard = wizard;
-    myValiditySpinner.setModel(new SpinnerNumberModel(25, 1, 1000, 1));
-  }
-
-  private int getValidity() {
-    SpinnerNumberModel model = (SpinnerNumberModel)myValiditySpinner.getModel();
-    return model.getNumber().intValue();
+    myNewKeyForm = new MyNewKeyForm();
   }
 
   @Override
   public void _init() {
-    myAliasField.setText(generateAlias());
+    myNewKeyForm.init();
   }
 
   @Override
   public JComponent getComponent() {
-    return myContentPanel;
-  }
-
-  private boolean findNonEmptyCertificateField() {
-    for (Component component : myCertificatePanel.getComponents()) {
-      if (component instanceof JTextField) {
-        if (((JTextField)component).getText().trim().length() > 0) {
-          return true;
-        }
-      }
-    }
-    return false;
+    return myNewKeyForm.getContentPanel();
   }
 
   @Override
@@ -98,157 +56,42 @@ public class NewKeyStep extends ExportSignedPackageWizardStep {
 
   @Override
   protected void commitForNext() throws CommitStepException {
-    if (myAliasField.getText().trim().length() == 0) {
-      throw new CommitStepException(AndroidBundle.message("android.export.package.specify.key.alias.error"));
-    }
-    checkNewPassword(myKeyPasswordField, myConfirmKeyPasswordField);
-    if (!findNonEmptyCertificateField()) {
-      throw new CommitStepException(AndroidBundle.message("android.export.package.specify.certificate.field.error"));
-    }
-    createKey();
+    myNewKeyForm.createKey();
+    final KeyStore keyStore = myNewKeyForm.getKeyStore();
+    final PrivateKey privateKey = myNewKeyForm.getPrivateKey();
+    final X509Certificate certificate = myNewKeyForm.getCertificate();
+    assert keyStore != null && privateKey != null && certificate != null;
+    myWizard.setKeystore(keyStore);
+    myWizard.setPrivateKey(privateKey);
+    myWizard.setCertificate(certificate);
   }
 
-  @NotNull
-  private String generateAlias() {
-    List<String> aliasList = myWizard.getKeyAliasList();
-    String prefix = "key";
-    if (aliasList == null) {
-      return prefix + '0';
+  private class MyNewKeyForm extends NewKeyForm {
+    @Override
+    protected List<String> getExistingKeyAliasList() {
+      return myWizard.getKeyAliasList();
     }
-    Set<String> aliasSet = new HashSet<String>();
-    for (String alias : aliasList) {
-      aliasSet.add(alias.toLowerCase());
-    }
-    for (int i = 0; ; i++) {
-      String alias = prefix + i;
-      if (!aliasSet.contains(alias)) {
-        return alias;
-      }
-    }
-  }
 
-  private static void buildDName(StringBuilder builder, String prefix, JTextField textField) {
-    if (textField != null) {
-      String value = textField.getText().trim();
-      if (value.length() > 0) {
-        if (builder.length() > 0) {
-          builder.append(",");
-        }
-        builder.append(prefix);
-        builder.append('=');
-        builder.append(value);
-      }
+    @NotNull
+    @Override
+    protected String getKeyStoreLocation() {
+      final String location = myWizard.getKeystoreLocation();
+      assert location != null;
+      return location;
     }
-  }
 
-  private String getDName() {
-    StringBuilder builder = new StringBuilder();
-    buildDName(builder, "CN", myFirstAndLastNameField);
-    buildDName(builder, "OU", myOrganizationUnitField);
-    buildDName(builder, "O", myOrganizationField);
-    buildDName(builder, "L", myCityField);
-    buildDName(builder, "ST", myStateOrProvinceField);
-    buildDName(builder, "C", myCountryCodeField);
-    return builder.toString();
-  }
+    @NotNull
+    @Override
+    protected char[] getKeyStorePassword() {
+      final char[] password = myWizard.getKeystorePassword();
+      assert password != null;
+      return password;
+    }
 
-  private void createKey() throws CommitStepException {
-    String keystoreLocation = myWizard.getKeystoreLocation();
-    assert keystoreLocation != null;
-    char[] keystorePassword = myWizard.getKeystorePassword();
-    assert keystorePassword != null;
-    char[] keyPassword = myKeyPasswordField.getPassword();
-    String keyAlias = myAliasField.getText().trim();
-    String dname = getDName();
-    assert dname != null;
-    boolean createdStore = false;
-    final StringBuilder errorBuilder = new StringBuilder();
-    final StringBuilder outBuilder = new StringBuilder();
-    try {
-      createdStore = KeystoreHelper
-        .createNewStore(keystoreLocation, null, new String(keystorePassword), keyAlias, new String(keyPassword), dname, getValidity(),
-                        new DebugKeyProvider.IKeyGenOutput() {
-                          public void err(String message) {
-                            errorBuilder.append(message).append('\n');
-                            LOG.info("Error: " + message);
-                          }
-
-                          public void out(String message) {
-                            outBuilder.append(message).append('\n');
-                            LOG.info(message);
-                          }
-                        });
-    }
-    catch (Exception e) {
-      LOG.info(e);
-      errorBuilder.append(e.getMessage()).append('\n');
-    }
-    normalizeBuilder(errorBuilder);
-    normalizeBuilder(outBuilder);
-    try {
-      if (createdStore) {
-        if (errorBuilder.length() > 0) {
-          String prefix = AndroidBundle.message("android.create.new.key.error.prefix");
-          Messages.showErrorDialog(myContentPanel, prefix + '\n' + errorBuilder.toString());
-        }
-      }
-      else {
-        if (errorBuilder.length() > 0) {
-          throw new CommitStepException(errorBuilder.toString());
-        }
-        if (outBuilder.length() > 0) {
-          throw new CommitStepException(outBuilder.toString());
-        }
-        throw new CommitStepException(AndroidBundle.message("android.cannot.create.new.key.error"));
-      }
-      PropertiesComponent.getInstance(myWizard.getProject()).setValue(KeystoreStep.DEFAULT_KEYSTORE_LOCATION, keystoreLocation);
-      loadKeystoreAndKey(keystoreLocation, keystorePassword, keyAlias, keyPassword);
-    }
-    finally {
-      Arrays.fill(keystorePassword, '\0');
-      Arrays.fill(keyPassword, '\0');
-    }
-  }
-
-  private void loadKeystoreAndKey(String keystoreLocation, char[] keystorePassword, String keyAlias, char[] keyPassword)
-    throws CommitStepException {
-    FileInputStream fis = null;
-    try {
-      KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-      fis = new FileInputStream(new File(keystoreLocation));
-      keyStore.load(fis, keystorePassword);
-      myWizard.setKeystore(keyStore);
-      KeyStore.PrivateKeyEntry entry = (KeyStore.PrivateKeyEntry)keyStore.getEntry(keyAlias, new KeyStore.PasswordProtection(keyPassword));
-      if (entry == null) {
-        throw new CommitStepException(AndroidBundle.message("android.extract.package.cannot.find.key.error", keyAlias));
-      }
-      PrivateKey privateKey = entry.getPrivateKey();
-      Certificate certificate = entry.getCertificate();
-      if (privateKey == null || certificate == null) {
-        throw new CommitStepException(AndroidBundle.message("android.extract.package.cannot.find.key.error", keyAlias));
-      }
-      PropertiesComponent.getInstance(myWizard.getProject()).setValue(InitialKeyStep.DEFAULT_KEY_ALIAS, keyAlias);
-      myWizard.setPrivateKey(privateKey);
-      myWizard.setCertificate((X509Certificate)certificate);
-
-    }
-    catch (Exception e) {
-      throw new CommitStepException("Error: " + e.getMessage());
-    }
-    finally {
-      if (fis != null) {
-        try {
-          fis.close();
-        }
-        catch (IOException ignored) {
-        }
-      }
-    }
-  }
-
-  private static void normalizeBuilder(StringBuilder builder) {
-    if (builder.length() > 0) {
-      builder.deleteCharAt(builder.length() - 1);
+    @NotNull
+    @Override
+    protected Project getProject() {
+      return myWizard.getProject();
     }
   }
 }
diff --git a/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java b/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java
index 2dc112b8b14d..9cf55702bbe1 100644
--- a/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java
+++ b/plugins/android/src/org/jetbrains/android/util/AndroidUtils.java
@@ -37,6 +37,7 @@ import com.intellij.facet.FacetManager;
 import com.intellij.facet.ModifiableFacetModel;
 import com.intellij.facet.ProjectFacetManager;
 import com.intellij.ide.util.DefaultPsiElementCellRenderer;
+import com.intellij.ide.wizard.CommitStepException;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
@@ -85,10 +86,7 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author yole, coyote
@@ -714,4 +712,47 @@ public class AndroidUtils {
     }
     return result;
   }
+
+  public static void checkNewPassword(JPasswordField passwordField, JPasswordField confirmedPasswordField) throws CommitStepException {
+    char[] password = passwordField.getPassword();
+    char[] confirmedPassword = confirmedPasswordField.getPassword();
+    try {
+      checkPassword(password);
+      if (password.length < 6) {
+        throw new CommitStepException(AndroidBundle.message("android.export.package.incorrect.password.length"));
+      }
+      if (!Arrays.equals(password, confirmedPassword)) {
+        throw new CommitStepException(AndroidBundle.message("android.export.package.passwords.not.match.error"));
+      }
+    }
+    finally {
+      Arrays.fill(password, '\0');
+      Arrays.fill(confirmedPassword, '\0');
+    }
+  }
+
+  public static void checkPassword(char[] password) throws CommitStepException {
+    if (password.length == 0) {
+        throw new CommitStepException(AndroidBundle.message("android.export.package.specify.password.error"));
+      }
+  }
+
+  public static void checkPassword(JPasswordField passwordField) throws CommitStepException {
+    char[] password = passwordField.getPassword();
+    try {
+      checkPassword(password);
+    }
+    finally {
+      Arrays.fill(password, '\0');
+    }
+  }
+
+  @NotNull
+  public static <T> List<T> toList(@NotNull Enumeration<T> enumeration) {
+    final List<T> result = new ArrayList<T>();
+    while (enumeration.hasMoreElements()) {
+      result.add(enumeration.nextElement());
+    }
+    return result;
+  }
 }

From 71ef09d921a5afdbed35a9152f9b89c53101864d Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@jetbrains.com>
Date: Mon, 4 Jun 2012 19:18:35 +0400
Subject: [PATCH 171/239] fix Mac Full Screen support loading in dev mode on
 old JDKs

---
 .../ui/mac/MacFullScreenListener.java         | 72 +++++++++++++++++++
 .../ui/mac/MacMainFrameDecorator.java         | 50 +++----------
 2 files changed, 80 insertions(+), 42 deletions(-)
 create mode 100644 platform/platform-impl/src/com/intellij/ui/mac/MacFullScreenListener.java

diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacFullScreenListener.java b/platform/platform-impl/src/com/intellij/ui/mac/MacFullScreenListener.java
new file mode 100644
index 000000000000..d92a4690be18
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ui/mac/MacFullScreenListener.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.ui.mac;
+
+import com.apple.eawt.AppEvent;
+import com.apple.eawt.FullScreenAdapter;
+import com.intellij.Patches;
+import com.intellij.openapi.wm.impl.IdeFrameImpl;
+
+import javax.swing.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+public class MacFullScreenListener extends FullScreenAdapter {
+  private final MacMainFrameDecorator myDecorator;
+  private final IdeFrameImpl myFrame;
+
+  public MacFullScreenListener(final MacMainFrameDecorator decorator,
+                               final IdeFrameImpl frame) {
+    myDecorator = decorator;
+    myFrame = frame;
+  }
+
+  @Override
+  public void windowEnteredFullScreen(AppEvent.FullScreenEvent event) {
+    myDecorator.setInFullScreen(true);
+
+    JRootPane rootPane = myFrame.getRootPane();
+    if (rootPane != null) rootPane.putClientProperty(MacMainFrameDecorator.FULL_SCREEN, Boolean.TRUE);
+    if (Patches.APPLE_BUG_ID_10207064) {
+      // fix problem with bottom empty bar
+      // it seems like the title is still visible in fullscreen but the window itself shifted up for titlebar height
+      // and the size of the frame is still calculated to be the height of the screen which is wrong
+      // so just add these titlebar height to the frame height once again
+      Timer timer = new Timer(300, new ActionListener() {
+        @Override
+        public void actionPerformed(ActionEvent e) {
+          SwingUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+              myFrame.setSize(myFrame.getWidth(), myFrame.getHeight() + myFrame.getInsets().top);
+            }
+          });
+        }
+      });
+      timer.setRepeats(false);
+      timer.start();
+    }
+  }
+
+  @Override
+  public void windowExitedFullScreen(AppEvent.FullScreenEvent event) {
+    myDecorator.setInFullScreen(false);
+    myFrame.storeFullScreenStateIfNeeded(false);
+
+    JRootPane rootPane = myFrame.getRootPane();
+    if (rootPane != null) rootPane.putClientProperty(MacMainFrameDecorator.FULL_SCREEN, null);
+  }
+}
diff --git a/platform/platform-impl/src/com/intellij/ui/mac/MacMainFrameDecorator.java b/platform/platform-impl/src/com/intellij/ui/mac/MacMainFrameDecorator.java
index fe295604c47b..46d4b8f1836c 100644
--- a/platform/platform-impl/src/com/intellij/ui/mac/MacMainFrameDecorator.java
+++ b/platform/platform-impl/src/com/intellij/ui/mac/MacMainFrameDecorator.java
@@ -15,9 +15,6 @@
  */
 package com.intellij.ui.mac;
 
-import com.apple.eawt.AppEvent;
-import com.apple.eawt.FullScreenAdapter;
-import com.apple.eawt.FullScreenUtilities;
 import com.intellij.Patches;
 import com.intellij.ide.ui.UISettings;
 import com.intellij.ide.ui.UISettingsListener;
@@ -36,8 +33,6 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -150,43 +145,10 @@ public class MacMainFrameDecorator implements UISettingsListener, Disposable {
       if (SystemInfo.isMacOSLion) {
         if (!FULL_SCREEN_AVAILABLE) return;
 
-        FullScreenUtilities.addFullScreenListenerTo(frame, new FullScreenAdapter() {
-          @Override
-          public void windowEnteredFullScreen(AppEvent.FullScreenEvent event) {
-            myInFullScreen = true;
-
-            JRootPane rootPane = frame.getRootPane();
-            if (rootPane != null) rootPane.putClientProperty(FULL_SCREEN, Boolean.TRUE);
-            if (Patches.APPLE_BUG_ID_10207064) {
-              // fix problem with bottom empty bar
-              // it seems like the title is still visible in fullscreen but the window itself shifted up for titlebar height
-              // and the size of the frame is still calculated to be the height of the screen which is wrong
-              // so just add these titlebar height to the frame height once again
-              Timer timer = new Timer(300, new ActionListener() {
-                @Override
-                public void actionPerformed(ActionEvent e) {
-                  SwingUtilities.invokeLater(new Runnable() {
-                    @Override
-                    public void run() {
-                      frame.setSize(frame.getWidth(), frame.getHeight() + frame.getInsets().top);
-                    }
-                  });
-                }
-              });
-              timer.setRepeats(false);
-              timer.start();
-            }
-          }
-
-          @Override
-          public void windowExitedFullScreen(AppEvent.FullScreenEvent event) {
-            myInFullScreen = false;
-            frame.storeFullScreenStateIfNeeded(false);
-
-            JRootPane rootPane = frame.getRootPane();
-            if (rootPane != null) rootPane.putClientProperty(FULL_SCREEN, null);
-          }
-        });
+        try {
+          Class<?> clazz = Class.forName("com.apple.eawt.FullScreenUtilities");
+          clazz.getMethod("addFullScreenListenerTo").invoke(null, frame, new MacFullScreenListener(this, frame));
+        } catch (Exception ignored) {}
       } else {
         // toggle toolbar
         String className = "IdeaToolbar" + v;
@@ -243,4 +205,8 @@ public class MacMainFrameDecorator implements UISettingsListener, Disposable {
       invoke(window, "toggleFullScreen:", window);
     }
   }
+
+  void setInFullScreen(boolean inFullScreen) {
+    myInFullScreen = inFullScreen;
+  }
 }

From 30dce3a510bb68212e069c244dcdf8af52f7b152 Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Mon, 4 Jun 2012 19:32:06 +0400
Subject: [PATCH 172/239] SM test runner event converter based on node id

---
 .../sm/SMTestRunnerConnectionUtil.java        |  37 +-
 ...eralIdBasedToSMTRunnerEventsConvertor.java | 633 ++++++++++++++++++
 .../sm/runner/GeneralTestEventsProcessor.java |  38 +-
 .../GeneralToSMTRunnerEventsConvertor.java    |  53 +-
 .../OutputToGeneralTestEventsConverter.java   |  90 +--
 .../testframework/sm/runner/SMTestProxy.java  |  11 +
 .../runner/events/BaseStartedNodeEvent.java   |  71 ++
 .../sm/runner/events/TestFailedEvent.java     |  90 +++
 .../sm/runner/events/TestFinishedEvent.java   |  50 ++
 .../sm/runner/events/TestIgnoredEvent.java    |  56 ++
 .../sm/runner/events/TestOutputEvent.java     |  55 ++
 .../sm/runner/events/TestStartedEvent.java    |  36 +
 .../runner/events/TestSuiteFinishedEvent.java |  37 +
 .../runner/events/TestSuiteStartedEvent.java  |  37 +
 .../sm/runner/events/TreeNodeEvent.java       | 101 +++
 .../sm/runner/ui/TestsPresentationUtil.java   |  12 +
 ...GeneralToSMTRunnerEventsConvertorTest.java |  51 +-
 ...MockGeneralTestEventsProcessorAdapter.java |  40 +-
 .../sm/runner/SMTRunnerConsoleTest.java       | 107 +--
 .../ui/SMTestRunnerResultsFormTest.java       |  33 +-
 20 files changed, 1423 insertions(+), 215 deletions(-)
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertor.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/BaseStartedNodeEvent.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestFailedEvent.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestFinishedEvent.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestIgnoredEvent.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestOutputEvent.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestStartedEvent.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestSuiteFinishedEvent.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestSuiteStartedEvent.java
 create mode 100644 platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TreeNodeEvent.java

diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
index d5990a41826b..99221666a0b4 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/SMTestRunnerConnectionUtil.java
@@ -25,9 +25,7 @@ import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.testframework.TestConsoleProperties;
-import com.intellij.execution.testframework.sm.runner.GeneralToSMTRunnerEventsConvertor;
-import com.intellij.execution.testframework.sm.runner.OutputToGeneralTestEventsConverter;
-import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
+import com.intellij.execution.testframework.sm.runner.*;
 import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerConsoleView;
 import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerNotificationsHandler;
 import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerUIActionsHandler;
@@ -87,6 +85,16 @@ public class SMTestRunnerConnectionUtil {
                                                                           final RunnerSettings runnerSettings,
                                                                           final ConfigurationPerRunnerSettings configurationSettings,
                                                                           @Nullable final TestLocationProvider locator) {
+    return createConsoleWithCustomLocator(testFrameworkName, consoleProperties, runnerSettings,
+                                          configurationSettings, locator, false);
+  }
+
+  public static BaseTestsOutputConsoleView createConsoleWithCustomLocator(@NotNull final String testFrameworkName,
+                                                                          @NotNull final TestConsoleProperties consoleProperties,
+                                                                          final RunnerSettings runnerSettings,
+                                                                          final ConfigurationPerRunnerSettings configurationSettings,
+                                                                          @Nullable final TestLocationProvider locator,
+                                                                          final boolean idBasedTreeConstruction) {
     // Console
     final String splitterPropertyName = testFrameworkName + ".Splitter.Proportion";
     final SMTRunnerConsoleView console =
@@ -97,7 +105,7 @@ public class SMTestRunnerConnectionUtil {
           super.attachToProcess(processHandler);
           attachEventsProcessors(consoleProperties, getResultsViewer(),
                                  getResultsViewer().getStatisticsPane(),
-                                 processHandler, testFrameworkName, locator);
+                                 processHandler, testFrameworkName, locator, idBasedTreeConstruction);
         }
       };
     console.setHelpId("reference.runToolWindow.testResultsTab");
@@ -200,15 +208,24 @@ public class SMTestRunnerConnectionUtil {
                                                        final StatisticsPanel statisticsPane,
                                                        final ProcessHandler processHandler,
                                                        @NotNull final String testFrameworkName,
-                                                       @Nullable final TestLocationProvider locator) {
+                                                       @Nullable final TestLocationProvider locator,
+                                                       boolean idBasedTreeConstruction) {
     //build messages consumer
-    final OutputToGeneralTestEventsConverter outputConsumer = consoleProperties instanceof SMCustomMessagesParsing
-                                                              ? ((SMCustomMessagesParsing)consoleProperties).createTestEventsConverter(testFrameworkName, consoleProperties)
-                                                              : new OutputToGeneralTestEventsConverter(testFrameworkName, consoleProperties);
+    final OutputToGeneralTestEventsConverter outputConsumer;
+    if (consoleProperties instanceof SMCustomMessagesParsing) {
+      outputConsumer = ((SMCustomMessagesParsing)consoleProperties).createTestEventsConverter(testFrameworkName, consoleProperties);
+    }
+    else {
+      outputConsumer = new OutputToGeneralTestEventsConverter(testFrameworkName, consoleProperties);
+    }
 
     //events processor
-    final GeneralToSMTRunnerEventsConvertor eventsProcessor = new GeneralToSMTRunnerEventsConvertor(resultsViewer.getTestsRootNode(),
-                                                                                                    testFrameworkName);
+    final GeneralTestEventsProcessor eventsProcessor;
+    if (idBasedTreeConstruction) {
+      eventsProcessor = new GeneralIdBasedToSMTRunnerEventsConvertor(resultsViewer.getTestsRootNode(), testFrameworkName);
+    } else {
+      eventsProcessor = new GeneralToSMTRunnerEventsConvertor(resultsViewer.getTestsRootNode(), testFrameworkName);
+    }
     if (locator != null) {
       eventsProcessor.setLocator(locator);
     }
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertor.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertor.java
new file mode 100644
index 000000000000..88ce640ae88f
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralIdBasedToSMTRunnerEventsConvertor.java
@@ -0,0 +1,633 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import com.intellij.execution.process.ProcessOutputTypes;
+import com.intellij.execution.testframework.sm.SMRunnerUtil;
+import com.intellij.execution.testframework.sm.SMTestRunnerConnectionUtil;
+import com.intellij.execution.testframework.sm.runner.events.*;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.Key;
+import com.intellij.testIntegration.TestLocationProvider;
+import gnu.trove.TIntObjectHashMap;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author Sergey Simonchik
+ */
+public class GeneralIdBasedToSMTRunnerEventsConvertor implements GeneralTestEventsProcessor {
+  private static final Logger LOG = Logger.getInstance(GeneralIdBasedToSMTRunnerEventsConvertor.class.getName());
+
+  private final TIntObjectHashMap<Node> myNodeByIdMap = new TIntObjectHashMap<Node>();
+  private final Set<Node> myRunningNodes = Sets.newHashSet();
+  private final List<SMTRunnerEventsListener> myEventsListeners = new ArrayList<SMTRunnerEventsListener>();
+  private final SMTestProxy.SMRootTestProxy myTestsRootProxy;
+  private final Node myTestsRootNode;
+  private final String myTestFrameworkName;
+  private boolean myIsTestingFinished = false;
+  private TestLocationProvider myLocator = null;
+
+  public GeneralIdBasedToSMTRunnerEventsConvertor(@NotNull SMTestProxy.SMRootTestProxy testsRootProxy,
+                                                  @NotNull String testFrameworkName) {
+    myTestsRootProxy = testsRootProxy;
+    myTestsRootNode = new Node(0, null, testsRootProxy);
+    myTestFrameworkName = testFrameworkName;
+    myNodeByIdMap.put(myTestsRootNode.getId(), myTestsRootNode);
+    myRunningNodes.add(myTestsRootNode);
+  }
+
+  public void setLocator(@NotNull TestLocationProvider customLocator) {
+    myLocator = customLocator;
+  }
+
+  public void addEventsListener(@NotNull SMTRunnerEventsListener listener) {
+    myEventsListeners.add(listener);
+  }
+
+  public void onStartTesting() {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        myTestsRootProxy.setStarted();
+
+        fireOnTestingStarted();
+      }
+    });
+  }
+
+  @Override
+  public void onTestsReporterAttached() {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        myTestsRootProxy.setTestsReporterAttached();
+      }
+    });
+  }
+
+  public void onFinishTesting() {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        if (myIsTestingFinished) {
+          // has been already invoked!
+          return;
+        }
+        myIsTestingFinished = true;
+
+        // We don't know whether process was destroyed by user
+        // or it finished after all tests have been run
+        // Lets assume, if at finish all suites except root suite are passed
+        // then all is ok otherwise process was terminated by user
+        if (myRunningNodes.size() == 1 && myRunningNodes.contains(myTestsRootNode)) {
+          myTestsRootProxy.setFinished();
+        } else {
+          logProblem("Unexpected running nodes: " + myRunningNodes);
+          myTestsRootProxy.setTerminated();
+        }
+        myNodeByIdMap.clear();
+        myRunningNodes.clear();
+
+        fireOnTestingFinished();
+      }
+    });
+  }
+
+  public void onTestStarted(@NotNull final TestStartedEvent testStartedEvent) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        doStartNode(testStartedEvent, false);
+      }
+    });
+  }
+
+  public void onSuiteStarted(@NotNull final TestSuiteStartedEvent suiteStartedEvent) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        doStartNode(suiteStartedEvent, true);
+      }
+    });
+  }
+
+  private void doStartNode(@NotNull BaseStartedNodeEvent startedNodeEvent, boolean suite) {
+    Node parentNode = findValidParentNode(startedNodeEvent);
+    if (parentNode == null) {
+      return;
+    }
+
+    if (!validateNodeId(startedNodeEvent)) {
+      return;
+    }
+    int nodeId = startedNodeEvent.getId();
+    Node childNode = myNodeByIdMap.get(nodeId);
+    if (childNode != null) {
+      logProblem(startedNodeEvent + " has been already started: " + childNode + "!");
+      return;
+    }
+
+    SMTestProxy childProxy = new SMTestProxy(startedNodeEvent.getName(), suite, startedNodeEvent.getLocationUrl(), true);
+    childNode = new Node(startedNodeEvent.getId(), parentNode, childProxy);
+    myNodeByIdMap.put(nodeId, childNode);
+    myRunningNodes.add(childNode);
+    if (myLocator != null) {
+      childProxy.setLocator(myLocator);
+    }
+    parentNode.getProxy().addChild(childProxy);
+
+    // progress started
+    childProxy.setStarted();
+    if (suite) {
+      fireOnSuiteStarted(childProxy);
+    } else {
+      fireOnTestStarted(childProxy);
+    }
+  }
+
+  @Nullable
+  private Node findValidParentNode(@NotNull BaseStartedNodeEvent startedNodeEvent) {
+    int parentId = startedNodeEvent.getParentId();
+    if (parentId < 0) {
+      logProblem("Parent node id should be non-negative: " + startedNodeEvent + ".");
+      return null;
+    }
+    Node parentNode = myNodeByIdMap.get(startedNodeEvent.getParentId());
+    if (parentNode == null) {
+      logProblem("Parent node is undefined for " + startedNodeEvent + ".");
+      return null;
+    }
+    if (parentNode.getState() != State.RUNNING) {
+      logProblem("Parent node should be running: " + parentNode + ", " + startedNodeEvent);
+      return null;
+    }
+    return parentNode;
+  }
+
+  public void onTestFinished(@NotNull final TestFinishedEvent testFinishedEvent) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        doFinishNode(testFinishedEvent, false);
+      }
+    });
+  }
+
+  public void onSuiteFinished(@NotNull final TestSuiteFinishedEvent suiteFinishedEvent) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        doFinishNode(suiteFinishedEvent, true);
+      }
+    });
+  }
+
+  private void doFinishNode(@NotNull TreeNodeEvent treeNodeEvent, boolean suite) {
+    Node finishedNode = findNode(treeNodeEvent);
+    if (finishedNode == null) {
+      String nodeType = suite ? "Suite" : "Test";
+      logProblem("Trying to finish not started " + nodeType + ": " + treeNodeEvent);
+      return;
+    }
+    stopRunningNode(finishedNode, State.FINISHED, treeNodeEvent);
+    finishedNode.getProxy().setFinished();
+    if (suite) {
+      fireOnSuiteFinished(finishedNode.getProxy());
+    } else {
+      fireOnTestFinished(finishedNode.getProxy());
+    }
+  }
+
+  public void onUncapturedOutput(@NotNull final String text, final Key outputType) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        Node activeNode = findActiveNode();
+        SMTestProxy activeProxy = activeNode.getProxy();
+        if (ProcessOutputTypes.STDERR.equals(outputType)) {
+          activeProxy.addStdErr(text);
+        } else if (ProcessOutputTypes.SYSTEM.equals(outputType)) {
+          activeProxy.addSystemOutput(text);
+        } else {
+          activeProxy.addStdOutput(text, outputType);
+        }
+      }
+    });
+  }
+
+  public void onError(@NotNull final String localizedMessage,
+                      @Nullable final String stackTrace,
+                      final boolean isCritical) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        Node activeNode = findActiveNode();
+        SMTestProxy activeProxy = activeNode.getProxy();
+        activeProxy.addError(localizedMessage, stackTrace, isCritical);
+      }
+    });
+  }
+
+  public void onCustomProgressTestsCategory(@Nullable final String categoryName,
+                                            final int testCount) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        fireOnCustomProgressTestsCategory(categoryName, testCount);
+      }
+    });
+  }
+
+  public void onCustomProgressTestStarted() {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        fireOnCustomProgressTestStarted();
+      }
+    });
+  }
+
+  public void onCustomProgressTestFailed() {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        fireOnCustomProgressTestFailed();
+      }
+    });
+  }
+
+  public void onTestFailure(@NotNull final TestFailedEvent testFailedEvent) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        Node node = findNode(testFailedEvent);
+        if (node == null) {
+          logProblem("Test wasn't started! " + testFailedEvent + ".");
+          return;
+        }
+        stopRunningNode(node, State.FAILED, testFailedEvent);
+
+        SMTestProxy testProxy = node.getProxy();
+
+        String comparisonFailureActualText = testFailedEvent.getComparisonFailureActualText();
+        String comparisonFailureExpectedText = testFailedEvent.getComparisonFailureExpectedText();
+        String failureMessage = testFailedEvent.getLocalizedFailureMessage();
+        String stackTrace = testFailedEvent.getStacktrace();
+        if (comparisonFailureActualText != null && comparisonFailureExpectedText != null) {
+          testProxy.setTestComparisonFailed(failureMessage, stackTrace,
+                                            comparisonFailureActualText, comparisonFailureExpectedText);
+        } else if (comparisonFailureActualText == null && comparisonFailureExpectedText == null) {
+          testProxy.setTestFailed(failureMessage, stackTrace, testFailedEvent.isTestError());
+        } else {
+          logProblem("Comparison failure actual and expected texts should be both null or not null.\n"
+                     + "Expected:\n"
+                     + comparisonFailureExpectedText + "\n"
+                     + "Actual:\n"
+                     + comparisonFailureActualText);
+        }
+
+        // fire event
+        fireOnTestFailed(testProxy);
+      }
+    });
+  }
+
+  public void onTestIgnored(@NotNull final TestIgnoredEvent testIgnoredEvent) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        Node node = findNode(testIgnoredEvent);
+        if (node == null) {
+          logProblem("Test wasn't started! " + testIgnoredEvent + ".");
+          return;
+        }
+        stopRunningNode(node, State.IGNORED, testIgnoredEvent);
+
+        SMTestProxy testProxy = node.getProxy();
+        testProxy.setTestIgnored(testIgnoredEvent.getIgnoreComment(), testIgnoredEvent.getStacktrace());
+
+        // fire event
+        fireOnTestIgnored(testProxy);
+      }
+    });
+  }
+
+  public void onTestOutput(@NotNull final TestOutputEvent testOutputEvent) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        Node node = findNode(testOutputEvent);
+        if (node == null) {
+          logProblem("Test wasn't started! But " + testOutputEvent + "!");
+          return;
+        }
+        SMTestProxy testProxy = node.getProxy();
+
+        if (testOutputEvent.isStdOut()) {
+          testProxy.addStdOutput(testOutputEvent.getText(), ProcessOutputTypes.STDOUT);
+        } else {
+          testProxy.addStdErr(testOutputEvent.getText());
+        }
+      }
+    });
+  }
+
+  public void onTestsCountInSuite(final int count) {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        fireOnTestsCountInSuite(count);
+      }
+    });
+  }
+
+  private boolean validateNodeId(@NotNull TreeNodeEvent treeNodeEvent) {
+    int nodeId = treeNodeEvent.getId();
+    if (nodeId <= 0) {
+      logProblem("Node id should be positive: " + treeNodeEvent + ".");
+      return false;
+    }
+    return true;
+  }
+
+  @Nullable
+  private Node findNode(@NotNull TreeNodeEvent treeNodeEvent) {
+    if (!validateNodeId(treeNodeEvent)) {
+      return null;
+    }
+    return myNodeByIdMap.get(treeNodeEvent.getId());
+  }
+
+  private void fireOnTestingStarted() {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onTestingStarted(myTestsRootProxy);
+    }
+  }
+
+  private void fireOnTestingFinished() {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onTestingFinished(myTestsRootProxy);
+    }
+  }
+
+  private void fireOnTestsCountInSuite(final int count) {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onTestsCountInSuite(count);
+    }
+  }
+
+
+  private void fireOnTestStarted(final SMTestProxy test) {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onTestStarted(test);
+    }
+  }
+
+  private void fireOnTestFinished(final SMTestProxy test) {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onTestFinished(test);
+    }
+  }
+
+  private void fireOnTestFailed(final SMTestProxy test) {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onTestFailed(test);
+    }
+  }
+
+  private void fireOnTestIgnored(final SMTestProxy test) {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onTestIgnored(test);
+    }
+  }
+
+  private void fireOnSuiteStarted(final SMTestProxy suite) {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onSuiteStarted(suite);
+    }
+  }
+
+  private void fireOnSuiteFinished(final SMTestProxy suite) {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onSuiteFinished(suite);
+    }
+  }
+
+
+  private void fireOnCustomProgressTestsCategory(@Nullable final String categoryName, int testCount) {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onCustomProgressTestsCategory(categoryName, testCount);
+    }
+  }
+
+  private void fireOnCustomProgressTestStarted() {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onCustomProgressTestStarted();
+    }
+  }
+
+  private void fireOnCustomProgressTestFailed() {
+    for (SMTRunnerEventsListener listener : myEventsListeners) {
+      listener.onCustomProgressTestFailed();
+    }
+  }
+
+  /*
+   * Remove listeners,  etc
+   */
+  public void dispose() {
+    SMRunnerUtil.addToInvokeLater(new Runnable() {
+      public void run() {
+        myEventsListeners.clear();
+
+        if (!myRunningNodes.isEmpty()) {
+          Application application = ApplicationManager.getApplication();
+          if (!application.isHeadlessEnvironment() && !application.isUnitTestMode()) {
+            logProblem("Not all events were processed!");
+          }
+        }
+        myRunningNodes.clear();
+        myNodeByIdMap.clear();
+      }
+    });
+  }
+
+  private void stopRunningNode(@NotNull Node node, @NotNull State stoppedState, @NotNull TreeNodeEvent event) {
+    if (stoppedState == State.RUNNING) {
+      throw new RuntimeException("newState shouldn't be " + State.RUNNING);
+    }
+    // check if has been already processed
+    if (node.getState() != State.RUNNING) {
+      logProblem("Can't change state of already stopped node" + node + " to " + stoppedState + ", " + event + ".");
+      return;
+    }
+    myRunningNodes.remove(node);
+    node.setState(stoppedState);
+  }
+
+  @NotNull
+  private Node findActiveNode() {
+    List<Node> runningLeaves = Lists.newArrayListWithExpectedSize(1);
+    for (Node node : myRunningNodes) {
+      if (!node.hasRunningChildren()) {
+        runningLeaves.add(node);
+      }
+    }
+    if (runningLeaves.isEmpty()) {
+      throw new RuntimeException("No running leaves found, running nodes: " + myRunningNodes);
+    }
+    if (runningLeaves.size() == 1) {
+      return runningLeaves.iterator().next();
+    }
+    List<Node> commonPathToRoot = null;
+    for (Node leaf : runningLeaves) {
+      List<Node> pathToRoot = leaf.getAncestorsFromParentToRoot();
+      if (commonPathToRoot == null) {
+        commonPathToRoot = pathToRoot;
+      } else {
+        commonPathToRoot = intersectPathsToRoot(commonPathToRoot, pathToRoot);
+      }
+    }
+    if (commonPathToRoot == null || commonPathToRoot.isEmpty()) {
+      throw new RuntimeException("Unexpected common path to root: " + commonPathToRoot + ", running leaves: " + runningLeaves);
+    }
+    return commonPathToRoot.get(0);
+  }
+
+  @NotNull
+  private static List<Node> intersectPathsToRoot(@NotNull List<Node> pathToRoot1, @NotNull List<Node> pathToRoot2) {
+    final int minSize = Math.min(pathToRoot1.size(), pathToRoot2.size());
+    final int shift1 = pathToRoot1.size() - minSize;
+    final int shift2 = pathToRoot2.size() - minSize;
+    int commonSize = 0;
+    for (int i = 0; i < minSize; i++) {
+      Node node1 = pathToRoot1.get(i + shift1);
+      Node node2 = pathToRoot2.get(i + shift2);
+      if (node1 == node2) {
+        commonSize = minSize - i;
+        break;
+      }
+    }
+    return pathToRoot1.subList(pathToRoot1.size() - commonSize, pathToRoot1.size());
+  }
+
+  private static String getTestFrameworkPrefix(@NotNull String testFrameworkName) {
+    return "[" + testFrameworkName + "] ";
+  }
+
+  private void logProblem(@NotNull String msg) {
+    logProblem(LOG, msg, myTestFrameworkName);
+  }
+
+  private static void logProblem(@NotNull Logger log, @NotNull String msg, @NotNull String testFrameworkName) {
+    logProblem(log, msg, SMTestRunnerConnectionUtil.isInDebugMode(), testFrameworkName);
+  }
+
+  private static void logProblem(@NotNull Logger log, @NotNull String msg, boolean throwError, @NotNull String testFrameworkName) {
+    final String text = getTestFrameworkPrefix(testFrameworkName) + msg;
+    if (throwError) {
+      log.error(text);
+    }
+    else {
+      log.warn(text);
+    }
+  }
+
+  private enum State {
+    RUNNING, FINISHED, FAILED, IGNORED
+  }
+
+  private static class Node {
+    private final int myId;
+    private final Node myParentNode;
+    private final SMTestProxy myProxy;
+    private State myState = State.RUNNING;
+    private int myRunningChildCount = 0;
+
+    Node(int id, @Nullable Node parentNode, @NotNull SMTestProxy proxy) {
+      myId = id;
+      myParentNode = parentNode;
+      myProxy = proxy;
+      if (myParentNode != null) {
+        myParentNode.myRunningChildCount++;
+      }
+    }
+
+    public int getId() {
+      return myId;
+    }
+
+    @Nullable
+    public Node getParentNode() {
+      return myParentNode;
+    }
+
+    @NotNull
+    public SMTestProxy getProxy() {
+      return myProxy;
+    }
+
+    @NotNull
+    public State getState() {
+      return myState;
+    }
+
+    public void setState(@NotNull State state) {
+      if (myState == State.RUNNING && state != State.RUNNING) {
+        if (myParentNode != null) {
+          myParentNode.myRunningChildCount--;
+        }
+      } else {
+        throw new RuntimeException("Attempt to change state from " + myState + " to " + state + ":" + toString());
+      }
+      myState = state;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) return true;
+      if (o == null || getClass() != o.getClass()) return false;
+
+      Node node = (Node)o;
+
+      return myId == node.myId;
+    }
+
+    @Override
+    public int hashCode() {
+      return myId;
+    }
+
+    @Override
+    public String toString() {
+      return "{" +
+             "id=" + myId +
+             ", parentId=" + (myParentNode != null ? String.valueOf(myParentNode.getId()) : "<undefined>") +
+             ", name='" + myProxy.getName() +
+             "', isSuite=" + myProxy.isSuite() +
+             ", state=" + myState +
+             '}';
+    }
+
+    public boolean hasRunningChildren() {
+      return myRunningChildCount > 0;
+    }
+
+    @NotNull
+    public List<Node> getAncestorsFromParentToRoot() {
+      List<Node> ancestors = Lists.newArrayList();
+      Node parent = getParentNode();
+      while (parent != null) {
+        ancestors.add(parent);
+        parent = parent.getParentNode();
+      }
+      return ancestors;
+    }
+  }
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralTestEventsProcessor.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralTestEventsProcessor.java
index ffa8f8bd185e..62f9564789df 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralTestEventsProcessor.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralTestEventsProcessor.java
@@ -15,8 +15,10 @@
  */
 package com.intellij.execution.testframework.sm.runner;
 
+import com.intellij.execution.testframework.sm.runner.events.*;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.util.Key;
+import com.intellij.testIntegration.TestLocationProvider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -29,33 +31,23 @@ import org.jetbrains.annotations.Nullable;
  * and name of test method
  */
 public interface GeneralTestEventsProcessor extends Disposable {
+  void onStartTesting();
+
   void onTestsCountInSuite(final int count);
 
-  void onTestStarted(@NotNull final String testName,
-                     @Nullable final String locationUrl);
+  void onTestStarted(@NotNull TestStartedEvent testStartedEvent);
 
-  void onTestFinished(@NotNull final String testName,
-                      final int duration);
+  void onTestFinished(@NotNull TestFinishedEvent testFinishedEvent);
 
-  void onTestFailure(@NotNull final String testName,
-                     @NotNull final String localizedMessage,
-                     @Nullable final String stackTrace,
-                     final boolean testError,
-                     @Nullable final String comparisionFailureActualText,
-                     @Nullable final String comparisionFailureExpectedText);
+  void onTestFailure(@NotNull TestFailedEvent testFailedEvent);
 
-  void onTestIgnored(@NotNull final String testName,
-                     @NotNull final String ignoreComment,
-                     @Nullable final String stackTrace);
+  void onTestIgnored(@NotNull TestIgnoredEvent testIgnoredEvent);
 
-  void onTestOutput(@NotNull final String testName,
-                    @NotNull final String text,
-                    final boolean stdOut);
+  void onTestOutput(@NotNull TestOutputEvent testOutputEvent);
 
-  void onSuiteStarted(@NotNull final String suiteName,
-                      @Nullable final String locationUrl);
+  void onSuiteStarted(@NotNull TestSuiteStartedEvent suiteStartedEvent);
 
-  void onSuiteFinished(@NotNull final String suiteName);
+  void onSuiteFinished(@NotNull TestSuiteFinishedEvent suiteFinishedEvent);
 
   void onUncapturedOutput(@NotNull final String text,
                           final Key outputType);
@@ -76,4 +68,10 @@ public interface GeneralTestEventsProcessor extends Disposable {
   void onCustomProgressTestStarted();
   void onCustomProgressTestFailed();
   void onTestsReporterAttached();
-}
\ No newline at end of file
+
+  void setLocator(@NotNull TestLocationProvider locator);
+
+  void addEventsListener(@NotNull SMTRunnerEventsListener viewer);
+
+  void onFinishTesting();
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
index d7fe14011a7f..2e38c07d0594 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
@@ -19,11 +19,13 @@ import com.intellij.execution.process.ProcessOutputTypes;
 import com.intellij.execution.testframework.AbstractTestProxy;
 import com.intellij.execution.testframework.sm.SMRunnerUtil;
 import com.intellij.execution.testframework.sm.SMTestRunnerConnectionUtil;
+import com.intellij.execution.testframework.sm.runner.events.*;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Key;
 import com.intellij.testIntegration.TestLocationProvider;
+import com.intellij.util.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -55,11 +57,11 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
     myTestFrameworkName = testFrameworkName;
   }
 
-  public void setLocator(TestLocationProvider customLocator) {
+  public void setLocator(@NotNull TestLocationProvider customLocator) {
     myLocator = customLocator;
   }
 
-  public void addEventsListener(final SMTRunnerEventsListener listener) {
+  public void addEventsListener(@NotNull final SMTRunnerEventsListener listener) {
     myEventsListeners.add(listener);
   }
 
@@ -111,10 +113,11 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
     });
   }
 
-  public void onTestStarted(@NotNull final String testName,
-                            @Nullable final String locationUrl) {
+  public void onTestStarted(@NotNull final TestStartedEvent testStartedEvent) {
     SMRunnerUtil.addToInvokeLater(new Runnable() {
       public void run() {
+        final String testName = testStartedEvent.getName();
+        final String locationUrl = testStartedEvent.getLocationUrl();
         final String fullName = getFullTestName(testName);
 
         if (myRunningTestsFullNameToProxy.containsKey(fullName)) {
@@ -146,9 +149,11 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
     });
   }
 
-  public void onSuiteStarted(@NotNull final String suiteName, @Nullable final String locationUrl) {
+  public void onSuiteStarted(@NotNull final TestSuiteStartedEvent suiteStartedEvent) {
     SMRunnerUtil.addToInvokeLater(new Runnable() {
       public void run() {
+        final String suiteName = suiteStartedEvent.getName();
+        final String locationUrl = suiteStartedEvent.getLocationUrl();
         final SMTestProxy parentSuite = getCurrentSuite();
         //new suite
         final SMTestProxy newSuite = new SMTestProxy(suiteName, true, locationUrl);
@@ -168,10 +173,11 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
     });
   }
 
-  public void onTestFinished(@NotNull final String testName,
-                             final int duration) {
+  public void onTestFinished(@NotNull final TestFinishedEvent testFinishedEvent) {
     SMRunnerUtil.addToInvokeLater(new Runnable() {
       public void run() {
+        final String testName = testFinishedEvent.getName();
+        final int duration = testFinishedEvent.getDuration();
         final String fullTestName = getFullTestName(testName);
         final SMTestProxy testProxy = getProxyByFullTestName(fullTestName);
 
@@ -191,9 +197,10 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
     });
   }
 
-  public void onSuiteFinished(@NotNull final String suiteName) {
+  public void onSuiteFinished(@NotNull final TestSuiteFinishedEvent suiteFinishedEvent) {
     SMRunnerUtil.addToInvokeLater(new Runnable() {
       public void run() {
+        final String suiteName = suiteFinishedEvent.getName();
         final SMTestProxy mySuite = mySuitesStack.popSuite(suiteName);
         if (mySuite != null) {
           mySuite.setFinished();
@@ -257,14 +264,15 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
     });
   }
 
-  public void onTestFailure(@NotNull final String testName,
-                            @NotNull final String localizedMessage,
-                            @Nullable final String stackTrace,
-                            final boolean isTestError,
-                            @Nullable final String comparisionFailureActualText,
-                            @Nullable final String comparisionFailureExpectedText) {
+  public void onTestFailure(@NotNull final TestFailedEvent testFailedEvent) {
     SMRunnerUtil.addToInvokeLater(new Runnable() {
       public void run() {
+        final String testName = ObjectUtils.assertNotNull(testFailedEvent.getName());
+        final String localizedMessage = testFailedEvent.getLocalizedFailureMessage();
+        final String stackTrace = testFailedEvent.getStacktrace();
+        final boolean isTestError = testFailedEvent.isTestError();
+        final String comparisionFailureActualText = testFailedEvent.getComparisonFailureActualText();
+        final String comparisionFailureExpectedText = testFailedEvent.getComparisonFailureExpectedText();
         final boolean inDebugMode = SMTestRunnerConnectionUtil.isInDebugMode();
 
         final String fullTestName = getFullTestName(testName);
@@ -281,7 +289,7 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
             if (!myFailedTestsSet.contains(testProxy)) {
               // if hasn't been already reported
               // 1. report
-              onTestStarted(testName, null);
+              onTestStarted(new TestStartedEvent(testName, null));
               // 2. add failure
               testProxy = getProxyByFullTestName(fullTestName);
             }
@@ -323,11 +331,12 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
     });
   }
 
-  public void onTestIgnored(@NotNull final String testName,
-                            @NotNull final String ignoreComment,
-                            @Nullable final String stackTrace) {
+  public void onTestIgnored(@NotNull final TestIgnoredEvent testIgnoredEvent) {
     SMRunnerUtil.addToInvokeLater(new Runnable() {
       public void run() {
+        final String testName = ObjectUtils.assertNotNull(testIgnoredEvent.getName());
+        final String ignoreComment = testIgnoredEvent.getIgnoreComment();
+        final String stackTrace = testIgnoredEvent.getStacktrace();
         final String fullTestName = getFullTestName(testName);
         SMTestProxy testProxy = getProxyByFullTestName(fullTestName);
         if (testProxy == null) {
@@ -341,7 +350,7 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
           } else {
             // try to fix
             // 1. report test opened
-            onTestStarted(testName, null);
+            onTestStarted(new TestStartedEvent(testName, null));
 
             // 2. report failure
             testProxy = getProxyByFullTestName(fullTestName);
@@ -359,10 +368,12 @@ public class GeneralToSMTRunnerEventsConvertor implements GeneralTestEventsProce
     });
   }
 
-  public void onTestOutput(@NotNull final String testName,
-                           @NotNull final String text, final boolean stdOut) {
+  public void onTestOutput(@NotNull final TestOutputEvent testOutputEvent) {
     SMRunnerUtil.addToInvokeLater(new Runnable() {
       public void run() {
+        final String testName = testOutputEvent.getName();
+        final String text = testOutputEvent.getText();
+        final boolean stdOut = testOutputEvent.isStdOut();
         final String fullTestName = getFullTestName(testName);
         final SMTestProxy testProxy = getProxyByFullTestName(fullTestName);
         if (testProxy == null) {
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputToGeneralTestEventsConverter.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputToGeneralTestEventsConverter.java
index c57111d9db64..9554844e1455 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputToGeneralTestEventsConverter.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/OutputToGeneralTestEventsConverter.java
@@ -17,6 +17,7 @@ package com.intellij.execution.testframework.sm.runner;
 
 import com.intellij.execution.process.ProcessOutputTypes;
 import com.intellij.execution.testframework.TestConsoleProperties;
+import com.intellij.execution.testframework.sm.runner.events.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
@@ -41,13 +42,11 @@ import static com.intellij.execution.testframework.sm.runner.GeneralToSMTRunnerE
 public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer {
   private static final Logger LOG = Logger.getInstance(OutputToGeneralTestEventsConverter.class.getName());
 
-  private static final String TEAMCITY_SERVICE_MESSAGE_PREFIX = "##teamcity[";
-
   private GeneralTestEventsProcessor myProcessor;
   private final MyServiceMessageVisitor myServiceMessageVisitor;
   private final String myTestFrameworkName;
 
-  private OutputLineSplitter mySplitter;
+  private final OutputLineSplitter mySplitter;
   private boolean myPendingLineBreakFlag;
 
   public OutputToGeneralTestEventsConverter(@NotNull final String testFrameworkName,
@@ -63,7 +62,7 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
     };
   }
 
-  public void setProcessor(final GeneralTestEventsProcessor processor) {
+  public void setProcessor(@Nullable final GeneralTestEventsProcessor processor) {
     myProcessor = processor;
   }
 
@@ -142,52 +141,38 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
   }
 
 
-  private void fireOnTestStarted(final String testName, @Nullable final String locationUrl) {
-    assertNotNull(testName);
-
+  private void fireOnTestStarted(@NotNull TestStartedEvent testStartedEvent) {
     // local variable is used to prevent concurrent modification
     final GeneralTestEventsProcessor processor = myProcessor;
     if (processor != null) {
-      processor.onTestStarted(testName, locationUrl);
+      processor.onTestStarted(testStartedEvent);
     }
   }
 
-  private void fireOnTestFailure(final String testName,
-                                 final String localizedMessage, final String stackTrace,
-                                 final boolean isTestError,
-                                 @Nullable final String comparisionFailureActualText,
-                                 @Nullable final String comparisionFailureExpectedText) {
-    assertNotNull(testName);
-    assertNotNull(localizedMessage);
+  private void fireOnTestFailure(@NotNull TestFailedEvent testFailedEvent) {
+    assertNotNull(testFailedEvent.getLocalizedFailureMessage());
 
     // local variable is used to prevent concurrent modification
     final GeneralTestEventsProcessor processor = myProcessor;
     if (processor != null) {
-      processor.onTestFailure(testName, localizedMessage, stackTrace, isTestError,
-                              comparisionFailureActualText,
-                              comparisionFailureExpectedText);
+      processor.onTestFailure(testFailedEvent);
     }
   }
 
-  private void fireOnTestIgnored(final String testName, final String ignoreComment,
-                                 @Nullable final String details) {
-    assertNotNull(testName);
-    assertNotNull(ignoreComment);
+  private void fireOnTestIgnored(@NotNull TestIgnoredEvent testIgnoredEvent) {
 
     // local variable is used to prevent concurrent modification
     final GeneralTestEventsProcessor processor = myProcessor;
     if (processor != null) {
-      processor.onTestIgnored(testName, ignoreComment, details);
+      processor.onTestIgnored(testIgnoredEvent);
     }
   }
 
-  private void fireOnTestFinished(final String testName, final int duration) {
-    assertNotNull(testName);
-
+  private void fireOnTestFinished(@NotNull TestFinishedEvent testFinishedEvent) {
     // local variable is used to prevent concurrent modification
     final GeneralTestEventsProcessor processor = myProcessor;
     if (processor != null) {
-      processor.onTestFinished(testName, duration);
+      processor.onTestFinished(testFinishedEvent);
     }
   }
 
@@ -224,14 +209,11 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
     }
   }
 
-  private void fireOnTestOutput(final String testName, final String text, final boolean stdOut) {
-    assertNotNull(testName);
-    assertNotNull(text);
-
+  private void fireOnTestOutput(@NotNull TestOutputEvent testOutputEvent) {
     // local variable is used to prevent concurrent modification
     final GeneralTestEventsProcessor processor = myProcessor;
     if (processor != null) {
-      processor.onTestOutput(testName, text, stdOut);
+      processor.onTestOutput(testOutputEvent);
     }
   }
 
@@ -257,23 +239,19 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
     }
   }
 
-  private void fireOnSuiteStarted(final String suiteName, @Nullable final String locationUrl) {
-    assertNotNull(suiteName);
-
+  private void fireOnSuiteStarted(@NotNull TestSuiteStartedEvent suiteStartedEvent) {
     // local variable is used to prevent concurrent modification
     final GeneralTestEventsProcessor processor = myProcessor;
     if (processor != null) {
-      processor.onSuiteStarted(suiteName, locationUrl);
+      processor.onSuiteStarted(suiteStartedEvent);
     }
   }
 
-  private void fireOnSuiteFinished(final String suiteName) {
-    assertNotNull(suiteName);
-
+  private void fireOnSuiteFinished(@NotNull TestSuiteFinishedEvent nodeFinishedEvent) {
     // local variable is used to prevent concurrent modification
     final GeneralTestEventsProcessor processor = myProcessor;
     if (processor != null) {
-      processor.onSuiteFinished(suiteName);
+      processor.onSuiteFinished(nodeFinishedEvent);
     }
   }
 
@@ -321,7 +299,8 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
 
     public void visitTestSuiteStarted(@NotNull final TestSuiteStarted suiteStarted) {
       final String locationUrl = fetchTestLocation(suiteStarted);
-      fireOnSuiteStarted(suiteStarted.getSuiteName(), locationUrl);
+      TestSuiteStartedEvent suiteStartedEvent = new TestSuiteStartedEvent(suiteStarted, locationUrl);
+      fireOnSuiteStarted(suiteStartedEvent);
     }
 
     @Nullable
@@ -343,7 +322,8 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
     }
 
     public void visitTestSuiteFinished(@NotNull final TestSuiteFinished suiteFinished) {
-      fireOnSuiteFinished(suiteFinished.getSuiteName());
+      TestSuiteFinishedEvent finishedEvent = new TestSuiteFinishedEvent(suiteFinished);
+      fireOnSuiteFinished(finishedEvent);
     }
 
     public void visitTestStarted(@NotNull final TestStarted testStarted) {
@@ -351,7 +331,8 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
       // final String locationUrl = testStarted.getLocationHint();
 
       final String locationUrl = testStarted.getAttributes().get(ATTR_KEY_LOCATION_URL);
-      fireOnTestStarted(testStarted.getTestName(), locationUrl);
+      TestStartedEvent testStartedEvent = new TestStartedEvent(testStarted, locationUrl);
+      fireOnTestStarted(testStartedEvent);
     }
 
     public void visitTestFinished(@NotNull final TestFinished testFinished) {
@@ -368,31 +349,27 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
         duration = convertToInt(durationStr, testFinished);
       }
 
-      fireOnTestFinished(testFinished.getTestName(), duration);
+      TestFinishedEvent testFinishedEvent = new TestFinishedEvent(testFinished, duration);
+      fireOnTestFinished(testFinishedEvent);
     }
 
     public void visitTestIgnored(@NotNull final TestIgnored testIgnored) {
-      final String details = testIgnored.getAttributes().get(ATTR_KEY_STACKTRACE_DETAILS);
-      fireOnTestIgnored(testIgnored.getTestName(), testIgnored.getIgnoreComment(), details);
+      final String stacktrace = testIgnored.getAttributes().get(ATTR_KEY_STACKTRACE_DETAILS);
+      fireOnTestIgnored(new TestIgnoredEvent(testIgnored, stacktrace));
     }
 
     public void visitTestStdOut(@NotNull final TestStdOut testStdOut) {
-      fireOnTestOutput(testStdOut.getTestName(), testStdOut.getStdOut(), true);
+      fireOnTestOutput(new TestOutputEvent(testStdOut, testStdOut.getStdOut(), true));
     }
 
     public void visitTestStdErr(@NotNull final TestStdErr testStdErr) {
-      fireOnTestOutput(testStdErr.getTestName(), testStdErr.getStdErr(), false);
+      fireOnTestOutput(new TestOutputEvent(testStdErr.getTestName(), testStdErr.getStdErr(), false));
     }
 
     public void visitTestFailed(@NotNull final TestFailed testFailed) {
-      final boolean isTestError = testFailed.getAttributes().get(ATTR_KEY_TEST_ERROR) != null;
-
-      fireOnTestFailure(testFailed.getTestName(),
-                        testFailed.getFailureMessage(),
-                        testFailed.getStacktrace(),
-                        isTestError,
-                        testFailed.getActual(),
-                        testFailed.getExpected());
+      final boolean testError = testFailed.getAttributes().get(ATTR_KEY_TEST_ERROR) != null;
+      TestFailedEvent testFailedEvent = new TestFailedEvent(testFailed, testError);
+      fireOnTestFailure(testFailedEvent);
     }
 
     public void visitPublishArtifacts(@NotNull final PublishArtifacts publishArtifacts) {
@@ -425,7 +402,6 @@ public class OutputToGeneralTestEventsConverter implements ProcessOutputConsumer
 
     @Override
     public void visitMessageWithStatus(@NotNull Message msg) {
-      final String name = msg.getMessageName();
       final Map<String, String> msgAttrs = msg.getAttributes();
 
       final String text = msgAttrs.get(ATTR_KEY_TEXT);
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
index ef66990b4384..68464529f969 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTestProxy.java
@@ -61,12 +61,20 @@ public class SMTestProxy extends AbstractTestProxy {
   private boolean myIsEmptyIsCached = false; // is used for separating unknown and unset values
   private boolean myIsEmpty = true;
   TestLocationProvider myCustomLocator = null;
+  private final boolean myPreservePresentableName;
 
   public SMTestProxy(final String testName, final boolean isSuite,
                      @Nullable final String locationUrl) {
+    this(testName, isSuite, locationUrl, false);
+  }
+
+  public SMTestProxy(final String testName, final boolean isSuite,
+                     @Nullable final String locationUrl,
+                     boolean preservePresentableName) {
     myName = testName;
     myIsSuite = isSuite;
     myLocationUrl = locationUrl;
+    myPreservePresentableName = preservePresentableName;
   }
 
   public void setLocator(@NotNull TestLocationProvider locator) {
@@ -470,6 +478,9 @@ public class SMTestProxy extends AbstractTestProxy {
 
   @NotNull
   public String getPresentableName() {
+    if (myPreservePresentableName) {
+      return TestsPresentationUtil.getPresentableNameTrimmedOnly(this);
+    }
     return TestsPresentationUtil.getPresentableName(this);
   }
 
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/BaseStartedNodeEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/BaseStartedNodeEvent.java
new file mode 100644
index 000000000000..9182d4619b8d
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/BaseStartedNodeEvent.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import jetbrains.buildServer.messages.serviceMessages.MessageWithAttributes;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Sergey Simonchik
+ */
+public abstract class BaseStartedNodeEvent extends TreeNodeEvent {
+
+  private final int myParentId;
+  private final String myLocationUrl;
+
+  protected BaseStartedNodeEvent(@NotNull String name,
+                                 int id,
+                                 int parentId,
+                                 @Nullable final String locationUrl) {
+    super(name, id);
+    myParentId = parentId;
+    myLocationUrl = locationUrl;
+    validate();
+  }
+
+  private void validate() {
+    if (myParentId < -1) {
+      fail("parentId should be greater than -2");
+    }
+    if (getId() == -1 ^ myParentId == -1) {
+      fail("id and parentId should be -1 or non-negative");
+    }
+  }
+
+  /**
+   * @return parent node id (non-negative integer), or -1 if undefined
+   */
+  public int getParentId() {
+    return myParentId;
+  }
+
+  @Nullable
+  public String getLocationUrl() {
+    return myLocationUrl;
+  }
+
+  @Override
+  protected void appendToStringInfo(@NotNull StringBuilder buf) {
+    append(buf, "parentId", myParentId);
+    append(buf, "locationUrl", myLocationUrl);
+  }
+
+  public static int getParentNodeId(@NotNull MessageWithAttributes message) {
+    return TreeNodeEvent.getIntAttribute(message, "parentNodeId");
+  }
+
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestFailedEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestFailedEvent.java
new file mode 100644
index 000000000000..04ed7e004b29
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestFailedEvent.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import com.google.common.base.Preconditions;
+import jetbrains.buildServer.messages.serviceMessages.TestFailed;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Sergey Simonchik
+ */
+public class TestFailedEvent extends TreeNodeEvent {
+
+  private final String myLocalizedFailureMessage;
+  private final String myStacktrace;
+  private final boolean myTestError;
+  private final String myComparisonFailureActualText;
+  private final String myComparisonFailureExpectedText;
+
+  public TestFailedEvent(@NotNull TestFailed testFailed, boolean testError) {
+    super(testFailed.getTestName(), TreeNodeEvent.getNodeId(testFailed));
+    myLocalizedFailureMessage = Preconditions.checkNotNull(testFailed.getFailureMessage());
+    myStacktrace = testFailed.getStacktrace();
+    myTestError = testError;
+    myComparisonFailureActualText = testFailed.getActual();
+    myComparisonFailureExpectedText = testFailed.getExpected();
+  }
+
+  public TestFailedEvent(@NotNull String testName,
+                         @NotNull String localizedFailureMessage,
+                         @Nullable String stackTrace,
+                         boolean testError,
+                         @Nullable String comparisonFailureActualText,
+                         @Nullable String comparisonFailureExpectedText) {
+    super(testName, -1);
+    myLocalizedFailureMessage = Preconditions.checkNotNull(localizedFailureMessage);
+    myStacktrace = stackTrace;
+    myTestError = testError;
+    myComparisonFailureActualText = comparisonFailureActualText;
+    myComparisonFailureExpectedText = comparisonFailureExpectedText;
+  }
+
+  @NotNull
+  public String getLocalizedFailureMessage() {
+    return myLocalizedFailureMessage;
+  }
+
+  @Nullable
+  public String getStacktrace() {
+    return myStacktrace;
+  }
+
+  public boolean isTestError() {
+    return myTestError;
+  }
+
+  @Nullable
+  public String getComparisonFailureActualText() {
+    return myComparisonFailureActualText;
+  }
+
+  @Nullable
+  public String getComparisonFailureExpectedText() {
+    return myComparisonFailureExpectedText;
+  }
+
+  @Override
+  protected void appendToStringInfo(@NotNull StringBuilder buf) {
+    append(buf, "localizedFailureMessage", myLocalizedFailureMessage);
+    append(buf, "stacktrace", myStacktrace);
+    append(buf, "isTestError", myTestError);
+    append(buf, "comparisonFailureActualText", myComparisonFailureActualText);
+    append(buf, "comparisonFailureExpectedText", myComparisonFailureExpectedText);
+  }
+
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestFinishedEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestFinishedEvent.java
new file mode 100644
index 000000000000..02ebdda3b220
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestFinishedEvent.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import jetbrains.buildServer.messages.serviceMessages.TestFinished;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Sergey Simonchik
+ */
+public class TestFinishedEvent extends TreeNodeEvent {
+
+  private final int myDuration;
+
+  public TestFinishedEvent(@NotNull TestFinished testFinished, int duration) {
+    this(testFinished.getTestName(), TreeNodeEvent.getNodeId(testFinished), duration);
+  }
+
+  public TestFinishedEvent(@Nullable String name, int id, int duration) {
+    super(name, id);
+    myDuration = duration;
+  }
+
+  public TestFinishedEvent(@NotNull String name, int duration) {
+    this(name, -1, duration);
+  }
+
+  public int getDuration() {
+    return myDuration;
+  }
+
+  @Override
+  protected void appendToStringInfo(@NotNull StringBuilder buf) {
+    append(buf, "duration", myDuration);
+  }
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestIgnoredEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestIgnoredEvent.java
new file mode 100644
index 000000000000..2237a8670cf0
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestIgnoredEvent.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import jetbrains.buildServer.messages.serviceMessages.TestIgnored;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Sergey Simonchik
+ */
+public class TestIgnoredEvent extends TreeNodeEvent {
+  private final String myIgnoreComment;
+  private final String myStacktrace;
+
+  public TestIgnoredEvent(@NotNull String testName, @NotNull String ignoreComment, @Nullable String stacktrace) {
+    super(testName, -1);
+    myIgnoreComment = ignoreComment;
+    myStacktrace = stacktrace;
+  }
+
+  public TestIgnoredEvent(@NotNull TestIgnored testIgnored, @Nullable String stacktrace) {
+    super(testIgnored.getTestName(), TreeNodeEvent.getNodeId(testIgnored));
+    myIgnoreComment = testIgnored.getIgnoreComment();
+    myStacktrace = stacktrace;
+  }
+
+  @NotNull
+  public String getIgnoreComment() {
+    return myIgnoreComment;
+  }
+
+  @Nullable
+  public String getStacktrace() {
+    return myStacktrace;
+  }
+
+  @Override
+  protected void appendToStringInfo(@NotNull StringBuilder buf) {
+    append(buf, "ignoreComment", myIgnoreComment);
+    append(buf, "stacktrace", myStacktrace);
+  }
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestOutputEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestOutputEvent.java
new file mode 100644
index 000000000000..bc8297f6d03c
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestOutputEvent.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import jetbrains.buildServer.messages.serviceMessages.BaseTestMessage;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Sergey Simonchik
+ */
+public class TestOutputEvent extends TreeNodeEvent {
+
+  private final String myText;
+  private final boolean myStdOut;
+
+  public TestOutputEvent(@NotNull BaseTestMessage message, @NotNull String text, boolean stdOut) {
+    super(message.getTestName(), TreeNodeEvent.getNodeId(message));
+    myText = text;
+    myStdOut = stdOut;
+  }
+
+  public TestOutputEvent(@NotNull String testName, @NotNull String text, boolean stdOut) {
+    super(testName, -1);
+    myText = text;
+    myStdOut = stdOut;
+  }
+
+  @NotNull
+  public String getText() {
+    return myText;
+  }
+
+  public boolean isStdOut() {
+    return myStdOut;
+  }
+
+  @Override
+  protected void appendToStringInfo(@NotNull StringBuilder buf) {
+    append(buf, "text", myText);
+    append(buf, "stdOut", myStdOut);
+  }
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestStartedEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestStartedEvent.java
new file mode 100644
index 000000000000..05ba2638e401
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestStartedEvent.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import jetbrains.buildServer.messages.serviceMessages.TestStarted;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Sergey Simonchik
+ */
+public class TestStartedEvent extends BaseStartedNodeEvent {
+
+  public TestStartedEvent(@NotNull TestStarted testStarted,
+                          @Nullable String locationUrl) {
+    super(testStarted.getTestName(), TreeNodeEvent.getNodeId(testStarted),
+          getParentNodeId(testStarted), locationUrl);
+  }
+
+  public TestStartedEvent(@NotNull String name, @Nullable String locationUrl) {
+    super(name, -1, -1, locationUrl);
+  }
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestSuiteFinishedEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestSuiteFinishedEvent.java
new file mode 100644
index 000000000000..e5a6e34853f9
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestSuiteFinishedEvent.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import jetbrains.buildServer.messages.serviceMessages.TestSuiteFinished;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Sergey Simonchik
+ */
+public class TestSuiteFinishedEvent extends TreeNodeEvent {
+
+  public TestSuiteFinishedEvent(@NotNull TestSuiteFinished suiteFinished) {
+    super(suiteFinished.getSuiteName(), TreeNodeEvent.getNodeId(suiteFinished));
+  }
+
+  public TestSuiteFinishedEvent(@NotNull String name) {
+    super(name, -1);
+  }
+
+  @Override
+  protected void appendToStringInfo(@NotNull StringBuilder buf) {
+  }
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestSuiteStartedEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestSuiteStartedEvent.java
new file mode 100644
index 000000000000..4c761e7471a1
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TestSuiteStartedEvent.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import jetbrains.buildServer.messages.serviceMessages.TestSuiteStarted;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Sergey Simonchik
+ */
+public class TestSuiteStartedEvent extends BaseStartedNodeEvent {
+
+  public TestSuiteStartedEvent(@NotNull TestSuiteStarted suiteStarted,
+                               @Nullable String locationUrl) {
+    super(suiteStarted.getSuiteName(), TreeNodeEvent.getNodeId(suiteStarted),
+          getParentNodeId(suiteStarted), locationUrl);
+  }
+
+  public TestSuiteStartedEvent(@NotNull String name, @Nullable String locationUrl) {
+    super(name, -1, -1, locationUrl);
+  }
+
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TreeNodeEvent.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TreeNodeEvent.java
new file mode 100644
index 000000000000..2758e5536bb1
--- /dev/null
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/events/TreeNodeEvent.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.testframework.sm.runner.events;
+
+import jetbrains.buildServer.messages.serviceMessages.MessageWithAttributes;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author Sergey Simonchik
+ */
+public abstract class TreeNodeEvent {
+
+  private final String myName;
+  private final int myId;
+
+  public TreeNodeEvent(@Nullable String name, int id) {
+    myName = name;
+    myId = id;
+    validate();
+  }
+
+  private void validate() {
+    if (myId < -1) {
+      fail("id should be greater than -2");
+    }
+    if (myName != null && myName.isEmpty()) {
+      fail("Tree node name is empty");
+    }
+  }
+
+  protected void fail(@NotNull String message) {
+    throw new IllegalStateException(message + ", " + toString());
+  }
+
+  @Nullable
+  public String getName() {
+    return myName;
+  }
+
+  /**
+   * @return tree node id (non-negative integer), or -1 if undefined
+   */
+  public int getId() {
+    return myId;
+  }
+
+  @Override
+  public final String toString() {
+    StringBuilder buf = new StringBuilder(getClass().getSimpleName() + "{");
+    append(buf, "name", myName);
+    append(buf, "id", myId);
+    appendToStringInfo(buf);
+    // drop last 2 chars: ', '
+    buf.setLength(buf.length() - 2);
+    buf.append("}");
+    return buf.toString();
+  }
+
+  protected abstract void appendToStringInfo(@NotNull StringBuilder buf);
+
+  protected static void append(@NotNull StringBuilder buffer,
+                               @NotNull String key, @Nullable Object value) {
+    if (value != null) {
+      buffer.append(key).append("=");
+      if (value instanceof String) {
+        buffer.append("'").append(value).append("'");
+      }
+      else {
+        buffer.append(String.valueOf(value));
+      }
+      buffer.append(", ");
+    }
+  }
+
+  public static int getNodeId(@NotNull MessageWithAttributes message) {
+    return getIntAttribute(message, "nodeId");
+  }
+
+  public static int getIntAttribute(@NotNull MessageWithAttributes message, @NotNull String key) {
+    String value = message.getAttributes().get(key);
+    if (value == null) {
+      return -1;
+    }
+    return Integer.parseInt(value);
+  }
+
+}
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtil.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtil.java
index c3f1b922761d..0e97d51729f5 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtil.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtil.java
@@ -226,6 +226,18 @@ public class TestsPresentationUtil {
     return presentationCandidate;
   }
 
+  @NotNull
+  public static String getPresentableNameTrimmedOnly(@NotNull SMTestProxy testProxy) {
+    String name = testProxy.getName();
+    if (name != null) {
+      name = name.trim();
+    }
+    if (name == null || name.isEmpty()) {
+      name = NO_NAME_TEST;
+    }
+    return name;
+  }
+
   @Nullable
   private static Icon getIcon(final SMTestProxy testProxy,
                               final TestConsoleProperties consoleProperties) {
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
index 2b3677e3fbfa..933972021fdf 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertorTest.java
@@ -18,6 +18,7 @@ package com.intellij.execution.testframework.sm.runner;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.TestConsoleProperties;
 import com.intellij.execution.testframework.sm.Marker;
+import com.intellij.execution.testframework.sm.runner.events.*;
 import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerConsoleView;
 import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerTestTreeView;
 import com.intellij.execution.testframework.sm.runner.ui.SMTestRunnerResultsForm;
@@ -125,7 +126,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
 
   public void testOnTestFailure() {
     onTestStarted("some_test");
-    myEventsProcessor.onTestFailure("some_test", "", "", false, null, null);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("some_test", "", "", false, null, null));
 
     final String fullName = myEventsProcessor.getFullTestName("some_test");
     final SMTestProxy proxy = myEventsProcessor.getProxyByFullTestName(fullName);
@@ -136,7 +137,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
 
   public void testOnTestComparisionFailure() {
     onTestStarted("some_test");
-    myEventsProcessor.onTestFailure("some_test", "", "", false, "actual", "expected");
+    myEventsProcessor.onTestFailure(new TestFailedEvent("some_test", "", "", false, "actual", "expected"));
 
     final String fullName = myEventsProcessor.getFullTestName("some_test");
     final SMTestProxy proxy = myEventsProcessor.getProxyByFullTestName(fullName);
@@ -147,8 +148,8 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
 
   public void testOnTestFailure_Twice() {
     onTestStarted("some_test");
-    myEventsProcessor.onTestFailure("some_test", "", "", false, null, null);
-    myEventsProcessor.onTestFailure("some_test", "", "", false, null, null);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("some_test", "", "", false, null, null));
+    myEventsProcessor.onTestFailure(new TestFailedEvent("some_test", "", "", false, null, null));
 
     assertEquals(1, myEventsProcessor.getRunningTestsQuantity());
     assertEquals(1, myEventsProcessor.getFailedTestsSet().size());
@@ -156,7 +157,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
 
    public void testOnTestError() {
     onTestStarted("some_test");
-    myEventsProcessor.onTestFailure("some_test", "", "", true, null, null);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("some_test", "", "", true, null, null));
 
     final String fullName = myEventsProcessor.getFullTestName("some_test");
     final SMTestProxy proxy = myEventsProcessor.getProxyByFullTestName(fullName);
@@ -167,7 +168,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
 
   public void testOnTestIgnored() {
     onTestStarted("some_test");
-    myEventsProcessor.onTestIgnored("some_test", "", null);
+    myEventsProcessor.onTestIgnored(new TestIgnoredEvent("some_test", "", null));
 
     final String fullName = myEventsProcessor.getFullTestName("some_test");
     final SMTestProxy proxy = myEventsProcessor.getProxyByFullTestName(fullName);
@@ -180,7 +181,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
     onTestStarted("some_test");
     final String fullName = myEventsProcessor.getFullTestName("some_test");
     final SMTestProxy proxy = myEventsProcessor.getProxyByFullTestName(fullName);
-    myEventsProcessor.onTestFinished("some_test", 10);
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("some_test", 10));
 
     assertEquals(0, myEventsProcessor.getRunningTestsQuantity());
     assertEquals(0, myEventsProcessor.getFailedTestsSet().size());
@@ -224,8 +225,8 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
 
   public void testOnFinishedTesting_WithFailure() {
     onTestStarted("test");
-    myEventsProcessor.onTestFailure("test", "", "", false, null, null);
-    myEventsProcessor.onTestFinished("test", 10);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("test", "", "", false, null, null));
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("test", 10));
     myEventsProcessor.onFinishTesting();
 
     //Tree
@@ -240,8 +241,8 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
 
   public void testOnFinishedTesting_WithError() {
     onTestStarted("test");
-    myEventsProcessor.onTestFailure("test", "", "", true, null, null);
-    myEventsProcessor.onTestFinished("test", 10);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("test", "", "", true, null, null));
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("test", 10));
     myEventsProcessor.onFinishTesting();
 
     //Tree
@@ -256,8 +257,8 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
 
   public void testOnFinishedTesting_WithIgnored() {
     onTestStarted("test");
-    myEventsProcessor.onTestIgnored("test", "", null);
-    myEventsProcessor.onTestFinished("test", 10);
+    myEventsProcessor.onTestIgnored(new TestIgnoredEvent("test", "", null));
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("test", 10));
     myEventsProcessor.onFinishTesting();
 
     //Tree
@@ -302,18 +303,18 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
     assertEquals("suite3", test2.getParent().getName());
     assertEquals("suite2", test2.getParent().getParent().getName());
 
-    myEventsProcessor.onTestFinished("test2", 10);
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("test2", 10));
 
     //check that after finishing suite (suite3), current will be parent of finished suite (i.e. suite2)
-    myEventsProcessor.onSuiteFinished("suite3");
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite3"));
     onTestStarted("test3");
     final SMTestProxy test3 =
         myEventsProcessor.getProxyByFullTestName(myEventsProcessor.getFullTestName("test3"));
     assertEquals("suite2", test3.getParent().getName());
 
     //clean up
-    myEventsProcessor.onSuiteFinished("suite2");
-    myEventsProcessor.onSuiteFinished("suite1");
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite2"));
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite1"));
   }
 
   public void testOnSuiteStarted_WithLocation() {
@@ -336,17 +337,17 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
   }
 
   public void testConcurrentSuite_intersected() {
-    myEventsProcessor.onSuiteStarted("suite1", null);
-    myEventsProcessor.onTestStarted("suite2.test1", null);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("suite1", null));
+    myEventsProcessor.onTestStarted(new TestStartedEvent("suite2.test1", null));
 
     final SMTestProxy test1 =
         myEventsProcessor.getProxyByFullTestName(myEventsProcessor.getFullTestName("suite2.test1"));
 
-    myEventsProcessor.onSuiteFinished("suite1");
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite1"));
 
-    myEventsProcessor.onSuiteStarted("suite2", null);
-    myEventsProcessor.onTestFinished("suite2.test1", 10);
-    myEventsProcessor.onSuiteFinished("suite2");
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("suite2", null));
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("suite2.test1", 10));
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite2"));
 
     assertEquals("suite1", test1.getParent().getName());
 
@@ -371,7 +372,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
   }
 
   private void onTestStarted(final String testName, @Nullable final String locationUrl) {
-    myEventsProcessor.onTestStarted(testName, locationUrl);
+    myEventsProcessor.onTestStarted(new TestStartedEvent(testName, locationUrl));
     myResultsViewer.performUpdate();
   }
 
@@ -380,7 +381,7 @@ public class GeneralToSMTRunnerEventsConvertorTest extends BaseSMTRunnerTestCase
   }
 
   private void onTestSuiteStarted(final String suiteName, @Nullable final String locationUrl) {
-    myEventsProcessor.onSuiteStarted(suiteName, locationUrl);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent(suiteName, locationUrl));
     myResultsViewer.performUpdate();
   }
 }
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockGeneralTestEventsProcessorAdapter.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockGeneralTestEventsProcessorAdapter.java
index 86289ef956ef..822e4e11520b 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockGeneralTestEventsProcessorAdapter.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/MockGeneralTestEventsProcessorAdapter.java
@@ -15,7 +15,9 @@
  */
 package com.intellij.execution.testframework.sm.runner;
 
+import com.intellij.execution.testframework.sm.runner.events.*;
 import com.intellij.openapi.util.Key;
+import com.intellij.testIntegration.TestLocationProvider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,46 +26,46 @@ import org.jetbrains.annotations.Nullable;
 */
 public class MockGeneralTestEventsProcessorAdapter implements GeneralTestEventsProcessor {
   private final StringBuilder myOutputBuffer = new StringBuilder();
+
+  @Override
+  public void onStartTesting() {
+  }
+
   @Override
   public void onTestsCountInSuite(int count) {
   }
 
   @Override
-  public void onTestStarted(@NotNull String testName, @Nullable String locationUrl) {
+  public void onTestStarted(@NotNull TestStartedEvent testStartedEvent) {
   }
 
   @Override
-  public void onTestFinished(@NotNull String testName, int duration) {
+  public void onTestFinished(@NotNull TestFinishedEvent testFinishedEvent) {
   }
 
   @Override
-  public void onTestFailure(@NotNull String testName,
-                            @NotNull String localizedMessage,
-                            @Nullable String stackTrace,
-                            boolean testError,
-                            @Nullable String comparisionFailureActualText,
-                            @Nullable String comparisionFailureExpectedText) {
+  public void onTestFailure(@NotNull TestFailedEvent testFailedEvent) {
   }
 
   @Override
-  public void onTestIgnored(@NotNull String testName, @NotNull String ignoreComment, @Nullable String stackTrace) {
+  public void onTestIgnored(@NotNull TestIgnoredEvent testIgnoredEvent) {
   }
 
   @Override
-  public void onTestOutput(@NotNull String testName, @NotNull String text, boolean stdOut) {
+  public void onTestOutput(@NotNull TestOutputEvent testOutputEvent) {
   }
 
   @Override
-  public void onSuiteStarted(@NotNull String suiteName, @Nullable String locationUrl) {
+  public void onSuiteStarted(@NotNull TestSuiteStartedEvent suiteStartedEvent) {
   }
 
   @Override
-  public void onSuiteFinished(@NotNull String suiteName) {
+  public void onSuiteFinished(@NotNull TestSuiteFinishedEvent suiteFinishedEvent) {
   }
 
   @Override
   public void onUncapturedOutput(@NotNull String text, Key outputType) {
-    myOutputBuffer.append("[").append(outputType.toString()).append("]"+ text);
+    myOutputBuffer.append("[").append(outputType.toString()).append("]").append(text);
   }
 
   @Override
@@ -86,6 +88,18 @@ public class MockGeneralTestEventsProcessorAdapter implements GeneralTestEventsP
   public void onTestsReporterAttached() {
   }
 
+  @Override
+  public void setLocator(@NotNull TestLocationProvider locator) {
+  }
+
+  @Override
+  public void addEventsListener(@NotNull SMTRunnerEventsListener viewer) {
+  }
+
+  @Override
+  public void onFinishTesting() {
+  }
+
   @Override
   public void dispose() {
     myOutputBuffer.setLength(0);
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java
index 7f345863b0ad..07982eb04d30 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/SMTRunnerConsoleTest.java
@@ -22,6 +22,7 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.Printable;
 import com.intellij.execution.testframework.Printer;
 import com.intellij.execution.testframework.TestConsoleProperties;
+import com.intellij.execution.testframework.sm.runner.events.*;
 import com.intellij.execution.testframework.sm.runner.ui.MockPrinter;
 import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerConsoleView;
 import com.intellij.execution.testframework.sm.runner.ui.SMTestRunnerResultsForm;
@@ -174,8 +175,8 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnTestStdOutput() {
     startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stdout2", true);
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout2", true));
 
     assertStdOutput(myMockResetablePrinter, "stdout1 stdout2");
   }
@@ -183,8 +184,8 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnTestStdErr() {
     startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
-    myEventsProcessor.onTestOutput("my_test", "stderr2", false);
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr2", false));
 
     assertStdErr(myMockResetablePrinter, "stderr1 stderr2");
   }
@@ -192,10 +193,10 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnTestMixedStd() {
     startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
-    myEventsProcessor.onTestOutput("my_test", "stdout2", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr2", false);
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout2", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr2", false));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 stdout2", "stderr1 stderr2", "");
   }
@@ -203,9 +204,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnFailure() {
     final SMTestProxy myTest1 = startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestFailure("my_test", "error msg", "method1:1\nmethod2:2", false, null, null);
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("my_test", "error msg", "method1:1\nmethod2:2", false, null, null));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "\nerror msg\nmethod1:1\nmethod2:2\nstderr1 ", "");
 
@@ -215,9 +216,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
 
     //other output order
     final SMTestProxy myTest2 = startTestWithPrinter("my_test2");
-    myEventsProcessor.onTestOutput("my_test2", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test2", "stderr1 ", false);
-    myEventsProcessor.onTestFailure("my_test2", "error msg", "method1:1\nmethod2:2", false, null, null);
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stderr1 ", false));
+    myEventsProcessor.onTestFailure(new TestFailedEvent("my_test2", "error msg", "method1:1\nmethod2:2", false, null, null));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "stderr1 \nerror msg\nmethod1:1\nmethod2:2\n", "");
     final MockPrinter mockPrinter2 = new MockPrinter(true);
@@ -228,9 +229,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnFailure_EmptyStacktrace() {
     final SMTestProxy myTest1 = startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestFailure("my_test", "error msg", "\n\n", false, null, null);
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("my_test", "error msg", "\n\n", false, null, null));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "\nerror msg\nstderr1 ", "");
 
@@ -242,9 +243,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnFailure_Comparision_Strings() {
     final SMTestProxy myTest1 = startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestFailure("my_test", "error msg", "method1:1\nmethod2:2", false, "actual", "expected");
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("my_test", "error msg", "method1:1\nmethod2:2", false, "actual", "expected"));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
 
     assertAllOutputs(myMockResetablePrinter,
                      // std out
@@ -281,10 +282,10 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnFailure_Comparision_MultilineTexts() {
     final SMTestProxy myTest1 = startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestFailure("my_test", "error msg", "method1:1\nmethod2:2", false,
-                                    "this is:\nactual", "this is:\nexpected");
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("my_test", "error msg", "method1:1\nmethod2:2", false,
+                                    "this is:\nactual", "this is:\nexpected"));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "\nerror msg \n" +
                                                          "\n" +
@@ -304,9 +305,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
  public void testProcessor_OnError() {
     final SMTestProxy myTest1 = startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestFailure("my_test", "error msg", "method1:1\nmethod2:2", true, null, null);
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("my_test", "error msg", "method1:1\nmethod2:2", true, null, null));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "\nerror msg\nmethod1:1\nmethod2:2\nstderr1 ", "");
 
@@ -316,9 +317,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
 
     //other output order
     final SMTestProxy myTest2 = startTestWithPrinter("my_test2");
-    myEventsProcessor.onTestOutput("my_test2", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test2", "stderr1 ", false);
-    myEventsProcessor.onTestFailure("my_test2", "error msg", "method1:1\nmethod2:2", true, null, null);
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stderr1 ", false));
+    myEventsProcessor.onTestFailure(new TestFailedEvent("my_test2", "error msg", "method1:1\nmethod2:2", true, null, null));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "stderr1 \nerror msg\nmethod1:1\nmethod2:2\n", "");
     final MockPrinter mockPrinter2 = new MockPrinter(true);
@@ -330,8 +331,8 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
     final SMTestProxy myTest1 = startTestWithPrinter("my_test");
 
     myEventsProcessor.onError("error msg", "method1:1\nmethod2:2", true);
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "\nerror msg\nmethod1:1\nmethod2:2\nstderr1 ", "");
 
@@ -342,13 +343,13 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
                                                "method1:1\n" +
                                                "method2:2\n" +
                                                "stderr1 ", "");
-    myEventsProcessor.onTestFinished("my_test", 1);
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("my_test", 1));
     myTest1.setFinished();
 
     //other output order
     final SMTestProxy myTest2 = startTestWithPrinter("my_test2");
-    myEventsProcessor.onTestOutput("my_test2", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test2", "stderr1 ", false);
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stderr1 ", false));
     myEventsProcessor.onError("error msg", "method1:1\nmethod2:2", true);
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "stderr1 \nerror msg\nmethod1:1\nmethod2:2\n", "");
@@ -360,7 +361,7 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_Suite_OnErrorMsg() {
     myEventsProcessor.onError("error msg:root", "method1:1\nmethod2:2", true);
 
-    myEventsProcessor.onSuiteStarted("suite", null);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("suite", null));
     final SMTestProxy suite = myEventsProcessor.getCurrentSuite();
     suite.setPrinter(myMockResetablePrinter);
     myEventsProcessor.onError("error msg:suite", "method1:1\nmethod2:2", true);
@@ -391,9 +392,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnIgnored() {
     final SMTestProxy myTest1 = startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestIgnored("my_test", "ignored msg", null);
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
+    myEventsProcessor.onTestIgnored(new TestIgnoredEvent("my_test", "ignored msg", null));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "stderr1 ", "\nignored msg\n");
 
@@ -403,9 +404,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
 
     //other output order
     final SMTestProxy myTest2 = startTestWithPrinter("my_test2");
-    myEventsProcessor.onTestOutput("my_test2", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test2", "stderr1 ", false);
-    myEventsProcessor.onTestIgnored("my_test2", "ignored msg", null);
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stderr1 ", false));
+    myEventsProcessor.onTestIgnored(new TestIgnoredEvent("my_test2", "ignored msg", null));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ", "stderr1 ", "\nignored msg\n");
     final MockPrinter mockPrinter2 = new MockPrinter(true);
@@ -416,9 +417,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testProcessor_OnIgnored_WithStacktrace() {
     final SMTestProxy myTest1 = startTestWithPrinter("my_test");
 
-    myEventsProcessor.onTestIgnored("my_test", "ignored2 msg", "method1:1\nmethod2:2");
-    myEventsProcessor.onTestOutput("my_test", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test", "stderr1 ", false);
+    myEventsProcessor.onTestIgnored(new TestIgnoredEvent("my_test", "ignored2 msg", "method1:1\nmethod2:2"));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test", "stderr1 ", false));
 
     assertAllOutputs(myMockResetablePrinter, "stdout1 ",
                      "\nmethod1:1\nmethod2:2\nstderr1 ",
@@ -433,9 +434,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
 
     //other output order
     final SMTestProxy myTest2 = startTestWithPrinter("my_test2");
-    myEventsProcessor.onTestOutput("my_test2", "stdout1 ", true);
-    myEventsProcessor.onTestOutput("my_test2", "stderr1 ", false);
-    myEventsProcessor.onTestIgnored("my_test2", "ignored msg", "method1:1\nmethod2:2");
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stdout1 ", true));
+    myEventsProcessor.onTestOutput(new TestOutputEvent("my_test2", "stderr1 ", false));
+    myEventsProcessor.onTestIgnored(new TestIgnoredEvent("my_test2", "ignored msg", "method1:1\nmethod2:2"));
 
     assertAllOutputs(myMockResetablePrinter,
                      "stdout1 ",
@@ -465,7 +466,7 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testOnUncapturedOutput_SomeSuite() {
     myEventsProcessor.onStartTesting();
 
-    myEventsProcessor.onSuiteStarted("my suite", null);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("my suite", null));
     final SMTestProxy mySuite = myEventsProcessor.getCurrentSuite();
     assertTrue(mySuite != myRootSuite);
     mySuite.setPrinter(myMockResetablePrinter);
@@ -476,7 +477,7 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   public void testOnUncapturedOutput_SomeTest() {
     myEventsProcessor.onStartTesting();
 
-    myEventsProcessor.onSuiteStarted("my suite", null);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("my suite", null));
     startTestWithPrinter("my test");
 
     assertOnUncapturedOutput();
@@ -514,9 +515,9 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
     myConsole.attachToProcess(null);
 
     myEventsProcessor.onStartTesting();
-    myEventsProcessor.onSuiteStarted("suite", null);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("suite", null));
     final SMTestProxy suite = myEventsProcessor.getCurrentSuite();
-    myEventsProcessor.onSuiteFinished("suite");
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite"));
     myEventsProcessor.onUncapturedOutput("preved", ProcessOutputTypes.STDOUT);
     myEventsProcessor.onFinishTesting();
 
@@ -536,7 +537,7 @@ public class SMTRunnerConsoleTest extends BaseSMTRunnerTestCase {
   }
 
   private SMTestProxy startTestWithPrinter(final String testName) {
-    myEventsProcessor.onTestStarted(testName, null);
+    myEventsProcessor.onTestStarted(new TestStartedEvent(testName, null));
     final SMTestProxy proxy =
         myEventsProcessor.getProxyByFullTestName(myEventsProcessor.getFullTestName(testName));
     proxy.setPrinter(myMockResetablePrinter);
diff --git a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java
index 6ed0317ee996..b4aa1ee7148c 100644
--- a/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java
+++ b/platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsFormTest.java
@@ -21,6 +21,7 @@ import com.intellij.execution.testframework.sm.Marker;
 import com.intellij.execution.testframework.sm.runner.BaseSMTRunnerTestCase;
 import com.intellij.execution.testframework.sm.runner.GeneralToSMTRunnerEventsConvertor;
 import com.intellij.execution.testframework.sm.runner.SMTestProxy;
+import com.intellij.execution.testframework.sm.runner.events.*;
 import com.intellij.openapi.progress.util.ColorProgressBar;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Ref;
@@ -226,24 +227,24 @@ public class SMTestRunnerResultsFormTest extends BaseSMTRunnerTestCase {
     TestConsoleProperties.HIDE_PASSED_TESTS.set(myConsoleProperties, true);
 
     myEventsProcessor.onStartTesting();
-    myEventsProcessor.onSuiteStarted("suite", null);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("suite", null));
     myResultsViewer.performUpdate();
 
-    myEventsProcessor.onTestStarted("test_failed", null);
+    myEventsProcessor.onTestStarted(new TestStartedEvent("test_failed", null));
     myResultsViewer.performUpdate();
-    myEventsProcessor.onTestFailure("test_failed", "", "", false, null, null);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("test_failed", "", "", false, null, null));
     myResultsViewer.performUpdate();
-    myEventsProcessor.onTestFinished("test_failed", 10);
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("test_failed", 10));
     myResultsViewer.performUpdate();
 
-    myEventsProcessor.onTestStarted("test", null);
+    myEventsProcessor.onTestStarted(new TestStartedEvent("test", null));
     myResultsViewer.performUpdate();
     assertEquals(2, myTreeModel.getChildCount(myTreeModel.getChild(myTreeModel.getRoot(), 0)));
 
-    myEventsProcessor.onTestFinished("test", 10);
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("test", 10));
     assertEquals(2, myTreeModel.getChildCount(myTreeModel.getChild(myTreeModel.getRoot(), 0)));
 
-    myEventsProcessor.onSuiteFinished("suite");
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite"));
     myEventsProcessor.onFinishTesting();
 
     assertEquals(1, myTreeModel.getChildCount(myTreeModel.getChild(myTreeModel.getRoot(), 0)));
@@ -251,27 +252,27 @@ public class SMTestRunnerResultsFormTest extends BaseSMTRunnerTestCase {
 
   public void testExpandIfOnlyOneRootChild() throws InterruptedException {
     myEventsProcessor.onStartTesting();
-    myEventsProcessor.onSuiteStarted("suite1", null);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("suite1", null));
     myResultsViewer.performUpdate();
-    myEventsProcessor.onSuiteStarted("suite2", null);
+    myEventsProcessor.onSuiteStarted(new TestSuiteStartedEvent("suite2", null));
     myResultsViewer.performUpdate();
 
-    myEventsProcessor.onTestStarted("test_failed", null);
+    myEventsProcessor.onTestStarted(new TestStartedEvent("test_failed", null));
     myResultsViewer.performUpdate();
-    myEventsProcessor.onTestFailure("test_failed", "", "", false, null, null);
+    myEventsProcessor.onTestFailure(new TestFailedEvent("test_failed", "", "", false, null, null));
     myResultsViewer.performUpdate();
-    myEventsProcessor.onTestFinished("test_failed", 10);
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("test_failed", 10));
     myResultsViewer.performUpdate();
 
-    myEventsProcessor.onTestStarted("test", null);
+    myEventsProcessor.onTestStarted(new TestStartedEvent("test", null));
     myResultsViewer.performUpdate();
 
-    myEventsProcessor.onTestFinished("test", 10);
+    myEventsProcessor.onTestFinished(new TestFinishedEvent("test", 10));
     myResultsViewer.performUpdate();
 
-    myEventsProcessor.onSuiteFinished("suite2");
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite2"));
     myResultsViewer.performUpdate();
-    myEventsProcessor.onSuiteFinished("suite1");
+    myEventsProcessor.onSuiteFinished(new TestSuiteFinishedEvent("suite1"));
     myResultsViewer.performUpdate();
     myEventsProcessor.onFinishTesting();
     myResultsViewer.performUpdate();

From 55af94604ffbf7f085b4ebf2952c73da0bed9261 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Mon, 4 Jun 2012 19:49:48 +0400
Subject: [PATCH 173/239] Inspections

---
 .../intellij/designer/componentTree/QuickFixManager.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/QuickFixManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/QuickFixManager.java
index 06493e5b828c..1d445496e355 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/QuickFixManager.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/QuickFixManager.java
@@ -61,6 +61,10 @@ public final class QuickFixManager extends AbstractQuickFixManager implements Co
   @Override
   protected Rectangle getErrorBounds() {
     ComponentTree component = (ComponentTree)myComponent;
-    return component.getPathBounds(component.getSelectionPath());
+    Rectangle bounds = component.getPathBounds(component.getSelectionPath());
+    if (bounds != null) {
+      bounds.x += ICON.getIconWidth();
+    }
+    return bounds;
   }
 }
\ No newline at end of file

From 11d77c06421fdd57584b11e4823006c687d66b67 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Mon, 4 Jun 2012 19:53:00 +0400
Subject: [PATCH 174/239] Morphing

---
 .../android/designer/icons/scroll_to_h_v.png  | Bin 141 -> 0 bytes
 .../model/scroll/RadScrollViewComponent.java  |  80 ------------------
 .../model/scroll/RadScrollViewLayout.java     |  40 ---------
 .../designer/model/views-meta-model.xml       |  58 +++++++++++--
 4 files changed, 53 insertions(+), 125 deletions(-)
 delete mode 100644 plugins/android-designer/src/com/intellij/android/designer/icons/scroll_to_h_v.png
 delete mode 100644 plugins/android-designer/src/com/intellij/android/designer/model/scroll/RadScrollViewComponent.java
 delete mode 100644 plugins/android-designer/src/com/intellij/android/designer/model/scroll/RadScrollViewLayout.java

diff --git a/plugins/android-designer/src/com/intellij/android/designer/icons/scroll_to_h_v.png b/plugins/android-designer/src/com/intellij/android/designer/icons/scroll_to_h_v.png
deleted file mode 100644
index 8349d4caedc557fa115610dbcfd7b48708497ee4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|uK)l42QoW4IvV|cnE+Xg
zB|(0{3=Yq3qyafbo-U3d9MQ=UtSmgdJUl)Hi#R<DbelFsFgLJpcN}FBV%~h<m6X&B
jiCJN~4Vw-mDJ*9A!X$ie&V_DKpl$|FS3j3^P6<r_apWgE

diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/scroll/RadScrollViewComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/scroll/RadScrollViewComponent.java
deleted file mode 100644
index 269eb6635db2..000000000000
--- a/plugins/android-designer/src/com/intellij/android/designer/model/scroll/RadScrollViewComponent.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.android.designer.model.scroll;
-
-import com.intellij.android.designer.model.RadViewComponent;
-import com.intellij.android.designer.model.ViewsMetaManager;
-import com.intellij.designer.designSurface.DesignerEditorPanel;
-import com.intellij.designer.model.MetaManager;
-import com.intellij.designer.model.MetaModel;
-import com.intellij.designer.model.RadComponent;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DefaultActionGroup;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.util.ThrowableRunnable;
-
-import javax.swing.*;
-import java.util.List;
-
-/**
- * @author Alexander Lobas
- */
-public class RadScrollViewComponent extends RadViewComponent {
-  private static final Icon SCROLL = IconLoader.getIcon("/com/intellij/android/designer/icons/scroll_to_h_v.png");
-
-  @Override
-  public void addSelectionActions(DesignerEditorPanel designer,
-                                  DefaultActionGroup actionGroup,
-                                  JComponent shortcuts,
-                                  List<RadComponent> selection) {
-    if (selection.size() == 1) {
-      addScrollAction(designer, actionGroup, shortcuts, this);
-    }
-  }
-
-  public static void addScrollAction(final DesignerEditorPanel designer,
-                                     DefaultActionGroup actionGroup,
-                                     JComponent shortcuts,
-                                     final RadViewComponent scrollContainer) {
-    String text = "Convert ScrollView to horizontal/vertical";
-    actionGroup.add(new AnAction(text, text, SCROLL) {
-      @Override
-      public void actionPerformed(AnActionEvent e) {
-        designer.getToolProvider().execute(new ThrowableRunnable<Exception>() {
-          @Override
-          public void run() throws Exception {
-            MetaManager manager = ViewsMetaManager.getInstance(scrollContainer.getTag().getProject());
-            MetaModel vScrollView = manager.getModelByTag("ScrollView");
-            MetaModel hScrollView = manager.getModelByTag("HorizontalScrollView");
-
-            scrollContainer.setMetaModel(scrollContainer.getMetaModel() == vScrollView ? hScrollView : vScrollView);
-
-            ApplicationManager.getApplication().runWriteAction(new Runnable() {
-              @Override
-              public void run() {
-                scrollContainer.getTag().setName(scrollContainer.getMetaModel().getTag());
-              }
-            });
-
-            // TODO: maybe reload properties
-          }
-        }, getTemplatePresentation().getText(), true);
-      }
-    });
-  }
-}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/scroll/RadScrollViewLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/scroll/RadScrollViewLayout.java
deleted file mode 100644
index 43ba95584d6c..000000000000
--- a/plugins/android-designer/src/com/intellij/android/designer/model/scroll/RadScrollViewLayout.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.android.designer.model.scroll;
-
-import com.intellij.android.designer.model.RadSingleChildrenViewLayout;
-import com.intellij.android.designer.model.RadViewComponent;
-import com.intellij.designer.designSurface.DesignerEditorPanel;
-import com.intellij.designer.model.RadComponent;
-import com.intellij.openapi.actionSystem.DefaultActionGroup;
-
-import javax.swing.*;
-import java.util.List;
-
-/**
- * @author Alexander Lobas
- */
-public class RadScrollViewLayout extends RadSingleChildrenViewLayout {
-  @Override
-  public void addSelectionActions(DesignerEditorPanel designer,
-                                  DefaultActionGroup actionGroup,
-                                  JComponent shortcuts,
-                                  List<RadComponent> selection) {
-    if (selection.size() == 1) {
-      RadScrollViewComponent.addScrollAction(designer, actionGroup, shortcuts, (RadViewComponent)myContainer);
-    }
-  }
-}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
index 1a2b8cf867fc..cf484ff287c5 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
@@ -82,6 +82,8 @@
     <palette title="TextView" icon="/com/intellij/android/designer/icons/TextView.png"
              tooltip="Displays text to the user and optionally allows them to edit it."/>
 
+    <morphing to="EditText ImageView CheckedTextView"/>
+
     <properties
         inplace="text"
         important="text hint textColor typeface textStyle gravity editable enabled"
@@ -108,7 +110,7 @@
     <palette title="Button" icon="/com/intellij/android/designer/icons/Button.png"
              tooltip="Represents a push-button widget."/>
 
-    <morphing to="RadioButton CheckBox ToggleButton"/>
+    <morphing to="RadioButton CheckBox ToggleButton ZoomButton ImageButton TextView EditText"/>
 
     <properties
         inplace="text"
@@ -161,6 +163,8 @@
     <palette title="RadioButton" icon="/com/intellij/android/designer/icons/RadioButton.png"
              tooltip="A radio button is a two-states button that can be either checked or unchecked."/>
 
+    <morphing to="Button CheckBox ToggleButton ZoomButton ImageButton TextView EditText"/>
+
     <creation>
       <![CDATA[
           <RadioButton
@@ -178,6 +182,8 @@
 
     <presentation title=" - &quot;%text%&quot;"/>
 
+    <morphing to="Button RadioButton ToggleButton ZoomButton ImageButton TextView EditText"/>
+
     <palette title="CheckBox" icon="/com/intellij/android/designer/icons/CheckBox.png"
              tooltip="A checkbox is a specific type of two-states button that can be either checked or unchecked."/>
 
@@ -201,6 +207,8 @@
     <palette title="ToggleButton" icon="/com/intellij/android/designer/icons/ToggleButton.png"
              tooltip="Displays checked/unchecked states as a button with a 'light' indicator and by default accompanied with the text 'ON' or 'OFF'. "/>
 
+    <morphing to="Button RadioButton CheckBox ZoomButton ImageButton TextView EditText"/>
+
     <properties important="textOn textOff disabledAlpha"/>
 
     <creation>
@@ -223,6 +231,8 @@
     <palette title="CheckedTextView" icon="/com/intellij/android/designer/icons/CheckedTextView.png"
              tooltip="An extension to TextView that supports the Checkable interface."/>
 
+    <morphing to="TextView EditText ImageView"/>
+
     <properties inplace="text checked" important="checked checkMark"/>
 
     <creation>
@@ -245,6 +255,8 @@
     <palette title="EditText" icon="/com/intellij/android/designer/icons/EditText.png"
              tooltip="EditText is a thin veneer over TextView that configures itself to be editable."/>
 
+    <morphing to="TextView CheckedTextView ImageView SearchView"/>
+
     <creation>
       <![CDATA[
           <EditText
@@ -265,6 +277,8 @@
     <palette title="AutoCompleteTextView" icon="/com/intellij/android/designer/icons/AutoCompleteTextView.png"
              tooltip="An editable text view that shows completion suggestions automatically while the user is typing."/>
 
+    <morphing to="TextView CheckedTextView EditText MultiAutoCompleteTextView ImageView SearchView"/>
+
     <properties inplace="text inputType"/>
 
     <creation>
@@ -287,6 +301,8 @@
     <palette title="MultiAutoCompleteTextView" icon="/com/intellij/android/designer/icons/MultiAutoCompleteTextView.png"
              tooltip="An editable text view, extending AutoCompleteTextView, that can show completion suggestions for the substring of the text where the user is typing instead of necessarily for the entire thing."/>
 
+    <morphing to="TextView CheckedTextView EditText AutoCompleteTextView ImageView SearchView"/>
+
     <creation>
       <![CDATA[
           <MultiAutoCompleteTextView
@@ -325,6 +341,8 @@
     <palette title="AnalogClock" icon="/com/intellij/android/designer/icons/AnalogClock.png"
              tooltip="This widget display an analogic clock with two hands for hours and minutes."/>
 
+    <morphing to="DigitalClock"/>
+
     <creation>
       <![CDATA[
           <AnalogClock
@@ -342,6 +360,8 @@
     <palette title="DigitalClock" icon="/com/intellij/android/designer/icons/DigitalClock.png"
              tooltip="Like AnalogClock, but digital. Shows seconds."/>
 
+    <morphing to="AnalogClock"/>
+
     <creation>
       <![CDATA[
           <DigitalClock
@@ -430,6 +450,8 @@
     <palette title="ProgressBar" icon="/com/intellij/android/designer/icons/ProgressBar.png"
              tooltip="Visual indicator of progress in some operation."/>
 
+    <morphing to="SeekBar RatingBar"/>
+
     <properties inplace="max progress indeterminate"
                 important="max progress indeterminate"/>
 
@@ -450,6 +472,8 @@
     <palette title="SeekBar" icon="/com/intellij/android/designer/icons/SeekBar.png"
              tooltip="A SeekBar is an extension of ProgressBar that adds a draggable thumb."/>
 
+    <morphing to="ProgressBar RatingBar"/>
+
     <creation>
       <![CDATA[
           <SeekBar
@@ -467,6 +491,8 @@
     <palette title="RatingBar" icon="/com/intellij/android/designer/icons/RatingBar.png"
              tooltip="A RatingBar is an extension of SeekBar and ProgressBar that shows a rating in stars."/>
 
+    <morphing to="ProgressBar SeekBar"/>
+
     <properties inplace="numStars rating stepSize"
                 important="numStars rating stepSize"
                 expert="max progress indeterminate isIndicator"/>
@@ -488,6 +514,8 @@
     <palette title="ImageView" icon="/com/intellij/android/designer/icons/ImageView.png"
              tooltip="Displays an arbitrary image, such as an icon."/>
 
+    <morphing to="TextView EditText CheckedTextView"/>
+
     <properties inplace="src"
                 important="src"/>
 
@@ -508,6 +536,8 @@
     <palette title="ImageButton" icon="/com/intellij/android/designer/icons/ImageButton.png"
              tooltip="Displays a button with an image (instead of text) that can be pressed or clicked by the user."/>
 
+    <morphing to="Button RadioButton CheckBox ToggleButton ZoomButton TextView EditText"/>
+
     <creation>
       <![CDATA[
           <ImageButton
@@ -525,6 +555,8 @@
     <palette title="ZoomButton" icon="/com/intellij/android/designer/icons/ZoomButton.png"
              tooltip="ZoomButton"/>
 
+    <morphing to="Button RadioButton CheckBox ToggleButton ImageButton TextView EditText"/>
+
     <creation>
       <![CDATA[
           <ZoomButton
@@ -638,6 +670,8 @@
     <palette title="DatePicker" icon="/com/intellij/android/designer/icons/DatePicker.png"
              tooltip="This class is a widget for selecting a date."/>
 
+    <morphing to="TimePicker CalendarView"/>
+
     <properties important="startYear endYear spinnersShown calendarViewShown minDate maxDate layout"/>
 
     <creation>
@@ -657,6 +691,8 @@
     <palette title="CalendarView" icon="/com/intellij/android/designer/icons/CalendarView.png"
              tooltip="This class is a calendar widget for displaying and selecting dates."/>
 
+    <morphing to="DatePicker TimePicker"/>
+
     <properties
         important="firstDayOfWeek showWeekNumber minDate maxDate shownWeekCount weekDayTextAppearance dateTextAppearance"/>
 
@@ -677,6 +713,8 @@
     <palette title="TimePicker" icon="/com/intellij/android/designer/icons/TimePicker.png"
              tooltip="A view for selecting the time of day, in either 24 hour or AM/PM mode."/>
 
+    <morphing to="DatePicker CalendarView"/>
+
     <properties inplace="layout"
                 important="layout"/>
 
@@ -756,6 +794,8 @@
     <palette title="ListView" icon="/com/intellij/android/designer/icons/ListView.png"
              tooltip="A view that shows items in a vertically scrolling list. The items come from the ListAdapter associated with this view."/>
 
+    <morphing to="ExpandableListView GridView"/>
+
     <properties important="entries divider dividerHeight headerDividersEnabled footerDividersEnabled overScrollHeader overScrollFooter"/>
 
     <creation>
@@ -775,6 +815,8 @@
     <palette title="ExpandableListView" icon="/com/intellij/android/designer/icons/ExpandableListView.png"
              tooltip="A view that shows items in a vertically scrolling two-level list. This differs from the ListView by allowing two levels: groups which can individually be expanded to show its children."/>
 
+    <morphing to="ListView GridView"/>
+
     <properties important="groupIndicator childIndicator indicatorLeft indicatorRight childIndicatorLeft childIndicatorRight childDivider"/>
 
     <creation>
@@ -794,6 +836,8 @@
     <palette title="GridView" icon="/com/intellij/android/designer/icons/GridView.png"
              tooltip="A view that shows items in two-dimensional scrolling grid. The items in the grid come from the ListAdapter associated with this view."/>
 
+    <morphing to="ListView ExpandableListView"/>
+
     <properties inplace="numColumns"
                 important="horizontalSpacing verticalSpacing stretchMode columnWidth numColumns gravity"/>
 
@@ -824,14 +868,16 @@
     </creation>
   </meta>
 
-  <meta model="com.intellij.android.designer.model.scroll.RadScrollViewComponent"
-        layout="com.intellij.android.designer.model.scroll.RadScrollViewLayout"
+  <meta model="com.intellij.android.designer.model.RadViewComponent"
+        layout="com.intellij.android.designer.model.RadSingleChildrenViewLayout"
         class="android.widget.ScrollView"
         tag="ScrollView">
 
     <palette title="ScrollView" icon="/com/intellij/android/designer/icons/ScrollView.png"
              tooltip="Layout container for a view hierarchy that can be scrolled by the user, allowing it to be larger than the physical display. ScrollView only supports vertical scrolling."/>
 
+    <morphing to="HorizontalScrollView"/>
+
     <properties inplace="fillViewport"
                 important="fillViewport"/>
 
@@ -845,14 +891,16 @@
     </creation>
   </meta>
 
-  <meta model="com.intellij.android.designer.model.scroll.RadScrollViewComponent"
-        layout="com.intellij.android.designer.model.scroll.RadScrollViewLayout"
+  <meta model="com.intellij.android.designer.model.RadViewComponent"
+        layout="com.intellij.android.designer.model.RadSingleChildrenViewLayout"
         class="android.widget.HorizontalScrollView"
         tag="HorizontalScrollView">
 
     <palette title="HorizontalScrollView" icon="/com/intellij/android/designer/icons/HorizontalScrollView.png"
              tooltip="Layout container for a view hierarchy that can be scrolled by the user, allowing it to be larger than the physical display."/>
 
+    <morphing to="ScrollView"/>
+
     <properties inplace="fillViewport"
                 important="fillViewport"/>
 

From c2eec741813f9f27c1434e1de8a6ca7367a249df Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 4 Jun 2012 19:42:45 +0400
Subject: [PATCH 175/239] restore caret position and dispose rangemarker after
 rename performed

---
 .../rename/inplace/MemberInplaceRenamer.java  | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
index 0640b0d0da2d..6d5477e406f2 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/rename/inplace/MemberInplaceRenamer.java
@@ -206,10 +206,6 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
       }
       finally {
         FinishMarkAction.finish(myProject, myEditor, markAction);
-        if (myBeforeRevert != null) {
-          myEditor.getCaretModel().moveToOffset(myBeforeRevert.getEndOffset());
-          myBeforeRevert.dispose();
-        }
       }
     }
   }
@@ -219,7 +215,17 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
     final RenameProcessor
       renameProcessor = new RenameProcessor(myProject, element, newName,
                                             elementProcessor.isToSearchInComments(element),
-                                            elementProcessor.isToSearchForTextOccurrences(element));
+                                            elementProcessor.isToSearchForTextOccurrences(element)){
+      @Override
+      public void doRun() {
+        try {
+          super.doRun();
+        }
+        finally {
+          restoreCaretOffsetAfterRename();
+        }
+      }
+    };
     for (AutomaticRenamerFactory factory : Extensions.getExtensions(AutomaticRenamerFactory.EP_NAME)) {
       if (factory.getOptionName() != null && factory.isApplicable(element)) {
         renameProcessor.addRenamerFactory(factory);
@@ -228,6 +234,13 @@ public class MemberInplaceRenamer extends VariableInplaceRenamer {
     renameProcessor.run();
   }
 
+  protected void restoreCaretOffsetAfterRename() {
+    if (myBeforeRevert != null) {
+      myEditor.getCaretModel().moveToOffset(myBeforeRevert.getEndOffset());
+      myBeforeRevert.dispose();
+    }
+  }
+
   @Override
   protected void collectAdditionalElementsToRename(List<Pair<PsiElement, TextRange>> stringUsages) {
     //do not highlight non-code usages in file

From b3f2d2939828fd2be305b99552227b740cb97488 Mon Sep 17 00:00:00 2001
From: Alexander Kirillin <angus@jetbrains.com>
Date: Mon, 4 Jun 2012 20:28:30 +0400
Subject: [PATCH 176/239] non-prefix matching in goto... actions

---
 .../actions/InspectionListCellRenderer.java          |  6 ++++++
 .../ide/util/gotoByName/ChooseByNameBase.java        | 10 ++++++++--
 .../gotoByName/ContributorsBasedGotoByModel.java     |  7 +------
 .../ide/util/gotoByName/GotoFileCellRenderer.java    | 12 +++++++++---
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/InspectionListCellRenderer.java b/platform/lang-impl/src/com/intellij/codeInspection/actions/InspectionListCellRenderer.java
index 92edbe05a58d..8033086b6bb8 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/actions/InspectionListCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/InspectionListCellRenderer.java
@@ -17,6 +17,7 @@ package com.intellij.codeInspection.actions;
 
 import com.intellij.codeInspection.InspectionProfileEntry;
 import com.intellij.codeInspection.ex.LocalInspectionToolWrapper;
+import com.intellij.ide.util.gotoByName.ChooseByNameBase;
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.fileTypes.UnknownFileType;
@@ -82,6 +83,11 @@ public class InspectionListCellRenderer extends DefaultListCellRenderer implemen
       right.add(icon, BorderLayout.EAST);
       panel.add(right, BorderLayout.EAST);
     }
+    else {
+      // E.g. "..." item
+      Component component = super.getListCellRendererComponent(list, value, index, sel, focus);
+      return value == ChooseByNameBase.NON_PREFIX_SEPARATOR ? ChooseByNameBase.renderNonPrefixSeparatorComponent(component) : component;
+    }
 
     return panel;
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index 0b746ecfd268..680db9fdb11f 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -410,8 +410,9 @@ public abstract class ChooseByNameBase {
               curElements.add(psi);
             }
           }
-          else if (object == NON_PREFIX_SEPARATOR)
+          else if (object == NON_PREFIX_SEPARATOR) {
             curElements = nonPrefixMatchElements;
+          }
         }
         return new PsiElement[][]{PsiUtilCore.toPsiElementArray(prefixMatchElements), PsiUtilCore.toPsiElementArray(nonPrefixMatchElements)};
       }
@@ -1398,7 +1399,12 @@ public abstract class ChooseByNameBase {
   }
 
   private static final String EXTRA_ELEM = "...";
-  static final String NON_PREFIX_SEPARATOR = "non-prefix matches:";
+  public static final String NON_PREFIX_SEPARATOR = "non-prefix matches:";
+
+  public static Component renderNonPrefixSeparatorComponent(Component component) {
+    component.setFont(component.getFont().deriveFont(Font.PLAIN, component.getFont().getSize() - 2));
+    return component;
+  }
 
   private class CalcElementsThread implements Runnable {
     private final String myPattern;
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
index f7bcd30ee03c..01eda277a3cf 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ContributorsBasedGotoByModel.java
@@ -58,12 +58,7 @@ public abstract class ContributorsBasedGotoByModel implements ChooseByNameModel
       @Override
       public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
         Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-
-        if (value == ChooseByNameBase.NON_PREFIX_SEPARATOR) {
-          component.setFont(component.getFont().deriveFont(Font.BOLD, component.getFont().getSize() - 2));
-        }
-
-        return component;
+        return value == ChooseByNameBase.NON_PREFIX_SEPARATOR ? ChooseByNameBase.renderNonPrefixSeparatorComponent(component) : component;
       }
     };
   }
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileCellRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileCellRenderer.java
index fba16cac1ee9..ec6512bd4126 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoFileCellRenderer.java
@@ -42,15 +42,21 @@ public class GotoFileCellRenderer extends PsiElementListCellRenderer<PsiFile> {
 
   public GotoFileCellRenderer(int maxSize) {
     myMaxWidth = maxSize;
-    EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme();
-    Font editorFont = new Font(scheme.getEditorFontName(), Font.PLAIN, scheme.getEditorFontSize());
-    setFont(editorFont);
   }
 
   public String getElementText(PsiFile element) {
     return element.getName();
   }
 
+  @Override
+  public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+    Component component = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+    EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme();
+    Font editorFont = new Font(scheme.getEditorFontName(), Font.PLAIN, scheme.getEditorFontSize());
+    setFont(editorFont);
+    return value == ChooseByNameBase.NON_PREFIX_SEPARATOR ? ChooseByNameBase.renderNonPrefixSeparatorComponent(component) : component;
+  }
+
   protected String getContainerText(PsiFile element, String name) {
     final PsiDirectory psiDirectory = element.getContainingDirectory();
     if (psiDirectory == null) return null;

From 7a656d571a1ba7dd1b19c24bfb0afb1c315168ff Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Mon, 4 Jun 2012 18:51:28 +0400
Subject: [PATCH 177/239] IDEA-73251 folding for identifier only

---
 .../RecursiveMethodCallFoldingBuilder.java    | 58 ++++++-------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
index a333490c0fad..5cf8424aebc1 100644
--- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
@@ -22,19 +22,16 @@ import com.intellij.lang.folding.FoldingDescriptor;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.SourceTreeToPsiMap;
+import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 /**
  * @author Danila Ponomarenko
  */
 public class RecursiveMethodCallFoldingBuilder extends FoldingBuilderEx {
-
   @NotNull
   @Override
   public FoldingDescriptor[] buildFoldRegions(@NotNull PsiElement root, @NotNull Document document, boolean quick) {
@@ -42,62 +39,43 @@ public class RecursiveMethodCallFoldingBuilder extends FoldingBuilderEx {
       return FoldingDescriptor.EMPTY;
     }
     final List<FoldingDescriptor> result = new ArrayList<FoldingDescriptor>();
-    root.accept(new JavaRecursiveElementWalkingVisitor() {
-
-      @Override
-      public void visitMethodCallExpression(PsiMethodCallExpression expression) {
-        if (isRecursiveMethodCall(expression)) {
-          result.add(new FoldingDescriptor(expression, expression.getTextRange()));
-        }
-        else {
+    root.accept(
+      new JavaRecursiveElementWalkingVisitor() {
+        @Override
+        public void visitMethodCallExpression(PsiMethodCallExpression expression) {
+          if (isRecursiveMethodCall(expression)) {
+            final PsiIdentifier identifier = PsiTreeUtil.getChildOfType(expression.getMethodExpression(), PsiIdentifier.class);
+            if (identifier != null) {
+              result.add(new FoldingDescriptor(identifier, identifier.getTextRange()));
+            }
+          }
           super.visitMethodCallExpression(expression);
         }
       }
-    });
+    );
 
     return result.toArray(new FoldingDescriptor[result.size()]);
   }
 
   @Override
   public boolean isCollapsedByDefault(@NotNull ASTNode node) {
-    final PsiElement element = SourceTreeToPsiMap.treeElementToPsi(node);
-    JavaCodeFoldingSettings settings = JavaCodeFoldingSettings.getInstance();
-
-    if (element instanceof PsiMethodCallExpression) {
-      final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)element;
-      return isRecursiveMethodCall(methodCall) && settings.isCollapseRecursiveMethodCalls();
-    }
-    return false;
+    return JavaCodeFoldingSettings.getInstance().isCollapseRecursiveMethodCalls();
   }
 
-  private static final char ANTICLOCKWISE_GAPPED_CIRCLE_ARROW = '\u27F2'; //⟲
+  private static final String ANTICLOCKWISE_GAPPED_CIRCLE_ARROW = "\u27F2"; //⟲
 
   @Override
   public String getPlaceholderText(@NotNull ASTNode node) {
-    return getPlaceholderText(node.getPsi());
-  }
+    final PsiElement element = node.getPsi();
 
-  @NotNull
-  private static String getPlaceholderText(@NotNull PsiElement element) {
-    if (element instanceof PsiMethodCallExpression) {
-      final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)element;
-      return getPlaceholderText(methodCall);
+    if (element instanceof PsiIdentifier) {
+      final PsiIdentifier identifier = (PsiIdentifier)element;
+      return ANTICLOCKWISE_GAPPED_CIRCLE_ARROW + identifier.getText();
     }
 
     return element.getText();
   }
 
-  @NotNull
-  private static String getPlaceholderText(@NotNull PsiMethodCallExpression methodCall) {
-    return getQualifierText(methodCall) + ANTICLOCKWISE_GAPPED_CIRCLE_ARROW + methodCall.getArgumentList().getText();
-  }
-
-  @NotNull
-  private static String getQualifierText(@NotNull PsiMethodCallExpression methodCall) {
-    final PsiElement qualifier = methodCall.getMethodExpression().getQualifier();
-    return qualifier != null ? qualifier.getText() + "." : "";
-  }
-
   private static boolean isRecursiveMethodCall(@NotNull PsiMethodCallExpression methodCall) {
     final PsiMethod referencedMethod = methodCall.resolveMethod();
 

From 667a9d2e18a8ee022f9b3761f40393d764bd9276 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Mon, 4 Jun 2012 20:49:15 +0400
Subject: [PATCH 178/239] IDEA-73251 recursive method call icon on gutter

---
 .../intellij/codeInsight/RecursionUtil.java   |  44 ++++
 .../impl/RecursiveCallLineMarkerProvider.java | 196 ++++++++++++++++++
 .../RecursiveMethodCallFoldingBuilder.java    |  23 +-
 resources/src/META-INF/IdeaPlugin.xml         |   1 +
 4 files changed, 243 insertions(+), 21 deletions(-)
 create mode 100644 java/java-impl/src/com/intellij/codeInsight/RecursionUtil.java
 create mode 100644 java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/RecursionUtil.java b/java/java-impl/src/com/intellij/codeInsight/RecursionUtil.java
new file mode 100644
index 000000000000..00e0bf788c60
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInsight/RecursionUtil.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight;
+
+import com.intellij.openapi.util.Comparing;
+import com.intellij.psi.PsiExpression;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiMethodCallExpression;
+import com.intellij.psi.PsiThisExpression;
+import com.intellij.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public class RecursionUtil {
+  public static boolean isRecursiveMethodCall(@NotNull PsiMethodCallExpression methodCall) {
+    final PsiMethod method = PsiTreeUtil.getParentOfType(methodCall, PsiMethod.class);
+    if (method == null) {
+      return false;
+    }
+
+    final PsiMethod resolvedMethod = methodCall.resolveMethod();
+
+    if (!Comparing.equal(method, resolvedMethod)) {
+      return false;
+    }
+    final PsiExpression qualifier = methodCall.getMethodExpression().getQualifierExpression();
+    return qualifier == null || qualifier instanceof PsiThisExpression;
+  }
+}
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
new file mode 100644
index 000000000000..85f27d544401
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.daemon.impl;
+
+import com.intellij.codeHighlighting.Pass;
+import com.intellij.codeInsight.RecursionUtil;
+import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
+import com.intellij.codeInsight.daemon.LineMarkerInfo;
+import com.intellij.codeInsight.daemon.LineMarkerProvider;
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.ScrollType;
+import com.intellij.openapi.editor.markup.GutterIconRenderer;
+import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.ui.popup.JBPopupFactory;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.*;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.util.PsiUtilBase;
+import com.intellij.ui.awt.RelativePoint;
+import com.intellij.ui.components.JBLabel;
+import com.intellij.ui.components.JBList;
+import com.intellij.util.Function;
+import com.intellij.util.FunctionUtil;
+import com.intellij.util.NotNullFunction;
+import org.jetbrains.annotations.NotNull;
+
+import javax.swing.*;
+import java.awt.event.MouseEvent;
+import java.util.*;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public class RecursiveCallLineMarkerProvider implements LineMarkerProvider, DumbAware {
+  private static final Icon RECURSIVE_METHOD_ICON = AllIcons.Gutter.RecursiveMethod;
+
+  @Override
+  public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
+    return null; //do nothing
+  }
+
+  @Override
+  public void collectSlowLineMarkers(@NotNull List<PsiElement> elements, @NotNull Collection<LineMarkerInfo> result) {
+    final Set<PsiMethod> recMethods = new HashSet<PsiMethod>();
+
+    for (PsiElement element : elements) {
+      if (element instanceof PsiMethodCallExpression) {
+        final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)element;
+        final PsiMethod method = methodCall.resolveMethod();
+        if (method != null && !recMethods.contains(method) && RecursionUtil.isRecursiveMethodCall(methodCall)) {
+          recMethods.add(method);
+          result.add(RecursiveMethodMarkerInfo.create(method));
+        }
+      }
+    }
+  }
+
+  @NotNull
+  private static List<PsiMethodCallExpression> getRecursiveMethodCalls(final @NotNull PsiMethod method) {
+    final List<PsiMethodCallExpression> result = new ArrayList<PsiMethodCallExpression>();
+    ApplicationManager.getApplication().runReadAction(new Runnable() {
+      @Override
+      public void run() {
+        method.accept(new JavaRecursiveElementWalkingVisitor() {
+          @Override
+          public void visitMethodCallExpression(PsiMethodCallExpression expression) {
+            if (RecursionUtil.isRecursiveMethodCall(expression)) {
+              result.add(expression);
+            }
+            super.visitMethodCallExpression(expression);
+          }
+        });
+      }
+    });
+    return result;
+  }
+
+  private static class RecursiveMethodMarkerInfo extends LineMarkerInfo<PsiMethod> {
+    public RecursiveMethodMarkerInfo(PsiMethod method,
+                                     TextRange range,
+                                     Icon icon,
+                                     int markers,
+                                     Function<PsiMethod, String> constant,
+                                     GutterIconNavigationHandler<PsiMethod> handler,
+                                     GutterIconRenderer.Alignment left) {
+      super(method, range, icon, markers, constant, handler, left);
+    }
+
+    @NotNull
+    public static RecursiveMethodMarkerInfo create(@NotNull PsiMethod method){
+      final PsiIdentifier identifier = method.getNameIdentifier();
+      return new RecursiveMethodMarkerInfo(method,
+                                           identifier != null ? identifier.getTextRange() : method.getTextRange(),
+                                           RECURSIVE_METHOD_ICON,
+                                           Pass.UPDATE_OVERRIDEN_MARKERS,
+                                           FunctionUtil.<PsiMethod, String>constant("Potentially recursive method"),
+                                           getNavigationHandler(method),
+                                           GutterIconRenderer.Alignment.LEFT
+      );
+    }
+
+
+    private static GutterIconNavigationHandler<PsiMethod> getNavigationHandler(final @NotNull PsiMethod method) {
+      return new GutterIconNavigationHandler<PsiMethod>() {
+        @Override
+        public void navigate(@NotNull MouseEvent e, PsiMethod elt) {
+          final List<PsiMethodCallExpression> calls = getRecursiveMethodCalls(method);
+          if (calls.size() == 1) {
+            navigateToMethodCall(calls.get(0));
+          }
+          else {
+            showPopup(e, calls);
+          }
+        }
+      };
+    }
+
+    private static void showPopup(@NotNull MouseEvent e, @NotNull List<PsiMethodCallExpression> calls) {
+      final JBList list = new JBList(calls);
+      list.setFixedCellHeight(20);
+      list.installCellRenderer(createCellRenderer());
+      JBPopupFactory.getInstance().
+        createListPopupBuilder(list).
+        setItemChoosenCallback(createItemChosenCallback(e, list)).
+        createPopup().show(new RelativePoint(e));
+    }
+
+
+    @NotNull
+    private static Runnable createItemChosenCallback(final MouseEvent e, final @NotNull JBList list) {
+      return new Runnable() {
+        @Override
+        public void run() {
+          final Object value = list.getSelectedValue();
+          if (!(value instanceof PsiMethodCallExpression)) {
+            return;
+          }
+          navigateToMethodCall((PsiMethodCallExpression)value);
+        }
+      };
+    }
+
+    private static void navigateToMethodCall(@NotNull PsiMethodCallExpression methodCall) {
+      final PsiIdentifier identifier = PsiTreeUtil.getChildOfType(methodCall.getMethodExpression(), PsiIdentifier.class);
+      if (identifier != null) {
+        navigateTo(identifier);
+      }else {
+        navigateTo(methodCall);
+      }
+    }
+
+    private static void navigateTo(@NotNull PsiElement element) {
+      final Editor editor = PsiUtilBase.findEditor(element);
+      if (editor == null) return;
+
+      editor.getCaretModel().moveToOffset(element.getTextRange().getStartOffset());
+      editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
+    }
+
+
+    @NotNull
+    private static NotNullFunction<Object, JComponent> createCellRenderer() {
+      return new NotNullFunction<Object, JComponent>() {
+        @NotNull
+        @Override
+        public JComponent fun(Object o) {
+          if (!(o instanceof PsiMethodCallExpression)) {
+            return new JBLabel();
+          }
+
+          final PsiMethodCallExpression methodCall = (PsiMethodCallExpression)o;
+          String text = StringUtil.first(methodCall.getText(), 100, true).replace('\n', ' ');
+
+          return new JBLabel(text, RECURSIVE_METHOD_ICON, SwingConstants.LEFT);
+        }
+      };
+    }
+  }
+}
+
diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
index 5cf8424aebc1..126c1b7f6378 100644
--- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/RecursiveMethodCallFoldingBuilder.java
@@ -15,12 +15,12 @@
  */
 package com.intellij.codeInsight.folding.impl;
 
+import com.intellij.codeInsight.RecursionUtil;
 import com.intellij.codeInsight.folding.JavaCodeFoldingSettings;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.folding.FoldingBuilderEx;
 import com.intellij.lang.folding.FoldingDescriptor;
 import com.intellij.openapi.editor.Document;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
@@ -43,7 +43,7 @@ public class RecursiveMethodCallFoldingBuilder extends FoldingBuilderEx {
       new JavaRecursiveElementWalkingVisitor() {
         @Override
         public void visitMethodCallExpression(PsiMethodCallExpression expression) {
-          if (isRecursiveMethodCall(expression)) {
+          if (RecursionUtil.isRecursiveMethodCall(expression)) {
             final PsiIdentifier identifier = PsiTreeUtil.getChildOfType(expression.getMethodExpression(), PsiIdentifier.class);
             if (identifier != null) {
               result.add(new FoldingDescriptor(identifier, identifier.getTextRange()));
@@ -75,23 +75,4 @@ public class RecursiveMethodCallFoldingBuilder extends FoldingBuilderEx {
 
     return element.getText();
   }
-
-  private static boolean isRecursiveMethodCall(@NotNull PsiMethodCallExpression methodCall) {
-    final PsiMethod referencedMethod = methodCall.resolveMethod();
-
-    if (referencedMethod == null || !referencedMethod.isValid() || !methodCall.isValid()) {
-      return false;
-    }
-
-    final PsiFile methodCallFile = methodCall.getContainingFile();
-    final PsiFile methodFile = referencedMethod.getContainingFile();
-
-    if (methodCallFile == null || methodFile == null || !methodCallFile.equals(methodFile)) {
-      return false;
-    }
-
-    final TextRange rmRange = referencedMethod.getTextRange();
-    final int mcOffset = methodCall.getTextRange().getStartOffset();
-    return rmRange != null && rmRange.contains(mcOffset);
-  }
 }
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 6d54f6c7e979..60af77201bfc 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -762,6 +762,7 @@
     <codeInsight.gotoSuper language="JAVA" implementationClass="com.intellij.codeInsight.navigation.JavaGotoSuperHandler"/>
     <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.JavaLineMarkerProvider"/>
     <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.IconLineMarkerProvider"/>
+    <codeInsight.lineMarkerProvider language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.RecursiveCallLineMarkerProvider"/>
     <colorProvider implementation="com.intellij.codeInsight.daemon.impl.JavaColorProvider" />
 
     <annotator language="JAVA" implementationClass="com.intellij.codeInsight.daemon.impl.JavaDocAnnotator"/>

From cb2d01a9f5321008f6e8e4b79ac895336a628545 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 4 Jun 2012 20:59:28 +0400
Subject: [PATCH 179/239] only zip content in helper thread, write zipped
 content from writer [content loading thread] on 5M threshold to avoid
 affecting reads by random writes.

---
 .../util/io/storage/RefCountingStorage.java   | 106 +++++++++++++-----
 1 file changed, 80 insertions(+), 26 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/storage/RefCountingStorage.java b/platform/util/src/com/intellij/util/io/storage/RefCountingStorage.java
index a0c2294ed6e0..faab5b883063 100644
--- a/platform/util/src/com/intellij/util/io/storage/RefCountingStorage.java
+++ b/platform/util/src/com/intellij/util/io/storage/RefCountingStorage.java
@@ -19,6 +19,7 @@
  */
 package com.intellij.util.io.storage;
 
+import com.intellij.openapi.util.LowMemoryWatcher;
 import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
 import com.intellij.openapi.util.io.ByteSequence;
 import com.intellij.openapi.util.io.StreamUtil;
@@ -38,17 +39,28 @@ import java.util.zip.Inflater;
 import java.util.zip.InflaterInputStream;
 
 public class RefCountingStorage extends AbstractStorage {
-  private final Map<Integer, Future<?>> myPendingWriteRequests = new ConcurrentHashMap<Integer, Future<?>>();
-  private int myPendingWriteRequestsSize;
-  private final ThreadPoolExecutor myPendingWriteRequestsExecutor = new ThreadPoolExecutor(1, 1, Long.MAX_VALUE, TimeUnit.DAYS, new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
+  private final Map<Integer, Future<?>> myPendingZipRequests = new ConcurrentHashMap<Integer, Future<?>>();
+  private int myPendingZipRequestsSize;
+  private final ThreadPoolExecutor myPendingZipRequestsExecutor = new ThreadPoolExecutor(1, 1, Long.MAX_VALUE, TimeUnit.DAYS, new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
     @Override
     public Thread newThread(Runnable runnable) {
-      return new Thread(runnable, "RefCountingStorage write content helper");
+      return new Thread(runnable, "Ref Counter Storage Zipper");
     }
   });
 
   private final boolean myDoNotZipCaches = Boolean.valueOf(System.getProperty("idea.doNotZipCaches")).booleanValue();
-  private static final int MAX_PENDING_WRITE_SIZE = 20 * 1024 * 1024;
+  private static final int MAX_PENDING_ZIP_SIZE = 20 * 1024 * 1024;
+
+  private final Map<Integer, Callable> myPendingWriteRequests = new ConcurrentHashMap<Integer, Callable>();
+  private int myPendingWriteRequestsSize;
+  private final LowMemoryWatcher myPendingWritesFlusher = LowMemoryWatcher.register(new Runnable() {
+    @Override
+    public void run() {
+      flushPendingWrites(); // only pending writes
+    }
+  });
+
+  private static final int MAX_PENDING_WRITE_SIZE = 5 * 1024 * 1024;
 
   public RefCountingStorage(String path) throws IOException {
     super(path);
@@ -106,7 +118,7 @@ public class RefCountingStorage extends AbstractStorage {
   }
 
   private void waitForPendingWriteForRecord(int record) {
-    Future<?> future = myPendingWriteRequests.get(record);
+    Future<?> future = myPendingZipRequests.get(record);
     if (future != null) {
       try {
         future.get();
@@ -115,6 +127,16 @@ public class RefCountingStorage extends AbstractStorage {
         throw new RuntimeException(e);
       }
     }
+
+    Callable action = myPendingWriteRequests.get(record);
+    if (action != null) {
+      try {
+        action.call();
+      }
+      catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
   }
 
   @Override
@@ -133,22 +155,48 @@ public class RefCountingStorage extends AbstractStorage {
     waitForPendingWriteForRecord(record);
 
     synchronized (myLock) {
-      myPendingWriteRequestsSize += bytes.getLength();
-      if (myPendingWriteRequestsSize > MAX_PENDING_WRITE_SIZE) {
-        zipAndWrite(bytes, record, fixedSize);
+      myPendingZipRequestsSize += bytes.getLength();
+      if (myPendingZipRequestsSize > MAX_PENDING_ZIP_SIZE) {
+        scheduleZippedContentToWrite(zip(bytes, record), record, fixedSize);
       } else {
-        myPendingWriteRequests.put(record, myPendingWriteRequestsExecutor.submit(new Callable<Object>() {
+        myPendingZipRequests.put(record, myPendingZipRequestsExecutor.submit(new Callable<Object>() {
           @Override
           public Object call() throws IOException {
-            zipAndWrite(bytes, record, fixedSize);
+            scheduleZippedContentToWrite(zip(bytes, record), record, fixedSize);
             return null;
           }
         }));
       }
+
+      if (myPendingWriteRequestsSize > MAX_PENDING_WRITE_SIZE) {
+        flushPendingWrites();
+      }
     }
   }
 
-  private void zipAndWrite(ByteSequence bytes, int record, boolean fixedSize) throws IOException {
+  private void scheduleZippedContentToWrite(final BufferExposingByteArrayOutputStream outputStream, final int record, final boolean fixedSize) {
+    synchronized (myLock) {
+      myPendingWriteRequestsSize += outputStream.size();
+      myPendingWriteRequests.put(record, new Callable<Object>() {
+        @Override
+        public Void call() throws Exception {
+          write(outputStream, record, fixedSize);
+          return null;
+        }
+      });
+    }
+  }
+
+
+  private void write(BufferExposingByteArrayOutputStream zippedBytes, int record, boolean fixedSize) throws IOException {
+    synchronized (myLock) {
+      super.writeBytes(record, new ByteSequence(zippedBytes.getInternalBuffer(), 0, zippedBytes.size()), fixedSize);
+      myPendingWriteRequestsSize -= zippedBytes.size();
+      myPendingWriteRequests.remove(record);
+    }
+  }
+
+  private BufferExposingByteArrayOutputStream zip(ByteSequence bytes, int record) throws IOException {
     BufferExposingByteArrayOutputStream s = new BufferExposingByteArrayOutputStream();
     DeflaterOutputStream out = new DeflaterOutputStream(s);
     try {
@@ -157,16 +205,11 @@ public class RefCountingStorage extends AbstractStorage {
     finally {
       out.close();
     }
-
     synchronized (myLock) {
-      doWrite(record, fixedSize, s);
-      myPendingWriteRequestsSize -= bytes.getLength();
-      myPendingWriteRequests.remove(record);
+      myPendingZipRequestsSize -= bytes.getLength();
+      myPendingZipRequests.remove(record);
     }
-  }
-
-  private void doWrite(int record, boolean fixedSize, BufferExposingByteArrayOutputStream s) throws IOException {
-    super.writeBytes(record, new ByteSequence(s.getInternalBuffer(), 0, s.size()), fixedSize);
+    return s;
   }
 
   @Override
@@ -207,40 +250,51 @@ public class RefCountingStorage extends AbstractStorage {
 
   @Override
   public void force() {
-    flushPendingWrites();
+    flushAllPendingWrites();
     super.force();
   }
 
   @Override
   public boolean isDirty() {
-    return myPendingWriteRequests.size() > 0 || super.isDirty();
+    return myPendingZipRequests.size() > 0 || myPendingWriteRequests.size() > 0 || super.isDirty();
   }
 
   @Override
   public boolean flushSome() {
-    flushPendingWrites();
+    flushAllPendingWrites();
     return super.flushSome();
   }
 
   @Override
   public void dispose() {
-    flushPendingWrites();
+    flushAllPendingWrites();
     super.dispose();
   }
 
   @Override
   public void checkSanity(int record) {
-    flushPendingWrites();
+    flushAllPendingWrites();
     super.checkSanity(record);
   }
 
   private void flushPendingWrites() {
-    for(Map.Entry<Integer, Future<?>> entry:myPendingWriteRequests.entrySet()) {
+    for(Map.Entry<Integer, Callable> entry: myPendingWriteRequests.entrySet()) {
+      try {
+        entry.getValue().call();
+      } catch (Exception e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  private void flushAllPendingWrites() {
+    for(Map.Entry<Integer, Future<?>> entry: myPendingZipRequests.entrySet()) {
       try {
         entry.getValue().get();
       } catch (Exception e) {
         throw new RuntimeException(e);
       }
     }
+    flushPendingWrites();
   }
 }

From 27c9b67cfd12d939021aaf71d8a286fc6b76248c Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 15:14:56 +0200
Subject: [PATCH 180/239] PathInterner.getAllPaths

---
 .../com/intellij/util/containers/PathInterner.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/platform/util/src/com/intellij/util/containers/PathInterner.java b/platform/util/src/com/intellij/util/containers/PathInterner.java
index 1ab566b79fef..ee108eec5ee8 100644
--- a/platform/util/src/com/intellij/util/containers/PathInterner.java
+++ b/platform/util/src/com/intellij/util/containers/PathInterner.java
@@ -22,9 +22,7 @@ import gnu.trove.TObjectIntHashMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author peter
@@ -174,6 +172,16 @@ public class PathInterner {
       myIdxToSeq.add(null);
     }
 
+    public List<String> getAllPaths() {
+      ArrayList<String> result = new ArrayList<String>(myIdxToSeq.size() - 1);
+      for (SubstringWrapper[] wrappers : myIdxToSeq) {
+        if (wrappers != null) {
+          result.add(PathInterner.restorePath(wrappers));
+        }
+      }
+      return result;
+    }
+
     public int addPath(String path) {
       PathInterner.SubstringWrapper[] seq = myInterner.internParts(path, true);
       if (!mySeqToIdx.containsKey(seq)) {

From 092dd4027eba30b5582e9ddc0c2a738c46bdffda Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 17:38:58 +0200
Subject: [PATCH 181/239] PathMap.values()

---
 .../util/src/com/intellij/util/containers/PathInterner.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/util/src/com/intellij/util/containers/PathInterner.java b/platform/util/src/com/intellij/util/containers/PathInterner.java
index ee108eec5ee8..9be077aeb01d 100644
--- a/platform/util/src/com/intellij/util/containers/PathInterner.java
+++ b/platform/util/src/com/intellij/util/containers/PathInterner.java
@@ -224,6 +224,10 @@ public class PathInterner {
       myMap.put(myInterner.internParts(path, true), value);
     }
 
+
+    public Iterable<T> values() {
+      return myMap.values();
+    }
   }
 
 }

From 1172f5701c57394013c97a73d2a7971c7325fb29 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 17:42:22 +0200
Subject: [PATCH 182/239] minor

---
 .../src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java   | 2 +-
 .../src/com/intellij/openapi/vfs/impl/jar/JarHandler.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java
index 4ef1fae4a59a..cc73d2ca2cf1 100644
--- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java
+++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.util.io.BufferExposingByteArrayInputStream;
 import com.intellij.openapi.util.io.FileAttributes;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.reference.SoftReference;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.TimedReference;
 import gnu.trove.THashMap;
@@ -28,7 +29,6 @@ import org.jetbrains.annotations.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.ref.SoftReference;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java
index 8c19444a3686..276fbafcad5a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java
@@ -63,7 +63,7 @@ public class JarHandler extends JarHandlerBase implements FileSystemInterface {
   @Nullable
   public VirtualFile markDirty() {
     synchronized (lock) {
-      myRelPathsToEntries.clear();
+      myRelPathsToEntries = null;
       myZipFile.set(null);
 
       final NewVirtualFile root = (NewVirtualFile)

From 718e56b88e79d37fb7d94717bfb5ce1f2023e0ca Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 17:49:25 +0200
Subject: [PATCH 183/239] spare some memory: reuse the underlying string since
 we store it as map key anyway

---
 .../src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java b/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java
index cc73d2ca2cf1..dfb2685e2d1e 100644
--- a/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java
+++ b/platform/core-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandlerBase.java
@@ -44,7 +44,7 @@ public class JarHandlerBase {
 
   protected static class EntryInfo {
     public EntryInfo(final String shortName, final EntryInfo parent, final boolean directory) {
-      this.shortName = new String(shortName);
+      this.shortName = shortName;
       this.parent = parent;
       isDirectory = directory;
     }

From a68a091a6f901f0eb8ec1eb543c47ca47ea4d00e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 4 Jun 2012 21:26:19 +0400
Subject: [PATCH 184/239] Fix project view background on GTK+

---
 .../com/intellij/ide/projectView/impl/ProjectViewTree.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
index c8abee55cfc9..229ef3c7ac1a 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
@@ -29,6 +29,7 @@ import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.ui.ColorUtil;
 import com.intellij.ui.FileColorManager;
 import com.intellij.ui.tabs.FileColorManagerImpl;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -56,9 +57,12 @@ public abstract class ProjectViewTree extends DnDAwareTree {
     cellRenderer.setIconOpaque(false);
     setCellRenderer(cellRenderer);
     cellRenderer.setTransparentIconBackground(true);
+
+    setBackground(UIUtil.getTreeTextBackground());
   }
 
   public abstract DefaultMutableTreeNode getSelectedNode();
+
   public Project getProject() {
     return myProject;
   }

From 3a8a40216f0c30554968525b703585dc0cc1833b Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Mon, 4 Jun 2012 21:35:46 +0400
Subject: [PATCH 185/239] Morphing

---
 .../android/designer/model/RadViewContainer.java   |  6 ++++++
 .../android/designer/model/views-meta-model.xml    | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewContainer.java b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewContainer.java
index ac7744491b19..e6403543bd96 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewContainer.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewContainer.java
@@ -18,6 +18,7 @@ package com.intellij.android.designer.model;
 import com.intellij.designer.designSurface.DesignerEditorPanel;
 import com.intellij.designer.designSurface.ICaption;
 import com.intellij.designer.designSurface.StaticDecorator;
+import com.intellij.designer.model.MetaModel;
 import com.intellij.designer.model.RadComponent;
 import com.intellij.designer.model.RadLayout;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
@@ -53,4 +54,9 @@ public class RadViewContainer extends RadViewComponent {
     RadLayout layout = getLayout();
     return layout == null ? null : layout.getCaption(this);
   }
+
+  @Override
+  public void morphingTo(MetaModel target) throws Exception {
+    // TODO: Auto-generated method stub
+  }
 }
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
index cf484ff287c5..240977dd60e2 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
@@ -1113,6 +1113,8 @@
     <palette title="RadioGroup" icon="/com/intellij/android/designer/icons/RadioGroup.png"
              tooltip="This class is used to create a multiple-exclusion scope for a set of radio buttons. Checking one radio button that belongs to a radio group unchecks any previously checked radio button within the same group."/>
 
+    <morphing to="LinearLayout FrameLayout TableLayout GridLayout RelativeLayout"/>
+
     <properties inplace="orientation checkedButton"
                 important="orientation checkedButton"
                 top="gravity orientation"/>
@@ -1280,6 +1282,8 @@
     <palette title="LinearLayout" icon="/com/intellij/android/designer/icons/LinearLayout.png"
              tooltip="A Layout that arranges its children in a single column or a single row."/>
 
+    <morphing to="FrameLayout RadioGroup TableLayout GridLayout RelativeLayout"/>
+
     <properties inplace="orientation"
                 important="orientation gravity baselineAligned measureWithLargestChild showDividers"
                 expert="layout:gravity.fill layout:gravity.clip layout:gravity.start layout:gravity.end"
@@ -1305,6 +1309,8 @@
     <palette title="FrameLayout" icon="/com/intellij/android/designer/icons/FrameLayout.png"
              tooltip="FrameLayout is designed to block out an area on the screen to display a single item."/>
 
+    <morphing to="LinearLayout RadioGroup TableLayout GridLayout RelativeLayout"/>
+
     <properties important="foreground foregroundGravity"
                 expert="layout:gravity.fill layout:gravity.clip layout:gravity.start layout:gravity.end"
         />
@@ -1327,6 +1333,8 @@
     <palette title="AbsoluteLayout" icon="/com/intellij/android/designer/icons/AbsoluteLayout.png"
              tooltip="A layout that lets you specify exact locations (x/y coordinates) of its children. Absolute layouts are less flexible and harder to maintain than other types of layouts without absolute positioning."/>
 
+    <morphing to="RelativeLayout FrameLayout TableLayout GridLayout"/>
+
     <creation>
       <![CDATA[
           <AbsoluteLayout
@@ -1347,6 +1355,8 @@
     <palette title="TableLayout" icon="/com/intellij/android/designer/icons/TableLayout.png"
              tooltip="A layout that arranges its children into rows and columns. A TableLayout consists of a number of TableRow objects, each defining a row (actually, you can have other children, which will be explained below). TableLayout containers do not display border lines for their rows, columns, or cells. Each row has zero or more cells; each cell can hold one View object. The table has as many columns as the row with the most cells. A table can leave cells empty. Cells can span columns, as they can in HTML."/>
 
+    <morphing to="RelativeLayout GridLayout FrameLayout"/>
+
     <creation>
       <![CDATA[
           <TableLayout
@@ -1386,6 +1396,8 @@
                 expert="layout:gravity.clip layout:gravity.start layout:gravity.end"
         />
 
+    <morphing to="TableLayout RelativeLayout FrameLayout"/>
+
     <palette title="GridLayout" icon="/com/intellij/android/designer/icons/GridLayout.png"
              tooltip="A layout that places its children in a rectangular grid."/>
 
@@ -1407,6 +1419,8 @@
     <properties inplace="gravity"
                 important="gravity"/>
 
+    <morphing to="GridLayout TableLayout FrameLayout"/>
+
     <palette title="RelativeLayout" icon="/com/intellij/android/designer/icons/RelativeLayout.png"
              tooltip="A Layout where the positions of the children can be described in relation to each other or to the parent."/>
 

From 0e35f229a4cbcbabcb5b40a8e819dcae52574c88 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 20:06:07 +0200
Subject: [PATCH 186/239] correct fold region length assertions, allow single
 character folding

---
 .../src/com/intellij/lang/folding/FoldingDescriptor.java      | 4 ++--
 .../src/com/intellij/openapi/editor/impl/FoldRegionImpl.java  | 2 +-
 .../com/intellij/openapi/editor/impl/FoldingModelImpl.java    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/lang-api/src/com/intellij/lang/folding/FoldingDescriptor.java b/platform/lang-api/src/com/intellij/lang/folding/FoldingDescriptor.java
index 1b2253bb7555..5b8b49bdd718 100644
--- a/platform/lang-api/src/com/intellij/lang/folding/FoldingDescriptor.java
+++ b/platform/lang-api/src/com/intellij/lang/folding/FoldingDescriptor.java
@@ -94,12 +94,12 @@ public class FoldingDescriptor {
                            @Nullable FoldingGroup group,
                            Set<Object> dependencies,
                            boolean neverExpands) {
-    assert range.getStartOffset() + 1 < range.getEndOffset() : range + ", text: " + node.getText() + ", language = " + node.getPsi().getLanguage();
+    assert range.getStartOffset() + 1 <= range.getEndOffset() : range + ", text: " + node.getText() + ", language = " + node.getPsi().getLanguage();
     myElement = node;
     ProperTextRange.assertProperRange(range);
     myRange = range;
     myGroup = group;
-    assert getRange().getLength() >= 2 : "range:" + getRange();
+    assert getRange().getLength() >= 1 : "range:" + getRange();
     myDependencies = dependencies;
     myNeverExpands = neverExpands;
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldRegionImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldRegionImpl.java
index 680ed70bc405..390ec2d09545 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldRegionImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldRegionImpl.java
@@ -91,7 +91,7 @@ public class FoldRegionImpl extends RangeMarkerImpl implements FoldRegion {
 
   @Override
   public boolean isValid() {
-    return super.isValid() && intervalStart() + 1 < intervalEnd();
+    return super.isValid() && intervalStart() + 1 <= intervalEnd();
   }
 
   public void setExpandedInternal(boolean toExpand) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
index 611456fe84f0..1a2a9bce6896 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/FoldingModelImpl.java
@@ -503,7 +503,7 @@ public class FoldingModelImpl implements FoldingModelEx, PrioritizedDocumentList
   public FoldRegion createFoldRegion(int startOffset, int endOffset, @NotNull String placeholder, @Nullable FoldingGroup group,
                                      boolean neverExpands)
   {
-    if (startOffset + 1 >= endOffset) {
+    if (startOffset + 1 > endOffset) {
       LOG.error("Invalid offsets: ("+startOffset+", "+endOffset+")");
     }
     FoldRegionImpl region = new FoldRegionImpl(myEditor, startOffset, endOffset, placeholder, group, neverExpands);

From fa4c2a691692de7fe9c61195eb327b526b76d041 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 20:19:10 +0200
Subject: [PATCH 187/239] IDEA-86810 Find Usages not finding usages when I do
 it on decompiled stub source

---
 .../src/com/intellij/psi/impl/PsiClassImplUtil.java    | 10 +++++++---
 .../libraryClassUsageFromDecompiledSource/Usage.java   |  5 +++++
 .../com/intellij/psi/search/FindUsagesTest.java        |  6 ++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 java/java-tests/testData/psi/search/findUsages/libraryClassUsageFromDecompiledSource/Usage.java

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
index fd83ec61c32e..18c9422cbe4d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.psi.impl;
 
+import com.intellij.lang.ASTNode;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicatorProvider;
@@ -964,9 +965,12 @@ public class PsiClassImplUtil {
 
   private static PsiElement originalElement(PsiClass aClass) {
     final PsiElement originalElement = aClass.getOriginalElement();
-    final PsiCompiledElement compiled = originalElement.getUserData(ClsElementImpl.COMPILED_ELEMENT);
-    if (compiled != null) {
-      return compiled;
+    ASTNode node = originalElement.getNode();
+    if (node != null) {
+      final PsiCompiledElement compiled = node.getUserData(ClsElementImpl.COMPILED_ELEMENT);
+      if (compiled != null) {
+        return compiled;
+      }
     }
     return originalElement;
   }
diff --git a/java/java-tests/testData/psi/search/findUsages/libraryClassUsageFromDecompiledSource/Usage.java b/java/java-tests/testData/psi/search/findUsages/libraryClassUsageFromDecompiledSource/Usage.java
new file mode 100644
index 000000000000..d0440bf389a9
--- /dev/null
+++ b/java/java-tests/testData/psi/search/findUsages/libraryClassUsageFromDecompiledSource/Usage.java
@@ -0,0 +1,5 @@
+import javax.swing.JLabel;
+
+public class Usage {
+  JLabel s;
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/psi/search/FindUsagesTest.java b/java/java-tests/testSrc/com/intellij/psi/search/FindUsagesTest.java
index e06de7cec18e..676425af10a7 100644
--- a/java/java-tests/testSrc/com/intellij/psi/search/FindUsagesTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/search/FindUsagesTest.java
@@ -89,6 +89,12 @@ public class FindUsagesTest extends PsiTestCase{
     assertEquals(1, ReferencesSearch.search(method).findAll().size());
   }
 
+  public void testLibraryClassUsageFromDecompiledSource() {
+    PsiElement decompiled =
+      ((PsiCompiledElement)myJavaFacade.findClass("javax.swing.JLabel", GlobalSearchScope.allScope(myProject))).getMirror();
+    assertEquals(2, ReferencesSearch.search(decompiled).findAll().size());
+  }
+
   public void testImplicitConstructorUsage() throws Throwable {
     PsiMethod[] ctrs = myJavaFacade.findClass("Foo", GlobalSearchScope.allScope(myProject)).getConstructors();
     PsiMethod method = ctrs[0];

From e3ab850ddc03acec7bec1bc69de73be8fcf996b9 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 4 Jun 2012 20:23:54 +0400
Subject: [PATCH 188/239] do not rename in the same name

---
 .../psi/impl/source/tree/java/PsiReferenceExpressionImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
index 7f2b850e7bce..527052d9ced3 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
@@ -491,7 +491,7 @@ public class PsiReferenceExpressionImpl extends PsiReferenceExpressionBase imple
       throw new IncorrectOperationException();
     }
     final String oldRefName = oldIdentifier.getText();
-    if (PsiKeyword.THIS.equals(oldRefName) || PsiKeyword.SUPER.equals(oldRefName)) return this;
+    if (PsiKeyword.THIS.equals(oldRefName) || PsiKeyword.SUPER.equals(oldRefName) || Comparing.strEqual(oldRefName, newElementName)) return this;
     PsiIdentifier identifier = JavaPsiFacade.getInstance(getProject()).getElementFactory().createIdentifier(newElementName);
     oldIdentifier.replace(identifier);
     return this;

From e5828700d5aada83d45e2972e4e098a575ec268b Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 4 Jun 2012 22:35:37 +0400
Subject: [PATCH 189/239] class shadowing

---
 .../resolve/ClassResolverProcessor.java       | 20 ++++++++++++++++---
 .../InnerClassesShadowing.java                | 15 ++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
index 69ca8fb6af0c..83d61fea1827 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/ClassResolverProcessor.java
@@ -26,7 +26,6 @@ import com.intellij.psi.scope.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.SmartList;
 
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -153,7 +152,7 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
       }
     }
 
-    boolean infoAccessible = info.isAccessible() && !otherClass.hasModifierProperty(PsiModifier.PRIVATE);
+    boolean infoAccessible = info.isAccessible() && isAccessible(otherClass);
     if (infoAccessible && !accessible) {
       return Domination.DOMINATED_BY;
     }
@@ -184,6 +183,21 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
     return Domination.EQUAL;
   }
 
+  private boolean isAccessible(PsiClass otherClass) {
+    if (otherClass.hasModifierProperty(PsiModifier.PRIVATE)) {
+      final PsiClass containingClass = otherClass.getContainingClass();
+      PsiClass containingPlaceClass = PsiTreeUtil.getParentOfType(myPlace, PsiClass.class, false);
+      while (containingPlaceClass != null) {
+        if (containingClass == containingPlaceClass) {
+          return true;
+        }
+        containingPlaceClass = PsiTreeUtil.getParentOfType(containingPlaceClass, PsiClass.class);
+      }
+      return false;
+    }
+    return true;
+  }
+
   private boolean isAmbiguousInherited(PsiClass containingClass1) {
     PsiClass psiClass = PsiTreeUtil.getParentOfType(myPlace, PsiClass.class);
     while (psiClass != null) {
@@ -213,7 +227,7 @@ public class ClassResolverProcessor extends BaseScopeProcessor implements NameHi
         for (int i = myCandidates.size()-1; i>=0; i--) {
           ClassCandidateInfo info = myCandidates.get(i);
 
-          Domination domination = dominates(aClass, accessible && !aClass.hasModifierProperty(PsiModifier.PRIVATE), fqName, info);
+          Domination domination = dominates(aClass, accessible && isAccessible(aClass), fqName, info);
           if (domination == Domination.DOMINATED_BY) {
             return true;
           }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/InnerClassesShadowing.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/InnerClassesShadowing.java
index 2922998974cd..e87c5db28998 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/InnerClassesShadowing.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/InnerClassesShadowing.java
@@ -1,3 +1,5 @@
+import java.io.*;
+
 public class Main {
     static interface A
     {
@@ -80,4 +82,17 @@ class BAO {
         void foo(){}
     }
 
+}
+
+class WithFileInputStream {
+  private static final Runnable runn = new Runnable() {
+    public void run() {
+      new FileInputStream("path");
+    }
+  };
+  
+  private static class FileInputStream {
+    private FileInputStream(String str) {
+    }
+  }
 }
\ No newline at end of file

From 02951abc572afa4adc7b0d52903ac4e9b8ca2f99 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Mon, 4 Jun 2012 22:46:35 +0400
Subject: [PATCH 190/239] Rename field "Goals" to Command line:

---
 .../idea/maven/execution/MavenRunnerParametersConfigurable.form | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form
index 6c2dcc6647ad..9290e9c77e41 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.form
@@ -31,7 +31,7 @@
           <componentClass value="com.intellij.ui.EditorTextField"/>
           <labelInsets top="0" left="0" bottom="0" right="0"/>
           <labelLocation value="West"/>
-          <text value="&amp;Goals (separated with space)"/>
+          <text value="&amp;Command line"/>
         </properties>
       </component>
       <grid id="1fdf9" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">

From f0b5cade50eefdd7482fcb0dd9016968edcaa61d Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 4 Jun 2012 22:43:00 +0400
Subject: [PATCH 191/239] Speed search on PSI viewer combo

---
 .../internal/psiView/PsiViewerDialog.java     | 36 +++----------------
 .../src/com/intellij/ui/SpeedSearchBase.java  |  1 +
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
index a8782689a47c..cfb74dc28a0a 100644
--- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java
@@ -357,38 +357,12 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp
         }
       }
     });
-    myFileTypeComboBox.setKeySelectionManager(new JComboBox.KeySelectionManager() {
-      private static final int TIMEOUT = 1000;  // ms
-      private final StringBuilder myPrefix = new StringBuilder();
-      private long myTimeStamp = 0;
-
+    new ComboboxSpeedSearch(myFileTypeComboBox) {
       @Override
-      public int selectionForKey(char ch, ComboBoxModel model) {
-        final long now = System.currentTimeMillis();
-        if (now - myTimeStamp > TIMEOUT) {
-          myPrefix.delete(0, myPrefix.length());
-        }
-        myTimeStamp = now;
-
-        if (Character.isLetterOrDigit(ch)) {
-          myPrefix.append(ch);
-        }
-        else if (ch == '\b') {
-          myPrefix.delete(0, myPrefix.length());
-          return 0;
-        }
-
-        final String prefix = myPrefix.toString().toLowerCase();
-        for (int i = 0, size = model.getSize(); i < size; i++) {
-          final SourceWrapper item = (SourceWrapper)model.getElementAt(i);
-          if (item.getText().toLowerCase().startsWith(prefix)) {
-            return i;
-          }
-        }
-
-        return -1;
+      protected String getElementText(Object element) {
+        return element instanceof SourceWrapper? ((SourceWrapper)element).getText() : null;
       }
-    });
+    };
     myFileTypeComboBox.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
@@ -460,8 +434,8 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider, Disp
     myTextPanel.setLayout(new BorderLayout());
     myTextPanel.add(myEditor.getComponent(), BorderLayout.CENTER);
 
+    final String text = myCurrentFile == null ? settings.text : myInitText;
     final AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(getClass());
-    String text = myCurrentFile == null ? settings.text : myInitText;
     try {
       myEditor.getDocument().setText(text);
       myEditor.getSelectionModel().setSelection(0, text.length());
diff --git a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
index 3fd8ff42574a..70d44c53888f 100644
--- a/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
+++ b/platform/platform-impl/src/com/intellij/ui/SpeedSearchBase.java
@@ -133,6 +133,7 @@ public abstract class SpeedSearchBase<Comp extends JComponent> extends SpeedSear
 
   protected abstract Object[] getAllElements();
 
+  @Nullable
   protected abstract String getElementText(Object element);
 
   protected int getElementCount() {

From aea35ce5fcb7c3e3e5660210dae5bae6ceca8be6 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 4 Jun 2012 22:44:32 +0400
Subject: [PATCH 192/239] Prevent speed-searchable combobox from popping on
 space key

---
 .../com/intellij/ui/ComboboxSpeedSearch.java  | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java
index ef12b0ac6b54..ce0b4bc2ef67 100644
--- a/platform/platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java
+++ b/platform/platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/*
- * Created by IntelliJ IDEA.
- * User: Anna.Kozlova
- * Date: 11-Jul-2006
- * Time: 13:56:13
- */
 package com.intellij.ui;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import javax.swing.*;
 
+/**
+ * @author Anna.Kozlova
+ * @since 11-Jul-2006
+ */
 public class ComboboxSpeedSearch extends SpeedSearchBase<JComboBox> {
-  public ComboboxSpeedSearch(JComboBox comboBox) {
+  public ComboboxSpeedSearch(@NotNull final JComboBox comboBox) {
     super(comboBox);
+    removeKeyStroke(comboBox.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), KeyStroke.getKeyStroke(' ', 0));
+  }
+
+  private static void removeKeyStroke(@Nullable InputMap map, KeyStroke ks) {
+    while (map != null) {
+      map.remove(ks);
+      map = map.getParent();
+    }
   }
 
   protected void selectElement(Object element, String selectedText) {
@@ -40,7 +48,7 @@ public class ComboboxSpeedSearch extends SpeedSearchBase<JComboBox> {
   protected Object[] getAllElements() {
     ListModel model = myComponent.getModel();
     Object[] elements = new Object[model.getSize()];
-    for(int i = 0; i < elements.length; i++){
+    for (int i = 0; i < elements.length; i++) {
       elements[i] = model.getElementAt(i);
     }
     return elements;

From ee128ee9278d28ffe4da5e0a0d90799437b05c4e Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 4 Jun 2012 22:47:25 +0400
Subject: [PATCH 193/239] Drop premature deprecation

---
 .../src/com/intellij/openapi/application/Application.java     | 4 +---
 .../com/intellij/openapi/vfs/local/FileWatcherTest.java       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/application/Application.java b/platform/core-api/src/com/intellij/openapi/application/Application.java
index f14d3344675a..b89ff3e59ceb 100644
--- a/platform/core-api/src/com/intellij/openapi/application/Application.java
+++ b/platform/core-api/src/com/intellij/openapi/application/Application.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -324,13 +324,11 @@ public interface Application extends ComponentManager {
   boolean isActive();
 
   /**
-   * @deprecated use {@link #runReadAction(Runnable)} instead
    * Returns lock used for read operations, should be closed in finally block
    */
   AccessToken acquireReadActionLock();
 
   /**
-   * @deprecated use {@link #runWriteAction(Runnable)} instead
    * Returns lock used for write operations, should be closed in finally block
    */
   AccessToken acquireWriteActionLock(@Nullable Class marker);
diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
index 07f23d257541..b0aed3874df4 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/local/FileWatcherTest.java
@@ -475,7 +475,7 @@ public class FileWatcherTest extends PlatformLangTestCase {
   private void delete(@NotNull final File file) throws IOException {
     final VirtualFile vFile = myFileSystem.findFileByIoFile(file);
     if (vFile != null) {
-      @SuppressWarnings("deprecation") final AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(getClass());
+      final AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(getClass());
       try {
         vFile.delete(this);
       }

From ac3a91006164b95e27b6b99b9aa40c273685c6aa Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 4 Jun 2012 21:25:37 +0200
Subject: [PATCH 194/239] expand the usage view tree when creating it with
 predefined usages (e.g. from Goto Class)

---
 .../usageView/src/com/intellij/usages/impl/UsageViewImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
index c0219c6ced28..5e86945abc3e 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -862,7 +862,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
   public void setSearchInProgress(boolean searchInProgress) {
     mySearchInProgress = searchInProgress;
     if (!myPresentation.isDetachedMode()) {
-      UIUtil.invokeLaterIfNeeded(new Runnable() {
+      myTransferToEDTQueue.offer(new Runnable() {
         @Override
         public void run() {
           if (isDisposed) return;

From 3b741cc670587e1acaa3af135c09f3b40033dc09 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Tue, 5 Jun 2012 10:00:13 +0200
Subject: [PATCH 195/239] IDEA-63852 Add Ctrl + Shift + T to reopen last closed
 code tab

---
 .../openapi/fileEditor/impl/EditorWindow.java | 32 ++++++++--
 .../impl/FileEditorManagerImpl.java           | 14 +++++
 .../impl/ReopenClosedTabAction.java           | 59 +++++++++++++++++++
 .../src/idea/PlatformActions.xml              |  2 +
 4 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/ReopenClosedTabAction.java

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
index 6a4145a2a387..c1cfae48f8ee 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
@@ -33,15 +33,14 @@ import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
 import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
-import com.intellij.openapi.util.ActionCallback;
-import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.Iconable;
-import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.*;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.ui.LayeredIcon;
 import com.intellij.util.IconUtil;
+import com.intellij.util.containers.Stack;
 import com.intellij.util.ui.EmptyIcon;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
@@ -74,6 +73,15 @@ public class EditorWindow {
   private boolean myIsDisposed = false;
   private static final Icon PIN_ICON = AllIcons.Nodes.TabPin;
   public static final Key<Integer> INITIAL_INDEX_KEY = Key.create("initial editor index");
+  private Stack<Pair<String, Integer>> myRemovedTabs = new Stack<Pair<String, Integer>>(UISettings.getInstance().EDITOR_TAB_LIMIT) {
+    @Override
+    public void push(Pair<String, Integer> pair) {
+      if (size() >= UISettings.getInstance().EDITOR_TAB_LIMIT) {
+        remove(0);
+      }
+      super.push(pair);
+    }
+  };
 
   protected EditorWindow(final EditorsSplitters owner) {
     myOwner = owner;
@@ -264,6 +272,21 @@ public class EditorWindow {
     closeFile(file, unsplit, true);
   }
 
+  public boolean hasClosedTabs() {
+    return !myRemovedTabs.empty();
+  }
+
+  public void restoreClosedTab() {
+    assert hasClosedTabs() : "Nothing to restore";
+
+    final Pair<String, Integer> info = myRemovedTabs.pop();
+    final VirtualFile file = VirtualFileManager.getInstance().findFileByUrl(info.getFirst());
+    final Integer second = info.getSecond();
+    if (file != null) {
+      getManager().openFileImpl4(this, file, true, null, true, second == null ? -1 : second.intValue());
+    }
+  }
+
   public void closeFile(final VirtualFile file, final boolean unsplit, final boolean transferFocus) {
     final FileEditorManagerImpl editorManager = getManager();
     editorManager.runChange(new FileEditorManagerChange() {
@@ -282,6 +305,7 @@ public class EditorWindow {
             final int componentIndex = findComponentIndex(editor.getComponent());
             if (componentIndex >= 0) { // editor could close itself on decomposition
               final int indexToSelect = calcIndexToSelect(file, componentIndex);
+              myRemovedTabs.push(Pair.create(file.getUrl(), componentIndex));
               final ActionCallback removeTab = myTabbedPane.removeTabAt(componentIndex, indexToSelect, transferFocus);
               final Runnable disposer = new Runnable() {
                 public void run() {
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
index ebd4fbb63c5a..d73e0ee92783 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
@@ -683,6 +683,16 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec
                                                          final boolean focusEditor,
                                                          @Nullable final HistoryEntry entry,
                                                          boolean current) {
+    return openFileImpl4(window, file, focusEditor, entry, current, -1);
+  }
+
+  @NotNull
+  Pair<FileEditor[], FileEditorProvider[]> openFileImpl4(@NotNull final EditorWindow window,
+                                                         @NotNull final VirtualFile file,
+                                                         final boolean focusEditor,
+                                                         @Nullable final HistoryEntry entry,
+                                                         boolean current,
+                                                         int index) {
     // Open file
     FileEditor[] editors;
     FileEditorProvider[] providers;
@@ -748,6 +758,10 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec
       // Now we have to create EditorComposite and insert it into the TabbedEditorComponent.
       // After that we have to select opened editor.
       newSelectedComposite = new EditorWithProviderComposite(file, editors, providers, this);
+
+      if (index >= 0) {
+        newSelectedComposite.getFile().putUserData(EditorWindow.INITIAL_INDEX_KEY, index);
+      }
     }
 
     window.setEditor(newSelectedComposite, focusEditor);
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/ReopenClosedTabAction.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/ReopenClosedTabAction.java
new file mode 100644
index 000000000000..6f091e4d2815
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/ReopenClosedTabAction.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.openapi.fileEditor.impl;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.util.ui.UIUtil;
+import org.jetbrains.annotations.Nullable;
+
+import java.awt.*;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class ReopenClosedTabAction extends AnAction {
+  public ReopenClosedTabAction() {
+    super("Reopen Closed Tab");
+  }
+
+  @Override
+  public void actionPerformed(AnActionEvent e) {
+    final EditorWindow window = getEditorWindow(e);
+    if (window != null) {
+      window.restoreClosedTab();
+    }
+  }
+
+  @Nullable
+  private static EditorWindow getEditorWindow(AnActionEvent e) {
+    final Component component = e.getData(PlatformDataKeys.CONTEXT_COMPONENT);
+    if (component != null) {
+      final EditorsSplitters splitters = UIUtil.getParentOfType(EditorsSplitters.class, component);
+      if (splitters != null) {
+        return splitters.getCurrentWindow();
+      }
+    }
+    return null;
+  }
+
+  @Override
+  public void update(AnActionEvent e) {
+    final EditorWindow window = getEditorWindow(e);
+    e.getPresentation().setEnabled(window != null && window.hasClosedTabs());
+  }
+}
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index 7d6faf452ca8..fb6855d75139 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -331,6 +331,7 @@
             <action id="CloseAllUnpinnedEditors" class="com.intellij.ide.actions.CloseAllUnpinnedEditorsAction"/>
           </group>
           <separator/>
+          <action id="ReopenClosedTab" class="com.intellij.openapi.fileEditor.impl.ReopenClosedTabAction" />
           <action id="SplitVertically" class="com.intellij.ide.actions.SplitVerticallyAction" icon="AllIcons.Actions.SplitVertically"/>
           <action id="SplitHorizontally" class="com.intellij.ide.actions.SplitHorizontallyAction" icon="AllIcons.Actions.SplitHorizontally"/>
           <action id="ChangeSplitOrientation" class="com.intellij.ide.actions.ChangeSplitterOrientationAction"/>
@@ -422,6 +423,7 @@
       <separator/>
       <reference ref="NextTab"/>
       <reference ref="PreviousTab"/>
+      <reference ref="ReopenClosedTab"/>
       <separator/>
       <reference ref="Unsplit"/>
       <reference ref="UnsplitAll"/>

From 37f0b08f00a1cdb57d02471f8e2eb0eb08c9be8e Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 5 Jun 2012 10:57:09 +0200
Subject: [PATCH 196/239] comment out the range marker validity assertion

---
 .../testSrc/com/intellij/openapi/editor/RangeMarkerTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/RangeMarkerTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/RangeMarkerTest.java
index b919fd29fc67..ac649e979174 100644
--- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/RangeMarkerTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/RangeMarkerTest.java
@@ -1039,7 +1039,7 @@ public class RangeMarkerTest extends LightPlatformTestCase {
       document.deleteString(1,2);
 
       assertTrue(marker.isValid());
-      assertFalse(fold[0].isValid());
+      //assertFalse(fold[0].isValid());
     }
     finally {
       EditorFactory.getInstance().releaseEditor(editor);

From de7e51cbef3edb2b6ce47f6d7918b6c2ceed3a2d Mon Sep 17 00:00:00 2001
From: Alexander Zolotov <Alexader.Zolotov@jetbrain.com>
Date: Tue, 5 Jun 2012 12:58:00 +0400
Subject: [PATCH 197/239] #IDEA-86953 fixed : Legal CSS color value flagged as
 invalid

- add darkgrey color to registry
- according to http://www.w3.org/TR/css3-color/#svg-color following colors: dimgrey, darkslategrey, lightgrey, lightslategrey, slategrey
---
 .../src/com/intellij/xml/util/ColorSampleLookupValue.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java b/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java
index 0f564d2bf0ec..837ad67b2e84 100644
--- a/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java
+++ b/xml/impl/src/com/intellij/xml/util/ColorSampleLookupValue.java
@@ -127,6 +127,7 @@ public class ColorSampleLookupValue implements LookupValueWithUIHint, DeferredUs
                                                      "  \t  \tdarkcyan \t#008b8b \t0,139,139\n" +
                                                      "  \t  \tdarkgoldenrod \t#b8860b \t184,134,11\n" +
                                                      "  \t  \tdarkgray \t#a9a9a9 \t169,169,169\n" +
+                                                     "  \t  \tdarkgrey \t#a9a9a9 \t169,169,169\n" +
                                                      "  \t  \tdarkgreen \t#006400 \t0,100,0\n" +
                                                      "  \t  \tdarkkhaki \t#bdb76b \t189,183,107\n" +
                                                      "  \t  \tdarkmagenta \t#8b008b \t139,0,139\n" +
@@ -138,11 +139,13 @@ public class ColorSampleLookupValue implements LookupValueWithUIHint, DeferredUs
                                                      "  \t  \tdarkseagreen \t#8fbc8f \t143,188,143\n" +
                                                      "  \t  \tdarkslateblue \t#483d8b \t72,61,139\n" +
                                                      "  \t  \tdarkslategray \t#2f4f4f \t47,79,79\n" +
+                                                     "  \t  \tdarkslategrey \t#2f4f4f \t47,79,79\n" +
                                                      "  \t  \tdarkturquoise \t#00ced1 \t0,206,209\n" +
                                                      "  \t  \tdarkviolet \t#9400d3 \t148,0,211\n" +
                                                      "  \t  \tdeeppink \t#ff1493 \t255,20,147\n" +
                                                      "  \t  \tdeepskyblue \t#00bfff \t0,191,255\n" +
                                                      "  \t  \tdimgray \t#696969 \t105,105,105\n" +
+                                                     "  \t  \tdimgrey \t#696969 \t105,105,105\n" +
                                                      "  \t  \tdodgerblue \t#1e90ff \t30,144,255\n" +
                                                      "  \t  \tfirebrick \t#b22222 \t178,34,34\n" +
                                                      "  \t  \tfloralwhite \t#fffaf0 \t255,250,240\n" +
@@ -171,12 +174,14 @@ public class ColorSampleLookupValue implements LookupValueWithUIHint, DeferredUs
                                                      "  \t  \tlightcyan \t#e0ffff \t224,255,255\n" +
                                                      "  \t  \tlightgoldenrodyellow \t#fafad2 \t250,250,210\n" +
                                                      "  \t  \tlightgray \t#d3d3d3 \t211,211,211\n" +
+                                                     "  \t  \tlightgrey \t#d3d3d3 \t211,211,211\n" +
                                                      "  \t  \tlightgreen \t#90ee90 \t144,238,144\n" +
                                                      "  \t  \tlightpink \t#ffb6c1 \t255,182,193\n" +
                                                      "  \t  \tlightsalmon \t#ffa07a \t255,160,122\n" +
                                                      "  \t  \tlightseagreen \t#20b2aa \t32,178,170\n" +
                                                      "  \t  \tlightskyblue \t#87cefa \t135,206,250\n" +
                                                      "  \t  \tlightslategray \t#778899 \t119,136,153\n" +
+                                                     "  \t  \tlightslategrey \t#778899 \t119,136,153\n" +
                                                      "  \t  \tlightsteelblue \t#b0c4de \t176,196,222\n" +
                                                      "  \t  \tlightyellow \t#ffffe0 \t255,255,224\n" +
                                                      "  \t  \tlime \t#00ff00 \t0,255,0\n" +
@@ -229,6 +234,7 @@ public class ColorSampleLookupValue implements LookupValueWithUIHint, DeferredUs
                                                      "  \t  \tskyblue \t#87ceeb \t135,206,235\n" +
                                                      "  \t  \tslateblue \t#6a5acd \t106,90,205\n" +
                                                      "  \t  \tslategray \t#708090 \t112,128,144\n" +
+                                                     "  \t  \tslategrey \t#708090 \t112,128,144\n" +
                                                      "  \t  \tsnow \t#fffafa \t255,250,250\n" +
                                                      "  \t  \tspringgreen \t#00ff7f \t0,255,127\n" +
                                                      "  \t  \tsteelblue \t#4682b4 \t70,130,180\n" +

From d6b1c05e38c515b404f6b39b01541c95fcfa5b4a Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Tue, 5 Jun 2012 10:48:50 +0400
Subject: [PATCH 198/239] [merge] Fix tests: project may be null.

---
 .../diff/impl/settings/DiffPreviewPanel.java  |  5 +++--
 .../intellij/openapi/diff/DiffRequest.java    | 21 +++++++++++++------
 .../diff/impl/incrementalMerge/MergeList.java |  4 ++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
index 76a3f35cd3b6..d7ee52134f17 100644
--- a/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
+++ b/platform/lang-impl/src/com/intellij/openapi/diff/impl/settings/DiffPreviewPanel.java
@@ -35,6 +35,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.util.EventDispatcher;
 import com.intellij.util.diff.FilesTooBigForDiffException;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
@@ -91,7 +92,7 @@ public class DiffPreviewPanel implements PreviewPanel {
 
   }
 
-  public void setMergeRequest(Project project) throws FilesTooBigForDiffException {
+  public void setMergeRequest(@Nullable Project project) throws FilesTooBigForDiffException {
     getMergePanel().setDiffRequest(new SampleMerge(project));
   }
 
@@ -119,7 +120,7 @@ public class DiffPreviewPanel implements PreviewPanel {
   }
 
   public static class SampleMerge extends DiffRequest {
-    public SampleMerge(Project project) {
+    public SampleMerge(@Nullable Project project) {
       super(project);
     }
 
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffRequest.java b/platform/platform-api/src/com/intellij/openapi/diff/DiffRequest.java
index d91cb5ee2546..9dd01a443427 100644
--- a/platform/platform-api/src/com/intellij/openapi/diff/DiffRequest.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/DiffRequest.java
@@ -34,7 +34,7 @@ public abstract class DiffRequest {
   @NonNls private static final String COMMON_DIFF_GROUP_KEY = "DiffWindow";
 
   private String myGroupKey = COMMON_DIFF_GROUP_KEY;
-  private final Project myProject;
+  @Nullable private final Project myProject;
   private ToolbarAddons myToolbarAddons = ToolbarAddons.NOTHING;
   private Factory<JComponent> myBottomComponentFactory = null;
   private final HashSet myHints = new HashSet();
@@ -42,7 +42,7 @@ public abstract class DiffRequest {
   private Runnable myOnOkRunnable;
   private final List<Pair<String, DiffRequest>> myAdditional;
 
-  protected DiffRequest(Project project) {
+  protected DiffRequest(@Nullable Project project) {
     myProject = project;
     myGenericData = new HashMap<String, Object>(2);
     myAdditional = new ArrayList<Pair<String, DiffRequest>>(0);
@@ -57,9 +57,18 @@ public abstract class DiffRequest {
     }
   }
 
-  public String getGroupKey() { return myGroupKey; }
-  public void setGroupKey(@NonNls String groupKey) { myGroupKey = groupKey; }
-  public Project getProject() { return myProject; }
+  public String getGroupKey() {
+    return myGroupKey;
+  }
+
+  public void setGroupKey(@NonNls String groupKey) {
+    myGroupKey = groupKey;
+  }
+
+  @Nullable
+  public Project getProject() {
+    return myProject;
+  }
 
   public boolean isSafeToCallFromUpdate() {
     return true;
@@ -161,7 +170,7 @@ public abstract class DiffRequest {
   /**
    * <B>Work in progress. Don't rely on this functionality</B><br>
    */
-  public static interface ToolbarAddons {
+  public interface ToolbarAddons {
     /**
      * Does nothing
      */
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
index 979c76f7cb1e..9d6c39283711 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
@@ -62,7 +62,7 @@ public class MergeList implements UserDataHolder {
   @NotNull private final ChangeList myBaseToLeftChangeList;
   @NotNull private final ChangeList myBaseToRightChangeList;
 
-  private MergeList(@NotNull Project project, @NotNull Document left, @NotNull Document base, @NotNull Document right) {
+  private MergeList(@Nullable Project project, @NotNull Document left, @NotNull Document base, @NotNull Document right) {
     myBaseToLeftChangeList = new ChangeList(base, left, project);
     myBaseToRightChangeList = new ChangeList(base, right, project);
   }
@@ -77,7 +77,7 @@ public class MergeList implements UserDataHolder {
     return myBaseToRightChangeList;
   }
 
-  public static MergeList create(@NotNull Project project, @NotNull Document left, @NotNull Document base,
+  public static MergeList create(@Nullable Project project, @NotNull Document left, @NotNull Document base,
                                  @NotNull Document right) throws FilesTooBigForDiffException {
     MergeList mergeList = new MergeList(project, left, base, right);
     String leftText = left.getText();

From 62a32899b1e26d5ea787d83a30708ea926c630cb Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Tue, 5 Jun 2012 13:57:59 +0400
Subject: [PATCH 199/239] IDEA-86949 Annotation's properties completion

---
 .../GroovyCompletionContributor.java          | 10 +++-
 .../lang/completion/GroovyCompletionData.java |  7 ++-
 .../lang/completion/GroovyCompletionUtil.java | 24 +++++++++
 .../lang/completion/GroovyInsertHandler.java  | 34 +++++++++---
 .../GrAnnotationNameValuePairImpl.java        | 27 +++-------
 .../CompleteReferenceExpression.java          | 18 +++++++
 .../completion/GroovyCompletionTest.groovy    | 54 +++++++++++++++++++
 7 files changed, 146 insertions(+), 28 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java
index c08c07ba6f8a..581b6674da9f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionContributor.java
@@ -51,6 +51,7 @@ import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory;
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.*;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
@@ -638,7 +639,14 @@ public class GroovyCompletionContributor extends CompletionContributor {
   public void beforeCompletion(@NotNull final CompletionInitializationContext context) {
     if (context.getCompletionType() == CompletionType.BASIC && context.getFile() instanceof GroovyFile) {
       PsiElement position = context.getFile().findElementAt(context.getStartOffset());
-      if (position != null && position.getParent() instanceof GrVariable && position == ((GrVariable)position.getParent()).getNameIdentifierGroovy()) {
+      if (position != null &&
+          position.getParent() instanceof GrVariable &&
+          position == ((GrVariable)position.getParent()).getNameIdentifierGroovy() ||
+
+          position != null &&
+          position.getParent() instanceof GrAnnotationNameValuePair &&
+          position == ((GrAnnotationNameValuePair)position.getParent()).getNameIdentifierGroovy()) {
+
         context.setDummyIdentifier(CompletionUtil.DUMMY_IDENTIFIER_TRIMMED);
       }
       else if (semicolonNeeded(context)) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
index 39f0eb9373a8..f0817fe51827 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionData.java
@@ -42,6 +42,7 @@ import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifierList;
 import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.*;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
@@ -79,7 +80,11 @@ public class GroovyCompletionData {
     if (parent instanceof GrLiteral) {
       return;
     }
-    
+
+    if (parent instanceof GrExpression && parent.getParent() instanceof GrAnnotationNameValuePair) {
+      return;
+    }
+
     if (!PlatformPatterns.psiElement().afterLeaf(".", ".&", "@", "*.", "?.").accepts(position)) {
       if (suggestPackage(position)) {
         result.addElement(keyword(PsiKeyword.PACKAGE, TailType.INSERT_SPACE));
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
index fb0bfef5c72e..bcb9f460a4e2 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java
@@ -39,6 +39,7 @@ import com.intellij.psi.util.InheritanceUtil;
 import com.intellij.psi.util.PsiFormatUtil;
 import com.intellij.psi.util.PsiFormatUtilBase;
 import com.intellij.psi.util.TypeConversionUtil;
+import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.CollectionFactory;
@@ -51,6 +52,7 @@ import org.jetbrains.plugins.groovy.lang.GrReferenceAdjuster;
 import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariableDeclaration;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrCodeBlock;
@@ -66,6 +68,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.toplevel.imports.GrImportStatem
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrClassTypeElement;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement;
+import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyResolveResultImpl;
 import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
 import org.jetbrains.plugins.groovy.lang.psi.util.GdkMethodUtil;
 import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil;
@@ -292,6 +295,10 @@ public class GroovyCompletionUtil {
 
   private static LookupElementBuilder setTailText(PsiElement element, LookupElementBuilder builder, PsiSubstitutor substitutor) {
     if (element instanceof PsiMethod) {
+      PsiClass aClass = ((PsiMethod)element).getContainingClass();
+      if (aClass != null && aClass.isAnnotationType()) {
+        return builder;
+      }
       builder = builder.withTailText(PsiFormatUtil.formatMethod((PsiMethod)element, substitutor, PsiFormatUtilBase.SHOW_PARAMETERS,
                                                                 PsiFormatUtilBase.SHOW_NAME | PsiFormatUtilBase.SHOW_TYPE));
     }
@@ -488,4 +495,21 @@ public class GroovyCompletionUtil {
     final IElementType t = pprev.getNode().getElementType();
     return t == mLT || t == mCOMMA;
   }
+
+  public static Object[] getAnnotationCompletionResults(GrAnnotation anno) {
+    if (anno != null) {
+      GrCodeReferenceElement ref = anno.getClassReference();
+      PsiElement resolved = ref.resolve();
+      if (resolved instanceof PsiClass && ((PsiClass)resolved).isAnnotationType()) {
+        PsiMethod[] methods = ((PsiClass)resolved).getMethods();
+        Object[] result = new Object[methods.length];
+        for (int i = 0; i < methods.length; i++) {
+          result[i] = createCompletionVariant(new GroovyResolveResultImpl(methods[i], true));
+        }
+        return result;
+      }
+    }
+
+    return ArrayUtil.EMPTY_OBJECT_ARRAY;
+  }
 }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java
index 4dfd43772e81..87cc16c0c0b2 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyInsertHandler.java
@@ -30,7 +30,7 @@ import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.text.CharArrayUtil;
 import org.jetbrains.annotations.NonNls;
-import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
+import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
 import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair;
@@ -72,13 +72,21 @@ public class GroovyInsertHandler implements InsertHandler<LookupElement> {
       PsiElement elementAt = file.findElementAt(context.getStartOffset());
       assert elementAt != null;
       PsiElement parent = elementAt.getParent();
-      if (parent instanceof GrReferenceExpression &&
-          ((GrReferenceExpression)parent).getDotTokenType() == GroovyElementTypes.mMEMBER_POINTER) {
+      if (parent instanceof GrReferenceExpression && ((GrReferenceExpression)parent).getDotTokenType() == GroovyTokenTypes.mMEMBER_POINTER) {
         return;
       }
 
-      if (parent instanceof GrAnnotationNameValuePair || parent != null && parent.getParent() instanceof GrAnnotationNameValuePair) {
-        document.insertString(offset, " = ");
+      CharSequence charsSequence = document.getCharsSequence();
+      if (isAnnotationNameValuePair(obj, parent)) {
+        int endOffset = offset;
+        if (context.getCompletionChar() == Lookup.REPLACE_SELECT_CHAR) {
+          endOffset = CharArrayUtil.shiftForward(charsSequence, offset, " \t");
+          if (charsSequence.length() > endOffset && charsSequence.charAt(endOffset) == '=') {
+            endOffset++;
+            endOffset = CharArrayUtil.shiftForward(charsSequence, endOffset, " \t");
+          }
+        }
+        document.replaceString(offset, endOffset, " = ");
         caretModel.moveToOffset(offset + 3);
         return;
       }
@@ -89,8 +97,8 @@ public class GroovyInsertHandler implements InsertHandler<LookupElement> {
         if ((context.getCompletionChar() != '(' && context.getCompletionChar() != ' ') && 
             TypesUtil.isClassType(parameters[0].getType(), GroovyCommonClassNames.GROOVY_LANG_CLOSURE)) {
           int afterBrace;
-          final int nonWs = CharArrayUtil.shiftForward(document.getCharsSequence(), offset, " \t");
-          if (nonWs < document.getTextLength() && document.getCharsSequence().charAt(nonWs) == '{') {
+          final int nonWs = CharArrayUtil.shiftForward(charsSequence, offset, " \t");
+          if (nonWs < document.getTextLength() && charsSequence.charAt(nonWs) == '{') {
             afterBrace = nonWs + 1;
           } else {
             document.insertString(offset, " {}");
@@ -152,6 +160,18 @@ public class GroovyInsertHandler implements InsertHandler<LookupElement> {
     }
   }
 
+  private static boolean isAnnotationNameValuePair(Object obj, PsiElement parent) {
+    if (parent instanceof GrAnnotationNameValuePair || parent != null && parent.getParent() instanceof GrAnnotationNameValuePair) {
+      if (obj instanceof PsiMethod) {
+        PsiClass aClass = ((PsiMethod)obj).getContainingClass();
+        if (aClass != null && aClass.isAnnotationType()) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
   private static void handleOverwrite(final int offset, final Document document) {
     final CharSequence sequence = document.getCharsSequence();
     int i = offset;
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
index 9990ca6eb2b9..07ceea770b65 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
@@ -17,18 +17,18 @@
 package org.jetbrains.plugins.groovy.lang.psi.impl.auxiliary.annotation;
 
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.*;
 import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.*;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.lang.completion.GroovyCompletionUtil;
 import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory;
-import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair;
-import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationMemberValue;
 import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationMemberValue;
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair;
 import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
 import org.jetbrains.plugins.groovy.lang.psi.impl.GroovyPsiElementImpl;
 
@@ -80,7 +80,7 @@ public class GrAnnotationNameValuePairImpl extends GroovyPsiElementImpl implemen
   }
 
   public PsiReference getReference() {
-    return this;
+    return getNameIdentifierGroovy() == null ? null : this;
   }
 
   public PsiElement getElement() {
@@ -89,10 +89,8 @@ public class GrAnnotationNameValuePairImpl extends GroovyPsiElementImpl implemen
 
   public TextRange getRangeInElement() {
     PsiElement nameId = getNameIdentifierGroovy();
-    if (nameId != null) {
-      return nameId.getTextRange().shiftRight(-getTextRange().getStartOffset());
-    }
-    return TextRange.EMPTY_RANGE;
+    assert nameId != null;
+    return nameId.getTextRange().shiftRight(-getTextRange().getStartOffset());
   }
 
   @Nullable
@@ -152,16 +150,7 @@ public class GrAnnotationNameValuePairImpl extends GroovyPsiElementImpl implemen
 
   @NotNull
   public Object[] getVariants() {
-    GrAnnotation anno = getAnnotation();
-    if (anno != null) {
-      GrCodeReferenceElement ref = anno.getClassReference();
-      PsiElement resolved = ref.resolve();
-      if (resolved instanceof PsiClass && ((PsiClass) resolved).isAnnotationType()) {
-        return ((PsiClass) resolved).getMethods();
-      }
-    }
-
-    return ArrayUtil.EMPTY_OBJECT_ARRAY;
+    return GroovyCompletionUtil.getAnnotationCompletionResults(getAnnotation());
   }
 
   public boolean isSoft() {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java
index 4ce03ecb8d09..43ba6338da9e 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/CompleteReferenceExpression.java
@@ -36,6 +36,8 @@ import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
 import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult;
 import org.jetbrains.plugins.groovy.lang.psi.api.SpreadState;
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;
+import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotationNameValuePair;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
@@ -66,6 +68,8 @@ public class CompleteReferenceExpression {
   }
 
   public static void processVariants(PrefixMatcher matcher, Consumer<Object> consumer, GrReferenceExpressionImpl refExpr, CompletionParameters parameters) {
+    processRefInAnnotation(consumer, refExpr);
+
     final CompleteReferenceProcessor processor = new CompleteReferenceProcessor(refExpr, consumer, matcher, parameters);
     getVariantsImpl(refExpr, processor);
     final GroovyResolveResult[] candidates = processor.getCandidates();
@@ -74,6 +78,20 @@ public class CompleteReferenceExpression {
     }
   }
 
+  private static void processRefInAnnotation(Consumer<Object> consumer, GrReferenceExpressionImpl refExpr) {
+    if (refExpr.getParent() instanceof GrAnnotationNameValuePair) {
+      PsiElement parent = refExpr.getParent().getParent();
+      if (!(parent instanceof GrAnnotation)) {
+        parent = parent.getParent();
+      }
+      if (parent instanceof GrAnnotation) {
+        for (Object result : GroovyCompletionUtil.getAnnotationCompletionResults((GrAnnotation)parent)) {
+          consumer.consume(result);
+        }
+      }
+    }
+  }
+
   private static void processIfJavaLangClass(GrReferenceExpression refExpr, ResolverProcessor consumer, PsiType type) {
     if (!(type instanceof PsiClassType)) return;
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
index 2a835f46e23e..1e29d0de3136 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/completion/GroovyCompletionTest.groovy
@@ -1326,4 +1326,58 @@ print map.metc<caret>
     myFixture.complete(CompletionType.BASIC);
     assertEmpty myFixture.getLookupElements()
   }
+
+  void testAnnotationCompletion0() {
+    myFixture.configureByText('_.groovy', '''\
+@interface A {
+  String fooo()
+}
+
+@A(foo<caret>)
+def bar(){}''')
+    myFixture.complete(CompletionType.BASIC)
+    myFixture.checkResult('''\
+@interface A {
+  String fooo()
+}
+
+@A(fooo = <caret>)
+def bar(){}''')
+  }
+
+  void testAnnotationCompletion1() {
+    myFixture.configureByText('_.groovy', '''\
+@interface A {
+  String fooo()
+}
+
+def abcde() {}
+
+@A(abc<caret>)
+def bar(){}''')
+    myFixture.complete(CompletionType.BASIC)
+    myFixture.checkResult('''\
+@interface A {
+  String fooo()
+}
+
+def abcde() {}
+
+@A(abcde()<caret>)
+def bar(){}''')
+  }
+
+  void testAnnotationCompletion2() {
+    myFixture.configureByText('_.groovy', '''\
+@interface A {
+  String fooo()
+  String fooo1()
+}
+
+@A(foo<caret> = 'a')
+def bar(){}''')
+    myFixture.complete(CompletionType.BASIC)
+    assertOrderedEquals(myFixture.lookupElementStrings, ['fooo', 'fooo1'])
+  }
+
 }
\ No newline at end of file

From 8404147de4a58bb495ce015faa9b541a9a31ae11 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Tue, 5 Jun 2012 12:10:26 +0200
Subject: [PATCH 200/239] don't set "default" bg/fg directly

---
 .../intellij/ide/projectView/impl/ProjectViewTree.java |  3 ---
 .../src/com/intellij/ui/treeStructure/Tree.java        | 10 ++++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
index 229ef3c7ac1a..2aa88bbc2a6a 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewTree.java
@@ -29,7 +29,6 @@ import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.ui.ColorUtil;
 import com.intellij.ui.FileColorManager;
 import com.intellij.ui.tabs.FileColorManagerImpl;
-import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -57,8 +56,6 @@ public abstract class ProjectViewTree extends DnDAwareTree {
     cellRenderer.setIconOpaque(false);
     setCellRenderer(cellRenderer);
     cellRenderer.setTransparentIconBackground(true);
-
-    setBackground(UIUtil.getTreeTextBackground());
   }
 
   public abstract DefaultMutableTreeNode getSelectedNode();
diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
index fc4565964ed6..33f5bcf8af97 100644
--- a/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
+++ b/platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
@@ -145,6 +145,16 @@ public class Tree extends JTree implements ComponentWithEmptyText, ComponentWith
     return myExpandableItemsHandler;
   }
 
+  @Override
+  public Color getBackground() {
+    return isBackgroundSet() ? super.getBackground() : UIUtil.getTreeTextBackground();
+  }
+
+  @Override
+  public Color getForeground() {
+    return isForegroundSet() ? super.getForeground() : UIUtil.getTreeForeground();
+  }
+
   @Override
   public void addNotify() {
     super.addNotify();

From 05d9c2fef8871ce78198e83a50e9da84bd93a373 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Tue, 5 Jun 2012 12:37:00 +0400
Subject: [PATCH 201/239] IDEA-86397 Delete line (Ctrl+Y) moves caret to the
 1st column position

Avoid endless loop in case of collapsed single-line fold region
---
 .../openapi/editor/ex/util/EditorUtil.java         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
index 07a4654578ab..434a6bfcc8ba 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/util/EditorUtil.java
@@ -700,7 +700,12 @@ public class EditorUtil {
         first = new LogicalPosition(line, 0);
         break;
       }
-      line = document.getLineNumber(foldRegion.getStartOffset());
+      final int foldEndLine = document.getLineNumber(foldRegion.getStartOffset());
+      if (foldEndLine <= line) {
+        first = new LogicalPosition(line, 0);
+        break;
+      }
+      line = foldEndLine;
     }
     
 
@@ -715,7 +720,12 @@ public class EditorUtil {
         second = new LogicalPosition(line + 1, 0);
         break;
       }
-      line = document.getLineNumber(foldRegion.getEndOffset());
+      final int foldEndLine = document.getLineNumber(foldRegion.getStartOffset());
+      if (foldEndLine <= line) {
+        first = new LogicalPosition(line + 1, 0);
+        break;
+      }
+      line = foldEndLine;
     }
     
     if (second.line >= document.getLineCount()) {

From cbb927c95132f77203d2ff7fab7a6ba97d738881 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Tue, 5 Jun 2012 14:19:37 +0400
Subject: [PATCH 202/239] IDEA-86017 Scroll view at bottom when file is
 re-opened, because text editor cursor was at last line when file was closed.

---
 .../editor/impl/ScrollingModelImpl.java       | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java
index 21d1fb3d46a3..5f4414a2558c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ScrollingModelImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,11 +54,12 @@ public class ScrollingModelImpl implements ScrollingModelEx {
   private final CopyOnWriteArrayList<VisibleAreaListener> myVisibleAreaListeners = ContainerUtil.createEmptyCOWList();
 
   private AnimatedScrollingRunnable myCurrentAnimationRequest = null;
-  private boolean myAnimationDisabled = false;
+  private boolean                   myAnimationDisabled       = false;
   private final DocumentAdapter myDocumentListener;
   private int myAccumulatedXOffset = -1;
   private int myAccumulatedYOffset = -1;
   private boolean myAccumulateViewportChanges;
+  private boolean myViewportPositioned;
 
   public ScrollingModelImpl(EditorImpl editor) {
     myEditor = editor;
@@ -70,6 +71,12 @@ public class ScrollingModelImpl implements ScrollingModelEx {
       public void stateChanged(ChangeEvent event) {
         Rectangle viewRect = getVisibleArea();
         VisibleAreaEvent visibleAreaEvent = new VisibleAreaEvent(myEditor, myLastViewRect, viewRect);
+        if (!myViewportPositioned && viewRect.height > 0) {
+          myViewportPositioned = true;
+          if (adjustVerticalOffsetIfNecessary()) {
+            return;
+          }
+        }
         myLastViewRect = viewRect;
         for (VisibleAreaListener listener : myVisibleAreaListeners) {
           listener.visibleAreaChanged(visibleAreaEvent);
@@ -86,6 +93,26 @@ public class ScrollingModelImpl implements ScrollingModelEx {
     myEditor.getDocument().addDocumentListener(myDocumentListener);
   }
 
+  /**
+   * Corrects viewport position if necessary on initial editor showing.
+   *
+   * @return    <code>true</code> if the vertical viewport position has been adjusted; <code>false</code> otherwise
+   */
+  private boolean adjustVerticalOffsetIfNecessary() {
+    // There is a possible case that the editor is configured to show virtual space at file bottom and requested position is located
+    // somewhere around. We don't want to position viewport in a way that most of its area is used to represent that virtual empty space.
+    // So, we tweak vertical offset if necessary.
+    int maxY = Math.max(myEditor.getLineHeight(), myEditor.getDocument().getLineCount() * myEditor.getLineHeight());
+    int minPreferredY = maxY - getVisibleArea().height * 2 / 3;
+    final int currentOffset = getVerticalScrollOffset();
+    int offsetToUse = Math.min(minPreferredY, currentOffset);
+    if (offsetToUse != currentOffset) {
+      scrollToOffsets(getHorizontalScrollOffset(), offsetToUse);
+      return true;
+    }
+    return false; 
+  }
+
   @Override
   public Rectangle getVisibleArea() {
     assertIsDispatchThread();

From a6af318829b8271601278f029027e55cefe0bdb5 Mon Sep 17 00:00:00 2001
From: Sergey Simonchik <sergey.simonchik@jetbrains.com>
Date: Tue, 5 Jun 2012 14:25:10 +0400
Subject: [PATCH 203/239] WI-11522 Inspection names - some words are
 incorrectly uppercased

---
 platform/platform-resources/src/META-INF/XmlPlugin.xml          | 2 +-
 .../impl/analysis/XmlHighlightVisitorBasedInspection.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/platform-resources/src/META-INF/XmlPlugin.xml b/platform/platform-resources/src/META-INF/XmlPlugin.xml
index 834e6e03ed0c..4a667eaa7ddd 100644
--- a/platform/platform-resources/src/META-INF/XmlPlugin.xml
+++ b/platform/platform-resources/src/META-INF/XmlPlugin.xml
@@ -343,7 +343,7 @@
     <localInspection language="XML" shortName="XmlUnusedNamespaceDeclaration" displayName="Unused XML schema declaration"
                      groupKey="xml.inspections.group.name" bundle="messages.XmlBundle" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInsight.daemon.impl.analysis.XmlUnusedNamespaceInspection"/>
-    <globalInspection shortName="XmlHighlighting" displayName="Xml Highlighting" groupName="General" enabledByDefault="true" level="ERROR"
+    <globalInspection shortName="XmlHighlighting" displayName="XML highlighting" groupName="General" enabledByDefault="true" level="ERROR"
                       implementationClass="com.intellij.codeInsight.daemon.impl.analysis.XmlHighlightVisitorBasedInspection"/>
 
     <codeFoldingOptionsProvider instance="com.intellij.application.options.editor.XmlCodeFoldingOptionsProvider"/>
diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java
index 2dd1dabc4785..34fa3bc3ac1b 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java
@@ -89,7 +89,7 @@ public class XmlHighlightVisitorBasedInspection extends GlobalSimpleInspectionTo
   @NotNull
   @Override
   public String getDisplayName() {
-    return "Xml Highlighting";
+    return "XML highlighting";
   }
 
   @NotNull

From 987f737e9e89112f3159620329f427435b64a07f Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Tue, 5 Jun 2012 14:50:24 +0400
Subject: [PATCH 204/239] IDEA-65714 CTRL+W: additional step for selecting
 vararg-argument in method call implemented

---
 .../wordSelection/VarargsSelectioner.java     | 91 +++++++++++++++++++
 resources/src/META-INF/IdeaPlugin.xml         |  1 +
 2 files changed, 92 insertions(+)
 create mode 100644 java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/VarargsSelectioner.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/VarargsSelectioner.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/VarargsSelectioner.java
new file mode 100644
index 000000000000..b454544d1ff8
--- /dev/null
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/wordSelection/VarargsSelectioner.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.editorActions.wordSelection;
+
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.psi.*;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public class VarargsSelectioner extends BasicSelectioner {
+  @Override
+  public boolean canSelect(PsiElement e) {
+    return e instanceof PsiExpressionList;
+  }
+
+  @Override
+  public List<TextRange> select(PsiElement e, CharSequence editorText, int cursorOffset, Editor editor) {
+    if (!(e instanceof PsiExpressionList)) {
+      return Collections.emptyList();
+    }
+
+    final PsiExpressionList expressionList = (PsiExpressionList)e;
+    final PsiParameterList parameterList = getParameterList(expressionList);
+
+    if (parameterList == null) {
+      return Collections.emptyList();
+    }
+
+    final PsiExpression[] varargArgs = getVarargArgs(parameterList, expressionList);
+
+    if (varargArgs.length == 0) {
+      return Collections.emptyList();
+    }
+
+    final TextRange firstExpressionRange = varargArgs[0].getTextRange();
+    final TextRange lastExpressionRange = varargArgs[varargArgs.length - 1].getTextRange();
+
+
+    return Collections.singletonList(new TextRange(firstExpressionRange.getStartOffset(), lastExpressionRange.getEndOffset()));
+  }
+
+  @NotNull
+  private static PsiExpression[] getVarargArgs(@NotNull PsiParameterList parameterList,
+                                               @NotNull PsiExpressionList expressionList) {
+    final PsiParameter[] parameters = parameterList.getParameters();
+    final PsiExpression[] expressions = expressionList.getExpressions();
+
+    if (parameters.length == 0 || expressions.length == 0) {
+      return PsiExpression.EMPTY_ARRAY;
+    }
+
+    final int varargIndex = parameters.length - 1;
+    final PsiParameter varargParam = parameters[varargIndex];
+    if (!varargParam.isVarArgs() || parameters.length > expressions.length) {
+      return PsiExpression.EMPTY_ARRAY;
+    }
+
+    return Arrays.copyOfRange(expressions, varargIndex, expressions.length);
+  }
+
+  @Nullable
+  private static PsiParameterList getParameterList(@NotNull PsiExpressionList list) {
+    if (!(list.getParent() instanceof PsiMethodCallExpression)) {
+      return null;
+    }
+    final PsiMethod method = ((PsiMethodCallExpression)list.getParent()).resolveMethod();
+
+    return method != null ? method.getParameterList() : null;
+  }
+}
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 60af77201bfc..3e6bb2a1f1df 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -870,6 +870,7 @@
     <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.LiteralSelectioner"/>
     <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.DocCommentSelectioner"/>
     <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.ListSelectioner"/>
+    <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.VarargsSelectioner"/>
     <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.CodeBlockOrInitializerSelectioner"/>
     <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.FinallyBlockSelectioner"/>
     <extendWordSelectionHandler implementation="com.intellij.codeInsight.editorActions.wordSelection.MethodOrClassSelectioner"/>

From b27e6a4ecc482b29d2e7a98b92746fb510facc6a Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <Denis.Zhdanov@jetbrains.com>
Date: Tue, 5 Jun 2012 15:12:58 +0400
Subject: [PATCH 205/239] IDEA-86633 Javadoc copy puts a non-lower-ascii
 character on the clipboard

&nbsp; symbols are replaced by raw white spaces at the copied javadoc text now
---
 .../codeInsight/documentation/DocumentationComponent.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
index a699c87e0083..f356fa43587e 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java
@@ -328,7 +328,9 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr
   @Override
   public Object getData(@NonNls String dataId) {
     if (DocumentationManager.SELECTED_QUICK_DOC_TEXT.getName().equals(dataId)) {
-      return myEditorPane.getSelectedText();
+      // Javadocs often contain &nbsp; symbols (non-breakable white space). We don't want to copy them as is and replace
+      // with raw white spaces. See IDEA-86633 for more details.
+      return myEditorPane.getSelectedText().replace((char)160, ' ');
     }
      
     return null;

From e3a6c666e9e85fc797b779deaaf674056069c63d Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Tue, 5 Jun 2012 13:20:34 +0200
Subject: [PATCH 206/239] LH: test fixed

---
 .../com/intellij/history/integration/FileListeningTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/history/integration/FileListeningTest.java b/platform/platform-tests/testSrc/com/intellij/history/integration/FileListeningTest.java
index 2d65ec17ac8f..392d567377d7 100644
--- a/platform/platform-tests/testSrc/com/intellij/history/integration/FileListeningTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/history/integration/FileListeningTest.java
@@ -69,7 +69,7 @@ public class FileListeningTest extends IntegrationTestCase {
     String dir2 = createDirectoryExternally("dir/subdir/subdir2");
     String f2 = createFileExternally("dir/subdir/subdir2/f.txt");
 
-    LocalFileSystem.getInstance().refresh(false);
+    myRoot.refresh(false, true);
 
     List<Change> changes = getVcs().getChangeListInTests().getChangesInTests().get(0).getChanges();
     assertEquals(changes.toString(), 4, changes.size());

From 4d1dfd52e9ed5a2e49192d8447112fde759926a5 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Tue, 5 Jun 2012 14:22:34 +0200
Subject: [PATCH 207/239] fix layout on Aqua LaF

---
 .../src/com/intellij/ui/ColorPicker.java        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
index f5333efeebbf..d51711bac17a 100644
--- a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
+++ b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.util.text.StringUtilRt;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.util.Alarm;
 import com.intellij.util.Consumer;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -335,21 +336,23 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
 
     final JPanel rgbPanel = new JPanel();
     rgbPanel.setLayout(new BoxLayout(rgbPanel, BoxLayout.X_AXIS));
-    myR_after.setPreferredSize(new Dimension(14, -1));
-    myG_after.setPreferredSize(new Dimension(14, -1));
-    myB_after.setPreferredSize(new Dimension(14, -1));
+    if (!UIUtil.isUnderAquaLookAndFeel()) {
+      myR_after.setPreferredSize(new Dimension(14, -1));
+      myG_after.setPreferredSize(new Dimension(14, -1));
+      myB_after.setPreferredSize(new Dimension(14, -1));
+    }
     rgbPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
     rgbPanel.add(myR);
     rgbPanel.add(myRed);
-    rgbPanel.add(myR_after);
+    if (!UIUtil.isUnderAquaLookAndFeel()) rgbPanel.add(myR_after);
     rgbPanel.add(Box.createHorizontalStrut(2));
     rgbPanel.add(myG);
     rgbPanel.add(myGreen);
-    rgbPanel.add(myG_after);
+    if (!UIUtil.isUnderAquaLookAndFeel()) rgbPanel.add(myG_after);
     rgbPanel.add(Box.createHorizontalStrut(2));
     rgbPanel.add(myB);
     rgbPanel.add(myBlue);
-    rgbPanel.add(myB_after);
+    if (!UIUtil.isUnderAquaLookAndFeel()) rgbPanel.add(myB_after);
     rgbPanel.add(Box.createHorizontalStrut(2));
     rgbPanel.add(myFormat);
 
@@ -358,7 +361,7 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen
     final JPanel hexPanel = new JPanel();
     hexPanel.setLayout(new BoxLayout(hexPanel, BoxLayout.X_AXIS));
     hexPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
-    hexPanel.add(new JLabel("Hex:"));
+    hexPanel.add(new JLabel("#"));
     hexPanel.add(myHex);
 
     result.add(hexPanel, BorderLayout.EAST);

From 750f741eb83af2bef415062ef82b22a9072d0971 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Tue, 5 Jun 2012 16:29:57 +0400
Subject: [PATCH 208/239] IDEA-86852 Add final modifier to Create Field
 implemented

---
 .../quickfix/CreateFieldFromUsageFix.java     | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java
index ddf177c70cb2..debb2fff7b1a 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFieldFromUsageFix.java
@@ -66,7 +66,7 @@ public class CreateFieldFromUsageFix extends CreateVarFromUsageFix {
     PsiClass parentClass;
     do {
       enclosingContext = PsiTreeUtil.getParentOfType(enclosingContext == null ? myReferenceExpression : enclosingContext, PsiMethod.class,
-                                    PsiField.class, PsiClassInitializer.class);
+                                                     PsiField.class, PsiClassInitializer.class);
       parentClass = enclosingContext == null ? null : enclosingContext.getContainingClass();
     }
     while (parentClass instanceof PsiAnonymousClass);
@@ -104,6 +104,10 @@ public class CreateFieldFromUsageFix extends CreateVarFromUsageFix {
       PsiUtil.setModifierProperty(field, PsiModifier.STATIC, true);
     }
 
+    if (shouldCreateFinalMember(myReferenceExpression, targetClass)) {
+      PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true);
+    }
+
     if (createConstantField()) {
       PsiUtil.setModifierProperty(field, PsiModifier.STATIC, true);
       PsiUtil.setModifierProperty(field, PsiModifier.FINAL, true);
@@ -146,6 +150,22 @@ public class CreateFieldFromUsageFix extends CreateVarFromUsageFix {
     });
   }
 
+  private static boolean shouldCreateFinalMember(@NotNull PsiReferenceExpression ref, @NotNull PsiClass targetClass) {
+    if (!PsiTreeUtil.isAncestor(targetClass, ref, true)) {
+      return false;
+    }
+    final PsiElement element = PsiTreeUtil.getParentOfType(ref, PsiClassInitializer.class, PsiMethod.class);
+    if (element instanceof PsiClassInitializer){
+      return true;
+    }
+
+    if (element instanceof PsiMethod && ((PsiMethod)element).isConstructor()){
+      return true;
+    }
+
+    return false;
+  }
+
   @Override
   @NotNull
   public String getFamilyName() {

From 4b16f22fcab0a458d4f7e0c099f68bbb8e7c14be Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Tue, 5 Jun 2012 16:50:59 +0400
Subject: [PATCH 209/239] test fixes

---
 .../quickFix/createFieldFromUsage/afterCreateFromEquals.java    | 2 +-
 .../afterCreateFromEqualsToPrimitiveType.java                   | 2 +-
 .../createFieldFromUsage/afterInsideStaticInnerClass.java       | 2 +-
 .../quickFix/createFieldFromUsage/afterQualifyInner.java        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterCreateFromEquals.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterCreateFromEquals.java
index 1f26fcbe44d1..4e3e4536d697 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterCreateFromEquals.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterCreateFromEquals.java
@@ -1,6 +1,6 @@
 // "Create Field 'VAR'" "true"
 class A {
-    private String VAR<caret>;
+    private final String VAR<caret>;
 
     public IDEA16027() {
     VAR.equals("");
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterCreateFromEqualsToPrimitiveType.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterCreateFromEqualsToPrimitiveType.java
index 8e57b7634bde..ec5f68c64b4b 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterCreateFromEqualsToPrimitiveType.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterCreateFromEqualsToPrimitiveType.java
@@ -1,6 +1,6 @@
 // "Create Field 'VAR'" "true"
 class A {
-    private Integer VAR<caret>;
+    private final Integer VAR<caret>;
 
     public IDEA16027() {
     VAR.equals(5);
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterInsideStaticInnerClass.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterInsideStaticInnerClass.java
index 1477ec14a8d6..82e132986ae2 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterInsideStaticInnerClass.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterInsideStaticInnerClass.java
@@ -3,7 +3,7 @@ class A {
   String field;
 
   static class Foo {
-      private Object field<caret>;
+      private final Object field<caret>;
 
       Foo() {
           field;
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterQualifyInner.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterQualifyInner.java
index 5becc861690b..879f7b391c7a 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterQualifyInner.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterQualifyInner.java
@@ -1,6 +1,6 @@
 // "Create Field 'field'" "true"
 class A{
-    private Outer.Inner field<caret>;
+    private final Outer.Inner field<caret>;
 
     {
         Outer.f(field);

From 39021d7b7049aa0187703dfbda9932b49447e6fb Mon Sep 17 00:00:00 2001
From: Oleg Sukhodolsky <oleg.sukhodolsky@jetbrains.com>
Date: Tue, 5 Jun 2012 16:47:12 +0400
Subject: [PATCH 210/239] Code cleanup: several typos fixed

---
 .../intellij/codeInsight/generation/IndentedCommenter.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/IndentedCommenter.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/IndentedCommenter.java
index 5273acf6314d..9cddcbc020ff 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/generation/IndentedCommenter.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/IndentedCommenter.java
@@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable;
  */
 public interface IndentedCommenter extends Commenter {
   /**
-   * Used to override CodeStyleSetings#LINE_COMMENT_AT_FIRST_COLUMN option
-   * @return true or false to overrride, null to use settings option
+   * Used to override CodeStyleSettings#LINE_COMMENT_AT_FIRST_COLUMN option
+   * @return true or false to override, null to use settings option
    */
   @Nullable
   Boolean forceIndentedLineComment();

From ed1348ccb344590aa9d4dae5be9ff02981152afa Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Tue, 5 Jun 2012 16:59:32 +0400
Subject: [PATCH 211/239] icon rotated

---
 platform/icons/src/gutter/recursiveMethod.png | Bin 490 -> 454 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/platform/icons/src/gutter/recursiveMethod.png b/platform/icons/src/gutter/recursiveMethod.png
index f74592556633f3f11567b0d865f7092e7bed4701..d5c3702009d6fb8ee4f847fb0e12da0117a8b43c 100644
GIT binary patch
delta 368
zcmV-$0gwLb1I7c8Uw;M#3^_BY_-3vE00BlxL_t(2&y`U<NJ3#0z4uErEL3O^L|#OL
z)uX_nTHewe4iQDs4@6r_v^g}EM3A)#%>^L@4lRumK@<*A(G-agVnads{=V<t78R3>
zI@7&y&OMiNkeT5>@H8*+$#p@>Ng}IhAPOt#fO5@8COSjJ{eSz5EMeVYbZ%S7>iZ7M
zY7YQxAybj13rboVNoSKtg@Adc;UK(S^BtrXuTOR(EnhqVz^ZP{9uun+8XLLr+w<K6
zDHGWK1d=weYe9D)5WC6kRqCqYiKRZ0c2?xmiE^k{9|=W=te~b_!s~}%q+f3)0{{q*
zuP8jeumAwar)d)<;q}KqUdx@q=s@i1DEZPZB~c%0PJ@@3mC8><lD0<DE;j_@%Lj&8
zDiqpXCf81pQs=F)uCc7fe~T5Ho30hNfUKr~XslM;Efbw0;^DXA{)#Wqqrc5<hm$S<
O0000<MNUMnLSTaXzoo$d

delta 405
zcmV;G0c!rn1L^~iUw;J)4<IdV&OvVg00C-AL_t(2&vlSLNJ3#0#n1bmrNzsLga;9>
zQB4jel#NZ%5ETT1(Ap9;iAYnn6*jg<gB5{MOJh_JMMIc1DnW>gLg@3o@4L6be1+kK
zyByB%{yAV~bnED5&g|3#y438}#b~vdFLdfI5ME7-NIVn$F@Kw6*B?kV5Q%4E;nlS3
z)0i2d`3(WxyRQ3;WZ!5gR4wKUM!>XcrM$0yz;7w*>j<iuc)mO!0RW`z7|VL-F}po-
zv%gR_0_Irl<IP91iO1~r2+R5~DLdhwq_J8Au+v_9f4EjL28SluvD(s(#%k&J2cjvB
zsr2``hvUSj;eYp!wFXiNL?!@u06<9_I<$XDJ>~W)0Kn3LlJ;*(%4xhPX$8AQtfUoG
zPUGDLnCP6Oo$3aVv{OuU<;FTOvn&`m5t^_?k2fhi-crlh43g8_C8k~tSb4oYC5@Q@
z0OQk30>G}&^*Q13nm<69l)46xEZm(D0DJ?h=gN&}AP)L700000NkvXXu0mjf8??a;


From 4639086c04a2a3f5249d0c53d71b828445dc3ace Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 5 Jun 2012 16:11:24 +0400
Subject: [PATCH 212/239] usage view: cancel search progress and view
 synchronously; do not cancel all searches when one was canceled

---
 .../find/findUsages/FindUsagesManager.java    |  3 -
 .../intellij/find/impl/FindInProjectUtil.java |  8 +--
 .../com/intellij/usages/UsageViewManager.java |  6 --
 .../intellij/usages/impl/UsageViewImpl.java   | 18 +++--
 .../usages/impl/UsageViewManagerImpl.java     | 72 ++++++++++++-------
 5 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
index e6bba8de2ff4..6c43f9915857 100644
--- a/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
+++ b/platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
@@ -550,13 +550,10 @@ public class FindUsagesManager implements JDOMExternalizable {
 
     final FileSearchScope direction = dir;
 
-    final com.intellij.usages.UsageViewManager usageViewManager = com.intellij.usages.UsageViewManager.getInstance(project);
-    usageViewManager.setCurrentSearchCancelled(false);
     final Usage[] foundUsage = {null};
     usageSearcher.generate(new Processor<Usage>() {
       @Override
       public boolean process(Usage usage) {
-        if (usageViewManager.searchHasBeenCancelled()) return false;
 
         usagesWereFound[0] = true;
 
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
index b2168ac187e5..175b8c97bfca 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
@@ -226,9 +226,7 @@ public class FindInProjectUtil {
       int count = 0;
       final boolean[] warningShown = {false};
 
-      final UsageViewManager usageViewManager = UsageViewManager.getInstance(project);
       for (final PsiFile psiFile : psiFiles) {
-        usageViewManager.checkSearchCanceled();
         final VirtualFile virtualFile = psiFile.getVirtualFile();
         final int index = i++;
         if (virtualFile == null) continue;
@@ -588,10 +586,8 @@ public class FindInProjectUtil {
 
     Project project = psiFile.getProject();
 
-    UsageViewManager usageViewManager = UsageViewManager.getInstance(project);
     FindManager findManager = FindManager.getInstance(project);
     while (offset < textLength) {
-      usageViewManager.checkSearchCanceled();
       FindResult result = findManager.findString(text, offset, findModel, psiFile.getVirtualFile());
       if (!result.isStringFound()) break;
 
@@ -601,7 +597,9 @@ public class FindInProjectUtil {
         if (!((LocalSearchScope)customScope).containsRange(psiFile, range)) break;
       }
       UsageInfo info = new UsageInfo(psiFile, result.getStartOffset(), result.getEndOffset());
-      if (!consumer.process(info)) break;
+      if (!consumer.process(info)){
+        throw new ProcessCanceledException();
+      }
       count++;
 
       final int prevOffset = offset;
diff --git a/platform/usageView/src/com/intellij/usages/UsageViewManager.java b/platform/usageView/src/com/intellij/usages/UsageViewManager.java
index 98440e87afa0..d0760ae753e4 100644
--- a/platform/usageView/src/com/intellij/usages/UsageViewManager.java
+++ b/platform/usageView/src/com/intellij/usages/UsageViewManager.java
@@ -52,12 +52,6 @@ public abstract class UsageViewManager {
                                 @NotNull UsageViewPresentation presentation,
                                 UsageViewStateListener listener);
 
-  public abstract void setCurrentSearchCancelled(boolean flag);
-
-  public abstract boolean searchHasBeenCancelled();
-
-  public abstract void checkSearchCanceled() throws ProcessCanceledException;
-
   public interface UsageViewStateListener {
     void usageViewCreated(UsageView usageView);
     void findingUsagesFinished(final UsageView usageView);
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
index 5e86945abc3e..08b1ff32d64a 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.ide.CopyPasteManager;
+import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
@@ -247,11 +248,17 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
     }, new Condition<Object>() {
       @Override
       public boolean value(Object o) {
-        return isDisposed || project.isDisposed() || com.intellij.usages.UsageViewManager.getInstance(project).searchHasBeenCancelled();
+        return isDisposed || project.isDisposed() || searchHasBeenCancelled();
       }
     },200);
   }
 
+  protected boolean searchHasBeenCancelled() {
+    return false;
+  }
+  
+  protected void setCurrentSearchCancelled(boolean flag){}
+  
   private void setupCentralPanel() {
     myCentralPanel.removeAll();
     if (myUsagePreviewPanel != null) {
@@ -650,14 +657,14 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
       public void run(@NotNull final ProgressIndicator indicator) {
         setSearchInProgress(true);
         final com.intellij.usages.UsageViewManager usageViewManager = com.intellij.usages.UsageViewManager.getInstance(myProject);
-        usageViewManager.setCurrentSearchCancelled(false);
+        setCurrentSearchCancelled(false);
 
         myChangesDetected = false;
         UsageSearcher usageSearcher = myUsageSearcherFactory.create();
         usageSearcher.generate(new Processor<Usage>() {
           @Override
           public boolean process(final Usage usage) {
-            if (usageViewManager.searchHasBeenCancelled()) return false;
+            if (searchHasBeenCancelled()) return false;
             if (tooManyUsages.get() == 1) {
               try {
                 waitWhileUserClick.await(1, TimeUnit.SECONDS);
@@ -671,7 +678,8 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
             if (incrementCounter) {
               final int usageCount = usageCountWithoutDefinition.incrementAndGet();
               if (usageCount > UsageLimitUtil.USAGES_LIMIT && tooManyUsages.get() == 0 && tooManyUsages.compareAndSet(0, 1)) {
-                ((UsageViewManagerImpl)usageViewManager).showTooManyUsagesWarning(indicator, waitWhileUserClick, usageCountWithoutDefinition.get());
+                ((UsageViewManagerImpl)usageViewManager)
+                  .showTooManyUsagesWarning(indicator, waitWhileUserClick, usageCountWithoutDefinition.get(), UsageViewImpl.this);
               }
               appendUsage(usage);
             }
@@ -835,8 +843,6 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
 
   @Override
   public void close() {
-    // todo ? crazyness
-    com.intellij.usages.UsageViewManager.getInstance(myProject).setCurrentSearchCancelled(true);
     UsageViewManager.getInstance(myProject).closeContent(myContent);
   }
 
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
index aec20676de48..489f10cbc95c 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
@@ -66,7 +66,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public class UsageViewManagerImpl extends UsageViewManager {
   private final Project myProject;
   private static final Key<UsageView> USAGE_VIEW_KEY = Key.create("USAGE_VIEW");
-  private volatile boolean mySearchHasBeenCancelled;
+  
 
   public UsageViewManagerImpl(Project project) {
     myProject = project;
@@ -75,7 +75,6 @@ public class UsageViewManagerImpl extends UsageViewManager {
   @Override
   @NotNull
   public UsageView createUsageView(@NotNull UsageTarget[] targets, @NotNull Usage[] usages, @NotNull UsageViewPresentation presentation, Factory<UsageSearcher> usageSearcherFactory) {
-    mySearchHasBeenCancelled = false;
     UsageViewImpl usageView = new UsageViewImpl(myProject, presentation, targets, usageSearcherFactory);
     appendUsages(usages, usageView);
     usageView.setSearchInProgress(false);
@@ -217,31 +216,18 @@ public class UsageViewManagerImpl extends UsageViewManager {
   }
 
 
-  @Override
-  public void setCurrentSearchCancelled(boolean flag) {
-    mySearchHasBeenCancelled = flag;
-  }
-
-  @Override
-  public boolean searchHasBeenCancelled() {
-    return mySearchHasBeenCancelled;
-  }
-
-  @Override
-  public void checkSearchCanceled() throws ProcessCanceledException {
-    if (searchHasBeenCancelled()) throw new ProcessCanceledException();
-    ProgressManager.checkCanceled();
-  }
-
-  public void showTooManyUsagesWarning(final ProgressIndicator indicator, final CountDownLatch waitWhileUserClick, final int usageCount) {
+  public void showTooManyUsagesWarning(final ProgressIndicator indicator,
+                                       final CountDownLatch waitWhileUserClick,
+                                       final int usageCount,
+                                       final UsageViewImpl usageView) {
     UIUtil.invokeLaterIfNeeded(new Runnable() {
       @Override
       public void run() {
-        if (searchHasBeenCancelled() || indicator != null && indicator.isCanceled()) return;
+        if (usageView != null && usageView.searchHasBeenCancelled() || indicator != null && indicator.isCanceled()) return;
         String message = UsageViewBundle.message("find.excessive.usage.count.prompt", usageCount);
         int ret = UsageLimitUtil.showTooManyUsagesWarning(myProject, message);
-        if (ret != 0) {
-          setCurrentSearchCancelled(true);
+        if (ret != 0 && usageView != null) {
+          usageView.setCurrentSearchCancelled(true);
         }
         waitWhileUserClick.countDown();
       }
@@ -257,6 +243,7 @@ public class UsageViewManagerImpl extends UsageViewManager {
     private final Factory<UsageSearcher> mySearcherFactory;
     private final FindUsagesProcessPresentation myProcessPresentation;
     private final UsageViewStateListener myListener;
+    private volatile boolean mySearchHasBeenCancelled;
 
     private SearchForUsagesRunnable(@NotNull final AtomicReference<UsageViewImpl> usageView,
                                     @NotNull final UsageViewPresentation presentation,
@@ -278,7 +265,7 @@ public class UsageViewManagerImpl extends UsageViewManager {
       if (usageView != null) return usageView;
       int usageCount = myUsageCountWithoutDefinition.get();
       if (usageCount >= 2 || usageCount == 1 && myProcessPresentation.isShowPanelIfOnlyOneUsage()) {
-        usageView = new UsageViewImpl(myProject, myPresentation, mySearchFor, mySearcherFactory);
+        usageView = new MyUsageViewImpl();
         if (myUsageViewRef.compareAndSet(null, usageView)) {
           openView(usageView);
           Usage firstUsage = myFirstUsage.get();
@@ -340,10 +327,13 @@ public class UsageViewManagerImpl extends UsageViewManager {
             if (usageCount == 1 && !myProcessPresentation.isShowPanelIfOnlyOneUsage()) {
               myFirstUsage.compareAndSet(null, usage);
             }
+
+            final UsageViewImpl usageView = getUsageView();
+
             if (usageCount > UsageLimitUtil.USAGES_LIMIT && tooManyUsages.get() == 0 && tooManyUsages.compareAndSet(0, 1)) {
-              showTooManyUsagesWarning(indicator, waitWhileUserClick, myUsageCountWithoutDefinition.get());
+              showTooManyUsagesWarning(indicator, waitWhileUserClick, myUsageCountWithoutDefinition.get(), usageView);
             }
-            UsageViewImpl usageView = getUsageView();
+            
             if (usageView != null) {
               usageView.appendUsage(usage);
             }
@@ -361,6 +351,14 @@ public class UsageViewManagerImpl extends UsageViewManager {
       }
     }
 
+    public void setCurrentSearchCancelled(boolean cancelled) {
+      mySearchHasBeenCancelled = cancelled;
+    }
+
+    public boolean searchHasBeenCancelled() {
+      return mySearchHasBeenCancelled;
+    }
+
     private void endSearchForUsages() {
       assert !ApplicationManager.getApplication().isDispatchThread() : Thread.currentThread();
       int usageCount = myUsageCountWithoutDefinition.get();
@@ -424,6 +422,30 @@ public class UsageViewManagerImpl extends UsageViewManager {
         myListener.findingUsagesFinished(myUsageViewRef.get());
       }
     }
+
+    private class MyUsageViewImpl extends UsageViewImpl {
+      public MyUsageViewImpl() {
+        super(myProject, SearchForUsagesRunnable.this.myPresentation,
+              SearchForUsagesRunnable.this.mySearchFor,
+              SearchForUsagesRunnable.this.mySearcherFactory);
+      }
+
+      @Override
+      public void close() {
+        setCurrentSearchCancelled(true);
+        super.close();
+      }
+
+      @Override
+      public boolean searchHasBeenCancelled() {
+        return SearchForUsagesRunnable.this.searchHasBeenCancelled();
+      }
+
+      @Override
+      public void setCurrentSearchCancelled(boolean cancelled) {
+        SearchForUsagesRunnable.this.setCurrentSearchCancelled(cancelled);
+      }
+    }
   }
 
   private static void flashUsageScriptaculously(final Usage usage) {

From 0b59d19a7cd157020aba29d5cede277f797d6d01 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 5 Jun 2012 18:08:52 +0400
Subject: [PATCH 213/239] inline method/constant: warn when method is used in
 javadoc (IDEA-72562); add search in comments and strings/for text occurrences
 options

---
 .../inline/InlineConstantFieldProcessor.java  | 59 +++++++++++++---
 .../refactoring/inline/InlineFieldDialog.java | 27 +++++++-
 .../inline/InlineMethodDialog.java            | 27 +++++++-
 .../inline/InlineMethodProcessor.java         | 46 +++++++++++++
 .../inline/InlineToAnonymousClassDialog.java  | 53 ++++++--------
 .../inlineMethod/MethodUsedInJavadoc.java     |  7 ++
 .../refactoring/inline/InlineMethodTest.java  | 13 +++-
 .../inline/InlineOptionsDialog.java           | 18 ++---
 ...InlineOptionsWithSearchSettingsDialog.java | 69 +++++++++++++++++++
 9 files changed, 263 insertions(+), 56 deletions(-)
 create mode 100644 java/java-tests/testData/refactoring/inlineMethod/MethodUsedInJavadoc.java
 create mode 100644 platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsWithSearchSettingsDialog.java

diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
index 3b8db434bb0b..e8a94e02374a 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
@@ -20,14 +20,15 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.*;
+import com.intellij.psi.impl.source.javadoc.PsiDocMethodOrFieldRef;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.refactoring.BaseRefactoringProcessor;
 import com.intellij.refactoring.RefactoringBundle;
-import com.intellij.refactoring.util.ConflictsUtil;
-import com.intellij.refactoring.util.RefactoringUIUtil;
+import com.intellij.refactoring.rename.NonCodeUsageInfoFactory;
+import com.intellij.refactoring.util.*;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewDescriptor;
 import com.intellij.usageView.UsageViewUtil;
@@ -35,7 +36,9 @@ import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 
 /**
  * @author ven
@@ -45,12 +48,25 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
   private PsiField myField;
   private final PsiReferenceExpression myRefExpr;
   private final boolean myInlineThisOnly;
+  private boolean mySearchInCommentsAndStrings;
+  private boolean mySearchForTextOccurrences;
 
   public InlineConstantFieldProcessor(PsiField field, Project project, PsiReferenceExpression ref, boolean isInlineThisOnly) {
+    this(field, project, ref, isInlineThisOnly, false, false);
+  }
+
+  public InlineConstantFieldProcessor(PsiField field,
+                                      Project project,
+                                      PsiReferenceExpression ref,
+                                      boolean isInlineThisOnly,
+                                      boolean searchInCommentsAndStrings,
+                                      boolean searchForTextOccurrences) {
     super(project);
     myField = field;
     myRefExpr = ref;
     myInlineThisOnly = isInlineThisOnly;
+    mySearchInCommentsAndStrings = searchInCommentsAndStrings;
+    mySearchForTextOccurrences = searchForTextOccurrences;
   }
 
   @NotNull
@@ -62,7 +78,7 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
   protected boolean isPreviewUsages(UsageInfo[] usages) {
     if (super.isPreviewUsages(usages)) return true;
     for (UsageInfo info : usages) {
-      if (info instanceof UsageFromJavaDoc) return true;
+      if (info instanceof NonCodeUsageInfo) return true;
     }
     return false;
   }
@@ -77,19 +93,32 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
   protected UsageInfo[] findUsages() {
     if (myInlineThisOnly) return new UsageInfo[]{new UsageInfo(myRefExpr)};
 
-    PsiReference[] refs = ReferencesSearch.search(myField, GlobalSearchScope.projectScope(myProject), false).toArray(new PsiReference[0]);
-    UsageInfo[] infos = new UsageInfo[refs.length];
-    for (int i = 0; i < refs.length; i++) {
-      PsiElement element = refs[i].getElement();
+    List<UsageInfo> usages = new ArrayList<UsageInfo>();
+    for (PsiReference ref : ReferencesSearch.search(myField, GlobalSearchScope.projectScope(myProject), false)) {
+      PsiElement element = ref.getElement();
       UsageInfo info = new UsageInfo(element);
 
       if (!(element instanceof PsiExpression) && PsiTreeUtil.getParentOfType(element, PsiImportStaticStatement.class) == null) {
         info = new UsageFromJavaDoc(element);
       }
 
-      infos[i] = info;
+      usages.add(info);
     }
-    return infos;
+    if (mySearchInCommentsAndStrings || mySearchForTextOccurrences) {
+      TextOccurrencesUtil.UsageInfoFactory nonCodeUsageFactory = new NonCodeUsageInfoFactory(myField, myField.getName());
+      if (mySearchInCommentsAndStrings) {
+        String stringToSearch =
+          ElementDescriptionUtil.getElementDescription(myField, NonCodeSearchDescriptionLocation.STRINGS_AND_COMMENTS);
+        TextOccurrencesUtil.addUsagesInStringsAndComments(myField, stringToSearch, usages, nonCodeUsageFactory);
+      }
+
+      if (mySearchForTextOccurrences) {
+        String stringToSearch = ElementDescriptionUtil.getElementDescription(myField, NonCodeSearchDescriptionLocation.NON_JAVA);
+        TextOccurrencesUtil
+          .addTextOccurences(myField, stringToSearch, GlobalSearchScope.projectScope(myProject), usages, nonCodeUsageFactory);
+      }
+    }
+    return usages.toArray(new UsageInfo[usages.size()]);
   }
 
   protected void refreshElements(PsiElement[] elements) {
@@ -105,6 +134,7 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
     initializer = normalize ((PsiExpression)initializer.copy());
     for (UsageInfo info : usages) {
       if (info instanceof UsageFromJavaDoc) continue;
+      if (info instanceof NonCodeUsageInfo) continue;
       final PsiElement element = info.getElement();
       try {
         if (element instanceof PsiExpression) {
@@ -235,6 +265,17 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
       }
     }
 
+    if (!myInlineThisOnly) {
+      for (UsageInfo info : usagesIn) {
+        if (info instanceof UsageFromJavaDoc) {
+          final PsiElement element = info.getElement();
+          if (element instanceof PsiDocMethodOrFieldRef && !PsiTreeUtil.isAncestor(myField, element, false)) {
+            conflicts.putValue(element, "Inlined method is used in javadoc");
+          }
+        }
+      }
+    }
+
     return showConflicts(conflicts, usagesIn);
   }
 
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java
index 602460f923e5..9df62a9dbe14 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineFieldDialog.java
@@ -25,7 +25,7 @@ import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.RefactoringBundle;
 
-public class InlineFieldDialog extends InlineOptionsDialog {
+public class InlineFieldDialog extends InlineOptionsWithSearchSettingsDialog {
   public static final String REFACTORING_NAME = RefactoringBundle.message("inline.field.title");
   private final PsiReferenceExpression myReferenceExpression;
 
@@ -65,8 +65,31 @@ public class InlineFieldDialog extends InlineOptionsDialog {
     return JavaRefactoringSettings.getInstance().INLINE_FIELD_THIS;
   }
 
+  @Override
+  protected boolean isSearchInCommentsAndStrings() {
+    return JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_FIELD;
+  }
+
+  @Override
+  protected void saveSearchInCommentsAndStrings(boolean searchInComments) {
+    JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_FIELD = searchInComments;
+  }
+
+  @Override
+  protected boolean isSearchForTextOccurrences() {
+    return JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_FIELD;
+  }
+
+  @Override
+  protected void saveSearchInTextOccurrences(boolean searchInTextOccurrences) {
+    JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_FIELD = searchInTextOccurrences;
+  }
+
   protected void doAction() {
-    invokeRefactoring(new InlineConstantFieldProcessor(myField, getProject(), myReferenceExpression, isInlineThisOnly()));
+    super.doAction();
+    invokeRefactoring(
+      new InlineConstantFieldProcessor(myField, getProject(), myReferenceExpression, isInlineThisOnly(), isSearchInCommentsAndStrings(),
+                                       isSearchForTextOccurrences()));
     JavaRefactoringSettings settings = JavaRefactoringSettings.getInstance();
     if(myRbInlineThisOnly.isEnabled() && myRbInlineAll.isEnabled()) {
       settings.INLINE_FIELD_THIS = isInlineThisOnly();
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java
index d93e87f84ac3..fd5b5ae3f2a3 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodDialog.java
@@ -26,7 +26,7 @@ import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.RefactoringBundle;
 
-public class InlineMethodDialog extends InlineOptionsDialog {
+public class InlineMethodDialog extends InlineOptionsWithSearchSettingsDialog {
   public static final String REFACTORING_NAME = RefactoringBundle.message("inline.method.title");
   private final PsiJavaCodeReferenceElement myReferenceElement;
   private final Editor myEditor;
@@ -72,7 +72,10 @@ public class InlineMethodDialog extends InlineOptionsDialog {
   }
 
   protected void doAction() {
-    invokeRefactoring(new InlineMethodProcessor(getProject(), myMethod, myReferenceElement, myEditor, isInlineThisOnly()));
+    super.doAction();
+    invokeRefactoring(
+      new InlineMethodProcessor(getProject(), myMethod, myReferenceElement, myEditor, isInlineThisOnly(), isSearchInCommentsAndStrings(),
+                                isSearchForTextOccurrences()));
     JavaRefactoringSettings settings = JavaRefactoringSettings.getInstance();
     if(myRbInlineThisOnly.isEnabled() && myRbInlineAll.isEnabled()) {
       settings.INLINE_METHOD_THIS = isInlineThisOnly();
@@ -91,4 +94,24 @@ public class InlineMethodDialog extends InlineOptionsDialog {
   protected boolean isInlineThis() {
     return JavaRefactoringSettings.getInstance().INLINE_METHOD_THIS;
   }
+
+  @Override
+  protected boolean isSearchInCommentsAndStrings() {
+    return JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_METHOD;
+  }
+
+  @Override
+  protected void saveSearchInCommentsAndStrings(boolean searchInComments) {
+    JavaRefactoringSettings.getInstance().RENAME_SEARCH_IN_COMMENTS_FOR_METHOD = searchInComments;
+  }
+
+  @Override
+  protected boolean isSearchForTextOccurrences() {
+    return JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_METHOD;
+  }
+
+  @Override
+  protected void saveSearchInTextOccurrences(boolean searchInTextOccurrences) {
+    JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_METHOD = searchInTextOccurrences;
+  }
 }
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
index d008ebdce664..873ebab9d542 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
@@ -31,6 +31,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.psi.codeStyle.VariableKind;
 import com.intellij.psi.controlFlow.*;
 import com.intellij.psi.impl.source.codeStyle.CodeEditUtil;
+import com.intellij.psi.impl.source.javadoc.PsiDocMethodOrFieldRef;
 import com.intellij.psi.infos.MethodCandidateInfo;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.LocalSearchScope;
@@ -42,7 +43,9 @@ import com.intellij.psi.util.PsiUtil;
 import com.intellij.refactoring.BaseRefactoringProcessor;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.introduceParameter.Util;
+import com.intellij.refactoring.rename.NonCodeUsageInfoFactory;
 import com.intellij.refactoring.rename.RenameJavaVariableProcessor;
+import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo;
 import com.intellij.refactoring.util.*;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewDescriptor;
@@ -64,6 +67,8 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
   private PsiJavaCodeReferenceElement myReference;
   private final Editor myEditor;
   private final boolean myInlineThisOnly;
+  private final boolean mySearchInComments;
+  private final boolean mySearchForTextOccurrences;
 
   private final PsiManager myManager;
   private final PsiElementFactory myFactory;
@@ -80,11 +85,23 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
                                @Nullable PsiJavaCodeReferenceElement reference,
                                Editor editor,
                                boolean isInlineThisOnly) {
+    this(project, method, reference, editor, isInlineThisOnly, false, false);
+  }
+
+  public InlineMethodProcessor(@NotNull Project project,
+                               @NotNull PsiMethod method,
+                               @Nullable PsiJavaCodeReferenceElement reference,
+                               Editor editor,
+                               boolean isInlineThisOnly,
+                               boolean searchInComments,
+                               boolean searchForTextOccurrences) {
     super(project);
     myMethod = method;
     myReference = reference;
     myEditor = editor;
     myInlineThisOnly = isInlineThisOnly;
+    mySearchInComments = searchInComments;
+    mySearchForTextOccurrences = searchForTextOccurrences;
 
     myManager = PsiManager.getInstance(myProject);
     myFactory = JavaPsiFacade.getInstance(myManager.getProject()).getElementFactory();
@@ -113,9 +130,31 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
       usages.add(new UsageInfo(reference.getElement()));
     }
 
+    if (mySearchInComments || mySearchForTextOccurrences) {
+      
+      if (mySearchInComments) {
+        String stringToSearch = ElementDescriptionUtil.getElementDescription(myMethod, NonCodeSearchDescriptionLocation.STRINGS_AND_COMMENTS);
+        TextOccurrencesUtil.addUsagesInStringsAndComments(myMethod, stringToSearch, usages, new NonCodeUsageInfoFactory(myMethod, myMethod.getName()));
+      }
+
+      if (mySearchForTextOccurrences) {
+        String stringToSearch = ElementDescriptionUtil.getElementDescription(myMethod, NonCodeSearchDescriptionLocation.NON_JAVA);
+        TextOccurrencesUtil
+          .addTextOccurences(myMethod, stringToSearch, GlobalSearchScope.projectScope(myProject), usages, new NonCodeUsageInfoFactory(myMethod, myMethod.getName()));
+      }
+    }
+
     return usages.toArray(new UsageInfo[usages.size()]);
   }
 
+  @Override
+  protected boolean isPreviewUsages(UsageInfo[] usages) {
+    for (UsageInfo usage : usages) {
+      if (usage instanceof NonCodeUsageInfo) return true;
+    }
+    return super.isPreviewUsages(usages);
+  }
+
   protected void refreshElements(PsiElement[] elements) {
     boolean condition = elements.length == 1 && elements[0] instanceof PsiMethod;
     LOG.assertTrue(condition);
@@ -137,6 +176,13 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
           .message("inlined.method.overrides.method.from.0", method.getContainingClass().getQualifiedName());
         conflicts.putValue(method, message);
       }
+
+      for (UsageInfo info : usagesIn) {
+        final PsiElement element = info.getElement();
+        if (element instanceof PsiDocMethodOrFieldRef && !PsiTreeUtil.isAncestor(myMethod, element, false)) {
+          conflicts.putValue(element, "Inlined method is used in javadoc");
+        }
+      }
     }
 
     addInaccessibleMemberConflicts(myMethod, usagesIn, new ReferencedElementsCollector(), conflicts);
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassDialog.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassDialog.java
index ef75c1c88152..b97da5d12b1f 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassDialog.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassDialog.java
@@ -24,17 +24,12 @@ import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.JavaRefactoringSettings;
 import com.intellij.refactoring.RefactoringBundle;
 
-import javax.swing.*;
-import java.awt.*;
-
 /**
  * @author yole
  */
-public class InlineToAnonymousClassDialog extends InlineOptionsDialog {
+public class InlineToAnonymousClassDialog extends InlineOptionsWithSearchSettingsDialog {
   private final PsiClass myClass;
   private final PsiCall myCallToInline;
-  private JCheckBox myCbSearchInComments;
-  private JCheckBox myCbSearchTextOccurences;
 
   protected InlineToAnonymousClassDialog(Project project, PsiClass psiClass, final PsiCall callToInline, boolean isInvokeOnReference) {
     super(project, true, psiClass);
@@ -66,38 +61,30 @@ public class InlineToAnonymousClassDialog extends InlineOptionsDialog {
     return false;
   }
 
-  protected JComponent createCenterPanel() {
-    JComponent optionsPanel = super.createCenterPanel();
+  @Override
+  protected boolean isSearchInCommentsAndStrings() {
+    return JavaRefactoringSettings.getInstance().INLINE_CLASS_SEARCH_IN_COMMENTS;
+  }
 
-    JPanel panel = new JPanel();
-    panel.setLayout(new GridBagLayout());
-    GridBagConstraints gbc = new GridBagConstraints();
-    gbc.fill = GridBagConstraints.HORIZONTAL;
-    gbc.weightx = 1.0;
-    panel.add(optionsPanel, gbc);
-
-    JavaRefactoringSettings settings = JavaRefactoringSettings.getInstance();
-    myCbSearchInComments = new JCheckBox(RefactoringBundle.message("search.in.comments.and.strings"),
-                                         settings.INLINE_CLASS_SEARCH_IN_COMMENTS);
-    myCbSearchTextOccurences = new JCheckBox(RefactoringBundle.message("search.for.text.occurrences"),
-                                             settings.INLINE_CLASS_SEARCH_IN_NON_JAVA);
-    gbc.gridy = 1;
-    panel.add(myCbSearchInComments, gbc);
-    gbc.gridy = 2;
-    panel.add(myCbSearchTextOccurences, gbc);
-    return panel;
+  @Override
+  protected boolean isSearchForTextOccurrences() {
+    return JavaRefactoringSettings.getInstance().INLINE_CLASS_SEARCH_IN_NON_JAVA;
   }
 
   protected void doAction() {
-    final boolean searchInComments = myCbSearchInComments.isSelected();
-    final boolean searchInNonJava = myCbSearchTextOccurences.isSelected();
-
-    JavaRefactoringSettings settings = JavaRefactoringSettings.getInstance();
-    settings.INLINE_CLASS_SEARCH_IN_COMMENTS = searchInComments;
-    settings.INLINE_CLASS_SEARCH_IN_NON_JAVA = searchInNonJava;
-
+    super.doAction();
     invokeRefactoring(new InlineToAnonymousClassProcessor(getProject(), myClass, myCallToInline, isInlineThisOnly(),
-                                                          searchInComments, searchInNonJava));
+                                                          isSearchInCommentsAndStrings(), isSearchForTextOccurrences()));
+  }
+
+  @Override
+  protected void saveSearchInCommentsAndStrings(boolean searchInComments) {
+    JavaRefactoringSettings.getInstance().INLINE_CLASS_SEARCH_IN_COMMENTS = searchInComments;
+  }
+  
+  @Override
+  protected void saveSearchInTextOccurrences(boolean searchInTextOccurrences) {
+    JavaRefactoringSettings.getInstance().INLINE_CLASS_SEARCH_IN_NON_JAVA = searchInTextOccurrences;
   }
 
   protected void doHelpAction() {
diff --git a/java/java-tests/testData/refactoring/inlineMethod/MethodUsedInJavadoc.java b/java/java-tests/testData/refactoring/inlineMethod/MethodUsedInJavadoc.java
new file mode 100644
index 000000000000..af2f72839ec3
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineMethod/MethodUsedInJavadoc.java
@@ -0,0 +1,7 @@
+/**
+ * {@link InlineMethodTest#foo}
+ */
+class InlineMethodTest {
+    public void f<caret>oo(){}
+  
+}
diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java
index ed976b84d5c2..99b98075ce1d 100644
--- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java
+++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java
@@ -6,6 +6,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.PsiReferenceExpression;
+import com.intellij.refactoring.BaseRefactoringProcessor;
 import com.intellij.refactoring.LightRefactoringTestCase;
 import com.intellij.refactoring.MockInlineMethodOptions;
 import com.intellij.refactoring.util.InlineUtil;
@@ -174,7 +175,17 @@ public class InlineMethodTest extends LightRefactoringTestCase {
   public void testInlineAnonymousClassWithPrivateMethodInside() throws Exception {
     doTest();
   }
-  
+
+  public void testMethodUsedInJavadoc() throws Exception {
+    try {
+      doTest();
+      fail("Conflict was not detected");
+    }
+    catch (BaseRefactoringProcessor.ConflictsInTestsException e) {
+      assertEquals("Inlined method is used in javadoc", e.getMessage());
+    }
+  }
+
   public void testInlineRunnableRun() throws Exception {
     @NonNls String fileName = "/refactoring/inlineMethod/" + getTestName(false) + ".java";
     configureByFile(fileName);
diff --git a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java
index 01d4b942be79..6b0819711bd9 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.refactoring.inline;
 
 import com.intellij.openapi.progress.ProgressManager;
@@ -23,11 +22,13 @@ import com.intellij.psi.PsiNameIdentifierOwner;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiSearchHelper;
 import com.intellij.psi.search.searches.ReferencesSearch;
+import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.ui.RefactoringDialog;
 import com.intellij.refactoring.util.RadioUpDownListener;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
+import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
@@ -37,7 +38,6 @@ public abstract class InlineOptionsDialog extends RefactoringDialog implements I
   protected boolean myInvokedOnReference;
   protected final PsiElement myElement;
   private final JLabel myNameLabel = new JLabel();
-  protected JPanel myOptionsPanel;
 
   protected InlineOptionsDialog(Project project, boolean canBeParent, PsiElement element) {
     super(project, canBeParent);
@@ -54,9 +54,9 @@ public abstract class InlineOptionsDialog extends RefactoringDialog implements I
   }
 
   protected JComponent createCenterPanel() {
-    myOptionsPanel = new JPanel();
-    myOptionsPanel.setBorder(new EmptyBorder(10, 0, 0, 0));
-    myOptionsPanel.setLayout(new BoxLayout(myOptionsPanel, BoxLayout.Y_AXIS));
+    JPanel optionsPanel = new JPanel();
+    optionsPanel.setBorder(new EmptyBorder(10, 0, 0, 0));
+    optionsPanel.setLayout(new BoxLayout(optionsPanel, BoxLayout.Y_AXIS));
 
     myRbInlineAll = new JRadioButton();
     myRbInlineAll.setText(getInlineAllText());
@@ -64,8 +64,8 @@ public abstract class InlineOptionsDialog extends RefactoringDialog implements I
     myRbInlineThisOnly = new JRadioButton();
     myRbInlineThisOnly.setText(getInlineThisText());
 
-    myOptionsPanel.add(myRbInlineAll);
-    myOptionsPanel.add(myRbInlineThisOnly);
+    optionsPanel.add(myRbInlineAll);
+    optionsPanel.add(myRbInlineThisOnly);
     ButtonGroup bg = new ButtonGroup();
     bg.add(myRbInlineAll);
     bg.add(myRbInlineThisOnly);
@@ -105,7 +105,7 @@ public abstract class InlineOptionsDialog extends RefactoringDialog implements I
         }
       }
     );
-    return myOptionsPanel;
+    return optionsPanel;
   }
 
   protected abstract String getNameLabelText();
diff --git a/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsWithSearchSettingsDialog.java b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsWithSearchSettingsDialog.java
new file mode 100644
index 000000000000..dc02ae5406da
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/refactoring/inline/InlineOptionsWithSearchSettingsDialog.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2000-2009 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.intellij.refactoring.inline;
+
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import com.intellij.refactoring.RefactoringBundle;
+
+import javax.swing.*;
+import java.awt.*;
+
+public abstract class InlineOptionsWithSearchSettingsDialog extends InlineOptionsDialog {
+  protected JCheckBox myCbSearchInComments;
+  protected JCheckBox myCbSearchTextOccurences;
+
+  protected InlineOptionsWithSearchSettingsDialog(Project project, boolean canBeParent, PsiElement element) {
+    super(project, canBeParent, element);
+  }
+
+  protected abstract boolean isSearchInCommentsAndStrings();
+  protected abstract void saveSearchInCommentsAndStrings(boolean searchInComments);
+  
+  protected abstract boolean isSearchForTextOccurrences();
+  protected abstract void saveSearchInTextOccurrences(boolean searchInTextOccurrences);
+
+  @Override
+  protected void doAction() {
+    final boolean searchInNonJava = myCbSearchTextOccurences.isSelected();
+    final boolean searchInComments = myCbSearchInComments.isSelected();
+    saveSearchInCommentsAndStrings(searchInComments);
+    saveSearchInTextOccurrences(searchInNonJava);
+  }
+
+  @Override
+  protected JComponent createCenterPanel() {
+    final JPanel panel = new JPanel(new GridBagLayout());
+    GridBagConstraints gbc = new GridBagConstraints();
+    gbc.fill = GridBagConstraints.HORIZONTAL;
+    gbc.weightx = 1.0;
+    gbc.gridwidth = 2;
+    panel.add(super.createCenterPanel(), gbc);
+
+
+    myCbSearchInComments = new JCheckBox(RefactoringBundle.message("search.in.comments.and.strings"), isSearchInCommentsAndStrings());
+    myCbSearchTextOccurences = new JCheckBox(RefactoringBundle.message("search.for.text.occurrences"), isSearchForTextOccurrences());
+    gbc.weightx = 0;
+    gbc.gridwidth = 1;
+    gbc.gridy = 1;
+    gbc.gridx = 0;
+    panel.add(myCbSearchInComments, gbc);
+    gbc.gridx = 1;
+    panel.add(myCbSearchTextOccurences, gbc);
+    return panel;
+  }
+}

From 9b5731595ebe6dec3cf458f78d6de25b4cd5b181 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Tue, 5 Jun 2012 18:14:02 +0400
Subject: [PATCH 214/239] KT-2145 Impossible to depend on Scala library

---
 .../impl/compiled/ClassFileStubBuilder.java   |  14 +-
 .../DefaultClsStubBuilderFactory.java         |  46 ++----
 .../OutOfOrderInnerClassException.java        |  28 ++++
 .../impl/compiled/StubBuildingVisitor.java    |  14 +-
 .../compiled/ClassFileStubBuilderTest.java    | 146 ------------------
 5 files changed, 61 insertions(+), 187 deletions(-)
 create mode 100644 java/java-psi-impl/src/com/intellij/psi/impl/compiled/OutOfOrderInnerClassException.java
 delete mode 100644 java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java
index 61d645b7f931..6bca28ed01ca 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClassFileStubBuilder.java
@@ -16,10 +16,11 @@
 package com.intellij.psi.impl.compiled;
 
 import com.intellij.openapi.extensions.Extensions;
-import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.impl.source.JavaFileElementType;
 import com.intellij.psi.stubs.BinaryFileStubBuilder;
+import com.intellij.psi.stubs.PsiFileStub;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.util.cls.ClsFormatException;
 
@@ -29,11 +30,7 @@ import com.intellij.util.cls.ClsFormatException;
 public class ClassFileStubBuilder implements BinaryFileStubBuilder {
   @Override
   public boolean acceptsFile(final VirtualFile file) {
-    final ClsStubBuilderFactory[] factories = Extensions.getExtensions(ClsStubBuilderFactory.EP_NAME);
-    for (ClsStubBuilderFactory factory : factories) {
-      if (!factory.isInnerClass(file)) return true;
-    }
-    return false;
+    return true;
   }
 
   @Override
@@ -42,7 +39,8 @@ public class ClassFileStubBuilder implements BinaryFileStubBuilder {
       final ClsStubBuilderFactory[] factories = Extensions.getExtensions(ClsStubBuilderFactory.EP_NAME);
       for (ClsStubBuilderFactory factory : factories) {
         if (!factory.isInnerClass(file) && factory.canBeProcessed(file, content)) {
-          return factory.buildFileStub(file, content);
+          PsiFileStub stub = factory.buildFileStub(file, content);
+          if (stub != null) return stub;
         }
       }
       return null;
@@ -56,4 +54,4 @@ public class ClassFileStubBuilder implements BinaryFileStubBuilder {
   public int getStubVersion() {
     return JavaFileElementType.STUB_VERSION + 3;
   }
-}
\ No newline at end of file
+}
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/DefaultClsStubBuilderFactory.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/DefaultClsStubBuilderFactory.java
index d2e031a64e9c..a0a8e956e968 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/DefaultClsStubBuilderFactory.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/DefaultClsStubBuilderFactory.java
@@ -40,9 +40,15 @@ public class DefaultClsStubBuilderFactory extends ClsStubBuilderFactory {
     final PsiJavaFileStubImpl file = new PsiJavaFileStubImpl("do.not.know.yet", true);
     try {
       final ClassReader reader = new ClassReader(bytes);
+
       final StubBuildingVisitor<VirtualFile> classVisitor =
         new StubBuildingVisitor<VirtualFile>(vFile, VirtualFileInnerClassStrategy.INSTANCE, file, 0);
-      reader.accept(classVisitor, ClassReader.SKIP_FRAMES);
+      try {
+        reader.accept(classVisitor, ClassReader.SKIP_FRAMES);
+      }
+      catch (OutOfOrderInnerClassException e) {
+        return null;
+      }
 
       @SuppressWarnings("unchecked") final PsiClassStub<PsiClass> result = (PsiClassStub<PsiClass>)classVisitor.getResult();
       if (result == null) return null;
@@ -63,40 +69,16 @@ public class DefaultClsStubBuilderFactory extends ClsStubBuilderFactory {
 
   @Override
   public boolean isInnerClass(VirtualFile file) {
-    return isInner(file.getNameWithoutExtension(), new ParentDirectory(file));
-  }
+    String name = file.getNameWithoutExtension();
+    int len = name.length();
+    int idx = name.indexOf('$');
 
-  static boolean isInner(final String name, final Directory directory) {
-    return isInner(name, 0, directory);
-  }
-
-  private static boolean isInner(final String name, final int from, final Directory directory) {
-    final int index = name.indexOf('$', from);
-    return index != -1 && (containsPart(directory, name, index) || isInner(name, index + 1, directory));
-  }
-
-  private static boolean containsPart(Directory directory, String name, int endIndex) {
-    return endIndex > 0 && directory.contains(name.substring(0, endIndex));
-  }
-
-  interface Directory {
-    boolean contains(String name);
-  }
-
-  private static class ParentDirectory implements Directory {
-    private final VirtualFile myDirectory;
-    private final String myExtension;
-
-    private ParentDirectory(final VirtualFile file) {
-      myDirectory = file.getParent();
-      myExtension = file.getExtension();
+    while (idx > 0) {
+      if (idx + 1 < len && Character.isDigit(name.charAt(idx + 1))) return true;
+      idx = name.indexOf('$', idx + 1);
     }
 
-    @Override
-    public boolean contains(final String name) {
-      final String fullName = myExtension == null ? name : name + "." + myExtension;
-      return myDirectory != null && myDirectory.findChild(fullName) != null;
-    }
+    return false;
   }
 
   private static class VirtualFileInnerClassStrategy implements InnerClassSourceStrategy<VirtualFile> {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/OutOfOrderInnerClassException.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/OutOfOrderInnerClassException.java
new file mode 100644
index 000000000000..3a144bfed2d4
--- /dev/null
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/OutOfOrderInnerClassException.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * @author max
+ */
+package com.intellij.psi.impl.compiled;
+
+public class OutOfOrderInnerClassException extends RuntimeException {
+
+  @Override
+  public Throwable fillInStackTrace() {
+    return this;
+  }
+}
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
index 5b220ffaff83..217e2cab1f8c 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
@@ -275,6 +275,9 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
 
   @Override
   public void visitOuterClass(final String owner, final String name, final String desc) {
+    if (myParent instanceof PsiFileStub) {
+      throw new OutOfOrderInnerClassException();
+    }
   }
 
   @Override
@@ -296,7 +299,16 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
     if ((access & Opcodes.ACC_SYNTHETIC) != 0) return;
     if (!isCorrectName(innerName)) return;
 
-    if (innerName == null || outerName == null || !getClassName(outerName).equals(myResult.getQualifiedName())) return;
+    if (innerName == null || outerName == null) return;
+    if ((getClassName(outerName) + "." + innerName).equals(myResult.getQualifiedName())) {
+      // Our result is inner class
+
+      if (myParent instanceof PsiFileStub) {
+        throw new OutOfOrderInnerClassException();
+      }
+    }
+
+    if (!getClassName(outerName).equals(myResult.getQualifiedName())) return;
 
     final T innerSource = myInnersStrategy.findInnerClass(innerName, mySource);
     if (innerSource == null) return;
diff --git a/java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java
deleted file mode 100644
index 71e7d950fcc6..000000000000
--- a/java/java-tests/testSrc/com/intellij/psi/impl/compiled/ClassFileStubBuilderTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.intellij.psi.impl.compiled;
-
-import com.intellij.util.containers.ContainerUtil;
-import junit.framework.TestCase;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Pavel.Fatin, 18.02.2010
- */
-public class ClassFileStubBuilderTest extends TestCase {
-  public void testOneFile() {
-    assertTopLevel("");
-    assertTopLevel("$");
-    assertTopLevel("$$");
-    assertTopLevel("$$$");
-    assertTopLevel("Foo");
-    assertTopLevel("Foo$");
-    assertTopLevel("$Foo");
-    assertTopLevel("$Foo$");
-    assertTopLevel("Foo$Bar");
-    assertTopLevel("$Foo$Bar");
-    assertTopLevel("Foo$Bar$");
-    assertTopLevel("$Foo$Bar$");
-    assertTopLevel("$$Foo$$Bar$$");
-  }
-
-  public void testWrongCase() {
-    assertTopLevel("Foo$Bar", "foo");
-    assertTopLevel("foo$Bar", "Foo");
-  }
-
-  public void testShortName() {
-    assertTopLevel("A");
-
-    assertInner("Foo$B", "Foo");
-    assertInner("A$Foo", "A");
-    assertInner("A$B", "A");
-
-    assertTopLevel("A$B", "A$");
-    assertTopLevel("A$B", "$B");
-    assertTopLevel("A$B", "B");
-    assertTopLevel("A$B", "$");
-  }
-
-  public void testShortNames() {
-    assertInner("A$B$C", "A");
-    assertInner("A$B$C", "A$B");
-    assertInner("A$B$C", "A", "A$B");
-
-    assertTopLevel("A$B$C", "A$");
-    assertTopLevel("A$B$C", "A$B$");
-  }
-
-  public void testEmptyFileName() {
-    assertTopLevel("$Foo", "");
-  }
-
-  public void testNoInnerName() {
-    //assertTopLevel("Foo$", "Foo");
-    //assertTopLevel("Foo$$", "Foo$");
-    // an exception to the rule (to hide Scala "objects") 
-    assertInner("Foo$", "Foo");
-    assertInner("Foo$$", "Foo$");
-  }
-
-  public void testDollarsInName() {
-    assertInner("$Foo$Bar", "$Foo");
-    assertInner("Foo$$Bar", "Foo");
-    assertInner("Foo$$Bar", "Foo");
-    assertInner("$Foo$$Bar", "$Foo");
-    assertInner("$Foo$$Bar", "$Foo$");
-  }
-
-  public void testInner() {
-    assertInner("Foo$Bar", "Foo");
-    assertInner("Foo$bar", "Foo");
-    assertInner("foo$Bar", "foo");
-    assertInner("foo$bar", "foo");
-  }
-  
-  public void testInnerAndNoise() {
-    assertInner("Foo$Bar", "Foo", "Foo$", "$Bar", "Bar");
-  }
-
-  public void testTopLevel() {
-    assertTopLevel("Foo$Bar");
-    assertTopLevel("Foo$Bar", "Foo$");
-    assertTopLevel("Foo$Bar", "$Bar");
-    assertTopLevel("Foo$Bar", "Bar");
-    assertTopLevel("Foo$Bar", "Foo$", "$Bar", "Bar");
-  }
-
-  public void testInners() {
-    assertInner("Foo$Bar$Moo", "Foo");
-    assertInner("Foo$Bar$Moo", "Foo$Bar");
-    assertInner("Foo$Bar$Moo", "Foo", "Foo$Bar");
-  }
-
-  public void testInnersAndNoise() {
-    assertInner("Foo$Bar$Moo", "Foo", "$Bar", "Bar", "$Moo", "Moo", "Bar$Moo", "$Bar$Moo");
-    assertInner("Foo$Bar$Moo", "Foo$Bar", "$Bar", "Bar", "$Moo", "Moo", "Bar$Moo", "$Bar$Moo");
-    assertInner("Foo$Bar$Moo", "Foo", "Foo$Bar", "$Bar", "Bar", "$Moo", "Moo", "Bar$Moo", "$Bar$Moo");
-  }
-
-  public void testTopLevels() {
-    assertTopLevel("Foo$Bar$Moo");
-    assertTopLevel("Foo$Bar$Moo", "$Bar");
-    assertTopLevel("Foo$Bar$Moo", "Bar");
-    assertTopLevel("Foo$Bar$Moo", "$Moo");
-    assertTopLevel("Foo$Bar$Moo", "Moo");
-    assertTopLevel("Foo$Bar$Moo", "Bar$Moo");
-    assertTopLevel("Foo$Bar$Moo", "$Bar$Moo");
-    assertTopLevel("Foo$Bar$Moo", "$Bar", "Bar", "$Moo", "Moo", "Bar$Moo", "$Bar$Moo");
-  }
-
-  private static void assertInner(String name, String... files) {
-    assertTrue("Class " + name + " must be identified as inner", isInner(name, files));
-  }
-
-  private static void assertTopLevel(String name, String... files) {
-    assertFalse("Class " + name + " must be identified as top-level", isInner(name, files));
-  }
-
-  private static boolean isInner(String name, String... files) {
-    Set<String> all = new HashSet<String>();
-    ContainerUtil.addAll(all, files);
-    all.add(name);
-    return DefaultClsStubBuilderFactory.isInner(name, new DirectoryMock(all));
-  }
-
-
-  private static class DirectoryMock implements DefaultClsStubBuilderFactory.Directory {
-    private Set<String> myFiles;
-
-    private DirectoryMock(Set<String> files) {
-      myFiles = files;
-    }
-
-    @Override
-    public boolean contains(String name) {
-      return myFiles.contains(name);
-    }
-  }
-}

From 5705687f1ebdcc4b4dcd89aec059fb4c8d04b7cf Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Mon, 4 Jun 2012 19:57:23 +0400
Subject: [PATCH 215/239] android artifacts: align apk

---
 .../messages/AndroidBundle.properties         |  3 +-
 .../AndroidApplicationArtifactProperties.java | 38 ++++++++++++--
 .../artifact/AndroidArtifactUtil.java         | 50 +++++++++++++++++++
 .../android/exportSignedPackage/ApkStep.java  | 40 ++-------------
 4 files changed, 90 insertions(+), 41 deletions(-)

diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties
index 25bd4b10cd19..58e6c4d31fc2 100644
--- a/plugins/android/resources/messages/AndroidBundle.properties
+++ b/plugins/android/resources/messages/AndroidBundle.properties
@@ -405,4 +405,5 @@ android.launch.draw.9.patch.action=Draw 9 Patch
 android.facet.settings.include.system.proguard=Include system proguard file
 file.already.exists.error=File {0} already exists
 deployment.target.settings.min.sdk.info.message=Only compatible AVDs are shown. See 'uses-sdk' tag in AndroidManifest.xml
-android.compilation.warning.circular.app.dependency=Generated fields in {0}.R class in module ''{1}'' won''t be final, because of circular dependency on module ''{2}''
\ No newline at end of file
+android.compilation.warning.circular.app.dependency=Generated fields in {0}.R class in module ''{1}'' won''t be final, because of circular dependency on module ''{2}''
+cannot.find.zip.align=The zipalign tool was not found in the SDK.\n\nPlease update to the latest SDK and re-export your application\nor run zipalign manually.\n\nAligning applications allows Android to use application resources\nmore efficiently.
\ No newline at end of file
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
index c7ee3c802239..3df3f323a79f 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
@@ -1,8 +1,10 @@
 package org.jetbrains.android.compiler.artifact;
 
+import com.android.sdklib.SdkConstants;
 import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompilerMessageCategory;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.module.Module;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VfsUtilCore;
@@ -14,6 +16,8 @@ import com.intellij.util.xmlb.XmlSerializerUtil;
 import com.intellij.util.xmlb.annotations.Transient;
 import org.apache.commons.codec.binary.Base64;
 import org.jetbrains.android.compiler.AndroidCompileUtil;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.android.sdk.AndroidPlatform;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.android.util.AndroidCommonUtils;
 import org.jetbrains.annotations.NotNull;
@@ -44,8 +48,21 @@ public class AndroidApplicationArtifactProperties extends ArtifactProperties<And
         mySigningMode != AndroidArtifactSigningMode.RELEASE_SIGNED) {
       return;
     }
-    final String errorPrefix = "[Artifact '" + artifact.getName() + "'] ";
-    final Pair<PrivateKey, X509Certificate> pair = getPrivateKeyAndCertificate(context, errorPrefix);
+
+    final AndroidFacet facet = AndroidArtifactUtil.getPackagedFacet(context.getProject(), artifact);
+    if (facet == null) {
+      return;
+    }
+    final String messagePrefix = "[Artifact '" + artifact.getName() + "'] ";
+
+    final Module module = facet.getModule();
+    final AndroidPlatform platform = AndroidPlatform.getInstance(module);
+    if (platform == null) {
+      context.addMessage(CompilerMessageCategory.ERROR, messagePrefix +
+                         AndroidBundle.message("android.compilation.error.specify.platform", module.getName()), null, -1, -1);
+      return;
+    }
+    final Pair<PrivateKey, X509Certificate> pair = getPrivateKeyAndCertificate(context, messagePrefix);
     if (pair == null) {
       return;
     }
@@ -64,11 +81,26 @@ public class AndroidApplicationArtifactProperties extends ArtifactProperties<And
       return;
     }
 
+    final String zipAlignPath =
+      FileUtil.toSystemDependentName(platform.getSdkData().getLocation() + '/' + AndroidCommonUtils.toolPath(SdkConstants.FN_ZIPALIGN));
+    final boolean runZipAlign = new File(zipAlignPath).isFile();
+
     File tmpDir = null;
     try {
       tmpDir = FileUtil.createTempDirectory("android_artifact", "tmp");
       final File tmpArtifact = new File(tmpDir, "tmpArtifact.apk");
-      FileUtil.copy(artifactFile, tmpArtifact);
+
+      if (runZipAlign) {
+        final String errorMessage = AndroidArtifactUtil.executeZipAlign(zipAlignPath, artifactFile, tmpArtifact);
+        if (errorMessage != null) {
+          context.addMessage(CompilerMessageCategory.ERROR, messagePrefix + "zip-align: " + errorMessage, null, -1, -1);
+          return;
+        }
+      }
+      else {
+        context.addMessage(CompilerMessageCategory.WARNING, messagePrefix + AndroidBundle.message("cannot.find.zip.align"), null, -1, -1);
+        FileUtil.copy(artifactFile, tmpArtifact);
+      }
 
       if (!FileUtil.delete(artifactFile)) {
         context.addMessage(CompilerMessageCategory.ERROR, "Cannot delete file " + artifactFile.getPath(), null, -1, -1);
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactUtil.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactUtil.java
index 85bf6c281842..2a6a1a08c6d9 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactUtil.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactUtil.java
@@ -1,11 +1,20 @@
 package org.jetbrains.android.compiler.artifact;
 
 import com.intellij.CommonBundle;
+import com.intellij.execution.ExecutionException;
+import com.intellij.execution.configurations.GeneralCommandLine;
+import com.intellij.execution.process.OSProcessHandler;
+import com.intellij.execution.process.ProcessAdapter;
+import com.intellij.execution.process.ProcessEvent;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.configuration.ChooseModulesDialog;
 import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.Ref;
 import com.intellij.packaging.artifacts.Artifact;
+import com.intellij.packaging.artifacts.ArtifactManager;
+import com.intellij.packaging.elements.PackagingElementResolvingContext;
 import com.intellij.packaging.impl.artifacts.ArtifactUtil;
 import com.intellij.packaging.ui.ArtifactEditorContext;
 import com.intellij.util.Processor;
@@ -13,6 +22,7 @@ import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.File;
 import java.util.List;
 
 /**
@@ -31,6 +41,21 @@ public class AndroidArtifactUtil {
       }, editorContext, true);
   }
 
+  @Nullable
+  public static AndroidFacet getPackagedFacet(Project project, Artifact artifact) {
+    final Ref<AndroidFinalPackageElement> elementRef = Ref.create(null);
+    final PackagingElementResolvingContext resolvingContext = ArtifactManager.getInstance(project).getResolvingContext();
+    ArtifactUtil
+      .processPackagingElements(artifact, AndroidFinalPackageElementType.getInstance(), new Processor<AndroidFinalPackageElement>() {
+        public boolean process(AndroidFinalPackageElement e) {
+          elementRef.set(e);
+          return false;
+        }
+      }, resolvingContext, true);
+    final AndroidFinalPackageElement element = elementRef.get();
+    return element != null ? element.getFacet() : null;
+  }
+
   @Nullable
   public static AndroidFacet chooseAndroidApplicationModule(@NotNull Project project, @NotNull List<Module> modules) {
     final ChooseModulesDialog dialog = new ChooseModulesDialog(project, modules, "Select Module",
@@ -53,4 +78,29 @@ public class AndroidArtifactUtil {
     }
     return facet;
   }
+
+  @Nullable
+  public static String executeZipAlign(String zipAlignPath, File source, File destination) {
+    GeneralCommandLine commandLine = new GeneralCommandLine();
+    commandLine.setExePath(zipAlignPath);
+    commandLine.addParameters("-f", "4", source.getAbsolutePath(), destination.getAbsolutePath());
+    OSProcessHandler handler;
+    try {
+      handler = new OSProcessHandler(commandLine.createProcess(), "");
+    }
+    catch (ExecutionException e) {
+      return e.getMessage();
+    }
+    final StringBuilder builder = new StringBuilder();
+    handler.addProcessListener(new ProcessAdapter() {
+      @Override
+      public void onTextAvailable(ProcessEvent event, Key outputType) {
+        builder.append(event.getText());
+      }
+    });
+    handler.startNotify();
+    handler.waitFor();
+    int exitCode = handler.getProcess().exitValue();
+    return exitCode != 0 ? builder.toString() : null;
+  }
 }
diff --git a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java
index 6c25426a7b9e..2e1373608de1 100644
--- a/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java
+++ b/plugins/android/src/org/jetbrains/android/exportSignedPackage/ApkStep.java
@@ -18,11 +18,6 @@ package org.jetbrains.android.exportSignedPackage;
 
 import com.android.sdklib.SdkConstants;
 import com.intellij.CommonBundle;
-import com.intellij.execution.ExecutionException;
-import com.intellij.execution.configurations.GeneralCommandLine;
-import com.intellij.execution.process.OSProcessHandler;
-import com.intellij.execution.process.ProcessAdapter;
-import com.intellij.execution.process.ProcessEvent;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.ide.wizard.CommitStepException;
 import com.intellij.openapi.application.ApplicationManager;
@@ -42,7 +37,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -50,6 +44,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.components.JBLabel;
 import org.jetbrains.android.compiler.AndroidCompileUtil;
 import org.jetbrains.android.compiler.AndroidProguardCompiler;
+import org.jetbrains.android.compiler.artifact.AndroidArtifactUtil;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.facet.AndroidFacetConfiguration;
 import org.jetbrains.android.facet.AndroidRootUtil;
@@ -244,7 +239,7 @@ class ApkStep extends ExportSignedPackageWizardStep {
 
     if (runZipAlign) {
       File realDestFile = new File(apkPath);
-      final String message = executeZipAlign(zipAlignPath, destFile, realDestFile);
+      final String message = AndroidArtifactUtil.executeZipAlign(zipAlignPath, destFile, realDestFile);
       if (message != null) {
         showErrorInDispatchThread(message);
         return;
@@ -254,11 +249,7 @@ class ApkStep extends ExportSignedPackageWizardStep {
       public void run() {
         String title = AndroidBundle.message("android.export.package.wizard.title");
         if (!runZipAlign) {
-          Messages.showWarningDialog(myWizard.getProject(), "The zipalign tool was not found in the SDK.\n\n" +
-                                                            "Please update to the latest SDK and re-export your application\n" +
-                                                            "or run zipalign manually.\n\n" +
-                                                            "Aligning applications allows Android to use application resources\n" +
-                                                            "more efficiently.", title);
+          Messages.showWarningDialog(myWizard.getProject(), AndroidBundle.message("cannot.find.zip.align"), title);
         }
         Messages.showInfoMessage(myWizard.getProject(), AndroidBundle.message("android.export.package.success.message", apkPath), title);
       }
@@ -286,31 +277,6 @@ class ApkStep extends ExportSignedPackageWizardStep {
     }, ModalityState.NON_MODAL);
   }
 
-  @Nullable
-  private static String executeZipAlign(String zipAlignPath, File source, File destination) {
-    GeneralCommandLine commandLine = new GeneralCommandLine();
-    commandLine.setExePath(zipAlignPath);
-    commandLine.addParameters("-f", "4", source.getAbsolutePath(), destination.getAbsolutePath());
-    OSProcessHandler handler;
-    try {
-      handler = new OSProcessHandler(commandLine.createProcess(), "");
-    }
-    catch (ExecutionException e) {
-      return e.getMessage();
-    }
-    final StringBuilder builder = new StringBuilder();
-    handler.addProcessListener(new ProcessAdapter() {
-      @Override
-      public void onTextAvailable(ProcessEvent event, Key outputType) {
-        builder.append(event.getText());
-      }
-    });
-    handler.startNotify();
-    handler.waitFor();
-    int exitCode = handler.getProcess().exitValue();
-    return exitCode != 0 ? builder.toString() : null;
-  }
-
   @Override
   protected boolean canFinish() {
     return true;

From e26d05dbb35c7b84ca24145054ce271ac7a36ccd Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Mon, 4 Jun 2012 22:16:35 +0400
Subject: [PATCH 216/239] clean up titles

---
 .../jetbrains/android/compiler/artifact/ChooseKeyDialog.java    | 2 +-
 .../jetbrains/android/compiler/artifact/NewKeyStoreDialog.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.java
index 7b0695955515..0d665014fccb 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/ChooseKeyDialog.java
@@ -65,7 +65,7 @@ public class ChooseKeyDialog extends DialogWrapper {
     myCreateNewKeyRadioButton.setSelected(!useExisting);
     UIUtil.setEnabled(myNewKeyPanel, !useExisting, true);
 
-    setTitle("Create New Key");
+    setTitle("Choose Key");
     init();
   }
 
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.java
index 7ea7ae3a88be..829de913968a 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.java
@@ -34,7 +34,7 @@ public class NewKeyStoreDialog extends DialogWrapper {
     super(project);
     myProject = project;
     myKeyStorePathField.setText(defaultKeyStorePath);
-    setTitle("Create New Key Store");
+    setTitle("New Key Store");
     myNewKeyForm = new MyNewKeyForm();
     myNewKeyPanel.add(myNewKeyForm.getContentPanel(), BorderLayout.CENTER);
 

From 49e7b9eddb38e9075d46162dc947ad9685b05ace Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Mon, 4 Jun 2012 22:40:11 +0400
Subject: [PATCH 217/239] android: disable "export package" actions

---
 .../AndroidExportUnsignedPackageAction.java   | 16 ++++---
 .../actions/ExportSignedPackageAction.java    | 43 +++++++++++++++++--
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/plugins/android/src/org/jetbrains/android/actions/AndroidExportUnsignedPackageAction.java b/plugins/android/src/org/jetbrains/android/actions/AndroidExportUnsignedPackageAction.java
index 0ab5a5a784ce..668d09527329 100644
--- a/plugins/android/src/org/jetbrains/android/actions/AndroidExportUnsignedPackageAction.java
+++ b/plugins/android/src/org/jetbrains/android/actions/AndroidExportUnsignedPackageAction.java
@@ -1,16 +1,13 @@
 package org.jetbrains.android.actions;
 
+import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
-import org.jetbrains.android.exportSignedPackage.ExportSignedPackageWizard;
-import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.android.util.AndroidUtils;
 
-import java.util.List;
-
 /**
  * @author Eugene.Kudelevsky
  */
@@ -22,18 +19,25 @@ public class AndroidExportUnsignedPackageAction extends AnAction {
 
   @Override
   public void actionPerformed(AnActionEvent e) {
-    final Project project = e.getData(PlatformDataKeys.PROJECT);
+    ExportSignedPackageAction.showNotification(false);
+
+    /*final Project project = e.getData(PlatformDataKeys.PROJECT);
     assert project != null;
 
     List<AndroidFacet> facets = AndroidUtils.getApplicationFacets(project);
     assert facets.size() > 0;
     ExportSignedPackageWizard wizard = new ExportSignedPackageWizard(project, facets, false);
-    wizard.show();
+    wizard.show();*/
   }
 
   @Override
   public void update(AnActionEvent e) {
     final Project project = e.getData(PlatformDataKeys.PROJECT);
     e.getPresentation().setEnabled(project != null && AndroidUtils.getApplicationFacets(project).size() > 0);
+
+    final String hide = PropertiesComponent.getInstance().getValue(ExportSignedPackageAction.HIDE_EXPORT_ACTIONS_PROPERTY);
+    if (Boolean.parseBoolean(hide)) {
+      e.getPresentation().setVisible(false);
+    }
   }
 }
diff --git a/plugins/android/src/org/jetbrains/android/actions/ExportSignedPackageAction.java b/plugins/android/src/org/jetbrains/android/actions/ExportSignedPackageAction.java
index 1523b07fcabf..a7f1fa369209 100644
--- a/plugins/android/src/org/jetbrains/android/actions/ExportSignedPackageAction.java
+++ b/plugins/android/src/org/jetbrains/android/actions/ExportSignedPackageAction.java
@@ -17,24 +17,27 @@
 package org.jetbrains.android.actions;
 
 import com.intellij.CommonBundle;
+import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.util.PairFunction;
 import org.jetbrains.android.exportSignedPackage.CheckModulePanel;
-import org.jetbrains.android.exportSignedPackage.ExportSignedPackageWizard;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.util.AndroidBundle;
 import org.jetbrains.android.util.AndroidUtils;
 
 import javax.swing.*;
-import java.util.List;
 
 /**
  * @author Eugene.Kudelevsky
  */
 public class ExportSignedPackageAction extends AnAction {
+  static final String HIDE_EXPORT_ACTIONS_PROPERTY = "ANDROID_HIDE_EXPORT_ACTIONS";
+
   public ExportSignedPackageAction() {
     super(AndroidBundle.message("android.export.signed.package.action.text"));
   }
@@ -43,11 +46,18 @@ public class ExportSignedPackageAction extends AnAction {
   public void update(AnActionEvent e) {
     final Project project = e.getData(PlatformDataKeys.PROJECT);
     e.getPresentation().setEnabled(project != null && AndroidUtils.getApplicationFacets(project).size() > 0);
+
+    final String hide = PropertiesComponent.getInstance().getValue(HIDE_EXPORT_ACTIONS_PROPERTY);
+    if (Boolean.parseBoolean(hide)) {
+      e.getPresentation().setVisible(false);
+    }
   }
 
   @Override
   public void actionPerformed(AnActionEvent e) {
-    final Project project = e.getData(PlatformDataKeys.PROJECT);
+    showNotification(true);
+
+    /*final Project project = e.getData(PlatformDataKeys.PROJECT);
     assert project != null;
 
     List<AndroidFacet> facets = AndroidUtils.getApplicationFacets(project);
@@ -56,7 +66,32 @@ public class ExportSignedPackageAction extends AnAction {
       if (!checkFacet(facets.get(0))) return;
     }
     ExportSignedPackageWizard wizard = new ExportSignedPackageWizard(project, facets, true);
-    wizard.show();
+    wizard.show();*/
+  }
+
+  static void showNotification(boolean signed) {
+    final String doNotShowStr = PropertiesComponent.getInstance().getValue(HIDE_EXPORT_ACTIONS_PROPERTY);
+    final boolean doNotShow = Boolean.parseBoolean(doNotShowStr);
+
+    if (!doNotShow) {
+      final boolean[] hide = {false};
+      final int result = Messages.showCheckboxMessageDialog(
+        "There is no 'Export package' wizard since IDEA 12. Instead, please open\n" +
+        "'File | Project Structure | Artifacts' and create new 'Android Application' artifact",
+        signed ? "Export Signed Package" : "Export Unsigned Package",
+        new String[]{CommonBundle.getOkButtonText()}, "Hide 'Export package' actions in the menu", false, 0, 0,
+        Messages.getInformationIcon(), new PairFunction<Integer, JCheckBox, Integer>() {
+        @Override
+        public Integer fun(Integer integer, JCheckBox checkBox) {
+          hide[0] = checkBox.isSelected();
+          return integer;
+        }
+      });
+
+      if (result == Messages.OK && hide[0]) {
+        PropertiesComponent.getInstance().setValue(HIDE_EXPORT_ACTIONS_PROPERTY, Boolean.toString(true));
+      }
+    }
   }
 
   private static boolean checkFacet(final AndroidFacet facet) {

From a6c837ed637cfcfad9d66fc33685e5351dd1757d Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Tue, 5 Jun 2012 15:43:15 +0400
Subject: [PATCH 218/239] fix tests

---
 .../android/compiler/artifact/AndroidSourceItemsProvider.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidSourceItemsProvider.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidSourceItemsProvider.java
index 4c2528464ed6..416d7b59f273 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidSourceItemsProvider.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidSourceItemsProvider.java
@@ -44,7 +44,9 @@ public class AndroidSourceItemsProvider extends FacetBasedPackagingSourceItemsPr
       final Module module = ((ModuleSourceItemGroup)parent).getModule();
       final Set<AndroidFacet> facets =
         new HashSet<AndroidFacet>(editorContext.getFacetsProvider().getFacetsByType(module, AndroidFacet.ID));
-      return Collections.singletonList(new FacetBasedSourceItem<AndroidFacet>(this, facets.iterator().next()));
+      if (facets.size() > 0) {
+        return Collections.singletonList(new FacetBasedSourceItem<AndroidFacet>(this, facets.iterator().next()));
+      }
     }
     return Collections.emptyList();
   }

From 491e40d3e780dd53cbf5691c18e5fb0f57b3b6a2 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Tue, 5 Jun 2012 18:40:38 +0400
Subject: [PATCH 219/239] dot

---
 .../jetbrains/android/actions/ExportSignedPackageAction.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/android/src/org/jetbrains/android/actions/ExportSignedPackageAction.java b/plugins/android/src/org/jetbrains/android/actions/ExportSignedPackageAction.java
index a7f1fa369209..bb1effc9c34d 100644
--- a/plugins/android/src/org/jetbrains/android/actions/ExportSignedPackageAction.java
+++ b/plugins/android/src/org/jetbrains/android/actions/ExportSignedPackageAction.java
@@ -77,7 +77,7 @@ public class ExportSignedPackageAction extends AnAction {
       final boolean[] hide = {false};
       final int result = Messages.showCheckboxMessageDialog(
         "There is no 'Export package' wizard since IDEA 12. Instead, please open\n" +
-        "'File | Project Structure | Artifacts' and create new 'Android Application' artifact",
+        "'File | Project Structure | Artifacts' and create new 'Android Application' artifact.",
         signed ? "Export Signed Package" : "Export Unsigned Package",
         new String[]{CommonBundle.getOkButtonText()}, "Hide 'Export package' actions in the menu", false, 0, 0,
         Messages.getInformationIcon(), new PairFunction<Integer, JCheckBox, Integer>() {

From df5b0ce5a1e8ae0395380631ac6cf15001d92411 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Tue, 5 Jun 2012 18:45:31 +0400
Subject: [PATCH 220/239] android artifacts: support proguard, bug fixes

---
 .../packaging/artifacts/ArtifactTemplate.java |   3 +
 .../ArtifactsStructureConfigurable.java       |   1 +
 .../android/compiler/AndroidCompileUtil.java  |  28 +++-
 .../compiler/AndroidPrecompileTask.java       |  61 ++++++-
 .../compiler/AndroidProguardCompiler.java     |  12 +-
 .../AndroidApplicationArtifactProperties.java |  30 +++-
 .../AndroidApplicationArtifactType.java       |  24 +++
 .../AndroidArtifactPropertiesEditor.form      | 154 +++++++++++++-----
 .../AndroidArtifactPropertiesEditor.java      |  72 +++++++-
 .../compiler/artifact/NewKeyStoreDialog.form  |  14 +-
 10 files changed, 337 insertions(+), 62 deletions(-)

diff --git a/java/compiler/openapi/src/com/intellij/packaging/artifacts/ArtifactTemplate.java b/java/compiler/openapi/src/com/intellij/packaging/artifacts/ArtifactTemplate.java
index b39bd8ac6992..f1b88274570a 100644
--- a/java/compiler/openapi/src/com/intellij/packaging/artifacts/ArtifactTemplate.java
+++ b/java/compiler/openapi/src/com/intellij/packaging/artifacts/ArtifactTemplate.java
@@ -49,6 +49,9 @@ public abstract class ArtifactTemplate {
     return new NewArtifactConfiguration(createRootElement(name), name, null);
   }
 
+  public void setUpArtifact(@NotNull Artifact artifact, @NotNull NewArtifactConfiguration configuration) {
+  }
+
   public static class NewArtifactConfiguration {
     private final CompositePackagingElement<?> myRootElement;
     private final String myArtifactName;
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
index 18b915cfacfc..5d0aa16cb58b 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactsStructureConfigurable.java
@@ -296,6 +296,7 @@ public class ArtifactsStructureConfigurable extends BaseStructureConfigurable {
       actualType = type;
     }
     final ModifiableArtifact artifact = myPackagingEditorContext.getOrCreateModifiableArtifactModel().addArtifact(name, actualType, configuration.getRootElement());
+    artifactTemplate.setUpArtifact(artifact, configuration);
     selectNodeInTree(findNodeByObject(myRoot, artifact));
   }
 
diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java
index 0875a4fb4be9..37869ef757d1 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidCompileUtil.java
@@ -55,9 +55,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
-import org.jetbrains.android.compiler.artifact.AndroidApplicationArtifactProperties;
-import org.jetbrains.android.compiler.artifact.AndroidArtifactPropertiesProvider;
-import org.jetbrains.android.compiler.artifact.AndroidArtifactSigningMode;
+import org.jetbrains.android.compiler.artifact.*;
 import org.jetbrains.android.dom.manifest.Manifest;
 import org.jetbrains.android.dom.resources.Attr;
 import org.jetbrains.android.dom.resources.DeclareStyleable;
@@ -868,13 +866,35 @@ public class AndroidCompileUtil {
 
   @Nullable
   public static ProguardRunningOptions getProguardConfigFilePathIfShouldRun(@NotNull AndroidFacet facet, CompileContext context) {
-    final String path = context.getCompileScope().getUserData(AndroidProguardCompiler.PROGUARD_CFG_PATH_KEY);
+    // wizard
+    String path = context.getCompileScope().getUserData(AndroidProguardCompiler.PROGUARD_CFG_PATH_KEY);
     if (path != null) {
       final Boolean includeSystemProguardFile = context.getCompileScope().
         getUserData(AndroidProguardCompiler.INCLUDE_SYSTEM_PROGUARD_FILE);
       return new ProguardRunningOptions(path, Boolean.TRUE.equals(includeSystemProguardFile));
     }
+    
+    // artifact
+    final Project project = context.getProject();
+    final Set<Artifact> artifacts = ArtifactCompileScope.getArtifactsToBuild(project, context.getCompileScope(), false);
 
+    for (Artifact artifact : artifacts) {
+      if (artifact.getArtifactType() instanceof AndroidApplicationArtifactType &&
+          facet.equals(AndroidArtifactUtil.getPackagedFacet(project, artifact))) {
+        final ArtifactProperties<?> properties = artifact.getProperties(AndroidArtifactPropertiesProvider.getInstance());
+        
+        if (properties instanceof AndroidApplicationArtifactProperties) {
+          final AndroidApplicationArtifactProperties p = (AndroidApplicationArtifactProperties)properties;
+          
+          if (p.isRunProGuard()) {
+            path = FileUtil.toSystemDependentName(VfsUtilCore.urlToPath(p.getProGuardCfgFileUrl()));
+            return new ProguardRunningOptions(path, p.isIncludeSystemProGuardCfgFile());
+          }
+        }
+      }
+    }
+
+    // facet
     final AndroidFacetConfiguration configuration = facet.getConfiguration();
     if (configuration.RUN_PROGUARD) {
       final VirtualFile proguardCfgFile = AndroidRootUtil.getProguardCfgFile(facet);
diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidPrecompileTask.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidPrecompileTask.java
index 3b952b9eb0c9..7511a8bd9051 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/AndroidPrecompileTask.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidPrecompileTask.java
@@ -34,26 +34,29 @@ import com.intellij.openapi.roots.DependencyScope;
 import com.intellij.openapi.roots.ModuleOrderEntry;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.OrderEntry;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.artifacts.ArtifactProperties;
 import com.intellij.packaging.impl.compiler.ArtifactCompileScope;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.hash.HashSet;
 import org.jetbrains.android.compiler.artifact.AndroidApplicationArtifactProperties;
 import org.jetbrains.android.compiler.artifact.AndroidArtifactPropertiesProvider;
 import org.jetbrains.android.compiler.artifact.AndroidArtifactSigningMode;
+import org.jetbrains.android.compiler.artifact.AndroidArtifactUtil;
 import org.jetbrains.android.facet.AndroidFacet;
 import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.android.maven.AndroidMavenUtil;
 import org.jetbrains.android.sdk.AndroidPlatform;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author Eugene.Kudelevsky
@@ -130,6 +133,7 @@ public class AndroidPrecompileTask implements CompileTask {
     }
     final Set<Artifact> debugArtifacts = new HashSet<Artifact>();
     final Set<Artifact> releaseArtifacts = new HashSet<Artifact>();
+    final Map<AndroidFacet, List<Artifact>> facet2artifacts = new HashMap<AndroidFacet, List<Artifact>>();
 
     for (final Artifact artifact : artifacts) {
       final ArtifactProperties<?> properties = artifact.getProperties(AndroidArtifactPropertiesProvider.getInstance());
@@ -142,6 +146,22 @@ public class AndroidPrecompileTask implements CompileTask {
           releaseArtifacts.add(artifact);
         }
       }
+
+      final AndroidFacet facet = ApplicationManager.getApplication().runReadAction(new Computable<AndroidFacet>() {
+        @Nullable
+        @Override
+        public AndroidFacet compute() {
+          return AndroidArtifactUtil.getPackagedFacet(project, artifact);
+        }
+      });
+      if (facet != null) {
+        List<Artifact> list = facet2artifacts.get(facet);
+        if (list == null) {
+          list = new ArrayList<Artifact>();
+          facet2artifacts.put(facet, list);
+        }
+        list.add(artifact);
+      }
     }
     boolean success = true;
 
@@ -160,9 +180,44 @@ public class AndroidPrecompileTask implements CompileTask {
       context.addMessage(CompilerMessageCategory.ERROR, message, null, -1, -1);
       success = false;
     }
+
+    for (Map.Entry<AndroidFacet, List<Artifact>> entry : facet2artifacts.entrySet()) {
+      final List<Artifact> list = entry.getValue();
+      final String moduleName = entry.getKey().getModule().getName();
+
+      if (list.size() > 1) {
+        final Artifact firstArtifact = list.get(0);
+        final Object[] firstArtifactProGuardOptions = getProGuardOptions(firstArtifact);
+
+        for (int i = 1; i < list.size(); i++) {
+          final Artifact artifact = list.get(i);
+          if (!Arrays.equals(getProGuardOptions(artifact), firstArtifactProGuardOptions)) {
+            context.addMessage(CompilerMessageCategory.ERROR, "Artifacts related to the same module '" +
+                                                              moduleName +
+                                                              "' have different ProGuard options: " +
+                                                              firstArtifact.getName() +
+                                                              ", " +
+                                                              artifact.getName(), null, -1, -1);
+            success = false;
+            break;
+          }
+        }
+      }
+    }
+
     return success;
   }
 
+  @NotNull
+  private static Object[] getProGuardOptions(@NotNull Artifact artifact) {
+    final ArtifactProperties<?> properties = artifact.getProperties(AndroidArtifactPropertiesProvider.getInstance());
+    if (properties instanceof AndroidApplicationArtifactProperties) {
+      final AndroidApplicationArtifactProperties p = (AndroidApplicationArtifactProperties)properties;
+      return new Object[] {p.isRunProGuard(), p.getProGuardCfgFileUrl(), p.isIncludeSystemProGuardCfgFile()};
+    }
+    return ArrayUtil.EMPTY_OBJECT_ARRAY;
+  }
+
   private static String toString(Collection<Artifact> artifacts) {
     final StringBuilder result = new StringBuilder();
     for (Artifact artifact : artifacts) {
diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidProguardCompiler.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidProguardCompiler.java
index c97dd11195f0..ced9100413d2 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/AndroidProguardCompiler.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidProguardCompiler.java
@@ -307,7 +307,7 @@ public class AndroidProguardCompiler implements ClassPostProcessingCompiler {
     @Override
     public ValidityState getValidityState() {
       return new MyValidityState(myTarget, mySdkOsPath, myOutputJarOsPath, myClassFilesDirs, myExternalJars, 
-                                 myProguardConfigFile, myLogsDirectoryOsPath);
+                                 myProguardConfigFile, myIncludeSystemProguardFile, myLogsDirectoryOsPath);
     }
 
     @NotNull
@@ -324,6 +324,7 @@ public class AndroidProguardCompiler implements ClassPostProcessingCompiler {
     private final Map<String, Long> myClassFilesMap;
     private final Map<String, Long> myExternalJarsMap;
     private final long myConfigFileTimestamp;
+    private final boolean myIncludeSystemProguardCfg;
   
     public MyValidityState(@NotNull IAndroidTarget target,
                            @NotNull String sdkOsPath,
@@ -331,10 +332,12 @@ public class AndroidProguardCompiler implements ClassPostProcessingCompiler {
                            @NotNull VirtualFile[] classFilesDirs,
                            @NotNull VirtualFile[] externalJars,
                            @NotNull VirtualFile proguardConfigFile,
+                           boolean includeSystemProguardCfg,
                            @Nullable String logsDirectoryOsPath) {
       myTargetHashString = target.hashString();
       mySdkPath = sdkOsPath;
       myOutputDirPath = outputJarOsPath;
+      myIncludeSystemProguardCfg = includeSystemProguardCfg;
   
       myClassFilesMap = new HashMap<String, Long>();
       final HashSet<VirtualFile> visited = new HashSet<VirtualFile>();
@@ -389,6 +392,7 @@ public class AndroidProguardCompiler implements ClassPostProcessingCompiler {
       }
       
       myConfigFileTimestamp = in.readLong();
+      myIncludeSystemProguardCfg = in.readBoolean();
       myLogsDirectoryPath = CompilerIOUtil.readString(in);
     }
   
@@ -403,8 +407,9 @@ public class AndroidProguardCompiler implements ClassPostProcessingCompiler {
              mySdkPath.equals(other.mySdkPath) && 
              myOutputDirPath.equals(other.myOutputDirPath) && 
              myClassFilesMap.equals(other.myClassFilesMap) && 
-             myExternalJarsMap.equals(other.myExternalJarsMap) && 
-             myConfigFileTimestamp == other.myConfigFileTimestamp && 
+             myExternalJarsMap.equals(other.myExternalJarsMap) &&
+             myConfigFileTimestamp == other.myConfigFileTimestamp &&
+             myIncludeSystemProguardCfg == other.myIncludeSystemProguardCfg &&
              myLogsDirectoryPath.equals(other.myLogsDirectoryPath);
     }
   
@@ -426,6 +431,7 @@ public class AndroidProguardCompiler implements ClassPostProcessingCompiler {
       }
       
       out.writeLong(myConfigFileTimestamp);
+      out.writeBoolean(myIncludeSystemProguardCfg);
       CompilerIOUtil.writeString(myLogsDirectoryPath, out);
     }
   }
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
index 3df3f323a79f..bae21bff1f89 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactProperties.java
@@ -42,6 +42,10 @@ public class AndroidApplicationArtifactProperties extends ArtifactProperties<And
   private String myKeyAlias = "";
   private String myKeyPassword = "";
 
+  private boolean myRunProGuard;
+  private String myProGuardCfgFileUrl = "";
+  private boolean myIncludeSystemProGuardCfgFile;
+
   @Override
   public void onBuildFinished(@NotNull Artifact artifact, @NotNull CompileContext context) {
     if (!(artifact.getArtifactType() instanceof AndroidApplicationArtifactType) ||
@@ -123,7 +127,7 @@ public class AndroidApplicationArtifactProperties extends ArtifactProperties<And
 
   @Override
   public ArtifactPropertiesEditor createEditor(@NotNull ArtifactEditorContext context) {
-    return new AndroidArtifactPropertiesEditor(this, context.getProject());
+    return new AndroidArtifactPropertiesEditor(context.getArtifact(), this, context.getProject());
   }
 
   @Override
@@ -279,4 +283,28 @@ public class AndroidApplicationArtifactProperties extends ArtifactProperties<And
   public void setPlainKeyPassword(@NotNull String password) {
     myKeyPassword = new String(new Base64().encode(password.getBytes()));
   }
+
+  public boolean isRunProGuard() {
+    return myRunProGuard;
+  }
+
+  public String getProGuardCfgFileUrl() {
+    return myProGuardCfgFileUrl;
+  }
+
+  public boolean isIncludeSystemProGuardCfgFile() {
+    return myIncludeSystemProGuardCfgFile;
+  }
+
+  public void setRunProGuard(boolean runProGuard) {
+    myRunProGuard = runProGuard;
+  }
+
+  public void setProGuardCfgFileUrl(String proGuardCfgFileUrl) {
+    myProGuardCfgFileUrl = proGuardCfgFileUrl;
+  }
+
+  public void setIncludeSystemProGuardCfgFile(boolean includeSystemProGuardCfgFile) {
+    myIncludeSystemProGuardCfgFile = includeSystemProGuardCfgFile;
+  }
 }
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java
index ea268a3fac13..da788b4ad7ce 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java
@@ -3,6 +3,9 @@ package org.jetbrains.android.compiler.artifact;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.LibrarySourceItem;
 import com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems.ModuleOutputSourceItem;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.packaging.artifacts.Artifact;
+import com.intellij.packaging.artifacts.ArtifactProperties;
 import com.intellij.packaging.artifacts.ArtifactTemplate;
 import com.intellij.packaging.artifacts.ArtifactType;
 import com.intellij.packaging.elements.CompositePackagingElement;
@@ -13,6 +16,7 @@ import com.intellij.packaging.impl.artifacts.ArtifactUtil;
 import com.intellij.packaging.impl.artifacts.PlainArtifactType;
 import com.intellij.packaging.ui.PackagingSourceItem;
 import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -91,5 +95,25 @@ public class AndroidApplicationArtifactType extends ArtifactType {
       rootElement.addFirstChild(new AndroidFinalPackageElement(myContext.getProject(), facet));
       return new NewArtifactConfiguration(rootElement, facet.getModule().getName(), AndroidApplicationArtifactType.this);
     }
+
+    @Override
+    public void setUpArtifact(@NotNull Artifact artifact, @NotNull NewArtifactConfiguration configuration) {
+      final AndroidFacet facet = AndroidArtifactUtil.getPackagedFacet(myContext.getProject(), artifact);
+
+      if (facet != null) {
+        final ArtifactProperties<?> properties = artifact.getProperties(AndroidArtifactPropertiesProvider.getInstance());
+
+        if (properties instanceof AndroidApplicationArtifactProperties) {
+          final AndroidApplicationArtifactProperties p = (AndroidApplicationArtifactProperties)properties;
+
+          final VirtualFile proguardCfgFile = AndroidRootUtil.getProguardCfgFile(facet);
+          if (proguardCfgFile != null) {
+            p.setProGuardCfgFileUrl(proguardCfgFile.getUrl());
+          }
+
+          p.setIncludeSystemProGuardCfgFile(facet.getConfiguration().isIncludeSystemProguardCfgPath());
+        }
+      }
+    }
   }
 }
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form
index cef9f344b696..20839331d098 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.compiler.artifact.AndroidArtifactPropertiesEditor">
-  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
@@ -10,45 +10,109 @@
     <children>
       <vspacer id="39e8a">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <component id="8bfdb" class="javax.swing.JRadioButton" binding="myReleaseSignedRadio">
-        <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <enabled value="true"/>
-          <text value="Release &amp;signed"/>
-        </properties>
-      </component>
-      <component id="791e9" class="javax.swing.JRadioButton" binding="myReleaseUnsignedRadio">
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="Release &amp;unsigned"/>
-        </properties>
-      </component>
-      <component id="ce323" class="javax.swing.JRadioButton" binding="myDebugRadio">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text value="&amp;Debug"/>
-        </properties>
-      </component>
-      <grid id="b6cd" binding="myReleaseKeyPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="bf5ad" binding="myProGuardPanel" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="2" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+        </constraints>
+        <properties/>
+        <border type="none">
+          <size top="0" left="0" bottom="0" right="0"/>
+        </border>
+        <children>
+          <component id="8a91f" class="javax.swing.JCheckBox" binding="myProGuardCheckBox">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="&amp;Run ProGuard"/>
+            </properties>
+          </component>
+          <grid id="309ae" binding="myProGuardConfigPanel" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+            <margin top="0" left="0" bottom="0" right="0"/>
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children>
+              <component id="9d985" class="com.intellij.ui.components.JBLabel">
+                <constraints>
+                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <anchor value="587da"/>
+                  <labelFor value="56295"/>
+                  <text value="Config &amp;file path:"/>
+                </properties>
+              </component>
+              <component id="56295" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myProGuardConfigFilePathField">
+                <constraints>
+                  <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties/>
+              </component>
+              <component id="9e1d0" class="javax.swing.JCheckBox" binding="myIncludeSystemProGuardFileCheckBox">
+                <constraints>
+                  <grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="&amp;Include system proguard file"/>
+                </properties>
+              </component>
+            </children>
+          </grid>
+        </children>
+      </grid>
+      <grid id="d292f" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="0" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children>
+          <component id="8bfdb" class="javax.swing.JRadioButton" binding="myReleaseSignedRadio">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <enabled value="true"/>
+              <text value="Release &amp;signed"/>
+            </properties>
+          </component>
+          <component id="791e9" class="javax.swing.JRadioButton" binding="myReleaseUnsignedRadio">
+            <constraints>
+              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="Release &amp;unsigned"/>
+            </properties>
+          </component>
+          <component id="ce323" class="javax.swing.JRadioButton" binding="myDebugRadio">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value="&amp;Debug"/>
+            </properties>
+          </component>
+        </children>
+      </grid>
+      <grid id="b6cd" binding="myReleaseKeyPanel" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+        <margin top="0" left="0" bottom="0" right="0"/>
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="true"/>
         </constraints>
         <properties/>
         <border type="none"/>
         <children>
           <component id="587da" class="com.intellij.ui.components.JBLabel">
             <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="779"/>
@@ -57,7 +121,7 @@
           </component>
           <component id="e6a18" class="com.intellij.ui.components.JBLabel">
             <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="8c694"/>
@@ -66,7 +130,7 @@
           </component>
           <component id="8c694" class="javax.swing.JPasswordField" binding="myKeyStorePasswordField">
             <constraints>
-              <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -74,7 +138,7 @@
           </component>
           <component id="5d3f2" class="com.intellij.ui.components.JBLabel">
             <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="9b706"/>
@@ -83,7 +147,7 @@
           </component>
           <component id="76382" class="com.intellij.ui.components.JBLabel">
             <constraints>
-              <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <labelFor value="3398"/>
@@ -92,7 +156,7 @@
           </component>
           <component id="3398" class="javax.swing.JPasswordField" binding="myKeyPasswordField">
             <constraints>
-              <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="4" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
@@ -100,25 +164,27 @@
           </component>
           <component id="9b706" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myKeyAliasField">
             <constraints>
-              <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
           </component>
           <component id="779" class="javax.swing.JTextField" binding="myKeyStorePathField">
             <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+              <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
                 <preferred-size width="150" height="-1"/>
               </grid>
             </constraints>
             <properties/>
           </component>
-          <grid id="bdf4e" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="bdf4e" binding="myKeyStoreButtonsPanel" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties/>
-            <border type="none"/>
+            <border type="none">
+              <size top="0" left="0" bottom="5" right="0"/>
+            </border>
             <children>
               <component id="48c0d" class="javax.swing.JButton" binding="myCreateKeyStoreButton">
                 <constraints>
@@ -143,6 +209,14 @@
               </hspacer>
             </children>
           </grid>
+          <component id="a9189" class="javax.swing.JLabel" binding="myIndentLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text value=" "/>
+            </properties>
+          </component>
         </children>
       </grid>
     </children>
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.java b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.java
index 8c86c94895ef..ea50c22d965a 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.java
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidArtifactPropertiesEditor.java
@@ -14,13 +14,18 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.ui.ArtifactPropertiesEditor;
+import com.intellij.ui.IdeBorderFactory;
 import com.intellij.util.ui.UIUtil;
+import org.jetbrains.android.facet.AndroidFacet;
+import org.jetbrains.android.facet.AndroidRootUtil;
 import org.jetbrains.android.util.AndroidUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.*;
@@ -49,10 +54,26 @@ public class AndroidArtifactPropertiesEditor extends ArtifactPropertiesEditor {
   private TextFieldWithBrowseButton myKeyAliasField;
   private JButton myLoadKeyStoreButton;
   private JButton myCreateKeyStoreButton;
+  private JCheckBox myProGuardCheckBox;
+  private TextFieldWithBrowseButton myProGuardConfigFilePathField;
+  private JCheckBox myIncludeSystemProGuardFileCheckBox;
+  private JPanel myProGuardConfigPanel;
+  private JLabel myIndentLabel;
+  private JPanel myKeyStoreButtonsPanel;
+  private JPanel myProGuardPanel;
 
-  public AndroidArtifactPropertiesEditor(@NonNull AndroidApplicationArtifactProperties properties, @NotNull final Project project) {
+  public AndroidArtifactPropertiesEditor(@Nullable final Artifact artifact,
+                                         @NonNull AndroidApplicationArtifactProperties properties,
+                                         @NotNull final Project project) {
     myProperties = properties;
 
+    myIndentLabel.setPreferredSize(new Dimension(20, 1));
+    myIndentLabel.setMinimumSize(new Dimension(20, 1));
+    myIndentLabel.setMaximumSize(new Dimension(20, 1));
+
+    myKeyStoreButtonsPanel.setBorder(IdeBorderFactory.createEmptyBorder(0, 0, 5, 0));
+    myProGuardPanel.setBorder(IdeBorderFactory.createEmptyBorder(10, 0, 0, 0));
+
     final ActionListener listener = new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent e) {
@@ -115,6 +136,34 @@ public class AndroidArtifactPropertiesEditor extends ArtifactPropertiesEditor {
         }
       }
     });
+
+    myProGuardCheckBox.addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        UIUtil.setEnabled(myProGuardConfigPanel, myProGuardCheckBox.isSelected(), true);
+      }
+    });
+
+    myProGuardConfigFilePathField.getButton().addActionListener(new ActionListener() {
+      @Override
+      public void actionPerformed(ActionEvent e) {
+        final String path = myProGuardConfigFilePathField.getText().trim();
+        VirtualFile defaultFile = path != null && path.length() > 0
+                                  ? LocalFileSystem.getInstance().findFileByPath(path)
+                                  : null;
+        if (defaultFile == null) {
+          final AndroidFacet facet = AndroidArtifactUtil.getPackagedFacet(project, artifact);
+          if (facet != null) {
+            defaultFile = AndroidRootUtil.getMainContentRoot(facet);
+          }
+        }
+        final FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor();
+        final VirtualFile file = FileChooser.chooseFile(descriptor, myPanel, project, defaultFile);
+        if (file != null) {
+          myProGuardConfigFilePathField.setText(FileUtil.toSystemDependentName(file.getPath()));
+        }
+      }
+    });
   }
 
   private String getKeyStorePath() {
@@ -180,7 +229,10 @@ public class AndroidArtifactPropertiesEditor extends ArtifactPropertiesEditor {
            !getKeyStoreFileUrl().equals(myProperties.getKeyStoreUrl()) ||
            !getKeyStorePassword().equals(myProperties.getPlainKeystorePassword()) ||
            !getKeyAlias().equals(myProperties.getKeyAlias()) ||
-           !getKeyPassword().equals(myProperties.getPlainKeyPassword());
+           !getKeyPassword().equals(myProperties.getPlainKeyPassword()) ||
+           myProGuardCheckBox.isSelected() != myProperties.isRunProGuard() ||
+           !getProGuardConfigFileUrl().equals(myProperties.getProGuardCfgFileUrl()) ||
+           myIncludeSystemProGuardFileCheckBox.isSelected() != myProperties.isIncludeSystemProGuardCfgFile();
   }
 
   @Override
@@ -190,6 +242,13 @@ public class AndroidArtifactPropertiesEditor extends ArtifactPropertiesEditor {
     myProperties.setPlainKeystorePassword(getKeyStorePassword());
     myProperties.setKeyAlias(getKeyAlias());
     myProperties.setPlainKeyPassword(getKeyPassword());
+    myProperties.setRunProGuard(myProGuardCheckBox.isSelected());
+    myProperties.setProGuardCfgFileUrl(getProGuardConfigFileUrl());
+    myProperties.setIncludeSystemProGuardCfgFile(myIncludeSystemProGuardFileCheckBox.isSelected());
+  }
+
+  private String getProGuardConfigFileUrl() {
+    return VfsUtilCore.pathToUrl(FileUtil.toSystemIndependentName(myProGuardConfigFilePathField.getText().trim()));
   }
 
   @Override
@@ -212,14 +271,19 @@ public class AndroidArtifactPropertiesEditor extends ArtifactPropertiesEditor {
         break;
     }
     final String keyStoreUrl = myProperties.getKeyStoreUrl();
-    myKeyStorePathField.setText(keyStoreUrl != null ? VfsUtilCore.urlToPath(keyStoreUrl) : "");
+    myKeyStorePathField.setText(keyStoreUrl != null ? FileUtil.toSystemDependentName(VfsUtilCore.urlToPath(keyStoreUrl)) : "");
     myKeyStorePasswordField.setText(myProperties.getPlainKeystorePassword());
 
     final String keyAlias = myProperties.getKeyAlias();
     myKeyAliasField.setText(keyAlias != null ? keyAlias : "");
     myKeyPasswordField.setText(myProperties.getPlainKeyPassword());
 
+    myProGuardCheckBox.setSelected(myProperties.isRunProGuard());
+    myProGuardConfigFilePathField.setText(FileUtil.toSystemDependentName(VfsUtilCore.urlToPath(myProperties.getProGuardCfgFileUrl())));
+    myIncludeSystemProGuardFileCheckBox.setSelected(myProperties.isIncludeSystemProGuardCfgFile());
+
     UIUtil.setEnabled(myReleaseKeyPanel, myProperties.getSigningMode() == AndroidArtifactSigningMode.RELEASE_SIGNED, true);
+    UIUtil.setEnabled(myProGuardConfigPanel, myProperties.isRunProGuard(), true);
   }
 
   @Override
@@ -240,7 +304,7 @@ public class AndroidArtifactPropertiesEditor extends ArtifactPropertiesEditor {
   @NotNull
   private String getKeyStoreFileUrl() {
     final String path = getKeyStorePath();
-    return VfsUtilCore.pathToUrl(path);
+    return VfsUtilCore.pathToUrl(FileUtil.toSystemIndependentName(path));
   }
 
   @NotNull
diff --git a/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.form b/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.form
index ade0f50564b1..a1b4ddc413a0 100644
--- a/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.form
+++ b/plugins/android/src/org/jetbrains/android/compiler/artifact/NewKeyStoreDialog.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.compiler.artifact.NewKeyStoreDialog">
-  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="4" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="507" height="400"/>
@@ -19,18 +19,18 @@
       </component>
       <vspacer id="a56a5">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="decbb" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myKeyStorePathField">
         <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
       <grid id="1d308" binding="myNewKeyPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="4" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <clientProperties>
@@ -58,16 +58,16 @@
       </component>
       <component id="aa6ed" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <labelFor value="bffd5"/>
-          <text value="Co&amp;nfirm password:"/>
+          <text value="Co&amp;nfirm:"/>
         </properties>
       </component>
       <component id="bffd5" class="javax.swing.JPasswordField" binding="myConfirmedPassword">
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>

From a0067515a63ef4bc0ee7eedc7a6c8cb8791c5915 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Tue, 5 Jun 2012 18:50:45 +0400
Subject: [PATCH 221/239] IDEA-85568 feature request: complain if there is no
 valid SDK implemented

---
 .../impl/SetupSDKNotificationProvider.java    | 98 +++++++++++++++++++
 .../src/messages/ProjectBundle.properties     |  3 +
 resources/src/idea/RichPlatformPlugin.xml     |  1 +
 3 files changed, 102 insertions(+)
 create mode 100644 java/idea-ui/src/com/intellij/codeInsight/daemon/impl/SetupSDKNotificationProvider.java

diff --git a/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/SetupSDKNotificationProvider.java b/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/SetupSDKNotificationProvider.java
new file mode 100644
index 000000000000..b4abfb99cc60
--- /dev/null
+++ b/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/SetupSDKNotificationProvider.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.codeInsight.daemon.impl;
+
+import com.intellij.ProjectTopics;
+import com.intellij.ide.highlighter.JavaClassFileType;
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectBundle;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.roots.*;
+import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.ui.EditorNotificationPanel;
+import com.intellij.ui.EditorNotifications;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Danila Ponomarenko
+ */
+public class SetupSDKNotificationProvider implements EditorNotifications.Provider<EditorNotificationPanel> {
+  private static final Key<EditorNotificationPanel> KEY = Key.create("Setup SDK");
+
+  private final Project myProject;
+
+  public SetupSDKNotificationProvider(Project project, final EditorNotifications notifications) {
+    myProject = project;
+    myProject.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() {
+      public void rootsChanged(ModuleRootEvent event) {
+        notifications.updateAllNotifications();
+      }
+    });
+  }
+
+  @Override
+  public Key<EditorNotificationPanel> getKey() {
+    return KEY;
+  }
+
+  @Override
+  public EditorNotificationPanel createNotificationPanel(VirtualFile file) {
+    if (file.getFileType() == JavaClassFileType.INSTANCE) return null;
+
+    final PsiFile psiFile = PsiManager.getInstance(myProject).findFile(file);
+    if (psiFile == null) {
+      return null;
+    }
+
+    if (ProjectRootManager.getInstance(myProject).getProjectSdk() != null) {
+      return null;
+    }
+
+    return createPanel(myProject, psiFile);
+  }
+
+  @NotNull
+  private static EditorNotificationPanel createPanel(final @NotNull Project project, final @NotNull PsiFile file) {
+    final EditorNotificationPanel panel = new EditorNotificationPanel();
+    panel.setText(ProjectBundle.message("project.sdk.not.defined"));
+    panel.createActionLabel(ProjectBundle.message("project.sdk.setup"), new Runnable() {
+      @Override
+      public void run() {
+        final Sdk projectSdk = ProjectSettingsService.getInstance(project).chooseAndSetSdk();
+        if (projectSdk == null) return;
+        ApplicationManager.getApplication().runWriteAction(new Runnable() {
+          @Override
+          public void run() {
+            final Module module = ModuleUtil.findModuleForPsiElement(file);
+            if (module != null) {
+              ModifiableRootModel modifiableModel = ModuleRootManager.getInstance(module).getModifiableModel();
+              modifiableModel.inheritSdk();
+              modifiableModel.commit();
+            }
+          }
+        });
+      }
+    });
+    return panel;
+  }
+}
diff --git a/platform/projectModel-impl/src/messages/ProjectBundle.properties b/platform/projectModel-impl/src/messages/ProjectBundle.properties
index 6e08ca5d3c41..cee4e41dc4c3 100644
--- a/platform/projectModel-impl/src/messages/ProjectBundle.properties
+++ b/platform/projectModel-impl/src/messages/ProjectBundle.properties
@@ -154,6 +154,9 @@ library.attach.sources.action=Attach Sources
 library.attach.sources.action.busy.text=Attaching...
 library.attach.sources.description=Select jar/zip files or directories in which library sources are located
 
+project.sdk.not.defined=Project SDK is not defined
+project.sdk.setup=Setup SDK
+
 module.module.language.level=&Language level:
 module.module.language.level.comment=(effective on project reload)
 module.circular.dependency.warning.short=There is circular dependency between modules {0}
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml
index 72ef62dedb26..6f614bddea9a 100644
--- a/resources/src/idea/RichPlatformPlugin.xml
+++ b/resources/src/idea/RichPlatformPlugin.xml
@@ -267,6 +267,7 @@
     <applicationConfigurable instance="com.intellij.execution.console.ConsoleFoldingConfigurable"/>
 
     <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.AttachSourcesNotificationProvider"/>
+    <editorNotificationProvider implementation="com.intellij.codeInsight.daemon.impl.SetupSDKNotificationProvider"/>
 
     <checkoutListener implementation="com.intellij.openapi.vcs.checkout.ProjectCheckoutListener"/>
     <checkoutListener implementation="com.intellij.openapi.vcs.checkout.ProjectDirCheckoutListener"/>

From ebf9b0d05de6feaea926c621d84aa6f7c4949dac Mon Sep 17 00:00:00 2001
From: Dennis Ushakov <dennis.ushakov@gmail.com>
Date: Tue, 5 Jun 2012 18:31:05 +0400
Subject: [PATCH 222/239] cleanup

---
 .../com/intellij/execution/ui/layout/impl/RunnerContentUi.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
index 1b6198e808e6..11ffa3ce3382 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
@@ -46,6 +46,7 @@ import com.intellij.ui.switcher.SwitchTarget;
 import com.intellij.ui.tabs.JBTabs;
 import com.intellij.ui.tabs.TabInfo;
 import com.intellij.ui.tabs.TabsListener;
+import com.intellij.ui.tabs.impl.JBTabsImpl;
 import com.intellij.util.NotNullFunction;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.AbstractLayoutManager;
@@ -1591,7 +1592,7 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
       storeDefaultIndices(data);
 
       final Dimension size = info.getComponent().getSize();
-      final Image image = myTabs.getComponentImage(info);
+      final Image image = JBTabsImpl.getComponentImage(info);
       if (component instanceof Grid) {
         info.setHidden(true);
       }

From a5c962e2e03a2d1a55745ab4ad899e190884ccf2 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Tue, 5 Jun 2012 19:15:00 +0400
Subject: [PATCH 223/239] IDEA-86830 Name of "Import class" quickfix in javadoc
 is confusing fixed

---
 .../javaDoc/JavaDocReferenceInspection.java   | 22 +++++++++----------
 .../src/messages/QuickFixBundle.properties    |  5 ++++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
index 8f21d5988000..1a4a3e58cafc 100644
--- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocReferenceInspection.java
@@ -85,7 +85,7 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
       final PsiElement referenceNameElement = reference.getReferenceNameElement();
       problems.add(manager.createProblemDescriptor(referenceNameElement != null ? referenceNameElement : reference,
                                                    cannotResolveSymbolMessage("<code>" + reference.getText() + "</code>"),
-                                                   !isOnTheFly || classesToImport.isEmpty() ? null : new AddImportFix(classesToImport),
+                                                   !isOnTheFly || classesToImport.isEmpty() ? null : new AddQualifierFix(classesToImport),
                                                    ProblemHighlightType.LIKE_UNKNOWN_SYMBOL, isOnTheFly));
     }
 
@@ -213,29 +213,29 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
     return HighlightDisplayLevel.ERROR;
   }
 
-  private class AddImportFix implements LocalQuickFix{
-    private final List<PsiClass> myClassesToImport;
+  private class AddQualifierFix implements LocalQuickFix{
+    private final List<PsiClass> originalClasses;
 
-    public AddImportFix(final List<PsiClass> classesToImport) {
-      myClassesToImport = classesToImport;
+    public AddQualifierFix(final List<PsiClass> originalClasses) {
+      this.originalClasses = originalClasses;
     }
 
     @NotNull
     public String getName() {
-      return QuickFixBundle.message("import.class.fix");
+      return QuickFixBundle.message("add.qualifier");
     }
 
     @NotNull
     public String getFamilyName() {
-      return QuickFixBundle.message("import.class.fix");
+      return QuickFixBundle.message("add.qualifier");
     }
 
     public void applyFix(@NotNull final Project project, @NotNull final ProblemDescriptor descriptor) {
       final PsiElement element = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), PsiJavaCodeReferenceElement.class);
       if (element instanceof PsiJavaCodeReferenceElement) {
         final PsiJavaCodeReferenceElement referenceElement = (PsiJavaCodeReferenceElement)element;
-        Collections.sort(myClassesToImport, new PsiProximityComparator(referenceElement.getElement()));
-        final JList list = new JBList(myClassesToImport.toArray(new PsiClass[myClassesToImport.size()]));
+        Collections.sort(originalClasses, new PsiProximityComparator(referenceElement.getElement()));
+        final JList list = new JBList(originalClasses.toArray(new PsiClass[originalClasses.size()]));
         list.setCellRenderer(new FQNameCellRenderer());
         final Runnable runnable = new Runnable() {
           public void run() {
@@ -244,7 +244,7 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
             if (index < 0) return;
             new WriteCommandAction(project, element.getContainingFile()){
               protected void run(final Result result) throws Throwable {
-                final PsiClass psiClass = myClassesToImport.get(index);
+                final PsiClass psiClass = originalClasses.get(index);
                 if (psiClass.isValid()) {
                   PsiDocumentManager.getInstance(project).commitAllDocuments();
                   referenceElement.bindToElement(psiClass);
@@ -258,7 +258,7 @@ public class JavaDocReferenceInspection extends BaseLocalInspectionTool {
           @Override
           public void run(DataContext dataContext) {
             new PopupChooserBuilder(list).
-              setTitle(QuickFixBundle.message("class.to.import.chooser.title")).
+              setTitle(QuickFixBundle.message("add.qualifier.original.class.chooser.title")).
               setItemChoosenCallback(runnable).
               createPopup().
               showInBestPositionFor(dataContext);
diff --git a/resources-en/src/messages/QuickFixBundle.properties b/resources-en/src/messages/QuickFixBundle.properties
index a5cda760fc2f..447464101eda 100644
--- a/resources-en/src/messages/QuickFixBundle.properties
+++ b/resources-en/src/messages/QuickFixBundle.properties
@@ -268,4 +268,7 @@ initialize.final.field.in.constructor.choose.dialog.title=Choose constructors to
 remove.redundant.arguments.text=Remove redundant arguments to call ''{0}''
 remove.redundant.arguments.family=Remove redundant arguments
 
-replace.with.list.access.text=Replace with list access
\ No newline at end of file
+replace.with.list.access.text=Replace with list access
+
+add.qualifier=Add qualifier
+add.qualifier.original.class.chooser.title=Original class
\ No newline at end of file

From cae9281d8110d65732348f05b6f30476084ca741 Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Tue, 5 Jun 2012 19:43:03 +0400
Subject: [PATCH 224/239] KT-1735 Can't access "assert" function from stdlib

---
 .../psi/impl/compiled/ClsIdentifierImpl.java  | 19 +++++++++++++++----
 .../impl/compiled/StubBuildingVisitor.java    | 13 ++-----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java
index e7fd57cbf41e..ac8cbdeee9c2 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsIdentifierImpl.java
@@ -15,7 +15,8 @@
  */
 package com.intellij.psi.impl.compiled;
 
-import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.lexer.JavaLexer;
+import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.tree.ElementType;
 import com.intellij.psi.impl.source.tree.TreeElement;
@@ -23,8 +24,6 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
 
 class ClsIdentifierImpl extends ClsElementImpl implements PsiIdentifier, PsiJavaToken {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.compiled.ClsIdentifierImpl");
-
   private final PsiElement myParent;
   private final String myText;
 
@@ -54,9 +53,21 @@ class ClsIdentifierImpl extends ClsElementImpl implements PsiIdentifier, PsiJava
     return myParent;
   }
 
+  private boolean isCorrectName(String name) {
+    if (name == null) return false;
+
+    return StringUtil.isJavaIdentifier(name) && !JavaLexer.isKeyword(name, ((PsiJavaFile)getContainingFile()).getLanguageLevel());
+  }
+
   @Override
   public void appendMirrorText(final int indentLevel, final StringBuilder buffer){
-    buffer.append(getText());
+    String original = getText();
+    if (isCorrectName(original)) {
+      buffer.append(original);
+    }
+    else {
+      buffer.append("$$").append(original).append(" /* Real name is '").append(original).append("' */");
+    }
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
index 217e2cab1f8c..fe7e1006aacf 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/StubBuildingVisitor.java
@@ -19,11 +19,9 @@
  */
 package com.intellij.psi.impl.compiled;
 
-import com.intellij.lexer.JavaLexer;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.psi.CommonClassNames;
-import com.intellij.psi.JavaTokenType;
 import com.intellij.psi.PsiNameHelper;
 import com.intellij.psi.PsiReferenceList;
 import com.intellij.psi.impl.cache.ModifierFlags;
@@ -69,7 +67,6 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
   private final T mySource;
   private PsiModifierListStub myModList;
   private PsiClassStub myResult;
-  private JavaLexer myLexer;
 
   public StubBuildingVisitor(final T classSource, InnerClassSourceStrategy<T> innersStrategy, final StubElement parent, final int access) {
     super(Opcodes.ASM4);
@@ -106,7 +103,6 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
     myResult = new PsiClassStubImpl(JavaStubElementTypes.CLASS, myParent, fqn, shortName, null, stubFlags);
 
     LanguageLevel languageLevel = convertFromVersion(version);
-    myLexer = new JavaLexer(languageLevel);
 
     ((PsiClassStubImpl)myResult).setLanguageLevel(languageLevel);
     myModList = new PsiModifierListStubImpl(myResult, packClassFlags(flags));
@@ -320,13 +316,8 @@ public class StubBuildingVisitor<T> extends ClassVisitor {
     reader.accept(classVisitor, ClassReader.SKIP_FRAMES);
   }
 
-  private boolean isCorrectName(String name) {
-    if (name == null) return false;
-
-    myLexer.start(name);
-    if (myLexer.getTokenType() != JavaTokenType.IDENTIFIER) return false;
-    myLexer.advance();
-    return myLexer.getTokenType() == null;
+  private static boolean isCorrectName(String name) {
+    return name != null;
   }
 
   @Override

From 0d042c5478e6ecda4bf4328960f8a632984da879 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Tue, 5 Jun 2012 18:24:18 +0200
Subject: [PATCH 225/239] [^anima] recreate completion file copy when the
 previous one is outdated

---
 .../completion/CodeCompletionHandlerBase.java        | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
index c5ed564d4f56..4715b4e5d53f 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
@@ -776,6 +776,16 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
 
   public static final Key<SoftReference<Pair<PsiFile, Document>>> FILE_COPY_KEY = Key.create("CompletionFileCopy");
 
+  private static boolean isCopyUpToDate(Document document, @NotNull PsiFile file) {
+    if (!file.isValid()) {
+      return false;
+    }
+    // the psi file cache might have been cleared by some external activity,
+    // in which case PSI-document sync may stop working
+    PsiFile current = PsiDocumentManager.getInstance(file.getProject()).getPsiFile(document);
+    return current != null && current.getViewProvider().getPsi(file.getLanguage()) == file;
+  }
+
   private static PsiFile createFileCopy(PsiFile file) {
     final VirtualFile virtualFile = file.getVirtualFile();
     if (file.isPhysical() && virtualFile != null && virtualFile.getFileSystem() == LocalFileSystem.getInstance()
@@ -784,7 +794,7 @@ public class CodeCompletionHandlerBase implements CodeInsightActionHandler {
       final SoftReference<Pair<PsiFile, Document>> reference = file.getUserData(FILE_COPY_KEY);
       if (reference != null) {
         final Pair<PsiFile, Document> pair = reference.get();
-        if (pair != null && pair.first.isValid() && pair.first.getClass().equals(file.getClass())) {
+        if (pair != null && pair.first.getClass().equals(file.getClass()) && isCopyUpToDate(pair.second, pair.first)) {
           final PsiFile copy = pair.first;
           if (copy.getViewProvider().getModificationStamp() > file.getViewProvider().getModificationStamp()) {
             ((PsiModificationTrackerImpl) file.getManager().getModificationTracker()).incCounter();

From 9474f3f7343af8024d010ccd79fb2f4f0dc6b403 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Tue, 5 Jun 2012 21:06:23 +0400
Subject: [PATCH 226/239] Morphing

---
 .../designer/model/ComponentMorphingTool.java | 103 ++++++++++++++++++
 .../designer/model/RadViewComponent.java      |  14 +--
 .../designer/model/RadViewContainer.java      |   4 +-
 .../model/layout/RadLinearLayout.java         |   2 +-
 .../model/layout/RadRadioGroupLayout.java     |   2 +-
 .../model/layout/table/RadTableRowLayout.java |   2 +-
 .../designer/model/morphing/LinearLayout.java |  95 ++++++++++++++++
 .../designer/model/morphing/RadioGroup.java   |  61 +++++++++++
 .../designer/actions/MorphingAction.java      |  16 ++-
 .../intellij/designer/model/RadComponent.java |   4 +-
 10 files changed, 282 insertions(+), 21 deletions(-)
 create mode 100644 plugins/android-designer/src/com/intellij/android/designer/model/ComponentMorphingTool.java
 create mode 100644 plugins/android-designer/src/com/intellij/android/designer/model/morphing/LinearLayout.java
 create mode 100644 plugins/android-designer/src/com/intellij/android/designer/model/morphing/RadioGroup.java

diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/ComponentMorphingTool.java b/plugins/android-designer/src/com/intellij/android/designer/model/ComponentMorphingTool.java
new file mode 100644
index 000000000000..a66c2b5a2c34
--- /dev/null
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/ComponentMorphingTool.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.android.designer.model;
+
+import com.intellij.designer.model.MetaModel;
+import com.intellij.designer.model.RadComponent;
+import com.intellij.designer.model.RadLayout;
+import com.intellij.openapi.application.ApplicationManager;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+/**
+ * @author Alexander Lobas
+ */
+public class ComponentMorphingTool {
+  protected final RadViewComponent myOldComponent;
+  protected final RadViewComponent myNewComponent;
+
+  public ComponentMorphingTool(RadViewComponent oldComponent,
+                               RadViewComponent newComponent,
+                               MetaModel newModel,
+                               @Nullable RadLayout newLayout) throws Exception {
+    myOldComponent = oldComponent;
+    myNewComponent = newComponent;
+
+    newComponent.setMetaModel(newModel);
+
+    if (newLayout != null) {
+      newComponent.setLayout(newLayout);
+    }
+
+    if (newComponent != oldComponent) {
+      RadComponent parent = oldComponent.getParent();
+      newComponent.setParent(parent);
+
+      List<RadComponent> parentChildren = parent.getChildren();
+      parentChildren.set(parentChildren.indexOf(oldComponent), newComponent);
+
+      newComponent.setTag(oldComponent.getTag());
+
+      convertChildren();
+    }
+
+    ApplicationManager.getApplication().runWriteAction(new Runnable() {
+      @Override
+      public void run() {
+        convertTag();
+        myNewComponent.getTag().setName(myNewComponent.getMetaModel().getTag());
+      }
+    });
+
+    PropertyParser propertyParser = newComponent.getRoot().getClientProperty(PropertyParser.KEY);
+    propertyParser.load(newComponent);
+    loadChildProperties(propertyParser);
+  }
+
+  protected void convertChildren() throws Exception {
+    List<RadComponent> oldChildren = myOldComponent.getChildren();
+    myNewComponent.getChildren().addAll(oldChildren);
+
+    for (RadComponent childComponent : oldChildren) {
+      childComponent.setParent(myNewComponent);
+    }
+  }
+
+  protected void convertTag() {
+  }
+
+  protected void loadChildProperties(PropertyParser propertyParser) throws Exception {
+    for (RadComponent childComponent : myNewComponent.getChildren()) {
+      propertyParser.load((RadViewComponent)childComponent);
+    }
+  }
+
+  public RadViewComponent result() {
+    return myNewComponent;
+  }
+
+  public static RadViewComponent convert(RadViewComponent component, MetaModel target) throws Exception {
+    ClassLoader classLoader = ComponentMorphingTool.class.getClassLoader();
+    Class<?> sourceConverterClass = classLoader.loadClass(
+      "com.intellij.android.designer.model.morphing." + component.getMetaModel().getTag());
+    Object sourceConverter = sourceConverterClass.newInstance();
+
+    Method method = sourceConverterClass.getMethod(target.getTag(), RadViewComponent.class, MetaModel.class);
+    return (RadViewComponent)method.invoke(sourceConverter, component, target);
+  }
+}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
index 5c6197721090..4554f6330ddb 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewComponent.java
@@ -253,17 +253,7 @@ public class RadViewComponent extends RadVisualComponent {
   }
 
   @Override
-  public void morphingTo(final MetaModel target) throws Exception {
-    ApplicationManager.getApplication().runWriteAction(new Runnable() {
-      @Override
-      public void run() {
-        myTag.setName(target.getTag());
-      }
-    });
-
-    setMetaModel(target);
-
-    PropertyParser propertyParser = getRoot().getClientProperty(PropertyParser.KEY);
-    propertyParser.load(this);
+  public RadComponent morphingTo(MetaModel target) throws Exception {
+    return new ComponentMorphingTool(this, this, target, null).result();
   }
 }
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewContainer.java b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewContainer.java
index e6403543bd96..dbfb68605493 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/RadViewContainer.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/RadViewContainer.java
@@ -56,7 +56,7 @@ public class RadViewContainer extends RadViewComponent {
   }
 
   @Override
-  public void morphingTo(MetaModel target) throws Exception {
-    // TODO: Auto-generated method stub
+  public RadComponent morphingTo(MetaModel target) throws Exception {
+    return ComponentMorphingTool.convert(this, target);
   }
 }
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java
index 16a1e38ee198..516c15bf3f3f 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadLinearLayout.java
@@ -58,7 +58,7 @@ public class RadLinearLayout extends RadViewLayoutWithData implements ILayoutDec
     return LAYOUT_PARAMS;
   }
 
-  protected boolean isHorizontal() {
+  public boolean isHorizontal() {
     return !"vertical".equals(((RadViewComponent)myContainer).getTag().getAttributeValue("android:orientation"));
   }
 
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadRadioGroupLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadRadioGroupLayout.java
index 93689059da6f..6f6af85b40ab 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadRadioGroupLayout.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/RadRadioGroupLayout.java
@@ -22,7 +22,7 @@ import com.intellij.android.designer.model.RadViewComponent;
  */
 public class RadRadioGroupLayout extends RadLinearLayout {
   @Override
-  protected boolean isHorizontal() {
+  public boolean isHorizontal() {
     return "horizontal".equals(((RadViewComponent)myContainer).getTag().getAttributeValue("android:orientation"));
   }
 }
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableRowLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableRowLayout.java
index cc8de9d46eb9..77911220982d 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableRowLayout.java
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/layout/table/RadTableRowLayout.java
@@ -54,7 +54,7 @@ public class RadTableRowLayout extends RadLinearLayout {
   }
 
   @Override
-  protected boolean isHorizontal() {
+  public boolean isHorizontal() {
     return true;
   }
 
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/morphing/LinearLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/morphing/LinearLayout.java
new file mode 100644
index 000000000000..e1377ab42719
--- /dev/null
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/morphing/LinearLayout.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.android.designer.model.morphing;
+
+import com.intellij.android.designer.model.*;
+import com.intellij.android.designer.model.layout.RadLinearLayout;
+import com.intellij.android.designer.model.layout.RadRadioGroupLayout;
+import com.intellij.android.designer.model.layout.grid.RadGridLayout;
+import com.intellij.android.designer.model.layout.grid.RadGridLayoutComponent;
+import com.intellij.android.designer.model.layout.table.RadTableLayout;
+import com.intellij.android.designer.model.layout.table.RadTableLayoutComponent;
+import com.intellij.designer.model.MetaModel;
+import com.intellij.designer.model.RadComponent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Alexander Lobas
+ */
+public class LinearLayout {
+  public static RadViewComponent RadioGroup(RadViewComponent component, MetaModel target) throws Exception {
+    final boolean horizontal = ((RadLinearLayout)component.getLayout()).isHorizontal();
+
+    return new ComponentMorphingTool(component, component, target, new RadRadioGroupLayout()) {
+      @Override
+      protected void convertTag() {
+        if (horizontal) {
+          myNewComponent.getTag().setAttribute("android:orientation", "horizontal");
+        }
+        else {
+          ModelParser.deleteAttribute(myNewComponent, "android:orientation");
+        }
+      }
+    }.result();
+  }
+
+  public static RadViewComponent GridLayout(RadViewComponent component, MetaModel target) throws Exception {
+    return new ComponentMorphingTool(component, new RadGridLayoutComponent(), target, new RadGridLayout()).result();
+  }
+
+  public static RadViewComponent TableLayout(RadViewComponent component, MetaModel target) throws Exception {
+    boolean horizontal = ((RadLinearLayout)component.getLayout()).isHorizontal();
+    return TableLayout(component, target, horizontal);
+  }
+
+  public static RadViewComponent TableLayout(RadViewComponent component, MetaModel target, final boolean horizontal) throws Exception {
+    final MetaModel tableRowModel = ViewsMetaManager.getInstance(component.getTag().getProject()).getModelByTag("TableRow");
+
+    return new ComponentMorphingTool(component, new RadTableLayoutComponent(), target, new RadTableLayout()) {
+      @Override
+      protected void convertChildren() throws Exception {
+        List<RadComponent> oldChildren = new ArrayList<RadComponent>(myOldComponent.getChildren());
+
+        if (horizontal) {
+          RadViewComponent newRowComponent = ModelParser.createComponent(null, tableRowModel);
+          ModelParser.addComponent(myNewComponent, newRowComponent, null);
+
+          for (RadComponent childComponent : oldChildren) {
+            ModelParser.moveComponent(newRowComponent, (RadViewComponent)childComponent, null);
+          }
+        }
+        else {
+          for (RadComponent childComponent : oldChildren) {
+            RadViewComponent newRowComponent = ModelParser.createComponent(null, tableRowModel);
+            ModelParser.addComponent(myNewComponent, newRowComponent, null);
+            ModelParser.moveComponent(newRowComponent, (RadViewComponent)childComponent, null);
+          }
+        }
+      }
+
+      @Override
+      protected void convertTag() {
+        ModelParser.deleteAttribute(myNewComponent, "android:orientation");
+      }
+
+      @Override
+      protected void loadChildProperties(PropertyParser propertyParser) throws Exception {
+      }
+    }.result();
+  }
+}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/morphing/RadioGroup.java b/plugins/android-designer/src/com/intellij/android/designer/model/morphing/RadioGroup.java
new file mode 100644
index 000000000000..67f5d6df92b5
--- /dev/null
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/morphing/RadioGroup.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.android.designer.model.morphing;
+
+import com.intellij.android.designer.model.ComponentMorphingTool;
+import com.intellij.android.designer.model.ModelParser;
+import com.intellij.android.designer.model.RadViewComponent;
+import com.intellij.android.designer.model.layout.RadLinearLayout;
+import com.intellij.android.designer.model.layout.RadRadioGroupLayout;
+import com.intellij.android.designer.model.layout.grid.RadGridLayout;
+import com.intellij.android.designer.model.layout.grid.RadGridLayoutComponent;
+import com.intellij.designer.model.MetaModel;
+import com.intellij.designer.model.RadLayout;
+
+/**
+ * @author Alexander Lobas
+ */
+public class RadioGroup {
+  public static RadViewComponent LinearLayout(RadViewComponent component, MetaModel target) throws Exception {
+    return convert(component, component, target, new RadLinearLayout());
+  }
+
+  public static RadViewComponent GridLayout(RadViewComponent component, MetaModel target) throws Exception {
+    return convert(component, new RadGridLayoutComponent(), target, new RadGridLayout());
+  }
+
+  private static RadViewComponent convert(RadViewComponent oldComponent, RadViewComponent newComponent, MetaModel target, RadLayout layout)
+    throws Exception {
+    final boolean horizontal = ((RadRadioGroupLayout)oldComponent.getLayout()).isHorizontal();
+
+    return new ComponentMorphingTool(oldComponent, newComponent, target, layout) {
+      @Override
+      protected void convertTag() {
+        if (horizontal) {
+          ModelParser.deleteAttribute(myNewComponent, "android:orientation");
+        }
+        else {
+          myNewComponent.getTag().setAttribute("android:orientation", "vertical");
+        }
+      }
+    }.result();
+  }
+
+  public static RadViewComponent TableLayout(RadViewComponent component, MetaModel target) throws Exception {
+    boolean horizontal = ((RadRadioGroupLayout)component.getLayout()).isHorizontal();
+    return LinearLayout.TableLayout(component, target, horizontal);
+  }
+}
\ No newline at end of file
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java
index 8f1563edf79c..a56027a75a83 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/MorphingAction.java
@@ -24,6 +24,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.util.ThrowableRunnable;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,12 +32,14 @@ import java.util.List;
  */
 public class MorphingAction extends AnAction {
   private final DesignerEditorPanel myDesigner;
+  private final EditableArea myArea;
   private final List<RadComponent> myComponents;
   private final MetaModel myTarget;
 
-  public MorphingAction(DesignerEditorPanel designer, List<RadComponent> components, MetaModel target) {
+  public MorphingAction(DesignerEditorPanel designer, EditableArea area, List<RadComponent> components, MetaModel target) {
     super(target.getTag(), null, target.getIcon());
     myDesigner = designer;
+    myArea = area;
     myComponents = components;
     myTarget = target;
   }
@@ -46,9 +49,16 @@ public class MorphingAction extends AnAction {
     myDesigner.getToolProvider().execute(new ThrowableRunnable<Exception>() {
       @Override
       public void run() throws Exception {
+        List<RadComponent> newComponents = new ArrayList<RadComponent>();
+
         for (RadComponent component : myComponents) {
-          component.morphingTo(myTarget);
+          RadComponent newComponent = component.morphingTo(myTarget);
+          if (newComponent != null) {
+            newComponents.add(newComponent);
+          }
         }
+
+        myArea.setSelection(newComponents);
       }
     }, "Run Morphing action", true);
   }
@@ -79,7 +89,7 @@ public class MorphingAction extends AnAction {
 
     DefaultActionGroup morphingGroup = new DefaultActionGroup("Morphing", true);
     for (MetaModel morphingModel : models) {
-      morphingGroup.add(new MorphingAction(designer, selection, morphingModel));
+      morphingGroup.add(new MorphingAction(designer, area, selection, morphingModel));
     }
 
     group.add(morphingGroup);
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java
index b935c5ffdc19..c5ceb44c64ab 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/model/RadComponent.java
@@ -260,7 +260,9 @@ public abstract class RadComponent {
   public void copyTo(Element parentElement) throws Exception {
   }
 
-  public void morphingTo(MetaModel target) throws Exception {
+  @Nullable
+  public RadComponent morphingTo(MetaModel target) throws Exception {
+    return null;
   }
 
   //////////////////////////////////////////////////////////////////////////////////////////

From 2c6b95276ad4b0567d00875e64fb84a187f6fbfc Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Tue, 5 Jun 2012 21:18:17 +0400
Subject: [PATCH 227/239] Fix npe during importing kotlin project

---
 .../idea/maven/importing/MavenModuleImporter.java          | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
index 7a51c9665b5c..207c5ed05f66 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
@@ -17,10 +17,7 @@ package org.jetbrains.idea.maven.importing;
 
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
-import com.intellij.openapi.roots.DependencyScope;
-import com.intellij.openapi.roots.LibraryOrderEntry;
-import com.intellij.openapi.roots.ModifiableRootModel;
-import com.intellij.openapi.roots.OrderRootType;
+import com.intellij.openapi.roots.*;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.JarFileSystem;
@@ -188,7 +185,7 @@ public class MavenModuleImporter {
           rootType = OrderRootType.SOURCES;
         }
         else if ("javadoc".equals(classifier)) {
-          rootType = OrderRootType.DOCUMENTATION;
+          rootType = JavadocOrderRootType.getInstance();
         }
 
         String filePath = artifactElement.getChildTextTrim("file");

From 339d390dd2fbd50d1553e49e9abbee7b7d432864 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Tue, 5 Jun 2012 19:54:46 +0400
Subject: [PATCH 228/239] IDEA-86962 delete mnemonics from "Device" and "Clear
 log" labels

---
 plugins/android/resources/messages/AndroidBundle.properties     | 2 +-
 .../jetbrains/android/logcat/AndroidLogcatToolWindowView.form   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties
index 58e6c4d31fc2..5fba05a4e6f8 100644
--- a/plugins/android/resources/messages/AndroidBundle.properties
+++ b/plugins/android/resources/messages/AndroidBundle.properties
@@ -94,7 +94,7 @@ android.run.configuration.logcat.skip.content.label=&Clear log before launch
 android.avd.error.title=AVD error
 cant.load.avds.error.prefix=Cannot reload AVD list:
 android.logcat.device.label=&Device:
-android.logcat.clear.log.button.title=&Clear log
+android.logcat.clear.log.button.title=Clear log
 android.export.signed.package.action.text=Export Signed Application Package
 android.unable.to.get.output.directory.error=Unable to get the output folder of the project
 android.file.not.exist.error=File {0} doesn't exist
diff --git a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.form b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.form
index 9246bc0f473f..612ade05a828 100644
--- a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.form
+++ b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowView.form
@@ -136,7 +136,7 @@
                     </constraints>
                     <properties>
                       <labelFor value="c3a51"/>
-                      <text value="&amp;Device:"/>
+                      <text value="Device:"/>
                     </properties>
                   </component>
                 </children>

From 68550fa3d6c2eaf6b76f01e558ffa7070af238bd Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Tue, 5 Jun 2012 20:24:50 +0400
Subject: [PATCH 229/239] IDEA-86928 regenerate all sources if sdk was changed

---
 .../src/org/jetbrains/android/facet/AndroidFacet.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java b/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java
index 6cb9d0f20d53..813a3d6592f8 100644
--- a/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java
+++ b/plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java
@@ -479,9 +479,13 @@ public class AndroidFacet extends Facet<AndroidFacetConfiguration> {
 
             final Sdk newSdk = ModuleRootManager.getInstance(getModule()).getSdk();
             if (newSdk != null && newSdk.getSdkType() instanceof AndroidSdkType && !newSdk.equals(myPrevSdk)) {
-              myPrevSdk = newSdk;
               androidPlatformChanged();
+
+              synchronized (myDirtyModes) {
+                myDirtyModes.addAll(Arrays.asList(AndroidAutogeneratorMode.values()));
+              }
             }
+            myPrevSdk = newSdk;
 
             PsiDocumentManager.getInstance(getModule().getProject()).commitAllDocuments();
 

From 264e7c8b46ce2f4b3345f070592021b422364511 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Tue, 5 Jun 2012 20:48:12 +0400
Subject: [PATCH 230/239] clean up, do not choose any build target if it cannot
 be read from xml

---
 .../android/resources/messages/AndroidBundle.properties   | 2 +-
 .../jetbrains/android/sdk/AndroidSdkConfigurableForm.java | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties
index 5fba05a4e6f8..25136fc22d19 100644
--- a/plugins/android/resources/messages/AndroidBundle.properties
+++ b/plugins/android/resources/messages/AndroidBundle.properties
@@ -214,7 +214,7 @@ android.keystore.confirm.password.label=C&onfirm:
 android.export.package.new.key.alias.label=&Alias:
 android.key.password.label=Pa&ssword:
 android.cannot.run.library.project.error=The module cannot be Android library project
-android.compilation.error.specify.platform=Android SDK is not specified for module {0}
+android.compilation.error.specify.platform=[{0}] Android SDK is not specified or cannot be parsed
 android.compilation.error.manifest.not.found=[{0}] AndroidManifest.xml file not found. Please, check Android facet settings.
 android.compilation.error.apt.gen.not.specified=AAPT destination directory not specified for module {0}
 android.compilation.error.apk.path.not.specified=Final APK path not specified for module {0}
diff --git a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java
index ea2c399aa8a0..d9d8d43f00d7 100644
--- a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java
+++ b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java
@@ -16,7 +16,6 @@
 package org.jetbrains.android.sdk;
 
 import com.android.sdklib.IAndroidTarget;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.SdkModel;
 import com.intellij.openapi.projectRoots.SdkModificator;
@@ -24,6 +23,7 @@ import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.ui.OrderRoot;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
@@ -68,6 +68,9 @@ class AndroidSdkConfigurableForm {
         if (value instanceof IAndroidTarget) {
           setText(AndroidSdkUtils.getTargetPresentableName((IAndroidTarget)value));
         }
+        else if (value == null) {
+          setText("<html><font color='red'>[none]</font></html>");
+        }
       }
     });
 
@@ -142,10 +145,11 @@ class AndroidSdkConfigurableForm {
         IAndroidTarget target = (IAndroidTarget)myBuildTargetsModel.getElementAt(i);
         if (buildTarget.hashString().equals(target.hashString())) {
           myBuildTargetComboBox.setSelectedIndex(i);
-          break;
+          return;
         }
       }
     }
+    myBuildTargetComboBox.setSelectedItem(null);
   }
 
   private void updateJdks() {

From fa185d9485077240dd2f67ce62a075a54efe3463 Mon Sep 17 00:00:00 2001
From: Eugene Kudelevsky <Eugene.Kudelevsky@jetbrains.com>
Date: Tue, 5 Jun 2012 21:17:47 +0400
Subject: [PATCH 231/239] IDEA-86892 android-dom: add "rotate" element

---
 .../dom/drawable/AndroidDrawableDomUtil.java   |  3 ++-
 .../InsetOrClipOrScaleDomFileDescription.java  |  2 +-
 .../android/dom/drawable/ListItemBase.java     |  2 ++
 .../dom/drawable/rotateCompletion1.xml         |  4 ++++
 .../dom/drawable/rotateCompletion1_after.xml   |  4 ++++
 .../dom/drawable/rotateCompletion2.xml         |  4 ++++
 .../dom/drawable/rotateHighlighting1.xml       |  9 +++++++++
 .../dom/drawable/rotateHighlighting2.xml       |  7 +++++++
 .../dom/AndroidDrawableResourcesDomTest.java   | 18 +++++++++++++++++-
 9 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 plugins/android/testData/dom/drawable/rotateCompletion1.xml
 create mode 100644 plugins/android/testData/dom/drawable/rotateCompletion1_after.xml
 create mode 100644 plugins/android/testData/dom/drawable/rotateCompletion2.xml
 create mode 100644 plugins/android/testData/dom/drawable/rotateHighlighting1.xml
 create mode 100644 plugins/android/testData/dom/drawable/rotateHighlighting2.xml

diff --git a/plugins/android/src/org/jetbrains/android/dom/drawable/AndroidDrawableDomUtil.java b/plugins/android/src/org/jetbrains/android/dom/drawable/AndroidDrawableDomUtil.java
index 898f5ad629d7..d3f6d4518d67 100644
--- a/plugins/android/src/org/jetbrains/android/dom/drawable/AndroidDrawableDomUtil.java
+++ b/plugins/android/src/org/jetbrains/android/dom/drawable/AndroidDrawableDomUtil.java
@@ -31,7 +31,7 @@ public class AndroidDrawableDomUtil {
   public static final Map<String, String> SPECIAL_STYLEABLE_NAMES = new HashMap<String, String>();
   private static final String[] POSSIBLE_DRAWABLE_ROOTS =
     new String[]{"selector", "bitmap", "nine-patch", "layer-list", "level-list", "transition", "inset", "clip", "scale", "shape",
-      "animation-list", "animated-rotate"};
+      "animation-list", "animated-rotate", "rotate"};
 
   static {
     SPECIAL_STYLEABLE_NAMES.put("selector", "StateListDrawable");
@@ -42,6 +42,7 @@ public class AndroidDrawableDomUtil {
     SPECIAL_STYLEABLE_NAMES.put("clip", "ClipDrawable");
     SPECIAL_STYLEABLE_NAMES.put("scale", "ScaleDrawable");
     SPECIAL_STYLEABLE_NAMES.put("animation-list", "AnimationDrawable");
+    SPECIAL_STYLEABLE_NAMES.put("rotate", "RotateDrawable");
     SPECIAL_STYLEABLE_NAMES.put("animated-rotate", "AnimatedRotateDrawable");
 
     SPECIAL_STYLEABLE_NAMES.put("shape", "GradientDrawable");
diff --git a/plugins/android/src/org/jetbrains/android/dom/drawable/InsetOrClipOrScaleDomFileDescription.java b/plugins/android/src/org/jetbrains/android/dom/drawable/InsetOrClipOrScaleDomFileDescription.java
index f2ca48fc1200..05f5b323dce2 100644
--- a/plugins/android/src/org/jetbrains/android/dom/drawable/InsetOrClipOrScaleDomFileDescription.java
+++ b/plugins/android/src/org/jetbrains/android/dom/drawable/InsetOrClipOrScaleDomFileDescription.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class InsetOrClipOrScaleDomFileDescription extends AndroidResourceDomFileDescription<InsetOrClipOrScale> {
 
-  @NonNls private static final String[] ROOT_TAGS = new String[] {"inset", "clip", "scale", "animated-rotate"};
+  @NonNls private static final String[] ROOT_TAGS = new String[] {"inset", "clip", "scale", "animated-rotate", "rotate"};
 
   public InsetOrClipOrScaleDomFileDescription() {
     super(InsetOrClipOrScale.class, ROOT_TAGS[0], "drawable");
diff --git a/plugins/android/src/org/jetbrains/android/dom/drawable/ListItemBase.java b/plugins/android/src/org/jetbrains/android/dom/drawable/ListItemBase.java
index b1a2834f7352..4e8ff538cc3f 100644
--- a/plugins/android/src/org/jetbrains/android/dom/drawable/ListItemBase.java
+++ b/plugins/android/src/org/jetbrains/android/dom/drawable/ListItemBase.java
@@ -29,4 +29,6 @@ public interface ListItemBase extends DrawableDomElement {
   List<InsetOrClipOrScale> getInsets();
 
   List<InsetOrClipOrScale> getAnimatedRotates();
+
+  List<InsetOrClipOrScale> getRotates();
 }
diff --git a/plugins/android/testData/dom/drawable/rotateCompletion1.xml b/plugins/android/testData/dom/drawable/rotateCompletion1.xml
new file mode 100644
index 000000000000..ad6ea50f2780
--- /dev/null
+++ b/plugins/android/testData/dom/drawable/rotateCompletion1.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDeg<caret>/>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/drawable/rotateCompletion1_after.xml b/plugins/android/testData/dom/drawable/rotateCompletion1_after.xml
new file mode 100644
index 000000000000..ce160d5191ae
--- /dev/null
+++ b/plugins/android/testData/dom/drawable/rotateCompletion1_after.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromDegrees=""/>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/drawable/rotateCompletion2.xml b/plugins/android/testData/dom/drawable/rotateCompletion2.xml
new file mode 100644
index 000000000000..5ab310975500
--- /dev/null
+++ b/plugins/android/testData/dom/drawable/rotateCompletion2.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@<caret>"/>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/drawable/rotateHighlighting1.xml b/plugins/android/testData/dom/drawable/rotateHighlighting1.xml
new file mode 100644
index 000000000000..ed3a7152a3a1
--- /dev/null
+++ b/plugins/android/testData/dom/drawable/rotateHighlighting1.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:fromDegrees="0"
+        android:toDegrees="360"
+        android:visible="<error>0</error>"
+        android:drawable="<error>@drawable/ababa</error>"/>
\ No newline at end of file
diff --git a/plugins/android/testData/dom/drawable/rotateHighlighting2.xml b/plugins/android/testData/dom/drawable/rotateHighlighting2.xml
new file mode 100644
index 000000000000..6e0a8a7c0657
--- /dev/null
+++ b/plugins/android/testData/dom/drawable/rotateHighlighting2.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <rotate android:drawable="@drawable/myDrawable"/>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java
index 34c54686254a..215e981f8e40 100644
--- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java
+++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidDrawableResourcesDomTest.java
@@ -265,13 +265,29 @@ public class AndroidDrawableResourcesDomTest extends AndroidDomTest {
     doTestHighlighting();
   }
 
+  public void testRotateCompletion1() throws Throwable {
+    doTestCompletion();
+  }
+
+  public void testRotateCompletion2() throws Throwable {
+    doTestOnlyDrawableReferences();
+  }
+
+  public void testRotateHighlighting1() throws Throwable {
+    doTestHighlighting();
+  }
+
+  public void testRotateHighlighting2() throws Throwable {
+    doTestHighlighting();
+  }
+
   public void testIncorrectRootTag() throws Throwable {
     doTestHighlighting();
   }
 
   public void testRootTagCompletion() throws Throwable {
     doTestCompletionVariants(getTestName(true) + ".xml", "selector", "bitmap", "nine-patch", "layer-list", "level-list", "transition",
-                             "inset", "clip", "scale", "shape", "animation-list", "animated-rotate");
+                             "inset", "clip", "scale", "shape", "animation-list", "animated-rotate", "rotate");
   }
 
   public void testInlineClip() throws Throwable {

From 2bc65585cafb453d075f47436b860e1a7411aa94 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 5 Jun 2012 19:03:39 +0400
Subject: [PATCH 232/239] inline: exclude non code usages inside inlined
 elements

---
 .../inline/InlineConstantFieldProcessor.java         |  8 +++++++-
 .../refactoring/inline/InlineMethodProcessor.java    | 12 +++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
index e8a94e02374a..ac1ab26c57a5 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldProcessor.java
@@ -105,7 +105,13 @@ public class InlineConstantFieldProcessor extends BaseRefactoringProcessor {
       usages.add(info);
     }
     if (mySearchInCommentsAndStrings || mySearchForTextOccurrences) {
-      TextOccurrencesUtil.UsageInfoFactory nonCodeUsageFactory = new NonCodeUsageInfoFactory(myField, myField.getName());
+      TextOccurrencesUtil.UsageInfoFactory nonCodeUsageFactory = new NonCodeUsageInfoFactory(myField, myField.getName()){
+        @Override
+        public UsageInfo createUsageInfo(@NotNull PsiElement usage, int startOffset, int endOffset) {
+          if (PsiTreeUtil.isAncestor(myField, usage, false)) return null;
+          return super.createUsageInfo(usage, startOffset, endOffset);
+        }
+      };
       if (mySearchInCommentsAndStrings) {
         String stringToSearch =
           ElementDescriptionUtil.getElementDescription(myField, NonCodeSearchDescriptionLocation.STRINGS_AND_COMMENTS);
diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
index 873ebab9d542..ce76e8bc97a0 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineMethodProcessor.java
@@ -131,16 +131,22 @@ public class InlineMethodProcessor extends BaseRefactoringProcessor {
     }
 
     if (mySearchInComments || mySearchForTextOccurrences) {
-      
+      final NonCodeUsageInfoFactory infoFactory = new NonCodeUsageInfoFactory(myMethod, myMethod.getName()) {
+        @Override
+        public UsageInfo createUsageInfo(@NotNull PsiElement usage, int startOffset, int endOffset) {
+          if (PsiTreeUtil.isAncestor(myMethod, usage, false)) return null;
+          return super.createUsageInfo(usage, startOffset, endOffset);
+        }
+      };
       if (mySearchInComments) {
         String stringToSearch = ElementDescriptionUtil.getElementDescription(myMethod, NonCodeSearchDescriptionLocation.STRINGS_AND_COMMENTS);
-        TextOccurrencesUtil.addUsagesInStringsAndComments(myMethod, stringToSearch, usages, new NonCodeUsageInfoFactory(myMethod, myMethod.getName()));
+        TextOccurrencesUtil.addUsagesInStringsAndComments(myMethod, stringToSearch, usages, infoFactory);
       }
 
       if (mySearchForTextOccurrences) {
         String stringToSearch = ElementDescriptionUtil.getElementDescription(myMethod, NonCodeSearchDescriptionLocation.NON_JAVA);
         TextOccurrencesUtil
-          .addTextOccurences(myMethod, stringToSearch, GlobalSearchScope.projectScope(myProject), usages, new NonCodeUsageInfoFactory(myMethod, myMethod.getName()));
+          .addTextOccurences(myMethod, stringToSearch, GlobalSearchScope.projectScope(myProject), usages, infoFactory);
       }
     }
 

From a36e232514a02d645c34ed4fe83ebff6c8197cb9 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 5 Jun 2012 20:57:48 +0400
Subject: [PATCH 233/239] inline field: allow inline non-final fields without
 writable access (IDEA-73025)

---
 .../inline/InlineConstantFieldHandler.java    | 42 +++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java
index 7a2c06d6bdd5..c2b22629b613 100644
--- a/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineConstantFieldHandler.java
@@ -18,14 +18,19 @@ package com.intellij.refactoring.inline;
 import com.intellij.codeInsight.TargetElementUtilBase;
 import com.intellij.lang.StdLanguages;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Ref;
 import com.intellij.psi.*;
 import com.intellij.psi.search.ProjectScope;
 import com.intellij.psi.search.searches.ReferencesSearch;
+import com.intellij.psi.util.PsiUtil;
 import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
 
+import java.util.Collection;
+
 /**
  * @author ven
  */
@@ -37,14 +42,7 @@ public class InlineConstantFieldHandler extends JavaInlineActionHandler {
   }
 
   public void inlineElement(Project project, Editor editor, PsiElement element) {
-    PsiField field = (PsiField) element;
-    if (!CommonRefactoringUtil.checkReadOnlyStatus(project, field)) return;
-
-    if (!field.hasModifierProperty(PsiModifier.FINAL)) {
-      String message = RefactoringBundle.message("0.refactoring.is.supported.only.for.final.fields", REFACTORING_NAME);
-      CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.INLINE_FIELD);
-      return;
-    }
+    final PsiField field = (PsiField) element;
 
     if (!field.hasInitializer()) {
       String message = RefactoringBundle.message("no.initializer.present.for.the.field");
@@ -64,15 +62,35 @@ public class InlineConstantFieldHandler extends JavaInlineActionHandler {
       return;
     }
 
+    if (!field.hasModifierProperty(PsiModifier.FINAL)) {
+      final Ref<Boolean> hasWriteUsages = new Ref<Boolean>(false);
+      if (!ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() {
+        @Override
+        public void run() {
+          for (PsiReference reference : ReferencesSearch.search(field)) {
+            final PsiElement referenceElement = reference.getElement();
+            if (!(referenceElement instanceof PsiExpression && PsiUtil.isAccessedForReading((PsiExpression)referenceElement))) {
+              hasWriteUsages.set(true);
+              break;
+            }
+          }
+        }
+      }, "Check if inline is possible...", true, project)) {
+        return;
+      }
+      if (hasWriteUsages.get()) {
+        String message = RefactoringBundle.message("0.refactoring.is.supported.only.for.final.fields", REFACTORING_NAME);
+        CommonRefactoringUtil.showErrorHint(project, editor, message, REFACTORING_NAME, HelpID.INLINE_FIELD);
+        return;
+      }
+    }
+
     PsiReference reference = editor != null ? TargetElementUtilBase.findReference(editor, editor.getCaretModel().getOffset()) : null;
     if (reference != null && !field.equals(reference.resolve())) {
       reference = null;
     }
 
-    final boolean invokedOnReference = (reference != null);
-    if (!invokedOnReference) {
-      if (!CommonRefactoringUtil.checkReadOnlyStatus(project, field)) return;
-    }
+    if (!CommonRefactoringUtil.checkReadOnlyStatus(project, field)) return;
     PsiReferenceExpression refExpression = reference instanceof PsiReferenceExpression ? (PsiReferenceExpression)reference : null;
     InlineFieldDialog dialog = new InlineFieldDialog(project, field, refExpression);
     dialog.show();

From c90439932187744d63484fa99a2d2969ddb93753 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 5 Jun 2012 21:24:43 +0400
Subject: [PATCH 234/239] provide local quick fixes for default highlighting
 inspection if possible

---
 .../daemon/impl/quickfix/AddTypeCastFix.java  | 22 ++++++++++------
 ...efaultHighlightVisitorBasedInspection.java |  5 ++--
 .../codeInspection/GlobalInspectionUtil.java  | 25 ++++++++++++++-----
 .../XmlHighlightVisitorBasedInspection.java   |  4 +--
 4 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java
index 0d5b7802b9e8..5966fbf38d36 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddTypeCastFix.java
@@ -27,6 +27,7 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.daemon.QuickFixBundle;
 import com.intellij.codeInsight.intention.IntentionAction;
+import com.intellij.codeInspection.LocalQuickFixAndIntentionActionOnPsiElement;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
@@ -35,14 +36,14 @@ import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class AddTypeCastFix implements IntentionAction {
+public class AddTypeCastFix extends LocalQuickFixAndIntentionActionOnPsiElement {
   private final PsiType myType;
-  private final PsiExpression myExpression;
 
   public AddTypeCastFix(PsiType type, PsiExpression expression) {
+    super(expression);
     myType = type;
-    myExpression = expression;
   }
 
   @Override
@@ -58,14 +59,21 @@ public class AddTypeCastFix implements IntentionAction {
   }
 
   @Override
-  public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
-    return myType.isValid() && myExpression.isValid() && myExpression.getManager().isInProject(myExpression);
+  public boolean isAvailable(@NotNull Project project,
+                             @NotNull PsiFile file,
+                             @NotNull PsiElement startElement,
+                             @NotNull PsiElement endElement) {
+    return myType.isValid() && startElement.isValid() && startElement.getManager().isInProject(startElement);
   }
 
   @Override
-  public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
+  public void invoke(@NotNull Project project,
+                     @NotNull PsiFile file,
+                     @Nullable("is null when called from inspection") Editor editor,
+                     @NotNull PsiElement startElement,
+                     @NotNull PsiElement endElement) {
     if (!CodeInsightUtilBase.prepareFileForWrite(file)) return;
-    addTypeCast(project, myExpression, myType);
+    addTypeCast(project, (PsiExpression)startElement, myType);
   }
 
   private static void addTypeCast(Project project, PsiExpression originalExpression, PsiType type) throws IncorrectOperationException {
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/DefaultHighlightVisitorBasedInspection.java b/platform/lang-impl/src/com/intellij/codeInspection/DefaultHighlightVisitorBasedInspection.java
index 2bb0ff86c664..935c80220789 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/DefaultHighlightVisitorBasedInspection.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/DefaultHighlightVisitorBasedInspection.java
@@ -19,6 +19,7 @@ package com.intellij.codeInspection;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
 import com.intellij.codeInsight.daemon.impl.*;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder;
+import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Document;
@@ -108,10 +109,10 @@ public abstract class DefaultHighlightVisitorBasedInspection extends GlobalSimpl
       if (element == null) {
         element = file;
       }
+      
       GlobalInspectionUtil.createProblem(
         element,
-        info.description,
-        HighlightInfo.convertType(info.type),
+        info,
         range.shiftRight(-element.getNode().getStartOffset()),
         info.getProblemGroup(),
         manager,
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/GlobalInspectionUtil.java b/platform/lang-impl/src/com/intellij/codeInspection/GlobalInspectionUtil.java
index 04214ea5be0b..6ddaf3ead1b0 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/GlobalInspectionUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/GlobalInspectionUtil.java
@@ -16,13 +16,19 @@
 
 package com.intellij.codeInspection;
 
+import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.reference.RefElement;
 import com.intellij.lang.injection.InjectedLanguageManager;
+import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * User: Maxim.Mossienko
  * Date: 16.09.2009
@@ -46,15 +52,22 @@ public class GlobalInspectionUtil {
     return message + LOC_MARKER;
   }
 
-  public static void createProblem(PsiElement elt, String message, ProblemHighlightType problemHighlightType, TextRange range,
+  public static void createProblem(PsiElement elt, HighlightInfo info, TextRange range,
                                    @Nullable String problemGroup,
                                    InspectionManager manager, ProblemDescriptionsProcessor problemDescriptionsProcessor,
                                    GlobalInspectionContext globalContext) {
-    ProblemDescriptor descriptor = manager.createProblemDescriptor(
-      elt,
-      range,
-      createInspectionMessage(message),
-      problemHighlightType, false);
+    List<LocalQuickFix> fixes = new ArrayList<LocalQuickFix>();
+    if (info.quickFixActionRanges != null) {
+      for (Pair<HighlightInfo.IntentionActionDescriptor, TextRange> actionRange : info.quickFixActionRanges) {
+        final IntentionAction action = actionRange.getFirst().getAction();
+        if (action instanceof LocalQuickFix) {
+          fixes.add((LocalQuickFix)action);
+        }
+      }
+    }
+    ProblemDescriptor descriptor = manager.createProblemDescriptor(elt, range, createInspectionMessage(info.description),
+                                                                   HighlightInfo.convertType(info.type), false,
+                                                                   fixes.isEmpty() ? null : fixes.toArray(new LocalQuickFix[fixes.size()]));
     descriptor.setProblemGroup(problemGroup);
     problemDescriptionsProcessor.addProblemElement(
       retrieveRefElement(elt, globalContext),
diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java
index 34fa3bc3ac1b..50a9665f00e0 100644
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java
@@ -47,11 +47,9 @@ public class XmlHighlightVisitorBasedInspection extends GlobalSimpleInspectionTo
       @Override
       public boolean add(@Nullable HighlightInfo info) {
         if (info != null) {
-          ProblemHighlightType problemHighlightType = HighlightInfo.convertType(info.type);
           GlobalInspectionUtil.createProblem(
             file,
-            info.description,
-            problemHighlightType,
+            info,
             new TextRange(info.startOffset, info.endOffset),
             null,
             manager,

From 89d52d3a9e93b55c16f0e1536e9fe7e87474a08a Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 5 Jun 2012 13:06:28 +0400
Subject: [PATCH 235/239] Cleanup

---
 .../lang/java/parser/DeclarationParser.java   |  3 +--
 .../lang/java/parser/ExpressionParser.java    | 23 ++++++++-----------
 .../lang/java/parser/ReferenceParser.java     |  3 +--
 .../lang/java/parser/StatementParser.java     |  6 ++---
 .../src/com/intellij/lang/PsiBuilderUtil.java | 23 +++++--------------
 5 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
index 6004f0836481..daf235f7f142 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
@@ -30,7 +30,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.PropertyKey;
 
 import static com.intellij.lang.PsiBuilderUtil.expect;
-import static com.intellij.lang.PsiBuilderUtil.nextTokenType;
 import static com.intellij.lang.java.parser.JavaParserUtil.*;
 
 public class DeclarationParser {
@@ -386,7 +385,7 @@ public class DeclarationParser {
         isEmpty = false;
       }
       else if (tokenType == JavaTokenType.AT) {
-        if (ElementType.KEYWORD_BIT_SET.contains(nextTokenType(builder))) {
+        if (ElementType.KEYWORD_BIT_SET.contains(builder.lookAhead(1))) {
           break;
         }
         parseAnnotation(builder);
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
index 1f535f70b8e8..3da15c602a4b 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
@@ -59,6 +59,8 @@ public class ExpressionParser {
   private static final TokenSet ARGS_LIST_CONTINUE = TokenSet.create(
     JavaTokenType.IDENTIFIER, TokenType.BAD_CHARACTER, JavaTokenType.COMMA, JavaTokenType.INTEGER_LITERAL, JavaTokenType.STRING_LITERAL);
   private static final TokenSet THIS_OR_SUPER = TokenSet.create(JavaTokenType.THIS_KEYWORD, JavaTokenType.SUPER_KEYWORD);
+  private static final TokenSet TYPE_START = TokenSet.orSet(
+    ElementType.PRIMITIVE_TYPE_BIT_SET, TokenSet.create(JavaTokenType.IDENTIFIER, JavaTokenType.AT));
 
   private final JavaParser myParser;
 
@@ -263,20 +265,16 @@ public class ExpressionParser {
       final PsiBuilder.Marker typeCast = builder.mark();
       builder.advanceLexer();
 
-      final ReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(builder,
-                                                                                            ReferenceParser.EAT_LAST_DOT |
-                                                                                            ReferenceParser.WILDCARD);
-
+      final ReferenceParser.TypeInfo typeInfo =
+        myParser.getReferenceParser().parseTypeInfo(builder, ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD);
       if (typeInfo == null || !expect(builder, JavaTokenType.RPARENTH)) {
         typeCast.rollbackTo();
         return parsePostfix(builder);
       }
 
-      if (PREF_ARITHMETIC_OPS.contains(builder.getTokenType())) {
-        if (!typeInfo.isPrimitive) {
-          typeCast.rollbackTo();
-          return parsePostfix(builder);
-        }
+      if (PREF_ARITHMETIC_OPS.contains(builder.getTokenType()) && !typeInfo.isPrimitive) {
+        typeCast.rollbackTo();
+        return parsePostfix(builder);
       }
 
       final PsiBuilder.Marker expr = parseUnary(builder);
@@ -537,13 +535,12 @@ public class ExpressionParser {
       return parseArrayInitializer(builder);
     }
 
-    if (ElementType.PRIMITIVE_TYPE_BIT_SET.contains(tokenType) || tokenType == JavaTokenType.IDENTIFIER) {
-      final boolean primitive = tokenType != JavaTokenType.IDENTIFIER;
+    if (TYPE_START.contains(tokenType)) {
       final PsiBuilder.Marker mark = builder.mark();
 
       final ReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(builder, 0);
-      if (typeInfo != null && (primitive || !typeInfo.hasErrors && typeInfo.isParameterized)) {
-        final PsiBuilder.Marker result = continueClassAccessOrMethodReference(builder, mark, primitive);
+      if (typeInfo != null && (typeInfo.isPrimitive || !typeInfo.hasErrors && typeInfo.isParameterized)) {
+        final PsiBuilder.Marker result = continueClassAccessOrMethodReference(builder, mark, typeInfo.isPrimitive);
         if (result != null) return result;
       }
 
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
index 3b9058ee6134..0555b567fcaa 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java
@@ -26,7 +26,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import static com.intellij.lang.PsiBuilderUtil.expect;
-import static com.intellij.lang.PsiBuilderUtil.nextTokenType;
 import static com.intellij.lang.java.parser.JavaParserUtil.*;
 import static com.intellij.util.BitUtil.isSet;
 
@@ -317,7 +316,7 @@ public class ReferenceParser {
     if (!expect(builder, JavaTokenType.GT)) {
       // hack for completion
       if (builder.getTokenType() == JavaTokenType.IDENTIFIER) {
-        if (nextTokenType(builder) == JavaTokenType.GT) {
+        if (builder.lookAhead(1) == JavaTokenType.GT) {
           final PsiBuilder.Marker errorElement = builder.mark();
           builder.advanceLexer();
           errorElement.error(JavaErrorMessages.message("unexpected.identifier"));
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java
index c97c875c0796..47e48e99547d 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java
@@ -147,7 +147,7 @@ public class StatementParser {
           return;
         }
         else if (braceMode == BraceMode.TILL_LAST) {
-          if (nextTokenType(builder) == null) {
+          if (builder.lookAhead(1) == null) {
             return;
           }
         }
@@ -288,7 +288,7 @@ public class StatementParser {
       return statement;
     }
 
-    if (lookAhead(builder, JavaTokenType.IDENTIFIER, JavaTokenType.COLON)) {
+    if (builder.getTokenType() == JavaTokenType.IDENTIFIER && builder.lookAhead(1) == JavaTokenType.COLON) {
       final PsiBuilder.Marker statement = builder.mark();
       advance(builder, 2);
       parseStatement(builder);
@@ -309,7 +309,7 @@ public class StatementParser {
 
   private static void skipQualifiedName(final PsiBuilder builder) {
     if (!expect(builder, JavaTokenType.IDENTIFIER)) return;
-    while (lookAhead(builder, JavaTokenType.DOT, JavaTokenType.IDENTIFIER)) {
+    while (builder.getTokenType() == JavaTokenType.DOT && builder.lookAhead(1) == JavaTokenType.IDENTIFIER) {
       advance(builder, 2);
     }
   }
diff --git a/platform/core-api/src/com/intellij/lang/PsiBuilderUtil.java b/platform/core-api/src/com/intellij/lang/PsiBuilderUtil.java
index 26c9ffbc6f08..c9a0a17ea159 100644
--- a/platform/core-api/src/com/intellij/lang/PsiBuilderUtil.java
+++ b/platform/core-api/src/com/intellij/lang/PsiBuilderUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,33 +19,22 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.Nullable;
 
-
 public class PsiBuilderUtil {
   private PsiBuilderUtil() { }
 
   /**
-   * Returns type of next token.
-   *
-   * @param builder PSI builder to operate on.
-   * @return type of next token or null, if the builder is at the end of token stream
+   * @deprecated use {@linkplain PsiBuilder#lookAhead(int)} (to remove in IDEA 13)
    */
+  @SuppressWarnings("UnusedDeclaration")
   @Nullable
   public static IElementType nextTokenType(final PsiBuilder builder) {
-    if (builder.getTokenType() == null) return null;
-    final PsiBuilder.Marker sp = builder.mark();
-    builder.advanceLexer();
-    final IElementType result = builder.getTokenType();
-    sp.rollbackTo();
-    return result;
+    return builder.lookAhead(1);
   }
 
   /**
-   * Checks if tokens in token stream form expected sequence.
-   *
-   * @param builder PSI builder to operate on.
-   * @param tokenTypes expected elements.
-   * @return true if tokens form expected sequence, false otherwise
+   * @deprecated use {@linkplain PsiBuilder#lookAhead(int)} (to remove in IDEA 13)
    */
+  @SuppressWarnings("UnusedDeclaration")
   public static boolean lookAhead(final PsiBuilder builder, final IElementType... tokenTypes) {
     if (tokenTypes.length == 0) return true;
 

From b3de9ce33f8804ae73b2640a6550734f02812035 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 5 Jun 2012 15:34:04 +0400
Subject: [PATCH 236/239] Cleanup

---
 .../com/intellij/psi/PsiBinaryExpression.java |  4 +--
 .../src/com/intellij/psi/PsiVariable.java     | 27 ++++++++++---------
 .../intellij/psi/stubs/LightStubBuilder.java  | 10 +++----
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/psi/PsiBinaryExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiBinaryExpression.java
index 438863ae681b..107c02f87b67 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiBinaryExpression.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiBinaryExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ import com.intellij.psi.tree.IElementType;
  * Represents a Java binary expression (addition, multiplication and so on).
  * N.B Please use {@link PsiPolyadicExpression} instead as a more general form of an infix operator-expression.
  */
-public interface PsiBinaryExpression extends PsiExpression, PsiPolyadicExpression {
+public interface PsiBinaryExpression extends PsiPolyadicExpression {
   /**
    * Returns the left operand of the expression.
    *
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiVariable.java b/java/java-psi-api/src/com/intellij/psi/PsiVariable.java
index 4d6a71ab6d62..7b1a768d1805 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiVariable.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiVariable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,8 @@ public interface PsiVariable extends PsiModifierListOwner, PsiNameIdentifierOwne
    *
    * @return the variable type.
    */
-  @NotNull PsiType getType();
+  @NotNull
+  PsiType getType();
 
   /**
    * Returns the type element declaring the type of the variable.
@@ -46,15 +47,15 @@ public interface PsiVariable extends PsiModifierListOwner, PsiNameIdentifierOwne
    * @return the initializer expression, or null if it has no initializer.
    * @see {@link #hasInitializer()}
    */
-  @Nullable PsiExpression getInitializer();
+  @Nullable
+  PsiExpression getInitializer();
 
   /**
-   * Checks if the variable has an initializer.
+   * <p>Checks if the variable has an initializer.</p>
+   * <p>Please note that even when {@link #hasInitializer()} returns true, {@link #getInitializer()} still can return null,
+   * e.g. for implicit initializer in case of enum constant declaration.</p>
    *
-   * @return true if the variable has an initializer, false otherwise
-   *
-   * Please note that even when {@link #hasInitializer()} returns true, {@link #getInitializer()} still can return null,
-   *  e.g. for implicit initializer in case of enum constant declaration
+   * @return true if the variable has an initializer, false otherwise.
    */
   boolean hasInitializer();
 
@@ -63,7 +64,7 @@ public interface PsiVariable extends PsiModifierListOwner, PsiNameIdentifierOwne
    * other declarations. Also, if the variable is an array, ensures that the array
    * brackets are used in Java style (<code>int[] a</code>)
    * and not in C style (<code> int a[]</code>).
-   * 
+   *
    * @throws IncorrectOperationException if the modification fails for some reason.
    */
   void normalizeDeclaration() throws IncorrectOperationException; // Q: split into normalizeBrackets and splitting declarations?
@@ -72,9 +73,10 @@ public interface PsiVariable extends PsiModifierListOwner, PsiNameIdentifierOwne
    * Calculates and returns the constant value of the variable initializer.
    *
    * @return the calculated value, or null if the variable has no initializer or
-   * the initializer does not evaluate to a constant.
+   *         the initializer does not evaluate to a constant.
    */
-  @Nullable Object computeConstantValue();
+  @Nullable
+  Object computeConstantValue();
 
   /**
    * Returns the identifier declaring the name of the variable.
@@ -82,7 +84,8 @@ public interface PsiVariable extends PsiModifierListOwner, PsiNameIdentifierOwne
    * @return the variable name identifier.
    */
   @Override
-  @Nullable PsiIdentifier getNameIdentifier();
+  @Nullable
+  PsiIdentifier getNameIdentifier();
 
   @Override
   PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException;
diff --git a/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
index 0e0adf8bc83e..7d4761cb9b15 100644
--- a/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
+++ b/platform/core-api/src/com/intellij/psi/stubs/LightStubBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,10 +154,10 @@ public class LightStubBuilder implements StubBuilder {
     return skipChildProcessingWhenBuildingStubs(parent != null ? parent.getElementType() : null, childType);
   }
 
-  public boolean skipChildProcessingWhenBuildingStubs(LightStubBuilder builder,
-                                                       LighterAST tree,
-                                                       final LighterASTNode parent,
-                                                       final LighterASTNode child) {
+  public boolean skipChildProcessingWhenBuildingStubs(final LightStubBuilder builder,
+                                                      final LighterAST tree,
+                                                      final LighterASTNode parent,
+                                                      final LighterASTNode child) {
     return false;
   }
 

From 6ea4c06d8f868190ef3ee863e67cef86a2d6820d Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 5 Jun 2012 21:49:11 +0400
Subject: [PATCH 237/239] Lambda expressions support: first round

---
 .../daemon/impl/analysis/HighlightUtil.java   |  12 +-
 .../impl/analysis/HighlightVisitorImpl.java   |   8 +-
 .../codeStyle/JavaCodeStyleManagerImpl.java   | 197 +++++++-----------
 .../com/intellij/psi/JavaElementVisitor.java  |   4 +
 .../com/intellij/psi/PsiLambdaExpression.java |  40 ++++
 .../intellij/psi/PsiLambdaExpressionType.java |  73 +++++++
 .../intellij/psi/PsiLambdaParameterType.java  |  73 +++++++
 .../intellij/psi/PsiMethodReferenceType.java  |   2 +-
 .../src/com/intellij/psi/PsiTypeVisitor.java  |   4 -
 .../intellij/psi/util/TypeConversionUtil.java |   1 +
 .../lang/java/parser/DeclarationParser.java   |  77 ++++---
 .../lang/java/parser/ExpressionParser.java    |  43 ++++
 .../psi/impl/source/JavaLightStubBuilder.java |  21 +-
 .../psi/impl/source/PsiFieldImpl.java         |   4 +-
 .../psi/impl/source/PsiParameterImpl.java     |  29 ++-
 .../psi/impl/source/tree/ElementType.java     |   2 +-
 .../psi/impl/source/tree/JavaElementType.java |   1 +
 .../impl/source/tree/JavaSharedImplUtil.java  |  51 ++---
 .../tree/java/PsiLambdaExpressionImpl.java    |  59 ++++++
 .../tree/java/PsiLocalVariableImpl.java       |   4 +-
 .../tree/java/ReplaceExpressionUtil.java      |   1 +
 .../src/messages/JavaErrorMessages.properties |   1 +
 .../advHighlighting/UnsupportedFeatures.java  |   4 +-
 .../advHighlighting7/LambdaExpressions.java   |  28 +++
 .../expressions/LambdaExpression0.txt         |  12 ++
 .../expressions/LambdaExpression1.txt         |  12 ++
 .../expressions/LambdaExpression10.txt        |  23 ++
 .../expressions/LambdaExpression11.txt        |  12 ++
 .../expressions/LambdaExpression2.txt         |  14 ++
 .../expressions/LambdaExpression3.txt         |  16 ++
 .../expressions/LambdaExpression4.txt         |  20 ++
 .../expressions/LambdaExpression5.txt         |  21 ++
 .../expressions/LambdaExpression6.txt         |  22 ++
 .../expressions/LambdaExpression7.txt         |  15 ++
 .../expressions/LambdaExpression8.txt         |  22 ++
 .../expressions/LambdaExpression9.txt         |  20 ++
 .../daemon/LightAdvHighlightingJdk7Test.java  |   1 +
 .../parser/partial/ExpressionParserTest.java  |  13 ++
 .../com/intellij/psi/JavaStubBuilderTest.java |   4 +-
 39 files changed, 750 insertions(+), 216 deletions(-)
 create mode 100644 java/java-psi-api/src/com/intellij/psi/PsiLambdaExpression.java
 create mode 100644 java/java-psi-api/src/com/intellij/psi/PsiLambdaExpressionType.java
 create mode 100644 java/java-psi-api/src/com/intellij/psi/PsiLambdaParameterType.java
 create mode 100644 java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression0.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression1.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression10.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression11.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression2.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression3.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression4.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression5.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression6.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression7.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression8.txt
 create mode 100644 java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression9.txt

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index ae6c0ba206e0..09b879bb2b81 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -2540,7 +2540,8 @@ public class HighlightUtil {
     BIN_LITERALS(LanguageLevel.JDK_1_7, "feature.binary.literals"),
     UNDERSCORES(LanguageLevel.JDK_1_7, "feature.underscores.in.literals"),
     EXTENSION_METHODS(LanguageLevel.JDK_1_8, "feature.extension.methods"),
-    METHOD_REFERENCES(LanguageLevel.JDK_1_8, "feature.method.references");
+    METHOD_REFERENCES(LanguageLevel.JDK_1_8, "feature.method.references"),
+    LAMBDA_EXPRESSIONS(LanguageLevel.JDK_1_8, "feature.lambda.expressions");
 
     private final LanguageLevel level;
     private final String key;
@@ -2617,4 +2618,13 @@ public class HighlightUtil {
     final String message = "Method references type check is not yet implemented";
     return HighlightInfo.createHighlightInfo(HighlightInfoType.WEAK_WARNING, expression, message);
   }
+
+  @Nullable
+  public static HighlightInfo checkLambdaFeature(final PsiLambdaExpression expression) {
+    final HighlightInfo info = checkFeature(expression, Feature.LAMBDA_EXPRESSIONS);
+    if (info != null) return info;
+    // todo[r.sh] stub; remove after implementing support in TypeConversionUtil
+    final String message = "Lambda expressions type check is not yet implemented";
+    return HighlightInfo.createHighlightInfo(HighlightInfoType.WEAK_WARNING, expression, message);
+  }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
index b857ebfe536a..00021004bb24 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
@@ -234,7 +234,13 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
     if (!myHolder.hasErrorResults()) myHolder.add(HighlightUtil.checkPolyadicOperatorApplicable(expression));
   }
 
-  @Override public void visitBreakStatement(PsiBreakStatement statement) {
+  @Override
+  public void visitLambdaExpression(PsiLambdaExpression expression) {
+    myHolder.add(HighlightUtil.checkLambdaFeature(expression));
+  }
+
+  @Override
+  public void visitBreakStatement(PsiBreakStatement statement) {
     super.visitBreakStatement(statement);
     if (!myHolder.hasErrorResults()) {
       myHolder.add(HighlightUtil.checkLabelDefined(statement.getLabelIdentifier(), statement.findExitedStatement()));
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
index 4e07dc9cf8fa..55d19be86fc5 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/JavaCodeStyleManagerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,12 +48,11 @@ import java.util.*;
 public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
   private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.JavaCodeStyleManagerImpl");
 
-  @NonNls private static final String IMPL_TYPNAME_SUFFIX = "Impl";
+  @NonNls private static final String IMPL_SUFFIX = "Impl";
   @NonNls private static final String GET_PREFIX = "get";
   @NonNls private static final String IS_PREFIX = "is";
   @NonNls private static final String FIND_PREFIX = "find";
   @NonNls private static final String CREATE_PREFIX = "create";
-  @NonNls private static final String WITH_PREFIX = "with";
   @NonNls private static final String SET_PREFIX = "set";
 
   private final Project myProject;
@@ -72,9 +71,10 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
     CheckUtil.checkWritable(element);
     if (!SourceTreeToPsiMap.hasTreeElement(element)) return element;
 
-    return SourceTreeToPsiMap.treeElementToPsi(
-      new ReferenceAdjuster(myProject).process((TreeElement)element.getNode(), (flags & DO_NOT_ADD_IMPORTS) == 0,
-                                               (flags & UNCOMPLETE_CODE) != 0));
+    final boolean addImports = (flags & DO_NOT_ADD_IMPORTS) == 0;
+    final boolean incompleteCode = (flags & UNCOMPLETE_CODE) != 0;
+    final TreeElement reference = new ReferenceAdjuster(myProject).process((TreeElement)element.getNode(), addImports, incompleteCode);
+    return SourceTreeToPsiMap.treeToPsiNotNull(reference);
   }
 
   @Override
@@ -88,7 +88,8 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
 
   @Override
   public PsiElement qualifyClassReferences(@NotNull PsiElement element) {
-    return SourceTreeToPsiMap.treeElementToPsi(new ReferenceAdjuster(true, true).process((TreeElement)element.getNode(), false, false));
+    final TreeElement reference = new ReferenceAdjuster(true, true).process((TreeElement)element.getNode(), false, false);
+    return SourceTreeToPsiMap.treeToPsiNotNull(reference);
   }
 
   @Override
@@ -117,10 +118,10 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
 
   @Override
   public void removeRedundantImports(@NotNull final PsiJavaFile file) throws IncorrectOperationException {
-    final Collection<PsiImportStatementBase> redundants = findRedundantImports(file);
-    if (redundants == null) return;
+    final Collection<PsiImportStatementBase> redundant = findRedundantImports(file);
+    if (redundant == null) return;
 
-    for (final PsiImportStatementBase importStatement : redundants) {
+    for (final PsiImportStatementBase importStatement : redundant) {
       final PsiJavaCodeReferenceElement ref = importStatement.getImportReference();
       //Do not remove non-resolving refs
       if (ref == null || ref.resolve() == null) {
@@ -140,20 +141,21 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
     if( imports.length == 0 ) return null;
 
     Set<PsiImportStatementBase> allImports = new THashSet<PsiImportStatementBase>(Arrays.asList(imports));
-    final Collection<PsiImportStatementBase> redundants;
+    final Collection<PsiImportStatementBase> redundant;
     if (JspPsiUtil.isInJspFile(file)) {
       // remove only duplicate imports
-      redundants = new THashSet<PsiImportStatementBase>(TObjectHashingStrategy.IDENTITY);
-      ContainerUtil.addAll(redundants, imports);
-      redundants.removeAll(allImports);
+      @SuppressWarnings("unchecked") final TObjectHashingStrategy<PsiImportStatementBase> strategy = TObjectHashingStrategy.IDENTITY;
+      redundant = new THashSet<PsiImportStatementBase>(strategy);
+      ContainerUtil.addAll(redundant, imports);
+      redundant.removeAll(allImports);
       for (PsiImportStatementBase importStatement : imports) {
         if (importStatement instanceof JspxImportStatement && ((JspxImportStatement)importStatement).isForeignFileImport()) {
-          redundants.remove(importStatement);
+          redundant.remove(importStatement);
         }
       }
     }
     else {
-      redundants = allImports;
+      redundant = allImports;
       final List<PsiFile> roots = file.getViewProvider().getAllFiles();
       for (PsiElement root : roots) {
         root.accept(new JavaRecursiveElementWalkingVisitor() {
@@ -164,7 +166,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
                 final PsiElement resolveScope = resolveResult.getCurrentFileResolveScope();
                 if (resolveScope instanceof PsiImportStatementBase) {
                   final PsiImportStatementBase importStatementBase = (PsiImportStatementBase)resolveScope;
-                  redundants.remove(importStatementBase);
+                  redundant.remove(importStatementBase);
                 }
               }
             }
@@ -183,7 +185,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
         });
       }
     }
-    return redundants;
+    return redundant;
   }
 
   @Override
@@ -334,9 +336,10 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
 
   private void suggestNamesForCollectionInheritors(final PsiType type,
                                                    final VariableKind variableKind,
-                                                   Collection<String> suggestions, boolean correctKeywords) {
+                                                   final Collection<String> suggestions,
+                                                   final boolean correctKeywords) {
     PsiType componentType = PsiUtil.extractIterableTypeParameter(type, false);
-    if( componentType == null ) {
+    if (componentType == null) {
       return;
     }
     String typeName = normalizeTypeName(getTypeName(componentType));
@@ -347,12 +350,11 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
 
   @Nullable
   private static String normalizeTypeName(String typeName) {
-    if( typeName == null )
-    {
+    if (typeName == null) {
       return null;
     }
-    if (typeName.endsWith(IMPL_TYPNAME_SUFFIX) && typeName.length() > IMPL_TYPNAME_SUFFIX.length()) {
-      return typeName.substring(0, typeName.length() - IMPL_TYPNAME_SUFFIX.length());
+    if (typeName.endsWith(IMPL_SUFFIX) && typeName.length() > IMPL_SUFFIX.length()) {
+      return typeName.substring(0, typeName.length() - IMPL_SUFFIX.length());
     }
     return typeName;
   }
@@ -363,47 +365,27 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
     if (type instanceof PsiClassType) {
       final PsiClassType classType = (PsiClassType)type;
       final String className = classType.getClassName();
-      if (className != null) {
-        return className;
-      }
-      else {
-        final PsiClass aClass = classType.resolve();
-        if (aClass instanceof PsiAnonymousClass) {
-          return ((PsiAnonymousClass)aClass).getBaseClassType().getClassName();
-        }
-        else {
-          return null;
-        }
-      }
+      if (className != null) return className;
+      final PsiClass aClass = classType.resolve();
+      return aClass instanceof PsiAnonymousClass ? ((PsiAnonymousClass)aClass).getBaseClassType().getClassName() : null;
+    }
+    else if (type instanceof PsiPrimitiveType) {
+      return type.getPresentableText();
+    }
+    else if (type instanceof PsiWildcardType) {
+      return getTypeName(((PsiWildcardType)type).getExtendsBound());
+    }
+    else if (type instanceof PsiIntersectionType) {
+      return getTypeName(((PsiIntersectionType)type).getRepresentative());
+    }
+    else if (type instanceof PsiCapturedWildcardType) {
+      return getTypeName(((PsiCapturedWildcardType)type).getWildcard());
+    }
+    else if (type instanceof PsiDisjunctionType) {
+      return getTypeName(((PsiDisjunctionType)type).getLeastUpperBound());
     }
     else {
-      if (type instanceof PsiPrimitiveType) {
-        return type.getPresentableText();
-      }
-      else {
-        if (type instanceof PsiWildcardType) {
-          return getTypeName(((PsiWildcardType)type).getExtendsBound());
-        }
-        else {
-          if (type instanceof PsiIntersectionType) {
-            return getTypeName(((PsiIntersectionType)type).getRepresentative());
-          }
-          else {
-            if (type instanceof PsiCapturedWildcardType) {
-              return getTypeName(((PsiCapturedWildcardType)type).getWildcard());
-            }
-            else {
-              if (type instanceof PsiDisjunctionType) {
-                return getTypeName(((PsiDisjunctionType)type).getLeastUpperBound());
-              }
-              else {
-                LOG.error("Unknown type:" + type);
-                return null;
-              }
-            }
-          }
-        }
-      }
+      return null;
     }
   }
 
@@ -411,66 +393,40 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
   private static String getLongTypeName(PsiType type) {
     if (type instanceof PsiClassType) {
       PsiClass aClass = ((PsiClassType)type).resolve();
-      if( aClass == null )
-      {
+      if (aClass == null) {
         return null;
       }
-      if (aClass instanceof PsiAnonymousClass) {
+      else if (aClass instanceof PsiAnonymousClass) {
         PsiClass baseClass = ((PsiAnonymousClass)aClass).getBaseClassType().resolve();
-        if( baseClass == null )
-        {
-          return null;
-        }
-        return baseClass.getQualifiedName();
-      }
-      return aClass.getQualifiedName();
-    }
-    else {
-      if (type instanceof PsiArrayType) {
-        return getLongTypeName(((PsiArrayType)type).getComponentType()) + "[]";
+        return baseClass != null ? baseClass.getQualifiedName() : null;
       }
       else {
-        if (type instanceof PsiPrimitiveType) {
-          return type.getPresentableText();
-        }
-        else {
-          if (type instanceof PsiWildcardType) {
-            final PsiType bound = ((PsiWildcardType)type).getBound();
-            if (bound != null) {
-              return getLongTypeName(bound);
-            }
-            else {
-              return CommonClassNames.JAVA_LANG_OBJECT;
-            }
-          }
-          else {
-            if (type instanceof PsiCapturedWildcardType) {
-              final PsiType bound = ((PsiCapturedWildcardType)type).getWildcard().getBound();
-              if (bound != null) {
-                return getLongTypeName(bound);
-              }
-              else {
-                return CommonClassNames.JAVA_LANG_OBJECT;
-              }
-            }
-            else {
-              if (type instanceof PsiIntersectionType) {
-                return getLongTypeName(((PsiIntersectionType)type).getRepresentative());
-              }
-              else {
-                if (type instanceof PsiDisjunctionType) {
-                  return getLongTypeName(((PsiDisjunctionType)type).getLeastUpperBound());
-                }
-                else {
-                  LOG.error("Unknown type:" + type);
-                  return null;
-                }
-              }
-            }
-          }
-        }
+        return aClass.getQualifiedName();
       }
     }
+    else if (type instanceof PsiArrayType) {
+      return getLongTypeName(((PsiArrayType)type).getComponentType()) + "[]";
+    }
+    else if (type instanceof PsiPrimitiveType) {
+      return type.getPresentableText();
+    }
+    else if (type instanceof PsiWildcardType) {
+      final PsiType bound = ((PsiWildcardType)type).getBound();
+      return bound != null ? getLongTypeName(bound) : CommonClassNames.JAVA_LANG_OBJECT;
+    }
+    else if (type instanceof PsiCapturedWildcardType) {
+      final PsiType bound = ((PsiCapturedWildcardType)type).getWildcard().getBound();
+      return bound != null ? getLongTypeName(bound) : CommonClassNames.JAVA_LANG_OBJECT;
+    }
+    else if (type instanceof PsiIntersectionType) {
+      return getLongTypeName(((PsiIntersectionType)type).getRepresentative());
+    }
+    else if (type instanceof PsiDisjunctionType) {
+      return getLongTypeName(((PsiDisjunctionType)type).getLeastUpperBound());
+    }
+    else {
+      return null;
+    }
   }
 
   private static class NamesByExprInfo {
@@ -701,10 +657,10 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
             break;
           }
         }
-        PsiParameter[] parms = method.getParameterList().getParameters();
-        if (index < parms.length) {
-          String name = parms[index].getName();
-          if (name != null && TypeConversionUtil.areTypesAssignmentCompatible(subst.substitute(parms[index].getType()), expr)) {
+        PsiParameter[] parameters = method.getParameterList().getParameters();
+        if (index < parameters.length) {
+          String name = parameters[index].getName();
+          if (name != null && TypeConversionUtil.areTypesAssignmentCompatible(subst.substitute(parameters[index].getType()), expr)) {
             name = variableNameToPropertyName(name, VariableKind.PARAMETER);
             String[] names = getSuggestionsByName(name, variableKind, false, correctKeywords);
             if (expressions.length == 1) {
@@ -760,6 +716,7 @@ public class JavaCodeStyleManagerImpl extends JavaCodeStyleManager {
           buffer.append(Character.toLowerCase(c));
         continue;
         }
+        //noinspection AssignmentToForLoopParameter
         i++;
         if (i < name.length()) {
           c = name.charAt(i);
diff --git a/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
index ddd54ad680e5..02a8ba1d50a2 100644
--- a/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
+++ b/java/java-psi-api/src/com/intellij/psi/JavaElementVisitor.java
@@ -375,4 +375,8 @@ public abstract class JavaElementVisitor extends PsiElementVisitor {
   public void visitPolyadicExpression(PsiPolyadicExpression expression) {
     visitExpression(expression);
   }
+
+  public void visitLambdaExpression(PsiLambdaExpression expression) {
+    visitExpression(expression);
+  }
 }
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpression.java b/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpression.java
new file mode 100644
index 000000000000..a0e7c5371313
--- /dev/null
+++ b/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpression.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Represents a Java lambda expression.
+ */
+public interface PsiLambdaExpression extends PsiExpression {
+  /**
+   * Returns this lambda expression's parameter list.
+   *
+   * @return parameter list.
+   */
+  @NotNull
+  PsiParameterList getParameterList();
+
+  /**
+   * Returns PSI element representing lambda expression body: {@link PsiCodeBlock}, {@link PsiExpression}, or null if none.
+   *
+   * @return lambda expression body.
+   */
+  @Nullable
+  PsiElement getBody();
+}
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpressionType.java b/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpressionType.java
new file mode 100644
index 000000000000..4a31d7b16555
--- /dev/null
+++ b/java/java-psi-api/src/com/intellij/psi/PsiLambdaExpressionType.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi;
+
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A type which represents a function denoted by a lambda expression.
+ */
+public class PsiLambdaExpressionType extends PsiType {
+  private final PsiLambdaExpression myExpression;
+
+  public PsiLambdaExpressionType(PsiLambdaExpression expression) {
+    super(PsiAnnotation.EMPTY_ARRAY);
+    myExpression = expression;
+  }
+
+  @Override
+  public String getPresentableText() {
+    return "<lambda expression>";
+  }
+
+  @Override
+  public String getCanonicalText() {
+    return getPresentableText();
+  }
+
+  @Override
+  public String getInternalCanonicalText() {
+    return getCanonicalText();
+  }
+
+  @Override
+  public boolean isValid() {
+    return myExpression.isValid();
+  }
+
+  @Override
+  public boolean equalsToText(@NonNls final String text) {
+    return false;
+  }
+
+  @Override
+  public <A> A accept(@NotNull final PsiTypeVisitor<A> visitor) {
+    return visitor.visitType(this);
+  }
+
+  @Override
+  public GlobalSearchScope getResolveScope() {
+    return null;
+  }
+
+  @NotNull
+  @Override
+  public PsiType[] getSuperTypes() {
+    return PsiType.EMPTY_ARRAY;
+  }
+}
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiLambdaParameterType.java b/java/java-psi-api/src/com/intellij/psi/PsiLambdaParameterType.java
new file mode 100644
index 000000000000..64282ce78d69
--- /dev/null
+++ b/java/java-psi-api/src/com/intellij/psi/PsiLambdaParameterType.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi;
+
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * A type which represents an omitted type for parameter of lambda expression.
+ */
+public class PsiLambdaParameterType extends PsiType {
+  private final PsiParameter myParameter;
+
+  public PsiLambdaParameterType(PsiParameter parameter) {
+    super(PsiAnnotation.EMPTY_ARRAY);
+    myParameter = parameter;
+  }
+
+  @Override
+  public String getPresentableText() {
+    return "<lambda parameter>";
+  }
+
+  @Override
+  public String getCanonicalText() {
+    return getPresentableText();
+  }
+
+  @Override
+  public String getInternalCanonicalText() {
+    return getCanonicalText();
+  }
+
+  @Override
+  public boolean isValid() {
+    return myParameter.isValid();
+  }
+
+  @Override
+  public boolean equalsToText(@NonNls final String text) {
+    return false;
+  }
+
+  @Override
+  public <A> A accept(@NotNull final PsiTypeVisitor<A> visitor) {
+    return visitor.visitType(this);
+  }
+
+  @Override
+  public GlobalSearchScope getResolveScope() {
+    return null;
+  }
+
+  @NotNull
+  @Override
+  public PsiType[] getSuperTypes() {
+    return PsiType.EMPTY_ARRAY;
+  }
+}
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java
index 306ea4edd58c..2901f7735919 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceType.java
@@ -57,7 +57,7 @@ public class PsiMethodReferenceType extends PsiType {
 
   @Override
   public <A> A accept(@NotNull final PsiTypeVisitor<A> visitor) {
-    return visitor.visitMethodReferenceType(this);
+    return visitor.visitType(this);
   }
 
   @Override
diff --git a/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
index 4f925f6d7fb4..bd2add5b490a 100644
--- a/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
@@ -56,8 +56,4 @@ public class PsiTypeVisitor<A> {
   public A visitDiamondType(PsiDiamondType diamondType) {
     return visitType(diamondType);
   }
-
-  public A visitMethodReferenceType(PsiMethodReferenceType methodReferenceType) {
-    return visitType(methodReferenceType);
-  }
 }
diff --git a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
index 621eba1ef44d..9a012978da9b 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
@@ -644,6 +644,7 @@ public class TypeConversionUtil {
 
     // todo[r.sh] implement
     if (right instanceof PsiMethodReferenceType && left instanceof PsiClassType) return true;
+    if (right instanceof PsiLambdaExpressionType && left instanceof PsiClassType) return true;
 
     if (left instanceof PsiIntersectionType) {
       PsiType[] conjuncts = ((PsiIntersectionType)left).getConjuncts();
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
index daf235f7f142..01d3288e803e 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java
@@ -43,6 +43,8 @@ public class DeclarationParser {
     JavaTokenType.IDENTIFIER, JavaTokenType.COMMA, JavaTokenType.EXTENDS_KEYWORD, JavaTokenType.IMPLEMENTS_KEYWORD);
   private static final TokenSet APPEND_TO_METHOD_SET = TokenSet.create(
     JavaTokenType.IDENTIFIER, JavaTokenType.COMMA, JavaTokenType.THROWS_KEYWORD);
+  private static final TokenSet PARAM_LIST_STOPPERS = TokenSet.create(
+    JavaTokenType.RPARENTH, JavaTokenType.LBRACE, JavaTokenType.ARROW);
 
   private static final String WHITESPACES = "\n\r \t";
   private static final String LINE_ENDS = "\n\r";
@@ -456,19 +458,28 @@ public class DeclarationParser {
 
   @NotNull
   public PsiBuilder.Marker parseParameterList(final PsiBuilder builder) {
-    return parseElementList(builder, false);
+    return parseElementList(builder, ListType.NORMAL);
   }
 
   @NotNull
   public PsiBuilder.Marker parseResourceList(final PsiBuilder builder) {
-    return parseElementList(builder, true);
+    return parseElementList(builder, ListType.RESOURCE);
   }
 
   @NotNull
-  private PsiBuilder.Marker parseElementList(final PsiBuilder builder, final boolean resources) {
-    assert builder.getTokenType() == JavaTokenType.LPARENTH : builder.getTokenType();
+  public PsiBuilder.Marker parseLambdaParameterList(final PsiBuilder builder, final boolean typed) {
+    return parseElementList(builder, typed ? ListType.LAMBDA_TYPED : ListType.LAMBDA_UNTYPED);
+  }
+
+  private enum ListType { NORMAL, RESOURCE, LAMBDA_TYPED, LAMBDA_UNTYPED }
+
+  @NotNull
+  private PsiBuilder.Marker parseElementList(final PsiBuilder builder, final ListType type) {
+    final boolean lambda = (type == ListType.LAMBDA_TYPED || type == ListType.LAMBDA_UNTYPED);
+    final boolean resources = (type == ListType.RESOURCE);
     final PsiBuilder.Marker elementList = builder.mark();
-    builder.advanceLexer();
+    final boolean leftParenth = expect(builder, JavaTokenType.LPARENTH);
+    assert lambda || leftParenth : builder.getTokenType();
 
     final IElementType delimiter = resources ? JavaTokenType.SEMICOLON : JavaTokenType.COMMA;
     final String noDelimiterMsg = resources ? "expected.semicolon" : "expected.comma";
@@ -480,10 +491,11 @@ public class DeclarationParser {
     boolean noElements = true;
     while (true) {
       final IElementType tokenType = builder.getTokenType();
-      if (tokenType == null || tokenType == JavaTokenType.RPARENTH || tokenType == JavaTokenType.LBRACE) {
+      if (tokenType == null || PARAM_LIST_STOPPERS.contains(tokenType)) {
         final boolean noLastElement = !delimiterExpected && (!noElements && !resources || noElements && resources);
         if (noLastElement) {
-          error(builder, JavaErrorMessages.message("expected.identifier.or.type"));
+          final String key = lambda ? "expected.parameter" : "expected.identifier.or.type";
+          error(builder, JavaErrorMessages.message(key));
         }
         if (tokenType == JavaTokenType.RPARENTH) {
           if (invalidElements != null) {
@@ -498,7 +510,9 @@ public class DeclarationParser {
               invalidElements.error(errorMessage);
             }
             invalidElements = null;
-            error(builder, JavaErrorMessages.message("expected.rparen"));
+            if (leftParenth) {
+              error(builder, JavaErrorMessages.message("expected.rparen"));
+            }
           }
         }
         break;
@@ -516,7 +530,9 @@ public class DeclarationParser {
         }
       }
       else {
-        final PsiBuilder.Marker listElement = resources ? parseResource(builder) : parseParameter(builder, true, false);
+        final PsiBuilder.Marker listElement = resources ? parseResource(builder) :
+                                              lambda ? parseLambdaParameter(builder, type == ListType.LAMBDA_TYPED) :
+                                              parseParameter(builder, true, false);
         if (listElement != null) {
           delimiterExpected = true;
           if (invalidElements != null) {
@@ -562,36 +578,45 @@ public class DeclarationParser {
 
   @Nullable
   public PsiBuilder.Marker parseParameter(final PsiBuilder builder, final boolean ellipsis, final boolean disjunctiveType) {
-    return parseListElement(builder, ellipsis, disjunctiveType, false);
+    return parseListElement(builder, true, ellipsis, disjunctiveType, false);
   }
 
   @Nullable
   public PsiBuilder.Marker parseResource(final PsiBuilder builder) {
-    return parseListElement(builder, false, false, true);
+    return parseListElement(builder, true, false, false, true);
+  }
+
+  @Nullable
+  public PsiBuilder.Marker parseLambdaParameter(final PsiBuilder builder, final boolean typed) {
+    return parseListElement(builder, typed, true, false, false);
   }
 
   @Nullable
   private PsiBuilder.Marker parseListElement(final PsiBuilder builder,
-                                                    final boolean ellipsis,
-                                                    final boolean disjunctiveType,
-                                                    final boolean resource) {
+                                             final boolean typed,
+                                             final boolean ellipsis,
+                                             final boolean disjunctiveType,
+                                             final boolean resource) {
     final PsiBuilder.Marker param = builder.mark();
 
     final Pair<PsiBuilder.Marker, Boolean> modListInfo = parseModifierList(builder);
 
-    int flags = ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD;
-    if (ellipsis) flags |= ReferenceParser.ELLIPSIS;
-    if (disjunctiveType) flags |= ReferenceParser.DISJUNCTIONS;
-    final ReferenceParser.TypeInfo typeInfo = myParser.getReferenceParser().parseTypeInfo(builder, flags);
+    ReferenceParser.TypeInfo typeInfo = null;
+    if (typed) {
+      int flags = ReferenceParser.EAT_LAST_DOT | ReferenceParser.WILDCARD;
+      if (ellipsis) flags |= ReferenceParser.ELLIPSIS;
+      if (disjunctiveType) flags |= ReferenceParser.DISJUNCTIONS;
+      typeInfo = myParser.getReferenceParser().parseTypeInfo(builder, flags);
 
-    if (typeInfo == null) {
-      if (modListInfo.second) {
-        param.rollbackTo();
-        return null;
-      }
-      else {
-        error(builder, JavaErrorMessages.message("expected.type"));
-        emptyElement(builder, JavaElementType.TYPE);
+      if (typeInfo == null) {
+        if (modListInfo.second) {
+          param.rollbackTo();
+          return null;
+        }
+        else {
+          error(builder, JavaErrorMessages.message("expected.type"));
+          emptyElement(builder, JavaElementType.TYPE);
+        }
       }
     }
 
diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
index 3da15c602a4b..f13f09658fcc 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
+++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java
@@ -514,6 +514,19 @@ public class ExpressionParser {
 
     if (tokenType == JavaTokenType.LPARENTH) {
       final PsiBuilder.Marker parenth = builder.mark();
+
+      final IElementType nextToken1 = builder.lookAhead(1);
+      final IElementType nextToken2 = builder.lookAhead(2);
+      if (nextToken1 == JavaTokenType.IDENTIFIER) {
+        if (nextToken2 == JavaTokenType.COMMA ||
+            nextToken2 == JavaTokenType.RPARENTH && builder.lookAhead(3) == JavaTokenType.ARROW) {
+          return parseLambdaExpression(builder, parenth, false);
+        }
+      }
+      else if (nextToken1 == JavaTokenType.RPARENTH && nextToken2 == JavaTokenType.ARROW) {
+        return parseLambdaExpression(builder, parenth, false);
+      }
+
       builder.advanceLexer();
 
       final PsiBuilder.Marker inner = parse(builder);
@@ -554,6 +567,10 @@ public class ExpressionParser {
     }
 
     if (tokenType == JavaTokenType.IDENTIFIER) {
+      if (builder.lookAhead(1) == JavaTokenType.ARROW) {
+        return parseLambdaExpression(builder, builder.mark(), false);
+      }
+
       final PsiBuilder.Marker refExpr;
       if (annotation != null) {
         final PsiBuilder.Marker refParam = annotation.precede();
@@ -810,6 +827,32 @@ public class ExpressionParser {
     return start;
   }
 
+  @NotNull
+  private PsiBuilder.Marker parseLambdaExpression(final PsiBuilder builder, final PsiBuilder.Marker start, final boolean typed) {
+    myParser.getDeclarationParser().parseLambdaParameterList(builder, typed);
+    return parseLambdaExpressionFromArrow(builder, start);
+  }
+
+  @NotNull
+  private PsiBuilder.Marker parseLambdaExpressionFromArrow(final PsiBuilder builder, final PsiBuilder.Marker start) {
+    builder.advanceLexer();
+
+    final PsiBuilder.Marker body;
+    if (builder.getTokenType() == JavaTokenType.LBRACE) {
+      body = myParser.getStatementParser().parseCodeBlock(builder);
+    }
+    else {
+      body = parse(builder);
+    }
+
+    if (body == null) {
+      builder.error(JavaErrorMessages.message("expected.lbrace"));
+    }
+
+    start.done(JavaElementType.LAMBDA_EXPRESSION);
+    return start;
+  }
+
   @NotNull
   public PsiBuilder.Marker parseArgumentList(final PsiBuilder builder) {
     final PsiBuilder.Marker list = builder.mark();
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java
index c83fa399d0a5..5081295bc720 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaLightStubBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,7 @@ package com.intellij.psi.impl.source;
 
 import com.intellij.lang.LighterAST;
 import com.intellij.lang.LighterASTNode;
-import com.intellij.lang.PsiBuilder;
 import com.intellij.lang.impl.ASTNodeBuilder;
-import com.intellij.lang.impl.PsiBuilderImpl;
 import com.intellij.psi.JavaTokenType;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiJavaFile;
@@ -32,7 +30,6 @@ import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.util.io.StringRef;
 
-
 public class JavaLightStubBuilder extends LightStubBuilder {
   @Override
   protected StubElement createStubForFile(final PsiFile file, final LighterAST tree) {
@@ -53,20 +50,17 @@ public class JavaLightStubBuilder extends LightStubBuilder {
 
   @Override
   public boolean skipChildProcessingWhenBuildingStubs(final IElementType nodeType, final IElementType childType) {
-    return childType == JavaElementType.PARAMETER && nodeType != JavaElementType.PARAMETER_LIST;
+    return childType == JavaElementType.PARAMETER && nodeType != JavaElementType.PARAMETER_LIST ||
+           childType == JavaElementType.PARAMETER_LIST && nodeType == JavaElementType.LAMBDA_EXPRESSION;
   }
 
-  static int totalMethods;
-  static int nonexpandedMethods;
-
   @Override
-  public boolean skipChildProcessingWhenBuildingStubs(LightStubBuilder builder,
-                                                       LighterAST tree,
-                                                       LighterASTNode parent,
-                                                       LighterASTNode child) {
+  public boolean skipChildProcessingWhenBuildingStubs(final LightStubBuilder builder,
+                                                      final LighterAST tree,
+                                                      final LighterASTNode parent,
+                                                      final LighterASTNode child) {
     if (child.getTokenType() == JavaElementType.CODE_BLOCK) {
       if (child instanceof ASTNodeBuilder.ASTUnparsedNodeMarker) {
-        ++totalMethods;
         ASTNodeBuilder.ASTUnparsedNodeMarker nodeMarker = (ASTNodeBuilder.ASTUnparsedNodeMarker)child;
         final ASTNodeBuilder nodeBuilder = nodeMarker.getBuilder();
         final int endLexemIndex = nodeMarker.getEndLexemIndex();
@@ -89,7 +83,6 @@ public class JavaLightStubBuilder extends LightStubBuilder {
           }
         }
 
-        ++nonexpandedMethods;
         return true;
       }
     }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
index 675b4d58efa0..dc0dc48d9e59 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -167,7 +167,7 @@ public class PsiFieldImpl extends JavaStubPsiElement<PsiFieldStub> implements Ps
     }
 
     myCachedType = null;
-    return JavaSharedImplUtil.getType(this);
+    return JavaSharedImplUtil.getType(getTypeElement(), getNameIdentifier(), this);
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
index ac27a012a2a9..0a569cf4a33e 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -118,7 +118,13 @@ public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> imple
     }
 
     myCachedType = null;
-    return JavaSharedImplUtil.getType(this);
+
+    final PsiTypeElement typeElement = getTypeElement();
+    if (typeElement == null && isLambdaParameter()) {
+      return new PsiLambdaParameterType(this);
+    }
+
+    return JavaSharedImplUtil.getType(typeElement, getNameIdentifier(), this);
   }
 
   @Override
@@ -134,13 +140,21 @@ public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> imple
         return null;
       }
     }
-    PsiTypeElement typeElement = getTypeElement();
-    PsiIdentifier nameIdentifier = getNameIdentifier();
-    return JavaSharedImplUtil.getTypeNoResolve(typeElement, nameIdentifier, this);
+
+    final PsiTypeElement typeElement = getTypeElement();
+    if (typeElement == null && isLambdaParameter()) {
+      return new PsiLambdaParameterType(this);
+    }
+
+    return JavaSharedImplUtil.getTypeNoResolve(typeElement, getNameIdentifier(), this);
+  }
+
+  private boolean isLambdaParameter() {
+    final PsiElement parent = getParent();
+    return parent instanceof PsiParameterList && parent.getParent() instanceof PsiLambdaExpression;
   }
 
   @Override
-  @NotNull
   public PsiTypeElement getTypeElement() {
     return (PsiTypeElement)getNode().findChildByRoleAsPsiElement(ChildRole.TYPE);
   }
@@ -233,7 +247,8 @@ public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> imple
     }
 
     myCachedType = null;
-    return SourceTreeToPsiMap.psiToTreeNotNull(getTypeElement()).findChildByType(JavaTokenType.ELLIPSIS) != null;
+    final PsiTypeElement typeElement = getTypeElement();
+    return typeElement != null && SourceTreeToPsiMap.psiToTreeNotNull(typeElement).findChildByType(JavaTokenType.ELLIPSIS) != null;
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
index a734707a2da1..a8d096a2e642 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
@@ -54,7 +54,7 @@ public interface ElementType extends JavaTokenType, JavaDocTokenType, JavaElemen
     REFERENCE_EXPRESSION, LITERAL_EXPRESSION, THIS_EXPRESSION, SUPER_EXPRESSION, PARENTH_EXPRESSION, METHOD_CALL_EXPRESSION,
     TYPE_CAST_EXPRESSION, PREFIX_EXPRESSION, POSTFIX_EXPRESSION, BINARY_EXPRESSION, POLYADIC_EXPRESSION, CONDITIONAL_EXPRESSION,
     ASSIGNMENT_EXPRESSION, NEW_EXPRESSION, ARRAY_ACCESS_EXPRESSION, ARRAY_INITIALIZER_EXPRESSION, INSTANCE_OF_EXPRESSION,
-    CLASS_OBJECT_ACCESS_EXPRESSION, METHOD_REF_EXPRESSION, EMPTY_EXPRESSION);
+    CLASS_OBJECT_ACCESS_EXPRESSION, METHOD_REF_EXPRESSION, LAMBDA_EXPRESSION, EMPTY_EXPRESSION);
 
   TokenSet ANNOTATION_MEMBER_VALUE_BIT_SET = TokenSet.orSet(EXPRESSION_BIT_SET,
                                                             TokenSet.create(ANNOTATION, ANNOTATION_ARRAY_INITIALIZER));
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
index 83d4271a06c6..62ea98ac674f 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaElementType.java
@@ -105,6 +105,7 @@ public interface JavaElementType {
   IElementType CLASS_OBJECT_ACCESS_EXPRESSION = new JavaCompositeElementType("CLASS_OBJECT_ACCESS_EXPRESSION", PsiClassObjectAccessExpressionImpl.class);
   IElementType EMPTY_EXPRESSION = new JavaCompositeElementType("EMPTY_EXPRESSION", PsiEmptyExpressionImpl.class, true);
   IElementType METHOD_REF_EXPRESSION = new JavaCompositeElementType("METHOD_REF_EXPRESSION", PsiMethodReferenceExpressionImpl.class);
+  IElementType LAMBDA_EXPRESSION = new JavaCompositeElementType("LAMBDA_EXPRESSION", PsiLambdaExpressionImpl.class);
   IElementType EXPRESSION_LIST = new JavaCompositeElementType("EXPRESSION_LIST", PsiExpressionListImpl.class, true);
   IElementType EMPTY_STATEMENT = new JavaCompositeElementType("EMPTY_STATEMENT", PsiEmptyStatementImpl.class);
   IElementType BLOCK_STATEMENT = new JavaCompositeElementType("BLOCK_STATEMENT", PsiBlockStatementImpl.class);
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
index 44fdb81002f3..917458d55f92 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/JavaSharedImplUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,30 +32,10 @@ import org.jetbrains.annotations.NotNull;
 public class JavaSharedImplUtil {
   private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.tree.JavaSharedImplUtil");
 
-  private JavaSharedImplUtil() {
-  }
-
-  public static PsiType getType(PsiVariable variable) {
-    PsiTypeElement typeElement = variable.getTypeElement();
-    PsiIdentifier nameIdentifier = variable.getNameIdentifier();
-    return getType(typeElement, nameIdentifier, variable);
-  }
+  private JavaSharedImplUtil() { }
 
   public static PsiType getType(@NotNull PsiTypeElement typeElement, @NotNull PsiElement anchor, @NotNull PsiElement context) {
-    int cStyleArrayCount = 0;
-    ASTNode name = SourceTreeToPsiMap.psiElementToTree(anchor);
-    for (ASTNode child = name.getTreeNext(); child != null; child = child.getTreeNext()) {
-      IElementType i = child.getElementType();
-      if (i == JavaTokenType.LBRACKET) {
-        cStyleArrayCount++;
-      }
-      else if (i != JavaTokenType.RBRACKET && i != TokenType.WHITE_SPACE &&
-               i != JavaTokenType.C_STYLE_COMMENT &&
-               i != JavaDocElementType.DOC_COMMENT &&
-               i != JavaTokenType.END_OF_LINE_COMMENT) {
-        break;
-      }
-    }
+    int cStyleArrayCount = countBrackets(anchor);
     PsiType type;
     if (typeElement instanceof PsiTypeElementImpl) {
       type = ((PsiTypeElementImpl)typeElement).getDetachedType(context);
@@ -63,33 +43,34 @@ public class JavaSharedImplUtil {
     else {
       type = typeElement.getType();
     }
-
     for (int i = 0; i < cStyleArrayCount; i++) {
       type = type.createArrayType();
     }
     return type;
   }
+
   public static PsiType getTypeNoResolve(@NotNull PsiTypeElement typeElement, @NotNull PsiElement anchor, @NotNull PsiElement context) {
+    int cStyleArrayCount = countBrackets(anchor);
+    PsiType type = typeElement.getTypeNoResolve(context);
+    for (int i = 0; i < cStyleArrayCount; i++) {
+      type = type.createArrayType();
+    }
+    return type;
+  }
+
+  private static int countBrackets(PsiElement anchor) {
     int cStyleArrayCount = 0;
-    ASTNode name = SourceTreeToPsiMap.psiElementToTree(anchor);
+    ASTNode name = SourceTreeToPsiMap.psiToTreeNotNull(anchor);
     for (ASTNode child = name.getTreeNext(); child != null; child = child.getTreeNext()) {
       IElementType i = child.getElementType();
       if (i == JavaTokenType.LBRACKET) {
         cStyleArrayCount++;
       }
-      else if (i != JavaTokenType.RBRACKET && i != TokenType.WHITE_SPACE &&
-               i != JavaTokenType.C_STYLE_COMMENT &&
-               i != JavaDocElementType.DOC_COMMENT &&
-               i != JavaTokenType.END_OF_LINE_COMMENT) {
+      else if (i != JavaTokenType.RBRACKET && !ElementType.JAVA_COMMENT_OR_WHITESPACE_BIT_SET.contains(i)) {
         break;
       }
     }
-    PsiType type = typeElement.getTypeNoResolve(context);
-
-    for (int i = 0; i < cStyleArrayCount; i++) {
-      type = type.createArrayType();
-    }
-    return type;
+    return cStyleArrayCount;
   }
 
   public static void normalizeBrackets(PsiVariable variable) {
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
new file mode 100644
index 000000000000..7301d74c6ce7
--- /dev/null
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi.impl.source.tree.java;
+
+import com.intellij.psi.*;
+import com.intellij.psi.impl.source.tree.JavaElementType;
+import com.intellij.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NotNull;
+
+public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements PsiLambdaExpression {
+  public PsiLambdaExpressionImpl() {
+    super(JavaElementType.LAMBDA_EXPRESSION);
+  }
+
+  @NotNull
+  @Override
+  public PsiParameterList getParameterList() {
+    return PsiTreeUtil.getRequiredChildOfType(this, PsiParameterList.class);
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public PsiElement getBody() {
+    return PsiTreeUtil.getChildOfAnyType(this, PsiExpression.class, PsiCodeBlock.class);
+  }
+
+  @Override
+  public PsiType getType() {
+    return new PsiLambdaExpressionType(this);
+  }
+
+  @Override
+  public void accept(@NotNull final PsiElementVisitor visitor) {
+    if (visitor instanceof JavaElementVisitor) {
+      ((JavaElementVisitor)visitor).visitLambdaExpression(this);
+    }
+    else {
+      visitor.visitElement(this);
+    }
+  }
+
+  @Override
+  public String toString() {
+    return "PsiLambdaExpression:" + getText();
+  }
+}
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java
index 344c8f081287..7f8c4e648180 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,7 +95,7 @@ public class PsiLocalVariableImpl extends CompositePsiElement implements PsiLoca
   @Override
   @NotNull
   public final PsiType getType() {
-    return JavaSharedImplUtil.getType(this);
+    return JavaSharedImplUtil.getType(getTypeElement(), getNameIdentifier(), this);
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
index 2ce7b12f1303..60cf15798689 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/ReplaceExpressionUtil.java
@@ -158,6 +158,7 @@ public class ReplaceExpressionUtil {
              i == JavaElementType.ARRAY_INITIALIZER_EXPRESSION ||
              i == JavaElementType.JAVA_CODE_REFERENCE ||
              i == JavaElementType.METHOD_REF_EXPRESSION ||
+             i == JavaElementType.LAMBDA_EXPRESSION ||
              i == JavaElementType.EMPTY_EXPRESSION) {
       return 14;
     }
diff --git a/java/java-psi-impl/src/messages/JavaErrorMessages.properties b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
index af50af742652..f74c309f2cc4 100644
--- a/java/java-psi-impl/src/messages/JavaErrorMessages.properties
+++ b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
@@ -354,4 +354,5 @@ feature.binary.literals=Binary literals
 feature.underscores.in.literals=Underscores in literals
 feature.extension.methods=Extension methods
 feature.method.references=Method references
+feature.lambda.expressions=Lambda expressions
 insufficient.language.level={0} are not supported at this language level
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnsupportedFeatures.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnsupportedFeatures.java
index d4ca889750a1..d2635c297368 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnsupportedFeatures.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnsupportedFeatures.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import java.io.*;
 import java.util.*;
 
@@ -38,7 +39,8 @@ class UnsupportedFeatures {
 
     try <error descr="Try-with-resources are not supported at this language level">(Reader r = new FileReader("/dev/null"))</error> { }
 
-    I i = <error descr="Method references are not supported at this language level">UnsupportedFeatures::m</error>;
+    I i1 = <error descr="Method references are not supported at this language level">UnsupportedFeatures::m</error>;
+    I i2 = <error descr="Lambda expressions are not supported at this language level">() -> { }</error>;
   }
 
   interface I {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java
new file mode 100644
index 000000000000..6522ea1376c1
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/LambdaExpressions.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class C {
+  interface Simplest {
+    void m();
+  }
+  void simplest() { }
+  void use(Simplest s) { }
+
+  void test() {
+    Simplest simplest = <weak_warning descr="Lambda expressions type check is not yet implemented">() -> { }</weak_warning>;
+    use(<weak_warning descr="Lambda expressions type check is not yet implemented">() -> { }</weak_warning>);
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression0.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression0.txt
new file mode 100644
index 000000000000..36d08eabeb2f
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression0.txt
@@ -0,0 +1,12 @@
+PsiJavaFile:LambdaExpression0.java
+  PsiLambdaExpression:p -> 42
+    PsiParameterList:p
+      PsiParameter:p
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:p('p')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiLiteralExpression:42
+      PsiJavaToken:INTEGER_LITERAL('42')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression1.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression1.txt
new file mode 100644
index 000000000000..8a7190f1d133
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression1.txt
@@ -0,0 +1,12 @@
+PsiJavaFile:LambdaExpression1.java
+  PsiLambdaExpression:p ->
+    PsiParameterList:p
+      PsiParameter:p
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:p('p')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiErrorElement:'{' expected
+      <empty list>
+  PsiWhiteSpace(' ')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression10.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression10.txt
new file mode 100644
index 000000000000..fd5637060a3d
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression10.txt
@@ -0,0 +1,23 @@
+PsiJavaFile:LambdaExpression10.java
+  PsiTypeCastExpression:(I)(p -> null)
+    PsiJavaToken:LPARENTH('(')
+    PsiTypeElement:I
+      PsiJavaCodeReferenceElement:I
+        PsiIdentifier:I('I')
+        PsiReferenceParameterList
+          <empty list>
+    PsiJavaToken:RPARENTH(')')
+    PsiParenthesizedExpression:(p -> null)
+      PsiJavaToken:LPARENTH('(')
+      PsiLambdaExpression:p -> null
+        PsiParameterList:p
+          PsiParameter:p
+            PsiModifierList:
+              <empty list>
+            PsiIdentifier:p('p')
+        PsiWhiteSpace(' ')
+        PsiJavaToken:ARROW('->')
+        PsiWhiteSpace(' ')
+        PsiLiteralExpression:null
+          PsiJavaToken:NULL_KEYWORD('null')
+      PsiJavaToken:RPARENTH(')')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression11.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression11.txt
new file mode 100644
index 000000000000..2aa1ced0bd12
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression11.txt
@@ -0,0 +1,12 @@
+PsiJavaFile:LambdaExpression11.java
+  PsiLambdaExpression:() -> { }
+    PsiParameterList:()
+      PsiJavaToken:LPARENTH('(')
+      PsiJavaToken:RPARENTH(')')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiCodeBlock
+      PsiJavaToken:LBRACE('{')
+      PsiWhiteSpace(' ')
+      PsiJavaToken:RBRACE('}')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression2.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression2.txt
new file mode 100644
index 000000000000..f4e8981fe53f
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression2.txt
@@ -0,0 +1,14 @@
+PsiJavaFile:LambdaExpression2.java
+  PsiLambdaExpression:p -> {
+    PsiParameterList:p
+      PsiParameter:p
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:p('p')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiCodeBlock
+      PsiJavaToken:LBRACE('{')
+      PsiErrorElement:'}' expected
+        <empty list>
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression3.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression3.txt
new file mode 100644
index 000000000000..f03f0eec5c3b
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression3.txt
@@ -0,0 +1,16 @@
+PsiJavaFile:LambdaExpression3.java
+  PsiLambdaExpression:(p) -> { }
+    PsiParameterList:(p)
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:p
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:p('p')
+      PsiJavaToken:RPARENTH(')')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiCodeBlock
+      PsiJavaToken:LBRACE('{')
+      PsiWhiteSpace(' ')
+      PsiJavaToken:RBRACE('}')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression4.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression4.txt
new file mode 100644
index 000000000000..6550b7ee595a
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression4.txt
@@ -0,0 +1,20 @@
+PsiJavaFile:LambdaExpression4.java
+  PsiLambdaExpression:(p, v) -> null
+    PsiParameterList:(p, v)
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:p
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:p('p')
+      PsiJavaToken:COMMA(',')
+      PsiWhiteSpace(' ')
+      PsiParameter:v
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:v('v')
+      PsiJavaToken:RPARENTH(')')
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiLiteralExpression:null
+      PsiJavaToken:NULL_KEYWORD('null')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression5.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression5.txt
new file mode 100644
index 000000000000..3df164863211
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression5.txt
@@ -0,0 +1,21 @@
+PsiJavaFile:LambdaExpression5.java
+  PsiLambdaExpression:(p, v -> null
+    PsiParameterList:(p, v
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:p
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:p('p')
+      PsiJavaToken:COMMA(',')
+      PsiWhiteSpace(' ')
+      PsiParameter:v
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:v('v')
+      PsiErrorElement:')' expected
+        <empty list>
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiLiteralExpression:null
+      PsiJavaToken:NULL_KEYWORD('null')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression6.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression6.txt
new file mode 100644
index 000000000000..ac3ac618cf04
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression6.txt
@@ -0,0 +1,22 @@
+PsiJavaFile:LambdaExpression6.java
+  PsiLambdaExpression:(p, v, -> null
+    PsiParameterList:(p, v,
+      PsiJavaToken:LPARENTH('(')
+      PsiParameter:p
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:p('p')
+      PsiJavaToken:COMMA(',')
+      PsiWhiteSpace(' ')
+      PsiParameter:v
+        PsiModifierList:
+          <empty list>
+        PsiIdentifier:v('v')
+      PsiJavaToken:COMMA(',')
+      PsiErrorElement:Parameter expected
+        <empty list>
+    PsiWhiteSpace(' ')
+    PsiJavaToken:ARROW('->')
+    PsiWhiteSpace(' ')
+    PsiLiteralExpression:null
+      PsiJavaToken:NULL_KEYWORD('null')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression7.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression7.txt
new file mode 100644
index 000000000000..96eb3ced7ab6
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression7.txt
@@ -0,0 +1,15 @@
+PsiJavaFile:LambdaExpression7.java
+  PsiParenthesizedExpression:(p -> null)
+    PsiJavaToken:LPARENTH('(')
+    PsiLambdaExpression:p -> null
+      PsiParameterList:p
+        PsiParameter:p
+          PsiModifierList:
+            <empty list>
+          PsiIdentifier:p('p')
+      PsiWhiteSpace(' ')
+      PsiJavaToken:ARROW('->')
+      PsiWhiteSpace(' ')
+      PsiLiteralExpression:null
+        PsiJavaToken:NULL_KEYWORD('null')
+    PsiJavaToken:RPARENTH(')')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression8.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression8.txt
new file mode 100644
index 000000000000..daf6a024bb83
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression8.txt
@@ -0,0 +1,22 @@
+PsiJavaFile:LambdaExpression8.java
+  PsiTypeCastExpression:(I)(p) -> null
+    PsiJavaToken:LPARENTH('(')
+    PsiTypeElement:I
+      PsiJavaCodeReferenceElement:I
+        PsiIdentifier:I('I')
+        PsiReferenceParameterList
+          <empty list>
+    PsiJavaToken:RPARENTH(')')
+    PsiLambdaExpression:(p) -> null
+      PsiParameterList:(p)
+        PsiJavaToken:LPARENTH('(')
+        PsiParameter:p
+          PsiModifierList:
+            <empty list>
+          PsiIdentifier:p('p')
+        PsiJavaToken:RPARENTH(')')
+      PsiWhiteSpace(' ')
+      PsiJavaToken:ARROW('->')
+      PsiWhiteSpace(' ')
+      PsiLiteralExpression:null
+        PsiJavaToken:NULL_KEYWORD('null')
\ No newline at end of file
diff --git a/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression9.txt b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression9.txt
new file mode 100644
index 000000000000..10ac4a98fccf
--- /dev/null
+++ b/java/java-tests/testData/psi/parser-partial/expressions/LambdaExpression9.txt
@@ -0,0 +1,20 @@
+PsiJavaFile:LambdaExpression9.java
+  PsiTypeCastExpression:(I)p -> null
+    PsiJavaToken:LPARENTH('(')
+    PsiTypeElement:I
+      PsiJavaCodeReferenceElement:I
+        PsiIdentifier:I('I')
+        PsiReferenceParameterList
+          <empty list>
+    PsiJavaToken:RPARENTH(')')
+    PsiLambdaExpression:p -> null
+      PsiParameterList:p
+        PsiParameter:p
+          PsiModifierList:
+            <empty list>
+          PsiIdentifier:p('p')
+      PsiWhiteSpace(' ')
+      PsiJavaToken:ARROW('->')
+      PsiWhiteSpace(' ')
+      PsiLiteralExpression:null
+        PsiJavaToken:NULL_KEYWORD('null')
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
index 171650d299bd..4e9a73b02c69 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
@@ -146,4 +146,5 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   public void testClassLiteral() throws Exception { doTest(false, false); }
   public void testExtensionMethods() throws Exception { doTest(false, false); }
   public void testMethodReferences() throws Exception { doTest(false, true, false); }
+  public void testLambdaExpressions() throws Exception { doTest(false, true, false); }
 }
diff --git a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
index 551f8b715c3c..87f78668a16d 100644
--- a/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
+++ b/java/java-tests/testSrc/com/intellij/lang/java/parser/partial/ExpressionParserTest.java
@@ -122,6 +122,19 @@ public class ExpressionParserTest extends JavaParsingTestCase {
   public void testMethodRef4() { doParserTest("int[]::clone"); }
   public void testMethodRef5() { doParserTest("(f ? list.map(String::length) : Collections.emptyList())::iterator"); }
 
+  public void testLambdaExpression0() { doParserTest("p -> 42"); }
+  public void testLambdaExpression1() { doParserTest("p -> "); }
+  public void testLambdaExpression2() { doParserTest("p -> {"); }
+  public void testLambdaExpression3() { doParserTest("(p) -> { }"); }
+  public void testLambdaExpression4() { doParserTest("(p, v) -> null"); }
+  public void testLambdaExpression5() { doParserTest("(p, v -> null"); }
+  public void testLambdaExpression6() { doParserTest("(p, v, -> null"); }
+  public void testLambdaExpression7() { doParserTest("(p -> null)"); }
+  public void testLambdaExpression8() { doParserTest("(I)(p) -> null"); }
+  public void testLambdaExpression9() { doParserTest("(I)p -> null"); }
+  public void testLambdaExpression10() { doParserTest("(I)(p -> null)"); }
+  public void testLambdaExpression11() { doParserTest("() -> { }"); }
+
   private void doParserTest(@NonNls final String text) {
     doParserTest(text, new MyTestParser());
   }
diff --git a/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
index 9bd2f1abd2d4..7d2a9cdd696f 100644
--- a/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/JavaStubBuilderTest.java
@@ -221,6 +221,7 @@ public class JavaStubBuilderTest extends LightIdeaTestCase {
     doTest("class C { {\n" +
            "  new O.P() { };\n" +
            "  X.new Y() { };\n" +
+           "  f(p -> new R() { });\n" +
            "} }",
 
            "PsiJavaFileStub []\n" +
@@ -233,7 +234,8 @@ public class JavaStubBuilderTest extends LightIdeaTestCase {
            "    CLASS_INITIALIZER:PsiClassInitializerStub\n" +
            "      MODIFIER_LIST:PsiModifierListStub[mask=4096]\n" +
            "      ANONYMOUS_CLASS:PsiClassStub[anonymous name=null fqn=null baseref=O.P]\n" +
-           "      ANONYMOUS_CLASS:PsiClassStub[anonymous name=null fqn=null baseref=Y inqualifnew]\n");
+           "      ANONYMOUS_CLASS:PsiClassStub[anonymous name=null fqn=null baseref=Y inqualifnew]\n" +
+           "      ANONYMOUS_CLASS:PsiClassStub[anonymous name=null fqn=null baseref=R]\n");
   }
 
   public void testEnums() {

From 5176f2edccd4ac19d146e135a89333918d5c1364 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Tue, 5 Jun 2012 23:09:09 +0400
Subject: [PATCH 238/239] fix for zero byte array inflating, checks for
 consistency

---
 .../util/io/storage/RefCountingStorage.java       | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/platform/util/src/com/intellij/util/io/storage/RefCountingStorage.java b/platform/util/src/com/intellij/util/io/storage/RefCountingStorage.java
index faab5b883063..de17708f52a2 100644
--- a/platform/util/src/com/intellij/util/io/storage/RefCountingStorage.java
+++ b/platform/util/src/com/intellij/util/io/storage/RefCountingStorage.java
@@ -60,7 +60,7 @@ public class RefCountingStorage extends AbstractStorage {
     }
   });
 
-  private static final int MAX_PENDING_WRITE_SIZE = 5 * 1024 * 1024;
+  private static final int MAX_PENDING_WRITE_SIZE = 2 * 1024 * 1024;
 
   public RefCountingStorage(String path) throws IOException {
     super(path);
@@ -101,11 +101,12 @@ public class RefCountingStorage extends AbstractStorage {
       super(new UnsyncByteArrayInputStream(compressedData), new Inflater(), 1);
       // force to directly use compressed data, this ensures less round trips with native extraction code and copy streams
       this.buf = compressedData;
+      this.len = -1; // ensure one time fill
     }
 
     @Override
     protected void fill() throws IOException {
-      if (len > 0) throw new EOFException();
+      if (len >= 0) throw new EOFException();
       len = buf.length;
       inf.setInput(buf, 0, len);
     }
@@ -169,7 +170,7 @@ public class RefCountingStorage extends AbstractStorage {
       }
 
       if (myPendingWriteRequestsSize > MAX_PENDING_WRITE_SIZE) {
-        flushPendingWrites();
+        flushPendingWrites();   // we do it under lock to ensure normally only one thread will bulky flush stuff
       }
     }
   }
@@ -184,12 +185,16 @@ public class RefCountingStorage extends AbstractStorage {
           return null;
         }
       });
+      if (myPendingWriteRequestsSize > MAX_PENDING_WRITE_SIZE) {  // we do it under lock to ensure normally only one thread will bulky flush stuff
+        flushPendingWrites();
+      }
     }
   }
 
 
   private void write(BufferExposingByteArrayOutputStream zippedBytes, int record, boolean fixedSize) throws IOException {
     synchronized (myLock) {
+      if (!myPendingWriteRequests.containsKey(record)) return; // some thread helped us
       super.writeBytes(record, new ByteSequence(zippedBytes.getInternalBuffer(), 0, zippedBytes.size()), fixedSize);
       myPendingWriteRequestsSize -= zippedBytes.size();
       myPendingWriteRequests.remove(record);
@@ -280,7 +285,8 @@ public class RefCountingStorage extends AbstractStorage {
   private void flushPendingWrites() {
     for(Map.Entry<Integer, Callable> entry: myPendingWriteRequests.entrySet()) {
       try {
-        entry.getValue().call();
+        Callable value = entry.getValue();
+        if (value != null) value.call();
       } catch (Exception e) {
         throw new RuntimeException(e);
       }
@@ -295,6 +301,7 @@ public class RefCountingStorage extends AbstractStorage {
         throw new RuntimeException(e);
       }
     }
+
     flushPendingWrites();
   }
 }

From 041e6f9a12fd23e1b9f9206fe9b4af68fad69714 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 6 Jun 2012 09:44:53 +0200
Subject: [PATCH 239/239] fix completion extender blinking

---
 .../lookup/impl/CompletionExtender.java       | 136 +++++-------------
 .../lookup/impl/LookupCellRenderer.java       |  56 ++++++--
 .../codeInsight/lookup/impl/LookupImpl.java   |  34 ++---
 .../ui/AbstractExpandableItemsHandler.java    |  36 +++--
 4 files changed, 115 insertions(+), 147 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionExtender.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionExtender.java
index 4704342565d0..801942040b3b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionExtender.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/CompletionExtender.java
@@ -15,122 +15,56 @@
  */
 package com.intellij.codeInsight.lookup.impl;
 
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.openapi.util.SystemInfo;
-import com.intellij.ui.HintHint;
-import com.intellij.ui.LightweightHint;
-import com.intellij.ui.ScreenUtil;
-import com.intellij.ui.awt.RelativePoint;
-import com.intellij.util.ui.UIUtil;
+import com.intellij.ui.ListExpandableItemsHandler;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
+import java.awt.event.*;
 
 /**
  * @author Konstantin Bulenkov
  */
-public class CompletionExtender extends LightweightHint {
-  private LookupElement myElement;
-  private LookupImpl myLookup;
-  private int myIndex;
+public class CompletionExtender extends ListExpandableItemsHandler {
 
-  public CompletionExtender(@NotNull LookupElement element, @NotNull LookupImpl lookup) {
-    super(createComponent(element, lookup));
-    setForceHideShadow(true);
-    myElement = element;
-    myLookup = lookup;
-    myIndex = myLookup.getList().getSelectedIndex();
-    myLookup.getComponent().addComponentListener(new ComponentAdapter() {
+  public CompletionExtender(@NotNull final JList list) {
+    super(list);
+    list.addComponentListener(new ComponentAdapter() {
       @Override
-      public void componentResized(ComponentEvent e) {
-        recalculateLocation();
-      }
+      public void componentShown(ComponentEvent e) {
+        if (myComponent.getParent() != null && myComponent.getParent().getParent() instanceof JScrollPane) {
+          final JScrollBar verticalScrollBar = ((JScrollPane)myComponent.getParent().getParent()).getVerticalScrollBar();
+          final JScrollBar horizontalScrollBar = ((JScrollPane)myComponent.getParent().getParent()).getVerticalScrollBar();
+          final AdjustmentListener listener = new AdjustmentListener() {
+            @Override
+            public void adjustmentValueChanged(AdjustmentEvent e) {
+              updateCurrentSelection();
+            }
+          };
+          if (verticalScrollBar != null) verticalScrollBar.addAdjustmentListener(listener);
+          if (horizontalScrollBar != null) horizontalScrollBar.addAdjustmentListener(listener);
 
-      @Override
-      public void componentMoved(ComponentEvent e) {
-        recalculateLocation();
+          list.removeComponentListener(this);
+        }
       }
     });
   }
-
-  public LookupElement getLookupElement() {
-    return myElement;
-  }
-
-  public boolean sameAsFor(LookupElement item) {
-    return getLookupElement().equals(item)
-           && myIndex == myLookup.getList().getSelectedIndex();
-  }
-
-  private static JComponent createComponent(LookupElement element, LookupImpl lookup) {
-    final LookupCellRenderer renderer = ((LookupCellRenderer)lookup.getList().getCellRenderer()).createExtenderRenderer();
-    final JComponent component = (JComponent)renderer.getListCellRendererComponent(lookup.getList(), element,
-                                                                                   lookup.getList().getSelectedIndex(),
-                                                                                   true, false);
-    component.setSize(component.getPreferredSize());
-    return component;
-  }
-
-  public boolean show() {
-    if (SystemInfo.isUnix) {
-      //TODO[kb]: fix shadow. This hint is always heavyweight window and has a shadow
-      hide();
-      return false;
-    }
-    if (!checkComponentBounds()) {
-      hide();
-      return false;
-    }
-    final JList list = myLookup.getList();
-    if (getComponent().getWidth() > list.getWidth()) {
-      final JComponent rootPane = myLookup.myLayeredPane;
-
-      final Point p = list.getLocationOnScreen();
-      p.y += list.indexToLocation(list.getSelectedIndex()).y;
-      SwingUtilities.convertPointFromScreen(p, rootPane);
-
-      if (rootPane != null) {
-        final HintHint hint = new HintHint();
-        show(rootPane, p.x, p.y, null, hint);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private boolean checkComponentBounds() {
-    final Dimension size = getComponent().getPreferredSize();
-    final JList list = myLookup.getList();
-    final Point p = list.getLocationOnScreen();
-    p.y += list.indexToLocation(list.getSelectedIndex()).y;
-    final Rectangle rectangle = new Rectangle(p, size);
-    return !ScreenUtil.isOutsideOnTheRightOFScreen(rectangle);
-  }
-
-  void recalculateLocation() {
-    if (!isVisible()) return;
-    final JList list = myLookup.getList();
-    final Point p = list.getLocationOnScreen();
-    final Point point = list.indexToLocation(list.getSelectedIndex());
-    if (point != null) {
-      p.y += point.y;
-      final JComponent rootPane = UIUtil.getRootPane(myLookup.getEditor().getContentComponent());
-      if (rootPane != null) {
-        SwingUtilities.convertPointFromScreen(p, rootPane);
-        setLocation(new RelativePoint(rootPane, p));
-        return;
-      }
-    }
-    hide();
+  @Override
+  protected void handleSelectionChange(Integer selected, boolean processIfUnfocused) {
+    super.handleSelectionChange(myComponent.getSelectedIndex(), true);
   }
 
   @Override
-  public void hide() {
-    super.hide();
-    myLookup = null;
-    myElement = null;
+  protected void onFocusLost() {
+    //don't hide hint
+  }
+
+  @Override
+  protected void handleMouseEvent(MouseEvent e, boolean forceUpdate) {
+    // don't show or hide hint on mouse events
+  }
+
+  @Override
+  protected boolean isPaintBorder() {
+    return false;
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
index 3e9b529ad131..a1b26f55b199 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupCellRenderer.java
@@ -37,6 +37,8 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @author peter
@@ -68,15 +70,13 @@ public class LookupCellRenderer implements ListCellRenderer {
   private final SimpleColoredComponent myNameComponent;
   private final SimpleColoredComponent myTailComponent;
   private final SimpleColoredComponent myTypeLabel;
-  private final JPanel myPanel;
+  private final LookupPanel myPanel;
+  private final Map<Integer, Boolean> mySelected = new HashMap<Integer, Boolean>();
 
   private static final String ELLIPSIS = "\u2026";
-  private final boolean myFullSize;
   private int myMaxWidth = -1;
 
-  public LookupCellRenderer(LookupImpl lookup, boolean fullSize) {
-    myFullSize = fullSize;
-
+  public LookupCellRenderer(LookupImpl lookup) {
     EditorColorsScheme scheme = lookup.getEditor().getColorsScheme();
     myNormalFont = scheme.getFont(EditorFontType.PLAIN);
     myBoldFont = scheme.getFont(EditorFontType.BOLD);
@@ -124,7 +124,7 @@ public class LookupCellRenderer implements ListCellRenderer {
     final Color background = isSelected ? SELECTED_BACKGROUND_COLOR : BACKGROUND_COLOR;
 
     int allowedWidth = list.getWidth() - AFTER_TAIL - AFTER_TYPE - getIconIndent();
-    final LookupElementPresentation presentation = new RealLookupElementPresentation(myFullSize ? getMaxWidth() : allowedWidth, myNormalMetrics, myBoldMetrics, myLookup);
+    final LookupElementPresentation presentation = new RealLookupElementPresentation(isSelected ? getMaxWidth() : allowedWidth, myNormalMetrics, myBoldMetrics, myLookup);
     if (item.isValid()) {
       item.renderElement(presentation);
     } else {
@@ -139,13 +139,37 @@ public class LookupCellRenderer implements ListCellRenderer {
 
     myTypeLabel.clear();
     if (allowedWidth > 0) {
-      allowedWidth -= setTypeTextLabel(item, background, foreground, presentation, myFullSize ? getMaxWidth() : allowedWidth, isSelected);
+      allowedWidth -= setTypeTextLabel(item, background, foreground, presentation, isSelected ? getMaxWidth() : allowedWidth, isSelected);
     }
 
     myTailComponent.clear();
     myTailComponent.setBackground(background);
-    if (myFullSize || allowedWidth >= 0) {
-      setTailTextLabel(isSelected, presentation, foreground, myFullSize ? getMaxWidth() : allowedWidth);
+    if (isSelected || allowedWidth >= 0) {
+      setTailTextLabel(isSelected, presentation, foreground, isSelected ? getMaxWidth() : allowedWidth);
+    }
+
+    if (mySelected.containsKey(index)) {
+      if (!isSelected && mySelected.get(index)) {
+        myPanel.setUpdateExtender(true);
+      }
+    }
+    mySelected.put(index, isSelected);
+
+    final double w = myNameComponent.getPreferredSize().getWidth() +
+                     myTailComponent.getPreferredSize().getWidth() +
+                     myTypeLabel.getPreferredSize().getWidth();
+
+    myPanel.removeAll();
+    if (isSelected && w > list.getWidth()) {
+      myPanel.setLayout(new BoxLayout(myPanel, BoxLayout.X_AXIS));
+      myPanel.add(myNameComponent);
+      myPanel.add(myTailComponent);
+      myPanel.add(myTypeLabel);
+    } else {
+      myPanel.setLayout(new BorderLayout());
+      myPanel.add(myNameComponent, BorderLayout.WEST);
+      myPanel.add(myTailComponent, BorderLayout.CENTER);
+      myPanel.add(myTypeLabel, BorderLayout.EAST);
     }
 
     return myPanel;
@@ -327,12 +351,6 @@ public class LookupCellRenderer implements ListCellRenderer {
     return RealLookupElementPresentation.calculateWidth(p, myNormalMetrics, myBoldMetrics) + AFTER_TAIL + AFTER_TYPE;
   }
 
-  public LookupCellRenderer createExtenderRenderer() {
-    LookupCellRenderer renderer = new LookupCellRenderer(myLookup, true);
-    renderer.myEmptyIcon = myEmptyIcon;
-    return renderer;
-  }
-
   public int getIconIndent() {
     return myNameComponent.getIconTextGap() + myEmptyIcon.getIconWidth();
   }
@@ -350,15 +368,23 @@ public class LookupCellRenderer implements ListCellRenderer {
   }
 
   private class LookupPanel extends JPanel {
+    boolean myUpdateExtender;
     public LookupPanel() {
       super(new BorderLayout());
     }
 
+    public void setUpdateExtender(boolean updateExtender) {
+      myUpdateExtender = updateExtender;
+    }
+
     public void paint(Graphics g){
       if (!myLookup.isFocused() && myLookup.isCompletion()) {
         ((Graphics2D)g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.6f));
       }
       super.paint(g);
+      //if (myUpdateExtender) {
+      //  myLookup.updateExtender();
+      //}
     }
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index 45903bca721d..19ff809c8012 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -41,6 +41,7 @@ import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.*;
 import com.intellij.openapi.editor.event.*;
+import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.keymap.KeymapUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.popup.JBPopup;
@@ -56,9 +57,7 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.impl.DebugUtil;
-import com.intellij.ui.LightweightHint;
-import com.intellij.ui.ListScrollingUtil;
-import com.intellij.ui.ScreenUtil;
+import com.intellij.ui.*;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.JBScrollPane;
@@ -97,12 +96,11 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
 
   private final Project myProject;
   private final Editor myEditor;
-  private CompletionExtender extender;
   private String myInitialPrefix;
 
   private boolean myStableStart;
   private RangeMarker myLookupStartMarker;
-  private final JList myList = new JBList(new DefaultListModel()) {
+  private final JBList myList = new JBList(new DefaultListModel()) {
     @Override
     protected void processKeyEvent(final KeyEvent e) {
       final char keyChar = e.getKeyChar();
@@ -118,6 +116,13 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
 
       super.processKeyEvent(e);
     }
+
+    ExpandableItemsHandler<Integer> myExtender = new CompletionExtender(this);
+    @NotNull
+    @Override
+    public ExpandableItemsHandler<Integer> getExpandableItemsHandler() {
+      return myExtender;
+    }
   };
   private final LookupCellRenderer myCellRenderer;
   private Boolean myPositionedAbove = null;
@@ -165,7 +170,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
     myPresentableArranger = arranger;
 
     myIconPanel.setVisible(false);
-    myCellRenderer = new LookupCellRenderer(this, false);
+    myCellRenderer = new LookupCellRenderer(this);
     myList.setCellRenderer(myCellRenderer);
 
     myList.setFocusable(false);
@@ -174,6 +179,8 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
     myList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     myList.setBackground(LookupCellRenderer.BACKGROUND_COLOR);
 
+    myList.getExpandableItemsHandler();
+
     myScrollBarIncreaseButton = new JButton();
     myScrollBarIncreaseButton.setFocusable(false);
     myScrollBarIncreaseButton.setRequestFocusEnabled(false);
@@ -188,7 +195,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
         return myScrollBarIncreaseButton;
       }
     });
-
     getComponent().add(myLayeredPane, BorderLayout.CENTER);
 
     //IDEA-82111
@@ -886,16 +892,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
           updateHint(item);
         }
         oldItem = item;
-
-        if (item != null && LookupImpl.this.isVisible() && LookupImpl.this.isFocused()) {
-          if (extender == null || !extender.isVisible() || !extender.sameAsFor(item)) {
-            if (extender != null) extender.hide();
-            extender = new CompletionExtender(item, LookupImpl.this);
-            if (!extender.show()) {
-              extender.hide();
-            }
-          }
-        }
       }
     });
 
@@ -1231,9 +1227,6 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
     }
     Disposer.dispose(myProcessIcon);
     Disposer.dispose(myHintAlarm);
-    if (extender != null) {
-      extender.hide();
-    }
     myDisposed = true;
     disposeTrace = DebugUtil.currentStackTrace() + "\n============";
     //noinspection AssignmentToStaticFieldFromInstanceMethod
@@ -1458,5 +1451,4 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
       return myPresentableArranger.getRelevanceStrings();
     }
   }
-
 }
diff --git a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
index 31bb933bfea0..95ad1d46b940 100644
--- a/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
+++ b/platform/platform-impl/src/com/intellij/ui/AbstractExpandableItemsHandler.java
@@ -89,7 +89,7 @@ abstract public class AbstractExpandableItemsHandler<KeyType, ComponentType exte
     myComponent.addFocusListener(
       new FocusAdapter() {
         public void focusLost(FocusEvent e) {
-          hideHint();
+          onFocusLost();
         }
 
         public void focusGained(FocusEvent e) {
@@ -134,6 +134,12 @@ abstract public class AbstractExpandableItemsHandler<KeyType, ComponentType exte
         }
       }
     );
+
+
+  }
+
+  protected void onFocusLost() {
+    hideHint();
   }
 
   @Override
@@ -160,7 +166,7 @@ abstract public class AbstractExpandableItemsHandler<KeyType, ComponentType exte
     handleMouseEvent(e, true);
   }
 
-  private void handleMouseEvent(MouseEvent e, boolean forceUpdate) {
+  protected void handleMouseEvent(MouseEvent e, boolean forceUpdate) {
     KeyType selected = getCellKeyForPoint(e.getPoint());
     if (forceUpdate || !Comparing.equal(myKey, selected)) {
       handleSelectionChange(selected, true);
@@ -307,14 +313,16 @@ abstract public class AbstractExpandableItemsHandler<KeyType, ComponentType exte
     g.translate(-(visibleRect.x + visibleRect.width - cellBounds.x), 0);
     doPaintTooltipImage(renderer, cellBounds, height, g, key);
 
-    // paint border
-    g.translate((visibleRect.x + visibleRect.width - cellBounds.x), 0);
-    g.setColor(Color.GRAY);
-    int rightX = myImage.getWidth() - 1;
-    final int h = myImage.getHeight();
-    UIUtil.drawLine(g, 0, 0, rightX, 0);
-    UIUtil.drawLine(g, rightX, 0, rightX, h);
-    UIUtil.drawLine(g, 0, h - 1, rightX, h - 1);
+
+    if (isPaintBorder()) {
+      g.translate((visibleRect.x + visibleRect.width - cellBounds.x), 0);
+      g.setColor(getBorderColor());
+      int rightX = myImage.getWidth() - 1;
+      final int h = myImage.getHeight();
+      UIUtil.drawLine(g, 0, 0, rightX, 0);
+      UIUtil.drawLine(g, rightX, 0, rightX, h);
+      UIUtil.drawLine(g, 0, h - 1, rightX, h - 1);
+    }
 
     g.dispose();
     myRendererPane.remove(renderer);
@@ -322,6 +330,14 @@ abstract public class AbstractExpandableItemsHandler<KeyType, ComponentType exte
     return new Point(visibleRect.x + visibleRect.width, cellBounds.y);
   }
 
+  protected boolean isPaintBorder() {
+    return true;
+  }
+
+  protected Color getBorderColor() {
+    return Color.GRAY;
+  }
+
   protected BufferedImage createImage(final int height, final int width) {
     return new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
   }