From 91064df3f324cfc4f03d1417a8f37f42290cf6f8 Mon Sep 17 00:00:00 2001 From: Willem Cazander 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 --> - - - + + + @@ -43,16 +43,18 @@ + - - - + + - + + + @@ -78,14 +80,14 @@ - + + - - + @@ -106,8 +108,8 @@ - + 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 --> + - - + \ 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 --> - - - + + + @@ -58,8 +58,8 @@ - + @@ -67,7 +67,9 @@ - + + + @@ -124,14 +126,14 @@ - - + + + - - + 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 @@ + 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 --> - + 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 @@ - + Test the global element configurator. - + Test the global element attribute1 handler.