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

Moved global attributes to namespace attribute to reflect schema

Browse source 
infoset.
This commit is contained in:
Willem Cazander 2013-08-24 22:04:18 +02:00
parent 4e9052244c
commit 57f3c20655
34 changed files with 958 additions and 1158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
x4o-driver/src/main/java/org/x4o/xml/eld/EldModuleLoaderCore.java
View file

@ -150,8 +150,8 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader {
ec.addElementClassAttribute(createElementClassAttribute(language,"bean.class",true,null)); ec.addElementClassAttribute(createElementClassAttribute(language,"bean.class",true,null));
namespace.addElementClass(ec); namespace.addElementClass(ec);
ec = createElementClass(language,"attributeHandler",null,BeanElement.class,"Defines generic attribute handler for language."); ec = createElementClass(language,"namespaceAttribute",null,BeanElement.class,"Defines generic namespace attribute for language.");
ec.addElementParent(CEL_ROOT_URI, "module"); ec.addElementParent(CEL_CORE_URI, "namespace");
ec.addElementClassAttribute(createElementClassAttribute(language,"bean.class",true,null)); ec.addElementClassAttribute(createElementClassAttribute(language,"bean.class",true,null));
namespace.addElementClass(ec); namespace.addElementClass(ec);
@ -172,7 +172,7 @@ public class EldModuleLoaderCore implements X4OLanguageModuleLoader {
ec.setSchemaContentBase("string"); ec.setSchemaContentBase("string");
ec.addElementParent(CEL_ROOT_URI, "module"); ec.addElementParent(CEL_ROOT_URI, "module");
ec.addElementParent(CEL_CORE_URI, "namespace"); ec.addElementParent(CEL_CORE_URI, "namespace");
ec.addElementParent(CEL_CORE_URI, "attributeHandler"); ec.addElementParent(CEL_CORE_URI, "namespaceAttribute");
ec.addElementParent(CEL_CORE_URI, "bindingHandler"); ec.addElementParent(CEL_CORE_URI, "bindingHandler");
ec.addElementParent(CEL_CORE_URI, "configurator"); ec.addElementParent(CEL_CORE_URI, "configurator");
ec.addElementParent(CEL_CORE_URI, "configuratorGlobal"); ec.addElementParent(CEL_CORE_URI, "configuratorGlobal");

10
x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementModuleBindingHandler.java
View file

@ -25,7 +25,6 @@ package org.x4o.xml.eld.lang;
import org.x4o.xml.eld.EldModuleLoader; import org.x4o.xml.eld.EldModuleLoader;
import org.x4o.xml.element.AbstractElementBindingHandler; import org.x4o.xml.element.AbstractElementBindingHandler;
import org.x4o.xml.element.Element; import org.x4o.xml.element.Element;
import org.x4o.xml.element.ElementAttributeHandler;
import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementBindingHandlerException; import org.x4o.xml.element.ElementBindingHandlerException;
import org.x4o.xml.element.ElementConfiguratorGlobal; import org.x4o.xml.element.ElementConfiguratorGlobal;
@ -51,7 +50,6 @@ public class ElementModuleBindingHandler extends AbstractElementBindingHandler<
ElementInterface.class, ElementInterface.class,
ElementNamespace.class, ElementNamespace.class,
ElementBindingHandler.class, ElementBindingHandler.class,
ElementAttributeHandler.class,
ElementConfiguratorGlobal.class, ElementConfiguratorGlobal.class,
}; };
@ -151,11 +149,6 @@ public class ElementModuleBindingHandler extends AbstractElementBindingHandler<
languageModule.addElementBindingHandler(elementBindingHandler); languageModule.addElementBindingHandler(elementBindingHandler);
return; return;
} }
if (childObject instanceof ElementAttributeHandler) {
ElementAttributeHandler elementAttributeHandler = (ElementAttributeHandler)childObject;
languageModule.addElementAttributeHandler(elementAttributeHandler);
return;
}
if (childObject instanceof ElementConfiguratorGlobal) { if (childObject instanceof ElementConfiguratorGlobal) {
ElementConfiguratorGlobal elementConfigurator = (ElementConfiguratorGlobal)childObject; ElementConfiguratorGlobal elementConfigurator = (ElementConfiguratorGlobal)childObject;
languageModule.addElementConfiguratorGlobal(elementConfigurator); languageModule.addElementConfiguratorGlobal(elementConfigurator);
@ -176,9 +169,6 @@ public class ElementModuleBindingHandler extends AbstractElementBindingHandler<
for (ElementBindingHandler child:parent.getElementBindingHandlers()) { for (ElementBindingHandler child:parent.getElementBindingHandlers()) {
createChild(parentElement, child); createChild(parentElement, child);
} }
for (ElementAttributeHandler child:parent.getElementAttributeHandlers()) {
createChild(parentElement, child);
}
for (ElementConfiguratorGlobal child:parent.getElementConfiguratorGlobals()) { for (ElementConfiguratorGlobal child:parent.getElementConfiguratorGlobals()) {
createChild(parentElement, child); createChild(parentElement, child);
} }

12
x4o-driver/src/main/java/org/x4o/xml/eld/lang/ElementNamespaceBindingHandler.java
View file

@ -27,6 +27,7 @@ import org.x4o.xml.element.Element;
import org.x4o.xml.element.ElementBindingHandlerException; import org.x4o.xml.element.ElementBindingHandlerException;
import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClass;
import org.x4o.xml.element.ElementNamespace; import org.x4o.xml.element.ElementNamespace;
import org.x4o.xml.element.ElementNamespaceAttribute;
/** /**
* ElementNamespaceBindingHandler binds ElementClass into namespace. * ElementNamespaceBindingHandler binds ElementClass into namespace.
@ -37,7 +38,8 @@ import org.x4o.xml.element.ElementNamespace;
public class ElementNamespaceBindingHandler extends AbstractElementBindingHandler<ElementNamespace> { public class ElementNamespaceBindingHandler extends AbstractElementBindingHandler<ElementNamespace> {
private final static Class<?>[] CLASSES_CHILD = new Class[] { private final static Class<?>[] CLASSES_CHILD = new Class[] {
ElementClass.class ElementClass.class,
ElementNamespaceAttribute.class
}; };
/** /**
@ -65,6 +67,11 @@ public class ElementNamespaceBindingHandler extends AbstractElementBindingHandle
} }
parent.addElementClass(elementClass); parent.addElementClass(elementClass);
} }
if (childObject instanceof ElementNamespaceAttribute) {
ElementNamespaceAttribute elementNamespaceAttribute = (ElementNamespaceAttribute)childObject;
parent.addElementNamespaceAttribute(elementNamespaceAttribute);
return;
}
} }
/** /**
@ -74,5 +81,8 @@ public class ElementNamespaceBindingHandler extends AbstractElementBindingHandle
for (ElementClass child:parent.getElementClasses()) { for (ElementClass child:parent.getElementClasses()) {
createChild(parentElement, child); createChild(parentElement, child);
} }
for (ElementNamespaceAttribute child:parent.getElementNamespaceAttributes()) {
createChild(parentElement, child);
}
} }
} }

6
x4o-driver/src/main/java/org/x4o/xml/eld/lang/NextAttributeElement.java
View file

@ -23,7 +23,7 @@
package org.x4o.xml.eld.lang; package org.x4o.xml.eld.lang;
import org.x4o.xml.element.AbstractElement; import org.x4o.xml.element.AbstractElement;
import org.x4o.xml.element.ElementAttributeHandler; import org.x4o.xml.element.ElementNamespaceAttribute;
import org.x4o.xml.element.ElementException; import org.x4o.xml.element.ElementException;
/** /**
@ -44,8 +44,8 @@ public class NextAttributeElement extends AbstractElement {
if (getParent()==null) { if (getParent()==null) {
throw new ElementException("can't be a root tag"); throw new ElementException("can't be a root tag");
} }
if (getParent().getElementObject() instanceof ElementAttributeHandler) { if (getParent().getElementObject() instanceof ElementNamespaceAttribute) {
((ElementAttributeHandler)getParent().getElementObject()).addNextAttribute(param); ((ElementNamespaceAttribute)getParent().getElementObject()).addNextAttribute(param);
} else { } else {
throw new ElementException("Wrong parent class"); throw new ElementException("Wrong parent class");
} }

7
x4o-driver/src/main/java/org/x4o/xml/eld/xsd/EldXsdXmlWriter.java
View file

@ -32,7 +32,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.x4o.xml.element.ElementAttributeHandler; import org.x4o.xml.element.ElementNamespaceAttribute;
import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClass;
import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.element.ElementClassAttribute;
@ -288,9 +288,9 @@ public class EldXsdXmlWriter {
writeElementAttribute(null,atts); writeElementAttribute(null,atts);
} }
} }
/* TODO: fix xsd namespace attribute printing !!!
for (X4OLanguageModule mod:language.getLanguageModules()) { for (X4OLanguageModule mod:language.getLanguageModules()) {
for (ElementAttributeHandler eah:mod.getElementAttributeHandlers()) { for (ElementNamespaceAttribute eah:ns.getElementNamespaceAttributes()) {
attrNames.add(eah.getAttributeName()); attrNames.add(eah.getAttributeName());
atts = new AttributesImpl(); atts = new AttributesImpl();
atts.addAttribute ("", "name", "", "", eah.getAttributeName()); atts.addAttribute ("", "name", "", "", eah.getAttributeName());
@ -298,6 +298,7 @@ public class EldXsdXmlWriter {
writeElementAttribute(eah,atts); writeElementAttribute(eah,atts);
} }
} }
*/
if (ec.getAutoAttributes()!=null && ec.getAutoAttributes()==false) { if (ec.getAutoAttributes()!=null && ec.getAutoAttributes()==false) {
// oke, reverse this if and rm whitespace. // oke, reverse this if and rm whitespace.

20
x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespace.java
View file

@ -44,9 +44,11 @@ public abstract class AbstractElementNamespace extends AbstractElementMetaBase i
private String schemaResource = null; private String schemaResource = null;
private String schemaPrefix = null; private String schemaPrefix = null;
private Boolean languageRoot = null; private Boolean languageRoot = null;
private List<ElementNamespaceAttribute> elementNamespaceAttributes = null;
public AbstractElementNamespace() { public AbstractElementNamespace() {
elementClasses = new HashMap<String,ElementClass>(100); elementClasses = new HashMap<String,ElementClass>(60);
elementNamespaceAttributes = new ArrayList<ElementNamespaceAttribute>(5);
} }
/** /**
@ -184,4 +186,20 @@ public abstract class AbstractElementNamespace extends AbstractElementMetaBase i
public void setSchemaPrefix(String schemaPrefix) { public void setSchemaPrefix(String schemaPrefix) {
this.schemaPrefix = schemaPrefix; this.schemaPrefix = schemaPrefix;
} }
public void addElementNamespaceAttribute(ElementNamespaceAttribute elementNamespaceAttribute) {
if (elementNamespaceAttribute==null) {
throw new NullPointerException("Can't add null object");
}
if (elementNamespaceAttribute.getId()==null) {
throw new NullPointerException("Can't add with null id property.");
}
//logger.finer("Adding elementNamespaceAttribute: "+elementNamespaceAttribute.getAttributeName());
elementNamespaceAttributes.add(elementNamespaceAttribute);
}
public List<ElementNamespaceAttribute> getElementNamespaceAttributes() {
return elementNamespaceAttributes;
}
} }

14
x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementAttributeHandler.java → x4o-driver/src/main/java/org/x4o/xml/element/AbstractElementNamespaceAttribute.java
View file

@ -26,18 +26,18 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* An AbstractElementAttributeHandler. * An AbstractElementNamespaceAttribute.
* *
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 Aug 10, 2006 * @version 1.0 Aug 10, 2006
*/ */
public abstract class AbstractElementAttributeHandler extends AbstractElementConfigurator implements ElementAttributeHandler { public abstract class AbstractElementNamespaceAttribute extends AbstractElementConfigurator implements ElementNamespaceAttribute {
private String attributeName = null; private String attributeName = null;
private List<String> nextAttributes = new ArrayList<String>(2); private List<String> nextAttributes = new ArrayList<String>(2);
/** /**
* @see org.x4o.xml.element.ElementAttributeHandler#addNextAttribute(java.lang.String) * @see org.x4o.xml.element.ElementNamespaceAttribute#addNextAttribute(java.lang.String)
*/ */
public void addNextAttribute(String attribute) { public void addNextAttribute(String attribute) {
if (attribute==null) { if (attribute==null) {
@ -47,7 +47,7 @@ public abstract class AbstractElementAttributeHandler extends AbstractElementCon
} }
/** /**
* @see org.x4o.xml.element.ElementAttributeHandler#removeNextAttribute(java.lang.String) * @see org.x4o.xml.element.ElementNamespaceAttribute#removeNextAttribute(java.lang.String)
*/ */
public void removeNextAttribute(String attribute) { public void removeNextAttribute(String attribute) {
if (attribute==null) { if (attribute==null) {
@ -57,21 +57,21 @@ public abstract class AbstractElementAttributeHandler extends AbstractElementCon
} }
/** /**
* @see org.x4o.xml.element.ElementAttributeHandler#getNextAttributes() * @see org.x4o.xml.element.ElementNamespaceAttribute#getNextAttributes()
*/ */
public List<String> getNextAttributes() { public List<String> getNextAttributes() {
return nextAttributes; return nextAttributes;
} }
/** /**
* @see org.x4o.xml.element.ElementAttributeHandler#getAttributeName() * @see org.x4o.xml.element.ElementNamespaceAttribute#getAttributeName()
*/ */
public String getAttributeName() { public String getAttributeName() {
return attributeName; return attributeName;
} }
/** /**
* @see org.x4o.xml.element.ElementAttributeHandler#setAttributeName(java.lang.String) * @see org.x4o.xml.element.ElementNamespaceAttribute#setAttributeName(java.lang.String)
*/ */
public void setAttributeName(String attributeName) { public void setAttributeName(String attributeName) {
this.attributeName=attributeName; this.attributeName=attributeName;

12
x4o-driver/src/main/java/org/x4o/xml/element/DefaultGlobalAttributeHandlerComparator.java → x4o-driver/src/main/java/org/x4o/xml/element/DefaultElementNamespaceAttributeComparator.java
View file

@ -27,21 +27,21 @@ import java.util.Comparator;
/** /**
* The DefaultGlobalAttributeHandlerComparator.<br> * The DefaultElementNamespaceAttributeComparator.<br>
* This Comparator compares the NextAttribute names with the attributeName of the ElementAttributeHandlers.<br> * This Comparator compares the NextAttribute names with the attributeName of the ElementNamespaceAttribute.<br>
* *
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 Feb 14, 2007 * @version 1.0 Feb 14, 2007
*/ */
public class DefaultGlobalAttributeHandlerComparator implements Comparator<ElementAttributeHandler> { public class DefaultElementNamespaceAttributeComparator implements Comparator<ElementNamespaceAttribute> {
/** /**
* @param e1 The first ElementAttributeHandler to compare. * @param e1 The first ElementNamespaceAttribute to compare.
* @param e2 The second ElementAttributeHandler to compare. * @param e2 The second ElementNamespaceAttribute to compare.
* @return 0 is same. * @return 0 is same.
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object) * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/ */
public int compare(ElementAttributeHandler e1, ElementAttributeHandler e2) { public int compare(ElementNamespaceAttribute e1, ElementNamespaceAttribute e2) {
for (String param:e1.getNextAttributes()) { for (String param:e1.getNextAttributes()) {
if(param.equals(e2.getAttributeName())) { if(param.equals(e2.getAttributeName())) {

12
x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespace.java
View file

@ -144,4 +144,16 @@ public interface ElementNamespace extends ElementMetaBase {
* @param schemaPrefix the schemaPrefix to set * @param schemaPrefix the schemaPrefix to set
*/ */
void setSchemaPrefix(String schemaPrefix); void setSchemaPrefix(String schemaPrefix);
/**
* Adds an ElementNamespaceAttribute.
* @param elementNamespaceAttribute Adds an ElementNamespaceAttribute.
*/
void addElementNamespaceAttribute(ElementNamespaceAttribute elementNamespaceAttribute);
/**
* Geta All ElementNamespaceAttributes.
* @return Returns an List of ElementNamespaceAttributes.
*/
List<ElementNamespaceAttribute> getElementNamespaceAttributes();
} }

4
x4o-driver/src/main/java/org/x4o/xml/element/ElementAttributeHandler.java → x4o-driver/src/main/java/org/x4o/xml/element/ElementNamespaceAttribute.java
View file

@ -30,7 +30,7 @@ import java.util.List;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 Aug 20, 2005 * @version 1.0 Aug 20, 2005
*/ */
public interface ElementAttributeHandler extends ElementConfigurator { public interface ElementNamespaceAttribute extends ElementConfigurator {
/** /**
* Gets the attribute name this attribute handler handles. * Gets the attribute name this attribute handler handles.
@ -46,7 +46,7 @@ public interface ElementAttributeHandler extends ElementConfigurator {
/** /**
* Adds an NextAttribute. * Adds an NextAttribute.
* There next attributes will defines the order in which the ElementAttributeHandlers are executed. * There next attributes will defines the order in which the ElementNamespaceAttribute are executed.
* @param attribute Add attribute which be will processed after this one. * @param attribute Add attribute which be will processed after this one.
*/ */
void addNextAttribute(String attribute); void addNextAttribute(String attribute);

2
x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OReader.java
View file

@ -64,7 +64,7 @@ public class DefaultX4OReader<T> extends AbstractX4OReader<T> {
private X4OLanguageSession languageSession = null; private X4OLanguageSession languageSession = null;
private PropertyConfig propertyConfig; private final PropertyConfig propertyConfig;
private final static String PROPERTY_CONTEXT_PREFIX = PropertyConfig.X4O_PROPERTIES_PREFIX+PropertyConfig.X4O_PROPERTIES_READER; private final static String PROPERTY_CONTEXT_PREFIX = PropertyConfig.X4O_PROPERTIES_PREFIX+PropertyConfig.X4O_PROPERTIES_READER;
private final static String PROPERTY_SAX_ERROR_HANDLER = "sax/error-handler"; private final static String PROPERTY_SAX_ERROR_HANDLER = "sax/error-handler";

2
x4o-driver/src/main/java/org/x4o/xml/io/DefaultX4OWriter.java
View file

@ -59,7 +59,7 @@ import org.xml.sax.helpers.AttributesImpl;
*/ */
public class DefaultX4OWriter<T> extends AbstractX4OWriter<T> { public class DefaultX4OWriter<T> extends AbstractX4OWriter<T> {
private PropertyConfig propertyConfig; private final PropertyConfig propertyConfig;
private final static String PROPERTY_CONTEXT_PREFIX = PropertyConfig.X4O_PROPERTIES_PREFIX+PropertyConfig.X4O_PROPERTIES_WRITER; private final static String PROPERTY_CONTEXT_PREFIX = PropertyConfig.X4O_PROPERTIES_PREFIX+PropertyConfig.X4O_PROPERTIES_WRITER;
private final static String PROPERTY_OUTPUT_STREAM = "output/stream"; private final static String PROPERTY_OUTPUT_STREAM = "output/stream";

40
x4o-driver/src/main/java/org/x4o/xml/io/sax/X4ODebugWriter.java
View file

@ -29,7 +29,7 @@ import java.util.Map;
import org.x4o.xml.conv.ObjectConverter; import org.x4o.xml.conv.ObjectConverter;
import org.x4o.xml.element.Element; import org.x4o.xml.element.Element;
import org.x4o.xml.element.ElementAttributeHandler; import org.x4o.xml.element.ElementNamespaceAttribute;
import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClass;
import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.element.ElementClassAttribute;
@ -154,7 +154,7 @@ public class X4ODebugWriter {
debugLanguageDefaultClass("getDefaultElementNamespaceInstanceProvider",conf.getDefaultElementNamespaceInstanceProvider()); debugLanguageDefaultClass("getDefaultElementNamespaceInstanceProvider",conf.getDefaultElementNamespaceInstanceProvider());
debugLanguageDefaultClass("getDefaultElementAttributeValueParser",conf.getDefaultElementAttributeValueParser()); debugLanguageDefaultClass("getDefaultElementAttributeValueParser",conf.getDefaultElementAttributeValueParser());
debugLanguageDefaultClass("getDefaultElementObjectPropertyValue",conf.getDefaultElementObjectPropertyValue()); debugLanguageDefaultClass("getDefaultElementObjectPropertyValue",conf.getDefaultElementObjectPropertyValue());
debugLanguageDefaultClass("getDefaultElementAttributeHandlerComparator",conf.getDefaultElementAttributeHandlerComparator()); debugLanguageDefaultClass("getDefaultElementNamespaceAttributeComparator",conf.getDefaultElementNamespaceAttributeComparator());
contentWriter.endElement(DEBUG_URI, "X4OLanguageDefaultClasses", ""); contentWriter.endElement(DEBUG_URI, "X4OLanguageDefaultClasses", "");
} catch (SAXException e) { } catch (SAXException e) {
@ -230,30 +230,9 @@ public class X4ODebugWriter {
} }
contentWriter.startElement (DEBUG_URI, "ElementLanguageModule", "", atts); contentWriter.startElement (DEBUG_URI, "ElementLanguageModule", "", atts);
//module.getElementAttributeHandlers();
//module.getElementBindingHandlers();
//module.getGlobalElementConfigurators();
//module.getElementInterfaces();
//module.getElementNamespace();
debugElementConfiguratorGlobal(module.getElementConfiguratorGlobals()); debugElementConfiguratorGlobal(module.getElementConfiguratorGlobals());
debugElementBindingHandler(module.getElementBindingHandlers()); debugElementBindingHandler(module.getElementBindingHandlers());
for (ElementAttributeHandler p:module.getElementAttributeHandlers()) {
atts = new AttributesImpl();
atts.addAttribute ("", "attributeName", "", "", p.getAttributeName());
atts.addAttribute ("", "description", "", "", p.getDescription());
atts.addAttribute ("", "className", "", "", p.getClass().getName());
contentWriter.startElement (DEBUG_URI, "elementAttributeHandler", "", atts);
for (String para:p.getNextAttributes()) {
atts = new AttributesImpl();
atts.addAttribute ("", "attributeName", "", "", para);
contentWriter.startElement (DEBUG_URI, "nextAttribute", "", atts);
contentWriter.endElement(DEBUG_URI, "nextAttribute", "");
}
contentWriter.endElement(DEBUG_URI, "elementAttributeHandler", "");
}
for (ElementInterface elementInterface:module.getElementInterfaces()) { for (ElementInterface elementInterface:module.getElementInterfaces()) {
atts = new AttributesImpl(); atts = new AttributesImpl();
atts.addAttribute ("", "className", "", "", elementInterface.getClass().getName()); atts.addAttribute ("", "className", "", "", elementInterface.getClass().getName());
@ -274,6 +253,21 @@ public class X4ODebugWriter {
atts.addAttribute ("", "className", "", "", enc.getClass().getName()); atts.addAttribute ("", "className", "", "", enc.getClass().getName());
contentWriter.startElement (DEBUG_URI, ElementNamespace.class.getSimpleName(), "", atts); contentWriter.startElement (DEBUG_URI, ElementNamespace.class.getSimpleName(), "", atts);
for (ElementNamespaceAttribute p:enc.getElementNamespaceAttributes()) {
atts = new AttributesImpl();
atts.addAttribute ("", "attributeName", "", "", p.getAttributeName());
atts.addAttribute ("", "description", "", "", p.getDescription());
atts.addAttribute ("", "className", "", "", p.getClass().getName());
contentWriter.startElement (DEBUG_URI, "elementNamespaceAttribute", "", atts);
for (String para:p.getNextAttributes()) {
atts = new AttributesImpl();
atts.addAttribute ("", "attributeName", "", "", para);
contentWriter.startElement (DEBUG_URI, "nextAttribute", "", atts);
contentWriter.endElement(DEBUG_URI, "nextAttribute", "");
}
contentWriter.endElement(DEBUG_URI, "elementNamespaceAttribute", "");
}
for (ElementClass ec:enc.getElementClasses()) { for (ElementClass ec:enc.getElementClasses()) {
debugElementClass(ec); debugElementClass(ec);
} }

14
x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageConfiguration.java
View file

@ -46,7 +46,7 @@ public abstract class AbstractX4OLanguageConfiguration implements X4OLanguageCon
private Class<?> defaultElementNamespaceInstanceProvider = null; private Class<?> defaultElementNamespaceInstanceProvider = null;
private Class<?> defaultElementAttributeValueParser = null; private Class<?> defaultElementAttributeValueParser = null;
private Class<?> defaultElementObjectPropertyValue = null; private Class<?> defaultElementObjectPropertyValue = null;
private Class<?> defaultElementAttributeHandlerComparator = null; private Class<?> defaultElementNamespaceAttributeComparator = null;
private Class<?> defaultLanguageVersionFilter = null; private Class<?> defaultLanguageVersionFilter = null;
private Class<?> defaultLanguageLoader = null; private Class<?> defaultLanguageLoader = null;
@ -255,17 +255,17 @@ public abstract class AbstractX4OLanguageConfiguration implements X4OLanguageCon
} }
/** /**
* @return the defaultElementAttributeHandlerComparator * @return the defaultElementNamespaceAttributeComparator
*/ */
public Class<?> getDefaultElementAttributeHandlerComparator() { public Class<?> getDefaultElementNamespaceAttributeComparator() {
return defaultElementAttributeHandlerComparator; return defaultElementNamespaceAttributeComparator;
} }
/** /**
* @param defaultElementAttributeHandlerComparator the defaultElementAttributeHandlerComparator to set * @param defaultElementNamespaceAttributeComparator the defaultElementNamespaceAttributeComparator to set
*/ */
public void setDefaultElementAttributeHandlerComparator(Class<?> defaultElementAttributeHandlerComparator) { public void setDefaultElementNamespaceAttributeComparator(Class<?> defaultElementNamespaceAttributeComparator) {
this.defaultElementAttributeHandlerComparator = defaultElementAttributeHandlerComparator; this.defaultElementNamespaceAttributeComparator = defaultElementNamespaceAttributeComparator;
} }
/** /**

25
x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageModule.java
View file

@ -29,7 +29,6 @@ import java.util.ArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.x4o.xml.element.AbstractElementMetaBase; import org.x4o.xml.element.AbstractElementMetaBase;
import org.x4o.xml.element.ElementAttributeHandler;
import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementConfiguratorGlobal; import org.x4o.xml.element.ElementConfiguratorGlobal;
import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementInterface;
@ -48,7 +47,6 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
private String providerHost=null; private String providerHost=null;
private String sourceResource = null; private String sourceResource = null;
private List<ElementAttributeHandler> elementAttributeHandlers = null;
private List<ElementBindingHandler> elementBindingHandlers = null; private List<ElementBindingHandler> elementBindingHandlers = null;
private List<ElementConfiguratorGlobal> elementConfiguratorGlobals = null; private List<ElementConfiguratorGlobal> elementConfiguratorGlobals = null;
private List<ElementInterface> elementInterfaces = null; private List<ElementInterface> elementInterfaces = null;
@ -61,7 +59,6 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
public AbstractX4OLanguageModule() { public AbstractX4OLanguageModule() {
logger = Logger.getLogger(AbstractX4OLanguageSession.class.getName()); logger = Logger.getLogger(AbstractX4OLanguageSession.class.getName());
logger.finest("Creating new ParsingContext"); logger.finest("Creating new ParsingContext");
elementAttributeHandlers = new ArrayList<ElementAttributeHandler>(4);
elementBindingHandlers = new ArrayList<ElementBindingHandler>(4); elementBindingHandlers = new ArrayList<ElementBindingHandler>(4);
elementConfiguratorGlobals = new ArrayList<ElementConfiguratorGlobal>(4); elementConfiguratorGlobals = new ArrayList<ElementConfiguratorGlobal>(4);
elementInterfaces = new ArrayList<ElementInterface>(20); elementInterfaces = new ArrayList<ElementInterface>(20);
@ -95,27 +92,6 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
public void setProviderHost(String providerHost) { public void setProviderHost(String providerHost) {
this.providerHost = providerHost; this.providerHost = providerHost;
} }
/**
* @see org.x4o.xml.lang.X4OLanguageModule#addElementAttributeHandler(ElementAttributeHandler)
*/
public void addElementAttributeHandler(ElementAttributeHandler elementAttributeHandler) {
if (elementAttributeHandler==null) {
throw new NullPointerException("Can't add null object");
}
if (elementAttributeHandler.getId()==null) {
throw new NullPointerException("Can't add with null id property.");
}
logger.finer("Adding ElementAttributeHandler: "+elementAttributeHandler.getAttributeName());
elementAttributeHandlers.add(elementAttributeHandler);
}
/**
* @see org.x4o.xml.lang.X4OLanguageModule#getElementAttributeHandlers()
*/
public List<ElementAttributeHandler> getElementAttributeHandlers() {
return elementAttributeHandlers;
}
/** /**
* @see org.x4o.xml.lang.X4OLanguageModule#addElementBindingHandler(ElementBindingHandler) * @see org.x4o.xml.lang.X4OLanguageModule#addElementBindingHandler(ElementBindingHandler)
@ -249,7 +225,6 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
* Reloads the module, experiment !! * Reloads the module, experiment !!
*/ */
public void reloadModule(X4OLanguageLocal elementLanguage,X4OLanguageModule elementLanguageModule) throws X4OLanguageModuleLoaderException { public void reloadModule(X4OLanguageLocal elementLanguage,X4OLanguageModule elementLanguageModule) throws X4OLanguageModuleLoaderException {
elementAttributeHandlers.clear();
elementBindingHandlers.clear(); elementBindingHandlers.clear();
elementInterfaces.clear(); elementInterfaces.clear();
elementNamespaces.clear(); elementNamespaces.clear();

4
x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageConfiguration.java
View file

@ -38,7 +38,7 @@ import org.x4o.xml.element.DefaultElementInterface;
import org.x4o.xml.element.DefaultElementNamespace; import org.x4o.xml.element.DefaultElementNamespace;
import org.x4o.xml.element.DefaultElementNamespaceInstanceProvider; import org.x4o.xml.element.DefaultElementNamespaceInstanceProvider;
import org.x4o.xml.element.DefaultElementObjectPropertyValue; import org.x4o.xml.element.DefaultElementObjectPropertyValue;
import org.x4o.xml.element.DefaultGlobalAttributeHandlerComparator; import org.x4o.xml.element.DefaultElementNamespaceAttributeComparator;
/** /**
* Provides all implementions of the different parts of the language parser. * Provides all implementions of the different parts of the language parser.
@ -69,7 +69,7 @@ public class DefaultX4OLanguageConfiguration extends AbstractX4OLanguageConfigur
if (getDefaultElementNamespaceInstanceProvider()==null) { setDefaultElementNamespaceInstanceProvider( DefaultElementNamespaceInstanceProvider.class); } if (getDefaultElementNamespaceInstanceProvider()==null) { setDefaultElementNamespaceInstanceProvider( DefaultElementNamespaceInstanceProvider.class); }
if (getDefaultElementAttributeValueParser()==null) { setDefaultElementAttributeValueParser( DefaultElementAttributeValueParser.class); } if (getDefaultElementAttributeValueParser()==null) { setDefaultElementAttributeValueParser( DefaultElementAttributeValueParser.class); }
if (getDefaultElementObjectPropertyValue()==null) { setDefaultElementObjectPropertyValue( DefaultElementObjectPropertyValue.class); } if (getDefaultElementObjectPropertyValue()==null) { setDefaultElementObjectPropertyValue( DefaultElementObjectPropertyValue.class); }
if (getDefaultElementAttributeHandlerComparator()==null) { setDefaultElementAttributeHandlerComparator( DefaultGlobalAttributeHandlerComparator.class); } if (getDefaultElementNamespaceAttributeComparator()==null){ setDefaultElementNamespaceAttributeComparator( DefaultElementNamespaceAttributeComparator.class); }
if (getDefaultLanguageVersionFilter()==null) { setDefaultLanguageVersionFilter( DefaultX4OLanguageVersionFilter.class); } if (getDefaultLanguageVersionFilter()==null) { setDefaultLanguageVersionFilter( DefaultX4OLanguageVersionFilter.class); }
if (getDefaultLanguageLoader()==null) { setDefaultLanguageLoader( DefaultX4OLanguageLoader.class); } if (getDefaultLanguageLoader()==null) { setDefaultLanguageLoader( DefaultX4OLanguageLoader.class); }
if (getDefaultExpressionLanguageContext()==null) { setDefaultExpressionLanguageContext( X4OELContext.class); } if (getDefaultExpressionLanguageContext()==null) { setDefaultExpressionLanguageContext( X4OELContext.class); }

2
x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfiguration.java
View file

@ -61,7 +61,7 @@ public interface X4OLanguageConfiguration {
Class<?> getDefaultElementNamespaceInstanceProvider(); Class<?> getDefaultElementNamespaceInstanceProvider();
Class<?> getDefaultElementAttributeValueParser(); Class<?> getDefaultElementAttributeValueParser();
Class<?> getDefaultElementObjectPropertyValue(); Class<?> getDefaultElementObjectPropertyValue();
Class<?> getDefaultElementAttributeHandlerComparator(); Class<?> getDefaultElementNamespaceAttributeComparator();
/** /**
* @return Returns the X4OLanguageVersionFilter which filters the best version to use. * @return Returns the X4OLanguageVersionFilter which filters the best version to use.

2
x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfigurationLocal.java
View file

@ -48,7 +48,7 @@ public interface X4OLanguageConfigurationLocal extends X4OLanguageConfiguration
void setDefaultElementNamespaceInstanceProvider(Class<?> value); void setDefaultElementNamespaceInstanceProvider(Class<?> value);
void setDefaultElementAttributeValueParser(Class<?> value); void setDefaultElementAttributeValueParser(Class<?> value);
void setDefaultElementObjectPropertyValue(Class<?> value); void setDefaultElementObjectPropertyValue(Class<?> value);
void setDefaultElementAttributeHandlerComparator(Class<?> value); void setDefaultElementNamespaceAttributeComparator(Class<?> value);
void setDefaultLanguageVersionFilter(Class<?> value); void setDefaultLanguageVersionFilter(Class<?> value);
void setDefaultLanguageLoader(Class<?> value); void setDefaultLanguageLoader(Class<?> value);

15
x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModule.java
View file

@ -24,7 +24,6 @@ package org.x4o.xml.lang;
import java.util.List; import java.util.List;
import org.x4o.xml.element.ElementAttributeHandler;
import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementConfiguratorGlobal; import org.x4o.xml.element.ElementConfiguratorGlobal;
import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementInterface;
@ -60,24 +59,12 @@ public interface X4OLanguageModule extends ElementMetaBase {
*/ */
void setProviderHost(String providerHost); void setProviderHost(String providerHost);
/**
* Adds an ElementAttributeHandler.
* @param elementAttributeHandler Adds an ElmentAttributeHandler.
*/
void addElementAttributeHandler(ElementAttributeHandler elementAttributeHandler);
/**
* Geta All ElementAttributeHandlers.
* @return Returns an List of ElementAttributeHandlers.
*/
List<ElementAttributeHandler> getElementAttributeHandlers();
/** /**
* Adds an ElementBindingHanlder. * Adds an ElementBindingHanlder.
* @param elementBindingHandler The ElementBindingHandler to add. * @param elementBindingHandler The ElementBindingHandler to add.
*/ */
void addElementBindingHandler(ElementBindingHandler elementBindingHandler); void addElementBindingHandler(ElementBindingHandler elementBindingHandler);
/** /**
* Gets all ElementBindingHandlers. * Gets all ElementBindingHandlers.
* @return Returns an List with all ElementBindingHandlers. * @return Returns an List with all ElementBindingHandlers.

23
x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java
View file

@ -31,7 +31,7 @@ import java.util.logging.Logger;
import org.x4o.xml.conv.ObjectConverterException; import org.x4o.xml.conv.ObjectConverterException;
import org.x4o.xml.element.Element; import org.x4o.xml.element.Element;
import org.x4o.xml.element.ElementAttributeHandler; import org.x4o.xml.element.ElementNamespaceAttribute;
import org.x4o.xml.element.ElementAttributeValueParser; import org.x4o.xml.element.ElementAttributeValueParser;
import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClass;
@ -263,7 +263,7 @@ public class X4OPhaseLanguageRead {
* X4OPhaseReadConfigGlobalAttribute * X4OPhaseReadConfigGlobalAttribute
*/ */
class X4OPhaseReadConfigGlobalAttribute extends AbstractX4OPhase { class X4OPhaseReadConfigGlobalAttribute extends AbstractX4OPhase {
Comparator<ElementAttributeHandler> elementAttributeHandlerComparator = null; Comparator<ElementNamespaceAttribute> elementNamespaceAttributeComparator = null;
private X4OPhaseReadRunConfigurator runConf = null; private X4OPhaseReadRunConfigurator runConf = null;
public X4OPhaseReadConfigGlobalAttribute(X4OPhaseReadRunConfigurator runConf) { public X4OPhaseReadConfigGlobalAttribute(X4OPhaseReadRunConfigurator runConf) {
this.runConf=runConf; this.runConf=runConf;
@ -279,9 +279,9 @@ public class X4OPhaseLanguageRead {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void runElementPhase(Element element) throws X4OPhaseException { public void runElementPhase(Element element) throws X4OPhaseException {
if (elementAttributeHandlerComparator==null) { if (elementNamespaceAttributeComparator==null) {
try { try {
elementAttributeHandlerComparator = (Comparator<ElementAttributeHandler>)X4OLanguageClassLoader.newInstance(element.getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementAttributeHandlerComparator()); elementNamespaceAttributeComparator = (Comparator<ElementNamespaceAttribute>)X4OLanguageClassLoader.newInstance(element.getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementNamespaceAttributeComparator());
} catch (Exception e) { } catch (Exception e) {
throw new X4OPhaseException(this,e); throw new X4OPhaseException(this,e);
} }
@ -289,17 +289,18 @@ public class X4OPhaseLanguageRead {
// do global parameters // do global parameters
logger.finest("Do Element Global AttributeHandlers."); logger.finest("Do Element Global AttributeHandlers.");
List<ElementAttributeHandler> handlers = new ArrayList<ElementAttributeHandler>(); List<ElementNamespaceAttribute> handlers = new ArrayList<ElementNamespaceAttribute>();
for (X4OLanguageModule mod:element.getLanguageSession().getLanguage().getLanguageModules()) { for (X4OLanguageModule mod:element.getLanguageSession().getLanguage().getLanguageModules()) {
for (ElementAttributeHandler global:mod.getElementAttributeHandlers()) { for (ElementNamespace ns:mod.getElementNamespaces()) {
for (ElementNamespaceAttribute global:ns.getElementNamespaceAttributes()) {
String attribute = element.getAttributes().get(global.getAttributeName()); String attribute = element.getAttributes().get(global.getAttributeName());
if (attribute!=null) { if (attribute!=null) {
handlers.add(global); handlers.add(global);
}
} }
} }
} }
Collections.sort(handlers,elementAttributeHandlerComparator); Collections.sort(handlers,elementNamespaceAttributeComparator);
List<ElementConfigurator> handlers2 = new ArrayList<ElementConfigurator>(handlers.size()); List<ElementConfigurator> handlers2 = new ArrayList<ElementConfigurator>(handlers.size());
handlers2.addAll(handlers); handlers2.addAll(handlers);
for (ElementConfigurator ec:handlers) { for (ElementConfigurator ec:handlers) {

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

@ -1,225 +1,193 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--
<!-- ==================================================================== -->
Copyright (c) 2004-2013, Willem Cazander
All rights reserved. <!-- ===== Automatic generated schema for language: cel ===== -->
Redistribution and use in source and binary forms, with or without modification, are permitted provided <!-- ==================================================================== -->
that the following conditions are met:
<!--
* Redistributions of source code must retain the above copyright notice, this list of conditions and the
following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: cel ===== -->
<!-- ==================================================================== -->
<!--
ID: cel-module ID: cel-module
ProviderName: Core Element Languag Module ProviderName: Core Element Languag Module
ProviderHost: cel.x4o.org ProviderHost: cel.x4o.org
Namespaces: 2 Namespaces: 2
Namespace: http://cel.x4o.org/xml/ns/cel-core Uri: http://cel.x4o.org/xml/ns/cel-core
Created on: Sun Apr 28 11:41:33 CEST 2013 Uri schema: http://cel.x4o.org/xml/ns/cel-core-1.0.xsd
--> Created on: Sat Aug 24 22:02:08 CEST 2013
<schema xmlns="http://www.w3.org/2001/XMLSchema" -->
xmlns:this="http://cel.x4o.org/xml/ns/cel-core" <schema xmlns="http://www.w3.org/2001/XMLSchema"
version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://cel.x4o.org/xml/ns/cel-core"> xmlns:this="http://cel.x4o.org/xml/ns/cel-core"
<complexType name="namespaceType"> version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://cel.x4o.org/xml/ns/cel-core">
<choice minOccurs="0" maxOccurs="unbounded"> <complexType name="attributeType">
<element name="description" type="this:descriptionType"/> <choice minOccurs="0" maxOccurs="unbounded">
<element name="element" type="this:elementType"/> <element name="attributeAlias" type="this:attributeAliasType"/>
</choice> <element name="classConverter" type="this:classConverterType"/>
<attribute name="uri" type="string" use="required"/> <element name="description" type="this:descriptionType"/>
<attribute name="name" type="string"/> </choice>
<attribute name="languageRoot" type="boolean"/> <attribute name="required" type="boolean"/>
<attribute name="prefixMapping" type="string"/> <attribute name="defaultValue" type="string"/>
<attribute name="elementNamespaceInstanceProvider" type="string"/> <attribute name="runResolveEL" type="boolean"/>
<attribute name="schemaUri" type="string"/> <attribute name="runConverters" type="boolean"/>
<attribute name="schemaResource" type="string"/> <attribute name="objectConverter" type="string"/>
<attribute name="schemaPrefix" type="string"/> <attribute name="runBeanValue" type="boolean"/>
<attribute name="description" type="string"/> <attribute name="writeOrder" type="integer"/>
<attribute name="id" type="string"/> <attribute name="description" type="string"/>
</complexType> <attribute name="id" type="string"/>
<complexType name="descriptionType"> </complexType>
<simpleContent> <complexType name="classConverterType">
<extension base="string"> <choice minOccurs="0" maxOccurs="unbounded"/>
<anyAttribute/> </complexType>
</extension> <complexType name="namespaceAttributeType">
</simpleContent> <choice minOccurs="0" maxOccurs="unbounded">
</complexType> <element name="description" type="this:descriptionType"/>
<complexType name="elementType"> </choice>
<choice minOccurs="0" maxOccurs="unbounded"> <attribute name="bean.class" type="string" use="required"/>
<element name="attribute" type="this:attributeType"/> <anyAttribute/>
<element name="configurator" type="this:configuratorType"/> </complexType>
<element name="description" type="this:descriptionType"/> <complexType name="namespaceType">
<element name="elementParent" type="this:elementParentType"/> <choice minOccurs="0" maxOccurs="unbounded">
</choice> <element name="description" type="this:descriptionType"/>
<attribute name="objectClass" type="string"/> <element name="element" type="this:elementType"/>
<attribute name="elementClass" type="string"/> <element name="namespaceAttribute" type="this:namespaceAttributeType"/>
<attribute name="schemaContentComplex" type="boolean"/> </choice>
<attribute name="schemaContentMixed" type="boolean"/> <attribute name="uri" type="string" use="required"/>
<attribute name="schemaContentBase" type="string"/> <attribute name="name" type="string"/>
<attribute name="autoAttributes" type="boolean"/> <attribute name="schemaUri" type="string"/>
<attribute name="description" type="string"/> <attribute name="schemaResource" type="string"/>
<attribute name="id" type="string"/> <attribute name="languageRoot" type="boolean"/>
</complexType> <attribute name="schemaPrefix" type="string"/>
<complexType name="configuratorGlobalType"> <attribute name="elementNamespaceInstanceProvider" type="string"/>
<choice minOccurs="0" maxOccurs="unbounded"> <attribute name="prefixMapping" type="string"/>
<element name="description" type="this:descriptionType"/> <attribute name="description" type="string"/>
</choice> <attribute name="id" type="string"/>
<attribute name="bean.class" type="string" use="required"/> </complexType>
<attribute name="configAction" type="string"/> <complexType name="descriptionType">
<anyAttribute/> <simpleContent>
</complexType> <extension base="string">
<complexType name="attributeAliasType"> <anyAttribute/>
<choice minOccurs="0" maxOccurs="unbounded"/> </extension>
<attribute name="name" type="string" use="required"/> </simpleContent>
<anyAttribute/> </complexType>
</complexType> <complexType name="bindingHandlerType">
<complexType name="configuratorType"> <choice minOccurs="0" maxOccurs="unbounded">
<choice minOccurs="0" maxOccurs="unbounded"> <element name="description" type="this:descriptionType"/>
<element name="description" type="this:descriptionType"/> </choice>
</choice> <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"/> <anyAttribute/>
<anyAttribute/> </complexType>
</complexType> <complexType name="elementType">
<complexType name="attributeHandlerType"> <choice minOccurs="0" maxOccurs="unbounded">
<choice minOccurs="0" maxOccurs="unbounded"> <element name="attribute" type="this:attributeType"/>
<element name="description" type="this:descriptionType"/> <element name="configurator" type="this:configuratorType"/>
</choice> <element name="description" type="this:descriptionType"/>
<attribute name="bean.class" type="string" use="required"/> <element name="elementParent" type="this:elementParentType"/>
<anyAttribute/> </choice>
</complexType> <attribute name="objectClass" type="string"/>
<complexType name="attributeType"> <attribute name="elementClass" type="string"/>
<choice minOccurs="0" maxOccurs="unbounded"> <attribute name="autoAttributes" type="boolean"/>
<element name="attributeAlias" type="this:attributeAliasType"/> <attribute name="schemaContentBase" type="string"/>
<element name="classConverter" type="this:classConverterType"/> <attribute name="schemaContentComplex" type="boolean"/>
<element name="description" type="this:descriptionType"/> <attribute name="schemaContentMixed" type="boolean"/>
</choice> <attribute name="description" type="string"/>
<attribute name="name" type="string"/> <attribute name="id" type="string"/>
<attribute name="runBeanValue" type="boolean"/> </complexType>
<attribute name="runResolveEL" type="boolean"/> <complexType name="configuratorGlobalType">
<attribute name="writeOrder" type="integer"/> <choice minOccurs="0" maxOccurs="unbounded">
<attribute name="objectConverter" type="string"/> <element name="description" type="this:descriptionType"/>
<attribute name="runConverters" type="boolean"/> </choice>
<attribute name="required" type="boolean"/> <attribute name="bean.class" type="string" use="required"/>
<attribute name="defaultValue" type="string"/> <attribute name="configAction" type="string"/>
<attribute name="description" type="string"/> <anyAttribute/>
<attribute name="id" type="string"/> </complexType>
</complexType> <complexType name="attributeAliasType">
<complexType name="classConverterType"> <choice minOccurs="0" maxOccurs="unbounded"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <attribute name="name" type="string" use="required"/>
</complexType> <anyAttribute/>
<complexType name="bindingHandlerType"> </complexType>
<choice minOccurs="0" maxOccurs="unbounded"> <complexType name="configuratorType">
<element name="description" type="this:descriptionType"/> <choice minOccurs="0" maxOccurs="unbounded">
</choice> <element name="description" type="this:descriptionType"/>
<attribute name="id" type="string" use="required"/> </choice>
<attribute name="bean.class" type="string" use="required"/> <attribute name="bean.class" type="string" use="required"/>
<anyAttribute/> <attribute name="configAction" type="string"/>
</complexType> <anyAttribute/>
<complexType name="elementInterfaceType"> </complexType>
<choice minOccurs="0" maxOccurs="unbounded"> <complexType name="elementInterfaceType">
<element name="attribute" type="this:attributeType"/> <choice minOccurs="0" maxOccurs="unbounded">
<element name="bindingHandler" type="this:bindingHandlerType"/> <element name="attribute" type="this:attributeType"/>
<element name="configurator" type="this:configuratorType"/> <element name="configurator" type="this:configuratorType"/>
<element name="description" type="this:descriptionType"/> <element name="description" type="this:descriptionType"/>
<element name="elementParent" type="this:elementParentType"/> <element name="elementParent" type="this:elementParentType"/>
</choice> </choice>
<attribute name="interfaceClass" type="string"/> <attribute name="interfaceClass" type="string"/>
<attribute name="description" type="string"/> <attribute name="description" type="string"/>
<attribute name="id" type="string"/> <attribute name="id" type="string"/>
</complexType> </complexType>
<complexType name="elementParentType"> <complexType name="elementParentType">
<choice minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"/>
<attribute name="tag" type="string" use="required"/> <attribute name="tag" type="string" use="required"/>
<attribute name="uri" type="string"/> <attribute name="uri" type="string"/>
<anyAttribute/> <anyAttribute/>
</complexType> </complexType>
<element name="namespace" type="this:namespaceType"> <element name="attribute" type="this:attributeType">
<annotation> <annotation>
<documentation xml:lang="en">Defines an xml namespace. <documentation xml:lang="en">Defines xml element attribute.</documentation>
</documentation> </annotation>
</annotation> </element>
</element> <element name="classConverter" type="this:classConverterType">
<element name="description" type="this:descriptionType"> <annotation>
<annotation> <documentation xml:lang="en">Converts string attribute to java class instance.</documentation>
<documentation xml:lang="en">Adds description as text on all eld elements. </annotation>
</documentation> </element>
</annotation> <element name="namespaceAttribute" type="this:namespaceAttributeType">
</element> <annotation>
<element name="element" type="this:elementType"> <documentation xml:lang="en">Defines generic namespace attribute for language.</documentation>
<annotation> </annotation>
<documentation xml:lang="en">Defines xml element tag. </element>
</documentation> <element name="namespace" type="this:namespaceType">
</annotation> <annotation>
</element> <documentation xml:lang="en">Defines an xml namespace.</documentation>
<element name="configuratorGlobal" type="this:configuratorGlobalType"> </annotation>
<annotation> </element>
<documentation xml:lang="en">Define generic global configuator for languge. <element name="description" type="this:descriptionType">
</documentation> <annotation>
</annotation> <documentation xml:lang="en">Adds description as text on all eld elements.</documentation>
</element> </annotation>
<element name="attributeAlias" type="this:attributeAliasType"> </element>
<annotation> <element name="bindingHandler" type="this:bindingHandlerType">
<documentation xml:lang="en">Adds an attribute alias. <annotation>
</documentation> <documentation xml:lang="en">Defines generic binding handler for languge.</documentation>
</annotation> </annotation>
</element> </element>
<element name="configurator" type="this:configuratorType"> <element name="element" type="this:elementType">
<annotation> <annotation>
<documentation xml:lang="en">Define generic configurator for language. <documentation xml:lang="en">Defines xml element tag.</documentation>
</documentation> </annotation>
</annotation> </element>
</element> <element name="configuratorGlobal" type="this:configuratorGlobalType">
<element name="attributeHandler" type="this:attributeHandlerType"> <annotation>
<annotation> <documentation xml:lang="en">Define generic global configuator for languge.</documentation>
<documentation xml:lang="en">Defines generic attribute handler for language. </annotation>
</documentation> </element>
</annotation> <element name="attributeAlias" type="this:attributeAliasType">
</element> <annotation>
<element name="attribute" type="this:attributeType"> <documentation xml:lang="en">Adds an attribute alias.</documentation>
<annotation> </annotation>
<documentation xml:lang="en">Defines xml element attribute. </element>
</documentation> <element name="configurator" type="this:configuratorType">
</annotation> <annotation>
</element> <documentation xml:lang="en">Define generic configurator for language.</documentation>
<element name="classConverter" type="this:classConverterType"> </annotation>
<annotation> </element>
<documentation xml:lang="en">Converts string attribute to java class instance. <element name="elementInterface" type="this:elementInterfaceType">
</documentation> <annotation>
</annotation> <documentation xml:lang="en">Defines element interface class.</documentation>
</element> </annotation>
<element name="bindingHandler" type="this:bindingHandlerType"> </element>
<annotation> <element name="elementParent" type="this:elementParentType">
<documentation xml:lang="en">Defines generic binding handler for languge. <annotation>
</documentation> <documentation xml:lang="en">Added (meta) element parent.</documentation>
</annotation> </annotation>
</element> </element>
<element name="elementInterface" type="this:elementInterfaceType"> </schema>
<annotation>
<documentation xml:lang="en">Defines element interface class.
</documentation>
</annotation>
</element>
<element name="elementParent" type="this:elementParentType">
<annotation>
<documentation xml:lang="en">Added (meta) element parent.
</documentation>
</annotation>
</element>
</schema>

92
x4o-driver/src/main/resources/META-INF/cel/cel-root-1.0.xsd
View file

@ -1,59 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--
<!-- ==================================================================== -->
Copyright (c) 2004-2013, Willem Cazander
All rights reserved. <!-- ===== Automatic generated schema for language: cel ===== -->
Redistribution and use in source and binary forms, with or without modification, are permitted provided <!-- ==================================================================== -->
that the following conditions are met:
<!--
* Redistributions of source code must retain the above copyright notice, this list of conditions and the
following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: cel ===== -->
<!-- ==================================================================== -->
<!--
ID: cel-module ID: cel-module
ProviderName: Core Element Languag Module ProviderName: Core Element Languag Module
ProviderHost: cel.x4o.org ProviderHost: cel.x4o.org
Namespaces: 2 Namespaces: 2
Namespace: http://cel.x4o.org/xml/ns/cel-root Uri: http://cel.x4o.org/xml/ns/cel-root
Created on: Sun Apr 28 11:41:33 CEST 2013 Uri schema: http://cel.x4o.org/xml/ns/cel-root-1.0.xsd
--> Created on: Sat Aug 24 22:02:08 CEST 2013
<schema xmlns="http://www.w3.org/2001/XMLSchema" -->
xmlns:cel-core="http://cel.x4o.org/xml/ns/cel-core" <schema xmlns="http://www.w3.org/2001/XMLSchema"
version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://cel.x4o.org/xml/ns/cel-root"> xmlns:cel-core="http://cel.x4o.org/xml/ns/cel-core"
<import namespace="http://cel.x4o.org/xml/ns/cel-core" schemaLocation="cel-core-1.0.xsd"/> version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://cel.x4o.org/xml/ns/cel-root">
<element name="module"> <import namespace="http://cel.x4o.org/xml/ns/cel-core" schemaLocation="cel-core-1.0.xsd"/>
<complexType> <element name="module">
<choice minOccurs="0" maxOccurs="unbounded"> <complexType>
<element ref="cel-core:attributeHandler"/> <choice minOccurs="0" maxOccurs="unbounded">
<element ref="cel-core:bindingHandler"/> <element ref="cel-core:bindingHandler"/>
<element ref="cel-core:configuratorGlobal"/> <element ref="cel-core:configuratorGlobal"/>
<element ref="cel-core:description"/> <element ref="cel-core:description"/>
<element ref="cel-core:elementInterface"/> <element ref="cel-core:elementInterface"/>
<element ref="cel-core:namespace"/> <element ref="cel-core:namespace"/>
</choice> </choice>
<attribute name="id" type="string" use="required"/> <attribute name="id" type="string" use="required"/>
<attribute name="providerHost" type="string" use="required"/> <attribute name="providerHost" type="string" use="required"/>
<attribute name="sourceResource" type="string"/> <attribute name="languageModuleLoader" type="string"/>
<attribute name="languageModuleLoader" type="string"/> <attribute name="sourceResource" type="string"/>
<attribute name="providerName" type="string"/> <attribute name="providerName" type="string"/>
<attribute name="description" type="string"/> <attribute name="description" type="string"/>
</complexType> </complexType>
</element> </element>
</schema> </schema>

311
x4o-driver/src/main/resources/META-INF/eld/eld-conv-1.0.xsd
View file

@ -1,177 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--
<!-- ==================================================================== -->
Copyright (c) 2004-2013, Willem Cazander
All rights reserved. <!-- ===== Automatic generated schema for language: eld ===== -->
Redistribution and use in source and binary forms, with or without modification, are permitted provided <!-- ==================================================================== -->
that the following conditions are met:
<!--
* Redistributions of source code must retain the above copyright notice, this list of conditions and the
following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: eld ===== -->
<!-- ==================================================================== -->
<!--
ID: eld-module ID: eld-module
ProviderName: Element Language Definition ProviderName: Element Language Definition
ProviderHost: eld.x4o.org ProviderHost: eld.x4o.org
Namespaces: 3 Namespaces: 3
Uri: http://eld.x4o.org/xml/ns/eld-conv Uri: http://eld.x4o.org/xml/ns/eld-conv
Uri schema: http://eld.x4o.org/xml/ns/eld-conv-0.8.xsd Uri schema: http://eld.x4o.org/xml/ns/eld-conv-0.8.xsd
Created on: Sun Apr 28 11:56:32 CEST 2013 Created on: Sat Aug 24 21:57:18 CEST 2013
--> -->
<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"
xmlns:lang="http://eld.x4o.org/xml/ns/eld-lang" xmlns:lang="http://eld.x4o.org/xml/ns/eld-lang"
version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://eld.x4o.org/xml/ns/eld-conv"> version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://eld.x4o.org/xml/ns/eld-conv">
<import namespace="http://eld.x4o.org/xml/ns/eld-lang" schemaLocation="eld-lang-1.0.xsd"/> <import namespace="http://eld.x4o.org/xml/ns/eld-lang" schemaLocation="eld-lang-1.0.xsd"/>
<complexType name="byteConverterType"> <complexType name="byteConverterType">
<choice minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"/>
</complexType> </complexType>
<complexType name="booleanConverterType"> <complexType name="doubleConverterType">
<choice minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"/>
</complexType> </complexType>
<complexType name="urlConverterType"> <complexType name="longConverterType">
<choice minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"/>
</complexType> </complexType>
<complexType name="beanConverterType"> <complexType name="classConverterType">
<choice minOccurs="0" maxOccurs="unbounded"/> <choice minOccurs="0" maxOccurs="unbounded"/>
<attribute name="bean.class" type="string"> </complexType>
<annotation> <complexType name="stringSplitConverterType">
<documentation xml:lang="en">The class name of the converter to load. <choice minOccurs="0" maxOccurs="unbounded">
</documentation> <element name="stringSplitConverterStep" type="this:stringSplitConverterStepType"/>
</annotation> </choice>
</attribute> <attribute name="useNativeType" type="string">
<anyAttribute/> <annotation>
</complexType> <documentation xml:lang="en">Set to true to convert to native data type.</documentation>
<complexType name="stringSplitConverterStepType"> </annotation>
<choice minOccurs="0" maxOccurs="unbounded"> </attribute>
<element name="booleanConverter" type="this:booleanConverterType"/> <attribute name="singleToMethod" type="string">
<element name="byteConverter" type="this:byteConverterType"/> <annotation>
<element name="characterConverter" type="this:characterConverterType"/> <documentation xml:lang="en">Shortcut to use only this method for the &apos;to&apos; convert.</documentation>
<element name="classConverter" type="this:classConverterType"/> </annotation>
<element name="doubleConverter" type="this:doubleConverterType"/> </attribute>
<element name="enumConverter" type="this:enumConverterType"/> <attribute name="splitSize" type="string" use="required">
<element name="floatConverter" type="this:floatConverterType"/> <annotation>
<element name="integerConverter" type="this:integerConverterType"/> <documentation xml:lang="en">The split value expected size.</documentation>
<element name="longConverter" type="this:longConverterType"/> </annotation>
<element name="stringSplitConverter" type="this:stringSplitConverterType"/> </attribute>
<element name="urlConverter" type="this:urlConverterType"/> <attribute name="split" type="string" use="required">
</choice> <annotation>
<attribute name="toMethod" type="string"> <documentation xml:lang="en">The split regex.</documentation>
<annotation> </annotation>
<documentation xml:lang="en">The convert 'to' method step. </attribute>
</documentation> <attribute name="classTo" type="string" use="required">
</annotation> <annotation>
</attribute> <documentation xml:lang="en">The class name to convert the string to.</documentation>
<attribute name="fromOrder" type="string" use="required"> </annotation>
<annotation> </attribute>
<documentation xml:lang="en">The convert 'from' order. </complexType>
</documentation> <complexType name="booleanConverterType">
</annotation> <choice minOccurs="0" maxOccurs="unbounded"/>
</attribute> </complexType>
<attribute name="fromMethod" type="string" use="required"> <complexType name="urlConverterType">
<annotation> <choice minOccurs="0" maxOccurs="unbounded"/>
<documentation xml:lang="en">The convert 'from' method step. </complexType>
</documentation> <complexType name="integerConverterType">
</annotation> <choice minOccurs="0" maxOccurs="unbounded"/>
</attribute> </complexType>
<attribute name="toOrder" type="string" use="required"> <complexType name="beanConverterType">
<annotation> <choice minOccurs="0" maxOccurs="unbounded"/>
<documentation xml:lang="en">The convert 'to' order. <attribute name="bean.class" type="string">
</documentation> <annotation>
</annotation> <documentation xml:lang="en">The class name of the converter to load.</documentation>
</attribute> </annotation>
<attribute name="objectConverter" type="string"/> </attribute>
</complexType> <anyAttribute/>
<complexType name="doubleConverterType"> </complexType>
<choice minOccurs="0" maxOccurs="unbounded"/> <complexType name="stringSplitConverterStepType">
</complexType> <choice minOccurs="0" maxOccurs="unbounded">
<complexType name="longConverterType"> <element name="booleanConverter" type="this:booleanConverterType"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <element name="byteConverter" type="this:byteConverterType"/>
</complexType> <element name="characterConverter" type="this:characterConverterType"/>
<complexType name="classConverterType"> <element name="classConverter" type="this:classConverterType"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <element name="doubleConverter" type="this:doubleConverterType"/>
</complexType> <element name="enumConverter" type="this:enumConverterType"/>
<complexType name="stringSplitConverterType"> <element name="floatConverter" type="this:floatConverterType"/>
<choice minOccurs="0" maxOccurs="unbounded"> <element name="integerConverter" type="this:integerConverterType"/>
<element name="stringSplitConverterStep" type="this:stringSplitConverterStepType"/> <element name="longConverter" type="this:longConverterType"/>
</choice> <element name="stringSplitConverter" type="this:stringSplitConverterType"/>
<attribute name="useNativeType" type="string"> <element name="urlConverter" type="this:urlConverterType"/>
<annotation> </choice>
<documentation xml:lang="en">Set to true to convert to native data type. <attribute name="toMethod" type="string">
</documentation> <annotation>
</annotation> <documentation xml:lang="en">The convert &apos;to&apos; method step.</documentation>
</attribute> </annotation>
<attribute name="singleToMethod" type="string"> </attribute>
<annotation> <attribute name="fromOrder" type="string" use="required">
<documentation xml:lang="en">Shortcut to use only this method for the 'to' convert. <annotation>
</documentation> <documentation xml:lang="en">The convert &apos;from&apos; order.</documentation>
</annotation> </annotation>
</attribute> </attribute>
<attribute name="splitSize" type="string" use="required"> <attribute name="fromMethod" type="string" use="required">
<annotation> <annotation>
<documentation xml:lang="en">The split value expected size. <documentation xml:lang="en">The convert &apos;from&apos; method step.</documentation>
</documentation> </annotation>
</annotation> </attribute>
</attribute> <attribute name="toOrder" type="string" use="required">
<attribute name="split" type="string" use="required"> <annotation>
<annotation> <documentation xml:lang="en">The convert &apos;to&apos; order.</documentation>
<documentation xml:lang="en">The split regex. </annotation>
</documentation> </attribute>
</annotation> <attribute name="objectConverter" type="string"/>
</attribute> </complexType>
<attribute name="classTo" type="string" use="required"> <complexType name="floatConverterType">
<annotation> <choice minOccurs="0" maxOccurs="unbounded"/>
<documentation xml:lang="en">The class name to convert the string to. </complexType>
</documentation> <complexType name="characterConverterType">
</annotation> <choice minOccurs="0" maxOccurs="unbounded"/>
</attribute> </complexType>
</complexType> <complexType name="enumConverterType">
<complexType name="integerConverterType"> <choice minOccurs="0" maxOccurs="unbounded"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <attribute name="enumClass" type="string"/>
</complexType> </complexType>
<complexType name="floatConverterType"> <element name="byteConverter" type="this:byteConverterType"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <element name="doubleConverter" type="this:doubleConverterType"/>
</complexType> <element name="longConverter" type="this:longConverterType"/>
<complexType name="characterConverterType"> <element name="classConverter" type="this:classConverterType"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <element name="stringSplitConverter" type="this:stringSplitConverterType"/>
</complexType> <element name="booleanConverter" type="this:booleanConverterType"/>
<complexType name="enumConverterType"> <element name="urlConverter" type="this:urlConverterType"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <element name="integerConverter" type="this:integerConverterType"/>
<attribute name="enumClass" type="string"/> <element name="beanConverter" type="this:beanConverterType">
</complexType> <annotation>
<element name="byteConverter" type="this:byteConverterType"/> <documentation xml:lang="en">Define an loadable in bean.class for an ObjectConverter.</documentation>
<element name="booleanConverter" type="this:booleanConverterType"/> </annotation>
<element name="urlConverter" type="this:urlConverterType"/> </element>
<element name="beanConverter" type="this:beanConverterType"> <element name="stringSplitConverterStep" type="this:stringSplitConverterStepType"/>
<annotation> <element name="floatConverter" type="this:floatConverterType"/>
<documentation xml:lang="en">Define an loadable in bean.class for an ObjectConverter. <element name="characterConverter" type="this:characterConverterType"/>
</documentation> <element name="enumConverter" type="this:enumConverterType"/>
</annotation> </schema>
</element>
<element name="stringSplitConverterStep" type="this:stringSplitConverterStepType"/>
<element name="doubleConverter" type="this:doubleConverterType"/>
<element name="longConverter" type="this:longConverterType"/>
<element name="classConverter" type="this:classConverterType"/>
<element name="stringSplitConverter" type="this:stringSplitConverterType"/>
<element name="integerConverter" type="this:integerConverterType"/>
<element name="floatConverter" type="this:floatConverterType"/>
<element name="characterConverter" type="this:characterConverterType"/>
<element name="enumConverter" type="this:enumConverterType"/>
</schema>

855
x4o-driver/src/main/resources/META-INF/eld/eld-lang-1.0.xsd
View file

@ -1,468 +1,399 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--
<!-- ==================================================================== -->
Copyright (c) 2004-2013, Willem Cazander
All rights reserved. <!-- ===== Automatic generated schema for language: eld ===== -->
Redistribution and use in source and binary forms, with or without modification, are permitted provided <!-- ==================================================================== -->
that the following conditions are met:
<!--
* Redistributions of source code must retain the above copyright notice, this list of conditions and the
following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: eld ===== -->
<!-- ==================================================================== -->
<!--
ID: eld-module ID: eld-module
ProviderName: Element Language Definition ProviderName: Element Language Definition
ProviderHost: eld.x4o.org ProviderHost: eld.x4o.org
Namespaces: 3 Namespaces: 3
Uri: http://eld.x4o.org/xml/ns/eld-lang Uri: http://eld.x4o.org/xml/ns/eld-lang
Uri schema: http://eld.x4o.org/xml/ns/eld-lang-0.8.xsd Uri schema: http://eld.x4o.org/xml/ns/eld-lang-0.8.xsd
Created on: Sun Apr 28 11:56:32 CEST 2013 Created on: Sat Aug 24 21:57:18 CEST 2013
--> -->
<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"
xmlns:this="http://eld.x4o.org/xml/ns/eld-lang" xmlns:this="http://eld.x4o.org/xml/ns/eld-lang"
version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://eld.x4o.org/xml/ns/eld-lang"> version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://eld.x4o.org/xml/ns/eld-lang">
<import namespace="http://eld.x4o.org/xml/ns/eld-conv" schemaLocation="eld-conv-1.0.xsd"/> <import namespace="http://eld.x4o.org/xml/ns/eld-conv" schemaLocation="eld-conv-1.0.xsd"/>
<complexType name="namespaceType"> <complexType name="attributeType">
<choice minOccurs="0" maxOccurs="unbounded"> <choice minOccurs="0" maxOccurs="unbounded">
<element name="description" type="this:descriptionType"/> <element ref="conv:beanConverter"/>
<element name="element" type="this:elementType"/> <element ref="conv:booleanConverter"/>
</choice> <element ref="conv:byteConverter"/>
<attribute name="id" type="string" use="required"> <element ref="conv:characterConverter"/>
<annotation> <element ref="conv:classConverter"/>
<documentation xml:lang="en">The namespace id. <element ref="conv:doubleConverter"/>
</documentation> <element ref="conv:enumConverter"/>
</annotation> <element ref="conv:floatConverter"/>
</attribute> <element ref="conv:integerConverter"/>
<attribute name="name" type="string"/> <element ref="conv:longConverter"/>
<attribute name="elementNamespaceInstanceProvider" type="string"/> <element ref="conv:stringSplitConverter"/>
<attribute name="uri" type="string"/> <element ref="conv:urlConverter"/>
<attribute name="schemaUri" type="string"/> <element name="attributeAlias" type="this:attributeAliasType"/>
<attribute name="schemaResource" type="string"/> <element name="bean" type="this:beanType"/>
<attribute name="schemaPrefix" type="string"/> <element name="description" type="this:descriptionType"/>
<attribute name="prefixMapping" type="string"/> </choice>
<attribute name="languageRoot" type="boolean"/> <attribute name="id" type="string">
<attribute name="description" type="string"/> <annotation>
</complexType> <documentation xml:lang="en">The attribute id. (with name as alias)</documentation>
<complexType name="descriptionType"> </annotation>
<simpleContent> </attribute>
<extension base="string"> <attribute name="name" type="string"/>
<anyAttribute/> <attribute name="required" type="boolean"/>
</extension> <attribute name="defaultValue" type="string"/>
</simpleContent> <attribute name="objectConverter" type="string"/>
</complexType> <attribute name="runResolveEL" type="boolean"/>
<complexType name="elementSkipPhaseType"> <attribute name="runConverters" type="boolean"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <attribute name="runBeanValue" type="boolean"/>
<attribute name="name" type="string" use="required"> <attribute name="writeOrder" type="integer"/>
<annotation> <attribute name="description" type="string"/>
<documentation xml:lang="en">The name of the phase to skip. </complexType>
</documentation> <complexType name="namespaceAttributeType">
</annotation> <choice minOccurs="0" maxOccurs="unbounded">
</attribute> <element name="description" type="this:descriptionType"/>
<anyAttribute/> <element name="namespaceAttributeNext" type="this:namespaceAttributeNextType"/>
</complexType> </choice>
<complexType name="elementType"> <attribute name="attributeName" type="string" use="required">
<choice minOccurs="0" maxOccurs="unbounded"> <annotation>
<element name="attribute" type="this:attributeType"/> <documentation xml:lang="en">The xml attribute name.</documentation>
<element name="attributeFromBody" type="this:attributeFromBodyType"/> </annotation>
<element name="bean" type="this:beanType"/> </attribute>
<element name="configurator" type="this:configuratorType"/> <attribute name="id" type="string" use="required">
<element name="description" type="this:descriptionType"/> <annotation>
<element name="elementParent" type="this:elementParentType"/> <documentation xml:lang="en">The namespace attribute id.</documentation>
<element name="elementSkipPhase" type="this:elementSkipPhaseType"/> </annotation>
</choice> </attribute>
<attribute name="id" type="string"> <attribute name="bean.class" type="string" use="required">
<annotation> <annotation>
<documentation xml:lang="en">The attribute id. (with tag as alias) <documentation xml:lang="en">The class of the namespace attribute.</documentation>
</documentation> </annotation>
</annotation> </attribute>
</attribute> <anyAttribute/>
<attribute name="tag" type="string"/> </complexType>
<attribute name="objectClass" type="string"> <complexType name="namespaceType">
<annotation> <choice minOccurs="0" maxOccurs="unbounded">
<documentation xml:lang="en">The class of the wrapped object. <element name="description" type="this:descriptionType"/>
</documentation> <element name="element" type="this:elementType"/>
</annotation> <element name="namespaceAttribute" type="this:namespaceAttributeType"/>
</attribute> </choice>
<attribute name="elementClass" type="string"> <attribute name="id" type="string" use="required">
<annotation> <annotation>
<documentation xml:lang="en">An custom element class to config object. <documentation xml:lang="en">The namespace id.</documentation>
</documentation> </annotation>
</annotation> </attribute>
</attribute> <attribute name="name" type="string"/>
<attribute name="schemaContentComplex" type="boolean"/> <attribute name="languageRoot" type="boolean"/>
<attribute name="autoAttributes" type="boolean"/> <attribute name="schemaPrefix" type="string"/>
<attribute name="schemaContentMixed" type="boolean"/> <attribute name="prefixMapping" type="string"/>
<attribute name="schemaContentBase" type="string"/> <attribute name="schemaUri" type="string"/>
<attribute name="description" type="string"/> <attribute name="schemaResource" type="string"/>
</complexType> <attribute name="elementNamespaceInstanceProvider" type="string"/>
<complexType name="attributeAliasType"> <attribute name="uri" type="string"/>
<choice minOccurs="0" maxOccurs="unbounded"/> <attribute name="description" type="string"/>
<attribute name="name" type="string" use="required"> </complexType>
<annotation> <complexType name="descriptionType">
<documentation xml:lang="en">The alias name to add to the attribute. <simpleContent>
</documentation> <extension base="string">
</annotation> <anyAttribute/>
</attribute> </extension>
<anyAttribute/> </simpleContent>
</complexType> </complexType>
<complexType name="configuratorGlobalType"> <complexType name="bindingHandlerType">
<choice minOccurs="0" maxOccurs="unbounded"> <choice minOccurs="0" maxOccurs="unbounded">
<element name="description" type="this:descriptionType"/> <element name="description" type="this:descriptionType"/>
</choice> </choice>
<attribute name="id" type="string" use="required"> <attribute name="id" type="string" use="required">
<annotation> <annotation>
<documentation xml:lang="en">The global element configurator id. <documentation xml:lang="en">The binding handler id.</documentation>
</documentation> </annotation>
</annotation> </attribute>
</attribute> <attribute name="bean.class" type="string" use="required">
<attribute name="bean.class" type="string" use="required"> <annotation>
<annotation> <documentation xml:lang="en">The class of the binding handler.</documentation>
<documentation xml:lang="en">The class of the element configurator. </annotation>
</documentation> </attribute>
</annotation> <anyAttribute/>
</attribute> </complexType>
<attribute name="configAction" type="string"> <complexType name="elementSkipPhaseType">
<annotation> <choice minOccurs="0" maxOccurs="unbounded"/>
<documentation xml:lang="en">If set to true then run in config phase. <attribute name="name" type="string" use="required">
</documentation> <annotation>
</annotation> <documentation xml:lang="en">The name of the phase to skip.</documentation>
</attribute> </annotation>
<anyAttribute/> </attribute>
</complexType> <anyAttribute/>
<complexType name="configuratorType"> </complexType>
<choice minOccurs="0" maxOccurs="unbounded"> <complexType name="elementType">
<element name="description" type="this:descriptionType"/> <choice minOccurs="0" maxOccurs="unbounded">
</choice> <element name="attribute" type="this:attributeType"/>
<attribute name="id" type="string" use="required"> <element name="attributeFromBody" type="this:attributeFromBodyType"/>
<annotation> <element name="bean" type="this:beanType"/>
<documentation xml:lang="en">The element configurator id. <element name="configurator" type="this:configuratorType"/>
</documentation> <element name="description" type="this:descriptionType"/>
</annotation> <element name="elementParent" type="this:elementParentType"/>
</attribute> <element name="elementSkipPhase" type="this:elementSkipPhaseType"/>
<attribute name="bean.class" type="string" use="required"> </choice>
<annotation> <attribute name="id" type="string">
<documentation xml:lang="en">The class of the global element configurator. <annotation>
</documentation> <documentation xml:lang="en">The attribute id. (with tag as alias)</documentation>
</annotation> </annotation>
</attribute> </attribute>
<attribute name="configAction" type="string"> <attribute name="tag" type="string"/>
<annotation> <attribute name="objectClass" type="string">
<documentation xml:lang="en">If set to true then run in config phase. <annotation>
</documentation> <documentation xml:lang="en">The class of the wrapped object.</documentation>
</annotation> </annotation>
</attribute> </attribute>
<anyAttribute/> <attribute name="elementClass" type="string">
</complexType> <annotation>
<complexType name="attributeFromBodyType"> <documentation xml:lang="en">An custom element class to config object.</documentation>
<choice minOccurs="0" maxOccurs="unbounded"> </annotation>
<element name="description" type="this:descriptionType"/> </attribute>
</choice> <attribute name="autoAttributes" type="boolean"/>
<attribute name="bodyType" type="string"> <attribute name="schemaContentBase" type="string"/>
<annotation> <attribute name="schemaContentComplex" type="boolean"/>
<documentation xml:lang="en">See org.x4o.xml.element.Element.ElementType for options defaults to 'characters'. <attribute name="schemaContentMixed" type="boolean"/>
</documentation> <attribute name="description" type="string"/>
</annotation> </complexType>
</attribute> <complexType name="attributeAliasType">
<attribute name="id" type="string" use="required"> <choice minOccurs="0" maxOccurs="unbounded"/>
<annotation> <attribute name="name" type="string" use="required">
<documentation xml:lang="en">The id for this configurator. <annotation>
</documentation> <documentation xml:lang="en">The alias name to add to the attribute.</documentation>
</annotation> </annotation>
</attribute> </attribute>
<attribute name="name" type="string" use="required"> <anyAttribute/>
<annotation> </complexType>
<documentation xml:lang="en">The attribute name to fill the value. <complexType name="configuratorGlobalType">
</documentation> <choice minOccurs="0" maxOccurs="unbounded">
</annotation> <element name="description" type="this:descriptionType"/>
</attribute> </choice>
</complexType> <attribute name="id" type="string" use="required">
<complexType name="attributeHandlerType"> <annotation>
<choice minOccurs="0" maxOccurs="unbounded"> <documentation xml:lang="en">The global element configurator id.</documentation>
<element name="attributeHandlerNextAttribute" type="this:attributeHandlerNextAttributeType"/> </annotation>
<element name="description" type="this:descriptionType"/> </attribute>
</choice> <attribute name="bean.class" type="string" use="required">
<attribute name="attributeName" type="string" use="required"> <annotation>
<annotation> <documentation xml:lang="en">The class of the element configurator.</documentation>
<documentation xml:lang="en">The xml attribute name. </annotation>
</documentation> </attribute>
</annotation> <attribute name="configAction" type="string">
</attribute> <annotation>
<attribute name="id" type="string" use="required"> <documentation xml:lang="en">If set to true then run in config phase.</documentation>
<annotation> </annotation>
<documentation xml:lang="en">The atttribute handler id. </attribute>
</documentation> <anyAttribute/>
</annotation> </complexType>
</attribute> <complexType name="configuratorType">
<attribute name="bean.class" type="string" use="required"> <choice minOccurs="0" maxOccurs="unbounded">
<annotation> <element name="description" type="this:descriptionType"/>
<documentation xml:lang="en">The class of the attribute handler. </choice>
</documentation> <attribute name="id" type="string" use="required">
</annotation> <annotation>
</attribute> <documentation xml:lang="en">The element configurator id.</documentation>
<anyAttribute/> </annotation>
</complexType> </attribute>
<complexType name="attributeHandlerNextAttributeType"> <attribute name="bean.class" type="string" use="required">
<choice minOccurs="0" maxOccurs="unbounded"/> <annotation>
<attribute name="attributeName" type="string" use="required"> <documentation xml:lang="en">The class of the global element configurator.</documentation>
<annotation> </annotation>
<documentation xml:lang="en">The attribute name to run after this attribute. </attribute>
</documentation> <attribute name="configAction" type="string">
</annotation> <annotation>
</attribute> <documentation xml:lang="en">If set to true then run in config phase.</documentation>
<anyAttribute/> </annotation>
</complexType> </attribute>
<complexType name="attributeType"> <anyAttribute/>
<choice minOccurs="0" maxOccurs="unbounded"> </complexType>
<element ref="conv:beanConverter"/> <complexType name="beanType">
<element ref="conv:booleanConverter"/> <choice minOccurs="0" maxOccurs="unbounded">
<element ref="conv:byteConverter"/> <element name="namespaceAttributeNext" type="this:namespaceAttributeNextType"/>
<element ref="conv:characterConverter"/> </choice>
<element ref="conv:classConverter"/> <attribute name="bean.class" type="string">
<element ref="conv:doubleConverter"/> <annotation>
<element ref="conv:enumConverter"/> <documentation xml:lang="en">The class name of the the class to load.</documentation>
<element ref="conv:floatConverter"/> </annotation>
<element ref="conv:integerConverter"/> </attribute>
<element ref="conv:longConverter"/> <anyAttribute/>
<element ref="conv:stringSplitConverter"/> </complexType>
<element ref="conv:urlConverter"/> <complexType name="classBindingHandlerType">
<element name="attributeAlias" type="this:attributeAliasType"/> <choice minOccurs="0" maxOccurs="unbounded">
<element name="bean" type="this:beanType"/> <element name="description" type="this:descriptionType"/>
<element name="description" type="this:descriptionType"/> </choice>
</choice> <attribute name="id" type="string" use="required">
<attribute name="id" type="string"> <annotation>
<annotation> <documentation xml:lang="en">The id for this binding handler.</documentation>
<documentation xml:lang="en">The attribute id. (with name as alias) </annotation>
</documentation> </attribute>
</annotation> <attribute name="childClass" type="string" use="required">
</attribute> <annotation>
<attribute name="name" type="string"/> <documentation xml:lang="en">The child class.</documentation>
<attribute name="required" type="boolean"/> </annotation>
<attribute name="defaultValue" type="string"/> </attribute>
<attribute name="objectConverter" type="string"/> <attribute name="parentClass" type="string" use="required">
<attribute name="runBeanValue" type="boolean"/> <annotation>
<attribute name="writeOrder" type="integer"/> <documentation xml:lang="en">The parent class.</documentation>
<attribute name="runConverters" type="boolean"/> </annotation>
<attribute name="runResolveEL" type="boolean"/> </attribute>
<attribute name="description" type="string"/> <attribute name="getMethod" type="string" use="required">
</complexType> <annotation>
<complexType name="bindingHandlerType"> <documentation xml:lang="en">The method name of the method used to get the childeren of the parent.</documentation>
<choice minOccurs="0" maxOccurs="unbounded"> </annotation>
<element name="description" type="this:descriptionType"/> </attribute>
</choice> <attribute name="addMethod" type="string" use="required">
<attribute name="id" type="string" use="required"> <annotation>
<annotation> <documentation xml:lang="en">The method name of the method used to add the child to the parent.</documentation>
<documentation xml:lang="en">The binding handler id. </annotation>
</documentation> </attribute>
</annotation> </complexType>
</attribute> <complexType name="elementInterfaceType">
<attribute name="bean.class" type="string" use="required"> <choice minOccurs="0" maxOccurs="unbounded">
<annotation> <element name="attribute" type="this:attributeType"/>
<documentation xml:lang="en">The class of the binding handler. <element name="attributeFromBody" type="this:attributeFromBodyType"/>
</documentation> <element name="bean" type="this:beanType"/>
</annotation> <element name="configurator" type="this:configuratorType"/>
</attribute> <element name="description" type="this:descriptionType"/>
<anyAttribute/> <element name="elementParent" type="this:elementParentType"/>
</complexType> </choice>
<complexType name="beanType"> <attribute name="id" type="string" use="required">
<choice minOccurs="0" maxOccurs="unbounded"> <annotation>
<element name="attributeHandlerNextAttribute" type="this:attributeHandlerNextAttributeType"/> <documentation xml:lang="en">The interface id.</documentation>
</choice> </annotation>
<attribute name="bean.class" type="string"> </attribute>
<annotation> <attribute name="interfaceClass" type="string" use="required">
<documentation xml:lang="en">The class name of the the class to load. <annotation>
</documentation> <documentation xml:lang="en">The interface class.</documentation>
</annotation> </annotation>
</attribute> </attribute>
<anyAttribute/> <attribute name="description" type="string"/>
</complexType> </complexType>
<complexType name="classBindingHandlerType"> <complexType name="attributeFromBodyType">
<choice minOccurs="0" maxOccurs="unbounded"> <choice minOccurs="0" maxOccurs="unbounded">
<element name="description" type="this:descriptionType"/> <element name="description" type="this:descriptionType"/>
</choice> </choice>
<attribute name="id" type="string" use="required"> <attribute name="bodyType" type="string">
<annotation> <annotation>
<documentation xml:lang="en">The id for this binding handler. <documentation xml:lang="en">See org.x4o.xml.element.Element.ElementType for options defaults to &apos;characters&apos;.</documentation>
</documentation> </annotation>
</annotation> </attribute>
</attribute> <attribute name="id" type="string" use="required">
<attribute name="childClass" type="string" use="required"> <annotation>
<annotation> <documentation xml:lang="en">The id for this configurator.</documentation>
<documentation xml:lang="en">The child class. </annotation>
</documentation> </attribute>
</annotation> <attribute name="name" type="string" use="required">
</attribute> <annotation>
<attribute name="parentClass" type="string" use="required"> <documentation xml:lang="en">The attribute name to fill the value.</documentation>
<annotation> </annotation>
<documentation xml:lang="en">The parent class. </attribute>
</documentation> </complexType>
</annotation> <complexType name="elementParentType">
</attribute> <choice minOccurs="0" maxOccurs="unbounded"/>
<attribute name="getMethod" type="string" use="required"> <attribute name="tag" type="string">
<annotation> <annotation>
<documentation xml:lang="en">The method name of the method used to get the childeren of the parent. <documentation xml:lang="en">The parent tag to have object for.</documentation>
</documentation> </annotation>
</annotation> </attribute>
</attribute> <attribute name="uri" type="string">
<attribute name="addMethod" type="string" use="required"> <annotation>
<annotation> <documentation xml:lang="en">The element namespace uri if non local parent.</documentation>
<documentation xml:lang="en">The method name of the method used to add the child to the parent. </annotation>
</documentation> </attribute>
</annotation> <anyAttribute/>
</attribute> </complexType>
</complexType> <complexType name="namespaceAttributeNextType">
<complexType name="elementInterfaceType"> <choice minOccurs="0" maxOccurs="unbounded"/>
<choice minOccurs="0" maxOccurs="unbounded"> <attribute name="attributeName" type="string" use="required">
<element name="attribute" type="this:attributeType"/> <annotation>
<element name="attributeFromBody" type="this:attributeFromBodyType"/> <documentation xml:lang="en">The attribute name to run after this attribute.</documentation>
<element name="bean" type="this:beanType"/> </annotation>
<element name="bindingHandler" type="this:bindingHandlerType"/> </attribute>
<element name="classBindingHandler" type="this:classBindingHandlerType"/> <anyAttribute/>
<element name="configurator" type="this:configuratorType"/> </complexType>
<element name="description" type="this:descriptionType"/> <element name="attribute" type="this:attributeType">
<element name="elementParent" type="this:elementParentType"/> <annotation>
</choice> <documentation xml:lang="en">XML Element Attribute tag.</documentation>
<attribute name="id" type="string" use="required"> </annotation>
<annotation> </element>
<documentation xml:lang="en">The interface id. <element name="namespaceAttribute" type="this:namespaceAttributeType">
</documentation> <annotation>
</annotation> <documentation xml:lang="en">Define an className in bean.class for an ElementNamespaceAttribute.</documentation>
</attribute> </annotation>
<attribute name="interfaceClass" type="string" use="required"> </element>
<annotation> <element name="namespace" type="this:namespaceType">
<documentation xml:lang="en">The interface class. <annotation>
</documentation> <documentation xml:lang="en">Defines an namespace for the language.</documentation>
</annotation> </annotation>
</attribute> </element>
<attribute name="description" type="string"/> <element name="description" type="this:descriptionType">
</complexType> <annotation>
<complexType name="elementParentType"> <documentation xml:lang="en">An ELD elementDescription field which lets you type text like this one in xml characters instead of an attribute.</documentation>
<choice minOccurs="0" maxOccurs="unbounded"/> </annotation>
<attribute name="tag" type="string"> </element>
<annotation> <element name="bindingHandler" type="this:bindingHandlerType">
<documentation xml:lang="en">The parent tag to have object for. <annotation>
</documentation> <documentation xml:lang="en">Define an className in bean.class for an ElementBindingHandler interface.</documentation>
</annotation> </annotation>
</attribute> </element>
<attribute name="uri" type="string"> <element name="elementSkipPhase" type="this:elementSkipPhaseType">
<annotation> <annotation>
<documentation xml:lang="en">The element namespace uri if non local parent. <documentation xml:lang="en">Adds an phase to skip to the parent element.</documentation>
</documentation> </annotation>
</annotation> </element>
</attribute> <element name="element" type="this:elementType">
<anyAttribute/> <annotation>
</complexType> <documentation xml:lang="en">The xml element.</documentation>
<element name="namespace" type="this:namespaceType"> </annotation>
<annotation> </element>
<documentation xml:lang="en">Defines an namespace for the language. <element name="attributeAlias" type="this:attributeAliasType">
</documentation> <annotation>
</annotation> <documentation xml:lang="en">Defines an alias for an attribute name.</documentation>
</element> </annotation>
<element name="description" type="this:descriptionType"> </element>
<annotation> <element name="configuratorGlobal" type="this:configuratorGlobalType">
<documentation xml:lang="en">An ELD elementDescription field which lets you type text like this one in xml characters instead of an attribute. <annotation>
</documentation> <documentation xml:lang="en">Define an className in bean.class for an ElementConfiguratorGlobal.</documentation>
</annotation> </annotation>
</element> </element>
<element name="elementSkipPhase" type="this:elementSkipPhaseType"> <element name="configurator" type="this:configuratorType">
<annotation> <annotation>
<documentation xml:lang="en">Adds an phase to skip to the parent element. <documentation xml:lang="en">Define an className in bean.class for an ElementConfigurator.</documentation>
</documentation> </annotation>
</annotation> </element>
</element> <element name="bean" type="this:beanType">
<element name="element" type="this:elementType"> <annotation>
<annotation> <documentation xml:lang="en">Loads bean into the Element</documentation>
<documentation xml:lang="en">The xml element. </annotation>
</documentation> </element>
</annotation> <element name="classBindingHandler" type="this:classBindingHandlerType">
</element> <annotation>
<element name="attributeAlias" type="this:attributeAliasType"> <documentation xml:lang="en">Lets you dynamicly bind to object togecher.</documentation>
<annotation> </annotation>
<documentation xml:lang="en">Defines an alias for an attribute name. </element>
</documentation> <element name="elementInterface" type="this:elementInterfaceType">
</annotation> <annotation>
</element> <documentation xml:lang="en">Config element objects by java interface.</documentation>
<element name="configuratorGlobal" type="this:configuratorGlobalType"> </annotation>
<annotation> </element>
<documentation xml:lang="en">Define an className in bean.class for an ElementConfiguratorGlobal. <element name="attributeFromBody" type="this:attributeFromBodyType">
</documentation> <annotation>
</annotation> <documentation xml:lang="en">Defines an alias for an attribute name.</documentation>
</element> </annotation>
<element name="configurator" type="this:configuratorType"> </element>
<annotation> <element name="elementParent" type="this:elementParentType">
<documentation xml:lang="en">Define an className in bean.class for an ElementConfigurator. <annotation>
</documentation> <documentation xml:lang="en">Adds an parent element tag for xsd</documentation>
</annotation> </annotation>
</element> </element>
<element name="attributeFromBody" type="this:attributeFromBodyType"> <element name="namespaceAttributeNext" type="this:namespaceAttributeNextType">
<annotation> <annotation>
<documentation xml:lang="en">Defines an alias for an attribute name. <documentation xml:lang="en">Defines the parameter order.</documentation>
</documentation> </annotation>
</annotation> </element>
</element> </schema>
<element name="attributeHandler" type="this:attributeHandlerType">
<annotation>
<documentation xml:lang="en">Define an className in bean.class for an ElementAttributeHandler.
</documentation>
</annotation>
</element>
<element name="attributeHandlerNextAttribute" type="this:attributeHandlerNextAttributeType">
<annotation>
<documentation xml:lang="en">Defines the parameter order.
</documentation>
</annotation>
</element>
<element name="attribute" type="this:attributeType">
<annotation>
<documentation xml:lang="en">XML Element Attribute tag.
</documentation>
</annotation>
</element>
<element name="bindingHandler" type="this:bindingHandlerType">
<annotation>
<documentation xml:lang="en">Define an className in bean.class for an ElementBindingHandler interface.
</documentation>
</annotation>
</element>
<element name="bean" type="this:beanType">
<annotation>
<documentation xml:lang="en">Loads bean into the Element
</documentation>
</annotation>
</element>
<element name="classBindingHandler" type="this:classBindingHandlerType">
<annotation>
<documentation xml:lang="en">Lets you dynamicly bind to object togecher.
</documentation>
</annotation>
</element>
<element name="elementInterface" type="this:elementInterfaceType">
<annotation>
<documentation xml:lang="en">Config element objects by java interface.
</documentation>
</annotation>
</element>
<element name="elementParent" type="this:elementParentType">
<annotation>
<documentation xml:lang="en">Adds an parent element tag for xsd
</documentation>
</annotation>
</element>
</schema>

16
x4o-driver/src/main/resources/META-INF/eld/eld-lang.eld
View file

@ -129,18 +129,18 @@
<elementParent tag="module" uri="http://eld.x4o.org/xml/ns/eld-root"/> <elementParent tag="module" uri="http://eld.x4o.org/xml/ns/eld-root"/>
</element> </element>
<element id="attributeHandler" elementClass="org.x4o.xml.eld.lang.BeanElement"> <element id="namespaceAttribute" elementClass="org.x4o.xml.eld.lang.BeanElement">
<description>Define an className in bean.class for an ElementAttributeHandler.</description> <description>Define an className in bean.class for an ElementNamespaceAttribute.</description>
<attribute id="id" required="true"> <attribute id="id" required="true">
<description>The atttribute handler id.</description> <description>The namespace attribute id.</description>
</attribute> </attribute>
<attribute id="bean.class" required="true"> <attribute id="bean.class" required="true">
<description>The class of the attribute handler.</description> <description>The class of the namespace attribute.</description>
</attribute> </attribute>
<attribute id="attributeName" required="true"> <attribute id="attributeName" required="true">
<description>The xml attribute name.</description> <description>The xml attribute name.</description>
</attribute> </attribute>
<elementParent tag="module" uri="http://eld.x4o.org/xml/ns/eld-root"/> <elementParent tag="namespace"/>
</element> </element>
<element id="configuratorGlobal" elementClass="org.x4o.xml.eld.lang.BeanElement"> <element id="configuratorGlobal" elementClass="org.x4o.xml.eld.lang.BeanElement">
@ -176,8 +176,8 @@
<description>An ELD elementDescription field which lets you type text like this one in xml characters instead of an attribute.</description> <description>An ELD elementDescription field which lets you type text like this one in xml characters instead of an attribute.</description>
<elementParent tag="module" uri="http://eld.x4o.org/xml/ns/eld-root"/> <elementParent tag="module" uri="http://eld.x4o.org/xml/ns/eld-root"/>
<elementParent tag="namespace"/> <elementParent tag="namespace"/>
<elementParent tag="namespaceAttribute"/>
<elementParent tag="bindingHandler"/> <elementParent tag="bindingHandler"/>
<elementParent tag="attributeHandler"/>
<elementParent tag="configurator"/> <elementParent tag="configurator"/>
<elementParent tag="configuratorGlobal"/> <elementParent tag="configuratorGlobal"/>
<elementParent tag="elementInterface"/> <elementParent tag="elementInterface"/>
@ -210,12 +210,12 @@
<elementParent tag="element"/> <elementParent tag="element"/>
</element> </element>
<element id="attributeHandlerNextAttribute" elementClass="org.x4o.xml.eld.lang.NextAttributeElement"> <element id="namespaceAttributeNext" elementClass="org.x4o.xml.eld.lang.NextAttributeElement">
<description>Defines the parameter order.</description> <description>Defines the parameter order.</description>
<attribute id="attributeName" required="true"> <attribute id="attributeName" required="true">
<description>The attribute name to run after this attribute.</description> <description>The attribute name to run after this attribute.</description>
</attribute> </attribute>
<elementParent tag="attributeHandler"/> <elementParent tag="namespaceAttribute"/>
<elementParent tag="bean"/> <elementParent tag="bean"/>
</element> </element>

122
x4o-driver/src/main/resources/META-INF/eld/eld-root-1.0.xsd
View file

@ -1,79 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!--
<!-- ==================================================================== -->
Copyright (c) 2004-2013, Willem Cazander
All rights reserved. <!-- ===== Automatic generated schema for language: eld ===== -->
Redistribution and use in source and binary forms, with or without modification, are permitted provided <!-- ==================================================================== -->
that the following conditions are met:
<!--
* Redistributions of source code must retain the above copyright notice, this list of conditions and the
following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<!-- ==================================================================== -->
<!-- ===== Automatic generated schema for language: eld ===== -->
<!-- ==================================================================== -->
<!--
ID: eld-module ID: eld-module
ProviderName: Element Language Definition ProviderName: Element Language Definition
ProviderHost: eld.x4o.org ProviderHost: eld.x4o.org
Namespaces: 3 Namespaces: 3
Uri: http://eld.x4o.org/xml/ns/eld-root Uri: http://eld.x4o.org/xml/ns/eld-root
Uri schema: http://eld.x4o.org/xml/ns/eld-root-1.0.xsd Uri schema: http://eld.x4o.org/xml/ns/eld-root-1.0.xsd
Created on: Sun Apr 28 11:56:32 CEST 2013 Created on: Sat Aug 24 21:57:18 CEST 2013
--> -->
<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"
xmlns:lang="http://eld.x4o.org/xml/ns/eld-lang" xmlns:lang="http://eld.x4o.org/xml/ns/eld-lang"
version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://eld.x4o.org/xml/ns/eld-root"> version="1.0" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://eld.x4o.org/xml/ns/eld-root">
<import namespace="http://eld.x4o.org/xml/ns/eld-conv" schemaLocation="eld-conv-1.0.xsd"/> <import namespace="http://eld.x4o.org/xml/ns/eld-conv" schemaLocation="eld-conv-1.0.xsd"/>
<import namespace="http://eld.x4o.org/xml/ns/eld-lang" schemaLocation="eld-lang-1.0.xsd"/> <import namespace="http://eld.x4o.org/xml/ns/eld-lang" schemaLocation="eld-lang-1.0.xsd"/>
<element name="module"> <element name="module">
<complexType> <complexType>
<choice minOccurs="0" maxOccurs="unbounded"> <choice minOccurs="0" maxOccurs="unbounded">
<element ref="lang:attributeHandler"/> <element ref="lang:bean"/>
<element ref="lang:bean"/> <element ref="lang:bindingHandler"/>
<element ref="lang:bindingHandler"/> <element ref="lang:classBindingHandler"/>
<element ref="lang:classBindingHandler"/> <element ref="lang:configuratorGlobal"/>
<element ref="lang:configuratorGlobal"/> <element ref="lang:description"/>
<element ref="lang:description"/> <element ref="lang:elementInterface"/>
<element ref="lang:elementInterface"/> <element ref="lang:namespace"/>
<element ref="lang:namespace"/> </choice>
</choice> <attribute name="id" type="string" use="required">
<attribute name="id" type="string" use="required"> <annotation>
<annotation> <documentation xml:lang="en">The module id.</documentation>
<documentation xml:lang="en">The module id. </annotation>
</documentation> </attribute>
</annotation> <attribute name="providerName" type="string">
</attribute> <annotation>
<attribute name="providerName" type="string"> <documentation xml:lang="en">The provider name in normal en:lang.</documentation>
<annotation> </annotation>
<documentation xml:lang="en">The provider name in normal en:lang. </attribute>
</documentation> <attribute name="providerHost" type="string" use="required">
</annotation> <annotation>
</attribute> <documentation xml:lang="en">The provider host like langx.someorg.domain for uri/etc defaults.</documentation>
<attribute name="providerHost" type="string" use="required"> </annotation>
<annotation> </attribute>
<documentation xml:lang="en">The provider host like langx.someorg.domain for uri/etc defaults. <attribute name="languageModuleLoader" type="string"/>
</documentation> <attribute name="sourceResource" type="string"/>
</annotation> <attribute name="description" type="string"/>
</attribute> </complexType>
<attribute name="languageModuleLoader" type="string"/> </element>
<attribute name="sourceResource" type="string"/> </schema>
<attribute name="description" type="string"/>
</complexType>
</element>
</schema>

4
x4o-driver/src/test/java/org/x4o/xml/test/element/TestElementAttributeHandler.java → x4o-driver/src/test/java/org/x4o/xml/test/element/TestElementNamespaceAttribute.java
View file

@ -22,7 +22,7 @@
*/ */
package org.x4o.xml.test.element; package org.x4o.xml.test.element;
import org.x4o.xml.element.AbstractElementAttributeHandler; import org.x4o.xml.element.AbstractElementNamespaceAttribute;
import org.x4o.xml.element.Element; import org.x4o.xml.element.Element;
import org.x4o.xml.element.ElementConfiguratorException; import org.x4o.xml.element.ElementConfiguratorException;
@ -32,7 +32,7 @@ import org.x4o.xml.element.ElementConfiguratorException;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 Aug 27, 2012 * @version 1.0 Aug 27, 2012
*/ */
public class TestElementAttributeHandler extends AbstractElementAttributeHandler { public class TestElementNamespaceAttribute extends AbstractElementNamespaceAttribute {
public void doConfigElement(Element element) throws ElementConfiguratorException { public void doConfigElement(Element element) throws ElementConfiguratorException {

23
x4o-driver/src/test/resources/META-INF/junit-defd/defd-lang.eld
View file

@ -64,26 +64,11 @@
</conv:stringSplitConverter> </conv:stringSplitConverter>
</eld:attribute> </eld:attribute>
</eld:elementInterface> </eld:elementInterface>
<eld:elementInterface id="JComponent" interfaceClass="javax.swing.JComponent">
<eld:description>Configs the JComponent based objects.</eld:description>
<eld:classBindingHandler id="JComponent-JComponent" parentClass="javax.swing.JComponent" childClass="javax.swing.JComponent" addMethod="add" getMethod="getComponents">
<eld:description>Binds the JComponent to the JComponent.</eld:description>
</eld:classBindingHandler>
</eld:elementInterface>
<eld:configuratorGlobal 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:configuratorGlobal> </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>
</eld:attributeHandler>
<eld:attributeHandler attributeName="tt.attr2" bean.class="org.x4o.xml.test.element.TestElementAttributeHandler" id="attrTest2">
<eld:description>Test the global element attribute2 handler.</eld:description>
<eld:attributeHandlerNextAttribute attributeName="tt.attr1"/>
</eld:attributeHandler>
<eld:namespace <eld:namespace
uri="http://test.x4o.org/xml/ns/test-root" uri="http://test.x4o.org/xml/ns/test-root"
schemaUri="http://test.x4o.org/xml/ns/test-root-1.0.xsd" schemaUri="http://test.x4o.org/xml/ns/test-root-1.0.xsd"
@ -109,6 +94,14 @@
name="Test Language Namespace" name="Test Language Namespace"
id="test-lang" id="test-lang"
> >
<eld:namespaceAttribute attributeName="attr1" bean.class="org.x4o.xml.test.element.TestElementNamespaceAttribute" id="attrTest1">
<eld:description>Test the global element attribute1 handler.</eld:description>
</eld:namespaceAttribute>
<eld:namespaceAttribute attributeName="attr2" bean.class="org.x4o.xml.test.element.TestElementNamespaceAttribute" id="attrTest2">
<eld:description>Test the global element attribute2 handler.</eld:description>
<eld:namespaceAttributeNext attributeName="attr1"/>
</eld:namespaceAttribute>
<eld:element tag="testNoNSRoot" objectClass="org.x4o.xml.test.models.TestObjectRoot"/> <eld:element tag="testNoNSRoot" objectClass="org.x4o.xml.test.models.TestObjectRoot"/>
<eld:element tag="testBean" objectClass="org.x4o.xml.test.models.TestBean"> <eld:element tag="testBean" objectClass="org.x4o.xml.test.models.TestBean">

23
x4o-driver/src/test/resources/META-INF/test/test-lang.eld
View file

@ -72,20 +72,6 @@
</eld:classBindingHandler> </eld:classBindingHandler>
</eld:elementInterface> </eld:elementInterface>
<!-- TODO: fix writer, run EldParserTest
<eld:configuratorGlobal bean.class="org.x4o.xml.test.element.TestElementConfigurator" id="testConfigGlobal">
<eld:description>Test the global element configurator.</eld:description>
</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>
</eld:attributeHandler>
<eld:attributeHandler attributeName="tt.attr2" bean.class="org.x4o.xml.test.element.TestElementAttributeHandler" id="attrTest2">
<eld:description>Test the global element attribute2 handler.</eld:description>
<eld:attributeHandlerNextAttribute attributeName="tt.attr1"/>
</eld:attributeHandler>
-->
<eld:namespace <eld:namespace
uri="http://test.x4o.org/xml/ns/test-root" uri="http://test.x4o.org/xml/ns/test-root"
schemaUri="http://test.x4o.org/xml/ns/test-root-1.0.xsd" schemaUri="http://test.x4o.org/xml/ns/test-root-1.0.xsd"
@ -111,6 +97,15 @@
name="Test Language Namespace" name="Test Language Namespace"
id="test-lang" id="test-lang"
> >
<!-- TODO: fix x4o writer, run EldParserTest
<eld:namespaceAttribute attributeName="attr1" bean.class="org.x4o.xml.test.element.TestElementNamespaceAttribute" id="attrTest1">
<eld:description>Test the global element attribute1 handler.</eld:description>
</eld:namespaceAttribute>
<eld:namespaceAttribute attributeName="attr2" bean.class="org.x4o.xml.test.element.TestElementNamespaceAttribute" id="attrTest2">
<eld:description>Test the global element attribute2 handler.</eld:description>
<eld:attributeHandlerNextAttribute attributeName="attr1"/>
</eld:namespaceAttribute>
-->
<eld:element tag="testNoNSRoot" objectClass="org.x4o.xml.test.models.TestObjectRoot"/> <eld:element tag="testNoNSRoot" objectClass="org.x4o.xml.test.models.TestObjectRoot"/>
<eld:element tag="testBean" objectClass="org.x4o.xml.test.models.TestBean"> <eld:element tag="testBean" objectClass="org.x4o.xml.test.models.TestBean">

2
x4o-driver/src/test/resources/META-INF/x4o-drivers.xml
View file

@ -44,7 +44,7 @@
<defaultElementNamespaceInstanceProvider></defaultElementNamespaceInstanceProvider> <defaultElementNamespaceInstanceProvider></defaultElementNamespaceInstanceProvider>
<defaultElementAttributeValueParser></defaultElementAttributeValueParser> <defaultElementAttributeValueParser></defaultElementAttributeValueParser>
<defaultElementObjectPropertyValue></defaultElementObjectPropertyValue> <defaultElementObjectPropertyValue></defaultElementObjectPropertyValue>
<defaultElementAttributeHandlerComparator></defaultElementAttributeHandlerComparator> <defaultElementNamespaceAttributeComparator></defaultElementNamespaceAttributeComparator>
<properties> <properties>
<property key="" value=""/> <property key="" value=""/>

8
x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriter.java
View file

@ -35,7 +35,7 @@ import org.x4o.xml.eld.doc.api.DefaultPageWriterTree;
import org.x4o.xml.eld.doc.api.dom.ApiDoc; import org.x4o.xml.eld.doc.api.dom.ApiDoc;
import org.x4o.xml.eld.doc.api.dom.ApiDocConcept; import org.x4o.xml.eld.doc.api.dom.ApiDocConcept;
import org.x4o.xml.eld.doc.api.dom.ApiDocNode; import org.x4o.xml.eld.doc.api.dom.ApiDocNode;
import org.x4o.xml.element.ElementAttributeHandler; import org.x4o.xml.element.ElementNamespaceAttribute;
import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementClass; import org.x4o.xml.element.ElementClass;
import org.x4o.xml.element.ElementClassAttribute; import org.x4o.xml.element.ElementClassAttribute;
@ -136,7 +136,7 @@ public class EldDocWriter {
ApiDocConcept adcEc = doc.addConcept(new ApiDocConcept(adcNs,C_ELEMENT,ElementClass.class)); ApiDocConcept adcEc = doc.addConcept(new ApiDocConcept(adcNs,C_ELEMENT,ElementClass.class));
// mm maybe redo something here // mm maybe redo something here
adcMod.addChildConcepts(new ApiDocConcept(adcMod,CC_ATTRIBUTE_H,ElementAttributeHandler.class)); adcMod.addChildConcepts(new ApiDocConcept(adcMod,CC_ATTRIBUTE_H,ElementNamespaceAttribute.class));
adcMod.addChildConcepts(new ApiDocConcept(adcMod,CC_CONFIGURATOR_G,ElementConfiguratorGlobal.class)); adcMod.addChildConcepts(new ApiDocConcept(adcMod,CC_CONFIGURATOR_G,ElementConfiguratorGlobal.class));
adcMod.addChildConcepts(new ApiDocConcept(adcMod,CC_BINDING,ElementBindingHandler.class)); adcMod.addChildConcepts(new ApiDocConcept(adcMod,CC_BINDING,ElementBindingHandler.class));
adcIface.addChildConcepts(new ApiDocConcept(adcMod,CC_ATTRIBUTE,ElementClassAttribute.class)); adcIface.addChildConcepts(new ApiDocConcept(adcMod,CC_ATTRIBUTE,ElementClassAttribute.class));
@ -153,12 +153,12 @@ public class EldDocWriter {
doc.setRootNode(rootNode); doc.setRootNode(rootNode);
for (X4OLanguageModule mod:context.getLanguage().getLanguageModules()) { ApiDocNode modNode = rootNode.addNode(createNodeLanguageModule(mod)); for (X4OLanguageModule mod:context.getLanguage().getLanguageModules()) { ApiDocNode modNode = rootNode.addNode(createNodeLanguageModule(mod));
for (ElementBindingHandler bind:mod.getElementBindingHandlers()) { modNode.addNode(createNodeElementBindingHandler(bind)); } for (ElementBindingHandler bind:mod.getElementBindingHandlers()) { modNode.addNode(createNodeElementBindingHandler(bind)); }
for (ElementAttributeHandler attr:mod.getElementAttributeHandlers()) { modNode.addNode(createNodeElementAttributeHandler(attr)); }
for (ElementConfiguratorGlobal conf:mod.getElementConfiguratorGlobals()) { modNode.addNode(createNodeElementConfiguratorGlobal(conf)); } for (ElementConfiguratorGlobal conf:mod.getElementConfiguratorGlobals()) { modNode.addNode(createNodeElementConfiguratorGlobal(conf)); }
for (ElementInterface iface:mod.getElementInterfaces()) { ApiDocNode ifaceNode = modNode.addNode(createNodeElementInterface(iface)); for (ElementInterface iface:mod.getElementInterfaces()) { ApiDocNode ifaceNode = modNode.addNode(createNodeElementInterface(iface));
for (ElementClassAttribute eca:iface.getElementClassAttributes()) { ifaceNode.addNode(createNodeElementClassAttribute(eca)); } for (ElementClassAttribute eca:iface.getElementClassAttributes()) { ifaceNode.addNode(createNodeElementClassAttribute(eca)); }
for (ElementConfigurator conf:iface.getElementConfigurators()) { ifaceNode.addNode(createNodeElementConfigurator(conf)); } } for (ElementConfigurator conf:iface.getElementConfigurators()) { ifaceNode.addNode(createNodeElementConfigurator(conf)); } }
for (ElementNamespace ns:mod.getElementNamespaces()) { ApiDocNode nsNode = modNode.addNode(createNodeElementNamespace(ns)); for (ElementNamespace ns:mod.getElementNamespaces()) { ApiDocNode nsNode = modNode.addNode(createNodeElementNamespace(ns));
for (ElementNamespaceAttribute attr:ns.getElementNamespaceAttributes()) { nsNode.addNode(createNodeElementNamespaceAttribute(attr)); }
for (ElementClass ec:ns.getElementClasses()) { ApiDocNode ecNode = nsNode.addNode(createNodeElementClass(ec)); for (ElementClass ec:ns.getElementClasses()) { ApiDocNode ecNode = nsNode.addNode(createNodeElementClass(ec));
for (ElementClassAttribute eca:ec.getElementClassAttributes()) { ecNode.addNode(createNodeElementClassAttribute(eca)); } for (ElementClassAttribute eca:ec.getElementClassAttributes()) { ecNode.addNode(createNodeElementClassAttribute(eca)); }
for (ElementConfigurator conf:ec.getElementConfigurators()) { ecNode.addNode(createNodeElementConfigurator(conf)); } } } for (ElementConfigurator conf:ec.getElementConfigurators()) { ecNode.addNode(createNodeElementConfigurator(conf)); } } }
@ -169,7 +169,7 @@ public class EldDocWriter {
private ApiDocNode createNodeElementBindingHandler(ElementBindingHandler bind) { private ApiDocNode createNodeElementBindingHandler(ElementBindingHandler bind) {
return new ApiDocNode(bind,bind.getId(),bind.getId(),bind.getDescription()); return new ApiDocNode(bind,bind.getId(),bind.getId(),bind.getDescription());
} }
private ApiDocNode createNodeElementAttributeHandler(ElementAttributeHandler attr) { private ApiDocNode createNodeElementNamespaceAttribute(ElementNamespaceAttribute attr) {
return new ApiDocNode(attr,attr.getId(),attr.getId(),attr.getDescription()); return new ApiDocNode(attr,attr.getId(),attr.getId(),attr.getDescription());
} }
private ApiDocNode createNodeElementConfiguratorGlobal(ElementConfiguratorGlobal conf) { private ApiDocNode createNodeElementConfiguratorGlobal(ElementConfiguratorGlobal conf) {

6
x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguage.java
View file

@ -76,13 +76,13 @@ public class EldDocWriterLanguage extends AbstractApiDocWriter {
int elements = 0; int elements = 0;
int namespaces = 0; int namespaces = 0;
for (X4OLanguageModule mod:context.getLanguage().getLanguageModules()) { for (X4OLanguageModule mod:context.getLanguage().getLanguageModules()) {
attrHandlers += mod.getElementAttributeHandlers().size();
bindHandlers += mod.getElementBindingHandlers().size(); bindHandlers += mod.getElementBindingHandlers().size();
interFaces += mod.getElementInterfaces().size(); interFaces += mod.getElementInterfaces().size();
eleConfigs += mod.getElementConfiguratorGlobals().size(); eleConfigs += mod.getElementConfiguratorGlobals().size();
for (ElementNamespace ns:mod.getElementNamespaces()) { for (ElementNamespace ns:mod.getElementNamespaces()) {
namespaces++; namespaces++;
elements += ns.getElementClasses().size(); elements += ns.getElementClasses().size();
attrHandlers += ns.getElementNamespaceAttributes().size();
} }
} }
writer.docTableStart("Language Summary", "Language Stats Summary.",ApiDocContentCss.overviewSummary); writer.docTableStart("Language Summary", "Language Stats Summary.",ApiDocContentCss.overviewSummary);
@ -90,10 +90,10 @@ public class EldDocWriterLanguage extends AbstractApiDocWriter {
writer.docTableRow("LanguageName:", ""+context.getLanguage().getLanguageName(), null); writer.docTableRow("LanguageName:", ""+context.getLanguage().getLanguageName(), null);
writer.docTableRow("LanguageVersion:",""+context.getLanguage().getLanguageVersion(),null); writer.docTableRow("LanguageVersion:",""+context.getLanguage().getLanguageVersion(),null);
writer.docTableRow("Modules:",""+context.getLanguage().getLanguageModules().size(),null); writer.docTableRow("Modules:",""+context.getLanguage().getLanguageModules().size(),null);
writer.docTableRow("Namespaces:",""+namespaces,null);
writer.docTableRow("Elements:",""+elements,null); writer.docTableRow("Elements:",""+elements,null);
writer.docTableRow("ElementNamespaces:",""+namespaces,null);
writer.docTableRow("ElementNamespaceAttribute:",""+attrHandlers,null);
writer.docTableRow("ElementInterfaces:",""+interFaces,null); writer.docTableRow("ElementInterfaces:",""+interFaces,null);
writer.docTableRow("ElementAttributeHandlers:",""+attrHandlers,null);
writer.docTableRow("ElementBindingHandlers:",""+bindHandlers,null); writer.docTableRow("ElementBindingHandlers:",""+bindHandlers,null);
writer.docTableRow("ElementConfigurators:",""+eleConfigs,null); writer.docTableRow("ElementConfigurators:",""+eleConfigs,null);
writer.docTableEnd(); writer.docTableEnd();

6
x4o-eld-doc/src/main/java/org/x4o/xml/eld/doc/EldDocWriterLanguageModule.java
View file

@ -30,7 +30,7 @@ import org.x4o.xml.eld.doc.api.dom.ApiDocNode;
import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody; import org.x4o.xml.eld.doc.api.dom.ApiDocNodeBody;
import org.x4o.xml.eld.doc.api.dom.ApiDocNodeData; import org.x4o.xml.eld.doc.api.dom.ApiDocNodeData;
import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent; import org.x4o.xml.eld.doc.api.dom.ApiDocWriteEvent;
import org.x4o.xml.element.ElementAttributeHandler; import org.x4o.xml.element.ElementNamespaceAttribute;
import org.x4o.xml.element.ElementBindingHandler; import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementConfigurator; import org.x4o.xml.element.ElementConfigurator;
import org.x4o.xml.element.ElementInterface; import org.x4o.xml.element.ElementInterface;
@ -50,7 +50,7 @@ public class EldDocWriterLanguageModule extends AbstractApiDocWriter {
public void configNavBar(ApiDoc doc,ApiDocNode node,ApiDocNodeData data) { public void configNavBar(ApiDoc doc,ApiDocNode node,ApiDocNodeData data) {
clearHrefContentGroup(doc,node,"summary","interface",ElementInterface.class); clearHrefContentGroup(doc,node,"summary","interface",ElementInterface.class);
clearHrefContentGroup(doc,node,"summary","binding",ElementBindingHandler.class); clearHrefContentGroup(doc,node,"summary","binding",ElementBindingHandler.class);
clearHrefContentGroup(doc,node,"summary","attribute",ElementAttributeHandler.class); clearHrefContentGroup(doc,node,"summary","attribute",ElementNamespaceAttribute.class);
clearHrefContentGroup(doc,node,"summary","configurator",ElementConfigurator.class); clearHrefContentGroup(doc,node,"summary","configurator",ElementConfigurator.class);
clearHrefContentGroup(doc,node,"summary","namespace",ElementNamespace.class); clearHrefContentGroup(doc,node,"summary","namespace",ElementNamespace.class);
} }
@ -67,7 +67,7 @@ public class EldDocWriterLanguageModule extends AbstractApiDocWriter {
@ApiDocNodeWriterMethod(nodeBody=ApiDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={3},contentGroup="attribute",contentGroupType="summary") @ApiDocNodeWriterMethod(nodeBody=ApiDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={3},contentGroup="attribute",contentGroupType="summary")
public void writeAttributeSummary(ApiDocWriteEvent<ApiDocNode> event) throws SAXException { public void writeAttributeSummary(ApiDocWriteEvent<ApiDocNode> event) throws SAXException {
printApiTable(event,"Attribute Summary",ElementAttributeHandler.class); printApiTable(event,"Attribute Summary",ElementNamespaceAttribute.class);
} }
@ApiDocNodeWriterMethod(nodeBody=ApiDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={4},contentGroup="configurator",contentGroupType="summary") @ApiDocNodeWriterMethod(nodeBody=ApiDocNodeBody.SUMMARY,targetClasses={X4OLanguageModule.class},nodeBodyOrders={4},contentGroup="configurator",contentGroupType="summary")

4
x4o-meta/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java
View file

@ -26,7 +26,7 @@ import java.util.logging.Logger;
import javax.el.ValueExpression; import javax.el.ValueExpression;
import org.x4o.xml.element.AbstractElementAttributeHandler; import org.x4o.xml.element.AbstractElementNamespaceAttribute;
import org.x4o.xml.element.Element; import org.x4o.xml.element.Element;
import org.x4o.xml.element.ElementConfiguratorException; import org.x4o.xml.element.ElementConfiguratorException;
@ -37,7 +37,7 @@ import org.x4o.xml.element.ElementConfiguratorException;
* @author Willem Cazander * @author Willem Cazander
* @version 1.0 Aug 23, 2006 * @version 1.0 Aug 23, 2006
*/ */
public class ELIDAttributeHandler extends AbstractElementAttributeHandler { public class ELIDAttributeHandler extends AbstractElementNamespaceAttribute {
/** /**
* @see org.x4o.xml.element.ElementConfigurator#doConfigElement(org.x4o.xml.element.Element) * @see org.x4o.xml.element.ElementConfigurator#doConfigElement(org.x4o.xml.element.Element)