From dcc9de7b0e4ae816b06b4bdffcbe136d4428ab03 Mon Sep 17 00:00:00 2001
From: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Date: Sun, 15 Mar 2015 19:36:06 -0400
Subject: [PATCH] fixed schema validation error on Mars

- more errors...

Change-Id: Iab24ae4f7e95bd674765855b54eeb7de019b2162
---
 core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd | 5 +++--
 core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd    | 5 +++--
 core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd  | 5 +++--
 qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd   | 5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd b/core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd
index 11d86c76647..d9cd9d5f7af 100644
--- a/core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd
+++ b/core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd
@@ -1,6 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+
+<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.cdt.ui" id="quickAssistProcessors" name="Quick Assist Processor"/>
@@ -15,8 +18,6 @@ This extension point supports the &lt;code&gt;enablement&lt;/code&gt; tag. Prope
       </documentation>
    </annotation>
 
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
    <element name="extension">
       <annotation>
          <appInfo>
diff --git a/core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd b/core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd
index b121f85897d..0668585a335 100644
--- a/core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd
+++ b/core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd
@@ -1,6 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+
+<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.cdt.ui" id="quickFixProcessors" name="Quick Fix Processor"/>
@@ -20,8 +23,6 @@ This extension point supports the &lt;code&gt;enablement&lt;/code&gt; tag. Prope
       </documentation>
    </annotation>
 
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
    <element name="extension">
       <annotation>
          <appInfo>
diff --git a/core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd b/core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd
index 0b385401e32..69c8b45ddf8 100644
--- a/core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd
+++ b/core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd
@@ -1,6 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+
+<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.cdt.ui" id="semanticHighligher" name="Semantic Highlighting"/>
@@ -23,8 +26,6 @@ Contributed highlightings will be visible in the Code tree of the &apos;C/C++ -
       </documentation>
    </annotation>
 
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
    <element name="extension">
       <annotation>
          <appInfo>
diff --git a/qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd b/qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd
index 00fe50ff479..6ea5bf9ae5b 100644
--- a/qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd
+++ b/qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd
@@ -1,6 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.qt.core" xmlns="http://www.w3.org/2001/XMLSchema">
+
+<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
 <annotation>
       <appinfo>
          <meta.schema plugin="org.eclipse.cdt.qt.core" id="qmakeEnvProvider" name="QMake Environment Provider"/>
@@ -10,8 +13,6 @@
       </documentation>
    </annotation>
 
-   <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
    <element name="extension">
       <annotation>
          <appinfo>