From 91064df3f324cfc4f03d1417a8f37f42290cf6f8 Mon Sep 17 00:00:00 2001
From: Willem Cazander <w.cazander@gmail.com>
Date: Sun, 18 Nov 2012 06:29:11 +0100
Subject: [PATCH] Updated xsd with desciption tag on configuratorGlobal tag.

---
 .../org/x4o/xml/eld/EldModuleLoaderCore.java  |  1 +
 .../resources/META-INF/cel/cel-core-1.0.xsd   | 26 ++++++++++---------
 .../resources/META-INF/cel/cel-root-1.0.xsd   |  6 ++---
 .../resources/META-INF/eld/eld-conv-1.0.xsd   |  2 +-
 .../resources/META-INF/eld/eld-lang-1.0.xsd   | 22 +++++++++-------
 .../main/resources/META-INF/eld/eld-lang.eld  |  1 +
 .../resources/META-INF/eld/eld-root-1.0.xsd   |  4 +--
 .../resources/META-INF/test/test-lang.eld     |  4 +--
 8 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/x4o-core/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java b/x4o-core/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java
index f5d5895..0a5c7eb 100644
--- a/x4o-core/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java
+++ b/x4o-core/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java
@@ -285,6 +285,7 @@ public class EldModuleLoaderCore implements ElementLanguageModuleLoader {
 		ec.addElementParent("", "attributeHandler");
 		ec.addElementParent("", "bindingHandler");
 		ec.addElementParent("", "configurator");
+		ec.addElementParent("", "configuratorGlobal");
 		ec.addElementParent("", "elementInterface");
 		ec.addElementParent("", "element");
 		ec.addElementParent("", "attribute");
diff --git a/x4o-core/src/main/resources/META-INF/cel/cel-core-1.0.xsd b/x4o-core/src/main/resources/META-INF/cel/cel-core-1.0.xsd
index 3ea1038..f0a6024 100644
--- a/x4o-core/src/main/resources/META-INF/cel/cel-core-1.0.xsd
+++ b/x4o-core/src/main/resources/META-INF/cel/cel-core-1.0.xsd
@@ -7,7 +7,7 @@
 	ModuleName:		Core Element Languag Module
 	Namespaces:		2
 	Namespace:		http://cel.x4o.org/xml/ns/cel-core
-	Created on:		Sun Nov 18 05:10:55 CET 2012
+	Created on:		Sun Nov 18 06:22:14 CET 2012
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
  xmlns:this="http://cel.x4o.org/xml/ns/cel-core"
@@ -19,13 +19,13 @@
 		<attribute name="uri" type="string" use="required"/>
 		<attribute name="name" type="string"/>
 		<attribute name="prefixMapping" type="string"/>
-		<attribute name="elementNamespaceInstanceProvider" type="string"/>
-		<attribute name="schemaUri" type="string"/>
 		<attribute name="schemaResource" type="string"/>
 		<attribute name="schemaPrefix" type="string"/>
 		<attribute name="languageRoot" type="boolean"/>
-		<attribute name="description" type="string"/>
+		<attribute name="elementNamespaceInstanceProvider" type="string"/>
+		<attribute name="schemaUri" type="string"/>
 		<attribute name="id" type="string"/>
+		<attribute name="description" type="string"/>
 	</complexType>
 	<complexType name="descriptionType">
 		<simpleContent>
@@ -43,16 +43,18 @@
 		</choice>
 		<attribute name="objectClass" type="string"/>
 		<attribute name="elementClass" type="string"/>
+		<attribute name="tag" type="string"/>
 		<attribute name="schemaContentBase" type="string"/>
-		<attribute name="autoAttributes" type="boolean"/>
 		<attribute name="schemaContentComplex" type="boolean"/>
 		<attribute name="schemaContentMixed" type="boolean"/>
-		<attribute name="tag" type="string"/>
-		<attribute name="description" type="string"/>
+		<attribute name="autoAttributes" type="boolean"/>
 		<attribute name="id" type="string"/>
+		<attribute name="description" type="string"/>
 	</complexType>
 	<complexType name="configuratorGlobalType">
-		<choice minOccurs="0" maxOccurs="unbounded"/>
+		<choice minOccurs="0" maxOccurs="unbounded">
+			<element name="description" type="this:descriptionType"/>
+		</choice>
 		<attribute name="bean.class" type="string" use="required"/>
 		<attribute name="configAction" type="string"/>
 		<anyAttribute/>
@@ -78,14 +80,14 @@
 			<element name="description" type="this:descriptionType"/>
 		</choice>
 		<attribute name="name" type="string"/>
-		<attribute name="objectConverter" type="string"/>
+		<attribute name="defaultValue" type="string"/>
 		<attribute name="runResolveEL" type="boolean"/>
 		<attribute name="runConverters" type="boolean"/>
 		<attribute name="runBeanFill" type="boolean"/>
+		<attribute name="objectConverter" type="string"/>
 		<attribute name="required" type="boolean"/>
-		<attribute name="defaultValue" type="string"/>
-		<attribute name="description" type="string"/>
 		<attribute name="id" type="string"/>
+		<attribute name="description" type="string"/>
 	</complexType>
 	<complexType name="classConverterType">
 		<choice minOccurs="0" maxOccurs="unbounded"/>
@@ -106,8 +108,8 @@
 			<element name="description" type="this:descriptionType"/>
 		</choice>
 		<attribute name="interfaceClass" type="string"/>
-		<attribute name="description" type="string"/>
 		<attribute name="id" type="string"/>
+		<attribute name="description" type="string"/>
 	</complexType>
 	<complexType name="elementParentType">
 		<choice minOccurs="0" maxOccurs="unbounded"/>
diff --git a/x4o-core/src/main/resources/META-INF/cel/cel-root-1.0.xsd b/x4o-core/src/main/resources/META-INF/cel/cel-root-1.0.xsd
index c737f78..b76a7e5 100644
--- a/x4o-core/src/main/resources/META-INF/cel/cel-root-1.0.xsd
+++ b/x4o-core/src/main/resources/META-INF/cel/cel-root-1.0.xsd
@@ -7,7 +7,7 @@
 	ModuleName:		Core Element Languag Module
 	Namespaces:		2
 	Namespace:		http://cel.x4o.org/xml/ns/cel-root
-	Created on:		Sun Nov 18 05:10:55 CET 2012
+	Created on:		Sun Nov 18 06:22:14 CET 2012
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
  xmlns:cel-core="http://cel.x4o.org/xml/ns/cel-core"
@@ -24,11 +24,11 @@
 				<element ref="cel-core:namespace"/>
 			</choice>
 			<attribute name="name" type="string"/>
+			<attribute name="providerName" type="string"/>
 			<attribute name="sourceResource" type="string"/>
 			<attribute name="elementLanguageModuleLoader" type="string"/>
-			<attribute name="providerName" type="string"/>
-			<attribute name="description" type="string"/>
 			<attribute name="id" type="string"/>
+			<attribute name="description" type="string"/>
 		</complexType>
 	</element>
 </schema>
\ No newline at end of file
diff --git a/x4o-core/src/main/resources/META-INF/eld/eld-conv-1.0.xsd b/x4o-core/src/main/resources/META-INF/eld/eld-conv-1.0.xsd
index 8d1bbf3..ff0062b 100644
--- a/x4o-core/src/main/resources/META-INF/eld/eld-conv-1.0.xsd
+++ b/x4o-core/src/main/resources/META-INF/eld/eld-conv-1.0.xsd
@@ -7,7 +7,7 @@
 	ModuleName:		Element Language Definition
 	Namespaces:		3
 	Namespace:		http://eld.x4o.org/xml/ns/eld-conv
-	Created on:		Sun Nov 18 05:06:09 CET 2012
+	Created on:		Sun Nov 18 06:22:58 CET 2012
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
  xmlns:this="http://eld.x4o.org/xml/ns/eld-conv"
diff --git a/x4o-core/src/main/resources/META-INF/eld/eld-lang-1.0.xsd b/x4o-core/src/main/resources/META-INF/eld/eld-lang-1.0.xsd
index 97e8ed8..ae71ce0 100644
--- a/x4o-core/src/main/resources/META-INF/eld/eld-lang-1.0.xsd
+++ b/x4o-core/src/main/resources/META-INF/eld/eld-lang-1.0.xsd
@@ -7,7 +7,7 @@
 	ModuleName:		Element Language Definition
 	Namespaces:		3
 	Namespace:		http://eld.x4o.org/xml/ns/eld-lang
-	Created on:		Sun Nov 18 05:06:09 CET 2012
+	Created on:		Sun Nov 18 06:22:58 CET 2012
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
  xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"
@@ -20,14 +20,14 @@
 		</choice>
 		<attribute name="uri" type="string" use="required"/>
 		<attribute name="name" type="string"/>
-		<attribute name="languageRoot" type="boolean"/>
-		<attribute name="elementNamespaceInstanceProvider" type="string"/>
 		<attribute name="schemaUri" type="string"/>
 		<attribute name="schemaResource" type="string"/>
 		<attribute name="schemaPrefix" type="string"/>
 		<attribute name="prefixMapping" type="string"/>
-		<attribute name="description" type="string"/>
+		<attribute name="languageRoot" type="boolean"/>
+		<attribute name="elementNamespaceInstanceProvider" type="string"/>
 		<attribute name="id" type="string"/>
+		<attribute name="description" type="string"/>
 	</complexType>
 	<complexType name="descriptionType">
 		<simpleContent>
@@ -58,8 +58,8 @@
 		<attribute name="autoAttributes" type="boolean"/>
 		<attribute name="schemaContentComplex" type="boolean"/>
 		<attribute name="schemaContentMixed" type="boolean"/>
-		<attribute name="description" type="string"/>
 		<attribute name="id" type="string"/>
+		<attribute name="description" type="string"/>
 	</complexType>
 	<complexType name="attributeAliasType">
 		<choice minOccurs="0" maxOccurs="unbounded"/>
@@ -67,7 +67,9 @@
 		<anyAttribute/>
 	</complexType>
 	<complexType name="configuratorGlobalType">
-		<choice minOccurs="0" maxOccurs="unbounded"/>
+		<choice minOccurs="0" maxOccurs="unbounded">
+			<element name="description" type="this:descriptionType"/>
+		</choice>
 		<attribute name="id" type="string" use="required"/>
 		<attribute name="bean.class" type="string" use="required"/>
 		<attribute name="configAction" type="string"/>
@@ -124,14 +126,14 @@
 			<element name="description" type="this:descriptionType"/>
 		</choice>
 		<attribute name="name" type="string"/>
-		<attribute name="runConverters" type="boolean"/>
-		<attribute name="runBeanFill" type="boolean"/>
+		<attribute name="defaultValue" type="string"/>
 		<attribute name="objectConverter" type="string"/>
 		<attribute name="runResolveEL" type="boolean"/>
+		<attribute name="runConverters" type="boolean"/>
+		<attribute name="runBeanFill" type="boolean"/>
 		<attribute name="required" type="boolean"/>
-		<attribute name="defaultValue" type="string"/>
-		<attribute name="description" type="string"/>
 		<attribute name="id" type="string"/>
+		<attribute name="description" type="string"/>
 	</complexType>
 	<complexType name="bindingHandlerType">
 		<choice minOccurs="0" maxOccurs="unbounded">
diff --git a/x4o-core/src/main/resources/META-INF/eld/eld-lang.eld b/x4o-core/src/main/resources/META-INF/eld/eld-lang.eld
index 0fc932c..8f1fbb7 100644
--- a/x4o-core/src/main/resources/META-INF/eld/eld-lang.eld
+++ b/x4o-core/src/main/resources/META-INF/eld/eld-lang.eld
@@ -163,6 +163,7 @@
 			<elementParent tag="bindingHandler"/>
 			<elementParent tag="attributeHandler"/>
 			<elementParent tag="configurator"/>
+			<elementParent tag="configuratorGlobal"/>
 			<elementParent tag="elementInterface"/>
 			<elementParent tag="element"/>
 			<elementParent tag="attribute"/>
diff --git a/x4o-core/src/main/resources/META-INF/eld/eld-root-1.0.xsd b/x4o-core/src/main/resources/META-INF/eld/eld-root-1.0.xsd
index 2c32eae..fe6cef6 100644
--- a/x4o-core/src/main/resources/META-INF/eld/eld-root-1.0.xsd
+++ b/x4o-core/src/main/resources/META-INF/eld/eld-root-1.0.xsd
@@ -7,7 +7,7 @@
 	ModuleName:		Element Language Definition
 	Namespaces:		3
 	Namespace:		http://eld.x4o.org/xml/ns/eld-root
-	Created on:		Sun Nov 18 05:06:09 CET 2012
+	Created on:		Sun Nov 18 06:22:58 CET 2012
 -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
  xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"
@@ -29,9 +29,9 @@
 			</choice>
 			<attribute name="id" type="string" use="required"/>
 			<attribute name="name" type="string"/>
-			<attribute name="providerName" type="string"/>
 			<attribute name="sourceResource" type="string"/>
 			<attribute name="elementLanguageModuleLoader" type="string"/>
+			<attribute name="providerName" type="string"/>
 			<attribute name="description" type="string"/>
 		</complexType>
 	</element>
diff --git a/x4o-core/src/test/resources/META-INF/test/test-lang.eld b/x4o-core/src/test/resources/META-INF/test/test-lang.eld
index f50a583..f1b6756 100644
--- a/x4o-core/src/test/resources/META-INF/test/test-lang.eld
+++ b/x4o-core/src/test/resources/META-INF/test/test-lang.eld
@@ -66,9 +66,9 @@
 		</eld:classBindingHandler>
 	</eld:elementInterface>
 	
-	<eld:configurator bean.class="org.x4o.xml.test.element.TestElementConfigurator" id="testConfigGlobal">
+	<eld:configuratorGlobal bean.class="org.x4o.xml.test.element.TestElementConfigurator" id="testConfigGlobal">
 		<eld:description>Test the global element configurator.</eld:description>
-	</eld:configurator>
+	</eld:configuratorGlobal>
 	
 	<eld:attributeHandler attributeName="tt.attr1" bean.class="org.x4o.xml.test.element.TestElementAttributeHandler" id="attrTest1">
 		<eld:description>Test the global element attribute1 handler.</eld:description>