arch-jedi/x4o
2
0
Fork 0
Code Issues 2 Pull requests Activity

Updated xsd with desciption tag on configuratorGlobal tag.

Browse source
This commit is contained in:
Willem Cazander 2012-11-18 06:29:11 +01:00
parent 9b286c7fbf
commit 91064df3f3
8 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
x4o-core/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java
View file

@ -285,6 +285,7 @@ public class EldModuleLoaderCore implements ElementLanguageModuleLoader {
ec.addElementParent("", "attributeHandler"); ec.addElementParent("", "attributeHandler");
ec.addElementParent("", "bindingHandler"); ec.addElementParent("", "bindingHandler");
ec.addElementParent("", "configurator"); ec.addElementParent("", "configurator");
ec.addElementParent("", "configuratorGlobal");
ec.addElementParent("", "elementInterface"); ec.addElementParent("", "elementInterface");
ec.addElementParent("", "element"); ec.addElementParent("", "element");
ec.addElementParent("", "attribute"); ec.addElementParent("", "attribute");

26
x4o-core/src/main/resources/META-INF/cel/cel-core-1.0.xsd
View file

@ -7,7 +7,7 @@
ModuleName: Core Element Languag Module ModuleName: Core Element Languag Module
Namespaces: 2 Namespaces: 2
Namespace: http://cel.x4o.org/xml/ns/cel-core 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" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:this="http://cel.x4o.org/xml/ns/cel-core" xmlns:this="http://cel.x4o.org/xml/ns/cel-core"
@ -19,13 +19,13 @@
<attribute name="uri" type="string" use="required"/> <attribute name="uri" type="string" use="required"/>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="prefixMapping" type="string"/> <attribute name="prefixMapping" type="string"/>
<attribute name="elementNamespaceInstanceProvider" type="string"/>
<attribute name="schemaUri" type="string"/>
<attribute name="schemaResource" type="string"/> <attribute name="schemaResource" type="string"/>
<attribute name="schemaPrefix" type="string"/> <attribute name="schemaPrefix" type="string"/>
<attribute name="languageRoot" type="boolean"/> <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="id" type="string"/>
<attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="descriptionType"> <complexType name="descriptionType">
<simpleContent> <simpleContent>
@ -43,16 +43,18 @@
</choice> </choice>
<attribute name="objectClass" type="string"/> <attribute name="objectClass" type="string"/>
<attribute name="elementClass" type="string"/> <attribute name="elementClass" type="string"/>
<attribute name="tag" type="string"/>
<attribute name="schemaContentBase" type="string"/> <attribute name="schemaContentBase" type="string"/>
<attribute name="autoAttributes" type="boolean"/>
<attribute name="schemaContentComplex" type="boolean"/> <attribute name="schemaContentComplex" type="boolean"/>
<attribute name="schemaContentMixed" type="boolean"/> <attribute name="schemaContentMixed" type="boolean"/>
<attribute name="tag" type="string"/> <attribute name="autoAttributes" type="boolean"/>
<attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
<attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="configuratorGlobalType"> <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="bean.class" type="string" use="required"/>
<attribute name="configAction" type="string"/> <attribute name="configAction" type="string"/>
<anyAttribute/> <anyAttribute/>
@ -78,14 +80,14 @@
<element name="description" type="this:descriptionType"/> <element name="description" type="this:descriptionType"/>
</choice> </choice>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="objectConverter" type="string"/> <attribute name="defaultValue" type="string"/>
<attribute name="runResolveEL" type="boolean"/> <attribute name="runResolveEL" type="boolean"/>
<attribute name="runConverters" type="boolean"/> <attribute name="runConverters" type="boolean"/>
<attribute name="runBeanFill" type="boolean"/> <attribute name="runBeanFill" type="boolean"/>
<attribute name="objectConverter" type="string"/>
<attribute name="required" type="boolean"/> <attribute name="required" type="boolean"/>
<attribute name="defaultValue" type="string"/>
<attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
<attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="classConverterType"> <complexType name="classConverterType">
<choice minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"/>
@ -106,8 +108,8 @@
<element name="description" type="this:descriptionType"/> <element name="description" type="this:descriptionType"/>
</choice> </choice>
<attribute name="interfaceClass" type="string"/> <attribute name="interfaceClass" type="string"/>
<attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
<attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="elementParentType"> <complexType name="elementParentType">
<choice minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"/>

6
x4o-core/src/main/resources/META-INF/cel/cel-root-1.0.xsd
View file

@ -7,7 +7,7 @@
ModuleName: Core Element Languag Module ModuleName: Core Element Languag Module
Namespaces: 2 Namespaces: 2
Namespace: http://cel.x4o.org/xml/ns/cel-root 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" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:cel-core="http://cel.x4o.org/xml/ns/cel-core" xmlns:cel-core="http://cel.x4o.org/xml/ns/cel-core"
@ -24,11 +24,11 @@
<element ref="cel-core:namespace"/> <element ref="cel-core:namespace"/>
</choice> </choice>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="providerName" type="string"/>
<attribute name="sourceResource" type="string"/> <attribute name="sourceResource" type="string"/>
<attribute name="elementLanguageModuleLoader" type="string"/> <attribute name="elementLanguageModuleLoader" type="string"/>
<attribute name="providerName" type="string"/>
<attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
<attribute name="description" type="string"/>
</complexType> </complexType>
</element> </element>
</schema> </schema>

2
x4o-core/src/main/resources/META-INF/eld/eld-conv-1.0.xsd
View file

@ -7,7 +7,7 @@
ModuleName: Element Language Definition ModuleName: Element Language Definition
Namespaces: 3 Namespaces: 3
Namespace: http://eld.x4o.org/xml/ns/eld-conv 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" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:this="http://eld.x4o.org/xml/ns/eld-conv" xmlns:this="http://eld.x4o.org/xml/ns/eld-conv"

22
x4o-core/src/main/resources/META-INF/eld/eld-lang-1.0.xsd
View file

@ -7,7 +7,7 @@
ModuleName: Element Language Definition ModuleName: Element Language Definition
Namespaces: 3 Namespaces: 3
Namespace: http://eld.x4o.org/xml/ns/eld-lang 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" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv" xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"
@ -20,14 +20,14 @@
</choice> </choice>
<attribute name="uri" type="string" use="required"/> <attribute name="uri" type="string" use="required"/>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="languageRoot" type="boolean"/>
<attribute name="elementNamespaceInstanceProvider" type="string"/>
<attribute name="schemaUri" type="string"/> <attribute name="schemaUri" type="string"/>
<attribute name="schemaResource" type="string"/> <attribute name="schemaResource" type="string"/>
<attribute name="schemaPrefix" type="string"/> <attribute name="schemaPrefix" type="string"/>
<attribute name="prefixMapping" 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="id" type="string"/>
<attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="descriptionType"> <complexType name="descriptionType">
<simpleContent> <simpleContent>
@ -58,8 +58,8 @@
<attribute name="autoAttributes" type="boolean"/> <attribute name="autoAttributes" type="boolean"/>
<attribute name="schemaContentComplex" type="boolean"/> <attribute name="schemaContentComplex" type="boolean"/>
<attribute name="schemaContentMixed" type="boolean"/> <attribute name="schemaContentMixed" type="boolean"/>
<attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
<attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="attributeAliasType"> <complexType name="attributeAliasType">
<choice minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"/>
@ -67,7 +67,9 @@
<anyAttribute/> <anyAttribute/>
</complexType> </complexType>
<complexType name="configuratorGlobalType"> <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="id" type="string" use="required"/>
<attribute name="bean.class" type="string" use="required"/> <attribute name="bean.class" type="string" use="required"/>
<attribute name="configAction" type="string"/> <attribute name="configAction" type="string"/>
@ -124,14 +126,14 @@
<element name="description" type="this:descriptionType"/> <element name="description" type="this:descriptionType"/>
</choice> </choice>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="runConverters" type="boolean"/> <attribute name="defaultValue" type="string"/>
<attribute name="runBeanFill" type="boolean"/>
<attribute name="objectConverter" type="string"/> <attribute name="objectConverter" type="string"/>
<attribute name="runResolveEL" type="boolean"/> <attribute name="runResolveEL" type="boolean"/>
<attribute name="runConverters" type="boolean"/>
<attribute name="runBeanFill" type="boolean"/>
<attribute name="required" type="boolean"/> <attribute name="required" type="boolean"/>
<attribute name="defaultValue" type="string"/>
<attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
<attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="bindingHandlerType"> <complexType name="bindingHandlerType">
<choice minOccurs="0" maxOccurs="unbounded"> <choice minOccurs="0" maxOccurs="unbounded">

1
x4o-core/src/main/resources/META-INF/eld/eld-lang.eld
View file

@ -163,6 +163,7 @@
<elementParent tag="bindingHandler"/> <elementParent tag="bindingHandler"/>
<elementParent tag="attributeHandler"/> <elementParent tag="attributeHandler"/>
<elementParent tag="configurator"/> <elementParent tag="configurator"/>
<elementParent tag="configuratorGlobal"/>
<elementParent tag="elementInterface"/> <elementParent tag="elementInterface"/>
<elementParent tag="element"/> <elementParent tag="element"/>
<elementParent tag="attribute"/> <elementParent tag="attribute"/>

4
x4o-core/src/main/resources/META-INF/eld/eld-root-1.0.xsd
View file

@ -7,7 +7,7 @@
ModuleName: Element Language Definition ModuleName: Element Language Definition
Namespaces: 3 Namespaces: 3
Namespace: http://eld.x4o.org/xml/ns/eld-root 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" <schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv" xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"
@ -29,9 +29,9 @@
</choice> </choice>
<attribute name="id" type="string" use="required"/> <attribute name="id" type="string" use="required"/>
<attribute name="name" type="string"/> <attribute name="name" type="string"/>
<attribute name="providerName" type="string"/>
<attribute name="sourceResource" type="string"/> <attribute name="sourceResource" type="string"/>
<attribute name="elementLanguageModuleLoader" type="string"/> <attribute name="elementLanguageModuleLoader" type="string"/>
<attribute name="providerName" type="string"/>
<attribute name="description" type="string"/> <attribute name="description" type="string"/>
</complexType> </complexType>
</element> </element>

4
x4o-core/src/test/resources/META-INF/test/test-lang.eld
View file

@ -66,9 +66,9 @@
</eld:classBindingHandler> </eld:classBindingHandler>
</eld:elementInterface> </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: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:attributeHandler attributeName="tt.attr1" bean.class="org.x4o.xml.test.element.TestElementAttributeHandler" id="attrTest1">
<eld:description>Test the global element attribute1 handler.</eld:description> <eld:description>Test the global element attribute1 handler.</eld:description>